From a25f1d36297d46daf62e63822808f8db134ae218 Mon Sep 17 00:00:00 2001
From: boccioli_m <boccioli_m@PC11577.psi.ch>
Date: Mon, 22 Jun 2015 10:57:08 +0200
Subject: [PATCH] Script execution

---
 .../Motor Test 2/Motor Test 2.py              | 90 +++++++++----------
 1 file changed, 45 insertions(+), 45 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 b165bea..174d01e 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	
@@ -22,52 +22,51 @@ scan.start()
 
 #Creating channels: dimension 1
 try:
-	#RegionPositioner idInkr
-	#idInkr = Channel(DEVICE+':INKR:2', type = 'd')
-	idInkr = Channel(DEVICE+':MOTOR.VAL', type = 'd')
-	#ScalarDetector idMotorStatus
-	#idMotorStatus = Channel(DEVICE+':STA:1', type = 'd')
-	idMotorStatus = Channel(DEVICE+':MOTOR.MSTA', type = 'd')
-	#ScalarDetector idLogicalPosition
-	#idLogicalPosition = Channel(DEVICE+':IST:2', type = 'd')
-	idLogicalPosition = Channel(DEVICE+':MOTOR.RVAL', type = 'd')
-	#ScalarDetector idDiameter
-	#idDiameter = Channel(DEVICE+':DIAM:2', type = 'd')
-	idDiameter = Channel(DEVICE+':ENCODERoff', type = 'd')
-	#ScalarDetector idMotorPosition
-	#idMotorPosition = Channel(DEVICE+':IST1:2', type = 'd')
-	idMotorPosition = Channel(DEVICE+':MOTOR.RBV', type = 'd')
-	#ScalarDetector idPotiRaw
-	#idPotiRaw = Channel(DEVICE+':POSA:1', type = 'd')
-	idPotiRaw = Channel(DEVICE+':ENCODERraw', type = 'd')
-	#ScalarDetector idPotiProc
-	#idPotiProc = Channel(DEVICE+':POSA:2', type = 'd')
-	idPotiProc = Channel(DEVICE+':ENCODER', type = 'd')
-	#ScalarDetector idBtvsRaw
-	#idBtvsRaw = Channel(DEVICE+':IST3:1', type = 'd')
-	idBtvsRaw = Channel(DEVICE+':MOTOR.LLS', type = 'd')
-	#ScalarDetector idBtvsProc
-	#idBtvsProc = Channel(DEVICE+':IST3:2', type = 'd')
-	idBtvsProc = Channel(DEVICE+':MOTOR.HLS', type = 'd')
-	#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')
-	#high position limit
-	idLimitH = Channel(DEVICE+':MOTOR.HLM', type = 'd')
-	#low position limit
-	idLimitL = Channel(DEVICE+':MOTOR.LLM', type = 'd')
-
+    #RegionPositioner idInkr
+    #idInkr = Channel(DEVICE+':INKR:2', type = 'd')
+    idInkr = Channel(DEVICE+':MOTOR.VAL', type = 'd')
+    #ScalarDetector idMotorStatus
+    #idMotorStatus = Channel(DEVICE+':STA:1', type = 'd')
+    idMotorStatus = Channel(DEVICE+':MOTOR.MSTA', type = 'd')
+    #ScalarDetector idLogicalPosition
+    #idLogicalPosition = Channel(DEVICE+':IST:2', type = 'd')
+    idLogicalPosition = Channel(DEVICE+':MOTOR.RVAL', type = 'd')
+    #ScalarDetector idDiameter
+    #idDiameter = Channel(DEVICE+':DIAM:2', type = 'd')
+    idDiameter = Channel(DEVICE+':ENCODERoff', type = 'd')
+    #ScalarDetector idMotorPosition
+    #idMotorPosition = Channel(DEVICE+':IST1:2', type = 'd')
+    idMotorPosition = Channel(DEVICE+':MOTOR.RBV', type = 'd')
+    #ScalarDetector idPotiRaw
+    #idPotiRaw = Channel(DEVICE+':POSA:1', type = 'd')
+    idPotiRaw = Channel(DEVICE+':ENCODERraw', type = 'd')
+    #ScalarDetector idPotiProc
+    #idPotiProc = Channel(DEVICE+':POSA:2', type = 'd')
+    idPotiProc = Channel(DEVICE+':ENCODER', type = 'd')
+    #ScalarDetector idBtvsRaw
+    #idBtvsRaw = Channel(DEVICE+':IST3:1', type = 'd')
+    idBtvsRaw = Channel(DEVICE+':MOTOR.LLS', type = 'd')
+    #ScalarDetector idBtvsProc
+    #idBtvsProc = Channel(DEVICE+':IST3:2', type = 'd')
+    idBtvsProc = Channel(DEVICE+':MOTOR.HLS', type = 'd')
+    #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')
+    #high position limit
+    idLimitH = Channel(DEVICE+':MOTOR.HLM', type = 'd')
+    #low position limit
+    idLimitL = Channel(DEVICE+':MOTOR.LLM', type = 'd')
 except:
-	print "Unable to create channel:", sys.exc_info()[0]
-	ret = 'Unable to create channel - ' + traceback.format_exc()
-	success = False
+    print "Unable to create channel:", sys.exc_info()[0]
+    ret = 'Unable to create channel - ' + traceback.format_exc()
+    success = False
     set_return(32)
-	raise Exception("")
+    raise Exception("")
 
-#remove limits	
+#remove limits    
 idLimitH.put(999999.9, timeout=None)
 idLimitL.put(-999999.9, timeout=None)
 
@@ -113,7 +112,7 @@ for setpoint1 in range(0, loopTimes):
         #end switches
         endH = idEndSwitchH.get()
         endL = idEndSwitchL.get()
-        #Manipulation idDiff02	
+        #Manipulation idDiff02    
         #Variable Mappings
         a =  detector4
         b =  detector8
@@ -154,10 +153,11 @@ idPotiRaw.close()
 idPotiProc.close()
 idBtvsRaw.close()
 idBtvsProc.close()
-		
+        
 scan.end()
 ret = 'Slide moved back and forth (' + str(count) + ' runs)'
 status = True
 set_return(24)
 
 
+