Skip to content

[6.40] [RF][HS3] Fix RooFormulaVar key export #22918

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 1 commit into from
Jul 26, 2026
+31 −3
Merged

[6.40] [RF][HS3] Fix RooFormulaVar key export #22918

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
4 changes: 2 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 @@ -581,7 +581,7 @@ bool importExponential(RooJSONFactoryWSTool *tool, const JSONNode &p)
// },
// {
// "name": "c_exponential_inverted", // transformation function created on-the-fly on export
// "type": "generic_function",
// "type": "generic",
// "expression": "-c"
// }
//
Expand Down Expand Up @@ -1270,7 +1270,7 @@ STATIC_EXECUTE([]() {
registerExporter<exportPolynomial<RooPolyVar>>(RooPolyVar::Class(), "polynomial", false);
registerExporter<exportRealSumFunc>(RooRealSumFunc::Class(), "weighted_sum", false);
registerExporter<exportRealSumPdf>(RooRealSumPdf::Class(), "weighted_sum_dist", false);
registerExporter<exportTFnBinding>(RooTFnBinding::Class(), "generic_function", false);
registerExporter<exportTFnBinding>(RooTFnBinding::Class(), "generic", false);
registerExporter<exportRealIntegral>(RooRealIntegral::Class(), "integral", false);
registerExporter<exportDerivative>(RooDerivative::Class(), "derivative", false);
registerExporter<exportFFTConvPdf>(RooFFTConvPdf::Class(), "fft_convolution_dist", false);
Expand Down
2 changes: 1 addition & 1 deletion roofit/hs3/src/RooJSONFactoryWSTool.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ std::string RooJSONFactoryWSTool::exportTransformed(const RooAbsReal *original,
{
std::string newname = std::string(original->GetName()) + suffix;
RooFit::Detail::JSONNode &trafo_node = appendNamedChild((*_rootnodeOutput)["functions"], newname);
trafo_node["type"] << "generic_function";
trafo_node["type"] << "generic";
trafo_node["expression"] << TString::Format(formula.c_str(), original->GetName()).Data();
this->setAttribute(newname, "roofit_skip"); // this function should not be imported back in
return newname;
Expand Down
28 changes: 28 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 <RooTFnBinding.h>
#include <RooWorkspace.h>

#include <cmath>
Expand All @@ -44,6 +45,7 @@
#include <string_view>
#include <vector>

#include <TF3.h>
#include <TROOT.h>

#include <gtest/gtest.h>
Expand Down Expand Up @@ -2300,3 +2302,29 @@ TEST(RooFitHS3, SimultaneousFit)

EXPECT_TRUE(res2->isIdentical(*res1));
}

TEST(RooFitHS3, GenericTypeNames)
{
RooRealVar x{"x", "x", 0.5, -1.0, 1.0};
RooRealVar y{"y", "y", 0.5, -1.0, 1.0};
RooRealVar z{"z", "z", 0.5, -1.0, 1.0};
RooRealVar c{"c", "c", -0.1};
RooFormulaVar formula{"formula", "x + y", RooArgList{x, y}};
RooGenericPdf genericPdf{"genericPdf", "x + 2.0", RooArgList{x}};
TF3 tf3{"tf3", "x + y + z", -1.0, 1.0, -1.0, 1.0, -1.0, 1.0};
RooTFnBinding binding{"binding", "binding", &tf3, RooArgList{x, y, z}};
RooExponential exponential{"exponential", "exponential", x, c};

RooWorkspace ws{"ws_generic_types"};
ws.import(formula, RooFit::Silence());
ws.import(genericPdf, RooFit::Silence(), RooFit::RecycleConflictNodes());
ws.import(binding, RooFit::Silence(), RooFit::RecycleConflictNodes());
ws.import(exponential, RooFit::Silence(), RooFit::RecycleConflictNodes());

const std::string json = RooJSONFactoryWSTool{ws}.exportJSONtoString();
EXPECT_NE(json.find("\"name\":\"formula\",\"type\":\"generic\""), std::string::npos) << json;
EXPECT_NE(json.find("\"name\":\"genericPdf\",\"type\":\"generic_dist\""), std::string::npos) << json;
EXPECT_NE(json.find("\"name\":\"binding\",\"type\":\"generic\""), std::string::npos) << json;
EXPECT_NE(json.find("\"name\":\"c_exponential_inverted\",\"type\":\"generic\""), std::string::npos) << json;
EXPECT_EQ(json.find("\"type\":\"generic_function\""), std::string::npos) << json;
}
Loading