From c756d634b25cd2df7d1009cb7640e74d35ead897 Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 1 Mar 2016 14:18:53 +0100 Subject: [PATCH] Script execution --- script/local.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/script/local.py b/script/local.py index 4f51f13..0f5b135 100644 --- a/script/local.py +++ b/script/local.py @@ -385,16 +385,18 @@ def hyst_step_mult(forward, ranges, ramp_speed, energies): def scan_e(start, end, step, settling_time = 0, accumulation_time = None): """ """ - #wait_beam() - acc = Accumulator([signal_tey, signal_i0, signal_trans, tey_norm, trans_norm], accumulation_time) + #wait_beam() + acc = Accumulator([signal_tey, signal_i0, signal_trans, tey_norm, trans_norm], accumulation_time) detectors = acc.getSensors() + [polmod, pol_angle, temperature, current] + set_preference(Preference.ENABLED_PLOTS, acc.getSensors()) lscan(energy, detectors, float(start), float(end), float(step), latency = settling_time) def scan_e_mult(ranges, settling_time = 0, accumulation_time = None): """ - """ + """ acc = Accumulator([signal_tey, signal_i0, signal_trans, tey_norm, trans_norm], accumulation_time) detectors = acc.getSensors() + [polmod, pol_angle, temperature, current] + set_preference(Preference.ENABLED_PLOTS, acc.getSensors()) rscan(energy, detectors, ranges, latency = settling_time) #not connected