From 778850ae5514ed5cc73f0d9d7f23225d66de01a3 Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Thu, 18 Jun 2015 08:06:11 +0200 Subject: [PATCH] Script execution --- .../tests/Collimator Tests/Motor Test 2/Motor Test 2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py b/script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py index e233653..26edd8a 100644 --- a/script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py +++ b/script/tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py @@ -74,7 +74,7 @@ for setpoint1 in range(0, loopTimes): count = count + 1 sleep( 2 ) # Settling time #RegionPositioner idInkr - for setpoint2 in frange(start, end, direction): + for setpoint2 in frange(start, end, direction, true): readback1 = setpoint1 ################### beginning of C ################## idInkr = setpoint2 # idInkr.put(setpoint2, timeout=None) # TODO: Set appropriate timeout @@ -119,14 +119,14 @@ for setpoint1 in range(0, loopTimes): idDiff01 = a-b countSteps = countSteps + 1 scan.append ([countSteps], [countSteps], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, idDiff02, idDiff01]) - if endH>0.0 or (direction > 0.0 and setpoint2 >= end ): + if endH>0.0 or (direction > 0.0 and setpoint2 >= end-1 ): #invert direction and swap start with end of translation end = startDefault start = setpoint2 - direction direction = -1.0 print 'End of span (' + str(setpoint2) + '), changing direction to ' + str(direction) break - if endL>0.0 or ( direction < 0.0 and setpoint2 <= end ): + if endL>0.0 or ( direction < 0.0 and setpoint2 <= end+1 ): #invert direction and swap start with end of translation end = endDefault start = setpoint2 - direction