[RF] Add CompileContext::markSubtreeAsCompiled()

This is a reoccuring pattern that merits its own helper function.

(cherry picked from commit 3d2fc3f)

Author: guitargeek

roofit/roofit/src/RooMomentMorphFuncND.cxx

@@ -368,7 +368,6 @@ RooMomentMorphFuncND::compileForNormSet(RooArgSet const &normSet, RooFit::Detail
    {
       RooArgSet branches;
       cache->_sum->branchNodeServerList(&branches);
-      branches.add(*cache->_sum);
       for (auto *b : branches) {
          std::vector<std::string> toRemove;
          for (auto const &attr : b->attributes()) {
@@ -408,17 +407,10 @@ RooMomentMorphFuncND::compileForNormSet(RooArgSet const &normSet, RooFit::Detail
    std::unique_ptr<RooAbsReal> newSum{static_cast<RooAbsReal *>(cust.build())};
    newSum->addOwnedComponents(std::move(newFractions));
 
-   // Mark every node in the freshly-cloned subtree as already compiled, so
-   // the recursive compileServers call below doesn't try to re-clone any of
-   // them. The leaves we still want compiled (the morph parameters and the
-   // observables) are reachable from these nodes' own server lists and will
-   // be visited.
-   ctx.markAsCompiled(*newSum);
-   RooArgSet allBranches;
-   newSum->branchNodeServerList(&allBranches);
-   for (auto *b : allBranches) {
-      ctx.markAsCompiled(*b);
-   }
+   // Tell the compile context the freshly-cloned subtree is already in its
+   // final form, so the recursive descent below only visits the leaves that
+   // still need compiling (the morph parameters and the observables).
+   ctx.markSubtreeAsCompiled(*newSum);
    ctx.compileServers(*newSum, normSet);
 
    return newSum;

roofit/roofitcore/inc/RooFit/Detail/NormalizationHelpers.h

@@ -42,6 +42,7 @@ class CompileContext {
    void compileServer(RooAbsArg &server, RooAbsArg &arg, RooArgSet const &normSet);
 
    void markAsCompiled(RooAbsArg &arg) const;
+   void markSubtreeAsCompiled(RooAbsArg &arg) const;
 
    // This information is used for the binned likelihood optimization.
    void setLikelihoodMode(bool flag) { _likelihoodMode = flag; }

roofit/roofitcore/src/NormalizationHelpers.cxx

@@ -76,6 +76,21 @@ void RooFit::Detail::CompileContext::markAsCompiled(RooAbsArg &arg) const
    arg.setAttribute("_COMPILED");
 }
 
+/// Mark `arg` and every branch node reachable through its server tree as
+/// already compiled. Use this after assembling or cloning a sub-graph
+/// yourself inside `compileForNormSet`: it prevents a follow-up
+/// `compileServers` call from re-cloning any of those internal nodes, while
+/// still letting the recursive descent reach the genuine leaves
+/// (fundamental observables and parameters) at the bottom of the tree.
+void RooFit::Detail::CompileContext::markSubtreeAsCompiled(RooAbsArg &arg) const
+{
+   RooArgSet branches;
+   arg.branchNodeServerList(&branches);
+   for (RooAbsArg *b : branches) {
+      markAsCompiled(*b);
+   }
+}
+
 bool RooFit::Detail::CompileContext::isMarkedAsCompiled(RooAbsArg const &arg) const
 {
    return arg.getAttribute("_COMPILED");

roofit/roofitcore/src/RooAbsCachedPdf.cxx

@@ -406,12 +406,9 @@ RooAbsCachedPdf::compileForNormSet(RooArgSet const &normSet, RooFit::Detail::Com
 
    auto newArg = std::make_unique<RooFit::Detail::RooNormalizedPdf>(*pdfClone, normSet);
 
-   // The direct servers are this pdf and the normalization integral, which
-   // don't need to be compiled further.
-   for (RooAbsArg *server : newArg->servers()) {
-      ctx.markAsCompiled(*server);
-   }
-   ctx.markAsCompiled(*newArg);
+   // The direct servers are the cloned pdf (already compiled above) and the
+   // freshly-built normalization integral. Neither needs further compilation.
+   ctx.markSubtreeAsCompiled(*newArg);
    newArg->addOwnedComponents(std::move(pdfClone));
    return newArg;
 }

roofit/roofitcore/src/RooAbsPdf.cxx

@@ -2790,12 +2790,9 @@ RooAbsPdf::compileForNormSet(RooArgSet const &normSet, RooFit::Detail::CompileCo
 
    auto newArg = std::make_unique<RooFit::Detail::RooNormalizedPdf>(*pdfClone, normSet);
 
-   // The direct servers are this pdf and the normalization integral, which
-   // don't need to be compiled further.
-   for (RooAbsArg *server : newArg->servers()) {
-      ctx.markAsCompiled(*server);
-   }
-   ctx.markAsCompiled(*newArg);
+   // The direct servers are the cloned pdf (already compiled above) and the
+   // freshly-built normalization integral. Neither needs further compilation.
+   ctx.markSubtreeAsCompiled(*newArg);
    newArg->addOwnedComponents(std::move(pdfClone));
    return newArg;
 }

roofit/roofitcore/src/RooRealSumPdf.cxx

@@ -767,12 +767,9 @@ RooRealSumPdf::compileForNormSet(RooArgSet const &normSet, RooFit::Detail::Compi
 
    auto newArg = std::make_unique<RooFit::Detail::RooNormalizedPdf>(*pdfClone, depList);
 
-   // The direct servers are this pdf and the normalization integral, which
-   // don't need to be compiled further.
-   for (RooAbsArg *server : newArg->servers()) {
-      ctx.markAsCompiled(*server);
-   }
-   ctx.markAsCompiled(*newArg);
+   // The direct servers are the cloned pdf (already compiled above) and the
+   // freshly-built normalization integral. Neither needs further compilation.
+   ctx.markSubtreeAsCompiled(*newArg);
    newArg->addOwnedComponents(std::move(pdfClone));
    return newArg;
 }