From 98e0eeaa73d52ee7f92ca3529ebef7b0bb0f92c8 Mon Sep 17 00:00:00 2001 From: sfop Date: Wed, 24 Aug 2016 15:42:09 +0200 Subject: [PATCH] Closedown --- script/Alignment/Gun_solenoid_alignment.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index d57092c..bde6e32 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -34,15 +34,14 @@ print "Parameters: ", I1, I2, dI, settling_time, plot_image, number_images, use_ plot_name = datetime.datetime.fromtimestamp(time.time()).strftime('%H%M%S') -""" + +latch = True if get_device("image_stats") is None: - print "Instantiating camtool" - latch = True + print "Instantiating camtool" add_device(CamTool("image_stats", prefix = "cam:", latch = latch, camera = "SINEG01-DSCR350"), True) - if (latch): - image_stats.start() -""" -add_device(ImageStats("image_stats", get_simulated_source(image)), True) +if (latch): + image_stats.start() +#add_device(ImageStats("image_stats", get_simulated_source(image)), True) image_stats.setNumberOfImages(max(number_images,1)) image_stats.enableBackground (use_background) @@ -89,8 +88,6 @@ try: finally: laser_off() -print "DONE" - image_stats.stop() @@ -109,7 +106,6 @@ gsa_log_msg = gsa_log_msg + "\n\n" + r.print() if do_elog: elog("Gun solenoid current scan", gsa_log_msg , get_plot_snapshots()) -print "Return", [r, hx, hy] set_return([r, hx, hy])