Local checkpoint Refs #9782

mantidproject · Sep 19, 2014 · ad174be · ad174be
1 parent 3b6f16b
commit ad174be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
@@ -134,8 +134,8 @@ set ( INC_FILES
 	inc/MantidCurveFitting/DampingMinimizer.h
 	inc/MantidCurveFitting/DeltaFunction.h
 	inc/MantidCurveFitting/DerivMinimizer.h
-	inc/MantidCurveFitting/DiffSphere.h
 	inc/MantidCurveFitting/DiffRotDiscreteCircle.h
+	inc/MantidCurveFitting/DiffSphere.h
 	inc/MantidCurveFitting/DllConfig.h
 	inc/MantidCurveFitting/EndErfc.h
 	inc/MantidCurveFitting/ExpDecay.h

diff --git a/Code/Mantid/Framework/CurveFitting/src/AutoDiffTestAlg.cpp b/Code/Mantid/Framework/CurveFitting/src/AutoDiffTestAlg.cpp
@@ -78,15 +78,15 @@ namespace
   {
     if ( type == "adept" )
     {
-      //return IFunction_sptr(new Lorentzians::LorentzianAutoDiff);
+      return IFunction_sptr(new Lorentzians::LorentzianAutoDiff);
       return IFunction_sptr(new Pearsons::PearsonVIIAutoDiff);
       return IFunction_sptr(new GaussianAutoDiff);
     } else if ( type == "num") {
-      //return IFunction_sptr(new Lorentzians::LorentzianNumDiff);
+      return IFunction_sptr(new Lorentzians::LorentzianNumDiff);
       return IFunction_sptr(new Pearsons::PearsonVIINumDiff);
       return IFunction_sptr(new GaussianNumDiff);
     }
-    //return IFunction_sptr(new Lorentzians::LorentzianHandCoded);
+    return IFunction_sptr(new Lorentzians::LorentzianHandCoded);
     return IFunction_sptr(new Pearsons::PearsonVIIHandCoded);
     return IFunction_sptr(new GaussianHandCoded);
   }

diff --git a/Code/Mantid/Framework/CurveFitting/src/LorentzianFamily.cpp b/Code/Mantid/Framework/CurveFitting/src/LorentzianFamily.cpp
@@ -70,10 +70,12 @@ void LorentzianAutoDiff::function1DAutoDiff(const FunctionDomain1D &domain, std:
     adept::adouble h = parameters.getParameter("Height");
     adept::adouble x0 = parameters.getParameter("Centre");
     adept::adouble s = parameters.getParameter("Gamma");
+    adept::adouble ssq = s * s;
 
     for(size_t i = 0; i < y.size(); ++i) {
         adept::adouble diff = domain[i] - x0;
-        y[i] = h * s * s / (diff*diff + s * s);
+
+        y[i] = h * ssq / (diff*diff + ssq);
     }
 }