diff --git a/scripts/Diffraction/isis_powder/gem.py b/scripts/Diffraction/isis_powder/gem.py index 0a74779b1de1e1af82c20c0f07ef297f85903889..0017007a492c21efd2b4e40dd0efa2908d25f89c 100644 --- a/scripts/Diffraction/isis_powder/gem.py +++ b/scripts/Diffraction/isis_powder/gem.py @@ -77,10 +77,6 @@ class Gem(AbstractInst): maud_calib_filename = filename_stub + ".maud" out_file_names["maud_calib_filename"] = maud_calib_filename - if self._inst_settings.save_gda: - gda_filename = filename_stub + ".gda" - out_file_names["gda_filename"] = gda_filename - return out_file_names def _output_focused_ws(self, processed_spectra, run_details, output_mode=None): @@ -102,26 +98,17 @@ class Gem(AbstractInst): if "angles_filename" in output_paths: gem_algs.save_angles(d_spacing_group, output_paths["angles_filename"]) - save_gda = "gda_filename" in output_paths - save_maud_calib = "maud_calib_filename" in output_paths - - if save_gda or save_maud_calib: + if "maud_calib_filename" in output_paths: gsas_calib_file_path = os.path.join(self._inst_settings.calibration_dir, self._inst_settings.gsas_calib_filename) if not os.path.exists(gsas_calib_file_path): raise RuntimeWarning("Could not save MAUD calibration file, as GSAS calibration file was not found. " "It should be present at " + gsas_calib_file_path) else: - if save_gda: - gem_algs.save_gda(d_spacing_group=d_spacing_group, - output_path=output_paths["gda_filename"], - gsas_calib_filename=gsas_calib_file_path, - grouping_scheme=self._inst_settings.maud_grouping_scheme) - if save_maud_calib: - gem_algs.save_maud_calib(d_spacing_group=d_spacing_group, - output_path=output_paths["maud_calib_filename"], - gsas_calib_filename=gsas_calib_file_path, - grouping_scheme=self._inst_settings.maud_grouping_scheme) + gem_algs.save_maud_calib(d_spacing_group=d_spacing_group, + output_path=output_paths["maud_calib_filename"], + gsas_calib_filename=gsas_calib_file_path, + grouping_scheme=self._inst_settings.maud_grouping_scheme) return d_spacing_group, tof_group diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py b/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py index 2990a8da485cffd4d62e9b5ac3a0e68b2b5b4e3f..0871958f289ae6b243203dc3b2045613d5be5646 100644 --- a/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py +++ b/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py @@ -101,7 +101,6 @@ def get_mode_specific_variables(is_texture_mode): "vanadium_cropping_values": texture_vanadium_cropping_values, "grouping_file_name": "offsets_xie_test_2.cal", "save_angles": True, - "save_gda": True, "save_maud": True, "save_maud_calib": True} else: @@ -109,7 +108,6 @@ def get_mode_specific_variables(is_texture_mode): "vanadium_cropping_values": vanadium_cropping_values, "grouping_file_name": "GEM_Instrument_grouping.cal", "save_angles": False, - "save_gda": False, "save_maud": False, "save_maud_calib": False} diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py b/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py index 8ede721f90be8b1df5e39e6b6d68198fb39cd39a..ae6db76614fd6b86141e3848441d29d4273c90e8 100644 --- a/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py +++ b/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py @@ -63,11 +63,3 @@ def save_maud_calib(d_spacing_group, output_path, gsas_calib_filename, grouping_ GSASParamFile=gsas_calib_filename, GroupingScheme=grouping_scheme, OutputFilename=output_path) - - -def save_gda(d_spacing_group, output_path, gsas_calib_filename, grouping_scheme): - cropped = mantid.CropWorkspace(InputWorkspace=d_spacing_group, XMax=10, StoreInADS=False) - mantid.SaveGDA(InputWorkspace=cropped, - GSASParamFile=gsas_calib_filename, - GroupingScheme=grouping_scheme, - Filename=output_path) diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py b/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py index 2a4c94ebc93dec3968ab2cb6a981335911baec71..066df060da48bbdf5559410df138558122b1e8e7 100644 --- a/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py +++ b/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py @@ -25,7 +25,6 @@ attr_mapping = \ 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="save_angles", int_name="save_angles"), - ParamMapEntry(ext_name="save_gda", int_name="save_gda"), ParamMapEntry(ext_name="save_maud_calib", int_name="save_maud_calib"), ParamMapEntry(ext_name="save_maud", int_name="save_maud"), ParamMapEntry(ext_name="spline_coefficient", int_name="spline_coeff"),