comments from Barth and fix for trending

Author: Lucia Anna Tarasovicova

Modules/CTP/include/CTP/RawDataReaderCheck.h

@@ -20,6 +20,7 @@
 #include "QualityControl/CheckInterface.h"
 #include "CommonConstants/LHCConstants.h"
 #include "DetectorsBase/GRPGeomHelper.h"
+#include <TLatex.h>
 #include <bitset>
 class TH1D;
 
@@ -50,6 +51,7 @@ class RawDataReaderCheck : public o2::quality_control::checker::CheckInterface
   int getRunNumberFromMO(std::shared_ptr<MonitorObject> mo);
   int checkChange(TH1D* mHist, TH1D* mHistPrev);
   int checkChangeOfRatio(TH1D* mHist, TH1D* mHistPrev, TH1D* mHistAbs);
+  float setTextPosition(float iPos, std::shared_ptr<TLatex> msg, TH1D* h);
   Quality setQualityResult(std::vector<int>& vBad, std::vector<int>& vMedium);
   void clearIndexVectors();
   long int mTimestamp;
@@ -73,7 +75,7 @@ class RawDataReaderCheck : public o2::quality_control::checker::CheckInterface
   std::vector<int> mVecIndexMedium;                       // vector of ctp input and class indices, which had a relative change
   std::bitset<o2::constants::lhc::LHCMaxBunches> mLHCBCs; // LHC filling scheme
 
-  ClassDefOverride(RawDataReaderCheck, 9);
+  ClassDefOverride(RawDataReaderCheck, 10);
 };
 
 } // namespace o2::quality_control_modules::ctp

Modules/CTP/src/CTPTrendingTask.cxx

@@ -62,6 +62,7 @@ void CTPTrendingTask::initCTP(Trigger& t)
   mgr.setURL(CCDBHost);
   map<string, string> metadata; // can be empty
   metadata["runNumber"] = run;
+  mgr.setFatalWhenNull(false);
   auto ctpconfigdb = mgr.getSpecific<o2::ctp::CTPConfiguration>(o2::ctp::CCDBPathCTPConfig, t.timestamp, metadata);
   if (ctpconfigdb == nullptr) {
     LOG(info) << "CTP config not in database, timestamp:" << t.timestamp;
@@ -125,6 +126,7 @@ void CTPTrendingTask::initCTP(Trigger& t)
 }
 void CTPTrendingTask::initialize(Trigger t, framework::ServiceRegistryRef services)
 {
+  initCTP(t);
 }
 
 void CTPTrendingTask::update(Trigger t, framework::ServiceRegistryRef services)

Modules/CTP/src/RawDataReaderCheck.cxx

@@ -192,6 +192,14 @@ int RawDataReaderCheck::checkChangeOfRatio(TH1D* mHist, TH1D* mHistPrev, TH1D* m
   }
   return 0;
 }
+float RawDataReaderCheck::setTextPosition(float iPos, std::shared_ptr<TLatex> msg, TH1D* h)
+{
+  msg->SetTextSize(0.03);
+  msg->SetNDC();
+  h->GetListOfFunctions()->Add(msg->Clone());
+  float MessagePos = iPos - 0.04;
+  return MessagePos;
+}
 
 std::string RawDataReaderCheck::getAcceptedType() { return "TH1"; }
 
@@ -200,6 +208,10 @@ void RawDataReaderCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality che
   std::shared_ptr<TLatex> msg;
   if (mo->getName() == "bcMinBias1" || mo->getName() == "bcMinBias2") {
     auto* h = dynamic_cast<TH1D*>(mo->getObject());
+    if (h == nullptr) {
+      ILOG(Info, Support) << "null pointer for hist:" << mo->getName() << ENDM;
+      return;
+    }
     h->SetMarkerStyle(20);
     h->SetMarkerSize(0.6);
     if (checkResult != Quality::Null) {
@@ -263,6 +275,10 @@ void RawDataReaderCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality che
     h->GetYaxis()->SetRangeUser(0, h->GetMaximum() * 1.5);
   } else if (mo->getName() == "decodeError") {
     auto* h = dynamic_cast<TH1D*>(mo->getObject());
+    if (h == nullptr) {
+      ILOG(Info, Support) << "null pointer for hist:" << mo->getName() << ENDM;
+      return;
+    }
     if (checkResult != Quality::Null) {
       msg = std::make_shared<TLatex>(0.2, 0.85, Form("Quality: %s", (checkResult.getName()).c_str()));
       if (checkResult == Quality::Bad) {
@@ -276,64 +292,28 @@ void RawDataReaderCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality che
     }
     if (checkResult == Quality::Bad) {
       float initialMessagePos = 0.8;
-      if (h->GetBinContent(1) > 0) {
-        msg = std::make_shared<TLatex>(0.2, initialMessagePos, "Failed to extract RDD");
-        msg->SetTextSize(0.03);
-        msg->SetNDC();
-        h->GetListOfFunctions()->Add(msg->Clone());
-        initialMessagePos -= 0.04;
-      }
-      if (h->GetBinContent(3) > 0) {
-        msg = std::make_shared<TLatex>(0.2, initialMessagePos, "Two CTP IRs with the same ts");
-        msg->SetTextSize(0.03);
-        msg->SetNDC();
-        h->GetListOfFunctions()->Add(msg->Clone());
-        initialMessagePos -= 0.04;
-      }
-      if (h->GetBinContent(4) > 0) {
-        msg = std::make_shared<TLatex>(0.2, initialMessagePos, "Two digits with the same ts");
-        msg->SetTextSize(0.03);
-        msg->SetNDC();
-        h->GetListOfFunctions()->Add(msg->Clone());
-        initialMessagePos -= 0.04;
-      }
-      if (h->GetBinContent(5) > 0) {
-        msg = std::make_shared<TLatex>(0.2, initialMessagePos, "Two CTP class masks with the same ts");
-        msg->SetTextSize(0.03);
-        msg->SetNDC();
-        h->GetListOfFunctions()->Add(msg->Clone());
-        initialMessagePos -= 0.04;
-      }
-      if (h->GetBinContent(6) > 0) {
-        msg = std::make_shared<TLatex>(0.2, initialMessagePos, "Two digits (Class Mask) with the same ts");
-        msg->SetTextSize(0.03);
-        msg->SetNDC();
-        h->GetListOfFunctions()->Add(msg->Clone());
-        initialMessagePos -= 0.04;
-      }
-      if (h->GetBinContent(7) > 0) {
-        msg = std::make_shared<TLatex>(0.2, initialMessagePos, "Trigger class without input");
-        msg->SetTextSize(0.03);
-        msg->SetNDC();
-        h->GetListOfFunctions()->Add(msg->Clone());
-        initialMessagePos -= 0.04;
-      }
-      if (h->GetBinContent(8) > 0) {
-        msg = std::make_shared<TLatex>(0.2, initialMessagePos, "CTP class mask not compatible with input class mask");
-        msg->SetTextSize(0.03);
-        msg->SetNDC();
-        h->GetListOfFunctions()->Add(msg->Clone());
-        initialMessagePos -= 0.04;
-      }
-      if (h->GetBinContent(9) > 0) {
-        msg = std::make_shared<TLatex>(0.2, initialMessagePos, "CTP class not found in the digit");
-        msg->SetTextSize(0.03);
-        msg->SetNDC();
-        h->GetListOfFunctions()->Add(msg->Clone());
+      string messages[9] = { "Failed to extract RDD",
+                             "",
+                             "Two CTP IRs with the same ts",
+                             "Two digits with the same ts",
+                             "Two CTP class masks with the same ts",
+                             "Two digits (Class Mask) with the same ts",
+                             "Trigger class without input",
+                             "CTP class mask not compatible with input class mask",
+                             "CTP class not found in the digit" };
+      for (int i = 1; i < h->GetXaxis()->GetNbins() + 1; i++) {
+        if (h->GetBinContent(i) > 0) {
+          msg = std::make_shared<TLatex>(0.2, initialMessagePos, messages[i - 1].c_str());
+          initialMessagePos = setTextPosition(initialMessagePos, msg, h);
+        }
       }
     }
   } else {
     auto* h = dynamic_cast<TH1D*>(mo->getObject());
+    if (h == nullptr) {
+      ILOG(Info, Support) << "null pointer for hist:" << mo->getName() << ENDM;
+      return;
+    }
     h->SetStats(kFALSE);
     msg = std::make_shared<TLatex>(0.45, 0.8, Form("Quality: %s", (checkResult.getName()).c_str()));
     std::string groupName = "Input";