From f4799b151746d69cd1325c164f1781fac15bb32e Mon Sep 17 00:00:00 2001
From: Sam Jenkins <s.jenkins@stfc.ac.uk>
Date: Wed, 16 Jan 2019 09:42:06 +0000
Subject: [PATCH] Re #24512 fixed flake errors
---
.../SystemTests/tests/analysis/EnginXScriptTest.py | 1 -
scripts/Engineering/EnginX.py | 1 -
scripts/Engineering/EngineeringCalibration.py | 13 +++++--------
scripts/Engineering/EngineeringFocus.py | 2 +-
scripts/Engineering/EngineeringPreProcess.py | 4 ++--
5 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/Testing/SystemTests/tests/analysis/EnginXScriptTest.py b/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
index 95d0f700271..8ce38fb8320 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 ff234e74b88..ba4f958d67a 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 b495c89a77c..d6c5176f994 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 3449770c025..89c94976064 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 f2f74bafeb3..9a832dd40db 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")
--
GitLab