Refs #10658 Add OFFSPEC support to old ISIS Refl UI

mantidproject · Jan 7, 2015 · c1bb024 · c1bb024
1 parent 96db873
commit c1bb024
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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.