[math] Make ScipyMinimizer compile again

Author: guitargeek

math/scipy/CMakeLists.txt

@@ -9,7 +9,9 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Scipy
                                 Math/ScipyMinimizer.h
                               LINKDEF 
                                 Math/LinkDef.h
-                              LIBRARIES ${PYTHON_LIBRARIES_Development_Main}
+                              LIBRARIES
+                                Python3::NumPy
+                                Python3::Python
                               SOURCES
                                 src/ScipyMinimizer.cxx
                               DEPENDENCIES Core MathCore RIO

math/scipy/inc/Math/ScipyMinimizer.h

@@ -84,7 +84,7 @@ class ScipyMinimizer : public BasicMinimizer {
    PyObject *fBoundsMod;
    PyObject *fConstraintsList; /// contraints functions
    GenAlgoOptions *fExtraOpts;
-   std::function<bool(const std::vector<double> &, double *)> fHessianFunc;
+   std::function<bool(std::span<const double>, double *)> fHessianFunc;
    unsigned int fConstN;
    unsigned int fCalls;
 
@@ -158,7 +158,7 @@ class ScipyMinimizer : public BasicMinimizer {
    /// method to perform the minimization
    virtual bool Minimize() override;
 
-   virtual void SetHessianFunction(std::function<bool(const std::vector<double> &, double *)>) override;
+   virtual void SetHessianFunction(std::function<bool(std::span<const double>, double *)>) override;
 
 protected:
    ClassDef(ScipyMinimizer, 0) //

math/scipy/src/ScipyMinimizer.cxx

@@ -5,6 +5,7 @@
 #include <Math/IFunction.h>
 #include <Math/FitMethodFunction.h>
 #include <Math/GenAlgoOptions.h>
+#include <Math/Error.h>
 #include <TString.h>
 #include <iostream>
 
@@ -352,7 +353,7 @@ void ScipyMinimizer::PyRunString(TString code, TString errorMessage, int start)
 }
 
 //_______________________________________________________________________
-void ScipyMinimizer::SetHessianFunction(std::function<bool(const std::vector<double> &, double *)> func)
+void ScipyMinimizer::SetHessianFunction(std::function<bool(std::span<const double>, double *)> func)
 {
    fHessianFunc = func;
 }

math/scipy/test/testScipyMinimizer.cxx

@@ -28,7 +28,7 @@ double RosenBrockGrad(const double *x, unsigned int ipar)
       return 200 * (x[1] - x[0] * x[0]);
 }
 // Hessian function
-bool RosenBrockHessian(const std::vector<double> &xx, double *hess)
+bool RosenBrockHessian(std::span<const double> xx, double *hess)
 {
    const double x = xx[0];
    const double y = xx[1];
@@ -126,4 +126,4 @@ TEST_F(ScipyFitClass, FitContraint) // using constraint function
       ASSERT_NEAR(1, x[1], 0.5);
       ASSERT_NEAR(0, RosenBrock(x), 0.5);
    }
-}
+}

tutorials/math/fit/scipy.C

@@ -23,7 +23,7 @@ double RosenBrockGrad(const double *x, unsigned int ipar)
       return 200 * (x[1] - x[0] * x[0]);
 }
 
-bool RosenBrockHessian(const std::vector<double> &xx, double *hess)
+bool RosenBrockHessian(std::span<const double> xx, double *hess)
 {
    const double x = xx[0];
    const double y = xx[1];
@@ -78,4 +78,4 @@ int scipy()
 int main()
 {
    return scipy();
-}
+}