Merge branch 'cholmcc_generators_more' into cholmcc_aod_to_hepmc

Author: cholmcc

Generators/include/Generators/GeneratorHepMCParam.h

@@ -30,8 +30,9 @@ namespace eventgen
  **/
 
 struct GeneratorHepMCParam : public o2::conf::ConfigurableParamHelper<GeneratorHepMCParam> {
-  int version = 3;
+  int version = 0;
   uint64_t eventsToSkip = 0;
+  std::string fileName = "";
   O2ParamDef(GeneratorHepMCParam, "HepMC");
 };
 

Generators/src/GeneratorFileOrCmd.cxx

@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-/// \author R+Preghenella - August 2017
+/// @author Christian Holm Christensen <cholm@nbi.dk>
 
 #include "SimulationDataFormat/MCUtils.h"
 #include "Generators/GeneratorFileOrCmd.h"
@@ -31,8 +31,9 @@ namespace
 std::string ltrim(const std::string& s, const std::string& what = "\" ' ")
 {
   auto start = s.find_first_not_of(what);
-  if (start == std::string::npos)
+  if (start == std::string::npos) {
     return "";
+  }
 
   return s.substr(start);
 }
@@ -73,21 +74,25 @@ void GeneratorFileOrCmd::setFileNames(const std::string& filenames)
 {
   std::stringstream s(filenames);
   std::string f;
-  while (std::getline(s, f, ','))
+  while (std::getline(s, f, ',')) {
     mFileNames.push_back(f);
+  }
 }
 // -----------------------------------------------------------------
 std::string GeneratorFileOrCmd::makeCmdLine() const
 {
   std::string fileName = mFileNames.front();
   std::stringstream s;
   s << mCmd << " ";
-  if (not mSeedSwitch.empty() and mSeedSwitch != "none")
+  if (not mSeedSwitch.empty() and mSeedSwitch != "none") {
     s << mSeedSwitch << " " << mSeed << " ";
-  if (not mNEventsSwitch.empty() and mNEventsSwitch != "none")
+  }
+  if (not mNEventsSwitch.empty() and mNEventsSwitch != "none") {
     s << mNEventsSwitch << " " << mNEvents << " ";
-  if (not mBmaxSwitch.empty() and mBmax >= 0 and mBmaxSwitch != "none")
+  }
+  if (not mBmaxSwitch.empty() and mBmax >= 0 and mBmaxSwitch != "none") {
     s << mBmaxSwitch.c_str() << " " << mBmax << " ";
+  }
 
   s << mOutputSwitch << " " << fileName << " "
     << mBackgroundSwitch;
@@ -190,13 +195,15 @@ void GeneratorFileOrCmd::waitForData(const std::string& filename) const
   LOG(debug) << "Waiting for data on " << p;
 
   // Wait until child process creates the file
-  while (not std::filesystem::exists(p))
+  while (not std::filesystem::exists(p)) {
     std::this_thread::sleep_for(mWait * 1ms);
+  }
 
   // Wait until we have more data in the file than just the file
   // header
-  while (std::filesystem::file_size(p) <= 256)
+  while (std::filesystem::file_size(p) <= 256) {
     std::this_thread::sleep_for(mWait * 1ms);
+  }
 
   // Give the child process 1 second to post the data to the file
   LOG(debug) << "Got data in " << p << ", sleeping for a while";

Generators/src/GeneratorHepMC.cxx

@@ -59,10 +59,12 @@ GeneratorHepMC::~GeneratorHepMC()
 {
   /** default destructor **/
   LOG(info) << "Destructing GeneratorHepMC";
-  if (mReader)
+  if (mReader) {
     mReader->close();
-  if (mEvent)
+  }
+  if (mEvent) {
     delete mEvent;
+  }
   removeTemp();
 }
 
@@ -71,21 +73,28 @@ void GeneratorHepMC::setup(const GeneratorFileOrCmdParam& param0,
                            const GeneratorHepMCParam& param,
                            const conf::SimConfig& config)
 {
+  if (not param.fileName.empty()) {
+    LOG(fatal) << "The use of the key \"HepMC.fileName\" is "
+               << "no longer supported, use \"FileOrCmd.fileNames\" instead";
+  }
+  if (param.version != 0)
+    LOG(warn) << "The key \"HepMC.version\" is no longer used. The "
+              << "version of the input files are automatically deduced.";
   GeneratorFileOrCmd::setup(param0, config);
   setEventsToSkip(param.eventsToSkip);
 }
 
 /*****************************************************************/
-
 Bool_t GeneratorHepMC::generateEvent()
 {
   LOG(debug) << "Generating an event";
   /** generate event **/
   int tries = 0;
   do {
     LOG(debug) << " try # " << ++tries;
-    if (not mReader and not makeReader())
+    if (not mReader and not makeReader()) {
       return false;
+    }
 
     /** clear and read event **/
     mEvent->clear();
@@ -153,34 +162,71 @@ Bool_t GeneratorHepMC::importParticles()
 
 namespace
 {
+template <typename AttributeType, typename TargetType>
+bool putAttributeInfoImpl(o2::dataformats::MCEventHeader* eventHeader,
+                          const std::string& name,
+                          const std::shared_ptr<HepMC3::Attribute>& a)
+{
+  if (auto* p = dynamic_cast<AttributeType*>(a.get())) {
+    eventHeader->putInfo<TargetType>(name, p->value());
+    return true;
+  }
+  return false;
+}
+
 void putAttributeInfo(o2::dataformats::MCEventHeader* eventHeader,
                       const std::string& name,
                       const std::shared_ptr<HepMC3::Attribute>& a)
 {
-  if (auto* p = dynamic_cast<HepMC3::IntAttribute*>(a.get()))
-    eventHeader->putInfo<int>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::LongAttribute*>(a.get()))
-    eventHeader->putInfo<int>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::FloatAttribute*>(a.get()))
-    eventHeader->putInfo<float>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::DoubleAttribute*>(a.get()))
-    eventHeader->putInfo<float>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::StringAttribute*>(a.get()))
-    eventHeader->putInfo<std::string>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::CharAttribute*>(a.get()))
-    eventHeader->putInfo<char>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::LongLongAttribute*>(a.get()))
-    eventHeader->putInfo<int>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::LongDoubleAttribute*>(a.get()))
-    eventHeader->putInfo<float>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::UIntAttribute*>(a.get()))
-    eventHeader->putInfo<int>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::ULongAttribute*>(a.get()))
-    eventHeader->putInfo<int>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::ULongLongAttribute*>(a.get()))
-    eventHeader->putInfo<int>(name, p->value());
-  if (auto* p = dynamic_cast<HepMC3::BoolAttribute*>(a.get()))
-    eventHeader->putInfo<bool>(name, p->value());
+  using IntAttribute = HepMC3::IntAttribute;
+  using LongAttribute = HepMC3::LongAttribute;
+  using FloatAttribute = HepMC3::FloatAttribute;
+  using DoubleAttribute = HepMC3::DoubleAttribute;
+  using StringAttribute = HepMC3::StringAttribute;
+  using CharAttribute = HepMC3::CharAttribute;
+  using LongLongAttribute = HepMC3::LongLongAttribute;
+  using LongDoubleAttribute = HepMC3::LongDoubleAttribute;
+  using UIntAttribute = HepMC3::UIntAttribute;
+  using ULongAttribute = HepMC3::ULongAttribute;
+  using ULongLongAttribute = HepMC3::ULongLongAttribute;
+  using BoolAttribute = HepMC3::BoolAttribute;
+
+  if (putAttributeInfoImpl<IntAttribute, int>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<LongAttribute, int>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<FloatAttribute, float>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<DoubleAttribute, float>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<StringAttribute, std::string>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<CharAttribute, char>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<LongLongAttribute, int>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<LongDoubleAttribute, float>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<UIntAttribute, int>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<ULongAttribute, int>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<ULongLongAttribute, int>(eventHeader, name, a)) {
+    return;
+  }
+  if (putAttributeInfoImpl<BoolAttribute, bool>(eventHeader, name, a)) {
+    return;
+  }
 }
 } // namespace
 
@@ -264,8 +310,9 @@ void GeneratorHepMC::updateHeader(o2::dataformats::MCEventHeader* eventHeader)
     std::string name = na.first;
     if (name == "GenPdfInfo" ||
         name == "GenCrossSection" ||
-        name == "GenHeavyIon")
+        name == "GenHeavyIon") {
       continue;
+    }
 
     for (auto ia : na.second) {
       int no = ia.first;
@@ -354,12 +401,14 @@ Bool_t GeneratorHepMC::Init()
   // around the actual EG program.
   if (not mCmd.empty()) {
     // Set filename to be a temporary name
-    if (not makeTemp())
+    if (not makeTemp()) {
       return false;
+    }
 
     // Make a fifo
-    if (not makeFifo())
+    if (not makeFifo()) {
       return false;
+    }
 
     // Build command line, rediret stdout to our fifo and put
     std::string cmd = makeCmdLine();
@@ -390,8 +439,9 @@ Bool_t GeneratorHepMC::Init()
     //
     // However, here we will assume system local files.  If _any_ of
     // the listed files do not exist, then we fail.
-    if (not ensureFiles())
+    if (not ensureFiles()) {
       return false;
+    }
   }
 
   // Create reader for current (first) file

Generators/src/GeneratorTParticle.cxx

@@ -35,12 +35,14 @@ GeneratorTParticle::~GeneratorTParticle()
 {
   if (mChain) {
     TFile* file = mChain->GetCurrentFile();
-    if (file)
+    if (file) {
       mChain->RecursiveRemove(file);
+    }
     delete mChain;
   }
-  if (mCmd.empty())
+  if (mCmd.empty()) {
     return;
+  }
 
   removeTemp();
 }
@@ -53,8 +55,9 @@ Bool_t GeneratorTParticle::Init()
 
   if (not mCmd.empty()) {
     // Set filename to be a temporary name
-    if (not makeTemp())
+    if (not makeTemp()) {
       return false;
+    }
 
     // Build command line, Assumes command line parameter
     std::string cmd = makeCmdLine();
@@ -66,8 +69,9 @@ Bool_t GeneratorTParticle::Init()
       return false;
     }
   }
-  for (auto filename : mFileNames)
+  for (auto filename : mFileNames) {
     mChain->AddFile(filename.c_str());
+  }
 
   // Clear the array of file names
   mFileNames.clear();
@@ -90,20 +94,23 @@ Bool_t GeneratorTParticle::generateEvent()
 {
   // If this is the first entry, and we're executing a command, then
   // wait until the input file exists and actually contain some data.
-  if (mEntry == 0 and not mCmd.empty())
+  if (mEntry == 0 and not mCmd.empty()) {
     waitForData(mTemporary);
+  }
 
   // Read in the next entry in the chain
   int read = mChain->GetEntry(mEntry);
   mEntry++;
 
   // If we got an error while reading, then give error message
-  if (read < 0)
+  if (read < 0) {
     LOG(error) << "Failed to read entry " << mEntry << " of chain";
+  }
 
   // If we had an error or nothing was read back, then return false
-  if (read <= 0)
+  if (read <= 0) {
     return false;
+  }
 
   return true;
 }
@@ -113,9 +120,10 @@ Bool_t GeneratorTParticle::importParticles()
   for (auto* object : *mTParticles) {
     TParticle* particle = static_cast<TParticle*>(object);
     auto statusCode = particle->GetStatusCode();
-    if (!mcgenstatus::isEncoded(statusCode))
+    if (!mcgenstatus::isEncoded(statusCode)) {
       statusCode = mcgenstatus::MCGenStatusEncoding(statusCode, 0)
                      .fullEncoding;
+    }
 
     mParticles.emplace_back(particle->GetPdgCode(),
                             statusCode,

run/CMakeLists.txt

@@ -279,7 +279,7 @@ o2_add_test_command(NAME o2sim_hepmc
                                       -g
                                    hepmc
                        --configKeyValues
-"HepMC.fileName=${CMAKE_SOURCE_DIR}/Generators/share/data/pythia.hepmc;HepMC.version=2;align-geom.mDetectors=none"
+"FileOrCmd.fileNames=${CMAKE_SOURCE_DIR}/Generators/share/data/pythia.hepmc;HepMC.version=2;align-geom.mDetectors=none"
                                       -o
                               o2simhepmc
                     LABELS long sim hepmc3