From 72ce3d3f1c3d64169c83df3e9c457847e1212380 Mon Sep 17 00:00:00 2001 From: sfop Date: Tue, 30 Aug 2016 17:19:09 +0200 Subject: [PATCH] Closedown --- config/plugins.properties | 2 +- script/Alignment/Gun_solenoid_alignment.py | 9 +++++---- script/Alignment/Laser_gun_alignment.py | 9 +++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/config/plugins.properties b/config/plugins.properties index 87b041a..0aae8f9 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1,5 +1,5 @@ Cameras.java=disabled LaserGunAlignment.java=enabled test2.java=disabled -GunSolenoidAlignment.java=disabled +GunSolenoidAlignment.java=enabled test.java=disabled diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index 0b9213c..e6531d0 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -45,9 +45,9 @@ if (use_bpm): multiple_background = False else: latch = True - if get_device("image_stats") is None: - print "Instantiating camtool" - add_device(CamTool("image_stats", prefix = "SINEG01-DSCR190:", latch = latch, camera = "SINEG01-DSCR190"), True) + #if get_device("image_stats") is None: + print "Instantiating camtool" + 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) @@ -95,7 +95,8 @@ try: sensors.append(image_stats.image) r = lscan(gun_solenoid, sensors , I1, I2, dI, settling_time, before_read = before_sample, after_read = after_sample) finally: - laser_off() + #laser_off() + pass image_stats.stop() diff --git a/script/Alignment/Laser_gun_alignment.py b/script/Alignment/Laser_gun_alignment.py index 619e75d..909a548 100755 --- a/script/Alignment/Laser_gun_alignment.py +++ b/script/Alignment/Laser_gun_alignment.py @@ -44,9 +44,9 @@ if (use_bpm): multiple_background = False else: latch = True - if get_device("image_stats") is None: - print "Instantiating camtool" - add_device(CamTool("image_stats", prefix = "SINEG01-DSCR190:", latch = latch, camera = "SINEG01-DSCR190"), True) + #if get_device("image_stats") is None: + print "Instantiating camtool" + 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) @@ -94,7 +94,8 @@ try: sensors.append(image_stats.image) r = lscan(gun_phase, sensors , phi1, phi2, dphi, settling_time, before_read = before_sample, after_read = after_sample) finally: - laser_off() + pass + #laser_off() image_stats.stop()