ITS General: correct merging of averages with THRatio (#1853)

* First changes in Tracks Task

* ÃAdded Track TRatio

* Finalized TrackTask

* ÃAdded Cluster Task

* Clang

* Ivan's commments + fixed bug in update

* Added mGeneralOccupancy to THRatio + reset of Occupancy arrays

* Fixed bug with IB occupancy aray

* Update ITSClusterTask.cxx to solve conflict with hEmptyLanesFractio

Added arguments to formatAxis(hEmptyLanesFraction), because without all parameters, this function was crashing the code

Author: IsakovAD

Modules/ITS/include/ITS/ITSClusterTask.h

@@ -23,6 +23,7 @@
 #include <TString.h>
 #include <THnSparse.h>
 #include <string>
+#include "Common/TH2Ratio.h"
 
 #include <DataFormatsITSMFT/TopologyDictionary.h>
 #include <ITSBase/GeometryTGeo.h>
@@ -35,6 +36,7 @@ class TH1F;
 class TH2F;
 
 using namespace o2::quality_control::core;
+using namespace o2::quality_control_modules::common;
 
 namespace o2::quality_control_modules::its
 {
@@ -62,7 +64,14 @@ class ITSClusterTask : public TaskInterface
 
  private:
   void publishHistos();
-  void formatAxes(TH1* h, const char* xTitle, const char* yTitle, float xOffset = 1., float yOffset = 1.);
+  template <class T>
+  void formatAxes(T* obj, const char* xTitle, const char* yTitle, float xOffset, float yOffset)
+  {
+    obj->GetXaxis()->SetTitle(xTitle);
+    obj->GetYaxis()->SetTitle(yTitle);
+    obj->GetXaxis()->SetTitleOffset(xOffset);
+    obj->GetYaxis()->SetTitleOffset(yOffset);
+  }
   void addObject(TObject* aObject);
   void getJsonParameters();
   void createAllHistos();
@@ -80,8 +89,8 @@ class ITSClusterTask : public TaskInterface
   TH1F* hClusterTopologySummaryIB[NLayer][48][9] = { { { nullptr } } };
   TH1F* hGroupedClusterSizeSummaryIB[NLayer][48][9] = { { { nullptr } } };
 
-  TH2F* hAverageClusterOccupancySummaryIB[NLayer] = { nullptr };
-  TH2F* hAverageClusterSizeSummaryIB[NLayer] = { nullptr };
+  std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryIB[NLayer];
+  std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryIB[NLayer];
 
   int mClusterOccupancyIB[NLayer][48][9] = { { { 0 } } };
 
@@ -90,8 +99,8 @@ class ITSClusterTask : public TaskInterface
   TH1F* hClusterSizeSummaryOB[NLayer][48] = { { nullptr } };
   TH1F* hClusterTopologySummaryOB[NLayer][48] = { { nullptr } };
 
-  TH2F* hAverageClusterOccupancySummaryOB[NLayer] = { nullptr };
-  TH2F* hAverageClusterSizeSummaryOB[NLayer] = { nullptr };
+  std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryOB[NLayer];
+  std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryOB[NLayer];
 
   int mClusterOccupancyOB[NLayer][48][28] = { { { 0 } } };
   int mNLaneEmpty[4] = { 0 }; // IB, ML, OL, TOTAL empty lane
@@ -103,14 +112,15 @@ class ITSClusterTask : public TaskInterface
 
   // General
   TH2F* hClusterVsBunchCrossing = nullptr;
-  TH2F* mGeneralOccupancy = nullptr;
+  std::unique_ptr<TH2FRatio> mGeneralOccupancy = nullptr;
 
   // Fine checks
-  TH2F* hAverageClusterOccupancySummaryFine[NLayer] = { nullptr };
-  TH2F* hAverageClusterSizeSummaryFine[NLayer] = { nullptr };
 
-  TH2F* hAverageClusterOccupancySummaryZPhi[NLayer] = { nullptr };
-  TH2F* hAverageClusterSizeSummaryZPhi[NLayer] = { nullptr };
+  std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryFine[NLayer];
+  std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryFine[NLayer];
+
+  std::shared_ptr<TH2FRatio> hAverageClusterOccupancySummaryZPhi[NLayer];
+  std::shared_ptr<TH2FRatio> hAverageClusterSizeSummaryZPhi[NLayer];
 
   TH1D* hEmptyLaneFractionGlobal;
 

Modules/ITS/include/ITS/ITSTrackTask.h

@@ -25,11 +25,14 @@
 #include <Framework/TimingInfo.h>
 #include <TTree.h>
 #include <TLine.h>
+#include "Common/TH1Ratio.h"
+#include "Common/TH2Ratio.h"
 
 class TH1D;
 class TH2D;
 
 using namespace o2::quality_control::core;
+using namespace o2::quality_control_modules::common;
 
 namespace o2::quality_control_modules::its
 {
@@ -54,6 +57,14 @@ class ITSTrackTask : public TaskInterface
   void formatAxes(TH1* h, const char* xTitle, const char* yTitle, float xOffset = 1., float yOffset = 1.);
   void addObject(TObject* aObject);
   void createAllHistos();
+  template <class T>
+  void formatAxes(T* obj, const char* xTitle, const char* yTitle, float xOffset, float yOffset)
+  {
+    obj->GetXaxis()->SetTitle(xTitle);
+    obj->GetYaxis()->SetTitle(yTitle);
+    obj->GetXaxis()->SetTitleOffset(xOffset);
+    obj->GetYaxis()->SetTitleOffset(yOffset);
+  }
 
   static constexpr int NLayer = 7;
   static constexpr int NLayerIB = 3;
@@ -63,24 +74,24 @@ class ITSTrackTask : public TaskInterface
   std::vector<TObject*> mPublishedObjects;
   TH1D* hNClusters;
   TH1D* hNClustersReset;
-  TH1D* hTrackEta;
-  TH1D* hTrackPhi;
+  std::unique_ptr<TH1DRatio> hTrackEta;
+  std::unique_ptr<TH1DRatio> hTrackPhi;
   TH1D* hVerticesRof;
-  TH2D* hAngularDistribution;
+  std::unique_ptr<TH2DRatio> hAngularDistribution;
   TH2D* hVertexCoordinates;
   TH2D* hVertexRvsZ;
   TH1D* hVertexZ;
   TH1D* hVertexContributors;
   TH1D* hAssociatedClusterFraction;
   TH1D* hNtracks;
   TH1D* hNtracksReset;
-  TH2D* hNClustersPerTrackEta;
-  TH2D* hNClustersPerTrackPhi;
-  TH2D* hHitFirstLayerPhiAll;
-  TH2D* hHitFirstLayerPhi4cls;
-  TH2D* hHitFirstLayerPhi5cls;
-  TH2D* hHitFirstLayerPhi6cls;
-  TH2D* hHitFirstLayerPhi7cls;
+  std::unique_ptr<TH2DRatio> hNClustersPerTrackEta;
+  std::unique_ptr<TH2DRatio> hNClustersPerTrackPhi;
+  std::unique_ptr<TH2DRatio> hHitFirstLayerPhiAll;
+  std::unique_ptr<TH2DRatio> hHitFirstLayerPhi4cls;
+  std::unique_ptr<TH2DRatio> hHitFirstLayerPhi5cls;
+  std::unique_ptr<TH2DRatio> hHitFirstLayerPhi6cls;
+  std::unique_ptr<TH2DRatio> hHitFirstLayerPhi7cls;
   TH2D* hClusterVsBunchCrossing;
   TH2D* hNClusterVsChipITS;
 

Modules/ITS/itsCluster.json

@@ -43,7 +43,7 @@
           "dicttimestamp": "0",
           "geomPath": "./",
           "publishSummary1D": "0",
-          "publishDetailedSummary": "0"
+          "publishDetailedSummary": "1"
         },
 	"grpGeomRequest" : {
           "geomRequest": "Aligned",