From caaa08881a8e165dce08ccf8d801e55b08d371c7 Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 1 Mar 2016 13:50:43 +0100 Subject: [PATCH] Script execution --- script/local.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/script/local.py b/script/local.py index 85c0e36..a5b1416 100644 --- a/script/local.py +++ b/script/local.py @@ -69,6 +69,19 @@ sim_energy = SimulatedEnergy() sim_energy_readback = SimulatedEnergyReadback() + +class TeyNorm(ReadonlyRegisterBase): + def read(self): + return signal_tey.take() / signal_i0.take(); + +class TransNorm(ReadonlyRegisterBase): + def read(self): + return signal_trans.read() / signal_i0.read(); + +add_device(TeyNorm("tey_norm"), True) +add_device(TransNorm("trans_norm"), True) + + ################################################################################################### # Utilities ################################################################################################### @@ -373,14 +386,14 @@ def scan_e(start, end, step, settling_time = 0, accumulation_time = None): """ """ #wait_beam() - acc = Accumulator([signal_tey, signal_i0, signal_trans], accumulation_time) + acc = Accumulator([signal_tey, signal_i0, signal_trans, tey_norm, trans_norm], accumulation_time) 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) + acc = Accumulator([signal_tey, signal_i0, signal_trans, tey_norm, trans_norm], accumulation_time) detectors = acc.getSensors() + [polmod, pol_angle, temperature, current] rscan(energy, detectors, ranges, latency = settling_time)