diff --git a/scripts/Diffraction/isis_powder/routines/focus.py b/scripts/Diffraction/isis_powder/routines/focus.py index 53da12961c8f7e0d89f85ddd7600fa2744e2aa42..f3202bc55ddca5299339097ea5d2dfcc711269c4 100644 --- a/scripts/Diffraction/isis_powder/routines/focus.py +++ b/scripts/Diffraction/isis_powder/routines/focus.py @@ -120,9 +120,8 @@ def _divide_one_spectrum_by_spline(spectrum, spline, instrument): if instrument.get_instrument_prefix() == "GEM": divided = mantid.Divide(LHSWorkspace=spectrum, RHSWorkspace=rebinned_spline, OutputWorkspace=spectrum, StoreInADS=False) - output = _crop_spline_to_percent_of_max(rebinned_spline, divided) - mantid.mtd['output'] = output - return output + return _crop_spline_to_percent_of_max(rebinned_spline, divided, spectrum) + divided = mantid.Divide(LHSWorkspace=spectrum, RHSWorkspace=rebinned_spline, OutputWorkspace=spectrum) return divided @@ -167,7 +166,7 @@ def _test_splined_vanadium_exists(instrument, run_details): " \nHave you run the method to create a Vanadium spline with these settings yet?\n") -def _crop_spline_to_percent_of_max(spline, input_ws): +def _crop_spline_to_percent_of_max(spline, input_ws, spectrum): spline_spectrum = spline.readY(0) y_val = numpy.amax(spline_spectrum) y_val = y_val / 100 @@ -175,5 +174,5 @@ def _crop_spline_to_percent_of_max(spline, input_ws): small_spline_indecies = numpy.nonzero(spline_spectrum > y_val)[0] x_max = x_list[small_spline_indecies[-1]] x_min = x_list[small_spline_indecies[0]] - output = mantid.CropWorkspace(inputWorkspace=input_ws, XMin=x_min, XMax=x_max, StoreInADS=False) + output = mantid.CropWorkspace(inputWorkspace=input_ws, XMin=x_min, XMax=x_max, OutputWorkspace=spectrum) return output