From 1f901eba3c364d1652911c632030d272b6053e60 Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 1 Mar 2016 14:43:15 +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 0f5b135..664ba32 100644 --- a/script/local.py +++ b/script/local.py @@ -372,15 +372,15 @@ def hyst_cont_mult(field, ranges, energies): """ run("HistScanMult",{"FIELD":field, "RANGES":ranges, "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "MODE":None, "OFFSET":None}) -def hyst_step(forward, field, init_field, final_field, step, energies): +def hyst_step(forward, field, init_field, final_field, step, energies, energy_change_sleep = 0.5, field_change_sleep = 22.0, mode = None, offset=None): """ """ - run("HistScanMult",{"FIELD":field, "RANGES":[(init_field, final_field, step),], "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "FIELD_CHANGE_SLEEP":22.0, "MODE":None, "OFFSET":None}) + run("HistScanStep",{"FIELD":field, "RANGES":[(init_field, final_field, step),], "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":energy_change_sleep, "FIELD_CHANGE_SLEEP":field_change_sleep, "MODE":mode, "OFFSET":offset}) -def hyst_step_mult(forward, ranges, ramp_speed, energies): +def hyst_step_mult(forward, ranges, ramp_speed, energies, energy_change_sleep = 0.5, field_change_sleep = 22.0, mode = None, offset=None): """ """ - run("HistScanMult",{"FIELD":field, "RANGES":ranges, "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "FIELD_CHANGE_SLEEP":22.0, "MODE":None, "OFFSET":None}) + run("HistScanStep",{"FIELD":field, "RANGES":ranges, "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":energy_change_sleep, "FIELD_CHANGE_SLEEP":field_change_sleep, "MODE":mode, "OFFSET":offset}) def scan_e(start, end, step, settling_time = 0, accumulation_time = None): """