GitLab will be upgraded on June 23rd evening. During the upgrade the service will be unavailable, sorry for the inconvenience.

Commit c5058624 authored by Emmanuel Papillon's avatar Emmanuel Papillon

Accomodate ftimescan runner and multiplexer to new options

in ftimescan (camera_mode and camera_signal)
parent 6ba33b43
......@@ -71,6 +71,7 @@ class FScanMuxPreset(ScanPreset):
for dev in self.limadevs:
cam_mux = CAM2MUX[dev.name]
self.opmux.switch(cam_mux, "ON")
self.opmux.switch("ITRIG", cam_mux)
if dev.name.startswith("frelon") and self.soft_fsh is True:
if dev.camera.image_mode == "FULL FRAME":
dev.shutter.mode = "AUTO_FRAME"
......
......@@ -23,7 +23,13 @@ class ID11CameraCalib:
lat_time = 1e-4
elif camtype == "Eiger":
cam_time = 1e-7
lat_time = 1e-6
# tests
# lat_time = ((acqtime // 25e-3) + 1) * 1e-6
# looks detector runs at about 300Hz in autosummation
lat_time = (acqtime // (1./300.)+1) * 1e-7
# round to 1e-6 (1MHz clock on musst)
lat_time = (1+int(lat_time/1e-6))*1e-6
#lat_time = 1e-6
else:
print("WARNING : software estimation of {dev.name} readout time !!")
cam_time = take_one_image(dev, acq_time)
......@@ -92,12 +98,13 @@ class ID11FTimeScan(FScanRunner):
pars = self.pars
# --- check minimum period
limadevs = self._master.get_controllers_found("lima")
(readout_time, min_lat_time) = self._calib.calibrate(limadevs, pars.acq_time, self._fsh.shutter_time)
min_period = pars.acq_time + readout_time + min_lat_time
if pars.camera_mode != "MASTER":
limadevs = self._master.get_controllers_found("lima")
(readout_time, min_lat_time) = self._calib.calibrate(limadevs, pars.acq_time, self._fsh.shutter_time)
min_period = pars.acq_time + readout_time + min_lat_time
if pars.period < min_period:
pars.period = min_period
if pars.period < min_period:
pars.period = min_period
super().validate()
......
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