Commit 337ddc4e authored by Emmanuel Papillon's avatar Emmanuel Papillon
Browse files

default latency time set to 1e-4 (needed for frelon)

unset shutter mode/close_time when frelon in FTM
parent 23deb9dc
......@@ -30,6 +30,10 @@ class CountMuxPreset(ChainPreset):
print(f"Your are using frelon {dev.name} in FULL FRAME mode")
print("but the fastshutter is DISABLED !!!\n")
break
else:
dev.shutter.mode = "MANUAL"
dev.shutter.close_time = 0.0
if not self.fsh.is_enabled():
self.soft_fsh = False
......@@ -61,9 +65,6 @@ class FScanMuxPreset(ScanPreset):
def prepare(self, scan):
self.soft_fsh = True
self.opmux.switch("TRIGGER_MODE", "MUSST")
self.opmux.switch("MUSST", "BTRIG")
self.opmux.switch("MCA1", "ON")
for dev in self.limadevs:
cam_mux = CAM2MUX[dev.name]
......@@ -79,6 +80,13 @@ class FScanMuxPreset(ScanPreset):
print("!!! WARNING !!!")
print(f"Your are using frelon {dev.name} in FULL FRAME mode")
print("but the fastshutter is DISABLED !!!\n")
else:
dev.shutter.mode = "MANUAL"
dev.shutter.close_time = 0.0
self.opmux.switch("TRIGGER_MODE", "MUSST")
self.opmux.switch("MUSST", "BTRIG")
self.opmux.switch("MCA1", "ON")
if not self.fsh.is_enabled():
self.soft_fsh = False
......
......@@ -72,7 +72,7 @@ class ID11FTimeScan(FScanRunner):
def __init__(self, scanname, scanmaster, fshutter):
self._fsh = fshutter
self._calib = ID11CameraCalib()
self._min_latency_time = 1e-5
self._min_latency_time = 1e-4
super().__init__(scanname, scanmaster)
def validate(self):
......@@ -98,7 +98,7 @@ class ID11FScan(FScanDiagRunner):
def __init__(self, scanname, scanmaster, fshutter):
self._fsh = fshutter
self._calib = ID11CameraCalib()
self._min_latency_time = 1e-5
self._min_latency_time = 1e-4
super().__init__(scanname, scanmaster)
def validate(self):
......@@ -133,7 +133,7 @@ class ID11FScan2D(FScanDiagRunner):
def __init__(self, scanname, scanmaster, fshutter):
self._fsh = fshutter
self._calib = ID11CameraCalib()
self._min_latency_time = 1e-5
self._min_latency_time = 1e-4
super().__init__(scanname, scanmaster)
def validate(self):
......@@ -164,6 +164,7 @@ class ID11FScan2D(FScanDiagRunner):
fast_npoints=fast_npoints,
acq_time=acq_time,
fast_step_time=0.,
fast_motor_mode=mode,
)
pars.update(kwargs)
self.pars.set(**pars)
......@@ -173,7 +174,7 @@ class ID11FInterlaced(FScanDiagRunner):
def __init__(self, scanname, scanmaster, fshutter):
self._fsh = fshutter
self._calib = ID11CameraCalib()
self._min_latency_time = 1e-5
self._min_latency_time = 1e-4
super().__init__(scanname, scanmaster)
def validate(self):
......
......@@ -47,6 +47,9 @@ class CountMuxPreset(ChainPreset):
print(f"Your are using frelon {dev.name} in FULL FRAME mode")
print("but the fastshutter is DISABLED !!!\n")
break
else:
dev.shutter.mode = "MANUAL"
dev.shutter.close_time = 0.0
if not self.fsh.is_enabled():
self.soft_fsh = False
......@@ -100,6 +103,9 @@ class FScanMuxPreset(ScanPreset):
print("!!! WARNING !!!")
print(f"Your are using frelon {dev.name} in FULL FRAME mode")
print("but the fastshutter is DISABLED !!!\n")
else:
dev.shutter.mode = "MANUAL"
dev.shutter.close_time = 0.0
if not self.fsh.is_enabled():
self.soft_fsh = False
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment