Skip to content

Please consider the following formatting changes to #13813 #9

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

Merged
jackal1-66 merged 1 commit into from
Dec 17, 2024
Merged

Please consider the following formatting changes to #13813 #9

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
12 changes: 6 additions & 6 deletions Generators/src/GeneratorHybrid.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ GeneratorHybrid::GeneratorHybrid(const std::string& inputgens)
}
int index = 0;
if (!(mRandomize || mGenerationMode == GenMode::kParallel)) {
if(mCocktailMode) {
if (mCocktailMode) {
if (mGroups.size() != mFractions.size()) {
LOG(fatal) << "Number of groups does not match the number of fractions";
return;
Expand All @@ -58,7 +58,7 @@ GeneratorHybrid::GeneratorHybrid(const std::string& inputgens)
LOG(fatal) << "All fractions provided are 0, no simulation will be performed";
return;
}
}
}
for (auto gen : mInputGens) {
// Search if the generator name is inside generatorNames (which is a vector of strings)
LOG(info) << "Checking if generator " << gen << " is in the list of available generators \n";
Expand Down Expand Up @@ -335,7 +335,7 @@ bool GeneratorHybrid::importParticles()
mResultQueue[0].pop(genIndex);
} else {
// need to pop from a particular queue
if(!mCocktailMode){
if (!mCocktailMode) {
mResultQueue[mIndex].pop(genIndex);
} else {
// in cocktail mode we need to pop from the group queue
Expand Down Expand Up @@ -508,18 +508,18 @@ Bool_t GeneratorHybrid::parseJSON(const std::string& path)
for (const auto& subset : sets.GetArray()) {
mGroups.back().push_back(subset.GetInt());
}
if(group.HasMember("fractions")) {
if (group.HasMember("fractions")) {
const auto& subfrac = group["fractions"];
mCocktailFractions.push_back({});
for (const auto& frac : subfrac.GetArray()) {
mCocktailFractions.back().push_back(frac.GetInt());
}
if(mGroups.back().size() != mCocktailFractions.back().size()) {
if (mGroups.back().size() != mCocktailFractions.back().size()) {
LOG(fatal) << "Number of fractions does not match the number of generators in the cocktail";
return false;
}
} else {
LOG(warn) << "Fractions not provided for cocktail group " << mGroups.size()-1 << " setting all fractions to 1";
LOG(warn) << "Fractions not provided for cocktail group " << mGroups.size() - 1 << " setting all fractions to 1";
mCocktailFractions.push_back({});
for (int i = 0; i < mGroups.back().size(); i++) {
mCocktailFractions.back().push_back(1);
Expand Down
Loading