From 04c9de7cb8b218cded172d53cbab04618b9afeca Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Mon, 22 Jun 2015 14:18:40 +0200 Subject: [PATCH] Script execution --- .../tests/Collimator Tests/Motor Test 2/Motor Test 2.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 242003e..e42511d 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 @@ -17,10 +17,10 @@ try: 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() + print "Could not retrieve testing parameters: ", sys.exc_info()[0] + ret = 'Could not retrieve testing parameters - ' + traceback.format_exc() success = False - raise Exception(20) + raise Exception('Could not retrieve testing parameters - ' + traceback.format_exc()) #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]) @@ -69,7 +69,7 @@ except: print "Unable to create channel:", sys.exc_info()[0] ret = 'Unable to create channel - ' + traceback.format_exc() success = False - raise Exception(20) + raise Exception('Unable to create channel - ' + traceback.format_exc()) #remove limits