fix: zorrosummary toi names fix

Author: lietava

EventFiltering/Zorro.cxx

@@ -17,6 +17,7 @@
 #include <CCDB/BasicCCDBManager.h>
 #include <CommonConstants/LHCConstants.h>
 #include <CommonDataFormat/IRFrame.h>
+#include <CommonUtils/StringUtils.h>
 #include <CommonDataFormat/InteractionRecord.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
@@ -198,24 +199,18 @@ std::vector<int> Zorro::initCCDB(o2::ccdb::BasicCCDBManager* ccdb, int runNumber
   mLastSelectedIdx = 0;
   mTOIs.clear();
   mTOIidx.clear();
-  while (!tois.empty()) {
-    size_t pos = tois.find(",");
-    pos = (pos == std::string::npos) ? tois.size() : pos;
-    std::string token = tois.substr(0, pos);
-    // Trim leading and trailing whitespaces from the token
-    token.erase(0, token.find_first_not_of(" "));
-    token.erase(token.find_last_not_of(" ") + 1);
+  std::vector<std::string> tokens = o2::utils::Str::tokenize(tois,','); // tokens are trimmed
+  for(auto const& token:tokens) {
     int bin = findBin(mSelections, token) - 2;
     mTOIs.push_back(token);
     mTOIidx.push_back(bin);
-    tois = tois.erase(0, pos + 1);
   }
   mTOIcounts.resize(mTOIs.size(), 0);
   LOGF(info, "Zorro initialized for run %d, triggers of interest:", runNumber);
   for (size_t i{0}; i < mTOIs.size(); ++i) {
     LOGF(info, ">>> %s : %i", mTOIs[i].data(), mTOIidx[i]);
   }
-  mZorroSummary.setupTOIs(mTOIs.size(), tois);
+  mZorroSummary.setupTOIs(mTOIs.size(), mTOIs);
   std::vector<double> toiCounters(mTOIs.size(), 0.);
   for (size_t i{0}; i < mTOIs.size(); ++i) {
     toiCounters[i] = mSelections->GetBinContent(mTOIidx[i] + 2);

EventFiltering/ZorroSummary.h

@@ -21,6 +21,7 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include <iostream>
 
 class ZorroSummary : public TNamed
 {
@@ -31,10 +32,17 @@ class ZorroSummary : public TNamed
   virtual void Copy(TObject& c) const; // NOLINT: Making this override breaks compilation for unknown reason
   virtual Long64_t Merge(TCollection* list);
 
-  void setupTOIs(int ntois, const std::string& toinames)
+  void setupTOIs(int ntois, const std::vector<std::string>& toinames)
   {
     mNtois = ntois;
-    mTOInames = toinames;
+    if(toinames.size() == 0) {
+      return;
+    }
+    mTOInames = toinames[0];
+    for(size_t i = 1; i < toinames.size(); i++) {
+      mTOInames += "," + toinames[i];
+    } 
+    std::cout << "TOI names:" << mTOInames << std::endl;
   }
   void setupRun(int runNumber, double tvxCountes, const std::vector<double>& toiCounters)
   {
@@ -56,7 +64,7 @@ class ZorroSummary : public TNamed
     mCurrentAnalysedTOIcounters->at(toiId)++;
   }
 
-  std::string getTOInames() const { return mTOInames; }
+  const auto& getTOInames() const {return mTOInames; }
   const auto& getTOIcounters() const { return mTOIcounters; }
   const auto& getTVXcounters() const { return mTVXcounters; }
   const auto& getAnalysedTOIcounters() const { return mAnalysedTOIcounters; }
@@ -71,7 +79,7 @@ class ZorroSummary : public TNamed
   std::unordered_map<int, std::vector<double>> mTOIcounters;
   std::unordered_map<int, double> mTVXcounters;
 
-  ClassDef(ZorroSummary, 1);
+  ClassDef(ZorroSummary, 2);
 };
 
 #endif // EVENTFILTERING_ZORROSUMMARY_H_