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 389e07d..49166e0 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 @@ -120,14 +120,14 @@ for setpoint1 in range(0, loopTimes): countSteps = countSteps + 1 print str(setpoint2) 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-1 ): + if endH>0.0 or (direction > 0.0 and setpoint2 >= end ): #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+1 ): + if endL>0.0 or ( direction < 0.0 and setpoint2 <= end ): #invert direction and swap start with end of translation end = endDefault start = setpoint2 - direction