diff --git a/andor_repo/andor/andor_driver.py b/andor_repo/andor/andor_driver.py index 9924843..37fd038 100644 --- a/andor_repo/andor/andor_driver.py +++ b/andor_repo/andor/andor_driver.py @@ -18,7 +18,7 @@ def __init__(self): (ret) = self.cam.CoolerON() (ret) = self.cam.SetCoolerMode(1) (ret) = self.cam.SetTemperature(-40) #David added this - (ret) = self.cam.SetHSSpeed(0,0) #David added this + (ret) = self.cam.SetHSSpeed(0,0) #David added this 0 (ret) = self.cam.SetVSSpeed(4)#.3) #David added this (ret) = self.cam.SetVSAmplitude(0) #David added this (ret) = self.cam.SetPreAmpGain(2) #David added this @@ -38,7 +38,7 @@ def __init__(self): (ret) = self.cam.SetFastExtTrigger(1) (ret) = self.cam.SetAcquisitionMode(3) (ret) = self.cam.SetNumberKinetics(2) - (ret) = self.cam.EnableKeepCleans(0) + (ret) = self.cam.EnableKeepCleans(1) #(ret) = SetIsolatedCropMode(1, 30, 30, 1, 1) ############################################################## @@ -66,11 +66,11 @@ def __init__(self): # ,Pre-Amp Gain (Gain 3), Output Amplifier (Electron Multiplying), Electron Multiplier (EM) Gain (Enabled->2) - def retrieve_trigger(self,images=1): + def retrieve_trigger(self,images=1,timeout = 0): # Time out time in seconds # print("Retrieving trigger...") # time1 = time.time() for i in range(images): - win32event.WaitForSingleObject(self.event, 6000) # 12000 is 12 second timeout + win32event.WaitForSingleObject(self.event, (timeout*1000 + 1000)) # 12000 is 12 second timeout # print(time.time()-time1) def reset_image(self):