Make SimpleAnalysis default; Robustness fixes

Author: sawenzel

src/MCAnalysisManager.cxx

@@ -156,6 +156,7 @@ bool MCAnalysisManager::analyze(int nEvents, bool isDryrun)
     std::cout << "---> Event " << mCurrentEventNumber << " <---\n";
     std::cout << "#steps: " << mCurrentStepInfo->size() << "\n";
     std::cout << "#mag field calls: " << mCurrentMagCallInfo->size() << "\n";
+    std::cout << "#vol IDs " << mCurrentLookups->volidtovolname.size() << "\n";
     if (!isDryrun) {
       std::cout << "\nStart..." << std::endl;
       for (auto& a : mAnalyses) {

src/MCStepLoggerImpl.cxx

@@ -58,6 +58,15 @@ const char* getVolMapFile()
   }
 }
 
+const char* getSensitiveVolFile()
+{
+  if (const char* f = std::getenv("MCSTEPLOG_SENSVOLFILE")) {
+    return f;
+  } else {
+    return "MCStepLoggerSenVol.dat";
+  }
+}
+
 // initializes a mapping from volumename to detector
 // used for step resolution to detectors
 void initVolumeMap()
@@ -76,7 +85,7 @@ void initVolumeMap()
       // split the line into key + value
       int counter = 0;
       std::string keyvalue[2] = { "NULL", "NULL" };
-      while (counter < 2 && std::getline(ss, token, ' ')) {
+      while (counter < 2 && std::getline(ss, token, ':')) {
         if (!token.empty()) {
           keyvalue[counter] = token;
           counter++;
@@ -216,6 +225,9 @@ class StepLogger
     }
     // try to load the volumename -> modulename mapping
     initVolumeMap();
+
+    // init the sensitive volume stuff
+    StepInfo::lookupstructures.initSensitiveVolLookup(getSensitiveVolFile());
   }
 
   void addStep(TVirtualMC* mc)
@@ -309,8 +321,7 @@ class StepLogger
       flushToTTree("Steps", &container);
       flushToTTree("Lookups", &StepInfo::lookupstructures);
       // we need to reset some parts of the lookupstructures for the next event
-      StepInfo::lookupstructures.tracktoparent.clear();
-      StepInfo::lookupstructures.tracktopdg.clear();
+      StepInfo::lookupstructures.clearTrackLookups();
     }
     clear();
   }

src/analyseMCSteps.cxx

@@ -22,6 +22,7 @@
 #include "MCStepLogger/MCAnalysisManager.h"
 #include "MCStepLogger/MCAnalysisFileWrapper.h"
 #include "MCStepLogger/BasicMCAnalysis.h"
+#include "MCStepLogger/SimpleStepAnalysis.h"
 
 using namespace o2::mcstepanalysis;
 
@@ -89,8 +90,10 @@ int analyze(const bpo::variables_map& vm, std::string& errorMessage)
     const std::string analysisDir = vm["analysis-dir"].as<std::string>().c_str();
     registerAnalyses(analysisDir);
   }
-  // create basic analysis by default, is registered automaticallyt to AnalysisManager
-  new BasicMCAnalysis();
+  // create simple analysis by default, is registered automatically to AnalysisManager
+  new SimpleStepAnalysis();
+  // new BasicMCAnalysis();
+
   //////////////////////////////////////////////////////////////////////////////////////////////
   // List analyses and quit. This has to be done here after analyses are read from analysis-dir
   // the first time the AnalysisManager is needed