[MCH] removed custom code for reference plots

* remove the custom MCH code for loading reference plots and comparing with actual data * store directly histograms instead of TCanvas objects for several plots
AliceO2Group · Dec 17, 2024 · de5d0cc · de5d0cc
1 parent 2603c31
commit de5d0cc
Show file tree

Hide file tree

Showing 20 changed files with 52 additions and 467 deletions.
diff --git a/Modules/MUON/MCH/include/MCH/ClusterChargePlotter.h b/Modules/MUON/MCH/include/MCH/ClusterChargePlotter.h
@@ -36,7 +36,7 @@ namespace muonchambers
 class ClusterChargePlotter : public HistPlotter
 {
  public:
-  ClusterChargePlotter(std::string path, TH2F* hRef, bool fullPlots = false);
+  ClusterChargePlotter(std::string path, bool fullPlots = false);
 
   void update(TH2F* hCharge);
 
@@ -62,9 +62,6 @@ class ClusterChargePlotter : public HistPlotter
   std::unique_ptr<ClusterChargeReductor> mChargeReductor;
 
   std::unique_ptr<TH1F> mHistogramChargePerDE;
-  std::unique_ptr<TH1F> mHistogramChargePerDERef;
-  std::unique_ptr<TH1F> mHistogramChargeRefRatio;
-  std::unique_ptr<TCanvas> mCanvasChargePerDE;
   std::array<std::unique_ptr<TH1F>, getNumDE()> mHistogramCharge;
 };
 

diff --git a/Modules/MUON/MCH/include/MCH/ClusterChargeTrendsPlotter.h b/Modules/MUON/MCH/include/MCH/ClusterChargeTrendsPlotter.h
@@ -35,7 +35,7 @@ namespace muonchambers
 class ClusterChargeTrendsPlotter : public HistPlotter
 {
  public:
-  ClusterChargeTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
+  ClusterChargeTrendsPlotter(std::string path, bool fullPlots = false);
 
   void update(long time, TH2F* hEfficiency);
 

diff --git a/Modules/MUON/MCH/include/MCH/ClusterSizePlotter.h b/Modules/MUON/MCH/include/MCH/ClusterSizePlotter.h
@@ -37,7 +37,7 @@ namespace muonchambers
 class ClusterSizePlotter : public HistPlotter
 {
  public:
-  ClusterSizePlotter(std::string path, TH2F* hRef, bool fullPlots = false);
+  ClusterSizePlotter(std::string path, bool fullPlots = false);
 
   void update(TH2F* hCharge);
 
@@ -52,9 +52,6 @@ class ClusterSizePlotter : public HistPlotter
   std::unique_ptr<ClusterSizeReductor> mClusterSizeReductor;
 
   std::array<std::unique_ptr<TH1F>, 3> mHistogramClusterSizePerDE;
-  std::array<std::unique_ptr<TH1F>, 3> mHistogramClusterSizePerDERef;
-  std::array<std::unique_ptr<TH1F>, 3> mHistogramClusterSizePerDERefRatio;
-  std::array<std::unique_ptr<TCanvas>, 3> mCanvasClusterSizePerDE;
   std::array<std::unique_ptr<TH1F>, getNumDE() * 3> mHistogramClusterSize;
   std::array<std::unique_ptr<TLegend>, getNumDE()> mLegendClusterSize;
   std::array<std::unique_ptr<TCanvas>, getNumDE()> mCanvasClusterSize;

diff --git a/Modules/MUON/MCH/include/MCH/ClusterSizeTrendsPlotter.h b/Modules/MUON/MCH/include/MCH/ClusterSizeTrendsPlotter.h
@@ -36,7 +36,7 @@ namespace muonchambers
 class ClusterSizeTrendsPlotter : public HistPlotter
 {
  public:
-  ClusterSizeTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
+  ClusterSizeTrendsPlotter(std::string path, bool fullPlots = false);
 
   void update(long time, TH2F* hEfficiency);
 

diff --git a/Modules/MUON/MCH/include/MCH/DigitsPostProcessing.h b/Modules/MUON/MCH/include/MCH/DigitsPostProcessing.h
@@ -71,7 +71,6 @@ class DigitsPostProcessing : public PostProcessingInterface
 
   // CCDB object accessors
   std::map<std::string, CcdbObjectHelper> mCcdbObjects;
-  std::map<std::string, CcdbObjectHelper> mCcdbObjectsRef;
 
   // Hit rate histograms ===============================================
 

diff --git a/Modules/MUON/MCH/include/MCH/EfficiencyPlotter.h b/Modules/MUON/MCH/include/MCH/EfficiencyPlotter.h
@@ -35,7 +35,7 @@ namespace muonchambers
 class EfficiencyPlotter : public HistPlotter
 {
  public:
-  EfficiencyPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
+  EfficiencyPlotter(std::string path, bool fullPlots = false);
 
   void update(TH2F* hEfficiency);
 
@@ -69,9 +69,6 @@ class EfficiencyPlotter : public HistPlotter
   std::unique_ptr<TH2ElecMapReductor> mElecMapReductor;
 
   std::array<std::unique_ptr<TH1F>, 2> mHistogramMeanEfficiencyPerDE;
-  std::array<std::unique_ptr<TH1F>, 2> mHistogramMeanEfficiencyPerDERef;
-  std::array<std::unique_ptr<TH1F>, 2> mHistogramMeanEfficiencyRefRatio;
-  std::array<std::unique_ptr<TCanvas>, 2> mCanvasMeanEfficiencyPerDE;
 
   std::array<std::map<int, std::shared_ptr<DetectorHistogram>>, 2> mHistogramEfficiencyDE; // 2D hit rate map for each DE
   std::array<std::unique_ptr<GlobalHistogram>, 2> mHistogramEfficiencyGlobal;              // Efficiency histogram (global XY view)

diff --git a/Modules/MUON/MCH/include/MCH/EfficiencyTrendsPlotter.h b/Modules/MUON/MCH/include/MCH/EfficiencyTrendsPlotter.h
@@ -35,7 +35,7 @@ namespace muonchambers
 class EfficiencyTrendsPlotter : public HistPlotter
 {
  public:
-  EfficiencyTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
+  EfficiencyTrendsPlotter(std::string path, bool fullPlots = false);
 
   void update(long time, TH2F* hEfficiency);
 

diff --git a/Modules/MUON/MCH/include/MCH/PreclustersPostProcessing.h b/Modules/MUON/MCH/include/MCH/PreclustersPostProcessing.h
@@ -73,15 +73,12 @@ class PreclustersPostProcessing : public PostProcessingInterface
   static std::string clusterChargeSourceName() { return "clcharge"; }
   static std::string clusterSizeSourceName() { return "clsize"; }
 
-  // PreclustersConfig mConfig;
-  int64_t mRefTimeStamp{ 0 };
   bool mFullHistos{ false };
 
   PostProcessingConfigMCH mConfig;
 
   // CCDB object accessors
   std::map<std::string, CcdbObjectHelper> mCcdbObjects;
-  std::map<std::string, CcdbObjectHelper> mCcdbObjectsRef;
 
   // Hit rate histograms ===============================================
 

diff --git a/Modules/MUON/MCH/include/MCH/RatesPlotter.h b/Modules/MUON/MCH/include/MCH/RatesPlotter.h
@@ -35,7 +35,7 @@ namespace muonchambers
 class RatesPlotter : public HistPlotter
 {
  public:
-  RatesPlotter(std::string path, TH2F* hRef, float rateMin, float rateMax, bool perStationPlots = false, bool fullPlots = false);
+  RatesPlotter(std::string path, float rateMin, float rateMax, bool perStationPlots = false, bool fullPlots = false);
 
   void update(TH2F* hRates);
 
@@ -69,14 +69,8 @@ class RatesPlotter : public HistPlotter
   std::unique_ptr<TH2F> mHistogramRatePerStation;
 
   std::unique_ptr<TH1F> mHistogramMeanRatePerDE;
-  std::unique_ptr<TH1F> mHistogramMeanRatePerDERef;
-  std::unique_ptr<TH1F> mHistogramMeanRateRefRatio;
-  std::unique_ptr<TCanvas> mCanvasMeanRatePerDE;
 
   std::unique_ptr<TH1F> mHistogramGoodChannelsFractionPerDE;
-  std::unique_ptr<TH1F> mHistogramGoodChannelsFractionPerDERef;
-  std::unique_ptr<TH1F> mHistogramGoodChannelsFractionRefRatio;
-  std::unique_ptr<TCanvas> mCanvasGoodChannelsFractionPerDE;
 
   std::map<int, std::shared_ptr<DetectorHistogram>> mHistogramRateDE[2]; // 2D hit rate map for each DE
   std::shared_ptr<GlobalHistogram> mHistogramRateGlobal[2];              // Rate histogram (global XY view)

diff --git a/Modules/MUON/MCH/include/MCH/RatesTrendsPlotter.h b/Modules/MUON/MCH/include/MCH/RatesTrendsPlotter.h
@@ -36,7 +36,7 @@ namespace muonchambers
 class RatesTrendsPlotter : public HistPlotter
 {
  public:
-  RatesTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots = false);
+  RatesTrendsPlotter(std::string path, bool fullPlots = false);
 
   void update(long time, TH2F* hEfficiency);
 
@@ -51,11 +51,9 @@ class RatesTrendsPlotter : public HistPlotter
 
   // Data reductor
   std::unique_ptr<TH2ElecMapReductor> mReductor;
-  std::array<std::optional<float>, getNumDE()> mRefValues;
   // Trend plots
   std::unique_ptr<TrendGraph> mOrbits;
   std::array<std::unique_ptr<TrendGraph>, getNumDE()> mTrendsDE;
-  std::array<std::unique_ptr<TrendGraph>, getNumDE()> mTrendsRefRatioDE;
   std::array<std::unique_ptr<TrendGraph>, 10> mTrendsChamber;
   std::unique_ptr<TrendMultiGraph> mTrends;
 };

diff --git a/Modules/MUON/MCH/src/ClusterChargePlotter.cxx b/Modules/MUON/MCH/src/ClusterChargePlotter.cxx
@@ -23,45 +23,17 @@ namespace quality_control_modules
 namespace muonchambers
 {
 
-ClusterChargePlotter::ClusterChargePlotter(std::string path, TH2F* hRef, bool fullPlots)
+ClusterChargePlotter::ClusterChargePlotter(std::string path, bool fullPlots)
 {
   mChargeReductor = std::make_unique<ClusterChargeReductor>();
 
-  //----------------------------------
-  // Reference charge MPV histogram
-  //----------------------------------
-  mHistogramChargePerDERef =
-    std::make_unique<TH1F>(TString::Format("%sChargeRef", path.c_str()),
-                           TString::Format("Charge vs DE, reference"), getNumDE(), 0, getNumDE());
-  mHistogramChargePerDERef->SetLineColor(kRed);
-  mHistogramChargePerDERef->SetLineStyle(kDashed);
-  mHistogramChargePerDERef->SetLineWidth(2);
-
-  if (hRef) {
-    ClusterChargeReductor reductorRef;
-    reductorRef.update(hRef);
-
-    for (size_t de = 0; de < mHistogramChargePerDERef->GetXaxis()->GetNbins(); de++) {
-      mHistogramChargePerDERef->SetBinContent(de + 1, reductorRef.getDeValue(de));
-      mHistogramChargePerDERef->SetBinError(de + 1, 0);
-    }
-  }
-
   //----------------------------------
   // Charge MPV histograms
   //----------------------------------
 
   mHistogramChargePerDE = std::make_unique<TH1F>(TString::Format("%sClusterChargeMPVHist", path.c_str()),
                                                  TString::Format("Charge vs DE"), getNumDE(), 0, getNumDE());
-
-  mHistogramChargeRefRatio = std::make_unique<TH1F>(TString::Format("%sClusterChargeMPVRefRatio", path.c_str()),
-                                                    TString::Format("Charge vs DE, ratio wrt reference"), getNumDE(), 0, getNumDE());
-  addHisto(mHistogramChargeRefRatio.get(), false, "histo", "");
-
-  mCanvasChargePerDE = std::make_unique<TCanvas>(TString::Format("%sClusterChargeMPV", path.c_str()),
-                                                 TString::Format("Charge MPV vs DE"), 800, 600);
-  // mCanvasChargePerDE->SetLogy(kTRUE);
-  addCanvas(mCanvasChargePerDE.get(), mHistogramChargePerDE.get(), false, "", "");
+  addHisto(mHistogramChargePerDE.get(), false, "histo", "");
 
   for (auto de : o2::mch::constants::deIdsForAllMCH) {
     int deID = getDEindex(de);
@@ -88,27 +60,6 @@ void ClusterChargePlotter::update(TH2F* hCharge)
     mHistogramChargePerDE->SetBinError(de + 1, 0.1);
   }
 
-  mCanvasChargePerDE->Clear();
-  mCanvasChargePerDE->cd();
-  mHistogramChargePerDE->Draw();
-
-  if (mHistogramChargePerDERef) {
-    mHistogramChargePerDERef->Draw("histsame");
-
-    mHistogramChargeRefRatio->Reset();
-    mHistogramChargeRefRatio->Add(mHistogramChargePerDE.get());
-    mHistogramChargeRefRatio->Divide(mHistogramChargePerDERef.get());
-
-    // special handling of bins with zero rate in reference
-    int nbinsx = mHistogramChargePerDERef->GetXaxis()->GetNbins();
-    for (int b = 1; b <= nbinsx; b++) {
-      if (mHistogramChargePerDERef->GetBinContent(b) == 0) {
-        mHistogramChargeRefRatio->SetBinContent(b, 1);
-        mHistogramChargeRefRatio->SetBinError(b, 0);
-      }
-    }
-  }
-
   for (int xbin = 1; xbin <= hCharge->GetXaxis()->GetNbins(); xbin++) {
     if (xbin > getNumDE()) {
       break;

diff --git a/Modules/MUON/MCH/src/ClusterChargeTrendsPlotter.cxx b/Modules/MUON/MCH/src/ClusterChargeTrendsPlotter.cxx
@@ -25,20 +25,10 @@ namespace quality_control_modules
 namespace muonchambers
 {
 
-ClusterChargeTrendsPlotter::ClusterChargeTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots)
+ClusterChargeTrendsPlotter::ClusterChargeTrendsPlotter(std::string path, bool fullPlots)
 {
   mReductor = std::make_unique<ClusterChargeReductor>();
 
-  //--------------------------------------------------
-  // Cluster charge reference values
-  //--------------------------------------------------
-
-  std::unique_ptr<ClusterChargeReductor> reductorRef;
-  if (hRef) {
-    reductorRef = std::make_unique<ClusterChargeReductor>();
-    reductorRef->update(hRef);
-  }
-
   //--------------------------------------------------
   // Cluster charge trends
   //--------------------------------------------------
@@ -49,13 +39,8 @@ ClusterChargeTrendsPlotter::ClusterChargeTrendsPlotter(std::string path, TH2F* h
       continue;
     }
 
-    std::optional<float> refVal;
-    if (reductorRef) {
-      refVal = reductorRef->getDeValue(deID);
-    }
-
     mTrends[deID] = std::make_unique<TrendGraph>(fmt::format("{}{}/ClusterCharge_DE{}", path, getHistoPath(de), de),
-                                                 fmt::format("DE{} Cluster Charge MPV", de), "charge (ADC)", refVal);
+                                                 fmt::format("DE{} Cluster Charge MPV", de), "charge (ADC)");
     // mTrends[deID]->setRange(0, 1.2);
     if (fullPlots) {
       addCanvas(mTrends[deID].get(), "");

diff --git a/Modules/MUON/MCH/src/ClusterSizePlotter.cxx b/Modules/MUON/MCH/src/ClusterSizePlotter.cxx
@@ -29,54 +29,22 @@ namespace quality_control_modules
 namespace muonchambers
 {
 
-ClusterSizePlotter::ClusterSizePlotter(std::string path, TH2F* hRef, bool fullPlots) : mPath(path)
+ClusterSizePlotter::ClusterSizePlotter(std::string path, bool fullPlots) : mPath(path)
 {
   mClusterSizeReductor = std::make_unique<ClusterSizeReductor>();
 
-  ClusterSizeReductor reductorRef;
-  if (hRef) {
-    reductorRef.update(hRef);
-  }
-
   std::string sc[3] = { "B", "NB", "" };
   std::string sc2[3] = { " (B)", " (NB)", "" };
   int histColors[3] = { kRed, kBlue, kBlack };
   for (int ci = 0; ci < 3; ci++) {
 
-    //----------------------------------
-    // Reference mean cluster size histogram
-    //----------------------------------
-    mHistogramClusterSizePerDERef[ci] =
-      std::make_unique<TH1F>(TString::Format("%sClusterSizeRef%s", mPath.c_str(), sc[ci].c_str()),
-                             TString::Format("Cluster Size vs DE%s, reference", sc2[ci].c_str()),
-                             getNumDE(), 0, getNumDE());
-    mHistogramClusterSizePerDERef[ci]->SetLineColor(kRed);
-    mHistogramClusterSizePerDERef[ci]->SetLineStyle(kDashed);
-    mHistogramClusterSizePerDERef[ci]->SetLineWidth(2);
-
-    if (hRef) {
-      for (size_t de = 0; de < mHistogramClusterSizePerDERef[ci]->GetXaxis()->GetNbins(); de++) {
-        mHistogramClusterSizePerDERef[ci]->SetBinContent(de + 1, reductorRef.getDeValue(de, ci));
-        mHistogramClusterSizePerDERef[ci]->SetBinError(de + 1, 0);
-      }
-    }
-
     //----------------------------------
     // Mean cluster size histograms
     //----------------------------------
 
-    mHistogramClusterSizePerDE[ci] = std::make_unique<TH1F>(TString::Format("%sMeanClusterSize%sHist", mPath.c_str(), sc[ci].c_str()),
+    mHistogramClusterSizePerDE[ci] = std::make_unique<TH1F>(TString::Format("%sMeanClusterSize%s", mPath.c_str(), sc[ci].c_str()),
                                                             TString::Format("Cluster Size vs DE%s", sc2[ci].c_str()), getNumDE(), 0, getNumDE());
-
-    mHistogramClusterSizePerDERefRatio[ci] = std::make_unique<TH1F>(TString::Format("%sMeanClusterSizeRefRatio%s", mPath.c_str(), sc[ci].c_str()),
-                                                                    TString::Format("Cluster Size vs DE%s, ratio wrt reference", sc2[ci].c_str()),
-                                                                    getNumDE(), 0, getNumDE());
-    addHisto(mHistogramClusterSizePerDERefRatio[ci].get(), false, "histo", "");
-
-    mCanvasClusterSizePerDE[ci] = std::make_unique<TCanvas>(TString::Format("%sMeanClusterSize%s", mPath.c_str(), sc[ci].c_str()),
-                                                            TString::Format("Cluster Size vs DE%s", sc2[ci].c_str()), 800, 600);
-    // mCanvasClusterSizePerDE->SetLogy(kTRUE);
-    addCanvas(mCanvasClusterSizePerDE[ci].get(), mHistogramClusterSizePerDE[ci].get(), false, "histo", "histo");
+    addHisto(mHistogramClusterSizePerDE[ci].get(), false, "histo", "");
 
     for (auto de : o2::mch::constants::deIdsForAllMCH) {
       int deID = getDEindex(de);
@@ -144,27 +112,6 @@ void ClusterSizePlotter::fillHistograms(TH2F* hSize)
       mHistogramClusterSizePerDE[ci]->SetBinContent(de + 1, mClusterSizeReductor->getDeValue(de, ci));
       mHistogramClusterSizePerDE[ci]->SetBinError(de + 1, 0.1);
     }
-
-    mCanvasClusterSizePerDE[ci]->Clear();
-    mCanvasClusterSizePerDE[ci]->cd();
-    mHistogramClusterSizePerDE[ci]->Draw();
-
-    if (mHistogramClusterSizePerDERef[ci]) {
-      mHistogramClusterSizePerDERef[ci]->Draw("histsame");
-
-      mHistogramClusterSizePerDERefRatio[ci]->Reset();
-      mHistogramClusterSizePerDERefRatio[ci]->Add(mHistogramClusterSizePerDE[ci].get());
-      mHistogramClusterSizePerDERefRatio[ci]->Divide(mHistogramClusterSizePerDERef[ci].get());
-
-      // special handling of bins with zero rate in reference
-      int nbinsx = mHistogramClusterSizePerDERef[ci]->GetXaxis()->GetNbins();
-      for (int b = 1; b <= nbinsx; b++) {
-        if (mHistogramClusterSizePerDERef[ci]->GetBinContent(b) == 0) {
-          mHistogramClusterSizePerDERefRatio[ci]->SetBinContent(b, 1);
-          mHistogramClusterSizePerDERefRatio[ci]->SetBinError(b, 0);
-        }
-      }
-    }
   }
 
   for (int xbin = 1; xbin <= hSize->GetXaxis()->GetNbins(); xbin++) {

diff --git a/Modules/MUON/MCH/src/ClusterSizeTrendsPlotter.cxx b/Modules/MUON/MCH/src/ClusterSizeTrendsPlotter.cxx
@@ -27,16 +27,10 @@ namespace quality_control_modules
 namespace muonchambers
 {
 
-ClusterSizeTrendsPlotter::ClusterSizeTrendsPlotter(std::string path, TH2F* hRef, bool fullPlots)
+ClusterSizeTrendsPlotter::ClusterSizeTrendsPlotter(std::string path, bool fullPlots)
 {
   mReductor = std::make_unique<ClusterSizeReductor>();
 
-  std::unique_ptr<ClusterSizeReductor> reductorRef;
-  if (hRef) {
-    reductorRef = std::make_unique<ClusterSizeReductor>();
-    reductorRef->update(hRef);
-  }
-
   //--------------------------------------------------
   // Efficiency trends
   //--------------------------------------------------
@@ -47,18 +41,11 @@ ClusterSizeTrendsPlotter::ClusterSizeTrendsPlotter(std::string path, TH2F* hRef,
       continue;
     }
 
-    std::optional<float> refB, refNB, refBNB;
-    if (reductorRef) {
-      refB = reductorRef->getDeValue(deID, 0);
-      refNB = reductorRef->getDeValue(deID, 1);
-      refBNB = reductorRef->getDeValue(deID, 2);
-    }
-
     mTrends[deID] = std::make_unique<TrendMultiGraph>(fmt::format("{}{}/ClusterSize_DE{}", path, getHistoPath(de), de),
                                                       fmt::format("DE{} Cluster Size", de), "cluster size");
-    mTrends[deID]->addGraph("B", "bending    ", refB);
-    mTrends[deID]->addGraph("NB", "non-bending", refNB);
-    mTrends[deID]->addGraph("BNB", "full       ", refBNB);
+    mTrends[deID]->addGraph("B", "bending    ");
+    mTrends[deID]->addGraph("NB", "non-bending");
+    mTrends[deID]->addGraph("BNB", "full       ");
     mTrends[deID]->addLegends();
 
     if (fullPlots) {