Skip to content

Minuit2::FCNBase: fix for root 6.32 #46006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Sep 16, 2024
Merged

Minuit2::FCNBase: fix for root 6.32 #46006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RecoVertex/BeamSpotProducer/interface/BSpdfsFcn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion RecoVertex/BeamSpotProducer/interface/FcnBeamSpotFitPV.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions RecoVertex/BeamSpotProducer/src/BSpdfsFcn.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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(
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down