From 754e59e7d3a3c06c395093ba52f9078e5b14459b Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 1 Mar 2016 12:22:05 +0100 Subject: [PATCH] Script execution --- script/local.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/local.py b/script/local.py index b07b275..af53df9 100644 --- a/script/local.py +++ b/script/local.py @@ -288,14 +288,14 @@ def wait_inj (value, delay=0.5): def set_file(file_name): FILENAME = file_name -class pol_mode_index(Readable): +class pol_mod(Readable): def read(self): mode = pol_mode.read() if mode == "LINEAR": return 0.0 if mode == "CIRC +": return 1.0 if mode == "CIRC -": return 2.0 return -1.0 -pmi = pol_mode_index() +polmod = pol_mod() def otf(start, end, time, delay=0.0): @@ -317,12 +317,12 @@ def scan_e(start, end, step, settling_time = 0, accumulation_time = None): #wait_beam() acc = Accumulator([signal_tey, signal_i0, signal_trans], accumulation_time) - detectors = acc.getSensors() + [pmi, pol_angle, temperature, current] + detectors = acc.getSensors() + [polmod, pol_angle, temperature, current] 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], accumulation_time) - detectors = acc.getSensors() + [pmi, pol_angle, temperature, current] + detectors = acc.getSensors() + [polmod, pol_angle, temperature, current] rscan(energy, detectors, ranges, latency = settling_time) #not connected