Skip to content
Snippets Groups Projects
Commit 9b8534c6 authored by Joe Ramsay's avatar Joe Ramsay
Browse files

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
parent 6a1b9df5
No related branches found
No related tags found
No related merge requests found
fb33507ac0702dd7d513d79e352637b4
\ No newline at end of file
...@@ -39,6 +39,8 @@ calibration_dir = os.path.join(input_dir, calibration_folder_name) ...@@ -39,6 +39,8 @@ calibration_dir = os.path.join(input_dir, calibration_folder_name)
spline_path = os.path.join(calibration_dir, spline_rel_path) spline_path = os.path.join(calibration_dir, spline_rel_path)
unsplined_van_path = os.path.join(calibration_dir, unsplined_van_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): class CreateVanadiumTest(stresstesting.MantidStressTest):
...@@ -102,7 +104,7 @@ class TotalScatteringTest(stresstesting.MantidStressTest): ...@@ -102,7 +104,7 @@ class TotalScatteringTest(stresstesting.MantidStressTest):
def runTest(self): def runTest(self):
# Load Focused ws # 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) self.pdf_output = run_total_scattering('98533', False)
def validate(self): def validate(self):
...@@ -131,6 +133,7 @@ def _gen_required_files(): ...@@ -131,6 +133,7 @@ def _gen_required_files():
# Generate file names of form "INSTxxxxx.nxs" # 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 = [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(calibration_map_path)
input_files.append(os.path.join(input_dir, "ISIS_Powder-POLARIS98533_TotalScatteringInput.nxs"))
return input_files return input_files
......
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