diff --git a/script/develop/ManipulatorYZFlyScan.py b/script/develop/ManipulatorYZFlyScan.py index 3028c187..195d8247 100644 --- a/script/develop/ManipulatorYZFlyScan.py +++ b/script/develop/ManipulatorYZFlyScan.py @@ -13,6 +13,7 @@ SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent RANGE_Y = (-5., +5) RANGE_Z = (114., 116.) STEPS_Y = 20 +SPEED_Y = 0.1 STEPS_Z = 2 RELATIVE = False LATENCY = 0.0 @@ -33,10 +34,11 @@ scienta_time = (time2 - time1) print "scienta_time: ", scienta_time # time for one Y scan in seconds -speed = (RANGE_Y[1] - RANGE_Y[0]) / scienta_time / STEPS_Y -speed = min(max(speed, ManipulatorY.getMinSpeed()), ManipulatorY.getMaxSpeed()) -STEPS_Y = (RANGE_Y[1] - RANGE_Y[0]) / scienta_time / speed -fly_time = scienta_time * STEPS_Y +fly_time = (RANGE_Y[1] - RANGE_Y[0]) / SPEED_Y +#speed = (RANGE_Y[1] - RANGE_Y[0]) / scienta_time / STEPS_Y +#speed = min(max(speed, ManipulatorY.getMinSpeed()), ManipulatorY.getMaxSpeed()) +STEPS_Y = int(fly_time / scienta_time) + 1 +#fly_time = scienta_time * STEPS_Y print "Y time: ", fly_time STEP_Z = (RANGE_Z[1] - RANGE_Z[0]) / STEPS_Z