Merge pull request #18865 from mantidproject/16925_Fix_reduction_with…

…_no_transmission_run Fix bug in reflectometry GUI
mantidproject · Feb 16, 2017 · f46a26a · f46a26a
2 parents def2d97 + 16c4bbc
commit f46a26a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/scripts/Interface/ui/reflectometer/refl_gui.py b/scripts/Interface/ui/reflectometer/refl_gui.py
@@ -1042,7 +1042,8 @@ def _do_run(self, runno, row, which):
                     alg = AlgorithmManager.create("ReflectometryReductionOneAuto")
                     alg.initialize()
                     alg.setProperty("InputWorkspace", ws[i])
-                    alg.setProperty("FirstTransmissionRun", group_trans_ws)
+                    if group_trans_ws:
+                        alg.setProperty("FirstTransmissionRun", group_trans_ws)
                     if angle is not None:
                         alg.setProperty("ThetaIn", angle)
                     alg.setProperty("OutputWorkspaceBinned", runno+'_IvsQ_binned_'+str(i+1))
@@ -1066,15 +1067,16 @@ def _do_run(self, runno, row, which):
                     wlamGroup.append(wlam)
                     thetaGroup.append(th)
 
-                wqBinned = GroupWorkspaces(InputWorkspaces=wqGroup, OutputWorkspace=runno+'_IvsQ_binned')
+                wqBinned = GroupWorkspaces(InputWorkspaces=wqGroupBinned, OutputWorkspace=runno+'_IvsQ_binned')
                 wq = GroupWorkspaces(InputWorkspaces=wqGroup, OutputWorkspace=runno+'_IvsQ')
                 wlam = GroupWorkspaces(InputWorkspaces=wlamGroup, OutputWorkspace=runno+'_IvsLam')
                 th = thetaGroup[0]
             else:
                 alg = AlgorithmManager.create("ReflectometryReductionOneAuto")
                 alg.initialize()
                 alg.setProperty("InputWorkspace", ws)
-                alg.setProperty("FirstTransmissionRun", transmission_ws)
+                if transmission_ws:
+                    alg.setProperty("FirstTransmissionRun", transmission_ws)
                 if angle is not None:
                     alg.setProperty("ThetaIn", angle)
                 alg.setProperty("OutputWorkspaceBinned", runno+'_IvsQ_binned')