Skip to content
Snippets Groups Projects
Commit f4799b15 authored by Sam Jenkins's avatar Sam Jenkins
Browse files

Re #24512 fixed flake errors

parent a810fdb4
No related branches found
No related tags found
No related merge requests found
...@@ -172,4 +172,3 @@ def _setup_focus(): ...@@ -172,4 +172,3 @@ def _setup_focus():
test.create_calibration() test.create_calibration()
test.create_calibration(cropped="spectra", spectra="1-20") test.create_calibration(cropped="spectra", spectra="1-20")
simple.mtd.clear() simple.mtd.clear()
...@@ -99,4 +99,3 @@ class EnginX: ...@@ -99,4 +99,3 @@ class EnginX:
def _gen_filename(run_number): def _gen_filename(run_number):
return "ENGINX" + ("0" * (8 - len(run_number))) + run_number return "ENGINX" + ("0" * (8 - len(run_number))) + run_number
...@@ -92,7 +92,7 @@ def save_calibration(ceria_run, van_run, ext, cal_dir, bank_names, difcs, zeros, ...@@ -92,7 +92,7 @@ def save_calibration(ceria_run, van_run, ext, cal_dir, bank_names, difcs, zeros,
if name == "all_banks": if name == "all_banks":
template_file = None template_file = None
elif name == "bank_South": elif name == "bank_South":
template_file = "template_ENGINX_241391_236516_South_bank.prm"; template_file = "template_ENGINX_241391_236516_South_bank.prm"
else: else:
template_file = "template_ENGINX_241391_236516_North_bank.prm" template_file = "template_ENGINX_241391_236516_North_bank.prm"
Utils.write_ENGINX_GSAS_iparam_file(output_file=gsas_iparm_fname, bank_names=bank_names, difc=difcs, tzero=zeros, Utils.write_ENGINX_GSAS_iparam_file(output_file=gsas_iparm_fname, bank_names=bank_names, difc=difcs, tzero=zeros,
...@@ -104,13 +104,10 @@ def save_calibration(ceria_run, van_run, ext, cal_dir, bank_names, difcs, zeros, ...@@ -104,13 +104,10 @@ def save_calibration(ceria_run, van_run, ext, cal_dir, bank_names, difcs, zeros,
def create_params_table(difc, tzero): def create_params_table(difc, tzero):
param_table = simple.CreateEmptyTableWorkspace(OutputWorkspace="engg_calibration_banks_parameters") param_table = simple.CreateEmptyTableWorkspace(OutputWorkspace="engg_calibration_banks_parameters")
param_table.addColumn("int", "bankid"); param_table.addColumn("int", "bankid")
param_table.addColumn("double", "difc"); param_table.addColumn("double", "difc")
param_table.addColumn("double", "difa"); param_table.addColumn("double", "difa")
param_table.addColumn("double", "tzero"); param_table.addColumn("double", "tzero")
for i in range(len(difc)): for i in range(len(difc)):
next_row = {"bankid": i, "difc": difc[i], "difa": 0, "tzero": tzero[i]} next_row = {"bankid": i, "difc": difc[i], "difa": 0, "tzero": tzero[i]}
param_table.addRow(next_row) param_table.addRow(next_row)
...@@ -75,7 +75,7 @@ def _save_out(output, run_number, bank_id, output_dir, join_string, focus_gen): ...@@ -75,7 +75,7 @@ def _save_out(output, run_number, bank_id, output_dir, join_string, focus_gen):
filename = path.join(output_dir, join_string.format(run_number, bank_id)) filename = path.join(output_dir, join_string.format(run_number, bank_id))
hdf5_name = path.join(output_dir, run_number + ".hdf5") hdf5_name = path.join(output_dir, run_number + ".hdf5")
if not unicode(bank_id).isnumeric(): if not unicode(bank_id).isnumeric():
bank_id = 0; bank_id = 0
simple.SaveFocusedXYE(InputWorkspace=output, Filename=filename + ".dat", SplitFiles=False, simple.SaveFocusedXYE(InputWorkspace=output, Filename=filename + ".dat", SplitFiles=False,
StartAtBankNumber=bank_id) StartAtBankNumber=bank_id)
simple.SaveGSS(InputWorkspace=output, Filename=filename + ".gss", SplitFiles=False, Bank=bank_id) simple.SaveGSS(InputWorkspace=output, Filename=filename + ".gss", SplitFiles=False, Bank=bank_id)
......
...@@ -13,8 +13,8 @@ def rebin_time(run, bin_param): ...@@ -13,8 +13,8 @@ def rebin_time(run, bin_param):
simple.Rebin(InputWorkspace=wsname, Params=bin_param, OutputWorkspace="engg_preproc_time_ws") simple.Rebin(InputWorkspace=wsname, Params=bin_param, OutputWorkspace="engg_preproc_time_ws")
def rebin_pulse(run, bin_param, n_periods): def rebin_pulse(run, bin_param): # , #n_periods): currently unused to match implementation in gui
_n_periods = n_periods # currently unused to match implementation in gui
wsname = _load_ws_to_process(run) wsname = _load_ws_to_process(run)
simple.RebinByPulseTimes(InputWorkspace=wsname, Params=bin_param, OutputWorkspace="engg_preproc_pulse_ws") simple.RebinByPulseTimes(InputWorkspace=wsname, Params=bin_param, OutputWorkspace="engg_preproc_pulse_ws")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment