Commit 0b61e1d6 authored by Emmanuel Papillon's avatar Emmanuel Papillon
Browse files

fscan debug

parent fbe9966a
......@@ -10,6 +10,7 @@ class ID11CameraCalib:
self.readout = dict()
def calibrate(self, devs, acqtime, shuttime=0.):
readout_time = 0.0
self.readout = dict()
for dev in devs:
camtype = dev._proxy.lima_type
......@@ -21,7 +22,9 @@ class ID11CameraCalib:
print("WARNING : software estimation of {dev.name} readout time !!")
camtime = take_one_image(dev, acq_time)
self.readout[dev.name] = camtime
return max(self.readout.values())
if len(self.readout):
readout_time = max(self.readout.values())
return readout_time
def calibrate_andor(self, dev, acqtime):
self.take_image(dev, acqtime, 1)
......@@ -78,7 +81,7 @@ class ID11FTimeScan(FScanRunner):
# --- check minimum period
limadevs = self._master.get_controllers_found("lima")
readout_time = self._calib.calibrate(limadevs, pars.acq_time, self._fsh.shutter_time)
min_period = pars.acq_time + readout_time + self._latency_time
min_period = pars.acq_time + readout_time + self._min_latency_time
if pars.period < min_period:
pars.period = min_period
......
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