From 7cd9491567ec2e1933ad1f14594a66b42ec5d0e7 Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 21 Jun 2016 18:11:17 +0200 Subject: [PATCH] Script execution --- script/HystScan.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/script/HystScan.py b/script/HystScan.py index 6591d90..f8aa51c 100644 --- a/script/HystScan.py +++ b/script/HystScan.py @@ -26,7 +26,7 @@ if OFFSET is not None: caputq('X07MA-PC:CSCALER.INPB', '1') if RAMP_RATE is not None: ramp_rate.write(RAMP_RATE) - ramp_rate.waitValue(RAMP_RATE,10000) + ramp_rate.waitInPosition(RAMP_RATE,10000) @@ -58,16 +58,19 @@ print "Set end field" field.write(END_FIELD) #caputq('X07MA-PC-PS2:M:GO.A', END_FIELD) - +if len (ENERGIES)==1: + energy.write(setpoint2) + sleep( ENERGY_CHANGE_SLEEP ) # Settling time index = 0 while(True): #Dimension 2START_FIELD = -0.2 - #ArrayPositioner Energy + #ArrayPositioner Energy for setpoint2 in ENERGIES: - #Energy.put(setpoint2, timeout=None) # TODO: Set appropriate timeout - energy.write(setpoint2) - sleep( ENERGY_CHANGE_SLEEP ) # Settling time + if len (ENERGIES)>1: + #Energy.put(setpoint2, timeout=None) # TODO: Set appropriate timeout + energy.write(setpoint2) + sleep( ENERGY_CHANGE_SLEEP ) # Settling time #TODO: change to Controlled variable? readback2 = energy_readback.read() #EnergyReadback.get() @@ -107,5 +110,5 @@ scan.end() if RAMP_RATE is not None: ramp_rate.write(2.0) - time.sleep(5.0) + ramp_rate.waitInPosition(2.0,10000)