pshell_config/ncs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tried adding LDAP information for contact user. Failed.

Browse Source 
Added copyright info.
This commit is contained in:
boccioli_m
2015-09-16 11:26:26 +02:00
parent ce5969b2b9
commit 041b5e2b62
8 changed files with 248 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
script/tests/tests/Collimator Tests pro/Monitor Movement/Monitor Movement.py
View File

@@ -42,10 +42,10 @@ def startTest(testName, DEVICE, params):
try:
idCom = Channel(DEVICE+':COM:2' , type = 'd') #current position as from motor step counter [mm]
idMotorPosition = Channel(DEVICE+':IST3:2', type = 'd') #current position as from motor step counter [mm]
idPotiPosFromBeam = Channel(DEVICE+':IST1:2', type = 'd') #current position from beam as from potentiometer [mm]
#idPotiPosFromBeam = Channel(DEVICE+':IST1:2', type = 'd') #current position from beam as from potentiometer [mm]
idPotiPosition = Channel(DEVICE+':IST2:1', type = 'd') #current position as from potentiometer [mm]
idPotiRef1Position = Channel(DEVICE+':REF1:1', type = 'd') #R1 position as from potentiometer [mm]
idPotiRef2Position = Channel(DEVICE+':REF2:1', type = 'd') #R2 position as from potentiometer [mm]
#idPotiRef1Position = Channel(DEVICE+':REF1:1', type = 'd') #R1 position as from potentiometer [mm]
#idPotiRef2Position = Channel(DEVICE+':REF2:1', type = 'd') #R2 position as from potentiometer [mm]
except:
test.sendFeedback( 'Unable to create channel - ' + traceback.format_exc(), False)
@@ -63,10 +63,10 @@ def startTest(testName, DEVICE, params):
currentTime = float(java.lang.System.currentTimeMillis())
motorPosition = idMotorPosition.get()
potiPosFromBeam = idPotiPosFromBeam.get()
#potiPosFromBeam = idPotiPosFromBeam.get()
potiPosision = idPotiPosition.get()
potiRef1Position = idPotiRef1Position.get()
potiRef2Position = idPotiRef2Position.get()
#potiRef1Position = idPotiRef1Position.get()
#potiRef2Position = idPotiRef2Position.get()
diff1 = motorPosition-potiPosision
scan.append ([currentTime], [currentTime], [motorPosition, potiPosision, diff1])
sleep( samplePeriod ) # Settling time
@@ -79,7 +79,6 @@ def startTest(testName, DEVICE, params):
idPotiPosition.close()
idPotiRef1Position.close()
idPotiRef2Position.close()
test.log( 'End of Monitoring')
ret = 'End of Monitoring'
success = True