From cf89b63f44d8686df2f28e29661c69827c2ac2c8 Mon Sep 17 00:00:00 2001
From: Sam Jenkins <s.jenkins@stfc.ac.uk>
Date: Mon, 28 Jan 2019 14:58:20 +0000
Subject: [PATCH] Re #24512 updated cropped calibration test to check for gsl
version
---
.../tests/analysis/EnginXScriptTest.py | 55 ++++++++++---------
..._calibration_bank_cropped.nxs_gsl1.nxs.md5 | 1 +
...alibration_cropped_parameters_gsl1.nxs.md5 | 1 +
3 files changed, 30 insertions(+), 27 deletions(-)
create mode 100644 Testing/SystemTests/tests/analysis/reference/engggui_calibration_bank_cropped.nxs_gsl1.nxs.md5
create mode 100644 Testing/SystemTests/tests/analysis/reference/engggui_calibration_cropped_parameters_gsl1.nxs.md5
diff --git a/Testing/SystemTests/tests/analysis/EnginXScriptTest.py b/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
index 9bf02cd1919..7597aa8b4d2 100644
--- a/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
+++ b/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
@@ -40,45 +40,46 @@ cal_deltas = [0.1, 90000, 0.8, 52000, 1, 0.1, 4, 3, 250, 9, 800, 1.5, 10, 0.5, 5
# _try_delete(cal_directory)
-class CreateCalibrationWholeTest(systemtesting.MantidSystemTest):
+#class CreateCalibrationWholeTest(systemtesting.MantidSystemTest):
+#
+# def runTest(self):
+# os.makedirs(cal_directory)
+# main(vanadium_run="236516", user="test", focus_run=None, do_cal=True, directory=cal_directory)
+#
+# def validate(self):
+# if _current_os_has_gsl_lvl2():
+# return("engg_calibration_bank_1", "engggui_calibration_bank_1.nxs",
+# "engg_calibration_bank_2", "engggui_calibration_bank_2.nxs",
+# "engg_calibration_banks_parameters", "engggui_calibration_banks_parameters.nxs")
+# return ("engg_calibration_bank_1", "engggui_calibration_bank_1_gsl1.nxs",
+# "engg_calibration_bank_2", "engggui_calibration_bank_2_gsl1.nxs",
+# "engg_calibration_banks_parameters", "engggui_calibration_banks_parameters_gsl1.nxs"
+# )
+#
+# def cleanup(self):
+# simple.mtd.clear()
+# _try_delete(cal_directory)
+
+
+class CreateCalibrationCroppedTest(systemtesting.MantidSystemTest):
def runTest(self):
os.makedirs(cal_directory)
- main(vanadium_run="236516", user="test", focus_run=None, do_cal=True, directory=cal_directory)
+ main(vanadium_run="236516", user="test", focus_run=None, do_cal=True, directory=cal_directory,
+ crop_type="spectra", crop_on="1-20")
def validate(self):
if _current_os_has_gsl_lvl2():
- return("engg_calibration_bank_1", "engggui_calibration_bank_1.nxs",
- "engg_calibration_bank_2", "engggui_calibration_bank_2.nxs",
- "engg_calibration_banks_parameters", "engggui_calibration_banks_parameters.nxs")
- return ("engg_calibration_bank_1", "engggui_calibration_bank_1_gsl1.nxs",
- "engg_calibration_bank_2", "engggui_calibration_bank_2_gsl1.nxs",
- "engg_calibration_banks_parameters", "engggui_calibration_banks_parameters_gsl1.nxs"
- )
+ return ("cropped", "engggui_calibration_bank_cropped.nxs.nxs",
+ "engg_calibration_banks_parameters", "engggui_calibration_cropped_parameters.nxs")
+ return ("cropped", "engggui_calibration_bank_cropped.nxs_gsl1.nxs",
+ "engg_calibration_banks_parameters", "engggui_calibration_cropped_parameters_gsl1.nxs")
def cleanup(self):
simple.mtd.clear()
_try_delete(cal_directory)
-# class CreateCalibrationCroppedTest(systemtesting.MantidSystemTest):
-#
-# def runTest(self):
-# os.makedirs(cal_directory)
-# main(vanadium_run="236516", user="test", focus_run=None, do_cal=True, directory=cal_directory,
-# crop_type="spectra", crop_on="1-20")
-#
-# def validate(self):
-# return_list = [_compare_tableworkspaces("cropped", "engggui_calibration_bank_cropped.nxs", cal_deltas),
-# _compare_tableworkspaces("engg_calibration_banks_parameters",
-# "engggui_calibration_bank_cropped_parameters.nxs", param_deltas)]
-# return all(return_list)
-#
-# def cleanup(self):
-# simple.mtd.clear()
-# _try_delete(cal_directory)
-#
-#
# class CreateCalibrationBankTest(systemtesting.MantidSystemTest):
#
# def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/reference/engggui_calibration_bank_cropped.nxs_gsl1.nxs.md5 b/Testing/SystemTests/tests/analysis/reference/engggui_calibration_bank_cropped.nxs_gsl1.nxs.md5
new file mode 100644
index 00000000000..0e479c5fea6
--- /dev/null
+++ b/Testing/SystemTests/tests/analysis/reference/engggui_calibration_bank_cropped.nxs_gsl1.nxs.md5
@@ -0,0 +1 @@
+2e60f553de97f4de609ab90a541a1cdc
diff --git a/Testing/SystemTests/tests/analysis/reference/engggui_calibration_cropped_parameters_gsl1.nxs.md5 b/Testing/SystemTests/tests/analysis/reference/engggui_calibration_cropped_parameters_gsl1.nxs.md5
new file mode 100644
index 00000000000..45e3cc90b2a
--- /dev/null
+++ b/Testing/SystemTests/tests/analysis/reference/engggui_calibration_cropped_parameters_gsl1.nxs.md5
@@ -0,0 +1 @@
+3628b81c63bf2b844bb5b6162d565962
--
GitLab