Skip to content

[RF] Update xRooFit #22257

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

Open
will-cern wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[RF] Update xRooFit #22257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7369eec
Update xRooFit
will-cern May 12, 2026
4a90a3b
add python library
will-cern May 12, 2026
551c7d9
ensure printValue is declared outside of namespace
will-cern May 13, 2026
a905f3b
fix namespace issues
will-cern May 13, 2026
6b61295
more updates
will-cern May 14, 2026
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
2 changes: 2 additions & 0 deletions roofit/xroofit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitXRooFit
src/xRooNode_interactive.cxx
DICTIONARY_OPTIONS
"-writeEmptyRootPCM"
LIBRARIES
Python3::Python
DEPENDENCIES
HistFactory
RooFit
Expand Down
19 changes: 13 additions & 6 deletions roofit/xroofit/inc/RooFit/xRooFit/xRooNLLVar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,8 @@ class xRooNLLVar : public std::shared_ptr<RooAbsReal> {
double alt_value = std::numeric_limits<double>::quiet_NaN(),
const xRooFit::Asymptotics::PLLType &pllType = xRooFit::Asymptotics::Unknown);
xRooHypoSpace hypoSpace(const char *parName, xRooFit::TestStatistic::Type tsType, int nPoints = 0,
double low = -std::numeric_limits<double>::infinity(),
double high = std::numeric_limits<double>::infinity(),
double low = std::numeric_limits<double>::quiet_NaN(),
double high = std::numeric_limits<double>::quiet_NaN(),
double alt_value = std::numeric_limits<double>::quiet_NaN())
{
return hypoSpace(parName, nPoints, low, high, alt_value, xRooFit::Asymptotics::Unknown, tsType);
Expand Down Expand Up @@ -511,11 +511,18 @@ class xRooNLLVar : public std::shared_ptr<RooAbsReal> {
bool kReuseNLL = true;
};

END_XROOFIT_NAMESPACE

#ifndef XROOFIT_NAMESPACE_NAME
#ifdef XROOFIT_NAMESPACE
#define XROOFIT_NAMESPACE_NAME XROOFIT_NAMESPACE
#else
#define XROOFIT_NAMESPACE_NAME
#endif
#endif
namespace cling {
std::string printValue(const xRooNLLVar::xValueWithError *val);
std::string printValue(const std::map<std::string, xRooNLLVar::xValueWithError> *m);
std::string printValue(const XROOFIT_NAMESPACE_NAME::xRooNLLVar::xValueWithError *val);
std::string printValue(const std::map<std::string, XROOFIT_NAMESPACE_NAME::xRooNLLVar::xValueWithError> *m);
} // namespace cling

END_XROOFIT_NAMESPACE

#endif // include guard
35 changes: 31 additions & 4 deletions roofit/xroofit/inc/RooFit/xRooFit/xRooNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,23 @@ class xRooNode : public TNamed, public std::vector<std::shared_ptr<xRooNode>> {
return aa == bb;
};
};
auto begin() const -> xRooNodeIterator { return xRooNodeIterator(std::vector<std::shared_ptr<xRooNode>>::begin()); }
auto begin() const -> xRooNodeIterator
{
// this update is to resolve need for calling browse() before iterating, e.g.
// for(auto a : xRooNode(b).browse()) ...
// can now become the more natural:
// for(auto a : xRooNode(b)) ...
// but would still need e.g. xRooNode(s).browse().size() rather than xRooNode(s).size() which would give 0 for
// unpopulated case
static bool browseLock =
false; // need for blocking recursive calls to browse (since browse method uses the iterators)
if (!browseLock && get() && empty()) {
browseLock = true;
const_cast<xRooNode &>(*this).browse();
browseLock = false;
}
return xRooNodeIterator(std::vector<std::shared_ptr<xRooNode>>::begin());
}
auto end() const -> xRooNodeIterator { return xRooNodeIterator(std::vector<std::shared_ptr<xRooNode>>::end()); }

// needed in pyROOT to avoid it creating iterators that follow the 'get' to death
Expand Down Expand Up @@ -312,6 +328,9 @@ class xRooNode : public TNamed, public std::vector<std::shared_ptr<xRooNode>> {
xRooNode datasets()
const; // datasets corresponding to this pdf (parent nodes that do observable selections automatically applied)

xRooNode parents() const; // the clients of this node
xRooNode args() const; // all the nodes underneath this node

xRooNode Replace(const xRooNode &node); // use to replace a node in the tree at the location of this node
xRooNode Remove(const xRooNode &child);
xRooNode
Expand All @@ -326,6 +345,7 @@ class xRooNode : public TNamed, public std::vector<std::shared_ptr<xRooNode>> {

xRooNode reduced(const std::string &range = "", bool invert = false)
const; // return a node representing reduced version of this node, will use the SetRange to reduce if blank
xRooNode reduced(const std::function<bool(const xRooNode &)> selector) const;

// following versions are for the menu in the GUI
/** @private */
Expand Down Expand Up @@ -537,10 +557,17 @@ class xRooNode : public TNamed, public std::vector<std::shared_ptr<xRooNode>> {
ClassDefOverride(xRooNode, 0)
};

END_XROOFIT_NAMESPACE

#ifndef XROOFIT_NAMESPACE_NAME
#ifdef XROOFIT_NAMESPACE
#define XROOFIT_NAMESPACE_NAME XROOFIT_NAMESPACE
#else
#define XROOFIT_NAMESPACE_NAME
#endif
#endif
namespace cling {
std::string printValue(const xRooNode *val);
std::string printValue(const XROOFIT_NAMESPACE_NAME::xRooNode *val);
}

END_XROOFIT_NAMESPACE

#endif // include guard
92 changes: 64 additions & 28 deletions roofit/xroofit/src/xRooFit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
#include "TROOT.h"
#include "TBrowser.h"

#include "Python.h"

BEGIN_XROOFIT_NAMESPACE

std::shared_ptr<RooLinkedList> xRooFit::sDefaultNLLOptions = nullptr;
Expand Down Expand Up @@ -222,9 +224,8 @@ xRooFit::generateFrom(RooAbsPdf &pdf, const RooFitResult &_fr, bool expected, in
!(cClass && strcmp(cClass->GetName(), "SimpleGaussianConstraint") == 0)) {
TString className = (cClass) ? cClass->GetName() : "undefined";
oocoutW((TObject *)nullptr, Generation)
<< "xRooFit::generateFrom : constraint term " << thePdf->GetName()
<< " of type " << className << " is a non-supported type - result might be not correct "
<< std::endl;
<< "xRooFit::generateFrom : constraint term " << thePdf->GetName() << " of type "
<< className << " is a non-supported type - result might be not correct " << std::endl;
}

// in case of a Poisson constraint make sure the rounding is not set
Expand Down Expand Up @@ -514,7 +515,9 @@ std::shared_ptr<ROOT::Fit::FitConfig> xRooFit::defaultFitConfig()
extraOpts->SetValue("OptimizeConst", 2); // if 0 will disable constant term optimization and cache-and-track of the
// NLL. 1 = just caching, 2 = cache and track
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 29, 00)
extraOpts->SetValue("StrategySequence", "0s01s12s2s3m");
extraOpts->SetValue(
"StrategySequence",
"0s01s12s2s3"); // 'm' would indicate use migradImproved from minuit v1. Dropped from default for 6.40
extraOpts->SetValue("HesseStrategySequence", "23");
#else
extraOpts->SetValue("StrategySequence", "0s01s12s2m");
Expand All @@ -541,6 +544,29 @@ ROOT::Math::IOptions *xRooFit::defaultFitConfigOptions()
return const_cast<ROOT::Math::IOptions *>(defaultFitConfig()->MinimizerOptions().ExtraOptions());
}

void printCerr(const char *msg)
{
if (Py_IsInitialized()) {
PySys_WriteStderr("%s\n", msg);
// if (PyObject *sys_stdout = PySys_GetObject("stderr"); sys_stdout != nullptr) {
// Py_XDECREF(PyObject_CallMethod(sys_stdout, "flush", nullptr));
// }
} else {
std::cerr << msg << std::endl;
}
}
void printCout(const char *msg)
{
if (Py_IsInitialized()) {
PySys_WriteStdout("%s\n", msg);
// if (PyObject *sys_stdout = PySys_GetObject("stdout"); sys_stdout != nullptr) {
// Py_XDECREF(PyObject_CallMethod(sys_stdout, "flush", nullptr));
// }
} else {
std::cout << msg << std::endl;
}
}

class ProgressMonitor : public RooAbsReal {
public:
void (*oldHandlerr)(int) = nullptr;
Expand All @@ -549,7 +575,7 @@ class ProgressMonitor : public RooAbsReal {
static void interruptHandler(int signum)
{
if (signum == SIGINT) {
std::cout << "Minimization interrupted ... will exit as soon as possible" << std::endl;
printCout("Minimization interrupted ... will exit as soon as possible");
// TODO: create a global mutex for this
fInterrupt = true;
} else {
Expand Down Expand Up @@ -625,22 +651,22 @@ class ProgressMonitor : public RooAbsReal {
s.Reset();
std::stringstream sout;

sout << (counter) << ") (" << evalRate << "Hz) " << TDatime().AsString();
sout << TDatime().AsString() << ":(" << (counter) << "|" << evalRate << "Hz)";
if (!fState.empty())
sout << " : " << fState;
if (counter2) {
// doing a hesse step, estimate progress based on evaluations
int nRequired = prevPars.size();
if (nRequired > 1) {
nRequired *= (nRequired-1);
nRequired *= (nRequired - 1);
nRequired /= 2; // since only need to do the a 'triangle' of the hessian matrix
if (fState == "Hesse3") {
nRequired *= 4;
}
sout << " (~" << int(100.0 * (counter - counter2) / nRequired) << "%)";
}
}
sout << " : " << minVal << " Delta = " << (minVal - prevMin);
sout << " : " << minVal << " Delta=" << (minVal - prevMin);
if (minVal < prevMin) {
sout << " : ";
// compare minPars and prevPars, print biggest deltas
Expand Down Expand Up @@ -685,7 +711,7 @@ class ProgressMonitor : public RooAbsReal {
}
gSystem->ProcessEvents();
}
std::cerr << sout.str() << std::endl;
printCerr(sout.str().c_str()); // std::cerr << sout.str() << std::endl;

prevMin = minVal;
prevCounter = counter;
Expand All @@ -699,10 +725,11 @@ class ProgressMonitor : public RooAbsReal {
mutable int counter = 0;
int counter2 = 0; // used to estimate progress of a Hesse calculation

private:
RooRealProxy fFunc;
mutable double minVal = std::numeric_limits<double>::infinity();
mutable double prevMin = std::numeric_limits<double>::infinity();

private:
RooRealProxy fFunc;
mutable RooArgList minPars;
mutable RooArgList prevPars;
mutable int prevCounter = 0;
Expand Down Expand Up @@ -948,7 +975,7 @@ std::shared_ptr<const RooFitResult> xRooFit::minimize(RooAbsReal &nll,
if (!out) {
int strategy = fitConfig.MinimizerOptions().Strategy();
// Note: AsymptoticCalculator enforces not less than 1 on tolerance - should we do so too?
if (_progress) {
if (_progress && printLevel >= -2) {
_nll = new ProgressMonitor(*_nll, _progress);
ProgressMonitor::fInterrupt = false;
}
Expand Down Expand Up @@ -1094,11 +1121,13 @@ std::shared_ptr<const RooFitResult> xRooFit::minimize(RooAbsReal &nll,
// specified Also note that if fits are failing because of edm over max, it can be a good idea to activate the
// Offset option when building nll
if (printLevel >= -1) {
Warning("fitTo", "%s %s%s Status=%d (edm=%f, tol=%f, strat=%d), tries=#%d...", fitName.Data(),
_minimizer.fitter()->Config().MinimizerType().c_str(),
_minimizer.fitter()->Config().MinimizerAlgoType().c_str(), status,
_minimizer.fitter()->Result().Edm(), _minimizer.fitter()->Config().MinimizerOptions().Tolerance(),
_minimizer.fitter()->Config().MinimizerOptions().Strategy(), tries);
printCerr(TString::Format("Warning: %s %s%s Status=%d (edm=%f, tol=%f, strat=%d), tries=#%d...",
fitName.Data(), _minimizer.fitter()->Config().MinimizerType().c_str(),
_minimizer.fitter()->Config().MinimizerAlgoType().c_str(), status,
_minimizer.fitter()->Result().Edm(),
_minimizer.fitter()->Config().MinimizerOptions().Tolerance(),
_minimizer.fitter()->Config().MinimizerOptions().Strategy(), tries)
.Data());
}

// decide what to do next based on strategy sequence
Expand Down Expand Up @@ -1196,6 +1225,8 @@ std::shared_ptr<const RooFitResult> xRooFit::minimize(RooAbsReal &nll,
if (auto fff = dynamic_cast<ProgressMonitor *>(_nll); fff) {
fff->fState = TString::Format("Hesse%d", _minimizer.fitter()->Config().MinimizerOptions().Strategy());
fff->counter2 = fff->counter;
fff->prevMin =
fff->minVal; // reset minimum when change to hesse. Helps see if hesse eval gives new lower values
}

//_nll->getVal(); // for reasons I dont understand, if nll evaluated before hesse call the edm is smaller? -
Expand Down Expand Up @@ -1235,12 +1266,9 @@ std::shared_ptr<const RooFitResult> xRooFit::minimize(RooAbsReal &nll,
}
if ((_status != 0 || _minimizer.fitter()->GetMinimizer()->CovMatrixStatus() != 3) && status == 0 &&
printLevel >= -1) {
Warning("fitTo", "%s hesse status is %d, covQual=%d", fitName.Data(), _status,
_minimizer.fitter()->GetMinimizer()->CovMatrixStatus());
}

if (sIdx >= m_hessestrategy.Length() - 1) {
break; // run out of strategies to try, stop
printCerr(TString::Format("Warning: %s hesse status is %d, covQual=%d", fitName.Data(), _status,
_minimizer.fitter()->GetMinimizer()->CovMatrixStatus())
.Data());
}

if (_status == 0 && _minimizer.fitter()->GetMinimizer()->CovMatrixStatus() == 3) {
Expand All @@ -1250,6 +1278,11 @@ std::shared_ptr<const RooFitResult> xRooFit::minimize(RooAbsReal &nll,
// set the statusHistory to the cov status, since that's more informative
statusHistory.back().second = _minimizer.fitter()->GetMinimizer()->CovMatrixStatus();
}

if (sIdx >= m_hessestrategy.Length() - 1) {
break; // run out of strategies to try, stop
}

sIdx++;
} // end of hesse attempt loop
}
Expand All @@ -1260,6 +1293,7 @@ std::shared_ptr<const RooFitResult> xRooFit::minimize(RooAbsReal &nll,
if (auto fff = dynamic_cast<ProgressMonitor *>(_nll); fff) {
fff->fState = "Minos";
fff->counter2 = 0;
fff->prevMin = fff->minVal;
}
auto _status = _minimizer.minos(*mpars);
statusHistory.push_back(std::pair("Minos", _status));
Expand All @@ -1284,13 +1318,15 @@ std::shared_ptr<const RooFitResult> xRooFit::minimize(RooAbsReal &nll,
}
}

if (miniStrat < _minimizer.fitter()->Config().MinimizerOptions().Strategy() && hesse &&
if (printLevel >= -2 && miniStrat < _minimizer.fitter()->Config().MinimizerOptions().Strategy() && hesse &&
out->edm() > _minimizer.fitter()->Config().MinimizerOptions().Tolerance() * 1e-3 && out->status() != 3) {
// hesse may have updated edm by using a better strategy than used in the minimization
// so print a warning about this
std::cerr << "Warning: post-Hesse edm " << out->edm() << " greater than allowed by tolerance "
<< _minimizer.fitter()->Config().MinimizerOptions().Tolerance() * 1e-3
<< ", consider increasing minimization strategy" << std::endl;
std::stringstream ss;
ss << "Warning: post-Hesse edm " << out->edm()
<< " > tolerance max edm:" << _minimizer.fitter()->Config().MinimizerOptions().Tolerance() * 1e-3
<< ". Consider increasing your minimization strategy";
printCerr(ss.str().c_str());
// Dec24: As this is a new warning, will not update status code for now, so edm will be large
// but in the future we should probably update the code to 3 so that users don't miss this warning.
// out->setStatus(3); // edm above max
Expand Down Expand Up @@ -1399,7 +1435,7 @@ std::shared_ptr<const RooFitResult> xRooFit::minimize(RooAbsReal &nll,
fitConfig.MinimizerOptions().SetMinimizerType(actualFirstMinimizer);
}

if (_progress) {
if (_progress && printLevel >= -2) {
delete _nll;
}
}
Expand Down
4 changes: 2 additions & 2 deletions roofit/xroofit/src/xRooFitVersion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@

#pragma once

#define GIT_COMMIT_HASH "v0.0.2"
#define GIT_COMMIT_DATE "2026-04-28 15:01:00 +0100"
#define GIT_COMMIT_HASH "v0.0.3"
#define GIT_COMMIT_DATE "2026-05-12 14:07:11 +0100"
Loading
Loading