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 c507113..d2087a4 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 @@ -9,14 +9,11 @@ ret = 'Test failed' status = False #DEVICE = 'PO2DV-NCS-LS' -print parameters - #get parameters from the calling interface +print parameters middle = parameters["midPoint"] loopTimes = parameters["repeatTimes"] span = parameters["spanFromMidPoint"] -print 'middle ' + str(middle) - #TODO: Set the diplay names of positioners and detectors #scan = ManualScan(['idX', 'idInkr'], ['idMotorStatus', 'idLogicalPosition', 'idDiameter', 'idMotorPosition', 'idPotiRaw', 'idPotiProc', 'idBtvsRaw', 'idBtvsProc', 'idDiff01', 'idDiff02'] , [-0.5, 0.0], [4.0, 3000.0], [3000, 20]) @@ -68,6 +65,7 @@ except: ret = 'Unable to create channel - ' + traceback.format_exc() success = False raise + set_return(32) sys.exit() #remove limits @@ -161,3 +159,5 @@ idBtvsProc.close() scan.end() ret = 'Slide moved back and forth (' + str(count) + ' runs)' status = True + +