Skip to content

Group labels in randMode + protection on non-integer fractions #15598

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

Open
jackal1-66 wants to merge 1 commit into
base: dev
Choose a base branch
from
+18 −2
Open

Group labels in randMode + protection on non-integer fractions #15598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions Generators/src/GeneratorHybrid.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,18 @@ Bool_t GeneratorHybrid::Init()
}
count++;
}
// Label for groups: concatenation of the names of the generators in the group, separated by '+'.
// Currently used only if randomisation is enabled
auto groupLabel = [this](int k) {
std::string label;
for (auto subIndex : mGroups[k]) {
if (!label.empty()) {
label += "+";
}
label += (mConfigs[subIndex] == "" ? mGens[subIndex] : mConfigs[subIndex]);
}
return label;
};
if (mRandomize) {
if (std::all_of(mFractions.begin(), mFractions.end(), [](int i) { return i == 1; })) {
LOG(info) << "Full randomisation of generators order";
Expand All @@ -261,12 +273,12 @@ Bool_t GeneratorHybrid::Init()
if (mFractions[k] == 0) {
// Generator will not be used if fraction is 0
mRngFractions.push_back(-1);
LOG(info) << "Generator " << mGens[k] << " will not be used";
LOG(info) << "Generator " << groupLabel(k) << " will not be used";
} else {
chance = static_cast<float>(mFractions[k]) / allfracs;
sum += chance;
mRngFractions.push_back(sum);
LOG(info) << "Generator " << (mConfigs[k] == "" ? mGens[k] : mConfigs[k]) << " has a " << chance * 100 << "% chance of being used";
LOG(info) << "Generator " << groupLabel(k) << " has a " << chance * 100 << "% chance of being used";
}
}
}
Expand Down Expand Up @@ -707,6 +719,10 @@ Bool_t GeneratorHybrid::parseJSON(const std::string& path)
if (doc.HasMember("fractions")) {
const auto& fractions = doc["fractions"];
for (const auto& frac : fractions.GetArray()) {
if (!frac.IsInt()) {
LOG(fatal) << "Fractions must be integers. Wrong type found in JSON";
return false;
}
mFractions.push_back(frac.GetInt());
}
} else {
Expand Down