Refs #10594 Don't put group workspaces in a TOF group

mantidproject · Nov 21, 2014 · 0761716 · 0761716
1 parent 9f4b306
commit 0761716
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py b/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py
@@ -972,11 +972,10 @@ def _do_run(self, runno, row, which):
             else:
                 raise RuntimeError("Up to 2 transmission runs can be specified. No more than that.")
 
-        if self.__alg_use:
-            #Load the runs required ConvertToWavelength will deal with the transmission runs, while .to_workspace will deal with the run itself
-
-            ws = ConvertToWavelength.to_workspace(loadedRun, ws_prefix="")
+        #Load the runs required ConvertToWavelength will deal with the transmission runs, while .to_workspace will deal with the run itself
+        ws = ConvertToWavelength.to_workspace(loadedRun, ws_prefix="")
 
+        if self.__alg_use:
             #If we're dealing with a workspace group, we'll manually map execution over each group member
             #We do this so we can get ThetaOut correctly (see ticket #10597 for why we can't at the moment)
             if isinstance(ws, WorkspaceGroup):
@@ -1004,7 +1003,7 @@ def _do_run(self, runno, row, which):
         else:
             wlam, wq, th = quick(loadedRun, trans=transmission_ws, theta=angle, tof_prefix="")
 
-        if self.__group_tof_workspaces:
+        if self.__group_tof_workspaces and not isinstance(ws, WorkspaceGroup):
             if "TOF" in mtd:
                 tof_group = mtd["TOF"]
                 if not tof_group.contains(loadedRun):