Skip to content

[v638][RF] Backport recent RooFit bugfixes #20444

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
merged 4 commits into from
Nov 17, 2025
Merged

[v638][RF] Backport recent RooFit bugfixes #20444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d098815
[hist] fix typoes
ferdymercury Nov 15, 2025
3d440bc
[RF] Correctly normalize RooSimultaneous when projecting over data
guitargeek Nov 16, 2025
e138e3a
[RF] Avoid warning about duplicate command arguments
guitargeek Nov 16, 2025
8c5b1ff
[RF] Return reference to actual RooAbsReal in `RooPolyVar::x()` getter
guitargeek Nov 16, 2025
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
4 changes: 2 additions & 2 deletions hist/hist/src/TBackCompFitter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ void TBackCompFitter::FixParameter(Int_t ipar) {
void TBackCompFitter::GetConfidenceIntervals(Int_t n, Int_t ndim, const Double_t *x, Double_t *ci, Double_t cl)
{
if (!fFitter->Result().IsValid()) {
Error("GetConfidenceIntervals","Cannot compute confidence intervals with an invalide fit result");
Error("GetConfidenceIntervals", "Cannot compute confidence intervals with an invalid fit result");
return;
}

Expand Down Expand Up @@ -367,7 +367,7 @@ void TBackCompFitter::GetConfidenceIntervals(Int_t n, Int_t ndim, const Double_t
void TBackCompFitter::GetConfidenceIntervals(TObject *obj, Double_t cl)
{
if (!fFitter->Result().IsValid() ) {
Error("GetConfidenceIntervals","Cannot compute confidence intervals with an invalide fit result");
Error("GetConfidenceIntervals", "Cannot compute confidence intervals with an invalid fit result");
return;
}

Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooPolyVar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class RooPolyVar : public RooAbsReal {
Int_t getAnalyticalIntegral(RooArgSet &allVars, RooArgSet &analVars, const char *rangeName = nullptr) const override;
double analyticalIntegral(Int_t code, const char *rangeName = nullptr) const override;

RooRealProxy const &x() const { return _x; }
RooAbsReal const &x() const { return _x.arg(); }
RooArgList const &coefList() const { return _coefList; }
int lowestOrder() const { return _lowestOrder; }

Expand Down
11 changes: 10 additions & 1 deletion roofit/roofitcore/src/RooAbsPdf.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,15 @@ inline double getLog(double prob, RooAbsReal const *caller)
return std::log(prob);
}

void replaceOrAdd(RooLinkedList &lst, TObject &obj)
{
TObject *old = lst.FindObject(obj.GetName());
if (old)
lst.Replace(old, &obj);
else
lst.Add(&obj);
}

} // namespace

using std::endl, std::string, std::ostream, std::vector, std::pair, std::make_pair;
Expand Down Expand Up @@ -2173,7 +2182,7 @@ RooPlot* RooAbsPdf::plotOn(RooPlot* frame, RooLinkedList& cmdList) const
// Append overriding scale factor command at end of original command list
RooCmdArg tmp = RooFit::Normalization(scaleFactor,Raw) ;
tmp.setInt(1,1) ; // Flag this normalization command as created for internal use (so that VisualizeError can strip it)
cmdList.Add(&tmp) ;
replaceOrAdd(cmdList, tmp);

// Was a component selected requested
if (haveCompSel) {
Expand Down
23 changes: 16 additions & 7 deletions roofit/roofitcore/src/RooSimultaneous.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,15 @@ std::map<std::string, RooAbsPdf *> createPdfMap(const RooArgList &inPdfList, Roo
return pdfMap;
}

void replaceOrAdd(RooLinkedList &lst, TObject &obj)
{
TObject *old = lst.FindObject(obj.GetName());
if (old)
lst.Replace(old, &obj);
else
lst.Add(&obj);
}

} // namespace

RooSimultaneous::InitializationOutput::~InitializationOutput() = default;
Expand Down Expand Up @@ -774,9 +783,9 @@ RooPlot* RooSimultaneous::plotOn(RooPlot *frame, RooLinkedList& cmdList) const
// WVE -- do not adjust normalization for asymmetry plots
RooLinkedList cmdList2(cmdList) ;
if (!cmdList.find("Asymmetry")) {
cmdList2.Add(&tmp1) ;
replaceOrAdd(cmdList2, tmp1);
}
cmdList2.Add(&tmp2) ;
replaceOrAdd(cmdList2, tmp2);

// Plot single component
RooPlot* retFrame = getPdf(idxCatClone->getCurrentLabel())->plotOn(frame,cmdList2);
Expand Down Expand Up @@ -810,8 +819,8 @@ RooPlot* RooSimultaneous::plotOn(RooPlot *frame, RooLinkedList& cmdList) const
}
if (skip) continue ;

// Instantiate a RRV holding this pdfs weight fraction
wgtCompList.addOwned(std::make_unique<RooRealVar>(proxy->name(),"coef",wTable->getFrac(proxy->name())));
// Instantiate a RRV holding this pdfs weight
wgtCompList.addOwned(std::make_unique<RooRealVar>(proxy->name(),"coef",wTable->get(proxy->name())));
sumWeight += wTable->getFrac(proxy->name()) ;

// Add the PDF to list list
Expand Down Expand Up @@ -875,15 +884,15 @@ RooPlot* RooSimultaneous::plotOn(RooPlot *frame, RooLinkedList& cmdList) const
RooCmdArg tmp2 = RooFit::ProjWData(*projDataSet,*projDataTmp) ;
// WVE -- do not adjust normalization for asymmetry plots
if (!cmdList.find("Asymmetry")) {
cmdList2.Add(&tmp1) ;
replaceOrAdd(cmdList2, tmp1);
}
cmdList2.Add(&tmp2) ;
replaceOrAdd(cmdList2, tmp2);

RooPlot* frame2 ;
if (!projSetTmp.empty()) {
// Plot temporary function
RooCmdArg tmp3 = RooFit::Project(projSetTmp) ;
cmdList2.Add(&tmp3) ;
replaceOrAdd(cmdList2, tmp3);
frame2 = plotVar.plotOn(frame,cmdList2) ;
} else {
// Plot temporary function
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ ROOT_ADD_GTEST(testRooPolyFunc testRooPolyFunc.cxx LIBRARIES Gpad RooFitCore)
ROOT_ADD_GTEST(testRooRealL TestStatistics/testRooRealL.cxx LIBRARIES RooFitCore)
ROOT_ADD_GTEST(testRooRombergIntegrator testRooRombergIntegrator.cxx LIBRARIES MathCore RooFitCore)
ROOT_ADD_GTEST(testRooSTLRefCountList testRooSTLRefCountList.cxx LIBRARIES RooFitCore)
ROOT_ADD_GTEST(testRooSimultaneous testRooSimultaneous.cxx LIBRARIES RooFitCore)
ROOT_ADD_GTEST(testRooSimultaneous testRooSimultaneous.cxx LIBRARIES RooFitCore RooFit)
ROOT_ADD_GTEST(testRooTruthModel testRooTruthModel.cxx LIBRARIES RooFitCore RooFit)
ROOT_ADD_GTEST(testSumW2Error testSumW2Error.cxx LIBRARIES Gpad RooFitCore)
ROOT_ADD_GTEST(testTestStatistics testTestStatistics.cxx LIBRARIES RooFitCore)
Expand Down
34 changes: 34 additions & 0 deletions roofit/roofitcore/test/testRooSimultaneous.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
#include <RooGenericPdf.h>
#include <RooHelpers.h>
#include <RooMinimizer.h>
#include <RooPlot.h>
#include <RooProdPdf.h>
#include <RooRandom.h>
#include <RooRealVar.h>
#include <RooSimultaneous.h>
#include <RooThresholdCategory.h>
#include <RooUniform.h>
#include <RooWorkspace.h>

#include "gtest_wrapper.h"
Expand Down Expand Up @@ -507,3 +509,35 @@ TEST_P(TestStatisticTest, RooSimultaneousSingleChannelCrossCheckWithCondVar)
EXPECT_TRUE(resSimWrapped->isIdentical(*resDirect))
<< "Inconsistency in RooSimultaneous wrapping with ConditionalObservables";
}

/// GitHub issue #20383.
/// Check that the the simultaneous pdf is normalized correctly when plotting
/// with a projection dataset.
TEST(RooSimultaneous, PlotProjWData)
{
RooRealVar x("x", "x", -8, 8);
x.setBins(1);

RooUniform model{"model", "", x};
RooUniform model_ctl{"model_ctl", "", x};

RooCategory sample("sample", "sample", {{"physics", 0}, {"control", 1}});

RooArgSet vars{x, sample};
RooDataHist combData{"combData", "", vars};
sample.setLabel("physics");
combData.add(vars, 1000);
sample.setLabel("control");
combData.add(vars, 2000);

RooSimultaneous simPdf("simPdf", "simultaneous pdf", {{"physics", &model}, {"control", &model_ctl}}, sample);

RooPlot *frame = x.frame();
combData.plotOn(frame);
simPdf.plotOn(frame, RooFit::ProjWData(sample, combData));

// The pdf should be normalized to match the data. In this test, we plot a
// single bin and the model is uniform, to the curve should be equal to the
// sum of data entries in the center.
EXPECT_DOUBLE_EQ(frame->getCurve()->interpolate(0.), combData.sumEntries());
}
2 changes: 1 addition & 1 deletion tutorials/roofit/roofit/rf501_simultaneouspdf.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void rf501_simultaneouspdf()
// ---------------------------------------------------

// Perform simultaneous fit of model to data and model_ctl to data_ctl
std::unique_ptr<RooFitResult> fitResult{simPdf.fitTo(combData, PrintLevel(-1), Save(), PrintLevel(-1))};
std::unique_ptr<RooFitResult> fitResult{simPdf.fitTo(combData, Save(), PrintLevel(-1))};
fitResult->Print();

// P l o t m o d e l s l i c e s o n d a t a s l i c e s
Expand Down
Loading