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 49166e0..2128d29 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 @@ -60,7 +60,7 @@ middle = 40.0 span = 10.0 startDefault = middle - span endDefault = middle + span -end = endDefault +end = endDefault+1 #find position: it will be the middle point of the test loopTimes = 3 ################### beginning of B ################## @@ -122,14 +122,14 @@ for setpoint1 in range(0, loopTimes): 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 ): #invert direction and swap start with end of translation - end = startDefault + end = startDefault-1 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 ): #invert direction and swap start with end of translation - end = endDefault + end = endDefault+1 start = setpoint2 - direction direction = 1.0 print 'End of span (' + str(setpoint2) + '), changing direction to ' + str(direction)