From 8a9c50c20f2d25e89ceaed7b1eebe5572f9d3ca8 Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 1 Mar 2016 14:49:18 +0100 Subject: [PATCH] Script execution --- script/HystScanStep.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/script/HystScanStep.py b/script/HystScanStep.py index d5cef54..0b20d51 100644 --- a/script/HystScanStep.py +++ b/script/HystScanStep.py @@ -1,7 +1,7 @@ #Parameters """ FIELD = "Hx" -RANGES = [(-0.1, 0.1, 0,2),] +RANGES = [(-0.1, 0.1, 0.1),] ENERGIES = (707.90, 703.90) ENERGY_CHANGE_SLEEP = 0.5 FIELD_CHANGE_SLEEP = 22.0 @@ -15,13 +15,13 @@ field = field_z if FIELD == "Hz" else field_x field_setpoint = Channel (field.channelName, 'd') #Not using energy device to have a blocking write #Pre-actions -wait_beam() +#wait_beam() if MODE is not None: pol_mode.write(MODE) if OFFSET is not None: pol_offset.write(OFFSET) #caput('X07MA-ID:ENERGY-OFFS', OFFSET) -pol_done.waitValue("DONE") +#pol_done.waitValue("DONE", -1) scan = ManualScan(['field', 'Energy'], ['TEY', 'I0', 'trans', 'polarization', 'polAngle', 'temperature', 'RingCurrent', 'fieldAnalogX', 'tey_norm'] , [0.0, 630.0], [0.1, 638.46], [44, 1]) scan.start() @@ -36,17 +36,18 @@ EnergyReadback = Channel('X07MA-PGM:CERBK', type = 'd') setpoints = [] for r in RANGES: setpoints = setpoints + frange(r[0], r[1], r[2], True) + for setpoint1 in setpoints: #PRObably not needed for newer HW """ if setpoint1 == 0.002: - caputq('X07MA-PC-PS2:SET:RAMP:TARGET', 'Zero') + caputq('X07MA-PC-PS2:SET:RAMP:TARGEFIELD_CHANGE_SLEEPT', 'Zero') sleep(6.0) caputq('X07MA-PC-PS2:SET:RAMP:DIR', 'Forward') sleep(6.0) caputq('X07MA-PC-PS2:SET:RAMP:TARGET', 'Lower') sleep(6.0) - caputq('X07MA-PC-PS2:SET:DMD:POINT:LOWER', '0.002') + caputq('X07MA-PC-PS2:SET:DMD:POINT:LFIELD_CHANGE_SLEEPOWER', '0.002') sleep(15.0) """ field_setpoint.write(setpoint1)