small

hoodlabpurdue · Feb 4, 2021 · 5dc3af5 · 5dc3af5
1 parent 4033bf8
commit 5dc3af5
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/Andor/sdk2/Andor.py b/Andor/sdk2/Andor.py
@@ -22,13 +22,14 @@ def Initialize(self):
 
         #configure the acquisition
         (ret) = cam.CoolerON()
+        print("Function CoolerON returned",ret)
         #(ret) = cam.CoolerOFF()
         #(ret, iCoolerStatus) = IsCoolerOn()
-        print("Function CoolerON returned",ret)
+
 
         #(ret, temperature) = GetTemperature()
 
-        (ret, gain) = cam.SetEMCCDGain()
+        #(ret, gain) = cam.SetEMCCDGain()
         #(ret, low, high) = cam.GetEMGainRange()
 
         #(ret, noGains) = cam.GetNumberPreAmpGains()
@@ -59,7 +60,7 @@ def Initialize(self):
             # 2 - Data in Photons
 
         #ret = SetHorizontalSpeed(index)
-        
+
 
         (ret) = cam.SetReadMode(4)
         print("Function SetReadMode returned",ret,"mode = Image")
@@ -93,15 +94,13 @@ def Initialize(self):
         (ret, fminExposure, fAccumulate, fKinetic) = cam.GetAcquisitionTimings()
         print("Function GetAcquisitionTimings returned",ret,"exposure =",fminExposure,"accumulate =",fAccumulate,"kinetic =",fKinetic)
 
-
+    def PrepareAcquisition(self):
+        (ret) = cam.PrepareAcquisition() # reads current acquisition setup and allocates memory. Is called automatically by StartAcuiqision if not run, but can take a while.
+        print("Function PrepareAcquisition returned",ret)
 
 
     def StartAcquisition(self):
-
-        (ret) = cam.PrepareAcquisition() # reads current acquisition setup and allocates memory. Is called automatically by StartAcuiqision if not run, but can take a while.
-        print("Function PrepareAcquisition returned",ret)
-
-        #Perform Acquisition
+        #Run after PrepareAcquisition to start waiting for trigger. 
         (ret) = cam.StartAcquisition()
         print("Function StartAcquisition returned",ret)
         #GetStatus()
@@ -112,7 +111,7 @@ def WaitForAcquisition(self):
         print("Function WaitForAcquisition returned",ret)
         #ret = WaitForAcquisitionTimeOut(iTimeOutMs)
 
-    # def CancelWait(self):
+        # def CancelWait(self):
         # (ret) = cam.CancelWait()
         # print("Cancel wait",ret)