diff --git a/scripts/Diffraction/isis_powder/abstract_inst.py b/scripts/Diffraction/isis_powder/abstract_inst.py index 10d8554fa7aeff2fa850c2fa2ced93da99d21a8d..e5dfa7b95af7234a2453d9856a4e16c772049420 100644 --- a/scripts/Diffraction/isis_powder/abstract_inst.py +++ b/scripts/Diffraction/isis_powder/abstract_inst.py @@ -196,6 +196,14 @@ class AbstractInst(object): """ return str() + def _get_current_tt_mode(self): + """ + Returns the current tt_mode this is only applicable + to PEARL. Otherwise returns None + :return: Current tt_mode on PEARL, otherwise None + """ + return None + def _normalise_ws_current(self, ws_to_correct, run_details=None): """ Normalises the workspace by the beam current at the time it was taken using diff --git a/scripts/Diffraction/isis_powder/pearl.py b/scripts/Diffraction/isis_powder/pearl.py index 82fd89167e09eba49e3a1477f02152ecc6aa3c9a..074726ca045c5c6afe029716fc59c46bcafd9c6a 100644 --- a/scripts/Diffraction/isis_powder/pearl.py +++ b/scripts/Diffraction/isis_powder/pearl.py @@ -87,13 +87,23 @@ class Pearl(AbstractInst): # instead we don't try to run this automatically raise NotImplementedError("You must run the create_vanadium method manually on Pearl") + def _get_current_tt_mode(self): + return self._inst_settings.tt_mode + def _get_monitor_spectra_index(self, run_number): return self._inst_settings.monitor_spec_no def _spline_vanadium_ws(self, focused_vanadium_spectra): focused_vanadium_spectra = pearl_algs.strip_bragg_peaks(focused_vanadium_spectra) - return common.spline_workspaces(focused_vanadium_spectra=focused_vanadium_spectra, - num_splines=self._inst_settings.spline_coefficient) + splined_list = common.spline_workspaces(focused_vanadium_spectra=focused_vanadium_spectra, + num_splines=self._inst_settings.spline_coefficient) + # Ensure the name is unique if we are in tt_mode all + new_workspace_names = [] + for ws in splined_list: + new_name = ws.getName() + '_' + self._inst_settings.tt_mode + new_workspace_names.append(mantid.RenameWorkspace(InputWorkspace=ws, OutputWorkspace=new_name)) + + return new_workspace_names def _output_focused_ws(self, processed_spectra, run_details, output_mode=None): if not output_mode: diff --git a/scripts/Diffraction/isis_powder/routines/calibrate.py b/scripts/Diffraction/isis_powder/routines/calibrate.py index 96e06873fe4faed82bc202f2c2beae0562a050d2..2556ddf88889a73ade0b9a8dbe1c2a8ba055cb5f 100644 --- a/scripts/Diffraction/isis_powder/routines/calibrate.py +++ b/scripts/Diffraction/isis_powder/routines/calibrate.py @@ -63,4 +63,7 @@ def _create_vanadium_splines(focused_spectra, instrument, run_details): mantid.SaveNexus(Filename=out_spline_van_file_path, InputWorkspace=ws, Append=append) append = True # Group for user convenience - mantid.GroupWorkspaces(InputWorkspaces=splined_ws_list, OutputWorkspace="Van_spline_data") + group_name = "Van_spline_data" + tt_mode = instrument._get_current_tt_mode() + group_name = group_name + '_' + tt_mode if tt_mode else group_name + mantid.GroupWorkspaces(InputWorkspaces=splined_ws_list, OutputWorkspace=group_name)