From 0ac45f3dfdaff747090e663c0f5122c5f8baee2f Mon Sep 17 00:00:00 2001
From: Carsten Burgard <carsten.burgard@gmail.com>
Date: Wed, 15 Mar 2023 18:18:16 +0100
Subject: [PATCH] [RF][HS3] Small renamings
---
etc/RooFitHS3_wsexportkeys.json | 6 +++---
etc/RooFitHS3_wsfactoryexpressions.json | 4 ++--
roofit/hs3/src/JSONFactories_RooFitCore.cxx | 16 ++++++++--------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/etc/RooFitHS3_wsexportkeys.json b/etc/RooFitHS3_wsexportkeys.json
index 19cb83da937..bd1344c9948 100644
--- a/etc/RooFitHS3_wsexportkeys.json
+++ b/etc/RooFitHS3_wsexportkeys.json
@@ -35,14 +35,14 @@
}
},
"ParamHistFunc": {
- "type": "paramhist",
+ "type": "step",
"proxies": {
- "dataVars": "observables",
+ "dataVars": "variables",
"paramSet": "parameters"
}
},
"RooAddPdf": {
- "type": "sum_dist",
+ "type": "mixture_dist",
"proxies": {
"refCoefNorm": "coefnormset",
"pdfs": "summands",
diff --git a/etc/RooFitHS3_wsfactoryexpressions.json b/etc/RooFitHS3_wsfactoryexpressions.json
index 4d2993dff65..845303f44b0 100644
--- a/etc/RooFitHS3_wsfactoryexpressions.json
+++ b/etc/RooFitHS3_wsfactoryexpressions.json
@@ -48,10 +48,10 @@
"summands"
]
},
- "paramhist": {
+ "step": {
"class": "ParamHistFunc",
"arguments": [
- "observables",
+ "variables",
"parameters"
]
},
diff --git a/roofit/hs3/src/JSONFactories_RooFitCore.cxx b/roofit/hs3/src/JSONFactories_RooFitCore.cxx
index fb09bdfb81e..ce99ed22d2b 100644
--- a/roofit/hs3/src/JSONFactories_RooFitCore.cxx
+++ b/roofit/hs3/src/JSONFactories_RooFitCore.cxx
@@ -298,7 +298,7 @@ class RooRealSumPdfStreamer : public RooFit::JSONIO::Exporter {
public:
std::string const &key() const override
{
- const static std::string keystring = "sumpdf";
+ const static std::string keystring = "weighted_sum_dist";
return keystring;
}
bool exportObject(RooJSONFactoryWSTool *, const RooAbsArg *func, JSONNode &elem) const override
@@ -316,7 +316,7 @@ class RooRealSumFuncStreamer : public RooFit::JSONIO::Exporter {
public:
std::string const &key() const override
{
- const static std::string keystring = "sumfunc";
+ const static std::string keystring = "weighted_sum";
return keystring;
}
bool exportObject(RooJSONFactoryWSTool *, const RooAbsArg *func, JSONNode &elem) const override
@@ -368,7 +368,7 @@ class RooHistPdfStreamer : public RooFit::JSONIO::Exporter {
public:
std::string const &key() const override
{
- static const std::string keystring = "histogramPdf";
+ static const std::string keystring = "histogram_dist";
return keystring;
}
bool exportObject(RooJSONFactoryWSTool *, const RooAbsArg *func, JSONNode &elem) const override
@@ -544,13 +544,13 @@ STATIC_EXECUTE([]() {
registerImporter<RooGenericPdfFactory>("generic_dist", false);
registerImporter<RooFormulaVarFactory>("generic_function", false);
- registerImporter<RooBinSamplingPdfFactory>("binsampling", false);
- registerImporter<RooAddPdfFactory>("sum_dist", false);
+ registerImporter<RooBinSamplingPdfFactory>("binsampling_dist", false);
+ registerImporter<RooAddPdfFactory>("mixture_dist", false);
registerImporter<RooHistFuncFactory>("histogram", false);
- registerImporter<RooHistPdfFactory>("histogramPdf", false);
+ registerImporter<RooHistPdfFactory>("histogram_dist", false);
registerImporter<RooBinWidthFunctionFactory>("binwidth", false);
- registerImporter<RooRealSumPdfFactory>("sumpdf", false);
- registerImporter<RooRealSumFuncFactory>("sumfunc", false);
+ registerImporter<RooRealSumPdfFactory>("weighted_sum_dist", false);
+ registerImporter<RooRealSumFuncFactory>("weighted_sum", false);
registerImporter<RooPolynomialFactory>("polynomial_dist", false);
registerImporter<RooMultiVarGaussianFactory>("multinormal_dist", false);
--
GitLab