Merge pull request #46079 from guitargeek/minuit2_fix

Follow up on recent Minuit 2 code changes

Author: cmsbuild

OnlineDB/CSCCondDB/interface/CSCThrTurnOnFcn.h

@@ -11,10 +11,6 @@
 
 #include "Minuit2/FCNBase.h"
 #include <vector>
-#include <RVersion.h>
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
-#include <span>
-#endif
 
 class CSCThrTurnOnFcn : public ROOT::Minuit2::FCNBase {
 private:
@@ -43,11 +39,7 @@ class CSCThrTurnOnFcn : public ROOT::Minuit2::FCNBase {
   void setNorm(float n) { norm = n; };
 
   /// Provide the chi-squared function for the given data
-#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;
-#endif
 
   ///@@ What?
   double Up() const override { return 1.; }

OnlineDB/CSCCondDB/src/CSCFitAFEBThr.cc

@@ -130,12 +130,9 @@ bool CSCFitAFEBThr::ThresholdNoise(const std::vector<float>& inputx,
   //                                               <<" "<<ery[i]<<std::endl;
 
   /// Fit  as 1D, <=500 iterations, edm=10**-5 (->0.1)
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
-  FunctionMinimum fmin = theFitter->Minimize(
-      *theOBJfun, {std::span<double>(parinit), std::span<double>(erparinit)}, MnStrategy{1}, 500, 0.1);
-#else
-  FunctionMinimum fmin = theFitter->Minimize(*theOBJfun, parinit, erparinit, 1, 500, 0.1);
-#endif
+  FunctionMinimum fmin =
+      theFitter->Minimize(*theOBJfun, MnUserParameterState{parinit, erparinit}, MnStrategy{1}, 500, 0.1);
+
   status = fmin.IsValid();
 
   if (status) {

OnlineDB/CSCCondDB/src/CSCThrTurnOnFcn.cc

@@ -5,11 +5,7 @@
 #include <vector>
 #include "TMath.h"
 
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
-double CSCThrTurnOnFcn::operator()(std::span<const double> par) const {
-#else
 double CSCThrTurnOnFcn::operator()(const std::vector<double>& par) const {
-#endif
   double x, y, er, fn;
   double N = norm;
   double chi2 = 0.;

RecoVertex/BeamSpotProducer/interface/BSpdfsFcn.h

@@ -18,10 +18,6 @@ ________________________________________________________________**/
 
 #include <iostream>
 #include <string>
-#include <RVersion.h>
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
-#include <span>
-#endif
 
 class BSpdfsFcn : public ROOT::Minuit2::FCNBase {
 public:
@@ -30,25 +26,14 @@ class BSpdfsFcn : public ROOT::Minuit2::FCNBase {
   // define pdfs to use
   void SetPDFs(std::string usepdfs) { fusepdfs = usepdfs; }
 
-#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;
-#endif
   double Up() const override { return 1.; }
 
 private:
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
-  double PDFGauss_d(double z, double d, double sigmad, double phi, std::span<const double> parms) const;
-  double PDFGauss_d_resolution(double z, double d, double phi, double pt, std::span<const double> parms) const;
-
-  double PDFGauss_z(double z, double sigmaz, std::span<const double> parms) const;
-#else
   double PDFGauss_d(double z, double d, double sigmad, double phi, const std::vector<double>& parms) const;
   double PDFGauss_d_resolution(double z, double d, double phi, double pt, const std::vector<double>& parms) const;
 
   double PDFGauss_z(double z, double sigmaz, const std::vector<double>& parms) const;
-#endif
 
   std::string fusepdfs;
   std::vector<BSTrkParameters> fBSvector;

RecoVertex/BeamSpotProducer/interface/FcnBeamSpotFitPV.h

@@ -18,8 +18,6 @@
 #include "Minuit2/FCNBase.h"
 
 #include <vector>
-#include <span>
-#include <RVersion.h>
 
 class FcnBeamSpotFitPV : public ROOT::Minuit2::FCNBase {
 public:
@@ -31,11 +29,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, 33, 1)
-  double operator()(std::span<const double>) const override;
-#else
   double operator()(const std::vector<double>&) const override;
-#endif
   // vertex count used for the fit (after selection)
   unsigned int nrOfVerticesUsed() const;
 

RecoVertex/BeamSpotProducer/src/BSpdfsFcn.cc

@@ -15,16 +15,9 @@ ________________________________________________________________**/
 
 #include <cmath>
 #include <vector>
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
-#include <span>
-#endif
 
 //______________________________________________________________________
-#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 {
-#endif
   //---------------------------------------------------------------------------
   //  PDF for d0 distribution. This PDF is a simple gaussian in the
   //  beam reference frame.
@@ -42,12 +35,8 @@ double BSpdfsFcn::PDFGauss_d(double z, double d, double sigmad, double phi, cons
 }
 
 //______________________________________________________________________
-#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(
     double z, double d, double phi, double pt, const std::vector<double>& parms) const {
-#endif
   //---------------------------------------------------------------------------
   //  PDF for d0 distribution. This PDF is a simple gaussian in the
   //  beam reference frame. The IP resolution is parametrize by a linear
@@ -68,12 +57,7 @@ double BSpdfsFcn::PDFGauss_d_resolution(
 }
 
 //______________________________________________________________________
-#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 {
-#endif
-
   //---------------------------------------------------------------------------
   //  PDF for z-vertex distribution. This distribution
   // is parametrized by a simple normalized gaussian distribution.
@@ -89,11 +73,7 @@ double BSpdfsFcn::PDFGauss_z(double z, double sigmaz, const std::vector<double>&
 }
 
 //______________________________________________________________________
-#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 {
-#endif
   double f = 0.0;
 
   //std::cout << "fusepdfs=" << fusepdfs << " params.size="<<params.size() << std::endl;

RecoVertex/BeamSpotProducer/src/FcnBeamSpotFitPV.cc

@@ -51,11 +51,7 @@ unsigned int FcnBeamSpotFitPV::nrOfVerticesUsed() const {
   return nVtx;
 }
 
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 33, 1)
-double FcnBeamSpotFitPV::operator()(std::span<const double> pars) const {
-#else
 double FcnBeamSpotFitPV::operator()(const std::vector<double>& pars) const {
-#endif
   //
   // fit parameters
   //