Hack formatting

Author: cholmcc

Detectors/AOD/src/AODMcProducerHelpers.cxx

@@ -17,6 +17,8 @@
 #include <Framework/AnalysisDataModel.h>
 #include <MathUtils/Utils.h>
 #include <algorithm>
+#define verbosity debug
+
 namespace o2::aodmchelpers
 {
 //==================================================================
@@ -53,6 +55,8 @@ short updateMCCollisions(const CollisionCursor& cursor,
   auto encodedGeneratorId = o2::mcgenid::getEncodedGenId(genId,
                                                          sourceId,
                                                          subGenId);
+
+  LOG(verbosity) << "Updating MC Collisions table w/bcId=" << bcId;
   cursor(0,
          bcId,
          encodedGeneratorId,
@@ -84,6 +88,7 @@ bool updateHepMCXSection(const XSectionCursor& cursor,
     return false;
   }
 
+  LOG(verbosity) << "Updating HepMC cross-section table w/bcId" << collisionID;
   cursor(0,
          collisionID,
          generatorID,
@@ -120,6 +125,7 @@ bool updateHepMCPdfInfo(const PdfInfoCursor& cursor,
     return false;
   }
 
+  LOG(verbosity) << "Updating HepMC PDF table w/bcId" << collisionID;
   cursor(0,
          collisionID,
          generatorID,
@@ -169,6 +175,8 @@ bool updateHepMCHeavyIon(const HeavyIonCursor& cursor,
                       getEventInfo(header, Key::nSpecTargetNeutron, -1));
   int specProtons = (getEventInfo(header, Key::nSpecProjectileProton, -1) +
                      getEventInfo(header, Key::nSpecTargetProton, -1));
+
+  LOG(verbosity) << "Updating HepMC heavy-ion table w/bcId" << collisionID;
   cursor(0,
          collisionID,
          generatorID,
@@ -259,6 +267,14 @@ void updateParticle(const ParticleCursor& cursor,
   float vZ = float(track.Vz());
   float time = float(track.T());
 
+  LOG(verbosity) << "McParticle bcId=" << collisionID << ","
+                 << "status=" << statusCode << ","
+                 << "hepmc=" << hepmc << ","
+                 << "pdg=" << track.GetPdgCode() << ","
+                 << "nMothers=" << mothers.size() << ","
+                 << "daughters=" << daughters[0] << ","
+                 << daughters[1];
+
   cursor(0,
          collisionID,
          track.GetPdgCode(),
@@ -305,7 +321,7 @@ uint32_t updateParticles(const ParticleCursor& cursor,
     return iter->second;
   };
 
-  LOG(debug) << "Got a total of " << tracks.size();
+  LOG(verbosity) << "Got a total of " << tracks.size();
   for (int trackNo = tracks.size() - 1; trackNo >= 0; trackNo--) {
     auto& track = tracks[trackNo];
     auto hepmc = getHepMCStatusCode(track.getStatusCode());
@@ -314,7 +330,11 @@ uint32_t updateParticles(const ParticleCursor& cursor,
           not track.isPrimary() and
           not MCTrackNavigator::isPhysicalPrimary(track, tracks) and
           not MCTrackNavigator::isKeepPhysics(track, tracks)) {
-        LOG(debug) << "Skipping track " << trackNo << " " << hepmc;
+        LOG(verbosity) << "Skipping track " << trackNo << " " << hepmc << " "
+                       << mapping(trackNo) << " "
+                       << track.isPrimary() << " "
+                       << MCTrackNavigator::isPhysicalPrimary(track, tracks)
+                       << MCTrackNavigator::isKeepPhysics(track, tracks);
         continue;
       }
     }
@@ -346,7 +366,7 @@ uint32_t updateParticles(const ParticleCursor& cursor,
   // Second loop to set indexes.  This is needed to be done before
   // we actually update the table, because a particle may point to a
   // later particle.
-  LOG(debug) << "Will store " << toStore.size() << " particles";
+  LOG(verbosity) << "Will store " << toStore.size() << " particles";
   size_t index = 0;
   for (size_t trackNo = 0U; trackNo < tracks.size(); trackNo++) {
     auto storeIt = mapping(trackNo);
@@ -361,7 +381,7 @@ uint32_t updateParticles(const ParticleCursor& cursor,
   // Make sure we have the right number
   assert(index == toStore.size());
 
-  LOG(debug) << "Starting index " << offset << ", last index" << index;
+  LOG(verbosity) << "Starting index " << offset << ", last index " << index;
   // Third loop to actually store the particles in the order given
   for (size_t trackNo = 0U; trackNo < tracks.size(); trackNo++) {
     auto storeIt = mapping(trackNo);
@@ -382,7 +402,7 @@ uint32_t updateParticles(const ParticleCursor& cursor,
                    momentumMask,
                    positionMask);
   }
-  LOG(debug) << "Return new offset " << offset + index;
+  LOG(verbosity) << "Return new offset " << offset + index;
   return offset + index;
 }
 } // namespace o2::aodmchelpers

Detectors/AOD/src/AODMcProducerWorkflowSpec.cxx

@@ -55,9 +55,13 @@ void AODMcProducerWorkflowDPL::init(InitContext& ic)
     mSimPrefix = ic.options().get<std::string>("mckine-fname");
   }
   std::string hepmcUpdate = ic.options().get<std::string>("hepmc-update");
-  HepMCUpdate when = (hepmcUpdate == "never" ? HepMCUpdate::never : hepmcUpdate == "always" ? HepMCUpdate::always
-                                                                  : hepmcUpdate == "all"    ? HepMCUpdate::allKeys
-                                                                                            : HepMCUpdate::anyKey);
+  HepMCUpdate when = (hepmcUpdate == "never"           //
+                        ? HepMCUpdate::never           //
+                        : hepmcUpdate == "always"      //
+                            ? HepMCUpdate::always      //
+                            : hepmcUpdate == "all"     //
+                                ? HepMCUpdate::allKeys //
+                                : HepMCUpdate::anyKey);
   mXSectionUpdate = when;
   mPdfInfoUpdate = when;
   mHeavyIonUpdate = when;
@@ -88,17 +92,26 @@ void AODMcProducerWorkflowDPL::updateHeader(CollisionCursor& collisionCursor,
                                   generatorID,
                                   sourceID,
                                   mCollisionPosition);
-  mXSectionUpdate = (updateHepMCXSection(xSectionCursor, eventID, genID, header,
-                                         mXSectionUpdate)
-                       ? HepMCUpdate::always
+  mXSectionUpdate = (updateHepMCXSection(xSectionCursor,  //
+                                         eventID,         //
+                                         genID,           //
+                                         header,          //
+                                         mXSectionUpdate) //
+                       ? HepMCUpdate::always              //
                        : HepMCUpdate::never);
-  mPdfInfoUpdate = (updateHepMCPdfInfo(pdfInfoCursor, eventID, genID, header,
-                                       mPdfInfoUpdate)
-                      ? HepMCUpdate::always
+  mPdfInfoUpdate = (updateHepMCPdfInfo(pdfInfoCursor,  //
+                                       eventID,        //
+                                       genID,          //
+                                       header,         //
+                                       mPdfInfoUpdate) //
+                      ? HepMCUpdate::always            //
                       : HepMCUpdate::never);
-  mHeavyIonUpdate = (updateHepMCHeavyIon(heavyIonCursor, eventID, genID, header,
-                                         mHeavyIonUpdate)
-                       ? HepMCUpdate::always
+  mHeavyIonUpdate = (updateHepMCHeavyIon(heavyIonCursor,  //
+                                         eventID,         //
+                                         genID,           //
+                                         header,          //
+                                         mHeavyIonUpdate) //
+                       ? HepMCUpdate::always              //
                        : HepMCUpdate::never);
 }
 
@@ -199,7 +212,9 @@ void AODMcProducerWorkflowDPL::run(ProcessingContext& pc)
   // Sort the event information
   std::sort(eventInfo.begin(), eventInfo.end(),
             [](typename EventInfo::const_reference left,
-               typename EventInfo::const_reference right) { return (std::get<0>(left) < std::get<0>(right)); });
+               typename EventInfo::const_reference right) { //
+              return (std::get<0>(left) < std::get<0>(right));
+            });
 
   // Loop over available events and update the tracks table
   size_t offset = 0;