Add separate histograms BcVsFeeModules and OutOfBunchColl for each trigger (#1848)

DawidSkora · dskora · web-flow · commit 7b4a4907fb15 · 2023-06-26T09:57:35.000+02:00
* Add mHistGateTimeRatio2Ch monitoring object to DigitQcTask

Extend GenericCheck with check of ratio of bins behind given
value. Add specific check for TriggersSoftwareVsTCM MO.

* Fix build errors

* Add check for MO TriggersSoftwareVsTCM and improve code

* Upload changes during work on TriggersSwVsTcmCheck

* Fix names and celan up the code

* Extend generic check butify function and parametrize EventsInGateTime hist

* Parametrize title of EventsInGateTime hist

* Parametrize title of EventsInGateTime hist

* Refactor code and fix TriggersSwVsTcmCheck

* Fix merge conflict

* Enable message box on TriggersSwVsTcmCheck

* Align code with clang-format

* Fix the filling of the EventInGateTime hist

Add parametrization of both min and max gate time
for EventInGateTime hist.

* Remove unused import

* Use DeadChannelMap in GenericCheck

* Add stub of a BcCheck

* Extend BcCheck

* Fix build errors for BcCheck

* Change hist title and add axis label

* Fix MaxTreshold in GenericCheck. Test DeadChannelMap

* Change axis labels for EventsInGateTime

* Remove unused files

* Fix clang format error

* Remove unused file

* Introduce BcCheck

* Introduce BcCheck

* Save

* Add metadata to BcVsTriggers and BcVsFeemodules

* Change approach

* Improve and rename BcCheck to OutOfBunchCollFeeModulesCheck

* Apply clang-format fixes in code

* Provide fix for unreadable metadata key.

* Fix clang-format error

* Add new histograms to DigitQcTask

Add five histograms BCvsFEEmodules. One for each trigger:
 - OrA
 - OrAOut
 - TrgNChan
 - TrgCharge
 - OrAIn

* Add OutOfBunchColl_FeeModules histograms for each Trigger

* Add OutOfBunchCheck histograms for each trigger and align OutOfBunchCheck

* Reduce logging

---------

Co-authored-by: dskora &lt;dawid.mateusz.skora@cern.ch&gt;
diff --git a/Modules/FIT/FV0/include/FV0/DigitQcTask.h b/Modules/FIT/FV0/include/FV0/DigitQcTask.h
@@ -173,6 +173,11 @@ class DigitQcTask final : public TaskInterface
   std::map<unsigned int, TH2F*> mMapHistAmpVsTime;
   std::unique_ptr<TH2F> mHistBCvsTrg;
   std::unique_ptr<TH2F> mHistBCvsFEEmodules;
+  std::unique_ptr<TH2F> mHistBcVsFeeForOrATrg;
+  std::unique_ptr<TH2F> mHistBcVsFeeForOrAOutTrg;
+  std::unique_ptr<TH2F> mHistBcVsFeeForNChanTrg;
+  std::unique_ptr<TH2F> mHistBcVsFeeForChargeTrg;
+  std::unique_ptr<TH2F> mHistBcVsFeeForOrAInTrg;
   std::unique_ptr<TH2F> mHistOrbitVsTrg;
   std::unique_ptr<TH2F> mHistOrbitVsFEEmodules;
   std::unique_ptr<TH2F> mHistPmTcmNchA;
diff --git a/Modules/FIT/FV0/include/FV0/PostProcTask.h b/Modules/FIT/FV0/include/FV0/PostProcTask.h
@@ -92,6 +92,11 @@ class PostProcTask final : public quality_control::postprocessing::PostProcessin
   std::unique_ptr<TH2F> mHistBcPatternFee;
   std::unique_ptr<TH2F> mHistBcTrgOutOfBunchColl;
   std::unique_ptr<TH2F> mHistBcFeeOutOfBunchColl;
+  std::unique_ptr<TH2F> mHistBcFeeOutOfBunchCollForOrATrg;
+  std::unique_ptr<TH2F> mHistBcFeeOutOfBunchCollForOrAOutTrg;
+  std::unique_ptr<TH2F> mHistBcFeeOutOfBunchCollForNChanTrg;
+  std::unique_ptr<TH2F> mHistBcFeeOutOfBunchCollForChargeTrg;
+  std::unique_ptr<TH2F> mHistBcFeeOutOfBunchCollForOrAInTrg;
 
   uint8_t mTCMhash;
   std::array<uint8_t, sNCHANNELS_FV0_PLUSREF> mChID2PMhash; // map chID->hashed PM value
diff --git a/Modules/FIT/FV0/src/DigitQcTask.cxx b/Modules/FIT/FV0/src/DigitQcTask.cxx
@@ -267,9 +267,19 @@ void DigitQcTask::initialize(o2::framework::InitContext& /*ctx*/)
   }
 
   mHistBCvsFEEmodules = std::make_unique<TH2F>("BCvsFEEmodules", "BC vs FEE module;BC;FEE", sBCperOrbit, 0, sBCperOrbit, mapFEE2hash.size(), 0, mapFEE2hash.size());
+  mHistBcVsFeeForOrATrg = std::make_unique<TH2F>("BCvsFEEmodulesForOrATrg", "BC vs FEE module for OrA trigger;BC;FEE", sBCperOrbit, 0, sBCperOrbit, mapFEE2hash.size(), 0, mapFEE2hash.size());
+  mHistBcVsFeeForOrAOutTrg = std::make_unique<TH2F>("BCvsFEEmodulesForOrAOutTrg", "BC vs FEE module for OrAOut trigger;BC;FEE", sBCperOrbit, 0, sBCperOrbit, mapFEE2hash.size(), 0, mapFEE2hash.size());
+  mHistBcVsFeeForNChanTrg = std::make_unique<TH2F>("BCvsFEEmodulesForNChanTrg", "BC vs FEE module for NChan trigger;BC;FEE", sBCperOrbit, 0, sBCperOrbit, mapFEE2hash.size(), 0, mapFEE2hash.size());
+  mHistBcVsFeeForChargeTrg = std::make_unique<TH2F>("BCvsFEEmodulesForChargeTrg", "BC vs FEE module for Charge trigger;BC;FEE", sBCperOrbit, 0, sBCperOrbit, mapFEE2hash.size(), 0, mapFEE2hash.size());
+  mHistBcVsFeeForOrAInTrg = std::make_unique<TH2F>("BCvsFEEmodulesForOrAInTrg", "BC vs FEE module for OrAIn trigger;BC;FEE", sBCperOrbit, 0, sBCperOrbit, mapFEE2hash.size(), 0, mapFEE2hash.size());
   mHistOrbitVsFEEmodules = std::make_unique<TH2F>("OrbitVsFEEmodules", "Orbit vs FEE module;Orbit;FEE", sOrbitsPerTF, 0, sOrbitsPerTF, mapFEE2hash.size(), 0, mapFEE2hash.size());
   for (const auto& entry : mapFEE2hash) {
     mHistBCvsFEEmodules->GetYaxis()->SetBinLabel(entry.second + 1, entry.first.c_str());
+    mHistBcVsFeeForOrATrg->GetYaxis()->SetBinLabel(entry.second + 1, entry.first.c_str());
+    mHistBcVsFeeForOrAOutTrg->GetYaxis()->SetBinLabel(entry.second + 1, entry.first.c_str());
+    mHistBcVsFeeForNChanTrg->GetYaxis()->SetBinLabel(entry.second + 1, entry.first.c_str());
+    mHistBcVsFeeForChargeTrg->GetYaxis()->SetBinLabel(entry.second + 1, entry.first.c_str());
+    mHistBcVsFeeForOrAInTrg->GetYaxis()->SetBinLabel(entry.second + 1, entry.first.c_str());
     mHistOrbitVsFEEmodules->GetYaxis()->SetBinLabel(entry.second + 1, entry.first.c_str());
   }
   // mHistTimeSum2Diff = std::make_unique<TH2F>("timeSumVsDiff", "time A/C side: sum VS diff;(TOC-TOA)/2 [ns];(TOA+TOC)/2 [ns]", 400, -52.08, 52.08, 400, -52.08, 52.08); // range of 52.08 ns = 4000*13.02ps = 4000 channels
@@ -358,6 +368,16 @@ void DigitQcTask::initialize(o2::framework::InitContext& /*ctx*/)
   getObjectsManager()->setDefaultDrawOptions(mHistAmp2Ch.get(), "COLZ");
   getObjectsManager()->startPublishing(mHistBCvsFEEmodules.get());
   getObjectsManager()->setDefaultDrawOptions(mHistBCvsFEEmodules.get(), "COLZ");
+  getObjectsManager()->startPublishing(mHistBcVsFeeForOrATrg.get());
+  getObjectsManager()->setDefaultDrawOptions(mHistBcVsFeeForOrATrg.get(), "COLZ");
+  getObjectsManager()->startPublishing(mHistBcVsFeeForOrAOutTrg.get());
+  getObjectsManager()->setDefaultDrawOptions(mHistBcVsFeeForOrAOutTrg.get(), "COLZ");
+  getObjectsManager()->startPublishing(mHistBcVsFeeForNChanTrg.get());
+  getObjectsManager()->setDefaultDrawOptions(mHistBcVsFeeForNChanTrg.get(), "COLZ");
+  getObjectsManager()->startPublishing(mHistBcVsFeeForChargeTrg.get());
+  getObjectsManager()->setDefaultDrawOptions(mHistBcVsFeeForChargeTrg.get(), "COLZ");
+  getObjectsManager()->startPublishing(mHistBcVsFeeForOrAInTrg.get());
+  getObjectsManager()->setDefaultDrawOptions(mHistBcVsFeeForOrAInTrg.get(), "COLZ");
   getObjectsManager()->startPublishing(mHistOrbitVsTrg.get());
   getObjectsManager()->setDefaultDrawOptions(mHistOrbitVsTrg.get(), "COLZ");
   getObjectsManager()->startPublishing(mHistOrbitVsFEEmodules.get());
@@ -402,6 +422,11 @@ void DigitQcTask::startOfActivity(const Activity& activity)
   mHistNumCFD->Reset();
   // mHistTimeSum2Diff->Reset();
   mHistBCvsFEEmodules->Reset();
+  mHistBcVsFeeForOrATrg->Reset();
+  mHistBcVsFeeForOrAOutTrg->Reset();
+  mHistBcVsFeeForNChanTrg->Reset();
+  mHistBcVsFeeForChargeTrg->Reset();
+  mHistBcVsFeeForOrAInTrg->Reset();
   mHistOrbitVsTrg->Reset();
   mHistOrbitVsFEEmodules->Reset();
   mHistTriggersCorrelation->Reset();
@@ -559,6 +584,11 @@ void DigitQcTask::monitorData(o2::framework::ProcessingContext& ctx)
     }
     for (const auto& feeHash : setFEEmodules) {
       mHistBCvsFEEmodules->Fill(static_cast<double>(digit.getIntRecord().bc), static_cast<double>(feeHash));
+      mHistBcVsFeeForOrATrg->Fill(static_cast<double>(digit.getIntRecord().bc), digit.mTriggers.getOrA());
+      mHistBcVsFeeForOrAOutTrg->Fill(static_cast<double>(digit.getIntRecord().bc), digit.mTriggers.getOrAOut());
+      mHistBcVsFeeForNChanTrg->Fill(static_cast<double>(digit.getIntRecord().bc), digit.mTriggers.getTrgNChan());
+      mHistBcVsFeeForChargeTrg->Fill(static_cast<double>(digit.getIntRecord().bc), digit.mTriggers.getTrgCharge());
+      mHistBcVsFeeForOrAInTrg->Fill(static_cast<double>(digit.getIntRecord().bc), digit.mTriggers.getOrAIn());
       mHistOrbitVsFEEmodules->Fill(static_cast<double>(digit.getIntRecord().orbit % sOrbitsPerTF), static_cast<double>(feeHash));
     }
 
@@ -708,6 +738,11 @@ void DigitQcTask::reset()
   mHistCycleDurationRange->Reset();
   mHistBCvsTrg->Reset();
   mHistBCvsFEEmodules->Reset();
+  mHistBcVsFeeForOrATrg->Reset();
+  mHistBcVsFeeForOrAOutTrg->Reset();
+  mHistBcVsFeeForNChanTrg->Reset();
+  mHistBcVsFeeForChargeTrg->Reset();
+  mHistBcVsFeeForOrAInTrg->Reset();
   mHistOrbitVsTrg->Reset();
   mHistOrbitVsFEEmodules->Reset();
   mHistPmTcmNchA->Reset();
diff --git a/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx b/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx
@@ -28,6 +28,7 @@
 #include <TList.h>
 
 #include <map>
+#include <algorithm>
 #include <DataFormatsQualityControl/FlagReasons.h>
 
 using namespace std;
@@ -66,7 +67,7 @@ Quality OutOfBunchCollFeeModulesCheck::check(std::map<std::string, std::shared_p
 
   for (auto& [moName, mo] : *moMap) {
     (void)moName;
-    if (mo->getName() == "OutOfBunchColl_BCvsFeeModules") {
+    if (mo->getName().find("OutOfBunchColl_BCvsFeeModules") != std::string::npos) {
       auto* histogram = dynamic_cast<TH2*>(mo->getObject());
 
       if (!histogram) {
@@ -127,7 +128,7 @@ std::string OutOfBunchCollFeeModulesCheck::getAcceptedType() { return "TH2"; }
 
 void OutOfBunchCollFeeModulesCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult)
 {
-  if (mo->getName() == "OutOfBunchColl_BCvsFeeModules") {
+  if (mo->getName().find("OutOfBunchColl_BCvsFeeModules") != std::string::npos) {
     auto* histogram = dynamic_cast<TH2*>(mo->getObject());
 
     if (!histogram) {
diff --git a/Modules/FIT/FV0/src/PostProcTask.cxx b/Modules/FIT/FV0/src/PostProcTask.cxx
