Skip to content

[RF] Fix Windows compiler warnings about mixing int and bool #22540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guitargeek merged 1 commit into from
Jun 9, 2026
Merged

[RF] Fix Windows compiler warnings about mixing int and bool #22540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 8 additions & 22 deletions roofit/roofit/test/testFitPerf.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,6 @@ int FitUsingRooFit(TH1 *hist, TF1 *func)
// unbinned roo fit
int FitUsingRooFit(TTree *tree, TF1 *func)
{

int iret = 0;
std::cout << "\n************************************************************\n";
std::cout << "\tFit using RooFit (Likelihood Fit)\n";
std::cout << "\twith function " << func->GetName() << "\n";
Expand Down Expand Up @@ -567,26 +565,21 @@ int FitUsingRooFit(TTree *tree, TF1 *func)
std::cout << " Roofit status " << result->status() << std::endl;
result->Print();
#endif
if (save)
iret |= int(result == nullptr);

if (iret != 0) {
if (save && result == nullptr) {
std::cout << "Fit failed " << std::endl;
return iret;
return 1;
}
}

w.Stop();
std::cout << "\nTime: \t" << w.RealTime() << " , " << w.CpuTime() << std::endl;
std::cout << "\n************************************************************\n";
return iret;
return 0;
}

// unbinned roo fit (large tree)
int FitUsingRooFit2(TTree *tree)
{

int iret = 0;
std::cout << "\n************************************************************\n";
std::cout << "\tFit using RooFit (Likelihood Fit)\n";

Expand Down Expand Up @@ -647,23 +640,16 @@ int FitUsingRooFit2(TTree *tree)
std::unique_ptr<RooFitResult> result{
pdf[N - 1]->fitTo(data, RooFit::Minos(0), RooFit::Hesse(1), RooFit::PrintLevel(level), RooFit::Save(save))};

#ifdef DEBUG
assert(result == nullptr);
//std::cout << " Roofit status " << result->status() << std::endl;
//result->Print();
#endif

iret |= int(result != nullptr);

if (iret != 0)
return iret;
// assert(iret == 0);
if (save && result == nullptr) {
std::cout << "Fit failed " << std::endl;
return 1;
}
}

w.Stop();
std::cout << "\nTime: \t" << w.RealTime() << " , " << w.CpuTime() << std::endl;
std::cout << "\n************************************************************\n";
return iret;
return 0;
}

double poly2(const double *x, const double *p)
Expand Down
7 changes: 4 additions & 3 deletions roofit/roofit/test/testRooFit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ int FitUsingRooFit(TTree &tree, RooAbsPdf &pdf, RooArgSet &xvars)
std::cout << " Roofit status " << result->status() << std::endl;
result->Print();
#endif
iret |= int(result == nullptr);
if (save && result == nullptr)
iret = 1;
}

w.Stop();
Expand Down Expand Up @@ -265,15 +266,15 @@ int FitUsingNewFitter(FitObj *fitobj, Func &func, bool useGrad = false)
std::cout << "\tFit using new Fit::Fitter\n";
std::cout << "\tMinimizer is " << MinType::name() << " " << MinType::name2() << std::endl;

int iret = 0;
TStopwatch w;
w.Start();

#ifdef DEBUG
func.SetParameters(iniPar);
iret |= DoFit<MinType>(fitobj, func, true, useGrad);
int iret = DoFit<MinType>(fitobj, func, true, useGrad);

#else
int iret = 0;
for (int i = 0; i < nfit; ++i) {
func.SetParameters(iniPar);
iret = DoFit<MinType>(fitobj, func, false, useGrad);
Expand Down
Loading