From f964d9f740d5c09ff21b0544d33c1c6b6928f316 Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Mon, 22 Jun 2015 10:28:22 +0200 Subject: [PATCH] Script execution --- .../Collimator Tests/Motor Test 2/Motor Test 2.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 3c48ad6..a54f940 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 @@ -11,6 +11,12 @@ status = False print parameters +#get parameters from the calling interface +middle = parameters["midPoint"] +loopTimes = parameters["repeatTimes"] +span = parameters["spanFromMidPoint"] + + #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]) @@ -68,12 +74,6 @@ except: idLimitH.put(999999.9, timeout=None) idLimitL.put(-999999.9, timeout=None) - -#get parameters from the calling interface -middle = parameters["midPoint"] -loopTimes = parameters["repeatTimes"] -span = parameters["spanFromMidPoint"] - print 'middle ' + middle direction = 1.0 startDefault = middle - span