Skip to content
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

[RF] Add codegen for integral of RooNormalizedPdf #17115

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[RF] Add codegen for integral of RooNormalizedPdf #17115

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
2 changes: 2 additions & 0 deletions roofit/codegen/inc/RooFit/CodegenImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ void codegenImpl(RooRecursiveFraction &arg, CodegenContext &ctx);
void codegenImpl(RooStats::HistFactory::FlexibleInterpVar &arg, CodegenContext &ctx);
void codegenImpl(RooUniform &arg, CodegenContext &ctx);

std::string
codegenIntegralImpl(RooFit::Detail::RooNormalizedPdf &arg, int code, const char *rangeName, CodegenContext &ctx);
std::string codegenIntegralImpl(RooAbsReal &arg, int code, const char *rangeName, CodegenContext &ctx);
std::string codegenIntegralImpl(RooBernstein &arg, int code, const char *rangeName, CodegenContext &ctx);
std::string codegenIntegralImpl(RooBifurGauss &arg, int code, const char *rangeName, CodegenContext &ctx);
Expand Down
7 changes: 7 additions & 0 deletions roofit/codegen/src/CodegenImpl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,13 @@ void codegenImpl(RooUniform &arg, CodegenContext &ctx)
/// \param[in] ctx An object to manage auxiliary information for code-squashing.
///
/// \returns The representative code string of the integral for the given object.
std::string
codegenIntegralImpl(RooFit::Detail::RooNormalizedPdf &arg, int code, const char *rangeName, CodegenContext &ctx)
{
// Dispatch to the pdf's integral function.
return codegenIntegral(const_cast<RooAbsPdf &>(arg.pdf()), code, rangeName, ctx);
}

std::string codegenIntegralImpl(RooAbsReal &arg, int, const char *, CodegenContext &)
{
std::stringstream errorMsg;
Expand Down
23 changes: 22 additions & 1 deletion roofit/roofitcore/test/testRooFuncWrapper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <RooRealVar.h>
#include <RooSimultaneous.h>
#include <RooWorkspace.h>
#include <RooFit/Detail/RooNormalizedPdf.h>

#include <ROOT/StringUtils.hxx>
#include <TROOT.h>
Expand Down Expand Up @@ -623,6 +624,26 @@ FactoryTestParams param15{"RecursiveFraction",
5e-3,
/*randomizeParameters=*/true};

// Test for RooNormalizedPdf.
FactoryTestParams param16{"NormalizedPdf",
[](RooWorkspace &ws) {
RooRealVar obs = RooRealVar("x", "x", 0, -10, 10);
ws.import(obs);
ws.defineSet("observables", "x");
RooRealVar mean = RooRealVar("mean", "mean", 0, -10, 10);
RooGaussian gauss = RooGaussian("gx", "gx", obs, mean, 1.);
RooArgSet nset(obs);
RooFit::Detail::RooNormalizedPdf npdf(gauss, nset);
npdf.SetName("model");
ws.import(npdf);
},
[](RooAbsPdf &pdf, RooAbsData &data, RooWorkspace &, RooFit::EvalBackend backend) {
using namespace RooFit;
return std::unique_ptr<RooAbsReal>{pdf.createNLL(data, backend)};
},
5e-3,
/*randomizeParameters=*/true};

FactoryTestParams makeTestParams(const char *name, std::string const &expr, bool randomizeParameters)
{
return FactoryTestParams{name,
Expand All @@ -642,7 +663,7 @@ auto testValues = testing::Values(
#if !defined(_MSC_VER) || defined(R__ENABLE_BROKEN_WIN_TESTS)
param3,
#endif
param4, param5, param6, param7, param8, param8p1, param9, param10, param11, param12, param13, param15,
param4, param5, param6, param7, param8, param8p1, param9, param10, param11, param12, param13, param15, param16,
makeTestParams("RooCBShape",
"CBShape::model(x[0., -200., 200.], x0[100., -200., 200.], sigma[2., 1.E-6, 100.], alpha[1., 1.E-6, "
"100.], n[1., 1.E-6, 100.])",
Expand Down
Loading