Feat: add occupancy histograms to Cluster tasks

Author: ariedel-cern

Modules/TPC/include/TPC/ClusterVisualizer.h

@@ -72,6 +72,7 @@ class ClusterVisualizer final : public quality_control::postprocessing::PostProc
   void fillRadialHisto(TH2D& h2D, const o2::tpc::CalDet<T>& calDet, const o2::tpc::Side side);
 
  private:
+  int mNHBFPerTF = 32;
   o2::ccdb::CcdbApi mCdbApi;
   std::string mHost;
   std::vector<std::vector<std::unique_ptr<TCanvas>>> mCalDetCanvasVec{}; ///< vector containing a vector of summary canvases for every CalDet object

Modules/TPC/include/TPC/Clusters.h

@@ -55,6 +55,7 @@ class Clusters /*final*/ : public TaskInterface // todo add back the "final" whe
 
  private:
   bool mIsMergeable = true;
+  int mNHBFPerTF = 32;
   ClustersData mQCClusters{};                                  ///< O2 Cluster task to perform actions on cluster objects
   std::vector<o2::tpc::qc::CalPadWrapper> mWrapperVector{};    ///< vector holding CalPad objects wrapped as TObjects; published on QCG; will be non-wrapped CalPad objects in the future
   std::vector<std::unique_ptr<TCanvas>> mNClustersCanvasVec{}; ///< summary canvases of the NClusters object

Modules/TPC/src/ClusterVisualizer.cxx

@@ -18,6 +18,7 @@
 #include "TPCBase/Painter.h"
 #include "TPCBase/CDBInterface.h"
 #include "TPCQC/Helpers.h"
+#include "DetectorsBase/GRPGeomHelper.h"
 
 // QC includes
 #include "QualityControl/QcInfoLogger.h"
@@ -140,6 +141,8 @@ void ClusterVisualizer::initialize(Trigger, framework::ServiceRegistryRef)
 {
   mCdbApi.init(mHost);
 
+  mNHBFPerTF = o2::base::GRPGeomHelper::instance().getNHBFPerTF();
+
   if (mCalDetCanvasVec.size() > 0) {
     mCalDetCanvasVec.clear();
   }
@@ -215,12 +218,12 @@ void ClusterVisualizer::update(Trigger t, framework::ServiceRegistryRef)
   o2::tpc::painter::makeSummaryCanvases(calDet, int(mRanges[calDet.getName()].at(0)), mRanges[calDet.getName()].at(1), mRanges[calDet.getName()].at(2), false, &vecPtr);
   calDetIter++;
 
-  calDet = clusters.getOccupancy();
+  auto occupancy = clusters.getOccupancy(mNHBFPerTF);
   vecPtr = toVector(mCalDetCanvasVec.at(calDetIter));
-  o2::tpc::painter::makeSummaryCanvases(calDet, int(mRanges[calDet.getName()].at(0)), mRanges[calDet.getName()].at(1), mRanges[calDet.getName()].at(2), false, &vecPtr);
+  o2::tpc::painter::makeSummaryCanvases(occupancy, int(mRanges[occupancy.getName()].at(0)), mRanges[occupancy.getName()].at(1), mRanges[occupancy.getName()].at(2), false, &vecPtr);
   calDetIter++;
   vecPtr = toVector(mCalDetCanvasVec.at(calDetIter));
-  makeRadialProfile(calDet, vecPtr.at(0), int(mRanges[calDet.getName()].at(0)), mRanges[calDet.getName()].at(1), mRanges[calDet.getName()].at(2));
+  makeRadialProfile(occupancy, vecPtr.at(0), int(mRanges[occupancy.getName()].at(0)), mRanges[occupancy.getName()].at(1), mRanges[occupancy.getName()].at(2));
   calDetIter++;
 }
 

Modules/TPC/src/Clusters.cxx

@@ -20,6 +20,7 @@
 #include "DataFormatsTPC/ClusterNative.h"
 #include "TPCBase/Painter.h"
 #include "Framework/InputRecordWalker.h"
+#include "DetectorsBase/GRPGeomHelper.h"
 
 // QC includes
 #include "QualityControl/QcInfoLogger.h"
@@ -42,6 +43,8 @@ void Clusters::initialize(InitContext& /*ctx*/)
 
   mQCClusters.setName("ClusterData");
 
+  mNHBFPerTF = o2::base::GRPGeomHelper::instance().getNHBFPerTF();
+
   const auto last = mCustomParameters.end();
   const auto itMergeable = mCustomParameters.find("mergeableOutput");
   std::string mergeable;
@@ -73,7 +76,8 @@ void Clusters::initialize(InitContext& /*ctx*/)
     mWrapperVector.emplace_back(&mQCClusters.getClusters().getSigmaTime());
     mWrapperVector.emplace_back(&mQCClusters.getClusters().getSigmaPad());
     mWrapperVector.emplace_back(&mQCClusters.getClusters().getTimeBin());
-    mWrapperVector.emplace_back(&mQCClusters.getClusters().getOccupancy());
+    auto occupancy = mQCClusters.getClusters().getOccupancy(mNHBFPerTF);
+    mWrapperVector.emplace_back(&occupancy);
 
     addAndPublish(getObjectsManager(), mNClustersCanvasVec, { "c_Sides_N_Clusters", "c_ROCs_N_Clusters_1D", "c_ROCs_N_Clusters_2D" });
     addAndPublish(getObjectsManager(), mQMaxCanvasVec, { "c_Sides_Q_Max", "c_ROCs_Q_Max_1D", "c_ROCs_Q_Max_2D" });