[patch] root-6.04.06_gsl-2.patch

root-6.04.06_gsl-2.patch (text/plain), 1.21 KB, created by Juergen Rose on 2016-05-08 12:07:13 UTC

diff -r -U2 root-6.04.06_orig/math/mathmore/src/GSLMultiFit.h root-6.04.06/math/mathmore/src/GSLMultiFit.h
--- root-6.04.06_orig/math/mathmore/src/GSLMultiFit.h	2015-10-13 12:41:18.000000000 +0200
+++ root-6.04.06/math/mathmore/src/GSLMultiFit.h	2016-05-08 12:35:15.603265621 +0200
@@ -144,5 +144,8 @@
    const double * Gradient() const {
       if (fSolver == 0) return 0;
-      gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
+      //gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
+      gsl_matrix * J = gsl_matrix_alloc(fSolver->fdf->n, fSolver->fdf->p);
+      gsl_multifit_fdfsolver_jac(fSolver, J);
+      gsl_multifit_gradient(J, fSolver->f,fVec);
       return fVec->data;
    }
@@ -155,5 +158,8 @@
       fCov = gsl_matrix_alloc( npar, npar );
       static double kEpsrel = 0.0001;
-      int ret = gsl_multifit_covar(fSolver->J, kEpsrel, fCov);
+      // int ret = gsl_multifit_covar(fSolver->J, kEpsrel, fCov);
+      gsl_matrix * J = gsl_matrix_alloc(fSolver->fdf->n, fSolver->fdf->p);
+      gsl_multifit_fdfsolver_jac(fSolver, J);
+      int ret = gsl_multifit_covar(J, kEpsrel, fCov);
       if (ret != GSL_SUCCESS) return 0;
       return fCov->data;
Only in root-6.04.06/math/mathmore/src: GSLMultiFit.h~