From 6e1aa6ba0e7c88aa8e2ccca338a895df599c6626 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 8 Feb 2018 14:59:21 +0100 Subject: [PATCH] Script execution --- script/test/HoloFlyScan.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/script/test/HoloFlyScan.py b/script/test/HoloFlyScan.py index 7486f359..f2007816 100644 --- a/script/test/HoloFlyScan.py +++ b/script/test/HoloFlyScan.py @@ -33,7 +33,7 @@ set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) time1 = time.time() trig_scienta() time2 = time.time() -scienta_time = (time2 - time1) * 1.01 + 5.0 +scienta_time = (time2 - time1) + 1.0 print "scienta_time: ", scienta_time # time for one theta scan in seconds @@ -51,8 +51,11 @@ try: print "phi = ", phi ManipulatorPhi.waitValueInRange(phi, 1.0, 100) print time.time(), " cscan: start" - cscan(ManipulatorTheta, SENSORS, THETA_RANGE[0], THETA_RANGE[1], THETA_NSTEPS, time=theta_time, before_read=before_readout, after_read = after_readout) - print time.time(), " cscan: end" + try: + cscan(ManipulatorTheta, SENSORS, THETA_RANGE[0], THETA_RANGE[1], THETA_NSTEPS, time=theta_time, before_read=before_readout, after_read = after_readout) + print time.time(), " cscan: end" + except ContinuousScanFollowingErrorException: + print time.time(), " cscan: exception" if ZIGZAG: THETA_RANGE = (THETA_RANGE[1], THETA_RANGE[0])