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 f242ddf..8abae64 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 @@ -79,17 +79,17 @@ for setpoint1 in range(0, loopTimes): #RegionPositioner idInkr for setpoint2 in frange(start, end, direction): readback1 = setpoint1 - ################### beginning of C ################## -i idInkr = setpoint2 # idInkr.put(setpoint2, timeout=None) # TODO: Set appropriate timeout + ################### beginning of C ################## + idInkr = setpoint2 # idInkr.put(setpoint2, timeout=None) # TODO: Set appropriate timeout sleep( 0.2 ) # Settling time readback2 = idInkr # readback2 = idInkr.get() - ################### end of C ################## -i if abs(readback2 - setpoint2) > 1 : # TODO: Check accuracy + ################### end of C ################## + if abs(readback2 - setpoint2) > 1 : # TODO: Check accuracy ret = 'Actor idInkr could not be set to the value ' + str(setpoint2) + ' (current value: ' + str(readback2) + ')' success = False raise Exception(ret) #Detector idMotorStatus - ################### beginning of D ################## + ################### beginning of D ################## detector1 = idMotorStatus #Detector idLogicalPosition detector2 = idLogicalPosition @@ -108,7 +108,7 @@ i if abs(readback2 - setpoint2) > 1 : # TODO: Check accuracy #end switches endH = idEndSwitchH endL = idEndSwitchL - ################### end of D ################## + ################### end of D ################## #Manipulation idDiff02 #Variable Mappings a = detector4