diff --git a/scripts/Diffraction/isis_powder/abstract_inst.py b/scripts/Diffraction/isis_powder/abstract_inst.py index 325f70cf031e2853ce88799bdee3ed2cf13bebfb..47bba21a8e1acd6176d954314088473f7acba4bf 100644 --- a/scripts/Diffraction/isis_powder/abstract_inst.py +++ b/scripts/Diffraction/isis_powder/abstract_inst.py @@ -160,7 +160,6 @@ class AbstractInst(object): @return: The filename of the file - Without the path or extension """ - @staticmethod @abstractmethod def _get_instrument_alg_save_ranges(instrument=''): @@ -261,7 +260,6 @@ def _prefix_dot_to_ext(ext): return ext - # These empty hooks can be used to diagnose when an override hasn't # fired or if steps are correctly being skipped diff --git a/scripts/Diffraction/isis_powder/polaris.py b/scripts/Diffraction/isis_powder/polaris.py index c87284070fc357eab4a207bc5f7e8a256a88c894..87445de16f30cef095a8e8b2a64a494e76225939 100644 --- a/scripts/Diffraction/isis_powder/polaris.py +++ b/scripts/Diffraction/isis_powder/polaris.py @@ -138,8 +138,8 @@ class Polaris(AbstractInst): def correct_sample_vanadium(self, focused_ws, index, vanadium_ws=None): spectra_name = "sample_ws-" + str(index + 1) - sample = mantid.CropWorkspace(InputWorkspace=focused_ws, OutputWorkspace=spectra_name, - StartWorkspaceIndex=index, EndWorkspaceIndex=index) + mantid.CropWorkspace(InputWorkspace=focused_ws, OutputWorkspace=spectra_name, + StartWorkspaceIndex=index, EndWorkspaceIndex=index) if vanadium_ws: van_rebinned = mantid.RebinToWorkspace(WorkspaceToRebin=vanadium_ws, WorkspaceToMatch=spectra_name) diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_calib_parser.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_calib_parser.py index 48680fca5acdd3c61842dc66a9de5b7ad455cce0..a62c54912f27922a0d63787b6a7befe96c761f45 100644 --- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_calib_parser.py +++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_calib_parser.py @@ -59,4 +59,3 @@ def _find_dictionary_key(dict_to_search, run_number): return key return None - diff --git a/scripts/Diffraction/isis_powder/routines/__init__.py b/scripts/Diffraction/isis_powder/routines/__init__.py index 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/scripts/Diffraction/isis_powder/routines/__init__.py +++ b/scripts/Diffraction/isis_powder/routines/__init__.py @@ -1 +0,0 @@ - diff --git a/scripts/Diffraction/isis_powder/routines/common.py b/scripts/Diffraction/isis_powder/routines/common.py index 99d7ee87605e200573eceedc6482b6a56f8b6038..8acbec6769f451863c5cb046399c4d987939a2b9 100644 --- a/scripts/Diffraction/isis_powder/routines/common.py +++ b/scripts/Diffraction/isis_powder/routines/common.py @@ -1,7 +1,5 @@ from __future__ import (absolute_import, division, print_function) -from six.moves import xrange - import mantid.simpleapi as mantid # --- Public API --- # diff --git a/scripts/Diffraction/isis_powder/routines/focus.py b/scripts/Diffraction/isis_powder/routines/focus.py index ddd86e372c88a24c44697bc8ef3c3453d5b64437..ab1cf2f89123741e4f1ba0dc11321881dfd8bc9c 100644 --- a/scripts/Diffraction/isis_powder/routines/focus.py +++ b/scripts/Diffraction/isis_powder/routines/focus.py @@ -91,4 +91,4 @@ def _apply_binning_to_spectra(spectra_list, binning_list): for ws, bin_params in zip(spectra_list, binning_list): # Starting bin edge / bin width / last bin edge rebin_string = bin_params[0] + ',' + bin_params[1] + ',' + bin_params[2] - mantid.Rebin(InputWorkspace=ws, OutputWorkspace=ws, Params=rebin_string) \ No newline at end of file + mantid.Rebin(InputWorkspace=ws, OutputWorkspace=ws, Params=rebin_string)