From 6c9dc5f2f2990929458d6e87ca74aad4a031bd3f Mon Sep 17 00:00:00 2001 From: x03daop Date: Sat, 10 Sep 2016 11:06:15 +0200 Subject: [PATCH] Script execution --- script/RefocusYManipulatorZScan.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/script/RefocusYManipulatorZScan.py b/script/RefocusYManipulatorZScan.py index b33add89..637b6e91 100644 --- a/script/RefocusYManipulatorZScan.py +++ b/script/RefocusYManipulatorZScan.py @@ -10,17 +10,15 @@ move manipulator and mirror to center position before start! import math # adjust the following parameters -STEPS = 25 +STEPS = 20 LATENCY = 0.0 ENDSCAN = False -# do not edit below - -MOTOR = (RefocusYTrans, ManipulatorZ) +MOTORS = (RefocusYTrans, ManipulatorZ) SENSORS = (Counts, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution) -STARTPOS = (9.260, 115.1) -ENDPOS = (9.160, 115.3) +STARTPOS = (9.060, 115.55) +ENDPOS = (9.460, 114.90) RELATIVE = False adjust_sensors() @@ -28,8 +26,8 @@ set_adc_averaging() def trig_sensors(): wait_beam() - trig_scienta() caput("X03DA-OP-10ADC:TRG.PROC", 1) + trig_scienta() try: lscan(MOTOR, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, before_read=trig_sensors, after_read = after_readout)