Skip to content

[RF] Avoid implicit creation of normalization set in RooNumRunningInt #20034

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −36
Open

[RF] Avoid implicit creation of normalization set in RooNumRunningInt #20034

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
9 changes: 3 additions & 6 deletions roofit/roofitcore/inc/RooNumRunningInt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand All @@ -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 ;
Expand Down
40 changes: 10 additions & 30 deletions roofit/roofitcore/src/RooNumRunningInt.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -70,37 +65,25 @@ 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

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());
Expand All @@ -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 ;
}

Expand All @@ -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 ;
}

Expand Down Expand Up @@ -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);
}


Expand Down Expand Up @@ -295,5 +277,3 @@ double RooNumRunningInt::evaluate() const
std::cout << "RooNumRunningInt::evaluate(" << GetName() << ")" << std::endl ;
return 0 ;
}


Loading