Closedown

This commit is contained in:
boccioli_m
2015-07-02 14:17:36 +02:00
parent efca88167d
commit c41ce07c69
4 changed files with 16 additions and 21 deletions

View File

@@ -184,7 +184,7 @@ def startTest(testName, DEVICE, params):
def sendFeedback(testPath, testName, DEVICE, returnString, testPassed):
print_log(testName, DEVICE, 'End of test. Result:')
print_log(testName, DEVICE, 'Test path: ' + testPath)
print_log(testName, DEVICE, 'Test name: ' + testName )
print_log(testName, DEVICE, 'Test name: ' + testName)
print_log(testName, DEVICE, 'Device: ' + DEVICE)
print_log(testName, DEVICE, 'Test passed: ' + str(testPassed))
print_log(testName, DEVICE, 'Return string: ' + returnString)
@@ -203,6 +203,3 @@ testName = test
params = parameters
#launch the test
startTest(testName, DEVICE, params)

View File

@@ -9,10 +9,9 @@ def startTest(testName, DEVICE, params):
#plot name to be given to the scan. Use: scan.setPlotName(plotName)
plotName = DEVICE + ' - ' + testName
###### WRITE YOUR CODE HERE BELOW #######
print 'testpath A: ' + testPath
print 'parameters:'
print params
print 'device: ' + DEVICE
print_log(testName, DEVICE, 'testpath A: ' + testPath )
print_log(testName, DEVICE, 'parameters: ' + str(params) )
print_log(testName, DEVICE, 'device: ' + DEVICE )
scan = ManualScan(['time'], ['SetV', 'ActualV', 'ActualI'] , [0.0], [30.0], [20])
scan.setPlotName(plotName)
scan.start()
@@ -41,7 +40,7 @@ def startTest(testName, DEVICE, params):
SetRamp.put(10.0, timeout=None)
#set voltage to 0
print 'Ramping down power supply A to 0V'
print_log(testName, DEVICE, 'Ramping down power supply A to 0V' )
SetV.put(0.0, timeout=None)
#wait up to 2 minutes for voltage to be ~0
@@ -53,7 +52,7 @@ def startTest(testName, DEVICE, params):
#Dimension 1
#LinearPositioner SetV
print 'Ramping up power supply A'
print_log(testName, DEVICE, 'Ramping up power supply A' )
for setpoint1 in frange(0.0, 20.0, 5.0, True):
if setpoint1 > 50.0 or setpoint1 < 0.0:
break

View File

@@ -9,10 +9,9 @@ def startTest(testName, DEVICE, params):
#plot name to be given to the scan. Use: scan.setPlotName(plotName)
plotName = DEVICE + ' - ' + testName
###### WRITE YOUR CODE HERE BELOW #######
print 'testpath B: ' + testPath
print 'parameters:'
print params
print 'device: ' + DEVICE
print_log(testName, DEVICE, 'testpath B: ' + testPath )
print_log(testName, DEVICE, 'parameters:' + str( params) )
print_log(testName, DEVICE, device: ' + DEVICE )
scan = ManualScan(['time'], ['SetVB', 'ActualVB', 'ActualIB'] , [0.0], [30.0], [20])
scan.setPlotName(plotName)
scan.start()
@@ -40,7 +39,7 @@ def startTest(testName, DEVICE, params):
SetRamp.put(10.0, timeout=None)
#set voltage to 0
print 'Ramping down power supply B to 0V'
print_log(testName, DEVICE, 'Ramping down power supply B to 0V')
SetVA.put(0.0, timeout=None)
#wait up to 2 minutes for voltage to be ~0
@@ -52,7 +51,7 @@ def startTest(testName, DEVICE, params):
#Dimension 1
#LinearPositioner SetVA
print 'Ramping up power supply'
print_log(testName, DEVICE, 'Ramping up power supply')
for setpoint1 in frange(0.0, 20.0, 5.0, True):
if setpoint1 > 50.0 or setpoint1 < 0.0:
break