diff --git a/script/local.py b/script/local.py index d025f2b..85fcd2f 100644 --- a/script/local.py +++ b/script/local.py @@ -306,12 +306,15 @@ def hyst_step_mult(forward, ranges, ramp_speed, energies): def scan_e(start, end, step, settling_time = 0, accumulation_time = None): wait_beam() - lscan(setpoint, energy_readback, float(start), float(end), float(step)) + acc = Accumulator([signal_tey, signal_i0, signal_trans], accumulation_time) + detectors = acc.getSensors() + [pol_mode, pol_angle, temperature, current] + lscan(energy, detectors, float(start), float(end), float(step), latency = settling_time) def scan_e(ranges, settling_time = 0, accumulation_time = None): - #setpoint = Channel (energy.channelName, 'd') - detectors = [signal_tey, signal_i0, signal_trans, pol_mode, pol_angle, temperature, current] + acc = Accumulator([signal_tey, signal_i0, signal_trans], accumulation_time) + detectors = acc.getSensors() + [pol_mode, pol_angle, temperature, current] rscan(energy, detectors, ranges, latency = settling_time) + #not connected def scan_v(keithley,start, end, step): setpoint = Channel (keithleys[keithley][0], 'd')