From 7df8a5c10cc80071e3d1671c1adde8c90fd4b4ee Mon Sep 17 00:00:00 2001 From: "Peana, David" Date: Wed, 29 Jun 2022 15:53:43 -0400 Subject: [PATCH] GM with objective --- .../{build => build_old}/lib/flir/__init__.py | 0 .../lib/flir/aqctl_flir.py | 0 .../{build => build_old}/lib/flir/driver.py | 0 .../flir/__pycache__/driver.cpython-38.pyc | Bin 3956 -> 3956 bytes flir_repo/flir/driver.py | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename flir_repo/{build => build_old}/lib/flir/__init__.py (100%) rename flir_repo/{build => build_old}/lib/flir/aqctl_flir.py (100%) rename flir_repo/{build => build_old}/lib/flir/driver.py (100%) diff --git a/flir_repo/build/lib/flir/__init__.py b/flir_repo/build_old/lib/flir/__init__.py similarity index 100% rename from flir_repo/build/lib/flir/__init__.py rename to flir_repo/build_old/lib/flir/__init__.py diff --git a/flir_repo/build/lib/flir/aqctl_flir.py b/flir_repo/build_old/lib/flir/aqctl_flir.py similarity index 100% rename from flir_repo/build/lib/flir/aqctl_flir.py rename to flir_repo/build_old/lib/flir/aqctl_flir.py diff --git a/flir_repo/build/lib/flir/driver.py b/flir_repo/build_old/lib/flir/driver.py similarity index 100% rename from flir_repo/build/lib/flir/driver.py rename to flir_repo/build_old/lib/flir/driver.py diff --git a/flir_repo/flir/__pycache__/driver.cpython-38.pyc b/flir_repo/flir/__pycache__/driver.cpython-38.pyc index 79405db0bbc94586e5d74045e322ad36e787ee39..15599bf20270522f9166e7d21676eb32ce8d7fef 100644 GIT binary patch delta 41 vcmew&_eG97l$V!_0SMl%*|U**7Ym!QiLsG|+2+$M-b~CaEG(NP*`qlC{S6At delta 41 vcmew&_eG97l$V!_0SH!h?B2+|i-pa^z|z>*bn|HzZzg6|7Us>8?9m(m@t+D| diff --git a/flir_repo/flir/driver.py b/flir_repo/flir/driver.py index 126bf93..82cda02 100644 --- a/flir_repo/flir/driver.py +++ b/flir_repo/flir/driver.py @@ -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()