Closedown

This commit is contained in:
x07maop
2016-04-11 18:52:44 +02:00
parent 599088043e
commit 811701dfd2
+4 -3
View File
@@ -385,7 +385,7 @@ def hyst_step_mult(forward, ranges, ramp_speed, energies, energy_change_sleep =
def scan_e(start, end, step, settling_time = 0, accumulation_time = None, name = None):
"""
"""
if name is not None:
if name is None:
set_context(name = name)
#wait_beam()
acc = Accumulator([signal_tey, signal_i0, signal_trans, tey_norm, trans_norm], accumulation_time)
@@ -396,8 +396,9 @@ def scan_e(start, end, step, settling_time = 0, accumulation_time = None, name =
def scan_e_mult(ranges, settling_time = 0, accumulation_time = None, name = None):
"""
"""
if name is not None:
set_context(name = name)
if name is None:
set_context(name = name)
# name = get_context().name
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())