From 022b495524b97829d08c258e421f6d5512f23e82 Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Thu, 18 Jun 2015 07:48:58 +0200 Subject: [PATCH] Script execution --- .../tests/tests/Collimator Tests/Motor Test 2/Motor Test 2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 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 55a8bbb..a114165 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 @@ -119,14 +119,14 @@ for setpoint1 in range(0, loopTimes): idDiff01 = a-b countSteps = countSteps + 1 scan.append ([countSteps], [countSteps], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, idDiff02, idDiff01]) - if endH>0.0 or readback2 >= end : + if endH>0.0 or (direction > 0 and readback2 >= end ): #invert direction and swap start with end of translation end = startDefault start = readback2 - direction direction = -1.0 print 'End of span, changing direction to ' + str(direction) break - if endL>0.0 or readback2 <= start: + if endL>0.0 or ( direction < 0 and readback2 <= start ): #invert direction and swap start with end of translation end = endDefault start = readback2 - direction