From 20de7dff6c2fadb4a72ff3d0987c5d8637e99976 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Mon, 16 Sep 2024 09:07:20 +0200 Subject: [PATCH] Minuit2::FCNBase: fix for root 6.32 --- RecoVertex/BeamSpotProducer/interface/BSpdfsFcn.h | 2 +- RecoVertex/BeamSpotProducer/interface/FcnBeamSpotFitPV.h | 2 +- RecoVertex/BeamSpotProducer/src/BSpdfsFcn.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RecoVertex/BeamSpotProducer/interface/BSpdfsFcn.h b/RecoVertex/BeamSpotProducer/interface/BSpdfsFcn.h index ca33384094dd5..f518c07ea3465 100644 --- a/RecoVertex/BeamSpotProducer/interface/BSpdfsFcn.h +++ b/RecoVertex/BeamSpotProducer/interface/BSpdfsFcn.h @@ -19,7 +19,7 @@ ________________________________________________________________**/ #include #include #include -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4) +#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1) #include #endif diff --git a/RecoVertex/BeamSpotProducer/interface/FcnBeamSpotFitPV.h b/RecoVertex/BeamSpotProducer/interface/FcnBeamSpotFitPV.h index e39584257832d..938a161fcb454 100644 --- a/RecoVertex/BeamSpotProducer/interface/FcnBeamSpotFitPV.h +++ b/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 override; #else double operator()(const std::vector&) const override; diff --git a/RecoVertex/BeamSpotProducer/src/BSpdfsFcn.cc b/RecoVertex/BeamSpotProducer/src/BSpdfsFcn.cc index d1295e4fd8eb8..cf6929476fba4 100644 --- a/RecoVertex/BeamSpotProducer/src/BSpdfsFcn.cc +++ b/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 parms) const { #else double BSpdfsFcn::PDFGauss_d(double z, double d, double sigmad, double phi, const std::vector& 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 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 parms) const { #else double BSpdfsFcn::PDFGauss_z(double z, double sigmaz, const std::vector& parms) const { @@ -89,7 +89,7 @@ double BSpdfsFcn::PDFGauss_z(double z, double sigmaz, const std::vector& } //______________________________________________________________________ -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4) +#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1) double BSpdfsFcn::operator()(const std::span params) const { #else double BSpdfsFcn::operator()(const std::vector& params) const {