Skip to content

[HS3] Fix export of self_normalized flag #22889

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
Phmonski wants to merge 2 commits into
base: master
Choose a base branch
from
+86 −2
Open

[HS3] Fix export of self_normalized flag #22889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91328cd
[HS3] Fix export of self_normalized flag
Phmonski Jul 22, 2026
ff6fd28
Merge branch 'master' into fix/hs3-patch
Phmonski Jul 23, 2026
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
8 changes: 6 additions & 2 deletions roofit/hs3/src/JSONFactories_RooFitCore.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,11 @@ bool importWrapperPdf(RooJSONFactoryWSTool *tool, const JSONNode &node)

bool selfNormalized = false;

if (auto sn = node.find("selfNormalized"))
auto sn = node.find("self_normalized");
// ROOT previously exported this key without an underscore.
if (!sn)
sn = node.find("selfnormalized");
if (sn)
selfNormalized = sn->val_bool();

tool->wsEmplace<RooWrapperPdf>(name, *func, selfNormalized);
Expand All @@ -1169,7 +1173,7 @@ bool exportWrapperPdf(RooJSONFactoryWSTool *, const RooAbsArg *arg, JSONNode &no

node["function"] << funcProxy->absArg()->GetName();
if (pdf->selfNormalized())
node["selfnormalized"] << true;
node["self_normalized"] << true;

return true;
}
Expand Down
80 changes: 80 additions & 0 deletions roofit/hs3/test/testRooFitHS3.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include <RooStats/HistFactory/ParamHistFunc.h>
#include <RooStats/HistFactory/FlexibleInterpVar.h>
#include <RooStats/HistFactory/PiecewiseInterpolation.h>
#include <RooWrapperPdf.h>
#include <RooWorkspace.h>

#include <cmath>
Expand Down Expand Up @@ -231,6 +232,17 @@ std::size_t countOccurrences(std::string_view haystack, std::string_view needle)
return result;
}

std::string makeWrapperPdfJson(bool selfNormalized)
{
RooRealVar x{"x", "x", 0.5, 0.0, 1.0};
RooFormulaVar function{"function", "1.0 + 0.0 * x", RooArgList{x}};
RooWrapperPdf pdf{"pdf", "pdf", function, selfNormalized};

RooWorkspace workspace;
workspace.import(pdf, RooFit::Silence());
return RooJSONFactoryWSTool{workspace}.exportJSONtoString();
}

// Asserts that exporting `ws` to HS3 throws and logs an error message containing `expectedReason`.
void expectExportThrowsWithError(RooWorkspace &ws, std::string const &expectedReason)
{
Expand Down Expand Up @@ -821,6 +833,74 @@ TEST(RooFitHS3, RooGenericPdf)
EXPECT_EQ(status, 0);
}

TEST(RooFitHS3, RooWrapperPdfSelfNormalizedRoundTrip)
{
const std::string json = makeWrapperPdfJson(true);
EXPECT_NE(json.find("\"self_normalized\":true"), std::string::npos) << json;
EXPECT_EQ(json.find("\"selfnormalized\""), std::string::npos) << json;
EXPECT_EQ(json.find("\"selfNormalized\""), std::string::npos) << json;

RooWorkspace imported;
ASSERT_TRUE(RooJSONFactoryWSTool{imported}.importJSONfromString(json));
auto *pdf = dynamic_cast<RooWrapperPdf *>(imported.pdf("pdf"));
ASSERT_NE(pdf, nullptr);
EXPECT_TRUE(pdf->selfNormalized());

const std::string defaultJson = makeWrapperPdfJson(false);
EXPECT_EQ(defaultJson.find("self_normalized"), std::string::npos) << defaultJson;

RooWorkspace importedDefault;
ASSERT_TRUE(RooJSONFactoryWSTool{importedDefault}.importJSONfromString(defaultJson));
auto *defaultPdf = dynamic_cast<RooWrapperPdf *>(importedDefault.pdf("pdf"));
ASSERT_NE(defaultPdf, nullptr);
EXPECT_FALSE(defaultPdf->selfNormalized());
}

TEST(RooFitHS3, RooWrapperPdfSelfNormalizedLegacyCompatibility)
{
std::string legacyJson = makeWrapperPdfJson(true);
const auto canonicalPos = legacyJson.find("self_normalized");
ASSERT_NE(canonicalPos, std::string::npos) << legacyJson;
legacyJson.replace(canonicalPos, std::string{"self_normalized"}.size(), "selfnormalized");

RooWorkspace imported;
ASSERT_TRUE(RooJSONFactoryWSTool{imported}.importJSONfromString(legacyJson));
auto *pdf = dynamic_cast<RooWrapperPdf *>(imported.pdf("pdf"));
ASSERT_NE(pdf, nullptr);
EXPECT_TRUE(pdf->selfNormalized());

const std::string canonicalJson = RooJSONFactoryWSTool{imported}.exportJSONtoString();
EXPECT_NE(canonicalJson.find("\"self_normalized\":true"), std::string::npos) << canonicalJson;
EXPECT_EQ(canonicalJson.find("\"selfnormalized\""), std::string::npos) << canonicalJson;
}

TEST(RooFitHS3, RooWrapperPdfSelfNormalizedCanonicalKeyTakesPrecedence)
{
std::string json = makeWrapperPdfJson(true);
const std::string canonicalField = "\"self_normalized\":true";
const auto canonicalPos = json.find(canonicalField);
ASSERT_NE(canonicalPos, std::string::npos) << json;
json.replace(canonicalPos, canonicalField.size(), "\"self_normalized\":false,\"selfnormalized\":true");

RooWorkspace imported;
ASSERT_TRUE(RooJSONFactoryWSTool{imported}.importJSONfromString(json));
auto *pdf = dynamic_cast<RooWrapperPdf *>(imported.pdf("pdf"));
ASSERT_NE(pdf, nullptr);
EXPECT_FALSE(pdf->selfNormalized());
}

TEST(RooFitHS3, RooWrapperPdfSelfNormalizedCamelCaseKeyIsIgnored)
{
std::string json = makeWrapperPdfJson(true);
const auto canonicalPos = json.find("self_normalized");
ASSERT_NE(canonicalPos, std::string::npos) << json;
json.replace(canonicalPos, std::string{"self_normalized"}.size(), "selfNormalized");

RooWorkspace imported;
ASSERT_TRUE(RooJSONFactoryWSTool{imported}.importJSONfromString(json));
auto *pdf = dynamic_cast<RooWrapperPdf *>(imported.pdf("pdf"));
ASSERT_NE(pdf, nullptr);
EXPECT_FALSE(pdf->selfNormalized());
TEST(RooFitHS3, BinnedGenericPdfUniformRoundTrip)
{
RooRealVar x{"x", "x", 0.0, 10.0};
Expand Down