Merge 3f08377 into sapling-pr-archive-ktf

Author: ktf

CODEOWNERS

@@ -43,7 +43,7 @@
 /DataFormats/Detectors/TRD                     @f3sch @bazinski @wille10
 /DataFormats/Detectors/Upgrades                @mconcas
 /DataFormats/Detectors/Upgrades/ITS3           @fgrosa @arossi81
-/DataFormats/Detectors/ZDC                     @coppedis
+/DataFormats/Detectors/ZDC                     @coppedis @cortesep
 
 #/DataFormats/Headers
 #/DataFormats/Legacy
@@ -75,7 +75,7 @@
 /Detectors/Upgrades                @mconcas
 /Detectors/Upgrades/ALICE3         @mconcas @njacazio
 /Detectors/Upgrades/ITS3           @fgrosa @arossi81 @mconcas @f3sch
-/Detectors/ZDC                     @coppedis
+/Detectors/ZDC                     @coppedis @cortesep
 /Detectors/CTF                     @shahor02
 /Detectors/Raw                     @shahor02
 /Detectors/StrangenessTracking     @mconcas @mpuccio @fmazzasc

Common/DCAFitter/include/DCAFitter/DCAFitterN.h

@@ -818,6 +818,7 @@ GPUd() o2::math_utils::SMatrix<double, 3, 3, o2::math_utils::MatRepSym<double, 3
   MatSym3D covmSum;
   for (int i = N; i--;) {
     MatSym3D covTr = o2::math_utils::Similarity(getTrackRotMatrix(i), getTrackCovMatrix(i, cand));
+    covmSum += covTr;
   }
   return covmSum;
 }

Common/SimConfig/include/SimConfig/G4Params.h

@@ -33,13 +33,22 @@ enum class EG4Physics {
   kUSER = 8                           /* allows to give own string combination */
 };
 
+// enumerating possible geometry navigation modes
+// (understanding that geometry description is always done with TGeo)
+enum class EG4Nav {
+  kTGeo = 0, /* navigate with TGeo */
+  kG4 = 1    /* navigate with G4 native geometry */
+};
+
 // parameters to influence the G4 engine
 struct G4Params : public o2::conf::ConfigurableParamHelper<G4Params> {
   EG4Physics physicsmode = EG4Physics::kFTFP_BERT_EMV_optical; // default physics mode with which to configure G4
 
   std::string configMacroFile = ""; // a user provided g4Config.in file (otherwise standard one fill be taken)
   std::string userPhysicsList = ""; // possibility to directly give physics list as string
 
+  EG4Nav navmode = EG4Nav::kTGeo; // geometry navigation mode (default TGeo)
+
   std::string const& getPhysicsConfigString() const;
 
   O2ParamDef(G4Params, "G4");

Common/SimConfig/src/SimConfigLinkDef.h

@@ -29,6 +29,7 @@
 #pragma link C++ class o2::conf::ConfigurableParamHelper < o2::conf::DigiParams> + ;
 
 #pragma link C++ enum o2::conf::EG4Physics;
+#pragma link C++ enum o2::conf::EG4Nav;
 #pragma link C++ enum o2::conf::SimFieldMode;
 #pragma link C++ struct o2::conf::G4Params + ;
 #pragma link C++ class o2::conf::ConfigurableParamHelper < o2::conf::G4Params> + ;

Common/Utils/include/CommonUtils/ConfigurableParam.h

@@ -187,6 +187,9 @@ class ConfigurableParam
   // writes a human readable INI file of all parameters
   static void writeINI(std::string const& filename, std::string const& keyOnly = "");
 
+  // writes a human readable INI or JSON file depending on the extension
+  static void write(std::string const& filename, std::string const& keyOnly = "");
+
   // can be used instead of using API on concrete child classes
   template <typename T>
   static T getValueAs(std::string key)

Common/Utils/include/CommonUtils/NameConf.h

@@ -103,6 +103,9 @@ class NameConf : public o2::conf::ConfigurableParamHelper<NameConf>
   // Default CCDB server
   static std::string getCCDBServer();
 
+  // create name to dump config file
+  static std::string getConfigOutputFileName(const std::string& procName, const std::string& confName = "", bool json = true);
+
  protected:
   // helper method to build filenames
   static std::string buildFileName(const std::string_view prefix, const std::string_view delimiter, const std::string_view defPrefix, const std::string_view defName,

Common/Utils/include/CommonUtils/StringUtils.h

@@ -136,6 +136,9 @@ struct Str {
   // return vector of tokens from the string with provided delimiter. If requested, trim the spaces from tokens
   static std::vector<std::string> tokenize(const std::string& src, char delim, bool trimToken = true, bool skipEmpty = true);
 
+  // return vector of tokens from the string with provided delimiters. If requested, trim the spaces from tokens
+  static std::vector<std::string> tokenize(const std::string& src, const std::string& delim, bool trimToken = true, bool skipEmpty = true);
+
   // concatenate arbitrary number of strings
   template <typename... Ts>
   static std::string concat_string(Ts const&... ts)

Common/Utils/src/ConfigurableParam.cxx

@@ -192,6 +192,19 @@ int EnumLegalValues::getIntValue(const std::string& value) const
 
 // -----------------------------------------------------------------
 
+void ConfigurableParam::write(std::string const& filename, std::string const& keyOnly)
+{
+  if (o2::utils::Str::endsWith(filename, ".ini")) {
+    writeINI(filename, keyOnly);
+  } else if (o2::utils::Str::endsWith(filename, ".json")) {
+    writeJSON(filename, keyOnly);
+  } else {
+    throw std::invalid_argument(fmt::format("ConfigurabeParam output file name {} extension is neither .json nor .ini", filename));
+  }
+}
+
+// -----------------------------------------------------------------
+
 void ConfigurableParam::writeINI(std::string const& filename, std::string const& keyOnly)
 {
   if (sOutputDir == "/dev/null") {
@@ -203,7 +216,10 @@ void ConfigurableParam::writeINI(std::string const& filename, std::string const&
   if (!keyOnly.empty()) { // write ini for selected key only
     try {
       boost::property_tree::ptree kTree;
-      kTree.add_child(keyOnly, sPtree->get_child(keyOnly));
+      auto keys = o2::utils::Str::tokenize(keyOnly, " ,;", true, true);
+      for (const auto& k : keys) {
+        kTree.add_child(k, sPtree->get_child(k));
+      }
       boost::property_tree::write_ini(outfilename, kTree);
     } catch (const boost::property_tree::ptree_bad_path& err) {
       LOG(fatal) << "non-existing key " << keyOnly << " provided to writeINI";
@@ -284,7 +300,10 @@ void ConfigurableParam::writeJSON(std::string const& filename, std::string const
   if (!keyOnly.empty()) { // write ini for selected key only
     try {
       boost::property_tree::ptree kTree;
-      kTree.add_child(keyOnly, sPtree->get_child(keyOnly));
+      auto keys = o2::utils::Str::tokenize(keyOnly, " ,;", true, true);
+      for (const auto& k : keys) {
+        kTree.add_child(k, sPtree->get_child(k));
+      }
       boost::property_tree::write_json(outfilename, kTree);
     } catch (const boost::property_tree::ptree_bad_path& err) {
       LOG(fatal) << "non-existing key " << keyOnly << " provided to writeJSON";

Common/Utils/src/NameConf.cxx

@@ -111,3 +111,12 @@ std::string NameConf::getCCDBServer()
 {
   return Instance().mCCDBServer;
 }
+
+std::string NameConf::getConfigOutputFileName(const std::string& procName, const std::string& confName, bool json)
+{
+  std::string nm = procName;
+  if (!confName.empty()) {
+    nm += '_' + confName;
+  }
+  return fmt::format("ConfigParam_{}.{}", nm, json ? "json" : "ini");
+}

Common/Utils/src/StringUtils.cxx

@@ -17,6 +17,7 @@
 #include <fmt/format.h>
 #endif
 #include <unistd.h>
+#include <cstring>
 
 using namespace o2::utils;
 
@@ -37,6 +38,35 @@ std::vector<std::string> Str::tokenize(const std::string& src, char delim, bool
   return tokens;
 }
 
+std::vector<std::string> Str::tokenize(const std::string& src, const std::string& delim, bool trimToken, bool skipEmpty)
+{
+  std::string inptStr{src};
+  char* input = inptStr.data();
+  auto mystrtok = [&]() -> char* {
+    input += std::strspn(input, delim.c_str());
+    if (*input == '\0') {
+      return nullptr;
+    }
+    char* const token = input;
+    input += std::strcspn(input, delim.c_str());
+    if (*input != '\0') {
+      *input++ = '\0';
+    }
+    return token;
+  };
+  std::vector<std::string> tokens;
+  while (*input != '\0') {
+    std::string token = mystrtok();
+    if (trimToken) {
+      trim(token);
+    }
+    if (!token.empty() || !skipEmpty) {
+      tokens.push_back(std::move(token));
+    }
+  }
+  return tokens;
+}
+
 // replace all occurencies of from by to, return count
 int Str::replaceAll(std::string& s, const std::string& from, const std::string& to)
 {