diff --git a/OnlineDB/CSCCondDB/src/CSCFitAFEBThr.cc b/OnlineDB/CSCCondDB/src/CSCFitAFEBThr.cc index e71f97e64008a..76bf50c82ae0f 100644 --- a/OnlineDB/CSCCondDB/src/CSCFitAFEBThr.cc +++ b/OnlineDB/CSCCondDB/src/CSCFitAFEBThr.cc @@ -1,4 +1,3 @@ -#include "Minuit2/VariableMetricMinimizer.h" #include "Minuit2/FunctionMinimum.h" #include @@ -130,7 +129,7 @@ bool CSCFitAFEBThr::ThresholdNoise(const std::vector& inputx, // <<" "<0.1) - FunctionMinimum fmin = theFitter->Minimize(*theOBJfun, parinit, erparinit, 1, 500, 0.1); + FunctionMinimum fmin = theFitter->Minimize(*theOBJfun, {parinit, erparinit}, MnStrategy{1}, 500, 0.1); status = fmin.IsValid(); diff --git a/RecoVertex/BeamSpotProducer/interface/BSFitter.h b/RecoVertex/BeamSpotProducer/interface/BSFitter.h index 4048720f73fa6..7bac767a69497 100644 --- 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 index 79f7fb5f290a7..6e3f824c006ec 100644 --- 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 &BSvector) { //if (theGausszFcn == 0 ) { thePDF = new BSpdfsFcn(); - //} - //if (theFitter == 0 ) { - - theFitter = new VariableMetricMinimizer(); - //} fapplyd0cut = false; @@ -95,7 +89,6 @@ BSFitter::BSFitter(const std::vector &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.);