Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions roofit/histfactory/test/stressHistFactory.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <TFile.h>
#include <TH1F.h>
#include <TMath.h>
#include <TMinuit.h>
#include <TString.h>
#include <TSystem.h>

Expand Down Expand Up @@ -428,24 +427,8 @@ class PdfComparison {
pVars1->assign(*pVars2);

// do the fit
std::string minimizerType = "Minuit2";
int prec = gErrorIgnoreLevel;
gErrorIgnoreLevel = kFatal;
if (gSystem->Load("libMinuit2") < 0)
minimizerType = "Minuit";
gErrorIgnoreLevel = prec;

std::unique_ptr<RooFitResult> r1{
rPDF1.fitTo(rTestData, Save(), PrintLevel(-1), Minimizer(minimizerType.c_str()))};
// L.M: for minuit we need to rest otherwise fit could fail
if (minimizerType == "Minuit") {
if (gMinuit) {
delete gMinuit;
gMinuit = nullptr;
}
}
std::unique_ptr<RooFitResult> r2{
rPDF2.fitTo(rTestData, Save(), PrintLevel(-1), Minimizer(minimizerType.c_str()))};
std::unique_ptr<RooFitResult> r1{rPDF1.fitTo(rTestData, Save(), PrintLevel(-1))};
std::unique_ptr<RooFitResult> r2{rPDF2.fitTo(rTestData, Save(), PrintLevel(-1))};

if (_verb > 0) {
r1->Print("v");
Expand Down
Loading