From 020a5aa320ec4dd9f2cef11887d07913c6ae39f0 Mon Sep 17 00:00:00 2001 From: x03daop Date: Wed, 3 Aug 2016 17:55:14 +0200 Subject: [PATCH] Script execution --- script/FocusYRotScan.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/FocusYRotScan.py b/script/FocusYRotScan.py index 6942dbd1..200f4362 100644 --- a/script/FocusYRotScan.py +++ b/script/FocusYRotScan.py @@ -13,8 +13,8 @@ STEPS = 40 LATENCY = 0.5 ENDSCAN = False -MOTORS = [FocusYRot] -SENSORS = [Counts, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution, OpticsCameraCentroidX, OpticsCameraSigmaX] +MOTORS = (FocusYRot) +SENSORS = (Counts, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution, OpticsCameraCentroidX, OpticsCameraSigmaX) STARTPOS = (-DISTANCE / 2.0) ENDPOS = (DISTANCE / 2.0) RELATIVE = True @@ -28,7 +28,7 @@ def trig_sensors(): caput("X03DA-OP-10ADC:TRG.PROC", 1) try: - lscan(MOTORS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, before_read=trig_sensors, after_read = after_readout) + lscan(MOTORS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, before_read=before_readout, after_read = after_readout) finally: if ENDSCAN: after_scan()