Please consider the following formatting changes

Author: alibuild

Generators/src/GeneratorHybrid.cxx

@@ -28,8 +28,8 @@ GeneratorHybrid::GeneratorHybrid(const std::string& inputgens)
     LOG(fatal) << "Number of configurations does not match the number of generators";
     exit(1);
   }
-  if (mConfigs.size() == 0){
-    for(auto gen : mInputGens){
+  if (mConfigs.size() == 0) {
+    for (auto gen : mInputGens) {
       mConfigs.push_back("");
     }
   }
@@ -40,16 +40,15 @@ GeneratorHybrid::GeneratorHybrid(const std::string& inputgens)
       return;
     }
     // Check if all elements of mFractions are 0
-    if (std::all_of(mFractions.begin(), mFractions.end(), [](int i){ return i == 0; })) {
+    if (std::all_of(mFractions.begin(), mFractions.end(), [](int i) { return i == 0; })) {
       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";
-    if (std::find(generatorNames.begin(), generatorNames.end(), gen) != generatorNames.end())
-    {
+    if (std::find(generatorNames.begin(), generatorNames.end(), gen) != generatorNames.end()) {
       LOG(info) << "Found generator " << gen << " in the list of available generators \n";
       if (gen.compare("boxgen") == 0) {
         if (mConfigs[index].compare("") == 0) {
@@ -64,15 +63,14 @@ GeneratorHybrid::GeneratorHybrid(const std::string& inputgens)
         // Check if mConfigs[index] contains pythia8_ and a number
         if (mConfigs[index].compare("") == 0) {
           gens.push_back(std::make_unique<o2::eventgen::GeneratorPythia8>());
-        }
-        else {
+        } else {
           // Get the index of pythia8 configuration
           int confPythia8Index = std::stoi(mConfigs[index].substr(8));
           gens.push_back(std::make_unique<o2::eventgen::GeneratorPythia8>(*mPythia8GenConfigs[confPythia8Index]));
         }
         mConfsPythia8.push_back(mConfigs[index]);
         mGens.push_back(gen);
-      } else if (gen.compare("extkinO2") == 0){
+      } else if (gen.compare("extkinO2") == 0) {
         int confO2KineIndex = std::stoi(mConfigs[index].substr(9));
         gens.push_back(std::make_unique<o2::eventgen::GeneratorFromO2Kine>(*mO2KineGenConfigs[confO2KineIndex]));
         mGens.push_back(gen);
@@ -106,8 +104,7 @@ Bool_t GeneratorHybrid::Init()
 {
   // init all sub-gens
   int count = 0;
-  for (auto& gen : mGens)
-  {
+  for (auto& gen : mGens) {
     if (gen == "pythia8pp") {
       auto config = std::string(std::getenv("O2_ROOT")) + "/share/Generators/egconfig/pythia8_inel.cfg";
       LOG(info) << "Setting \'Pythia8\' base configuration: " << config << std::endl;
@@ -134,28 +131,28 @@ Bool_t GeneratorHybrid::Init()
 
 Bool_t GeneratorHybrid::generateEvent()
 {
-    // Order randomisation or sequence of generators
-    // following provided fractions, if not generators are used in proper sequence
-    if (mRandomize) {
-      mIndex = gRandom->Integer(mGens.size());
-    } else {
-      while (mFractions[mCurrentFraction] == 0 || mseqCounter == mFractions[mCurrentFraction]) {
-        if (mFractions[mCurrentFraction] != 0)
-          mseqCounter = 0;
-        mCurrentFraction = (mCurrentFraction + 1) % mFractions.size();
-      }
-      mIndex = mCurrentFraction;
+  // Order randomisation or sequence of generators
+  // following provided fractions, if not generators are used in proper sequence
+  if (mRandomize) {
+    mIndex = gRandom->Integer(mGens.size());
+  } else {
+    while (mFractions[mCurrentFraction] == 0 || mseqCounter == mFractions[mCurrentFraction]) {
+      if (mFractions[mCurrentFraction] != 0)
+        mseqCounter = 0;
+      mCurrentFraction = (mCurrentFraction + 1) % mFractions.size();
     }
-    if(mConfigs[mIndex].compare("") == 0)
-      LOG(info) << "GeneratorHybrid: generating event with generator " << mGens[mIndex];
-    else
-      LOG(info) << "GeneratorHybrid: generating event with generator " << mConfigs[mIndex];
-    gens[mIndex]->clearParticles(); // clear container of this class
-    gens[mIndex]->generateEvent();
-    // notify the sub event generator
-    notifySubGenerator(mIndex);
-    mseqCounter++;
-    return true;
+    mIndex = mCurrentFraction;
+  }
+  if (mConfigs[mIndex].compare("") == 0)
+    LOG(info) << "GeneratorHybrid: generating event with generator " << mGens[mIndex];
+  else
+    LOG(info) << "GeneratorHybrid: generating event with generator " << mConfigs[mIndex];
+  gens[mIndex]->clearParticles(); // clear container of this class
+  gens[mIndex]->generateEvent();
+  // notify the sub event generator
+  notifySubGenerator(mIndex);
+  mseqCounter++;
+  return true;
 }
 
 Bool_t GeneratorHybrid::importParticles()
@@ -165,8 +162,7 @@ Bool_t GeneratorHybrid::importParticles()
   std::copy(gens[mIndex]->getParticles().begin(), gens[mIndex]->getParticles().end(), std::back_insert_iterator(mParticles));
 
   // we need to fix particles statuses --> need to enforce this on the importParticles level of individual generators
-  for (auto& p : mParticles)
-  {
+  for (auto& p : mParticles) {
     auto st = o2::mcgenstatus::MCGenStatusEncoding(p.GetStatusCode(), p.GetStatusCode()).fullEncoding;
     p.SetStatusCode(st);
     p.SetBit(ParticleStatus::kToBeDone, true);
@@ -209,7 +205,7 @@ Bool_t GeneratorHybrid::parseJSON(const std::string& path)
       std::string name = gen["name"].GetString();
       mInputGens.push_back(name);
       if (gen.HasMember("config")) {
-        //Check if config is an array
+        // Check if config is an array
         if (name == "boxgen") {
           const auto& boxconf = gen["config"];
           auto boxConfig = TBufferJSON::FromJSON<o2::eventgen::BoxGenConfig>(jsonValueToString(boxconf).c_str());
@@ -247,13 +243,11 @@ Bool_t GeneratorHybrid::parseJSON(const std::string& path)
         } else {
           mConfigs.push_back("");
         }
-      }
-      else {
-        if(name == "boxgen" || name == "pythia8" || name == "extkinO2" || name == "external" || name == "hepmc"){
+      } else {
+        if (name == "boxgen" || name == "pythia8" || name == "extkinO2" || name == "external" || name == "hepmc") {
           LOG(fatal) << "No configuration provided for generator " << name;
           return false;
-        }
-        else
+        } else
           mConfigs.push_back("");
       }
     }
@@ -265,8 +259,7 @@ Bool_t GeneratorHybrid::parseJSON(const std::string& path)
     for (const auto& frac : fractions.GetArray()) {
       mFractions.push_back(frac.GetInt());
     }
-  }
-  else {
+  } else {
     // Set fractions to unity for all generators in case they are not provided
     const auto& gens = doc["generators"];
     for (const auto& gen : gens.GetArray()) {