Skip to content

Commit

Permalink
jon_left_6/28
Browse files Browse the repository at this point in the history
  • Loading branch information
dpeana committed Jun 28, 2022
1 parent 0c584d8 commit ab93e4c
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 11 deletions.
13 changes: 6 additions & 7 deletions andor_repo/andor/andor_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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?
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file modified flir_repo/flir/__pycache__/driver.cpython-38.pyc
Binary file not shown.
8 changes: 4 additions & 4 deletions flir_repo/flir/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit ab93e4c

Please sign in to comment.