Skip to content

Fraction based randomisation for Hybrid Gen #13745

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
sawenzel merged 1 commit into from
Dec 5, 2024
Merged

Fraction based randomisation for Hybrid Gen #13745

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions Generators/include/Generators/GeneratorHybrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class GeneratorHybrid : public Generator

bool mRandomize = false;
std::vector<int> mFractions;
std::vector<float> mRngFractions;
int mseqCounter = 0;
int mCurrentFraction = 0;
int mIndex = 0;
Expand Down
44 changes: 42 additions & 2 deletions Generators/src/GeneratorHybrid.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,55 @@ Bool_t GeneratorHybrid::Init()
addSubGenerator(count, gen);
count++;
}
if (mRandomize) {
if (std::all_of(mFractions.begin(), mFractions.end(), [](int i) { return i == 1; })) {
LOG(info) << "Full randomisation of generators order";
} else {
LOG(info) << "Randomisation based on fractions";
int allfracs = 0;
for (auto& f : mFractions) {
allfracs += f;
}
// Assign new rng fractions
float sum = 0;
float chance = 0;
for (int k = 0; k < mFractions.size(); k++) {
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";
} 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";
}
}
}
} else {
LOG(info) << "Generators will be used in sequence, following provided fractions";
}
return Generator::Init();
}

Bool_t GeneratorHybrid::generateEvent()
{
// Order randomisation or sequence of generators
// following provided fractions, if not generators are used in proper sequence
// following provided fractions. If not available generators will be used sequentially
if (mRandomize) {
mIndex = gRandom->Integer(mGens.size());
if (mRngFractions.size() != 0) {
// Generate number between 0 and 1
float rnum = gRandom->Rndm();
// Find generator index
for (int k = 0; k < mRngFractions.size(); k++) {
if (rnum <= mRngFractions[k]) {
mIndex = k;
break;
}
}
} else {
mIndex = gRandom->Integer(mGens.size());
}
} else {
while (mFractions[mCurrentFraction] == 0 || mseqCounter == mFractions[mCurrentFraction]) {
if (mFractions[mCurrentFraction] != 0) {
Expand Down