From 31f0ac5e409e4a8217b085470bc8cd4e43e3e913 Mon Sep 17 00:00:00 2001 From: sfop Date: Tue, 30 Aug 2016 15:12:53 +0200 Subject: [PATCH] Closedown --- script/Alignment/Laser_gun_alignment.py | 4 ++-- script/camtool.py | 17 +++++++---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/script/Alignment/Laser_gun_alignment.py b/script/Alignment/Laser_gun_alignment.py index 8bb6498..f1e1507 100755 --- a/script/Alignment/Laser_gun_alignment.py +++ b/script/Alignment/Laser_gun_alignment.py @@ -10,7 +10,7 @@ import datetime -use_bpm = True +use_bpm = False if get_context().source == CommandSource.ui: phi1= 95.0 @@ -45,7 +45,7 @@ else: latch = True if get_device("image_stats") is None: print "Instantiating camtool" - add_device(CamTool("image_stats", prefix = "cam:", latch = latch, camera = "SINEG01-DSCR350"), True) + add_device(CamTool("image_stats", prefix = "SINEG01-DSCR190:", latch = latch, camera = "SINEG01-DSCR190"), True) if (latch): image_stats.start() #add_device(ImageStats("image_stats", get_simulated_source(image)), True) diff --git a/script/camtool.py b/script/camtool.py index 57721c9..152a6d2 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -192,21 +192,18 @@ class CamTool(DeviceBase): if __name__ == "__builtin__": - pass - """ camera_tool = CamTool("camtool", latch = False) add_device(camera_tool, True) - camera_tool.enableBackground(False) - #camera_tool.enableBackground(False) + #camera_tool.enableBackground(False) + camera_tool.enableBackground(False) #camera_tool.captureBackground(5) for i in range (100): camera_tool.capture() print camera_tool.take(), camera_tool.com_x.read(), camera_tool.com_y.read() #from camtool import CamTool - camera_tool = CamTool("camtool", latch = True) - add_device(camera_tool, True) - camera_tool.enableBackground(True) - camera_tool.capture() - print camera_tool.take(), camera_tool.com_x.read(), camera_tool.com_y.read() - """ + #camera_tool = CamTool("camtool", latch = True) + #add_device(camera_tool, True) + #camera_tool.enableBackground(True) + #camera_tool.capture() + #print camera_tool.take(), camera_tool.com_x.read(), camera_tool.com_y.read()