Skip to content

Commit 20de7df

Browse files
committed
Minuit2::FCNBase: fix for root 6.32
1 parent a86063d commit 20de7df

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

RecoVertex/BeamSpotProducer/interface/BSpdfsFcn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ________________________________________________________________**/
1919
#include <iostream>
2020
#include <string>
2121
#include <RVersion.h>
22-
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
22+
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
2323
#include <span>
2424
#endif
2525

RecoVertex/BeamSpotProducer/interface/FcnBeamSpotFitPV.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class FcnBeamSpotFitPV : public ROOT::Minuit2::FCNBase {
3131
// deltaFcn for definition of the uncertainty
3232
double Up() const override { return errorDef_; }
3333
// -2lnL value based on vector of parameters
34-
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
34+
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
3535
double operator()(std::span<const double>) const override;
3636
#else
3737
double operator()(const std::vector<double>&) const override;

RecoVertex/BeamSpotProducer/src/BSpdfsFcn.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ________________________________________________________________**/
2020
#endif
2121

2222
//______________________________________________________________________
23-
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
23+
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
2424
double BSpdfsFcn::PDFGauss_d(double z, double d, double sigmad, double phi, std::span<const double> parms) const {
2525
#else
2626
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
4242
}
4343

4444
//______________________________________________________________________
45-
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
45+
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
4646
double BSpdfsFcn::PDFGauss_d_resolution(double z, double d, double phi, double pt, std::span<const double> parms) const {
4747
#else
4848
double BSpdfsFcn::PDFGauss_d_resolution(
@@ -68,7 +68,7 @@ double BSpdfsFcn::PDFGauss_d_resolution(
6868
}
6969

7070
//______________________________________________________________________
71-
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
71+
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
7272
double BSpdfsFcn::PDFGauss_z(double z, double sigmaz, std::span<const double> parms) const {
7373
#else
7474
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>&
8989
}
9090

9191
//______________________________________________________________________
92-
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 32, 4)
92+
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
9393
double BSpdfsFcn::operator()(const std::span<const double> params) const {
9494
#else
9595
double BSpdfsFcn::operator()(const std::vector<double>& params) const {

0 commit comments

Comments
 (0)