From ca567989c1a106eb60a5996856502ee7064e4873 Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Mon, 15 Jun 2015 11:48:23 +0200 Subject: [PATCH] Script execution --- script/End-to-End.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/script/End-to-End.py b/script/End-to-End.py index 6cffe6b..f082dae 100644 --- a/script/End-to-End.py +++ b/script/End-to-End.py @@ -113,22 +113,22 @@ for setpoint1 in range(0, 6): b = detector6 count = setpoint1 idDiff01 = a-b - if endH>0.0 : + if endH>0.0 : #invert direction and swap start with end of translation end = startDefault start = readback2 - direction direction = -1.0 print 'End H switch, changing direction to ' + str(direction) scan.append ([setpoint2], [readback2], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, idDiff02, idDiff01]) - break - if endL>0.0 : - #invert direction and swap start with end of translation - end = endDefault - start = readback2 - direction - direction = 1.0 - print 'End L switch, changing direction to ' + str(direction) + break + if endL>0.0 : + #invert direction and swap start with end of translation + end = endDefault + start = readback2 - direction + direction = 1.0 + print 'End L switch, changing direction to ' + str(direction) scan.append ([setpoint2], [readback2], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, idDiff02, idDiff01]) - break + break #set limits back idLimitH.put(145.0, timeout=None)