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

Commit 2c007563 authored by Emmanuel Papillon's avatar Emmanuel Papillon

add marana readout_time

parent b708f9b2
......@@ -16,7 +16,7 @@ class ID11CameraCalib:
for dev in devs:
camtype = dev._proxy.lima_type
if camtype == "Andor3":
cam_time = self.calibrate_andor(dev, acqtime)
cam_time = dev.camera.readout_time
lat_time = 1e-4
elif camtype == "Frelon":
cam_time = self.calibrate_frelon(dev, acqtime, shuttime)
......@@ -40,11 +40,6 @@ class ID11CameraCalib:
(readout_time, latency_time) = self.readout[max_name]
return (readout_time, latency_time)
def calibrate_andor(self, dev, acqtime):
self.take_image(dev, acqtime, 1)
readout = dev.camera.readout_time
return readout
def calibrate_frelon(self, dev, acqtime, shuttime):
dev._proxy.saving_mode = "MANUAL"
dev._proxy.prepareAcq()
......@@ -129,8 +124,14 @@ class ID11FScan(FScanDiagRunner):
min_step_time = pars.acq_time + readout_time + pars.latency_time
else:
min_step_time = pars.acq_time + readout_time + min_lat_time
else:
else: # --- camera mode
min_step_time = pars.acq_time + readout_time
if limadevs[0].name == "marana":
if limadevs[0].camera.overlap == "ON":
if pars.acq_time > readout_time:
min_step_time = pars.acq_time
else:
min_step_time = readout_time + readout_time / 2048.
if pars.step_time < min_step_time:
pars.step_time = min_step_time
......
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