From c1bb02416920d3c6fe43cbc75ded482d0e66422b Mon Sep 17 00:00:00 2001 From: Harry Jeffery Date: Wed, 7 Jan 2015 10:05:24 +0000 Subject: [PATCH] Refs #10658 Add OFFSPEC support to old ISIS Refl UI --- .../scripts/Interface/ui/reflectometer/refl_gui.py | 2 +- .../Reflectometry/isis_reflectometry/combineMulti.py | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py b/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py index d8eb10f996a8..569a85819416 100644 --- a/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py +++ b/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py @@ -71,7 +71,7 @@ def __init__(self): self.__group_tof_workspaces_key = "group_tof_workspaces" #Setup instrument options with defaults assigned. - self.instrument_list = ['INTER', 'SURF', 'CRISP', 'POLREF'] + self.instrument_list = ['INTER', 'SURF', 'CRISP', 'POLREF', 'OFFSPEC'] self.polarisation_instruments = ['CRISP', 'POLREF'] self.polarisation_options = {'None' : PolarisationCorrection.NONE, '1-PNR' : PolarisationCorrection.PNR, '2-PA' : PolarisationCorrection.PA } diff --git a/Code/Mantid/scripts/Reflectometry/isis_reflectometry/combineMulti.py b/Code/Mantid/scripts/Reflectometry/isis_reflectometry/combineMulti.py index 9541079d3215..037f88995b45 100644 --- a/Code/Mantid/scripts/Reflectometry/isis_reflectometry/combineMulti.py +++ b/Code/Mantid/scripts/Reflectometry/isis_reflectometry/combineMulti.py @@ -40,13 +40,8 @@ def combineDataMulti(wksp_list,output_wksp,beg_overlap,end_overlap,Qmin,Qmax,bin else: overlapLow = beg_overlap[i+1] overlapHigh = end_overlap[i] - - #check if multi-period - if isinstance(currentSum, WorkspaceGroup): - raise RuntimeError("combineMulti, does not support multi-period input workspaces") - else: - print "Iteration",i - currentSum, scale_factor = stitch2(currentSum, mtd[wksp_list[i+1]], currentSum.name(), overlapLow, overlapHigh, Qmin, Qmax, binning, scale_high) + print "Iteration",i + currentSum, scale_factor = stitch2(currentSum, mtd[wksp_list[i+1]], currentSum.name(), overlapLow, overlapHigh, Qmin, Qmax, binning, scale_high) RenameWorkspace(InputWorkspace=currentSum.name(),OutputWorkspace=output_wksp) # Remove any existing workspaces from the workspace list.