Skip to content

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

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

Closed
wants to merge 9 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e6522e4
Include RooDecayStreamer, RooAddModel, RooGaussModel, RooTruthModel
Phmonski Aug 21, 2025
5e00519
Update to HS3 Tools
Phmonski Sep 5, 2025
50b8e58
sanitizeWS
Phmonski Sep 11, 2025
b93aa47
Commit local stashed changes
Phmonski Oct 7, 2025
d4ebc76
added snapshot handling to analysis in hs3
cburgard Sep 12, 2025
a0c631d
small code cleanup
cburgard Oct 1, 2025
88d5ce6
test-driven-development: adding a few tests and make sure they succeed
cburgard Oct 3, 2025
8286cbc
clang-format corrections for PR
Phmonski Oct 8, 2025
8fe4090
Merge branch 'root-project:master' into dev
Phmonski Oct 8, 2025
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
10 changes: 8 additions & 2 deletions roofit/hs3/inc/RooFitHS3/RooJSONFactoryWSTool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion roofit/hs3/src/JSONFactories_HistFactory.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading