From b4cbed1ee472deff861428a1dffedf9cd4284d91 Mon Sep 17 00:00:00 2001 From: x07maop Date: Thu, 7 Apr 2016 15:25:41 +0200 Subject: [PATCH] Closedown --- script/HystScan.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/script/HystScan.py b/script/HystScan.py index 6cfbfcb..1ef296b 100644 --- a/script/HystScan.py +++ b/script/HystScan.py @@ -29,7 +29,8 @@ if RAMP_RATE is not None: if len(ENERGIES) ==2: - dif_series = plot([],"Dif", context="Dif")[0].getSeries(0) + # dif_series = plot([],"Dif", context="Dif")[0].getSeries(0) + dif_series = plot([],"Dif")[0].getSeries(0) else: dif_series = None @@ -47,10 +48,10 @@ if abs(field.readback.read() - START_FIELD) > FIELD_PRECISION: field.write(START_FIELD) -wait_device(field_done, 1) #ramp_done.wait_for_value(1.0) +#wait_device(field_done, 1) #ramp_done.wait_for_value(1.0) wait_device(pol_done, "DONE") -open(2.0) +#open(2.0) print "Set end field" field.write(END_FIELD) #caputq('X07MA-PC-PS2:M:GO.A', END_FIELD) @@ -80,7 +81,7 @@ while(True): detector3 = signal_trans.read() #trans.get() detector4 = float(pol_mode.getPositions().index(pol_mode.readback.read())) #polarization.get() detector5 = pol_angle.read() #polAngle.get() - detector6 = temperature.read() #temperature.get() + detector6 = temperature_readback.read() #temperature.get() detector7 = current.read() detector8 = signal_field_analog_x.read() # fieldAnalogX.get()