diff --git a/script/ManipulatorXYScan.py b/script/ManipulatorXYScan.py index 53173f4e..b924d14e 100644 --- a/script/ManipulatorXYScan.py +++ b/script/ManipulatorXYScan.py @@ -10,11 +10,11 @@ import math # adjust the following parameters DISTANCE = 5.0 -ANGLE = -30.0 # move sample across beam -#ANGLE = 60.0 # move sample along beam +#ANGLE = -30.0 # move sample across beam +ANGLE = 60.0 # move sample along beam STEPS = 10 -LATENCY = 1.0 -ENDSCAN = False +LATENCY = 0.1 +ENDSCAN = True # do not edit below # TODO: check signs! @@ -22,7 +22,7 @@ DISTANCE_X = DISTANCE * math.cos(math.radians(ANGLE)) DISTANCE_Y = DISTANCE * math.sin(math.radians(ANGLE)) MOTOR = (ManipulatorX, ManipulatorY) -SENSORS = (Counts, SampleCurrent, RefCurrent, AuxCurrent, MachineCurrent, EnergyDistribution, AngleDistribution) +SENSORS = (Counts, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution) STARTPOS = (-DISTANCE_X / 2.0, -DISTANCE_Y / 2.0) ENDPOS = (DISTANCE_X / 2.0, DISTANCE_Y / 2.0) RELATIVE = True