Skip to content
Snippets Groups Projects
Commit ac0d9baa authored by David Fairbrother's avatar David Fairbrother
Browse files

Re #17949 Updated system test results following alg changes

parent f4d2b1af
No related merge requests found
Showing
with 16 additions and 26 deletions
181cdee947912603c3b77087d84691e8
3fbc605d28a75a557d4e4303ffca85f5
c2fa198cf2c4a1cdf86350cafba365fe
ba22e9d51e4fb5b4615eb9704dacbd0e
a2fa4fdacf3981540787a0ccd5a6ce2c
3e6766a5dc14c34f400884027bba82b8
...@@ -180,10 +180,9 @@ class LoadCalibTests(unittest.TestCase): ...@@ -180,10 +180,9 @@ class LoadCalibTests(unittest.TestCase):
vanadium_tt_35_dir = os.path.join(vanadium_base_dir, tt_35_file) vanadium_tt_35_dir = os.path.join(vanadium_base_dir, tt_35_file)
van_tt35_data = LoadNexusProcessed(Filename=vanadium_tt_35_dir) van_tt35_data = LoadNexusProcessed(Filename=vanadium_tt_35_dir)
self.matrix_workspaces_test(van_tt35_data, 'tt35') self.matrix_workspaces_test(van_tt35_data, 'tt35')
self.assertAlmostEquals(-5.59125571e-06, van_tt35_data[1].readY(0)[2], places=DIFF_PLACES)
self.assertAlmostEquals(-5.62564874e-06, van_tt35_data[1].readY(0)[2], places=DIFF_PLACES) self.assertAlmostEquals(1.45223820e-05, van_tt35_data[5].readY(0)[4545], places=DIFF_PLACES)
self.assertAlmostEquals(1.46103398e-05, van_tt35_data[5].readY(0)[4545], places=DIFF_PLACES) self.assertAlmostEquals(5.16652141e-06, van_tt35_data[8].readY(0)[7553], places=DIFF_PLACES)
self.assertAlmostEquals(5.19832053e-06, van_tt35_data[8].readY(0)[7553], places=DIFF_PLACES)
self.assertAlmostEquals(2.30071459205e-08, van_tt35_data[4].readE(0)[17], places=DIFF_PLACES) self.assertAlmostEquals(2.30071459205e-08, van_tt35_data[4].readE(0)[17], places=DIFF_PLACES)
self.assertAlmostEquals(177.218826007, van_tt35_data[13].readX(0)[278], places=DIFF_PLACES) self.assertAlmostEquals(177.218826007, van_tt35_data[13].readX(0)[278], places=DIFF_PLACES)
...@@ -193,9 +192,9 @@ class LoadCalibTests(unittest.TestCase): ...@@ -193,9 +192,9 @@ class LoadCalibTests(unittest.TestCase):
OutputWorkspace=tt_70_file) OutputWorkspace=tt_70_file)
self.matrix_workspaces_test(van_tt70_data, 'tt70') self.matrix_workspaces_test(van_tt70_data, 'tt70')
self.assertAlmostEquals(-1.01558339e-05, van_tt70_data[1].readY(0)[2], places=DIFF_PLACES) self.assertAlmostEquals(-1.00937319e-05, van_tt70_data[1].readY(0)[2], places=DIFF_PLACES)
self.assertAlmostEquals(3.05071701e-05, van_tt70_data[5].readY(0)[4545], places=DIFF_PLACES) self.assertAlmostEquals(3.03206351e-05, van_tt70_data[5].readY(0)[4545], places=DIFF_PLACES)
self.assertAlmostEquals(1.05314602e-05, van_tt70_data[8].readY(0)[7553], places=DIFF_PLACES) self.assertAlmostEquals(1.04670371e-05, van_tt70_data[8].readY(0)[7553], places=DIFF_PLACES)
self.assertAlmostEquals(3.2808780582e-08, van_tt70_data[4].readE(0)[17], places=DIFF_PLACES) self.assertAlmostEquals(3.2808780582e-08, van_tt70_data[4].readE(0)[17], places=DIFF_PLACES)
self.assertAlmostEquals(177.218826007, van_tt70_data[13].readX(0)[278], places=DIFF_PLACES) self.assertAlmostEquals(177.218826007, van_tt70_data[13].readX(0)[278], places=DIFF_PLACES)
...@@ -205,9 +204,9 @@ class LoadCalibTests(unittest.TestCase): ...@@ -205,9 +204,9 @@ class LoadCalibTests(unittest.TestCase):
OutputWorkspace=tt_88_file) OutputWorkspace=tt_88_file)
self.matrix_workspaces_test(van_tt88_data, 'tt88') self.matrix_workspaces_test(van_tt88_data, 'tt88')
self.assertAlmostEquals(-1.16490247e-05, van_tt88_data[1].readY(0)[2], places=DIFF_PLACES) self.assertAlmostEquals(-1.15778020e-05, van_tt88_data[1].readY(0)[2], places=DIFF_PLACES)
self.assertAlmostEquals(3.63947846e-05, van_tt88_data[5].readY(0)[4545], places=DIFF_PLACES) self.assertAlmostEquals(3.61722568e-05, van_tt88_data[5].readY(0)[4545], places=DIFF_PLACES)
self.assertAlmostEquals(1.28533968e-05, van_tt88_data[8].readY(0)[7553], places=DIFF_PLACES) self.assertAlmostEquals(1.27747701e-05, van_tt88_data[8].readY(0)[7553], places=DIFF_PLACES)
self.assertAlmostEquals(3.21810924e-08, van_tt88_data[4].readE(0)[17], places=DIFF_PLACES) self.assertAlmostEquals(3.21810924e-08, van_tt88_data[4].readE(0)[17], places=DIFF_PLACES)
self.assertAlmostEquals(177.218826007, van_tt88_data[13].readX(0)[278], places=DIFF_PLACES) self.assertAlmostEquals(177.218826007, van_tt88_data[13].readX(0)[278], places=DIFF_PLACES)
......
...@@ -156,5 +156,5 @@ def _validate_wrapper(cls, focus_mode): ...@@ -156,5 +156,5 @@ def _validate_wrapper(cls, focus_mode):
out_name = "PEARL_routines_fmode_" + focus_mode out_name = "PEARL_routines_fmode_" + focus_mode
mantid.LoadNexus(Filename=DIRS[0] + "PEARL/Focus_Test/DataOut/PEARL92476_92479.nxs", mantid.LoadNexus(Filename=DIRS[0] + "PEARL/Focus_Test/DataOut/PEARL92476_92479.nxs",
OutputWorkspace=out_name) OutputWorkspace=out_name)
reference_file_name = "PEARL92476_92479_" + focus_mode + ".nxs" reference_file_name = "ISIS_Powder-PEARL92476_92479_" + focus_mode + ".nxs"
return out_name, reference_file_name return out_name, reference_file_name
...@@ -28,7 +28,7 @@ class isis_powder_PolarisVanadiumCalTest(stresstesting.MantidStressTest): ...@@ -28,7 +28,7 @@ class isis_powder_PolarisVanadiumCalTest(stresstesting.MantidStressTest):
def cleanup(self): def cleanup(self):
# TODO clean up reference files properly # TODO clean up reference files properly
config['datasearch.directories'] = self.existing_config config['datasearch.directories'] = self.existing_config
_clean_up() # _clean_up()
class isis_powder_PolarisFocusTest(stresstesting.MantidStressTest): class isis_powder_PolarisFocusTest(stresstesting.MantidStressTest):
...@@ -86,7 +86,7 @@ def _calibration_validation(cls, results): ...@@ -86,7 +86,7 @@ def _calibration_validation(cls, results):
ws_to_validate_output_name = "pearl_van_cal_output" ws_to_validate_output_name = "pearl_van_cal_output"
mantid.LoadNexus(Filename=output_full_path, OutputWorkspace=ws_to_validate_output_name) mantid.LoadNexus(Filename=output_full_path, OutputWorkspace=ws_to_validate_output_name)
reference_file_name = "POLARIS_PowderDiffVanCalibration.nxs" reference_file_name = "ISIS_Powder-PEARL78338_Van_Cal.nxs"
return ws_to_validate_output_name, reference_file_name return ws_to_validate_output_name, reference_file_name
...@@ -135,4 +135,4 @@ def _get_output_dir(): ...@@ -135,4 +135,4 @@ def _get_output_dir():
def _get_calibration_dir(): def _get_calibration_dir():
return os.path.join(DIRS[0], "POLARIS/test/Cycle_15_2/Calibration") return os.path.join(DIRS[0], "POLARIS/Calibration")
19390f1b54bb9f7837c9c4d7fe991691
5af4d59e931792809a6c71768815827f
693f8b8d827cd832109d43380a366785
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