diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py index aa28de1003f3e02e14b67cacab73c94fbab33098..b697346d12c8908f202ae0dc34776881bcd9a1db 100644 --- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py +++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py @@ -1,5 +1,6 @@ file_names = { - "masking_file_name": "VanaPeaks.dat" + "masking_file_name": "VanaPeaks.dat", + "grouping_file_name": "Master_copy_of_grouping_file_with_essential_masks.cal" } script_params = { diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py index e7cbafa029f750909a5193b3d43aba43a17679dc..e859af6fa82caa2bf3cbe0e1432b43cff9fccc0d 100644 --- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py +++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py @@ -43,9 +43,10 @@ def get_run_details(run_number, inst_settings): splined_vanadium_name = _generate_splined_van_name(chopper_on=inst_settings.chopper_on, vanadium_run_string=vanadium_runs) + grouping_full_path = os.path.join(inst_settings.calibration_dir, inst_settings.grouping_file_name) + in_calib_dir = os.path.join(inst_settings.calibration_dir, label) calibration_full_path = os.path.join(in_calib_dir, yaml_dict["offset_file_name"]) - grouping_full_path = os.path.join(in_calib_dir, yaml_dict["offset_file_name"]) splined_vanadium = os.path.join(in_calib_dir, splined_vanadium_name) run_details = RunDetails(run_number=run_number) diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py index af24b128208a7bec0bbd3ff1f6df74c4374eda6c..a7f3ee9024f0cb816cc1c87367d7c22d82caa7d3 100644 --- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py +++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py @@ -7,6 +7,7 @@ attr_mapping = [("calibration_directory", "calibration_dir"), ("config_file", "config_file"), ("do_van_normalisation", "do_van_normalisation"), ("do_absorb_corrections", "do_absorb_corrections"), + ("grouping_file_name", "grouping_file_name"), ("input_mode", "input_mode"), ("masking_file_name", "masking_file_name"), ("multiple_scattering", "multiple_scattering"),