Skip to content

Commit

Permalink
Cherry pick pull request #18865
Browse files Browse the repository at this point in the history
Re #16925 Fix the bug

(cherry picked from commit 7758a96)

Re #16925 Fix another issue found during testing

(cherry picked from commit 16c4bbc)

Add patch release note
  • Loading branch information
Raquel Alvarez authored and martyngigg committed Feb 23, 2017
1 parent 17c4ab3 commit 9078e19
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
3 changes: 3 additions & 0 deletions docs/source/release/v3.9.1/index.rst
Expand Up @@ -25,6 +25,7 @@ Changes in this version
-----------------------

* `18833 <https://www.github.com/mantidproject/mantid/pull/18833>`_ Added check for if nonorthogonal axes should be displayed
* `18865 <https://www.github.com/mantidproject/mantid/pull/18865>`_ Fix bug in reflectometry GUI
* `18891 <https://www.github.com/mantidproject/mantid/pull/18891>`_ Fix bug in gd_prtn_chrg for chunked data
* `18907 <https://www.github.com/mantidproject/mantid/pull/18907>`_ Fix zeropadding for IMAT in Facilities.XML
* `18914 <https://www.github.com/mantidproject/mantid/pull/18914>`_ Fix mass ws deletion bug
Expand All @@ -41,6 +42,8 @@ Summary of impact
+=======+===================================================================================+=============================================+==============+
| 18833 | HKL axes now respect the non-orthogonal checkbox | Add check if button is in a checked state | **low** |
+-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
| 18865 | Correct behaviour when no transmission run is provided | Add check if runs are provided | **low** |
+-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
| 18891 | Fixes bug in gd_prtn_chrg for chunked data | Recalculate proton charge just prior to use | **low** |
+-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
| 18907 | Allows IMAT to use general file finding mechanism | Facilities file update | **low** |
Expand Down
8 changes: 5 additions & 3 deletions scripts/Interface/ui/reflectometer/refl_gui.py
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

0 comments on commit 9078e19

Please sign in to comment.