Skip to content

Commit a32f6d3

Browse files
authored
Merge pull request #12 from alibuild/alibot-cleanup-13868
Please consider the following formatting changes to #13868
2 parents 8726226 + 4d1c057 commit a32f6d3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Generators/include/Generators/Generator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class Generator : public FairGenerator
8787

8888
/** getters **/
8989
const std::vector<TParticle>& getParticles() const { return mParticles; }; //!
90-
void * getInterface() { return mInterface; };
90+
void* getInterface() { return mInterface; };
9191
std::string getInterfaceName() { return mInterfaceName; };
9292
ETriggerMode_t getTriggerMode() { return mTriggerMode; };
9393
std::vector<Trigger> getTriggers() { return mTriggers; };

Generators/src/GeneratorHybrid.cxx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ Bool_t GeneratorHybrid::Init()
185185
addSubGenerator(count, gen);
186186
// If trigger mode is an unknown value or empty string in the JSON file, it will be set to kTriggerOR
187187
// when at least one generator has trigger mode enabled. If the trigger field is not set then trigger is forced OFF
188-
if(!mTriggerFlag && gens[count]->getTriggerMode()) {
188+
if (!mTriggerFlag && gens[count]->getTriggerMode()) {
189189
LOG(info) << "Generator " << gen << " has trigger mode enabled to " << gens[count]->getTriggerMode();
190190
LOG(info) << "Setting Hybrid trigger mode to OR";
191191
setTriggerMode(o2::eventgen::Generator::kTriggerOR);
@@ -375,7 +375,7 @@ bool GeneratorHybrid::importParticles()
375375
// Trigger forwarding to hybrid gen for the event
376376
// For cocktail mode only the first generator in the list is used for triggers
377377
// TODO: implement trigger merging for cocktail mode
378-
if(strcmp(mInterfaceName.c_str(), "") == 0) {
378+
if (strcmp(mInterfaceName.c_str(), "") == 0) {
379379
if (gens[subIndex]->getTriggers().size() > 0) {
380380
for (auto& Trigger : gens[subIndex]->getTriggers()) {
381381
addTrigger(Trigger);
@@ -421,7 +421,8 @@ bool GeneratorHybrid::importParticles()
421421
return true;
422422
}
423423

424-
bool GeneratorHybrid::triggerEvent(){
424+
bool GeneratorHybrid::triggerEvent()
425+
{
425426
bool triggered = Generator::triggerEvent();
426427
if (!triggered) {
427428
// counter is decreased when event is rejected, otherwise simulation hangs

0 commit comments

Comments
 (0)