From 7758a961fa6d54ecbefc6b8d69568427883aa157 Mon Sep 17 00:00:00 2001 From: Raquel Alvarez Date: Wed, 15 Feb 2017 09:04:37 +0000 Subject: [PATCH 1/2] Re #16925 Fix the bug --- scripts/Interface/ui/reflectometer/refl_gui.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/Interface/ui/reflectometer/refl_gui.py b/scripts/Interface/ui/reflectometer/refl_gui.py index fc808e9a7dc1..bfa00a4b2662 100644 --- 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)) @@ -1074,7 +1075,8 @@ def _do_run(self, runno, row, which): 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') From 16c4bbca59b0c600ab3037cadce094f2afb06347 Mon Sep 17 00:00:00 2001 From: Raquel Alvarez Date: Wed, 15 Feb 2017 12:19:54 +0000 Subject: [PATCH 2/2] Re #16925 Fix another issue found during testing --- scripts/Interface/ui/reflectometer/refl_gui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Interface/ui/reflectometer/refl_gui.py b/scripts/Interface/ui/reflectometer/refl_gui.py index bfa00a4b2662..6d275c51f9a8 100644 --- a/scripts/Interface/ui/reflectometer/refl_gui.py +++ b/scripts/Interface/ui/reflectometer/refl_gui.py @@ -1067,7 +1067,7 @@ 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]