Apply new MC IO convention also to serial case

sawenzel · sawenzel · commit 80c7d6d23742 · 2020-06-15T19:34:17.000+02:00
diff --git a/macro/migrateSimFiles.C b/macro/migrateSimFiles.C
@@ -1,3 +1,20 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#if !defined(__CLING__) || defined(__ROOTCLING__)
+#include <TTree.h>
+#include <DetectorsCommonDataFormats/NameConf.h>
+#include <DetectorsCommonDataFormats/DetID.h>
+#include <DetectorsCommonDataFormats/SimTraits.h>
+#endif
+
 // A macro with the purpose to produce
 // simulation files in the new layout, where detector hits
 // are stored in individual files.
diff --git a/macro/o2sim.C b/macro/o2sim.C
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <sstream>
 #endif
+#include "migrateSimFiles.C"
 
 FairRunSim* o2sim_init(bool asservice)
 {
@@ -205,6 +206,14 @@ void o2sim_run(FairRunSim* run, bool asservice)
   LOG(INFO) << "Macro finished succesfully.";
   LOG(INFO) << "Real time " << rtime << " s, CPU time " << ctime << "s";
   LOG(INFO) << "Memory used " << sysinfo.GetMaxMemory() << " MB";
+
+  // migrate to file format where hits sit in separate files
+  // (Note: The parallel version is doing this intrinsically;
+  //  The serial version uses FairRootManager IO which handles a common file IO for all outputs)
+  if (!asservice) {
+    LOG(INFO) << "Migrating simulation output to separate hit file format";
+    migrateSimFiles(confref.getOutPrefix().c_str());
+  }
 }
 
 // asservice: in a parallel device-based context?
