Merge remote-tracking branch 'origin/feature/10623_enable_poldi_2d_fit'

mantidproject · Dec 5, 2014 · 661616c · 661616c
2 parents 5950169 + b209bff
commit 661616c
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/...ysisTests/POLDICalculateSpectrum2DTest.py → ...ests/AnalysisTests/POLDIFitPeaks2DTest.py b/...ysisTests/POLDICalculateSpectrum2DTest.py → ...ests/AnalysisTests/POLDIFitPeaks2DTest.py
@@ -2,8 +2,9 @@
 from mantid.simpleapi import *
 import numpy as np
 
-'''Checking results of POLDICalculateSpectrum2DTest.'''
-class POLDICalculateSpectrum2DTest(stresstesting.MantidStressTest):
+'''The system test currently checks that the calculation of 2D spectra
+works correctly.'''
+class POLDIFitPeaks2DTest(stresstesting.MantidStressTest):
   def runTest(self):
     dataFiles = ["poldi2013n006904"]
 
@@ -29,10 +30,12 @@ def loadReferenceSpectrum(self, filenames):
 
   def runCalculateSpectrum2D(self, filenames):
     for dataFile in filenames:
-      PoldiCalculateSpectrum2D(InputWorkspace=dataFile,
+      PoldiFitPeaks2D(InputWorkspace=dataFile,
                                PoldiPeakWorkspace="%s_reference_Peaks" % (dataFile),
                                PeakProfileFunction="Gaussian",
-                               OutputWorkspace="%s_2d_calculated_Spectrum" % (dataFile))
+                               RefinedPoldiPeakWorkspace="%s_refined_Peaks" % (dataFile),
+                               OutputWorkspace="%s_2d_calculated_Spectrum" % (dataFile),
+                               MaximumIterations=0)
 
   def analyseResults(self, filenames):
     for dataFile in filenames:
@@ -42,8 +45,12 @@ def analyseResults(self, filenames):
       self.assertEqual(calculatedSpectrum.getNumberHistograms(), referenceSpectrum.getNumberHistograms())
 
       for i in range(calculatedSpectrum.getNumberHistograms()):
-        refHisto = referenceSpectrum.readY(i)
         calHisto = calculatedSpectrum.readY(i)
 
-        absDiff = np.fabs(refHisto - calHisto)
-        self.assertTrue(np.all(absDiff < 7e-4))
+        if not referenceSpectrum.getDetector(i).isMasked():
+          refHisto = referenceSpectrum.readY(i)
+
+          absDiff = np.fabs(refHisto - calHisto)
+          self.assertTrue(np.all(absDiff < 7e-4))
+        else:
+          self.assertTrue(np.all(calHisto == 0.0))