Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug in reflectometry GUI #18865

Merged
merged 2 commits into from Feb 16, 2017
Merged

Fix bug in reflectometry GUI #18865

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7758a96
Re #16925 Fix the bug
Feb 15, 2017
16c4bbc
Re #16925 Fix another issue found during testing
Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions scripts/Interface/ui/reflectometer/refl_gui.py
View file
Open in desktop
Expand Up @@ -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))
Expand All @@ -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')
Expand Down