include cleanExpression and RooResolutionModels in sanitization

Author: Phmonski

roofit/hs3/src/JSONFactories_RooFitCore.cxx

@@ -543,12 +543,6 @@ class RooAddPdfStreamer : public RooFit::JSONIO::Exporter {
    {
       const RooArg_t *pdf = static_cast<const RooArg_t *>(func);
       elem["type"] << key();
-      std::string name = elem["name"].val();
-      /*elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
-      RooJSONFactoryWSTool::fillSeqSanitizedName(elem["summands"], pdf->pdfList());
-      RooJSONFactoryWSTool::fillSeqSanitizedName(elem["coefficients"], pdf->coefList());
-      */
-      elem["name"] << name;
       RooJSONFactoryWSTool::fillSeq(elem["summands"], pdf->pdfList());
       RooJSONFactoryWSTool::fillSeq(elem["coefficients"], pdf->coefList());
       elem["extended"] << (pdf->extendMode() != RooArg_t::CanNotBeExtended);
@@ -563,12 +557,6 @@ class RooRealSumPdfStreamer : public RooFit::JSONIO::Exporter {
    {
       const RooRealSumPdf *pdf = static_cast<const RooRealSumPdf *>(func);
       elem["type"] << key();
-      std::string name = elem["name"].val();
-      /*elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
-      RooJSONFactoryWSTool::fillSeqSanitizedName(elem["samples"], pdf->funcList());
-      RooJSONFactoryWSTool::fillSeqSanitizedName(elem["coefficients"], pdf->coefList());
-      */
-      elem["name"] << name;
       RooJSONFactoryWSTool::fillSeq(elem["samples"], pdf->funcList());
       RooJSONFactoryWSTool::fillSeq(elem["coefficients"], pdf->coefList());
       elem["extended"] << (pdf->extendMode() != RooAbsPdf::CanNotBeExtended);
@@ -583,12 +571,6 @@ class RooRealSumFuncStreamer : public RooFit::JSONIO::Exporter {
    {
       const RooRealSumFunc *pdf = static_cast<const RooRealSumFunc *>(func);
       elem["type"] << key();
-      std::string name = elem["name"].val();
-      /*elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
-      RooJSONFactoryWSTool::fillSeqSanitizedName(elem["samples"], pdf->funcList());
-      RooJSONFactoryWSTool::fillSeqSanitizedName(elem["coefficients"], pdf->coefList());
-      */
-      elem["name"] << name;
       RooJSONFactoryWSTool::fillSeq(elem["samples"], pdf->funcList());
       RooJSONFactoryWSTool::fillSeq(elem["coefficients"], pdf->coefList());
       return true;
@@ -687,6 +669,7 @@ class RooFormulaArgStreamer : public RooFit::JSONIO::Exporter {
       const RooArg_t *pdf = static_cast<const RooArg_t *>(func);
       elem["type"] << key();
       TString expression(pdf->expression());
+      cleanExpression(expression);
       // If the tokens follow the "x[#]" convention, the square braces enclosing each number
       // ensures that there is a unique mapping between the token and parameter name
       // If the tokens follow the "@#" convention, the numbers are not enclosed by braces.
@@ -701,6 +684,18 @@ class RooFormulaArgStreamer : public RooFit::JSONIO::Exporter {
       elem["expression"] << expression.Data();
       return true;
    }
+private:
+   void cleanExpression(TString& expr) const
+   {
+      expr.ReplaceAll("TMath::Exp",  "exp");
+      expr.ReplaceAll("TMath::Min",  "min");
+      expr.ReplaceAll("TMath::Max",  "max");
+      expr.ReplaceAll("TMath::Log",  "log");
+      expr.ReplaceAll("TMath::Cos",  "cos");
+      expr.ReplaceAll("TMath::Sin",  "sin");
+      expr.ReplaceAll("TMath::Sqrt", "sqrt");
+      expr.ReplaceAll("TMath::Power", "pow");
+   }
 };
 template <class RooArg_t>
 class RooPolynomialStreamer : public RooFit::JSONIO::Exporter {
@@ -784,9 +779,6 @@ class RooTruthModelStreamer : public RooFit::JSONIO::Exporter {
    {
       auto *pdf = static_cast<const RooTruthModel *>(func);
       elem["type"] << key();
-      std::string name = elem["name"].val();
-      // elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
-      elem["name"] << name;
       elem["x"] << pdf->convVar().GetName();
 
       return true;
@@ -800,9 +792,6 @@ class RooGaussModelStreamer : public RooFit::JSONIO::Exporter {
    {
       auto *pdf = static_cast<const RooGaussModel *>(func);
       elem["type"] << key();
-      std::string name = elem["name"].val();
-      // elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
-      elem["name"] << name;
       elem["x"] << pdf->convVar().GetName();
       elem["mean"] << pdf->getMean().GetName();
       elem["sigma"] << pdf->getSigma().GetName();
@@ -913,10 +902,6 @@ class RooRealIntegralStreamer : public RooFit::JSONIO::Exporter {
    bool exportObject(RooJSONFactoryWSTool *, const RooAbsArg *func, JSONNode &elem) const override
    {
       auto *integral = static_cast<const RooRealIntegral *>(func);
-      std::string name = elem["name"].val();
-      // elem["name"] << RooJSONFactoryWSTool::sanitizeName(name);
-      elem["name"] << name;
-
       elem["type"] << key();
       std::string integrand = integral->integrand().GetName();
       // elem["integrand"] << RooJSONFactoryWSTool::sanitizeName(integrand);

roofit/hs3/src/RooJSONFactoryWSTool.cxx

@@ -2508,6 +2508,10 @@ RooWorkspace RooJSONFactoryWSTool::cleanWS(const RooWorkspace &ws, bool onlyMode
       tmpWS.import(*obj);
    }
 
+   for (auto *obj : ws.allResolutionModels()) {
+      tmpWS.import(*obj);
+   }   
+
    /*
    if (auto* mc = dynamic_cast<RooStats::ModelConfig*>(obj)) {
          // Import the PDF
@@ -2582,7 +2586,13 @@ RooWorkspace RooJSONFactoryWSTool::sanitizeWS(const RooWorkspace &ws)
          obj->SetName(sanitizeName(obj->GetName()).c_str());
       }
    }
-
+   
+   // Resolution Models
+   for (auto *obj : tmpWS.allResolutionModels()){
+      if (!isValidName(obj->GetName())) {
+         obj->SetName(sanitizeName(obj->GetName()).c_str());
+      }
+   }
    // Datasets
    for (auto *data : tmpWS.allData()) {
       // Sanitize dataset name