From 9b8534c680609ad6bbe60a0fd6335d36c9d5737c Mon Sep 17 00:00:00 2001
From: Joe Ramsay <joseph.ramsay@stfc.ac.uk>
Date: Tue, 23 Jan 2018 10:48:09 +0000
Subject: [PATCH] Re #21598 Make total scattering test independent of focus
The total scattering system test was made to read its own input file
instead of using the output of the focus test, so that the focus reference
file could be updated without breaking the total scattering test
---
.../ISIS_Powder-POLARIS98533_TotalScatteringInput.nxs.md5 | 1 +
Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 Testing/Data/SystemTest/ISIS_Powder/input/ISIS_Powder-POLARIS98533_TotalScatteringInput.nxs.md5
diff --git a/Testing/Data/SystemTest/ISIS_Powder/input/ISIS_Powder-POLARIS98533_TotalScatteringInput.nxs.md5 b/Testing/Data/SystemTest/ISIS_Powder/input/ISIS_Powder-POLARIS98533_TotalScatteringInput.nxs.md5
new file mode 100644
index 00000000000..c1822805695
--- /dev/null
+++ b/Testing/Data/SystemTest/ISIS_Powder/input/ISIS_Powder-POLARIS98533_TotalScatteringInput.nxs.md5
@@ -0,0 +1 @@
+fb33507ac0702dd7d513d79e352637b4
\ No newline at end of file
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
index 8d7dcf00e2a..8f5df35905d 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
@@ -39,6 +39,8 @@ calibration_dir = os.path.join(input_dir, calibration_folder_name)
spline_path = os.path.join(calibration_dir, spline_rel_path)
unsplined_van_path = os.path.join(calibration_dir, unsplined_van_rel_path)
+total_scattering_input_file = os.path.join(input_dir, "ISIS_Powder-POLARIS98533_TotalScatteringInput.nxs")
+
class CreateVanadiumTest(stresstesting.MantidStressTest):
@@ -102,7 +104,7 @@ class TotalScatteringTest(stresstesting.MantidStressTest):
def runTest(self):
# Load Focused ws
- mantid.LoadNexus(Filename="ISIS_Powder-POLARIS98533_FocusSempty.nxs", OutputWorkspace='98533-Results-TOF-Grp')
+ mantid.LoadNexus(Filename=total_scattering_input_file, OutputWorkspace='98533-Results-TOF-Grp')
self.pdf_output = run_total_scattering('98533', False)
def validate(self):
@@ -131,6 +133,7 @@ def _gen_required_files():
# Generate file names of form "INSTxxxxx.nxs"
input_files = [os.path.join(input_dir, (inst_name + "000" + number + ".nxs")) for number in required_run_numbers]
input_files.append(calibration_map_path)
+ input_files.append(os.path.join(input_dir, "ISIS_Powder-POLARIS98533_TotalScatteringInput.nxs"))
return input_files
--
GitLab