[Trigger] Zorro: Fix various C++ issues

EventFiltering/Zorro.cxx

@@ -1,4 +1,4 @@
 // Copyright 2019-2020 CERN and copyright holders of ALICE O2.
 // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
 // All rights not expressly granted are reserved.
 //
@@ -8,17 +8,34 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
 
 #include "Zorro.h"
 
-#include <algorithm>
-#include <map>
+#include "EventFiltering/ZorroHelper.h"
+
+#include <CCDB/BasicCCDBManager.h>
+#include <CommonConstants/LHCConstants.h>
+#include <CommonDataFormat/IRFrame.h>
+#include <CommonDataFormat/InteractionRecord.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/HistogramSpec.h>
+#include <Framework/Logger.h>
 
-#include <TList.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <TString.h>
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonDataFormat/InteractionRecord.h"
+#include <RtypesCore.h>
+
+#include <algorithm>
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 using o2::InteractionRecord;
 
@@ -171,7 +188,7 @@
   metadata["runNumber"] = std::to_string(runNumber);
   mRunDuration = mCCDB->getRunDuration(runNumber, true);
   int64_t runTs = (mRunDuration.first / 2 + mRunDuration.second / 2);
   auto ctp = ccdb->getForTimeStamp<std::vector<Long64_t>>("CTP/Calib/OrbitReset", runTs);
   mOrbitResetTimestamp = (*ctp)[0];
   mScalers = mCCDB->getSpecific<TH1D>(mBaseCCDBPath + "FilterCounters", runTs, metadata);
   mSelections = mCCDB->getSpecific<TH1D>(mBaseCCDBPath + "SelectionCounters", runTs, metadata);
@@ -212,7 +229,7 @@
 {
   mLastResult.reset();
   if (bcGlobalId < mBCranges.front().getMin().toLong() - tolerance || bcGlobalId > mBCranges.back().getMax().toLong() + tolerance) {
-    setupHelpers((mOrbitResetTimestamp + int64_t(bcGlobalId * o2::constants::lhc::LHCBunchSpacingNS * 1e-3)) / 1000);
+    setupHelpers((mOrbitResetTimestamp + static_cast<int64_t>(bcGlobalId * o2::constants::lhc::LHCBunchSpacingNS * 1e-3)) / 1000);
   }
 
   o2::dataformats::IRFrame bcFrame{InteractionRecord::long2IR(bcGlobalId) - tolerance, InteractionRecord::long2IR(bcGlobalId) + tolerance};
@@ -223,8 +240,8 @@
   mLastBCglobalId = bcGlobalId;
   for (size_t i = mLastSelectedIdx; i < mBCranges.size(); i++) {
     if (!mBCranges[i].isOutside(bcFrame)) {
       for (int iMask{0}; iMask < 2; ++iMask) {
         for (int iTOI{0}; iTOI < 64; ++iTOI) {
           if (mZorroHelpers->at(i).selMask[iMask] & (1ull << iTOI)) {
             mLastResult.set(iMask * 64 + iTOI, 1);
             if (mAnalysedTriggers && !mAccountedBCranges[i]) {
@@ -306,7 +323,7 @@
   std::sort(mZorroHelpers->begin(), mZorroHelpers->end(), [](const auto& a, const auto& b) { return std::min(a.bcAOD, a.bcEvSel) < std::min(b.bcAOD, b.bcEvSel); });
   mBCranges.clear();
   mAccountedBCranges.clear();
-  for (auto helper : *mZorroHelpers) {
+  for (const auto& helper : *mZorroHelpers) {
     mBCranges.emplace_back(InteractionRecord::long2IR(std::min(helper.bcAOD, helper.bcEvSel)), InteractionRecord::long2IR(std::max(helper.bcAOD, helper.bcEvSel)));
   }
   mAccountedBCranges.resize(mBCranges.size(), false);

EventFiltering/Zorro.h

@@ -19,19 +19,21 @@
 #ifndef EVENTFILTERING_ZORRO_H_
 #define EVENTFILTERING_ZORRO_H_
 
+#include "ZorroHelper.h"
+#include "ZorroSummary.h"
+
+#include <CommonDataFormat/IRFrame.h>
+#include <Framework/HistogramRegistry.h>
+
+#include <TH1.h>
+#include <TH2.h>
+
 #include <bitset>
-#include <memory>
+#include <cstdint>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "TH1D.h"
-#include "TH2D.h"
-#include "CommonDataFormat/IRFrame.h"
-#include "Framework/HistogramRegistry.h"
-#include "ZorroHelper.h"
-#include "ZorroSummary.h"
-
 namespace o2
 {
 namespace ccdb
@@ -61,8 +63,8 @@ class Zorro
   std::vector<bool> getTriggerOfInterestResults() const;
   int getNTOIs() const { return mTOIs.size(); }
 
-  void setCCDBpath(std::string path) { mBaseCCDBPath = path; }
-  void setBaseCCDBPath(std::string path) { mBaseCCDBPath = path; }
+  void setCCDBpath(const std::string& path) { mBaseCCDBPath = path; }
+  void setBaseCCDBPath(const std::string& path) { mBaseCCDBPath = path; }
   void setBCtolerance(int tolerance) { mBCtolerance = tolerance; }
 
   ZorroSummary* getZorroSummary() { return &mZorroSummary; }
@@ -76,8 +78,8 @@ class Zorro
   int mRunNumber = 0;
   std::pair<int64_t, int64_t> mRunDuration;
   int64_t mOrbitResetTimestamp = 0;
-  TH1* mAnalysedTriggers;           /// Accounting for all triggers in the current run
-  TH1* mAnalysedTriggersOfInterest; /// Accounting for triggers of interest in the current run
+  TH1* mAnalysedTriggers = nullptr;           /// Accounting for all triggers in the current run
+  TH1* mAnalysedTriggersOfInterest = nullptr; /// Accounting for triggers of interest in the current run
 
   std::vector<int> mRunNumberHistos;
   std::vector<TH1*> mAnalysedTriggersList;           /// Per run histograms

EventFiltering/ZorroHelper.h

@@ -8,15 +8,16 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
 
 #ifndef EVENTFILTERING_ZORROHELPER_H_
 #define EVENTFILTERING_ZORROHELPER_H_
 
-#include "Rtypes.h"
+#include <Rtypes.h>
+#include <RtypesCore.h>
 
 struct ZorroHelper {
   ULong64_t bcAOD, bcEvSel, trigMask[2], selMask[2];
   ClassDefNV(ZorroHelper, 1);
 };
 

EventFiltering/ZorroSummary.cxx

@@ -11,7 +11,12 @@
 
 #include "ZorroSummary.h"
 
-#include "TCollection.h"
+#include <TCollection.h>
+#include <TObject.h>
+
+#include <RtypesCore.h>
+
+#include <cstddef>
 
 void ZorroSummary::Copy(TObject& c) const
 {
@@ -42,7 +47,7 @@ Long64_t ZorroSummary::Merge(TCollection* list)
         mTOIcounters[runNumber] = entry->getTOIcounters().at(runNumber);
       } else {
         auto& thisCounters = mAnalysedTOIcounters[runNumber];
-        for (size_t i = 0; i < thisCounters.size(); ++i) {
+        for (std::size_t i = 0; i < thisCounters.size(); ++i) {
           thisCounters[i] += currentAnalysedToiCounters[i];
         }
       }
@@ -66,4 +71,4 @@ double ZorroSummary::getNormalisationFactor(int toiId) const
   }
 
   return totalTVX * totalAnalysedTOI / totalTOI;
-}
+}

EventFiltering/ZorroSummary.h

@@ -15,6 +15,9 @@
 
 #include <TNamed.h>
 
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -41,9 +44,7 @@ class ZorroSummary : public TNamed
     mRunNumber = runNumber;
     mTVXcounters[runNumber] = tvxCountes;
     mTOIcounters[runNumber] = toiCounters;
-    if (mAnalysedTOIcounters.find(runNumber) == mAnalysedTOIcounters.end()) {
-      mAnalysedTOIcounters[runNumber] = std::vector<ULong64_t>(mNtois, 0ull);
-    }
+    mAnalysedTOIcounters.try_emplace(runNumber, std::vector<ULong64_t>(mNtois, 0ull));
     mCurrentAnalysedTOIcounters = &mAnalysedTOIcounters[runNumber];
   }
   double getNormalisationFactor(int toiId) const;
@@ -73,4 +74,4 @@ class ZorroSummary : public TNamed
   ClassDef(ZorroSummary, 1);
 };
 
-#endif // EVENTFILTERING_ZORROSUMMARY_H_
+#endif // EVENTFILTERING_ZORROSUMMARY_H_