[RF][HS3] Minor Bugfixes, added Streamers and name sanitizing scheme

- Added Streamers:
   - RooDecay
   - RooDerivative
   - RooAddModel
   - RooGaussModel
   - RooTruthModel

- New name sanitizing Tool

- Minor Bugfixes

Author: Phmonski

roofit/hs3/inc/RooFitHS3/RooJSONFactoryWSTool.h

@@ -39,6 +39,9 @@ class RooJSONFactoryWSTool {
 public:
    static constexpr bool useListsInsteadOfDicts = true;
    static bool allowExportInvalidNames;
+   static bool allowSanitizeNames;
+   static RooWorkspace sanitizeWS(const RooWorkspace &ws);
+   static RooWorkspace cleanWS(const RooWorkspace &ws, bool onlyModelConfig = false);
 
    struct CombinedData {
       std::string name;
@@ -52,11 +55,14 @@ class RooJSONFactoryWSTool {
    static std::string name(const RooFit::Detail::JSONNode &n);
    static bool isValidName(const std::string &str);
    static bool testValidName(const std::string &str, bool forcError);
+   static std::string sanitizeName(const std::string str);
+   static void rebuildModelConfigInWorkspace(RooStats::ModelConfig *mc, RooWorkspace &ws);
 
    static RooFit::Detail::JSONNode &appendNamedChild(RooFit::Detail::JSONNode &node, std::string const &name);
    static RooFit::Detail::JSONNode const *findNamedChild(RooFit::Detail::JSONNode const &node, std::string const &name);
 
    static void fillSeq(RooFit::Detail::JSONNode &node, RooAbsCollection const &coll, size_t nMax = -1);
+   static void fillSeqSanitizedName(RooFit::Detail::JSONNode &node, RooAbsCollection const &coll, size_t nMax = -1);
 
    template <class T>
    T *request(const std::string &objname, const std::string &requestAuthor)
@@ -199,7 +205,6 @@ class RooJSONFactoryWSTool {
 private:
    template <class T>
    T *requestImpl(const std::string &objname);
-
    void exportObject(RooAbsArg const &func, std::set<std::string> &exportedObjectNames);
 
    // To export multiple objects sorted alphabetically
@@ -230,7 +235,8 @@ class RooJSONFactoryWSTool {
    void exportAllObjects(RooFit::Detail::JSONNode &n);
 
    void exportModelConfig(RooFit::Detail::JSONNode &rootnode, RooStats::ModelConfig const &mc,
-                          const std::vector<RooJSONFactoryWSTool::CombinedData> &d);
+                          const std::vector<RooJSONFactoryWSTool::CombinedData> &combined,
+                          const std::vector<RooAbsData *> &single);
 
    void exportSingleModelConfig(RooFit::Detail::JSONNode &rootnode, RooStats::ModelConfig const &mc,
                                 std::string const &analysisName,

roofit/hs3/src/JSONFactories_HistFactory.cxx

@@ -263,7 +263,6 @@ getOrCreateConstraint(RooJSONFactoryWSTool &tool, const JSONNode &mod, RooRealVa
       }
       return *constraint;
    } else {
-      std::cout << "creating new constraint for " << param << std::endl;
       std::string constraint_type = "Gauss";
       if (auto constrType = mod.find("constraint_type")) {
          constraint_type = constrType->val();