Skip to content

Please consider the following formatting changes to #13868 #12

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
Jan 16, 2025
Merged

Please consider the following formatting changes to #13868 #12

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
2 changes: 1 addition & 1 deletion Generators/include/Generators/Generator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class Generator : public FairGenerator

/** getters **/
const std::vector<TParticle>& getParticles() const { return mParticles; }; //!
void * getInterface() { return mInterface; };
void* getInterface() { return mInterface; };
std::string getInterfaceName() { return mInterfaceName; };
ETriggerMode_t getTriggerMode() { return mTriggerMode; };
std::vector<Trigger> getTriggers() { return mTriggers; };
Expand Down
7 changes: 4 additions & 3 deletions Generators/src/GeneratorHybrid.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Bool_t GeneratorHybrid::Init()
addSubGenerator(count, gen);
// If trigger mode is an unknown value or empty string in the JSON file, it will be set to kTriggerOR
// when at least one generator has trigger mode enabled. If the trigger field is not set then trigger is forced OFF
if(!mTriggerFlag && gens[count]->getTriggerMode()) {
if (!mTriggerFlag && gens[count]->getTriggerMode()) {
LOG(info) << "Generator " << gen << " has trigger mode enabled to " << gens[count]->getTriggerMode();
LOG(info) << "Setting Hybrid trigger mode to OR";
setTriggerMode(o2::eventgen::Generator::kTriggerOR);
Expand Down Expand Up @@ -375,7 +375,7 @@ bool GeneratorHybrid::importParticles()
// Trigger forwarding to hybrid gen for the event
// For cocktail mode only the first generator in the list is used for triggers
// TODO: implement trigger merging for cocktail mode
if(strcmp(mInterfaceName.c_str(), "") == 0) {
if (strcmp(mInterfaceName.c_str(), "") == 0) {
if (gens[subIndex]->getTriggers().size() > 0) {
for (auto& Trigger : gens[subIndex]->getTriggers()) {
addTrigger(Trigger);
Expand Down Expand Up @@ -421,7 +421,8 @@ bool GeneratorHybrid::importParticles()
return true;
}

bool GeneratorHybrid::triggerEvent(){
bool GeneratorHybrid::triggerEvent()
{
bool triggered = Generator::triggerEvent();
if (!triggered) {
// counter is decreased when event is rejected, otherwise simulation hangs
Expand Down
Loading