From 9f9500d3480585f912e01c9ea97df952da9e5ebb Mon Sep 17 00:00:00 2001 From: sfop Date: Tue, 30 Aug 2016 15:39:45 +0200 Subject: [PATCH] Closedown --- config/plugins.properties | 2 +- script/Alignment/Gun_solenoid_alignment.py | 3 ++- script/Alignment/Laser_gun_alignment.py | 7 ++++--- script/camtool.py | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/config/plugins.properties b/config/plugins.properties index 0aae8f9..87b041a 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1,5 +1,5 @@ Cameras.java=disabled LaserGunAlignment.java=enabled test2.java=disabled -GunSolenoidAlignment.java=enabled +GunSolenoidAlignment.java=disabled test.java=disabled diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index 643cce1..b69cc4a 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -28,7 +28,8 @@ if get_context().source == CommandSource.ui: else: centroid_excursion_plot = False -from camtool import CamTool +#from camtool import CamTool +run("camtool") from ImageStats import ImageStats, get_simulated_source diff --git a/script/Alignment/Laser_gun_alignment.py b/script/Alignment/Laser_gun_alignment.py index 4ca84a7..619e75d 100755 --- a/script/Alignment/Laser_gun_alignment.py +++ b/script/Alignment/Laser_gun_alignment.py @@ -27,9 +27,10 @@ if get_context().source == CommandSource.ui: else: centroid_excursion_plot = False -from camtool import CamTool -from ImageStats import ImageStats, get_simulated_source -from BpmStats import BpmStats +#from camtool import CamTool +run("camtool") +#from ImageStats import ImageStats, get_simulated_source +#from BpmStats import BpmStats multiple_background = multiple_background and use_background diff --git a/script/camtool.py b/script/camtool.py index 44dbfb7..dbf10fd 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -196,7 +196,7 @@ class CamTool(DeviceBase): """ if __name__ == "__builtin__": - camera_tool = CamTool("camtool", prefix = "SINEG01-DSCR190:", latch = False, camera = "SINEG01-DSCR190") + camera_tool = CamTool("camtool", prefix = "SINEG01-DSCR190:", latch = True, camera = "SINEG01-DSCR190") add_device(camera_tool, True) #camera_tool.enableBackground(False) camera_tool.enableBackground(False) @@ -210,4 +210,4 @@ if __name__ == "__builtin__": #camera_tool.enableBackground(True) #camera_tool.capture() #print camera_tool.take(), camera_tool.com_x.read(), camera_tool.com_y.read() -""" +""" \ No newline at end of file