diff --git a/script/tests/tests/Collimator Tests/Initialise/Initialise.py b/script/tests/tests/Collimator Tests/Initialise/Initialise.py index 8fe65f1..0ab0272 100644 --- a/script/tests/tests/Collimator Tests/Initialise/Initialise.py +++ b/script/tests/tests/Collimator Tests/Initialise/Initialise.py @@ -64,19 +64,8 @@ def startTest(testName, DEVICE, params): idInit = Channel(DEVICE+':INIT.PROC', type = 'l') idReady = Channel(DEVICE+':RDY', type = 'l') idInterlock = Channel(DEVICE+':ILK', type = 'l') - #ScalarDetector idMotorPosition - #idMotorPosition = Channel(DEVICE+':IST1:2', type = 'd') idMotorPosition = Channel(DEVICE+':MOTOR.RBV', type = 'd') - #ScalarDetector idEncoderPosition - #idEncoderPosition = Channel(DEVICE+':POSA:2', type = 'd') idEncoderPosition = Channel(DEVICE+':ENCODER', type = 'd') - #ScalarDetector idBtvsProc - #ScalarDetector idEndSwitchL - #idBtvsRaw = Channel(DEVICE+':IST3:1', type = 'd') - idEndSwitchL = Channel(DEVICE+':MOTOR.LLS', type = 'd') - #ScalarDetector idEndSwitchH - #idBtvsProc = Channel(DEVICE+':IST3:2', type = 'd') - idEndSwitchH = Channel(DEVICE+':MOTOR.HLS', type = 'd') except: ret = 'Unable to create channel - ' + traceback.format_exc() success = False @@ -103,9 +92,6 @@ def startTest(testName, DEVICE, params): detector6 = idEncoderPosition.get() ready = idReady.get() interlock = idInterlock.get() - #end switches - endH = idEndSwitchH.get() - endL = idEndSwitchL.get() #Manipulation idDiff01 a = detector4 b = detector6