From 1a98827f79797d924dabe7e8d4da974f6173e628 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 8 Feb 2018 11:35:06 +0100 Subject: [PATCH] Script execution --- script/ManipulatorYZScan.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/script/ManipulatorYZScan.py b/script/ManipulatorYZScan.py index f482be47..df62802c 100644 --- a/script/ManipulatorYZScan.py +++ b/script/ManipulatorYZScan.py @@ -9,17 +9,17 @@ move manipulator to center position before start! import math -STEPS = (8, 8) +STEPS = (3, 3) LATENCY = 0.0 ENDSCAN = False -ZIGZAG = False +ZIGZAG = True -# do not edit below MOTORS = (ManipulatorY, ManipulatorZ) -SENSORS = (Counts,Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution) -STARTPOS = (-0.50-0.5, 115.20-0.5) -ENDPOS = (-0.50+0.5, 115.20+0.5) -RELATIVE = False +SENSORS = (Counts, Scienta.spectrum, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution) +#SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution) +STARTPOS = (-0.5, -0.5) +ENDPOS = (+0.5, +0.5) +RELATIVE = True adjust_sensors() set_adc_averaging() @@ -29,4 +29,5 @@ try: ascan(MOTORS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, RELATIVE, zigzag = ZIGZAG, before_read=before_readout, after_read = after_readout) finally: if ENDSCAN: - after_scan() \ No newline at end of file + after_scan() + \ No newline at end of file