From 3f4dfddc45041d9784a9600ff35b7f8cf3d117b3 Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Wed, 20 May 2015 16:24:00 +0200 Subject: [PATCH] Script execution --- script/Marco/power-supply.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/Marco/power-supply.py b/script/Marco/power-supply.py index edf852a..427effd 100644 --- a/script/Marco/power-supply.py +++ b/script/Marco/power-supply.py @@ -28,13 +28,13 @@ for setpoint1 in frange(0.0, 120.0, 1.0, True): #Dimension 1 #LinearPositioner SetVA for setpoint1 in frange(0.0, 50.0, 5.0, True): - if setpoint1 > 50.0 or setpoint1 < 0.0: + if setpoint1 > 50.0 or setpoint1 < 0.0: break SetVA.put(setpoint1, timeout=None) # TODO: Set appropriate timeout readback1 = SetVA.get() if abs(readback1 - setpoint1) > 0.5 : # TODO: Check accuracy raise Exception('Actor SetVA could not be set to the value ' + str(setpoint1)) - for setpoint2 in frange(0.0, 40.0, 1.0, True): + for setpoint2 in frange(0.0, 50.0, 1.0, True): #Detector time detector1 = float(java.lang.System.currentTimeMillis()) #Detector ActualVA