From 19e2b3fb7768efcf0f6e06274121bfc61ac864ae Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 18 Nov 2021 11:57:44 +0100 Subject: [PATCH] Script execution --- script/ManipulatorYZFlyScan.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/script/ManipulatorYZFlyScan.py b/script/ManipulatorYZFlyScan.py index 81e93d63..19bc49c9 100644 --- a/script/ManipulatorYZFlyScan.py +++ b/script/ManipulatorYZFlyScan.py @@ -33,11 +33,9 @@ ManipulatorY.write(RANGE_Y[0]) # time per scienta acquisition in seconds trig_scienta() time1 = time.time() -before_readout() +trig_scienta() time2 = time.time() -before_readout() -time3 = time.time() -scienta_time = max((time2 - time1), (time3 - time2)) +scienta_time = (time2 - time1) print "scienta time: ", scienta_time # time for one Y scan in seconds @@ -59,9 +57,14 @@ def before_pass(index, scan): try: - cscan(MOTORS, SENSORS, RANGE_Y[0], RANGE_Y[1], STEPS_Y, time=fly_time, passes=len(positions_z), zigzag=ZIGZAG, before_read=before_readout, after_read = after_readout, before_pass = before_pass, check_positions = False) + #cscan(MOTORS, SENSORS, RANGE_Y[0], RANGE_Y[1], STEPS_Y, time=fly_time, passes=len(positions_z), zigzag=ZIGZAG, before_read=before_readout, after_read = after_readout, before_pass = before_pass, check_positions = False) + + Scienta.setGrabMode('Continuous') + cscan(MOTORS, SENSORS, RANGE_Y[0], RANGE_Y[1], STEPS_Y, time=fly_time, passes=len(positions_z), zigzag=ZIGZAG, before_pass=before_pass, check_positions=False) finally: + Scienta.setGrabMode('Single') + if ENDSCAN: after_scan() \ No newline at end of file