From ab883e787dd8af96539163da986eab4d316573c7 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Fri, 21 Jan 2022 11:25:47 +0100 Subject: [PATCH] Script execution --- script/optics/FrontEndBladeScan.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/optics/FrontEndBladeScan.py b/script/optics/FrontEndBladeScan.py index 933bcb04..8fbb9dbe 100644 --- a/script/optics/FrontEndBladeScan.py +++ b/script/optics/FrontEndBladeScan.py @@ -18,9 +18,9 @@ LATENCY = 1.0 DWELL = 1.0 def trig(): - wait_beam() caput("X03DA-OP-10ADC:TRG.PROC", 1) - + time.sleep(DWELL) + value = DWELL * 10.0 SampleCurrentAveraging.write(value) RefCurrentAveraging.write(value) @@ -43,13 +43,13 @@ POSITIONERS = (FrontendBladeUp) FrontendBladeUp.write(STARTPOS) FrontendBladeDown.write(-2.0) time.sleep(5.0) -lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) +lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig) POSITIONERS = (FrontendBladeDown) FrontendBladeDown.write(STARTPOS) FrontendBladeUp.write(+2.0) time.sleep(5.0) -lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) +lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig) FrontendHSize.write(2.0) FrontendVSize.write(2.0) @@ -63,13 +63,13 @@ POSITIONERS = (FrontendBladeRing) FrontendBladeRing.write(STARTPOS) FrontendBladeWall.write(-4.0) time.sleep(5.0) -lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) +lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig) POSITIONERS = (FrontendBladeWall) FrontendBladeWall.write(STARTPOS) FrontendBladeRing.write(+4.0) time.sleep(5.0) -lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) +lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig) FrontendHSize.write(0.0) FrontendVSize.write(0.0)