From 0c584d8de4cebc72a1647a950dc2235f1cd04ab0 Mon Sep 17 00:00:00 2001 From: "Peana, David" Date: Tue, 28 Jun 2022 13:56:51 -0400 Subject: [PATCH] chnage camera --- .../WindowsScripts/AWGCommand.py | 4 +++- .../flir/__pycache__/driver.cpython-38.pyc | Bin 3956 -> 3956 bytes flir_repo/flir/driver.py | 5 +++-- .../build/lib/flir/__init__.py | 0 .../build/lib/flir/aqctl_flir.py | 0 .../build/lib/flir/driver.py | 0 .../dist/flir-0.0.0-py3.8.egg | Bin .../doc/Makefile | 0 .../doc/conf.py | 0 .../doc/index.rst | 0 .../aqctl_picomotor.cpython-38.pyc | Bin 1688 -> 1688 bytes picomotor_repo/picomotor/aqctl_picomotor.py | 2 +- 12 files changed, 7 insertions(+), 4 deletions(-) rename flir_repo/{ => old setup files...do not edit}/build/lib/flir/__init__.py (100%) rename flir_repo/{ => old setup files...do not edit}/build/lib/flir/aqctl_flir.py (100%) rename flir_repo/{ => old setup files...do not edit}/build/lib/flir/driver.py (100%) rename flir_repo/{ => old setup files...do not edit}/dist/flir-0.0.0-py3.8.egg (100%) rename flir_repo/{ => old setup files...do not edit}/doc/Makefile (100%) rename flir_repo/{ => old setup files...do not edit}/doc/conf.py (100%) rename flir_repo/{ => old setup files...do not edit}/doc/index.rst (100%) diff --git a/AWGCommandScripts/WindowsScripts/AWGCommand.py b/AWGCommandScripts/WindowsScripts/AWGCommand.py index 0dabd6e..f412afd 100644 --- a/AWGCommandScripts/WindowsScripts/AWGCommand.py +++ b/AWGCommandScripts/WindowsScripts/AWGCommand.py @@ -2,7 +2,9 @@ import sys import subprocess -arg_message = sys.argv[1] +# Example command: python AWGCommand.py start 140 + +arg_message = sys.argv[1] if len(sys.argv)>2: freq = sys.argv[2] diff --git a/flir_repo/flir/__pycache__/driver.cpython-38.pyc b/flir_repo/flir/__pycache__/driver.cpython-38.pyc index 3df9d8ec71dfd5b3b6f9f32ee6b4d9cb16e04b11..6371863707865a5ce44f103561ea6484ff789380 100644 GIT binary patch delta 75 zcmew&_eG8`l$V!_0SGRd?@s!wwvlf;3!AZtv5|$@=F=>`OpGj>CE0Tr8S^%`ailXc fc5Z&h`GARW-sJN!p3Ga$XtkM}FOv}fXI>Yl delta 75 zcmew&_eG8`l$V!_0SI<-&r2#+-^jO}h0Vmk(%9H^^Jx}eCPwDXlI%H*jJccJIMNvz fJ2t=Le89vwck+3j!;B{;Pv$LWwA{?im&phKFkcq6 diff --git a/flir_repo/flir/driver.py b/flir_repo/flir/driver.py index 9f7b38f..4df821f 100644 --- a/flir_repo/flir/driver.py +++ b/flir_repo/flir/driver.py @@ -53,8 +53,9 @@ def __init__(self): # try: # Set camera serial numbers - serial_1 = '20409335' #'20409335' # abs camera (286 was the original abs camera (the one Karl is currently using for fluorescence imaging) and 335 is the new one (the one we tried to do abs. imaging of Lithium with)) , 20343286 for 1st - + serial_1 = '20343286' # currently replacing Andor + #serial_1 = '20409335' # diagonal flourescence (on stage carriage) + # Get system self.system = PySpin.System.GetInstance() diff --git a/flir_repo/build/lib/flir/__init__.py b/flir_repo/old setup files...do not edit/build/lib/flir/__init__.py similarity index 100% rename from flir_repo/build/lib/flir/__init__.py rename to flir_repo/old setup files...do not edit/build/lib/flir/__init__.py diff --git a/flir_repo/build/lib/flir/aqctl_flir.py b/flir_repo/old setup files...do not edit/build/lib/flir/aqctl_flir.py similarity index 100% rename from flir_repo/build/lib/flir/aqctl_flir.py rename to flir_repo/old setup files...do not edit/build/lib/flir/aqctl_flir.py diff --git a/flir_repo/build/lib/flir/driver.py b/flir_repo/old setup files...do not edit/build/lib/flir/driver.py similarity index 100% rename from flir_repo/build/lib/flir/driver.py rename to flir_repo/old setup files...do not edit/build/lib/flir/driver.py diff --git a/flir_repo/dist/flir-0.0.0-py3.8.egg b/flir_repo/old setup files...do not edit/dist/flir-0.0.0-py3.8.egg similarity index 100% rename from flir_repo/dist/flir-0.0.0-py3.8.egg rename to flir_repo/old setup files...do not edit/dist/flir-0.0.0-py3.8.egg diff --git a/flir_repo/doc/Makefile b/flir_repo/old setup files...do not edit/doc/Makefile similarity index 100% rename from flir_repo/doc/Makefile rename to flir_repo/old setup files...do not edit/doc/Makefile diff --git a/flir_repo/doc/conf.py b/flir_repo/old setup files...do not edit/doc/conf.py similarity index 100% rename from flir_repo/doc/conf.py rename to flir_repo/old setup files...do not edit/doc/conf.py diff --git a/flir_repo/doc/index.rst b/flir_repo/old setup files...do not edit/doc/index.rst similarity index 100% rename from flir_repo/doc/index.rst rename to flir_repo/old setup files...do not edit/doc/index.rst diff --git a/picomotor_repo/picomotor/__pycache__/aqctl_picomotor.cpython-38.pyc b/picomotor_repo/picomotor/__pycache__/aqctl_picomotor.cpython-38.pyc index 7f04d735336490fab5ca673d313d779e228003de..ac886d74dd8c43ff64e3c9e0a3399b22834312c0 100644 GIT binary patch delta 27 hcmbQiJA;=yl$V!_0SI^wZ{5h9!NO>=xr9Z92>?=K1_1y7 delta 27 hcmbQiJA;=yl$V!_0SMO3QQF9z!NO>~xr9Z92>?=B1?T_( diff --git a/picomotor_repo/picomotor/aqctl_picomotor.py b/picomotor_repo/picomotor/aqctl_picomotor.py index 007815d..dbfa2c1 100644 --- a/picomotor_repo/picomotor/aqctl_picomotor.py +++ b/picomotor_repo/picomotor/aqctl_picomotor.py @@ -37,7 +37,7 @@ def main(): # if args.device is None: # print("Starting in Simulation mode...") # dev = andor(args.device if not args.simulation else None) - dev = picomotor("COM3") + dev = picomotor("COM4") #asyncio.get_event_loop().run_until_complete(dev.setup()) try: print("picomotor server startup on port",args.port,"successful...")