Merge remote-tracking branch 'origin/feature/9892_DSFInterp1DFitTest_segfault'

Code/Mantid/Framework/PythonInterface/mantid/api/src/FitFunctions/IFunction1DAdapter.cpp

@@ -53,7 +53,7 @@ namespace Mantid
       Py_DECREF(xvals);
       if(PyErr_Occurred())
       {
-        Py_DECREF(result);
+        Py_XDECREF(result);
         Environment::throwRuntimeError(true);
       }
 

Code/Mantid/Framework/PythonInterface/plugins/functions/DSFinterp1DFit.py

@@ -28,9 +28,6 @@ from mantid.simpleapi import mtd
 from mantid import logger
 import numpy
 from scipy.interpolate import interp1d
-from pdb import set_trace as tr
-
-#from pdb import set_trace as tr
 
 class DSFinterp1DFit(IFunction1D):
 
@@ -117,7 +114,7 @@ class DSFinterp1DFit(IFunction1D):
           raise IndexError(message)
       # check number of input workspaces and parameters is the same
       if len(self._ParameterValues) != len(self._InputWorkspaces):
-        message = 'Number of InputWorkspaces and ParameterValues should be the same. Found {0} and {1}, respectively'.format(len(self._ParameterValues), len(self._InputWorkspaces))
+        message = 'Number of InputWorkspaces and ParameterValues should be the same. Found {0} and {1}, respectively'.format(len(self._InputWorkspaces), len(self._ParameterValues))
         logger.error(message)
         raise ValueError(message)
       # check the regression type is valid

Code/Mantid/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py

 import unittest
 import numpy
-#from pdb import set_trace as tr
+
 from mantid.kernel import logger
 from mantid.simpleapi import CreateWorkspace, Fit, mtd, SaveNexus
 from mantid.api import AnalysisDataService
+import sys
 
 class DSFinterp1DTestTest(unittest.TestCase):