From fd12166098d59ee81904baca475cddfaec512784 Mon Sep 17 00:00:00 2001 From: sfop Date: Tue, 30 Aug 2016 17:11:07 +0200 Subject: [PATCH] Closedown --- script/Alignment/Gun_solenoid_alignment.py | 2 +- script/camtool.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index b69cc4a..0b9213c 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -47,7 +47,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 4e47584..8574fec 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -198,19 +198,20 @@ class CamTool(DeviceBase): self.bg_capture_remain.close() #self.image.close() - +""" if __name__ == "__builtin__": 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) #camera_tool.captureBackground(5) - for i in range (100): + for i in range (1000): camera_tool.capture() - print camera_tool.take(), camera_tool.com_x.read(), camera_tool.com_y.read() + print i, 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() +""" \ No newline at end of file