ParamHistFuncs accept custom modifiers

Author: Phmonski

roofit/hs3/src/JSONFactories_HistFactory.cxx

@@ -823,6 +823,15 @@ void collectElements(RooArgSet &elems, RooAbsArg *arg)
    }
 }
 
+bool allRooRealVar(const RooAbsCollection &list) {
+   for (auto* var : list) {
+      if (!dynamic_cast<RooRealVar*>(var)) {
+         return false;
+      }
+   }
+   return true;
+}
+
 struct Sample {
    std::string name;
    std::vector<double> hist;
@@ -920,7 +929,7 @@ Channel readChannel(RooJSONFactoryWSTool *tool, const std::string &pdfname, cons
                addNormFactor(par, sample, ws);
             } else if (auto hf = dynamic_cast<const RooHistFunc *>(e)) {
                updateObservables(hf->dataHist());
-            } else if (auto phf = dynamic_cast<ParamHistFunc *>(e)) {
+            } else if (ParamHistFunc* phf = dynamic_cast<ParamHistFunc *>(e); phf && allRooRealVar(phf->paramList())) {
                phfs.push_back(phf);
             } else if (auto fip = dynamic_cast<RooStats::HistFactory::FlexibleInterpVar *>(e)) {
                // some (modified) histfactory models have several instances of FlexibleInterpVar

roofit/hs3/src/JSONFactories_RooFitCore.cxx

@@ -33,6 +33,7 @@
 #include <RooLegacyExpPoly.h>
 #include <RooLognormal.h>
 #include <RooMultiVarGaussian.h>
+#include <RooStats/HistFactory/ParamHistFunc.h>
 #include <RooPoisson.h>
 #include <RooPolynomial.h>
 #include <RooPolyVar.h>
@@ -532,6 +533,23 @@ class RooMultiVarGaussianFactory : public RooFit::JSONIO::Importer {
    }
 };
 
+class ParamHistFuncFactory : public RooFit::JSONIO::Importer {
+public:
+   bool importArg(RooJSONFactoryWSTool *tool, const JSONNode &p) const override
+   {
+      std::string name(RooJSONFactoryWSTool::name(p));
+      RooArgList vars = tool->requestArgList<RooRealVar>(p, "variables");
+      std::vector<int> nbins;
+      nbins << p["nbins"];
+      for (size_t i = 0; i < vars.size(); ++i) {
+         auto *v = dynamic_cast<RooRealVar*>(vars.at(i));
+         v->setBins(nbins[i]);
+      }
+      tool->wsEmplace<ParamHistFunc>(name, vars, tool->requestArgList<RooAbsReal>(p, "parameters"));
+      return true;
+   }
+};
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 // specialized exporter implementations
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -696,6 +714,7 @@ class RooFormulaArgStreamer : public RooFit::JSONIO::Exporter {
       expr.ReplaceAll("TMath::Sin", "sin");
       expr.ReplaceAll("TMath::Sqrt", "sqrt");
       expr.ReplaceAll("TMath::Power", "pow");
+      expr.ReplaceAll("TMath::Erf", "erf");
    }
 };
 template <class RooArg_t>
@@ -952,6 +971,26 @@ class RooExtendPdfStreamer : public RooFit::JSONIO::Exporter {
    }
 };
 
+class ParamHistFuncStreamer : public RooFit::JSONIO::Exporter {
+public:
+   std::string const &key() const override;
+   bool exportObject(RooJSONFactoryWSTool *, const RooAbsArg *func, JSONNode &elem) const override
+   {
+      auto *pdf = static_cast<const ParamHistFunc *>(func);
+      elem["type"] << key();
+      RooJSONFactoryWSTool::fillSeq(elem["variables"], pdf->dataVars());
+      RooJSONFactoryWSTool::fillSeq(elem["parameters"], pdf->paramList());
+      std::vector<int> nbins;
+      for (auto *arg : pdf->dataVars()) {
+         auto *var = dynamic_cast<RooRealVar*>(arg);
+         nbins.push_back(var->numBins());
+      }
+      elem["nbins"] << nbins;
+
+      return true;
+   }
+};
+
 #define DEFINE_EXPORTER_KEY(class_name, name)    \
    std::string const &class_name::key() const    \
    {                                             \
@@ -989,6 +1028,7 @@ DEFINE_EXPORTER_KEY(RooRealIntegralStreamer, "integral");
 DEFINE_EXPORTER_KEY(RooDerivativeStreamer, "derivative");
 DEFINE_EXPORTER_KEY(RooFFTConvPdfStreamer, "fft_conv_pdf");
 DEFINE_EXPORTER_KEY(RooExtendPdfStreamer, "extend_pdf");
+DEFINE_EXPORTER_KEY(ParamHistFuncStreamer, "param_hist_func");
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 // instantiate all importers and exporters
@@ -1021,6 +1061,7 @@ STATIC_EXECUTE([]() {
    registerImporter<RooDerivativeFactory>("derivative", false);
    registerImporter<RooFFTConvPdfFactory>("fft_conv_pdf", false);
    registerImporter<RooExtendPdfFactory>("extend_pdf", false);
+   registerImporter<ParamHistFuncFactory>("param_hist_func", false);
 
    registerExporter<RooAddPdfStreamer<RooAddPdf>>(RooAddPdf::Class(), false);
    registerExporter<RooAddPdfStreamer<RooAddModel>>(RooAddModel::Class(), false);
@@ -1047,6 +1088,7 @@ STATIC_EXECUTE([]() {
    registerExporter<RooDerivativeStreamer>(RooDerivative::Class(), false);
    registerExporter<RooFFTConvPdfStreamer>(RooFFTConvPdf::Class(), false);
    registerExporter<RooExtendPdfStreamer>(RooExtendPdf::Class(), false);
+   registerExporter<ParamHistFuncStreamer>(ParamHistFunc::Class(), false);
 });
 
 } // namespace

roofit/hs3/src/RooFitHS3_wsexportkeys.cxx

@@ -62,6 +62,13 @@ auto RooFitHS3_wsexportkeys = R"({
             "sigmaR": "sigma_R"
         }
     },
+    "RooEffProd": {
+        "type": "efficiency_product_pdf_dist",
+        "proxies": {
+            "pdf": "pdf",
+            "eff": "eff"
+        }
+    },
     "RooGamma": {
         "type": "gamma_dist",
         "proxies": {
@@ -79,13 +86,6 @@ auto RooFitHS3_wsexportkeys = R"({
             "sigma": "sigma"
         }
     },
-    "ParamHistFunc": {
-        "type": "step",
-        "proxies": {
-            "dataVars": "variables",
-            "paramSet": "parameters"
-        }
-    },
     "RooLandau": {
         "type": "landau_dist",
         "proxies": {

roofit/hs3/src/RooFitHS3_wsfactoryexpressions.cxx

@@ -43,6 +43,13 @@ auto RooFitHS3_wsfactoryexpressions = R"({
             "coefficients"
         ]
     },
+    "efficiency_product_pdf_dist": {
+        "class": "RooEffProd",
+        "arguments": [
+            "pdf",
+            "eff"
+        ]
+    },
     "gamma_dist": {
         "class": "RooGamma",
         "arguments": [
@@ -112,13 +119,6 @@ auto RooFitHS3_wsfactoryexpressions = R"({
             "observables"
         ]
     },
-    "step": {
-        "class": "ParamHistFunc",
-        "arguments": [
-            "variables",
-            "parameters"
-        ]
-    },
     "sum": {
         "class": "RooAddition",
         "arguments": [

roofit/jsoninterface/inc/RooFit/Detail/JSONInterface.h

@@ -265,6 +265,12 @@ inline RooFit::Detail::JSONNode &operator<<(RooFit::Detail::JSONNode &n, std::sp
    return n;
 }
 
+inline RooFit::Detail::JSONNode &operator<<(RooFit::Detail::JSONNode &n, std::span<const int> v)
+{
+   n.fill_seq(v);
+   return n;
+}
+
 template <class Key, class T, class Hash, class KeyEqual, class Allocator>
 RooFit::Detail::JSONNode &
 operator<<(RooFit::Detail::JSONNode &n, const std::unordered_map<Key, T, Hash, KeyEqual, Allocator> &m)