Sim evalmat for Run5 modules

Author: Benedikt Volkel

Common/SimConfig/src/SimConfig.cxx

@@ -74,14 +74,14 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
   if (activeModules[0] != "all") {
     if (mIsRun5) {
       for (int i = 0; i < activeModules.size(); ++i) {
-        if (activeModules[i] != "IT3" && activeModules[i] != "TRK" && activeModules[i] != "FT3" && activeModules[i] != "FCT") {
+        if (activeModules[i] != "IT3" && activeModules[i] != "TRK" && activeModules[i] != "FT3" && activeModules[i] != "FCT" && activeModules[i] != "A3IP") {
           LOGP(fatal, "List of active modules contains {}, which is not a run 5 module", activeModules[i]);
         }
       }
     }
     if (!mIsRun5) {
       for (int i = 0; i < activeModules.size(); ++i) {
-        if (activeModules[i] == "TRK" || activeModules[i] == "FT3" || activeModules[i] == "FCT") {
+        if (activeModules[i] == "TRK" || activeModules[i] == "FT3" || activeModules[i] == "FCT" || activeModules[i] == "A3IP") {
           LOGP(fatal, "List of active modules contains {}, which is not a run 3 module", activeModules[i]);
         }
       }
@@ -97,6 +97,7 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
           activeModules.emplace_back(DetID::getName(d));
         }
       }
+      activeModules.emplace_back("A3IP");
     } else {
 #endif
       // add passive components manually (make a PassiveDetID for them!)

run/CMakeLists.txt

@@ -81,6 +81,11 @@ o2_add_executable(sim-run5
                   SOURCES o2sim_parallel.cxx
                   PUBLIC_LINK_LIBRARIES internal::allsim O2::Version
                   TARGETVARNAME simdriverrun5)
+
+o2_add_executable(evalmat-run5
+                  COMPONENT_NAME sim
+                  SOURCES o2sim_evalmat.cxx
+                  PUBLIC_LINK_LIBRARIES internal::allsim)
 endif()
 if(NOT APPLE)
   set_property(TARGET ${simexe} PROPERTY LINK_WHAT_YOU_USE ON)
@@ -122,9 +127,11 @@ o2_name_target(sim-serial NAME o2simSerialExecutable IS_EXE)
 if(ENABLE_UPGRADES)
 o2_name_target(sim-serial-run5 NAME o2simSerialRun5Executable IS_EXE)
 o2_name_target(sim-run5 NAME o2simRun5Executable IS_EXE)
+o2_name_target(sim-evalmat-run5 NAME o2simEvalmatRun5Executable IS_EXE)
 
 target_compile_definitions(${o2simSerialRun5Executable} PUBLIC SIM_RUN5)
 target_compile_definitions(${o2simRun5Executable} PUBLIC SIM_RUN5)
+target_compile_definitions(${o2simEvalmatRun5Executable} PUBLIC SIM_RUN5)
 endif()
 if (BUILD_TESTING)
 o2_add_test_command(NAME o2sim_G4

run/o2sim_evalmat.cxx

@@ -19,7 +19,11 @@ int main(int argc, char* argv[])
 {
   TStopwatch timer;
   timer.Start();
+
   auto& conf = o2::conf::SimConfig::Instance();
+#ifdef SIM_RUN5
+  conf.setRun5();
+#endif
   auto& matmapP = o2::conf::MatMapParams::Instance();
   if (!conf.resetFromArguments(argc, argv)) {
     return 1;