[EMCAL-524] Add occupancy histograms (#437)

Adapt task also to Cells

Author: cterrevo

Modules/EMCAL/etc/digits.json

@@ -23,7 +23,7 @@
         }
       },
       "tasks": {
-        "QcTask": {
+        "CellTask": {
           "active": "true",
           "className": "o2::quality_control_modules::emcal::DigitsQcTask",
           "moduleName": "QcEMCAL",
@@ -49,7 +49,7 @@
           "detectorName": "EMC",
           "dataSource": [{
             "type": "Task",
-            "name": "QcTask",
+            "name": "CellTask",
             "MOs": ["digitAmplitudeHG"]
           }]
         },
@@ -61,7 +61,7 @@
           "detectorName": "EMC",
           "dataSource": [{
             "type": "Task",
-            "name": "QcTask",
+            "name": "CellTask",
             "MOs": ["digitAmplitudeLG"]
           }]
         },
@@ -73,7 +73,7 @@
           "detectorName": "EMC",
           "dataSource": [{
             "type": "Task",
-            "name": "QcTask",
+            "name": "CellTask",
             "MOs": ["digitTimeHG"]
           }]
         },
@@ -85,7 +85,7 @@
           "detectorName": "EMC",
           "dataSource": [{
             "type": "Task",
-            "name": "QcTask",
+            "name": "CellTask",
             "MOs": ["digitTimeLG"]
           }]
         },
@@ -97,7 +97,7 @@
           "detectorName": "EMC",
           "dataSource": [{
             "type": "Task",
-            "name": "QcTask",
+            "name": "CellTask",
             "MOs": ["digitAmplitudeEMCAL"]
           }]
         },
@@ -109,7 +109,7 @@
           "detectorName": "EMC",
           "dataSource": [{
             "type": "Task",
-            "name": "QcTask",
+            "name": "CellTask",
             "MOs": ["digitAmplitudeDCAL"]
           }]
         }

Modules/EMCAL/include/EMCAL/DigitsQcTask.h

@@ -8,6 +8,7 @@
 
 #include "QualityControl/TaskInterface.h"
 #include <array>
+#include <TProfile2D.h>
 
 class TH1;
 class TH2;
@@ -51,11 +52,13 @@ class DigitsQcTask final : public TaskInterface
   void reset() override;
 
  private:
-  std::array<TH2*, 2> mDigitAmplitude;      ///< Digit amplitude
-  std::array<TH2*, 2> mDigitTime;           ///< Digit time
-  TH1* mDigitAmplitudeEMCAL = nullptr;      ///< Digit amplitude in EMCAL
-  TH1* mDigitAmplitudeDCAL = nullptr;       ///< Digit amplitude in DCAL
-  o2::emcal::Geometry* mGeometry = nullptr; ///< EMCAL geometry
+  std::array<TH2*, 2> mDigitAmplitude;        ///< Digit amplitude
+  std::array<TH2*, 2> mDigitTime;             ///< Digit time
+  TH2* mDigitOccupancy = nullptr;             ///< Digit occupancy EMCAL and DCAL
+  TProfile2D* mIntegratedOccupancy = nullptr; ///< Digit integrated occupancy
+  TH1* mDigitAmplitudeEMCAL = nullptr;        ///< Digit amplitude in EMCAL
+  TH1* mDigitAmplitudeDCAL = nullptr;         ///< Digit amplitude in DCAL
+  o2::emcal::Geometry* mGeometry = nullptr;   ///< EMCAL geometry
 };
 
 } // namespace emcal

Modules/EMCAL/src/DigitsQcTask.cxx

@@ -5,12 +5,14 @@
 
 #include <TCanvas.h>
 #include <TH2.h>
+#include <TProfile2D.h>
 
 #include <DataFormatsEMCAL/EMCALBlockHeader.h>
 #include <DataFormatsEMCAL/TriggerRecord.h>
 #include <DataFormatsEMCAL/Digit.h>
 #include "QualityControl/QcInfoLogger.h"
 #include "EMCAL/DigitsQcTask.h"
+#include "DataFormatsEMCAL/Cell.h"
 #include "EMCALBase/Geometry.h"
 
 namespace o2
@@ -41,9 +43,17 @@ void DigitsQcTask::initialize(o2::framework::InitContext& /*ctx*/)
   //define histograms
   mDigitAmplitude[0] = new TH2F("digitAmplitudeHG", "Digit Amplitude (High gain)", 100, 0, 100, 20000, 0., 20000.);
   mDigitAmplitude[1] = new TH2F("digitAmplitudeLG", "Digit Amplitude (Low gain)", 100, 0, 100, 20000, 0., 20000.);
+
+  mDigitOccupancy = new TH2F("digitOccupancyEMC", "Digit Occupancy EMCAL", 96, -0.5, 95.5, 208, -0.5, 207.5);
+
+  mIntegratedOccupancy = new TProfile2D("digitOccupancyInt", "Digit Occupancy Integrated", 96, -0.5, 95.5, 208, -0.5, 207.5);
+  mIntegratedOccupancy->GetXaxis()->SetTitle("col");
+  mIntegratedOccupancy->GetYaxis()->SetTitle("row");
+
   mDigitTime[0] = new TH2F("digitTimeHG", "Digit Time (High gain)", 1000, 0, 1000, 20000, 0., 20000.);
   mDigitTime[1] = new TH2F("digitTimeLG", "Digit Time (Low gain)", 1000, 0, 1000, 20000, 0., 20000.);
   // 1D histograms for showing the integrated spectrum
+
   mDigitAmplitudeEMCAL = new TH1F("digitAmplitudeEMCAL", "Digit amplitude in EMCAL", 100, 0., 100.);
   mDigitAmplitudeDCAL = new TH1F("digitAmplitudeDCAL", "Digit amplitude in DCAL", 100, 0., 100.);
 
@@ -55,6 +65,8 @@ void DigitsQcTask::initialize(o2::framework::InitContext& /*ctx*/)
 
   getObjectsManager()->startPublishing(mDigitAmplitudeEMCAL);
   getObjectsManager()->startPublishing(mDigitAmplitudeDCAL);
+  getObjectsManager()->startPublishing(mDigitOccupancy);
+  getObjectsManager()->startPublishing(mIntegratedOccupancy);
 
   // initialize geometry
   if (!mGeometry)
@@ -86,7 +98,7 @@ void DigitsQcTask::monitorData(o2::framework::ProcessingContext& ctx)
   }
 
   // Get payload and loop over digits
-  auto digitcontainer = ctx.inputs().get<gsl::span<o2::emcal::Digit>>("emcal-digits");
+  auto digitcontainer = ctx.inputs().get<gsl::span<o2::emcal::Cell>>("emcal-digits"); //it was emcal::Digit
   auto triggerrecords = ctx.inputs().get<gsl::span<o2::emcal::TriggerRecord>>("emcal-triggerecords");
 
   //  QcInfoLogger::GetInstance() << "Received " << digitcontainer.size() << " digits " << AliceO2::InfoLogger::InfoLogger::endm;
@@ -95,21 +107,29 @@ void DigitsQcTask::monitorData(o2::framework::ProcessingContext& ctx)
     if (!trg.getNumberOfObjects())
       continue;
     QcInfoLogger::GetInstance() << QcInfoLogger::Debug << "Next event " << eventcouter << " has " << trg.getNumberOfObjects() << " digits" << QcInfoLogger::endm;
-    gsl::span<const o2::emcal::Digit> eventdigits(digitcontainer.data() + trg.getFirstEntry(), trg.getNumberOfObjects());
+    //gsl::span<const o2::emcal::Digit> eventdigits(digitcontainer.data() + trg.getFirstEntry(), trg.getNumberOfObjects());
+    gsl::span<const o2::emcal::Cell> eventdigits(digitcontainer.data() + trg.getFirstEntry(), trg.getNumberOfObjects());
     for (auto digit : eventdigits) {
       int index = digit.getHighGain() ? 0 : (digit.getLowGain() ? 1 : -1);
       if (index < 0)
         continue;
 
       mDigitAmplitude[index]->Fill(digit.getEnergy(), digit.getTower());
       mDigitTime[index]->Fill(digit.getTimeStamp(), digit.getTower());
-      //if we fill phy vs eta plots integrated: filled with eta phi GlobalRowColumnFromIndex  from Geometry
 
       // get the supermodule for filling EMCAL/DCAL spectra
+
       try {
+
+        auto [row, col] = mGeometry->GlobalRowColFromIndex(digit.getTower());
+        if (digit.getEnergy() > 0)
+          mDigitOccupancy->Fill(col, row);
+        mIntegratedOccupancy->Fill(col, row, digit.getEnergy());
+
         auto cellindices = mGeometry->GetCellIndex(digit.getTower());
         if (std::get<0>(cellindices) < 12)
           mDigitAmplitudeEMCAL->Fill(digit.getEnergy());
+
         else
           mDigitAmplitudeDCAL->Fill(digit.getEnergy());
       } catch (o2::emcal::InvalidCellIDException& e) {