diff --git a/script/local.py b/script/local.py index 3835092..2c4c1a7 100644 --- a/script/local.py +++ b/script/local.py @@ -76,7 +76,7 @@ class TeyNorm(ReadonlyRegisterBase): class TransNorm(ReadonlyRegisterBase): def read(self): return signal_trans.take() / signal_i0.take(); - +OFFSET add_device(TeyNorm("tey_norm"), True) add_device(TransNorm("trans_norm"), True) @@ -222,7 +222,7 @@ def close_valve(delay = 0.0): #TODO: Check default delay """ """ valve_try_open.write(0) - time.sleep(float(delay)) + time.sleep(fset_pol_cplusloat(delay)) def set_energy (value, delay=0.5): """ @@ -354,10 +354,10 @@ class pol_mod(Readable): polmod = pol_mod() -def otf(start, end, time, delay=0.0): +def otf(start, end, time, delay=0.0, mode = None, offset = None, alpha = None, name = None): """ """ - run("EnergyScan", {"E1":start, "E2":end, "TIME":time, "DELAY":float(delay), "MODE":None, "OFFSET":None, "FOLDER":None, "FILE":None, "ALPHA":None}) + run("EnergyScan", {"E1":start, "E2":end, "TIME":time, "DELAY":float(delay), "MODE":mode, "OFFSET":float(offset), "FOLDER":None, "FILE":name, "ALPHA":float(alpha)}) def hyst_cont(field, init_field, final_field, ramp_speed, energies): """