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 37bad50..242003e 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 @@ -10,13 +10,18 @@ status = False #DEVICE = 'PO2DV-NCS-LS' #get parameters from the calling interface -print parameters -print 'midpoint: ' + parameters["midPoint"]["value"] -middle = parameters["midPoint"] -loopTimes = parameters["repeatTimes"] -span = parameters["spanFromMidPoint"] +try: + print "Running test with the following parameters:" + print parameters + middle = parameters["midPoint"] + loopTimes = parameters["repeatTimes"] + span = parameters["spanFromMidPoint"] +except: + print "Unable to retrieve testing parameters: ", sys.exc_info()[0] + ret = 'Unable to retrieve testing parameters - ' + traceback.format_exc() + success = False + raise Exception(20) -#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]) scan = ManualScan(['idX'], ['idMotorStatus', 'idLogicalPosition', 'idDiameter', 'idMotorPosition', 'idPotiRaw', 'idPotiProc', 'idBtvsRaw', 'idBtvsProc', 'idDiff01', 'idDiff02'] , [ 0.0], [ 3000.0], [20]) scan.start()