Fixes after root-project/root#6443

cms-sw · Oct 2, 2024 · a789d04 · a789d04
1 parent 71e61ee
commit a789d04
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/OnlineDB/CSCCondDB/src/CSCFitAFEBThr.cc b/OnlineDB/CSCCondDB/src/CSCFitAFEBThr.cc
@@ -1,5 +1,5 @@
-#include "Minuit2/VariableMetricMinimizer.h"
 #include "Minuit2/FunctionMinimum.h"
+#include "Minuit2/MnStrategy.h"
 
 #include <OnlineDB/CSCCondDB/interface/CSCFitAFEBThr.h>
 #include <OnlineDB/CSCCondDB/interface/CSCThrTurnOnFcn.h>
@@ -132,7 +132,7 @@ bool CSCFitAFEBThr::ThresholdNoise(const std::vector<float>& inputx,
   /// 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), 1, 500, 0.1);
+      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

diff --git a/RecoVertex/BeamSpotProducer/interface/BSFitter.h b/RecoVertex/BeamSpotProducer/interface/BSFitter.h
@@ -20,7 +20,6 @@ ________________________________________________________________**/
 // ROOT
 #include "TMatrixD.h"
 #include "TMath.h"
-#include "Minuit2/VariableMetricMinimizer.h"
 #include "TH1F.h"
 
 // C++ standard
@@ -87,7 +86,6 @@ class BSFitter {
   TH1F *GetVzHisto() { return h1z; }
 
 private:
-  ROOT::Minuit2::ModularFunctionMinimizer *theFitter;
   //BSzFcn* theGausszFcn;
   BSpdfsFcn *thePDF;
 

diff --git a/RecoVertex/BeamSpotProducer/src/BSFitter.cc b/RecoVertex/BeamSpotProducer/src/BSFitter.cc
@@ -10,7 +10,6 @@
 
 ________________________________________________________________**/
 
-#include "Minuit2/VariableMetricMinimizer.h"
 #include "Minuit2/FunctionMinimum.h"
 #include "Minuit2/MnPrint.h"
 #include "Minuit2/MnMigrad.h"
@@ -70,11 +69,6 @@ BSFitter::BSFitter(const std::vector<BSTrkParameters> &BSvector) {
   //if (theGausszFcn == 0 ) {
   thePDF = new BSpdfsFcn();
 
-  //}
-  //if (theFitter == 0 ) {
-
-  theFitter = new VariableMetricMinimizer();
-
   //}
 
   fapplyd0cut = false;
@@ -95,7 +89,6 @@ BSFitter::BSFitter(const std::vector<BSTrkParameters> &BSvector) {
 BSFitter::~BSFitter() {
   //delete fBSvector;
   delete thePDF;
-  delete theFitter;
 }
 
 //______________________________________________________________________
@@ -271,7 +264,6 @@ reco::BeamSpot BSFitter::Fit_z_likelihood(double *inipar) {
   thePDF->SetData(fBSvector);
   //std::cout << "data loaded"<< std::endl;
 
-  //FunctionMinimum fmin = theFitter->Minimize(*theGausszFcn, par, err, 1, 500, 0.1);
   MnUserParameters upar;
   upar.Add("X0", 0., 0.);
   upar.Add("Y0", 0., 0.);