Skip to content

[RF] Small fixes to debug printout in RooRealIntegral and RooEffGenContext #12178

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
guitargeek merged 3 commits into from
Feb 1, 2023
Merged

[RF] Small fixes to debug printout in RooRealIntegral and RooEffGenContext #12178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7537092
Fix debug print in `RooRealIntegral::evaluate`
Jan 31, 2023
7a08efb
Format RooEffGenContext.h and cxx to match the ROOT style
Jan 31, 2023
b07f976
Add printing to `RooEffGenContext`
Jan 31, 2023
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
25 changes: 13 additions & 12 deletions roofit/roofitcore/inc/RooEffGenContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,23 @@ class RooAbsReal;

class RooEffGenContext : public RooAbsGenContext {
public:
RooEffGenContext(const RooAbsPdf &model,
const RooAbsPdf &pdf,const RooAbsReal& eff,
const RooArgSet &vars, const RooDataSet *prototype= nullptr,
const RooArgSet* auxProto=nullptr, bool verbose=false, const RooArgSet* forceDirect=nullptr);
~RooEffGenContext() override;
RooEffGenContext(const RooAbsPdf &model, const RooAbsPdf &pdf, const RooAbsReal &eff, const RooArgSet &vars,
const RooDataSet *prototype = nullptr, const RooArgSet *auxProto = nullptr, bool verbose = false,
const RooArgSet *forceDirect = nullptr);
~RooEffGenContext() override;

void printMultiline(std::ostream &os, Int_t content, bool verbose = false, TString indent = "") const override;

protected:
void initGenerator(const RooArgSet &theEvent) override;
void generateEvent(RooArgSet &theEvent, Int_t remaining) override;
void initGenerator(const RooArgSet &theEvent) override;
void generateEvent(RooArgSet &theEvent, Int_t remaining) override;

private:
RooArgSet _cloneSet; ///< Internal clone of p.d.f.
RooAbsReal* _eff; ///< Pointer to efficiency function
RooAbsGenContext* _generator; ///< Generator context for p.d.f
RooArgSet _vars; ///< Vars to generate
double _maxEff; ///< Maximum of efficiency in vars
RooArgSet _cloneSet; ///< Internal clone of p.d.f.
RooAbsReal *_eff; ///< Pointer to efficiency function
RooAbsGenContext *_generator; ///< Generator context for p.d.f
RooArgSet _vars; ///< Vars to generate
double _maxEff; ///< Maximum of efficiency in vars

ClassDefOverride(RooEffGenContext, 0); // Context for generating a dataset from a PDF
};
Expand Down
38 changes: 26 additions & 12 deletions roofit/roofitcore/src/RooEffGenContext.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
*****************************************************************************/


/**
\file RooEffGenContext.cxx
\class RooEffGenContext
Expand All @@ -38,16 +37,14 @@ ClassImp(RooEffGenContext);
////////////////////////////////////////////////////////////////////////////////
/// Constructor of generator context for RooEffProd products

RooEffGenContext::RooEffGenContext(const RooAbsPdf &model,
const RooAbsPdf& pdf, const RooAbsReal& eff,
const RooArgSet &vars,
const RooDataSet *prototype, const RooArgSet* auxProto,
bool verbose, const RooArgSet* /*forceDirect*/) :
RooAbsGenContext(model, vars, prototype, auxProto, verbose), _maxEff(0.)
RooEffGenContext::RooEffGenContext(const RooAbsPdf &model, const RooAbsPdf &pdf, const RooAbsReal &eff,
const RooArgSet &vars, const RooDataSet *prototype, const RooArgSet *auxProto,
bool verbose, const RooArgSet * /*forceDirect*/)
: RooAbsGenContext(model, vars, prototype, auxProto, verbose), _maxEff(0.)
{
RooArgSet x(eff,eff.GetName());
RooArgSet x(eff, eff.GetName());
x.snapshot(_cloneSet, true);
_eff = dynamic_cast<RooAbsReal*>(_cloneSet.find(eff.GetName()));
_eff = dynamic_cast<RooAbsReal *>(_cloneSet.find(eff.GetName()));
_generator = pdf.genContext(vars, prototype, auxProto, verbose);
vars.snapshot(_vars, true);
}
Expand All @@ -71,9 +68,9 @@ void RooEffGenContext::initGenerator(const RooArgSet &theEvent)
// Check if PDF supports maximum finding
Int_t code = _eff->getMaxVal(_vars);
if (!code) {
_maxEff = 1.;
_maxEff = 1.;
} else {
_maxEff = _eff->maxVal(code);
_maxEff = _eff->maxVal(code);
}
}

Expand All @@ -89,11 +86,28 @@ void RooEffGenContext::generateEvent(RooArgSet &theEvent, Int_t remaining)
double val = _eff->getVal();
if (val > _maxEff && !_eff->getMaxVal(_vars)) {
coutE(Generation) << ClassName() << "::" << GetName()
<< ":generateEvent: value of efficiency is larger than assumed maximum of 1." << std::endl;
<< ":generateEvent: value of efficiency is larger than assumed maximum of 1." << std::endl;
continue;
}
if (val > RooRandom::uniform() * _maxEff) {
break;
}
}
}

////////////////////////////////////////////////////////////////////////////////
/// Detailed printing interface

void RooEffGenContext::printMultiline(ostream &os, Int_t content, bool verbose, TString indent) const
{
RooAbsGenContext::printMultiline(os, content, verbose, indent);
os << indent << "--- RooEffGenContext ---" << endl;
os << indent << "Using EFF ";
_eff->printStream(os, kName | kArgs | kClassName, kSingleLine, indent);
os << indent << "PDF generator" << endl;

TString indent2(indent);
indent2.Append(" ");

_generator->printMultiline(os, content, verbose, indent2);
}
2 changes: 1 addition & 1 deletion roofit/roofitcore/src/RooRealIntegral.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ double RooRealIntegral::evaluate() const

if (dologD(Tracing)) {
cxcoutD(Tracing) << "RooRealIntegral::evaluate(" << GetName() << ") anaInt = " << _anaList << " numInt = " << _intList << _sumList << " mode = " ;
switch(_mode) {
switch(_intOperMode) {
case Hybrid: ccoutD(Tracing) << "Hybrid" ; break ;
case Analytic: ccoutD(Tracing) << "Analytic" ; break ;
case PassThrough: ccoutD(Tracing) << "PassThrough" ; break ;
Expand Down