Merge pull request #46006 from smuzaffar/FCNBase-root632

Minuit2::FCNBase: fix for root 6.32

Author: cmsbuild

RecoVertex/BeamSpotProducer/interface/BSpdfsFcn.h

@@ -19,7 +19,7 @@ ________________________________________________________________**/
 #include <iostream>
 #include <string>
 #include <RVersion.h>
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
 #include <span>
 #endif
 

RecoVertex/BeamSpotProducer/interface/FcnBeamSpotFitPV.h

@@ -31,7 +31,7 @@ class FcnBeamSpotFitPV : public ROOT::Minuit2::FCNBase {
   // deltaFcn for definition of the uncertainty
   double Up() const override { return errorDef_; }
   // -2lnL value based on vector of parameters
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
   double operator()(std::span<const double>) const override;
 #else
   double operator()(const std::vector<double>&) const override;

RecoVertex/BeamSpotProducer/src/BSpdfsFcn.cc

@@ -20,7 +20,7 @@ ________________________________________________________________**/
 #endif
 
 //______________________________________________________________________
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
 double BSpdfsFcn::PDFGauss_d(double z, double d, double sigmad, double phi, std::span<const double> parms) const {
 #else
 double BSpdfsFcn::PDFGauss_d(double z, double d, double sigmad, double phi, const std::vector<double>& parms) const {
@@ -42,7 +42,7 @@ double BSpdfsFcn::PDFGauss_d(double z, double d, double sigmad, double phi, cons
 }
 
 //______________________________________________________________________
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
 double BSpdfsFcn::PDFGauss_d_resolution(double z, double d, double phi, double pt, std::span<const double> parms) const {
 #else
 double BSpdfsFcn::PDFGauss_d_resolution(
@@ -68,7 +68,7 @@ double BSpdfsFcn::PDFGauss_d_resolution(
 }
 
 //______________________________________________________________________
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
 double BSpdfsFcn::PDFGauss_z(double z, double sigmaz, std::span<const double> parms) const {
 #else
 double BSpdfsFcn::PDFGauss_z(double z, double sigmaz, const std::vector<double>& parms) const {
@@ -89,7 +89,7 @@ double BSpdfsFcn::PDFGauss_z(double z, double sigmaz, const std::vector<double>&
 }
 
 //______________________________________________________________________
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
 double BSpdfsFcn::operator()(const std::span<const double> params) const {
 #else
 double BSpdfsFcn::operator()(const std::vector<double>& params) const {