diff --git a/Testing/Data/SystemTest/ISIS_Powder/input/calibration/pearl/17_1/pearl_offset_16_4.cal.md5 b/Testing/Data/SystemTest/ISIS_Powder/input/calibration/pearl/17_1/pearl_offset_16_4.cal.md5 index 2d208f99c360f34270409c25d99c90b4be45fc7c..4de79d39c41b51e96c4212f7fcfec7e16ea2983a 100644 --- a/Testing/Data/SystemTest/ISIS_Powder/input/calibration/pearl/17_1/pearl_offset_16_4.cal.md5 +++ b/Testing/Data/SystemTest/ISIS_Powder/input/calibration/pearl/17_1/pearl_offset_16_4.cal.md5 @@ -1 +1 @@ -918c05da37cf50e89553164e2c6387f0 +fd4460f1c9e270f1bb38a788b1b639f4 diff --git a/Testing/Data/SystemTest/ISIS_Powder/input/yaml_files/pearl_system_test_mapping.yaml.md5 b/Testing/Data/SystemTest/ISIS_Powder/input/yaml_files/pearl_system_test_mapping.yaml.md5 index abab6932d59adbaede46afdd793cdc38c89bf423..0c84426dda5a15baeb7d8d0ca8dbd5fe5d2abbf0 100644 --- a/Testing/Data/SystemTest/ISIS_Powder/input/yaml_files/pearl_system_test_mapping.yaml.md5 +++ b/Testing/Data/SystemTest/ISIS_Powder/input/yaml_files/pearl_system_test_mapping.yaml.md5 @@ -1 +1 @@ -f3064cb75a0f8c0238afe0f1caa6aa7d +c496a4ea13275b98beb3f21d6115bade diff --git a/Testing/SystemTests/tests/framework/ISIS_PowderPearlTest.py b/Testing/SystemTests/tests/framework/ISIS_PowderPearlTest.py index 847b9c34a59f44ffdc7108f99be689f434bcdf4a..820e8d8eef7dcb25cc77e7de6cfea0fbc857e77f 100644 --- a/Testing/SystemTests/tests/framework/ISIS_PowderPearlTest.py +++ b/Testing/SystemTests/tests/framework/ISIS_PowderPearlTest.py @@ -31,6 +31,7 @@ calibration_folder_name = os.path.join("calibration", inst_name.lower()) calibration_map_rel_path = os.path.join("yaml_files", "pearl_system_test_mapping.yaml") cycle = "17_1" spline_rel_path = os.path.join(cycle, "VanSplined_98472_tt70_pearl_offset_16_4.cal.nxs") +summed_empty_rel_path = os.path.join(cycle, "summed_empty_98485.nxs") # Generate paths for the tests # This implies DIRS[0] is the system test data folder @@ -42,6 +43,7 @@ output_dir = os.path.join(working_dir, output_folder_name) calibration_map_path = os.path.join(input_dir, calibration_map_rel_path) calibration_dir = os.path.join(input_dir, calibration_folder_name) spline_path = os.path.join(calibration_dir, spline_rel_path) +summed_empty_path = os.path.join(calibration_dir, summed_empty_rel_path) class _CreateVanadiumTest(systemtesting.MantidSystemTest): @@ -73,6 +75,7 @@ class _CreateVanadiumTest(systemtesting.MantidSystemTest): try: _try_delete(output_dir) _try_delete(spline_path) + _try_delete(summed_empty_path) finally: mantid.mtd.clear() config['datasearch.directories'] = self.existing_config @@ -220,7 +223,6 @@ class FocusWithAbsorbCorrectionsTest(systemtesting.MantidSystemTest): def cleanup(self): try: - _try_delete(spline_path) _try_delete(output_dir) finally: config['datasearch.directories'] = self.existing_config @@ -256,6 +258,8 @@ class CreateCalTest(systemtesting.MantidSystemTest): calibration_results = None existing_config = config["datasearch.directories"] + run_number = 98494 + run_details = None def requiredFiles(self): return _gen_required_files() @@ -263,19 +267,20 @@ class CreateCalTest(systemtesting.MantidSystemTest): def runTest(self): setup_mantid_paths() inst_object = setup_inst_object(tt_mode="tt88", focus_mode="trans") - self.calibration_results = run_create_cal(inst_object, focus_mode="all") + self.calibration_results = run_create_cal(inst_object, focus_mode="all", ceria_run=self.run_number) # Make sure that inst_settings reverted to the default after create_cal self.assertEqual(inst_object._inst_settings.focus_mode, "trans") + self.run_details = inst_object._get_run_details(self.run_number) + def validate(self): self.tolerance = 1e-5 return "PRL98494_tt88_grouped", "ISIS_Powder-PEARL98494_grouped.nxs" def cleanup(self): try: - _try_delete(spline_path) - _try_delete(output_dir) + _try_delete(self.run_details.offset_file_path) finally: config['datasearch.directories'] = self.existing_config mantid.mtd.clear() @@ -292,8 +297,7 @@ def _gen_required_files(): return input_files -def run_create_cal(inst_object, focus_mode): - ceria_run = 98494 +def run_create_cal(inst_object, focus_mode, ceria_run): return inst_object.create_cal(run_number=ceria_run, focus_mode=focus_mode)