From 4339e9bc856b5366d828bd676513309c4f6eb5f2 Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Sun, 5 Oct 2025 17:32:43 +0200
Subject: [PATCH] [RF] Avoid implicit creation of normalization set in
 RooNumRunningInt

Fixes this error when using the RooNumRunningInt class:

```
what():  calling RooAbsReal::getVal() with r-value references to the
normalization set is not allowed, because it breaks RooFits caching
logic and potentially introduces significant overhead. Please
explicitly create the RooArgSet outside the call to getVal().
```
---
 roofit/roofitcore/inc/RooNumRunningInt.h   |  9 ++---
 roofit/roofitcore/src/RooNumRunningInt.cxx | 40 ++++++----------------
 2 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/roofit/roofitcore/inc/RooNumRunningInt.h b/roofit/roofitcore/inc/RooNumRunningInt.h
index d58c19cf1936e..be8e0fe212845 100644
--- a/roofit/roofitcore/inc/RooNumRunningInt.h
+++ b/roofit/roofitcore/inc/RooNumRunningInt.h
@@ -23,11 +23,9 @@ class RooNumRunningInt : public RooAbsCachedReal {
 public:
   RooNumRunningInt(const char *name, const char *title, RooAbsReal& _func, RooRealVar& _x, const char* binningName="cache");
   RooNumRunningInt(const RooNumRunningInt& other, const char* name=nullptr) ;
-  TObject* clone(const char* newname=nullptr) const override { return new RooNumRunningInt(*this,newname); }
-  ~RooNumRunningInt() override ;
-
-protected:
+  TObject *clone(const char *newname = nullptr) const override { return new RooNumRunningInt(*this, newname); }
 
+  protected:
   class RICacheElem: public FuncCacheElem {
   public:
     RICacheElem(const RooNumRunningInt& ri, const RooArgSet* nset) ;
@@ -39,8 +37,7 @@ class RooNumRunningInt : public RooAbsCachedReal {
     RooNumRunningInt* _self ;
     std::vector<double> _ax ;
     std::vector<double> _ay ;
-    RooRealVar* _xx ;
-
+    RooArgSet _xx;
   } ;
 
   friend class RICacheElem ;
diff --git a/roofit/roofitcore/src/RooNumRunningInt.cxx b/roofit/roofitcore/src/RooNumRunningInt.cxx
index e29d3ad533820..59d61e8ccddf1 100644
--- a/roofit/roofitcore/src/RooNumRunningInt.cxx
+++ b/roofit/roofitcore/src/RooNumRunningInt.cxx
@@ -35,11 +35,6 @@ when any of the parameters of the input p.d.f. has changed.
 #include "RooHistPdf.h"
 #include "RooRealVar.h"
 
-using std::string;
-
-
-
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Construct running integral of function '_func' over x_print from
 /// the lower bound on _x to the present value of _x using a numeric
@@ -70,29 +65,17 @@ RooNumRunningInt::RooNumRunningInt(const RooNumRunningInt& other, const char* na
  {
  }
 
-
-
-////////////////////////////////////////////////////////////////////////////////
-/// Destructor
-
-RooNumRunningInt::~RooNumRunningInt()
-{
-}
-
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Return unique name for RooAbsCachedPdf cache components
 /// constructed from input function name
 
 const char* RooNumRunningInt::inputBaseName() const
 {
-  static string ret ;
-  ret = func.arg().GetName() ;
-  ret += "_NUMRUNINT" ;
-  return ret.c_str() ;
-} ;
-
-
+   static std::string ret;
+   ret = func.arg().GetName();
+   ret += "_NUMRUNINT";
+   return ret.c_str();
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Construct RunningIntegral CacheElement
@@ -100,7 +83,7 @@ const char* RooNumRunningInt::inputBaseName() const
 RooNumRunningInt::RICacheElem::RICacheElem(const RooNumRunningInt &self, const RooArgSet *nset)
    : FuncCacheElem(self, nset),
      _self(&const_cast<RooNumRunningInt &>(self)),
-     _xx(static_cast<RooRealVar *>(hist()->get()->find(self.x.arg().GetName())))
+     _xx(*hist()->get()->find(self.x.arg().GetName()))
 {
   // Instantiate temp arrays
   _ax.resize(hist()->numEntries());
@@ -110,7 +93,7 @@ RooNumRunningInt::RICacheElem::RICacheElem(const RooNumRunningInt &self, const R
 
   for (int i=0 ; i<hist()->numEntries() ; i++) {
     hist()->get(i) ;
-    _ax[i] = _xx->getVal() ;
+    _ax[i] = static_cast<RooRealVar *>(_xx.first())->getVal();
     _ay[i] = -1 ;
   }
 
@@ -125,7 +108,7 @@ RooArgList RooNumRunningInt::RICacheElem::containedArgs(Action action)
   RooArgList ret ;
   ret.add(FuncCacheElem::containedArgs(action)) ;
   ret.add(*_self) ;
-  ret.add(*_xx) ;
+  ret.add(_xx);
   return ret ;
 }
 
@@ -234,9 +217,8 @@ void RooNumRunningInt::RICacheElem::addRange(Int_t ixlo, Int_t ixhi, Int_t nbins
 void RooNumRunningInt::RICacheElem::addPoint(Int_t ix)
 {
   hist()->get(ix) ;
-  _self->x = _xx->getVal() ;
-  _ay[ix] = _self->func.arg().getVal(*_xx) ;
-
+  _self->x = static_cast<RooRealVar *>(_xx.first())->getVal();
+  _ay[ix] = _self->func.arg().getVal(_xx);
 }
 
 
@@ -295,5 +277,3 @@ double RooNumRunningInt::evaluate() const
   std::cout << "RooNumRunningInt::evaluate(" << GetName() << ")" << std::endl ;
   return 0 ;
 }
-
-