diff --git a/andor_repo/andor/andor_driver.py b/andor_repo/andor/andor_driver.py index 9112e7b..27cd0c3 100644 --- a/andor_repo/andor/andor_driver.py +++ b/andor_repo/andor/andor_driver.py @@ -19,17 +19,17 @@ def __init__(self): (ret) = self.cam.SetTemperature(-60) (ret) = self.cam.SetADChannel(0) # Added 4/6/22 (ret) = self.cam.SetHSSpeed(0,0) # 0 corresponds to 17MHz on AD channel 0 (the only channel for our camera) in EM Gain mode - print("HSSpeed",self.cam.GetHSSpeed(0, 0, 0)) + # print("HSSpeed",self.cam.GetHSSpeed(0, 0, 0)) (ret) = self.cam.SetVSSpeed(4) # 4 corresponds to 3.3us. 0 is .3 - print("VSSpeed",self.cam.GetVSSpeed(4)) + # print("VSSpeed",self.cam.GetVSSpeed(4)) (ret) = self.cam.SetVSAmplitude(0) # 0 corresponds to 'Normal' 3 required for good image at 0.3 usec VSSpeed - print("Number VSAmplitudes is",self.cam.GetNumberVSAmplitudes()) + # print("Number VSAmplitudes is",self.cam.GetNumberVSAmplitudes()) (ret) = self.cam.SetPreAmpGain(2) # 2 corresponds to a gain of 3.0 - print("PreAmpGain", self.cam.GetPreAmpGain(2)) + # print("PreAmpGain", self.cam.GetPreAmpGain(2)) (ret) = self.cam.SetBaselineClamp(1) (ret) = self.cam.SetOutputAmplifier(0) # 0 is EMCCD. David added this (ret) = self.cam.SetEMGainMode(3) # Max is 300? David added this - (ret) = self.cam.SetEMCCDGain(50) # Max is 300? David added this + (ret) = self.cam.SetEMCCDGain(11) # Max is 300? David added this ########################################################### (ret) = self.cam.SetCountConvertMode(1) # 1 is electron, 2 is photon (ret) = self.cam.SetFrameTransferMode(0) # (ret) = self.cam.SetCountConvertWavelength(float(852)) @@ -43,11 +43,10 @@ def __init__(self): (ret) = self.cam.SetNumberKinetics(2) #number of images taken in an acquisition (ret) = self.cam.EnableKeepCleans(1) (ret) = self.cam.SetNumberAccumulations(1) #Default value is 1. Excplicitly stating this is probably unnecessary. - (ret) = self.cam.SaveEEPROMToFile(r'C:\Users\hoodl\Desktop\EEPROM.txt') + # (ret) = self.cam.SaveEEPROMToFile(r'C:\Users\hoodl\Desktop\EEPROM.txt') # This breaks the camera initialization. #(ret) = SetIsolatedCropMode(1, 30, 30, 1, 1) ############################################################## - (ret) = self.cam.SetReadMode(4) (ret) = self.cam.SetTriggerMode(1) # 0 is internal, 1 is external, 6 is external start? diff --git a/flir_repo/old setup files...do not edit/build/lib/flir/__init__.py b/flir_repo/build/lib/flir/__init__.py similarity index 100% rename from flir_repo/old setup files...do not edit/build/lib/flir/__init__.py rename to flir_repo/build/lib/flir/__init__.py diff --git a/flir_repo/old setup files...do not edit/build/lib/flir/aqctl_flir.py b/flir_repo/build/lib/flir/aqctl_flir.py similarity index 100% rename from flir_repo/old setup files...do not edit/build/lib/flir/aqctl_flir.py rename to flir_repo/build/lib/flir/aqctl_flir.py diff --git a/flir_repo/old setup files...do not edit/build/lib/flir/driver.py b/flir_repo/build/lib/flir/driver.py similarity index 100% rename from flir_repo/old setup files...do not edit/build/lib/flir/driver.py rename to flir_repo/build/lib/flir/driver.py diff --git a/flir_repo/old setup files...do not edit/dist/flir-0.0.0-py3.8.egg b/flir_repo/dist/flir-0.0.0-py3.8.egg similarity index 100% rename from flir_repo/old setup files...do not edit/dist/flir-0.0.0-py3.8.egg rename to flir_repo/dist/flir-0.0.0-py3.8.egg diff --git a/flir_repo/old setup files...do not edit/doc/Makefile b/flir_repo/doc/Makefile similarity index 100% rename from flir_repo/old setup files...do not edit/doc/Makefile rename to flir_repo/doc/Makefile diff --git a/flir_repo/old setup files...do not edit/doc/conf.py b/flir_repo/doc/conf.py similarity index 100% rename from flir_repo/old setup files...do not edit/doc/conf.py rename to flir_repo/doc/conf.py diff --git a/flir_repo/old setup files...do not edit/doc/index.rst b/flir_repo/doc/index.rst similarity index 100% rename from flir_repo/old setup files...do not edit/doc/index.rst rename to flir_repo/doc/index.rst diff --git a/flir_repo/flir/__pycache__/driver.cpython-38.pyc b/flir_repo/flir/__pycache__/driver.cpython-38.pyc index 6371863..79405db 100644 Binary files a/flir_repo/flir/__pycache__/driver.cpython-38.pyc and b/flir_repo/flir/__pycache__/driver.cpython-38.pyc differ diff --git a/flir_repo/flir/driver.py b/flir_repo/flir/driver.py index 4df821f..126bf93 100644 --- a/flir_repo/flir/driver.py +++ b/flir_repo/flir/driver.py @@ -18,8 +18,8 @@ # MOT_OFFSET_HEIGHT = 0 #These corrections are for a MOT that is not at the center of the frame # MOT_OFFSET_WIDTH = 0 #OFFSET = 964 #52 #652 #This will be the pixel width and height of the roi -IMAGE_HEIGHT = 960 #964 #OFFSET #964 pixels default -IMAGE_WIDTH = 1280 #1288 #OFFSET #1288 pixels default +IMAGE_HEIGHT = 960 #964 is max #OFFSET #964 pixels default +IMAGE_WIDTH = 1280 #1288 is max #OFFSET #1288 pixels default # HEIGHT_OFFSET = round((964+1-IMAGE_HEIGHT-MOT_OFFSET_HEIGHT)/2)#(964-IMAGE_HEIGHT)/2) # Y, to keep in middle of sensor # WIDTH_OFFSET = round((1288+1-IMAGE_WIDTH-MOT_OFFSET_WIDTH)/2)#(1288-IMAGE_WIDTH)/2) # X, to keep in middle of sensor @@ -53,8 +53,8 @@ def __init__(self): # try: # Set camera serial numbers - serial_1 = '20343286' # currently replacing Andor - #serial_1 = '20409335' # diagonal flourescence (on stage carriage) + #serial_1 = '20343286' # currently replacing Andor + serial_1 = '20409335' # diagonal flourescence (on stage carriage) # Get system self.system = PySpin.System.GetInstance()