Merge 64df0ad into sapling-pr-archive-ehellbar

Author: ehellbar

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/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)
 {

DataFormats/Detectors/TOF/include/DataFormatsTOF/Diagnostic.h

@@ -44,6 +44,13 @@ class Diagnostic
   uint32_t fillEmptyTOF(uint32_t frequency = 1) { return fill(1, frequency); }
   static ULong64_t getEmptyCrateKey(int crate);
   static ULong64_t getNoisyChannelKey(int channel);
+  static ULong64_t getDRMKey(int crate) { return 1000000 + crate * 1000; }
+  static ULong64_t getDRMerrorKey(int crate, int error) { return getDRMKey(crate) + error; }
+  uint32_t getFrequencyDRM(int crate) const { return getFrequency(getDRMKey(crate)); }
+  uint32_t getFrequencyDRMerror(int crate, int error) const { return getFrequency(getDRMerrorKey(crate, error)); }
+  uint32_t fillDRM(int crate, uint32_t frequency) { return fill(getDRMKey(crate), frequency); }
+  uint32_t fillDRMerror(int crate, int error, uint32_t frequency) { return fill(getDRMerrorKey(crate, error), frequency); }
+
   static ULong64_t getTRMKey(int crate, int trm);
   void print(bool longFormat = false) const;
   void clear() { mVector.clear(); }

DataFormats/Detectors/TRD/include/DataFormatsTRD/CalGain.h

@@ -33,12 +33,52 @@ class CalGain
 
   void setMPVdEdx(int iDet, float mpv) { mMPVdEdx[iDet] = mpv; }
 
-  float getMPVdEdx(int iDet) const { return mMPVdEdx[iDet]; }
+  float getMPVdEdx(int iDet, bool defaultAvg = true) const
+  {
+    // if defaultAvg = false, we take the value stored whatever it is
+    // if defaultAvg = true and we have default value or bad value stored, we take the average on all chambers instead
+    if (!defaultAvg || isGoodGain(iDet))
+      return mMPVdEdx[iDet];
+    else {
+      if (TMath::Abs(mMeanGain + 999.) < 1e-6)
+        mMeanGain = getAverageGain();
+      return mMeanGain;
+    }
+  }
+
+  float getAverageGain() const
+  {
+    float averageGain = 0.;
+    int ngood = 0;
+
+    for (int iDet = 0; iDet < constants::MAXCHAMBER; iDet++) {
+      if (isGoodGain(iDet)) {
+        // The chamber has correct calibration
+        ngood++;
+        averageGain += mMPVdEdx[iDet];
+      }
+    }
+    if (ngood == 0) {
+      // we should make sure it never happens
+      return constants::MPVDEDXDEFAULT;
+    }
+    averageGain /= ngood;
+    return averageGain;
+  }
+
+  bool isGoodGain(int iDet) const
+  {
+    if (TMath::Abs(mMPVdEdx[iDet] - constants::MPVDEDXDEFAULT) > 1e-6)
+      return true;
+    else
+      return false;
+  }
 
  private:
   std::array<float, constants::MAXCHAMBER> mMPVdEdx{}; ///< Most probable value of dEdx distribution per TRD chamber
+  mutable float mMeanGain{-999.};                      ///! average gain, calculated only once
 
-  ClassDefNV(CalGain, 1);
+  ClassDefNV(CalGain, 2);
 };
 
 } // namespace trd