From 12c0de4bafee89f8e86dfd111f386f6a2392b7fb Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Sat, 19 Jul 2025 18:25:00 +0200 Subject: [PATCH 1/5] fix: zorrosummary toi names fix --- EventFiltering/Zorro.cxx | 13 ++++--------- EventFiltering/ZorroSummary.h | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/EventFiltering/Zorro.cxx b/EventFiltering/Zorro.cxx index 2b78c157399..843c1de36e5 100644 --- a/EventFiltering/Zorro.cxx +++ b/EventFiltering/Zorro.cxx @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -198,24 +199,18 @@ std::vector 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 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 toiCounters(mTOIs.size(), 0.); for (size_t i{0}; i < mTOIs.size(); ++i) { toiCounters[i] = mSelections->GetBinContent(mTOIidx[i] + 2); diff --git a/EventFiltering/ZorroSummary.h b/EventFiltering/ZorroSummary.h index 8987d8cd5cd..374dfbb7ae5 100644 --- a/EventFiltering/ZorroSummary.h +++ b/EventFiltering/ZorroSummary.h @@ -21,6 +21,7 @@ #include #include #include +#include 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& 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& 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> mTOIcounters; std::unordered_map mTVXcounters; - ClassDef(ZorroSummary, 1); + ClassDef(ZorroSummary, 2); }; #endif // EVENTFILTERING_ZORROSUMMARY_H_ From c97e9ba4ce72a2150cdb708ff25ec1fe4be546f9 Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Sat, 19 Jul 2025 18:26:59 +0200 Subject: [PATCH 2/5] clang --- EventFiltering/Zorro.cxx | 6 +++--- EventFiltering/ZorroSummary.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/EventFiltering/Zorro.cxx b/EventFiltering/Zorro.cxx index 843c1de36e5..ccdf063307d 100644 --- a/EventFiltering/Zorro.cxx +++ b/EventFiltering/Zorro.cxx @@ -17,8 +17,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -199,8 +199,8 @@ std::vector Zorro::initCCDB(o2::ccdb::BasicCCDBManager* ccdb, int runNumber mLastSelectedIdx = 0; mTOIs.clear(); mTOIidx.clear(); - std::vector tokens = o2::utils::Str::tokenize(tois,','); // tokens are trimmed - for(auto const& token:tokens) { + std::vector 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); diff --git a/EventFiltering/ZorroSummary.h b/EventFiltering/ZorroSummary.h index 374dfbb7ae5..6337d2c089d 100644 --- a/EventFiltering/ZorroSummary.h +++ b/EventFiltering/ZorroSummary.h @@ -18,10 +18,10 @@ #include #include +#include #include #include #include -#include class ZorroSummary : public TNamed { @@ -35,13 +35,13 @@ class ZorroSummary : public TNamed void setupTOIs(int ntois, const std::vector& toinames) { mNtois = ntois; - if(toinames.size() == 0) { + if (toinames.size() == 0) { return; } mTOInames = toinames[0]; - for(size_t i = 1; i < toinames.size(); i++) { + 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& toiCounters) @@ -64,14 +64,14 @@ class ZorroSummary : public TNamed mCurrentAnalysedTOIcounters->at(toiId)++; } - const auto& 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; } private: int mRunNumber = 0; //! Run currently being analysed - std::vector* mCurrentAnalysedTOIcounters = nullptr; //! Analysed TOI counters for the current run + // std::vector* mCurrentAnalysedTOIcounters = nullptr; //! Analysed TOI counters for the current run int mNtois = 0; std::string mTOInames; From 209e4ab29ae9f9e585576c5550bda60aa41d28e4 Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Sat, 19 Jul 2025 18:30:53 +0200 Subject: [PATCH 3/5] fix --- EventFiltering/ZorroSummary.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EventFiltering/ZorroSummary.h b/EventFiltering/ZorroSummary.h index 6337d2c089d..998e8aa3df2 100644 --- a/EventFiltering/ZorroSummary.h +++ b/EventFiltering/ZorroSummary.h @@ -42,7 +42,7 @@ class ZorroSummary : public TNamed for (size_t i = 1; i < toinames.size(); i++) { mTOInames += "," + toinames[i]; } - std::cout << "TOI names:" << mTOInames << std::endl; + // std::cout << "TOI names:" << mTOInames << std::endl; } void setupRun(int runNumber, double tvxCountes, const std::vector& toiCounters) { @@ -71,7 +71,7 @@ class ZorroSummary : public TNamed private: int mRunNumber = 0; //! Run currently being analysed - // std::vector* mCurrentAnalysedTOIcounters = nullptr; //! Analysed TOI counters for the current run + std::vector* mCurrentAnalysedTOIcounters = nullptr; //! Analysed TOI counters for the current run int mNtois = 0; std::string mTOInames; From d524f724bb983bed14dcc53d9bb79b9624d24906 Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Sat, 19 Jul 2025 18:36:00 +0200 Subject: [PATCH 4/5] fix --- EventFiltering/ZorroSummary.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/EventFiltering/ZorroSummary.h b/EventFiltering/ZorroSummary.h index 998e8aa3df2..4c59ceb72b4 100644 --- a/EventFiltering/ZorroSummary.h +++ b/EventFiltering/ZorroSummary.h @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -42,7 +41,6 @@ class ZorroSummary : public TNamed 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& toiCounters) { From 442d1e0682a5f0e75b608ce29ee230360e8a8413 Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Wed, 23 Jul 2025 12:58:36 +0200 Subject: [PATCH 5/5] fix: ClassDef back to 1 as no members modified --- EventFiltering/ZorroSummary.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EventFiltering/ZorroSummary.h b/EventFiltering/ZorroSummary.h index 4c59ceb72b4..51019aeef18 100644 --- a/EventFiltering/ZorroSummary.h +++ b/EventFiltering/ZorroSummary.h @@ -77,7 +77,7 @@ class ZorroSummary : public TNamed std::unordered_map> mTOIcounters; std::unordered_map mTVXcounters; - ClassDef(ZorroSummary, 2); + ClassDef(ZorroSummary, 1); }; #endif // EVENTFILTERING_ZORROSUMMARY_H_