From a10c27d944eb214809f6a9422d81103dc337499a Mon Sep 17 00:00:00 2001
From: Sam Jenkins <s.jenkins@stfc.ac.uk>
Date: Tue, 2 Oct 2018 16:52:53 +0100
Subject: [PATCH] Re #23690 Fixed failing tests
---
.../reference/ISIS_Powder-GEM83605_FocusSempty.nxs.md5 | 2 +-
scripts/test/isis_powder/ISISPowderFocusCropTest.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Testing/SystemTests/tests/analysis/reference/ISIS_Powder-GEM83605_FocusSempty.nxs.md5 b/Testing/SystemTests/tests/analysis/reference/ISIS_Powder-GEM83605_FocusSempty.nxs.md5
index d85832bc0b8..e1dee0343f1 100644
--- a/Testing/SystemTests/tests/analysis/reference/ISIS_Powder-GEM83605_FocusSempty.nxs.md5
+++ b/Testing/SystemTests/tests/analysis/reference/ISIS_Powder-GEM83605_FocusSempty.nxs.md5
@@ -1 +1 @@
-7fd06e065b645d51c69c248303f76265
+1feccda871823814107a21de6eb9a260
diff --git a/scripts/test/isis_powder/ISISPowderFocusCropTest.py b/scripts/test/isis_powder/ISISPowderFocusCropTest.py
index b7216cde911..590ad10edbb 100644
--- a/scripts/test/isis_powder/ISISPowderFocusCropTest.py
+++ b/scripts/test/isis_powder/ISISPowderFocusCropTest.py
@@ -9,7 +9,7 @@ class ISISPowderFocusCropTest(unittest.TestCase):
x = [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
y = [0, 0, 10, 30, 2000, 80, 50, 40, 30, 25, 30]
test_ws = mantid.CreateWorkspace(DataX=x, DataY=y)
- test_ws = focus._crop_spline_to_percent_of_max(test_ws, test_ws)
+ test_ws = focus._crop_spline_to_percent_of_max(test_ws, test_ws, test_ws)
y_compare = [30, 2000, 80, 50, 40, 30, 25, 30]
result = test_ws.readY(0)
for compare, val in zip(y_compare, result):
@@ -19,7 +19,7 @@ class ISISPowderFocusCropTest(unittest.TestCase):
x = [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
y = [50, 100, 300, 500, 2000, 80, 50, 0, 0, 0, 0]
test_ws = mantid.CreateWorkspace(DataX=x, DataY=y)
- test_ws = focus._crop_spline_to_percent_of_max(test_ws, test_ws)
+ test_ws = focus._crop_spline_to_percent_of_max(test_ws, test_ws, test_ws)
y_compare = [50, 100, 300, 500, 2000, 80, 50]
result = test_ws.readY(0)
for compare, val in zip(y_compare, result):
@@ -29,7 +29,7 @@ class ISISPowderFocusCropTest(unittest.TestCase):
x = [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
y = [0, 0, 10, 30, 2000, 80, 50, 0, 0, 0, 0]
test_ws = mantid.CreateWorkspace(DataX=x, DataY=y)
- test_ws = focus._crop_spline_to_percent_of_max(test_ws, test_ws)
+ test_ws = focus._crop_spline_to_percent_of_max(test_ws, test_ws, test_ws)
y_compare = [30, 2000, 80, 50]
result = test_ws.readY(0)
for compare, val in zip(y_compare, result):
@@ -39,7 +39,7 @@ class ISISPowderFocusCropTest(unittest.TestCase):
x = [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
y = [1, 5, 10, 30, 20, 80, 50, 40, 20, 10, 1]
test_ws = mantid.CreateWorkspace(DataX=x, DataY=y)
- test_ws = focus._crop_spline_to_percent_of_max(test_ws, test_ws)
+ test_ws = focus._crop_spline_to_percent_of_max(test_ws, test_ws, test_ws)
y_compare = [1, 5, 10, 30, 20, 80, 50, 40, 20, 10, 1]
result = test_ws.readY(0)
for compare, val in zip(y_compare, result):
--
GitLab