diff --git a/plugins/TestingList.java b/plugins/TestingList.java index 108b222..a553ea0 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -834,6 +834,7 @@ public class TestingList extends Panel { reloadTests(); try { cleanTests(); + cleanTests(); } catch (IOException ex) { Logger.getLogger(TestingList.class.getName()).log(Level.SEVERE, null, ex); } @@ -861,6 +862,7 @@ public class TestingList extends Panel { reloadTests(); try { cleanTests(); + cleanTests(); } catch (IOException ex) { Logger.getLogger(TestingList.class.getName()).log(Level.SEVERE, null, ex); } diff --git a/script/tests/tests/Collimator Tests pro/Monitor Movement/Monitor Movement.py b/script/tests/tests/Collimator Tests pro/Monitor Movement/Monitor Movement.py index 5aff1bc..de14f4a 100644 --- a/script/tests/tests/Collimator Tests pro/Monitor Movement/Monitor Movement.py +++ b/script/tests/tests/Collimator Tests pro/Monitor Movement/Monitor Movement.py @@ -49,14 +49,11 @@ def startTest(testName, DEVICE, params): except: test.sendFeedback( 'Unable to create channel - ' + traceback.format_exc(), False) - #raise Exception('Unable to create channel - ' + traceback.format_exc()) return - #monitorTime=40 #seconds + test.log( 'Monitoring movement for ' + str(monitorTime) + 's') #scan quickly the output during some seconds - potiPosision = idPotiPosition.get() - potiRef2Position = idPotiRef2Position.get() timeElapsed=0 while timeElapsed<(monitorTime*10): #Detector time @@ -64,21 +61,21 @@ def startTest(testName, DEVICE, params): motorPosition = idMotorPosition.get() #potiPosFromBeam = idPotiPosFromBeam.get() - potiPosision = idPotiPosition.get() + potiPosition = idPotiPosition.get() #potiRef1Position = idPotiRef1Position.get() #potiRef2Position = idPotiRef2Position.get() - diff1 = motorPosition-potiPosision - scan.append ([currentTime], [currentTime], [motorPosition, potiPosision, diff1]) + diff1 = motorPosition-potiPosition + scan.append ([currentTime], [currentTime], [motorPosition, potiPosition, diff1]) sleep( samplePeriod ) # Settling time timeElapsed=timeElapsed+1 #Closing channels idCom.close() idMotorPosition.close() - idPotiPosFromBeam.close() + #idPotiPosFromBeam.close() idPotiPosition.close() - idPotiRef1Position.close() - idPotiRef2Position.close() + #idPotiRef1Position.close() + #idPotiRef2Position.close() ret = 'End of Monitoring' success = True