From 1bcd51d1844878b2a4561dcd6be741cccd7f9273 Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Wed, 20 May 2015 15:54:08 +0200 Subject: [PATCH] Script execution --- script/Marco/power-supply.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/script/Marco/power-supply.py b/script/Marco/power-supply.py index f9f9c31..1c7f662 100644 --- a/script/Marco/power-supply.py +++ b/script/Marco/power-supply.py @@ -34,12 +34,13 @@ for setpoint1 in frange(0.0, 50.0, 2.0, True): 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)) - sleep( 1.0 ) # Settling time - #Detector time - detector1 = float(java.lang.System.currentTimeMillis()) - #Detector ActualVA - detector2 = ActualVA.get() - scan.append ([setpoint1], [readback1], [detector1, detector2]) + for setpoint1 in frange(0.0, 10.0, 1.0, True): + sleep( 0.1 ) # Settling time + #Detector time + detector1 = float(java.lang.System.currentTimeMillis()) + #Detector ActualVA + detector2 = ActualVA.get() + scan.append ([setpoint1], [readback1], [detector1, detector2]) #Closing channels SetVA.close()