From 1eaa2a65f1f9c4a5a3cca90237ca96f26b2b5b60 Mon Sep 17 00:00:00 2001
From: Joseph Ramsay <joseph.ramsay@stfc.ac.uk>
Date: Tue, 26 Sep 2017 16:23:37 +0100
Subject: [PATCH] Re #20603 Changed masking_file_name ext name in polaris
---
.../techniques/ISISPowder-Polaris-v1.rst | 6 +--
.../polaris_advanced_config.py | 8 ++--
.../polaris_routines/polaris_param_mapping.py | 46 +++++++++----------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/docs/source/techniques/ISISPowder-Polaris-v1.rst b/docs/source/techniques/ISISPowder-Polaris-v1.rst
index 8effef475fa..dddadd0b575 100644
--- a/docs/source/techniques/ISISPowder-Polaris-v1.rst
+++ b/docs/source/techniques/ISISPowder-Polaris-v1.rst
@@ -614,8 +614,8 @@ On POLARIS this is set to the following:
.. _masking_file_name_polaris_isis-powder-diffraction-ref:
-masking_file_name
-^^^^^^^^^^^^^^^^^^
+vanadium_peaks_masking_file
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
Determines the name of the masking file containing the
masks to remove Bragg peaks on Polaris. This file must
be located within the top level of the
@@ -625,7 +625,7 @@ On POLARIS this is set to the following:
.. code-block:: python
- masking_file_name: "VanaPeaks.dat"
+ vanadium_peaks_masking_file: "VanaPeaks.dat"
.. _raw_data_cropping_values_polaris_isis-powder-diffraction-ref:
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 8acaf528a5f..8d6122f390e 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py
@@ -13,7 +13,7 @@ absorption_correction_params = {
}
file_names = {
- "masking_file_name": "VanaPeaks.dat",
+ "vanadium_peaks_masking_file": "VanaPeaks.dat",
"grouping_file_name": "Master_copy_of_grouping_file_with_essential_masks.cal"
}
@@ -50,9 +50,9 @@ vanadium_cropping_values = [
variable_help = {
"file_names": {
- "masking_file_name": "Specifies the name of the of the file containing the positions of the vanadium Bragg "
- "Peaks to mask out. This must be located at the root of the calibration folder the user "
- "has specified."
+ "vanadium_peaks_masking_file": "Specifies the name of the of the file containing the positions of the vanadium "
+ "Bragg Peaks to mask out. This must be located at the root of the calibration "
+ "folder the user has specified."
},
"script_params": {
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 7c370a88ed9..2e7883791e0 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
@@ -7,27 +7,27 @@ from isis_powder.polaris_routines.polaris_enums import POLARIS_CHOPPER_MODES
# Maps friendly user name (ext_name) -> script name (int_name)
attr_mapping = \
[
- ParamMapEntry(ext_name="calibration_directory", int_name="calibration_dir"),
- ParamMapEntry(ext_name="calibration_mapping_file", int_name="cal_mapping_path"),
- ParamMapEntry(ext_name="config_file", int_name="config_file"),
- ParamMapEntry(ext_name="do_absorb_corrections", int_name="do_absorb_corrections"),
- ParamMapEntry(ext_name="do_van_normalisation", int_name="do_van_normalisation"),
- ParamMapEntry(ext_name="file_ext", int_name="file_extension", optional=True),
- ParamMapEntry(ext_name="first_cycle_run_no", int_name="run_in_range"),
- ParamMapEntry(ext_name="focused_cropping_values", int_name="focused_cropping_values"),
- ParamMapEntry(ext_name="focused_bin_widths", int_name="focused_bin_widths"),
- ParamMapEntry(ext_name="grouping_file_name", int_name="grouping_file_name"),
- ParamMapEntry(ext_name="input_mode", int_name="input_mode", enum_class=INPUT_BATCHING),
- ParamMapEntry(ext_name="masking_file_name", int_name="masking_file_name"),
- ParamMapEntry(ext_name="mode", int_name="mode", enum_class=POLARIS_CHOPPER_MODES),
- ParamMapEntry(ext_name="multiple_scattering", int_name="multiple_scattering"),
- ParamMapEntry(ext_name="raw_data_cropping_values", int_name="raw_data_crop_values"),
- ParamMapEntry(ext_name="run_number", int_name="run_number"),
- ParamMapEntry(ext_name="sample_empty", int_name="sample_empty", optional=True),
- ParamMapEntry(ext_name="sample_empty_scale", int_name="sample_empty_scale"),
- ParamMapEntry(ext_name="suffix", int_name="suffix", optional=True),
- ParamMapEntry(ext_name="spline_coefficient", int_name="spline_coeff"),
- ParamMapEntry(ext_name="output_directory", int_name="output_dir"),
- ParamMapEntry(ext_name="user_name", int_name="user_name"),
- ParamMapEntry(ext_name="vanadium_cropping_values", int_name="van_crop_values")
+ ParamMapEntry(ext_name="calibration_directory", int_name="calibration_dir"),
+ ParamMapEntry(ext_name="calibration_mapping_file", int_name="cal_mapping_path"),
+ ParamMapEntry(ext_name="config_file", int_name="config_file"),
+ ParamMapEntry(ext_name="do_absorb_corrections", int_name="do_absorb_corrections"),
+ ParamMapEntry(ext_name="do_van_normalisation", int_name="do_van_normalisation"),
+ ParamMapEntry(ext_name="file_ext", int_name="file_extension", optional=True),
+ ParamMapEntry(ext_name="first_cycle_run_no", int_name="run_in_range"),
+ ParamMapEntry(ext_name="focused_cropping_values", int_name="focused_cropping_values"),
+ ParamMapEntry(ext_name="focused_bin_widths", int_name="focused_bin_widths"),
+ ParamMapEntry(ext_name="grouping_file_name", int_name="grouping_file_name"),
+ ParamMapEntry(ext_name="input_mode", int_name="input_mode", enum_class=INPUT_BATCHING),
+ ParamMapEntry(ext_name="vanadium_peaks_masking_file", int_name="masking_file_name"),
+ ParamMapEntry(ext_name="mode", int_name="mode", enum_class=POLARIS_CHOPPER_MODES),
+ ParamMapEntry(ext_name="multiple_scattering", int_name="multiple_scattering"),
+ ParamMapEntry(ext_name="raw_data_cropping_values", int_name="raw_data_crop_values"),
+ ParamMapEntry(ext_name="run_number", int_name="run_number"),
+ ParamMapEntry(ext_name="sample_empty", int_name="sample_empty", optional=True),
+ ParamMapEntry(ext_name="sample_empty_scale", int_name="sample_empty_scale"),
+ ParamMapEntry(ext_name="suffix", int_name="suffix", optional=True),
+ ParamMapEntry(ext_name="spline_coefficient", int_name="spline_coeff"),
+ ParamMapEntry(ext_name="output_directory", int_name="output_dir"),
+ ParamMapEntry(ext_name="user_name", int_name="user_name"),
+ ParamMapEntry(ext_name="vanadium_cropping_values", int_name="van_crop_values")
]
--
GitLab