Skip to content
Snippets Groups Projects
Commit f9e37dac authored by Verena Reimund's avatar Verena Reimund
Browse files

Read Dx instead of read E in unit tests, merge master

Refs #22217
parent ae779970
No related branches found
No related tags found
No related merge requests found
...@@ -140,23 +140,14 @@ class SortXAxisTest(unittest.TestCase): ...@@ -140,23 +140,14 @@ class SortXAxisTest(unittest.TestCase):
dataY = [1, 2, 3, 1, 2, 3] dataY = [1, 2, 3, 1, 2, 3]
dx = [1, 2, 3, 1, 2, 3] dx = [1, 2, 3, 1, 2, 3]
unsortedws = CreateWorkspace(DataX=dataX, DataY=dataY, Dx=dx, UnitX='TOF', Distribution=True, NSpec=2) unsortedws = CreateWorkspace(DataX=dataX, DataY=dataY, Dx=dx, UnitX='TOF', Distribution=True, NSpec=2)
dataY.reverse()
dx.reverse() dx.reverse()
# Run the algorithm # Run the algorithm
sortedws = SortXAxis(InputWorkspace=unsortedws) sortedws = SortXAxis(InputWorkspace=unsortedws)
# Check the resulting data values for 1st spectrum. # Check the resulting data values for 1st spectrum.
sortedX = sortedws.readX(0)
sortedY = sortedws.readY(0)
sortedDx = sortedws.readDx(0) sortedDx = sortedws.readDx(0)
self.assertEqual(sorted(dataX[0:3]), sortedX.tolist())
self.assertEqual(dataY[0:3], sortedY.tolist())
self.assertEqual(dx[0:3], sortedDx.tolist()) self.assertEqual(dx[0:3], sortedDx.tolist())
# Check the resulting data values for 2nd spectrum. # Check the resulting data values for 2nd spectrum.
sortedX = sortedws.readX(1) sortedDx = sortedws.readDx(1)
sortedY = sortedws.readY(1)
sortedDx = sortedws.readE(1)
self.assertEqual(sorted(dataX[3:]), sortedX.tolist())
self.assertEqual(dataY[3:], sortedY.tolist())
self.assertEqual(dx[3:], sortedDx.tolist()) self.assertEqual(dx[3:], sortedDx.tolist())
DeleteWorkspace(unsortedws) DeleteWorkspace(unsortedws)
DeleteWorkspace(sortedws) DeleteWorkspace(sortedws)
...@@ -168,12 +159,8 @@ class SortXAxisTest(unittest.TestCase): ...@@ -168,12 +159,8 @@ class SortXAxisTest(unittest.TestCase):
unsortedws = CreateWorkspace(DataX=dataX, DataY=dataY, Dx=dx, UnitX='TOF', Distribution=False) unsortedws = CreateWorkspace(DataX=dataX, DataY=dataY, Dx=dx, UnitX='TOF', Distribution=False)
# Run the algorithm # Run the algorithm
sortedws = SortXAxis(InputWorkspace=unsortedws) sortedws = SortXAxis(InputWorkspace=unsortedws)
sortedX = sortedws.readX(0)
sortedY = sortedws.readY(0)
sortedDx = sortedws.readDx(0) sortedDx = sortedws.readDx(0)
# Check the resulting data values. Sorting operation should have resulted in no changes # Check the resulting data values. Sorting operation should have resulted in no changes
self.assertEqual(dataX, sortedX.tolist())
self.assertEqual(dataY, sortedY.tolist())
self.assertEqual(dx, sortedDx.tolist()) self.assertEqual(dx, sortedDx.tolist())
DeleteWorkspace(unsortedws) DeleteWorkspace(unsortedws)
DeleteWorkspace(sortedws) DeleteWorkspace(sortedws)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment