diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h index 3553130b461e29e0a6027b5144f0bcfe94efeba6..e2b9ab9afe6a1b701be96f332c13dd802114a65c 100644 --- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h +++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h @@ -72,15 +72,12 @@ namespace Mantid /// Destructor virtual ~InelasticDiffSphere() {} - /// overwrite IFunction base class methods - std::string name()const{return "InelasticDiffSphere";} - virtual const std::string category() const { return "Optimization\\FitFunctions";} - std::vector<double> LorentzianCoefficients(double a) const; + //std::vector<double> LorentzianCoefficients(double a) const; protected: virtual void functionMW(double* out, const double* xValues, const size_t nData)const; //virtual void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData); //not yet implemented - //std::vector<double> LorentzianCoefficients(double a); + std::vector<double> LorentzianCoefficients(double a) const; private: std::vector<xnlc> xnl; //xnl coefficients @@ -104,7 +101,9 @@ namespace Mantid /// overwrite IFunction base class methods std::string name()const{return "DiffSphere";} - virtual const std::string category() const { return "Optimization\\FitFunctions";} + virtual const std::string category() const { return "Optimization\\FitModels";} + virtual int version() const { return 1;} + void functionMW(double* out, const double* xValues, const size_t nData)const; void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData); diff --git a/Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp b/Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp index 44d272d1562e22364e60a0d919286009f39f8b24..31d1920d8c4b6eaf39953372cfdd00695155a58b 100644 --- a/Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp +++ b/Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp @@ -183,11 +183,6 @@ void InelasticDiffSphere::functionDerivMW(API::Jacobian* out, const double* xVal } */ -//Height of the deltaFunction is determined by parameters from the inelastic part -double DiffSphere::ElasticIntensityTie(double I, double R, double Q) { - return I * pow( 3*boost::math::sph_bessel(1,Q*R)/(Q*R), 2 ); -} - DiffSphere::DiffSphere() { m_elastic = dynamic_cast<ElasticDiffSphere*>(API::FunctionFactory::Instance().createFunction("ElasticDiffSphere"));