Reduce vertexer verbosity

mconcas · shahor02 · commit 0c06e530edf9 · 2021-09-29T21:06:52.000+02:00
diff --git a/Detectors/ITSMFT/ITS/tracking/include/ITStracking/Vertexer.h b/Detectors/ITSMFT/ITS/tracking/include/ITStracking/Vertexer.h
@@ -78,7 +78,7 @@ class Vertexer
   // Utils
   void dumpTraits();
   template <typename... T>
-  float evaluateTask(void (Vertexer::*)(T...), const char*, std::function<void(std::string s)> logger, T&&... args);
+  float evaluateTask(void (Vertexer::*)(T...), bool, const char*, std::function<void(std::string s)> logger, T&&... args);
 
   // debug
   void setDebugCombinatorics();
@@ -148,7 +148,7 @@ inline std::vector<Vertex> Vertexer::exportVertices()
 }
 
 template <typename... T>
-float Vertexer::evaluateTask(void (Vertexer::*task)(T...), const char* taskName, std::function<void(std::string s)> logger,
+float Vertexer::evaluateTask(void (Vertexer::*task)(T...), bool verbose, const char* taskName, std::function<void(std::string s)> logger,
                              T&&... args)
 {
   float diff{0.f};
@@ -167,7 +167,9 @@ float Vertexer::evaluateTask(void (Vertexer::*task)(T...), const char* taskName,
     } else {
       sstream << std::setw(2) << " - " << taskName << " completed in: " << diff << " ms";
     }
-    logger(sstream.str());
+    if (verbose) {
+      logger(sstream.str());
+    }
   } else {
     (this->*task)(std::forward<T>(args)...);
   }
diff --git a/Detectors/ITSMFT/ITS/tracking/src/Vertexer.cxx b/Detectors/ITSMFT/ITS/tracking/src/Vertexer.cxx
@@ -40,15 +40,15 @@ float Vertexer::clustersToVertices(ROframe& event, const bool useMc, std::functi
 {
   ROframe* eventptr = &event;
   float total{0.f};
-  total += evaluateTask(&Vertexer::initialiseVertexer, "Vertexer initialisation", logger, eventptr);
-  total += evaluateTask(&Vertexer::findTracklets, "Tracklet finding", logger);
+  total += evaluateTask(&Vertexer::initialiseVertexer, false, "Vertexer initialisation", logger, eventptr);
+  total += evaluateTask(&Vertexer::findTracklets, false, "Tracklet finding", logger);
 #ifdef _ALLOW_DEBUG_TREES_ITS_
   if (useMc) {
     total += evaluateTask(&Vertexer::filterMCTracklets, "MC tracklets filtering", logger);
   }
 #endif
-  total += evaluateTask(&Vertexer::validateTracklets, "Adjacent tracklets validation", logger);
-  total += evaluateTask(&Vertexer::findVertices, "Vertex finding", logger);
+  total += evaluateTask(&Vertexer::validateTracklets, false, "Adjacent tracklets validation", logger);
+  total += evaluateTask(&Vertexer::findVertices, false, "Vertex finding", logger);
 
   return total;
 }
diff --git a/Detectors/ITSMFT/ITS/workflow/src/TrackerSpec.cxx b/Detectors/ITSMFT/ITS/workflow/src/TrackerSpec.cxx
@@ -203,6 +203,7 @@ void TrackerDPL::run(ProcessingContext& pc)
     pattIt = patterns.begin();
     std::vector<int> savedROF;
     auto logger = [&](std::string s) { LOG(INFO) << s; };
+    float vertexerElapsedTime{0.f};
     for (auto& rof : rofspan) {
 
       int nclUsed = ioutils::loadROFrameData(rof, event, compClusters, pattIt, mDict, labels);
@@ -218,7 +219,7 @@ void TrackerDPL::run(ProcessingContext& pc)
 
       std::vector<Vertex> vtxVecLoc;
       if (mRunVertexer) {
-        mVertexer->clustersToVertices(event, false, logger);
+        vertexerElapsedTime += mVertexer->clustersToVertices(event, false, logger);
         vtxVecLoc = mVertexer->exportVertices();
       }
       mTimeFrame.addPrimaryVertices(vtxVecLoc);
@@ -230,6 +231,8 @@ void TrackerDPL::run(ProcessingContext& pc)
       savedROF.push_back(roFrame);
       roFrame++;
     }
+    LOG(INFO) << " - Vertex seeding total elapsed time: " << vertexerElapsedTime << " ms";
+
     mTracker->clustersToTracks(logger);
 
     for (unsigned int iROF{0}; iROF < rofs.size(); ++iROF) {

Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,15 @@ float Vertexer::clustersToVertices(ROframe& event, const bool useMc, std::functi`
`40`	`40`	`{`
`41`	`41`	`ROframe* eventptr = &event;`
`42`	`42`	`float total{0.f};`
`43`		`- total += evaluateTask(&Vertexer::initialiseVertexer, "Vertexer initialisation", logger, eventptr);`
`44`		`- total += evaluateTask(&Vertexer::findTracklets, "Tracklet finding", logger);`
	`43`	`+ total += evaluateTask(&Vertexer::initialiseVertexer, false, "Vertexer initialisation", logger, eventptr);`
	`44`	`+ total += evaluateTask(&Vertexer::findTracklets, false, "Tracklet finding", logger);`
`45`	`45`	`#ifdef _ALLOW_DEBUG_TREES_ITS_`
`46`	`46`	`if (useMc) {`
`47`	`47`	`total += evaluateTask(&Vertexer::filterMCTracklets, "MC tracklets filtering", logger);`
`48`	`48`	`}`
`49`	`49`	`#endif`
`50`		`- total += evaluateTask(&Vertexer::validateTracklets, "Adjacent tracklets validation", logger);`
`51`		`- total += evaluateTask(&Vertexer::findVertices, "Vertex finding", logger);`
	`50`	`+ total += evaluateTask(&Vertexer::validateTracklets, false, "Adjacent tracklets validation", logger);`
	`51`	`+ total += evaluateTask(&Vertexer::findVertices, false, "Vertex finding", logger);`
`52`	`52`
`53`	`53`	`return total;`
`54`	`54`	`}`