o2sim_parallel: correct stack filtering, add timing information

sawenzel · sawenzel · commit 036e2fffaeee · 2018-06-15T19:04:47.000+02:00
This is providing one more step to be consistent with the serial and parallel
version of the simulation. Up until now, the parallel version did not call
important hooks on the stack object after each event.

Also adding some total timing information to both o2sim and o2sim_parallel
for better systematic comparison.
diff --git a/Steer/include/Steer/O2MCApplication.h b/Steer/include/Steer/O2MCApplication.h
@@ -44,14 +44,20 @@ class O2MCApplication : public FairMCApplication
   /** Define actions at the end of event */
   void FinishEvent() override
   {
+    // update the stack
+    fStack->FillTrackArray();
+    fStack->UpdateTrackIndex(fActiveDetectors);
+
     // This special finish event version does not fill the output tree of FairRootManager
     // but forwards the data to the HitMerger
     SendData();
 
     // call end of event on active detectors
     for (auto det : listActiveDetectors) {
+      det->FinishEvent();
       det->EndOfEvent();
     }
+    fStack->Reset();
   }
 
   /** Define actions at the end of run */
diff --git a/run/o2sim.cxx b/run/o2sim.cxx
@@ -10,9 +10,13 @@
 
 #include "../macro/o2sim.C"
 #include <SimConfig/SimConfig.h>
+#include <TStopwatch.h>
+#include <FairLogger.h>
 
 int main(int argc, char* argv[])
 {
+  TStopwatch timer;
+  timer.Start();
   auto& conf = o2::conf::SimConfig::Instance();
   if (!conf.resetFromArguments(argc, argv)) {
     return 1;
@@ -21,6 +25,9 @@ int main(int argc, char* argv[])
   // call o2sim "macro"
   o2sim(false);
 
+  // print total time
+  LOG(INFO) << "Simulation process took " << timer.RealTime() << " s";
+
   // We do this instead of return 0
   // for the reason that we see lots of problems
   // with TROOTs atexit mechanism often triggering double-free or delete symptoms.
diff --git a/run/o2sim_parallel.cxx b/run/o2sim_parallel.cxx
@@ -21,6 +21,8 @@
 #include <vector>
 #include <thread>
 #include <signal.h>
+#include "TStopwatch.h"
+#include "FairLogger.h"
 
 const char* serverlogname = "serverlog";
 const char* workerlogname = "workerlog";
@@ -30,6 +32,8 @@ const char* mergerlogname = "mergerlog";
 // for parallel simulation
 int main(int argc, char* argv[])
 {
+  TStopwatch timer;
+  timer.Start();
   std::string rootpath(getenv("O2_ROOT"));
   std::string installpath = rootpath + "/bin";
 
@@ -151,7 +155,9 @@ int main(int argc, char* argv[])
   // wait just blocks and waits until any child returns; make sure that we wait until merger is here
   while ((cpid = wait(&status)) != mergerpid) {
   }
-  std::cout << "Merger process " << mergerpid << " returned\n";
+  // This marks the actual end of the computation (since results are available)
+  LOG(INFO) << "Merger process " << mergerpid << " returned";
+  LOG(INFO) << "Simulation process took " << timer.RealTime() << " s";
 
   // make sure the rest shuts down
   for (auto p : childpids) {

Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,20 @@ class O2MCApplication : public FairMCApplication`
`44`	`44`	`/** Define actions at the end of event */`
`45`	`45`	`void FinishEvent() override`
`46`	`46`	`{`
	`47`	`+ // update the stack`
	`48`	`+ fStack->FillTrackArray();`
	`49`	`+ fStack->UpdateTrackIndex(fActiveDetectors);`
	`50`	`+`
`47`	`51`	`// This special finish event version does not fill the output tree of FairRootManager`
`48`	`52`	`// but forwards the data to the HitMerger`
`49`	`53`	`SendData();`
`50`	`54`
`51`	`55`	`// call end of event on active detectors`
`52`	`56`	`for (auto det : listActiveDetectors) {`
	`57`	`+ det->FinishEvent();`
`53`	`58`	`det->EndOfEvent();`
`54`	`59`	`}`
	`60`	`+ fStack->Reset();`
`55`	`61`	`}`
`56`	`62`
`57`	`63`	`/** Define actions at the end of run */`