diff --git a/Testing/SystemTests/tests/analysis/EnginXScriptTest.py b/Testing/SystemTests/tests/analysis/EnginXScriptTest.py index 95d0f70027194dc2056b99555b296603d5f24563..8ce38fb832077a45fda3dc955c946c48b24add26 100644 --- a/Testing/SystemTests/tests/analysis/EnginXScriptTest.py +++ b/Testing/SystemTests/tests/analysis/EnginXScriptTest.py @@ -172,4 +172,3 @@ def _setup_focus(): test.create_calibration() test.create_calibration(cropped="spectra", spectra="1-20") simple.mtd.clear() - diff --git a/scripts/Engineering/EnginX.py b/scripts/Engineering/EnginX.py index ff234e74b88e4dbfc53cf97f0ff7a52a1e3f45b1..ba4f958d67ab3f8dc6479a4a291e611d07bfdd69 100644 --- a/scripts/Engineering/EnginX.py +++ b/scripts/Engineering/EnginX.py @@ -99,4 +99,3 @@ class EnginX: def _gen_filename(run_number): return "ENGINX" + ("0" * (8 - len(run_number))) + run_number - diff --git a/scripts/Engineering/EngineeringCalibration.py b/scripts/Engineering/EngineeringCalibration.py index b495c89a77c20906b131607aa231a8b7ef2cd7c2..d6c5176f994f4819f75fabb353f9ccd36fa6ae05 100644 --- a/scripts/Engineering/EngineeringCalibration.py +++ b/scripts/Engineering/EngineeringCalibration.py @@ -92,7 +92,7 @@ def save_calibration(ceria_run, van_run, ext, cal_dir, bank_names, difcs, zeros, if name == "all_banks": template_file = None elif name == "bank_South": - template_file = "template_ENGINX_241391_236516_South_bank.prm"; + template_file = "template_ENGINX_241391_236516_South_bank.prm" else: 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, @@ -104,13 +104,10 @@ def save_calibration(ceria_run, van_run, ext, cal_dir, bank_names, difcs, zeros, def create_params_table(difc, tzero): param_table = simple.CreateEmptyTableWorkspace(OutputWorkspace="engg_calibration_banks_parameters") - param_table.addColumn("int", "bankid"); - param_table.addColumn("double", "difc"); - param_table.addColumn("double", "difa"); - param_table.addColumn("double", "tzero"); + param_table.addColumn("int", "bankid") + param_table.addColumn("double", "difc") + param_table.addColumn("double", "difa") + param_table.addColumn("double", "tzero") for i in range(len(difc)): next_row = {"bankid": i, "difc": difc[i], "difa": 0, "tzero": tzero[i]} param_table.addRow(next_row) - - - diff --git a/scripts/Engineering/EngineeringFocus.py b/scripts/Engineering/EngineeringFocus.py index 3449770c025da1aa93c6daee4e77b2b747768fd9..89c94976064ffe7382758efe7858a2d9451e8dc8 100644 --- a/scripts/Engineering/EngineeringFocus.py +++ b/scripts/Engineering/EngineeringFocus.py @@ -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)) hdf5_name = path.join(output_dir, run_number + ".hdf5") if not unicode(bank_id).isnumeric(): - bank_id = 0; + bank_id = 0 simple.SaveFocusedXYE(InputWorkspace=output, Filename=filename + ".dat", SplitFiles=False, StartAtBankNumber=bank_id) simple.SaveGSS(InputWorkspace=output, Filename=filename + ".gss", SplitFiles=False, Bank=bank_id) diff --git a/scripts/Engineering/EngineeringPreProcess.py b/scripts/Engineering/EngineeringPreProcess.py index f2f74bafeb35fb5f3e4f0018bbbdfd70773d26aa..9a832dd40dbaaba486a7227dc26a54092e5e1502 100644 --- a/scripts/Engineering/EngineeringPreProcess.py +++ b/scripts/Engineering/EngineeringPreProcess.py @@ -13,8 +13,8 @@ def rebin_time(run, bin_param): simple.Rebin(InputWorkspace=wsname, Params=bin_param, OutputWorkspace="engg_preproc_time_ws") -def rebin_pulse(run, bin_param, n_periods): - _n_periods = n_periods # currently unused to match implementation in gui +def rebin_pulse(run, bin_param): # , #n_periods): currently unused to match implementation in gui + wsname = _load_ws_to_process(run) simple.RebinByPulseTimes(InputWorkspace=wsname, Params=bin_param, OutputWorkspace="engg_preproc_pulse_ws")