remove unused headers and use RooMinimizer

cms-sw · Jul 13, 2021 · 374b4ff · 374b4ff
1 parent 12039d5
commit 374b4ff
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/MuonAnalysis/MomentumScaleCalibration/test/Macros/RooFit/FitWithRooFit.cc b/MuonAnalysis/MomentumScaleCalibration/test/Macros/RooFit/FitWithRooFit.cc
@@ -23,7 +23,7 @@
 #include "RooPolynomial.h"
 #include "RooCBShape.h"
 #include "RooChi2Var.h"
-#include "RooFitLegacy/RooMinuit.h"
+#include "RooMinimizer.h"
 #include "RooBreitWigner.h"
 #include "RooFFTConvPdf.h"
 
@@ -126,7 +126,7 @@ class FitWithRooFit {
     // Fit with chi^2
     else {
       std::cout << "FITTING WITH CHI^2" << std::endl;
-      RooMinuit m(chi2);
+      RooMinimizer m(chi2);
       m.migrad();
       m.hesse();
       // RooFitResult* r_chi2_wgt = m.save();

diff --git a/PhysicsTools/TagAndProbe/src/TagProbeFitter.cc b/PhysicsTools/TagAndProbe/src/TagProbeFitter.cc
@@ -33,7 +33,6 @@
 #include "RooLinkedListIter.h"
 #include "RooMappedCategory.h"
 #include "RooMinimizer.h"
-#include "RooFitLegacy/RooMinuit.h"
 #include "RooMsgService.h"
 #include "RooMultiCategory.h"
 #include "RooNLLVar.h"
@@ -584,9 +583,8 @@ void TagProbeFitter::doFitEfficiency(RooWorkspace* w, string pdfName, RooRealVar
   RooAbsReal* simNLL = w->pdf("simPdf")->createNLL(*data, Extended(true), NumCPU(numCPU));
 
   RooMinimizer minimizer(*simNLL);  // we are going to use this for 'scan'
-  RooMinuit minuit(*simNLL);
-  minuit.setStrategy(1);
-  minuit.setProfile(true);
+  minimizer.setStrategy(1);
+  minimizer.setProfile(true);
   RooProfileLL profileLL("simPdfNLL", "", *simNLL, *w->var("efficiency"));
 
   //******* The block of code below is to make the fit converge faster.
@@ -618,17 +616,17 @@ void TagProbeFitter::doFitEfficiency(RooWorkspace* w, string pdfName, RooRealVar
       varFixer(w, true);
       //do fit
       minimizer.minimize("Minuit2", "Scan");
-      minuit.migrad();
-      minuit.hesse();
+      minimizer.migrad();
+      minimizer.hesse();
       //minuit.minos();
       //w->pdf("simPdf")->fitTo(*data, Save(true), Extended(true), NumCPU(numCPU), Strategy(2),
       //PrintLevel(quiet?-1:1), PrintEvalErrors(quiet?-1:1), Warnings(!quiet));
       //release vars
       varFixer(w, false);
       //do fit
       minimizer.minimize("Minuit2", "Scan");
-      minuit.migrad();
-      minuit.hesse();
+      minimizer.migrad();
+      minimizer.hesse();
       //minuit.minos();
       //w->pdf("simPdf")->fitTo(*data, Save(true), Extended(true), NumCPU(numCPU), Strategy(2),
       //PrintLevel(quiet?-1:1), PrintEvalErrors(quiet?-1:1), Warnings(!quiet));
@@ -643,8 +641,8 @@ void TagProbeFitter::doFitEfficiency(RooWorkspace* w, string pdfName, RooRealVar
 
     //do fit
     minimizer.minimize("Minuit2", "Scan");
-    minuit.migrad();
-    minuit.hesse();
+    minimizer.migrad();
+    minimizer.hesse();
     // initialize the profile likelihood
     profileLL.getVal();
     RooMinimizer* profMinuit = profileLL.minimizer();
@@ -665,8 +663,8 @@ void TagProbeFitter::doFitEfficiency(RooWorkspace* w, string pdfName, RooRealVar
 
     //do fit
     minimizer.minimize("Minuit2", "Scan");
-    minuit.migrad();
-    minuit.hesse();
+    minimizer.migrad();
+    minimizer.hesse();
     res.reset(w->pdf("simPdf")->fitTo(*data,
                                       Save(true),
                                       Extended(true),

diff --git a/PhysicsTools/TagAndProbe/test/utilities/ElectronTagAndProbeFitter.C b/PhysicsTools/TagAndProbe/test/utilities/ElectronTagAndProbeFitter.C
@@ -27,7 +27,6 @@
 #include "RooGaussian.h"
 #include "RooNLLVar.h"
 #include "RooConstVar.h"
-#include "RooFitLegacy/RooMinuit.h"
 #include "RooFitResult.h"
 #include "RooExponential.h"
 #include "RooFFTConvPdf.h"

diff --git a/PhysicsTools/TagAndProbe/test/utilities/ZeeBkgFit.C b/PhysicsTools/TagAndProbe/test/utilities/ZeeBkgFit.C
@@ -25,7 +25,6 @@
 #include "RooGaussian.h"
 #include "RooNLLVar.h"
 #include "RooConstVar.h"
-#include "RooFitLegacy/RooMinuit.h"
 #include "RooFitResult.h"
 #include "RooExponential.h"
 #include "RooFFTConvPdf.h"

diff --git a/PhysicsTools/TagAndProbe/test/utilities/fitZCat.C b/PhysicsTools/TagAndProbe/test/utilities/fitZCat.C
@@ -25,7 +25,6 @@
 #include "RooGaussian.h"
 #include "RooNLLVar.h"
 #include "RooConstVar.h"
-#include "RooFitLegacy/RooMinuit.h"
 #include "RooFitResult.h"
 #include "RooExponential.h"