Skip to content

Commit

Permalink
Cherry-pick pull request #18915
Browse files Browse the repository at this point in the history
Add missing parameter in function call

(cherry picked from commit c0920c0)

Added patch release note.
  • Loading branch information
martyngigg committed Feb 23, 2017
1 parent 62d1f50 commit 1210167
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
20 changes: 12 additions & 8 deletions Framework/Algorithms/test/NormaliseByCurrentTest.h
Expand Up @@ -455,30 +455,34 @@ class NormaliseByCurrentTestPerformance : public CxxTest::TestSuite {
}

void test_execPerformance() {
doTest(execWSIn, execWSOut, 1.0, 0.5 * M_SQRT2, performance);
doTest(execWSIn, execWSOut, 1.0, 0.5 * M_SQRT2, false, performance);
}
void test_execInPlacePerformance() {
doTest(execInPlaceWSIn, execInPlaceWSIn, 1.0, 0.5 * M_SQRT2, performance);
doTest(execInPlaceWSIn, execInPlaceWSIn, 1.0, 0.5 * M_SQRT2, false,
performance);
}

void test_execEventPerformance() {
EventWorkspace_const_sptr outputEvent;
outputEvent = boost::dynamic_pointer_cast<const EventWorkspace>(
doTest(execEventWSIn, execEventWSOut, 1.0, 0.5 * M_SQRT2, performance));
outputEvent = boost::dynamic_pointer_cast<const EventWorkspace>(doTest(
execEventWSIn, execEventWSOut, 1.0, 0.5 * M_SQRT2, false, performance));
}
void test_execEventInPlacePerformance() {
EventWorkspace_const_sptr outputEvent;
outputEvent = boost::dynamic_pointer_cast<const EventWorkspace>(
doTest(execEventInPlaceWSIn, execEventInPlaceWSIn, 1.0, 0.5 * M_SQRT2,
performance));
false, performance));
}
void test_multiPeriodDataPerformance() {

// Check that normalisation has used the protonChargeByPeriod data. i.e Yout
// = Yin/2.0, Yout = Yin/4.0, ... for each period workspace.
doTest(multiPeriodWS1, "period1", 1.00, 1.500, performance); // 2/2, 3/2
doTest(multiPeriodWS2, "period2", 0.50, 0.750, performance); // 2/4, 3/4
doTest(multiPeriodWS3, "period3", 0.25, 0.375, performance); // 2/8, 3/8
doTest(multiPeriodWS1, "period1", 1.00, 1.500, false,
performance); // 2/2, 3/2
doTest(multiPeriodWS2, "period2", 0.50, 0.750, false,
performance); // 2/4, 3/4
doTest(multiPeriodWS3, "period3", 0.25, 0.375, false,
performance); // 2/8, 3/8
}

private:
Expand Down
3 changes: 3 additions & 0 deletions docs/source/release/v3.9.1/index.rst
Expand Up @@ -27,6 +27,7 @@ Changes in this version
* `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
* `18915 <https://www.github.com/mantidproject/mantid/pull/18915>`_ Add missing parameter in function call in performance test
* `18926 <https://www.github.com/mantidproject/mantid/pull/18926>`_ Fix wrong detector selection when loading high angle bank user files in ISIS SANS


Expand All @@ -43,6 +44,8 @@ Summary of impact
+-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
| 18914 | Avoids crash when mass deleting hundreds of workspaces in MantidPlot | Call single algorithm in separate thread | **medium** |
+-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
| 18915 | Fixes test builds | Fix function calls | **low** |
+-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
| 18926 | Enables ISIS SANS to select the correct bank of the detector | Fix interpreation of list indices in GUI | **low** |
+-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+

Expand Down

0 comments on commit 1210167

Please sign in to comment.