Merge branch 'feature/ecldqmanalysis-out-of-time-digits-rel8' into 'release/08-00'

DQMHistAnalysisECLOutOfTimeDigits adjustments for release-08-00

See merge request belle2/software/basf2!2509

Author: Frankenfrog

dqm/analysis/modules/src/DQMHistAnalysisECLOutOfTimeDigits.cc

@@ -10,7 +10,8 @@
 #include <dqm/analysis/modules/DQMHistAnalysisECLOutOfTimeDigits.h>
 
 //ROOT
-#include <TProfile.h>
+#include <TF1.h>
+#include <TH1F.h>
 
 using namespace Belle2;
 
@@ -56,11 +57,11 @@ void DQMHistAnalysisECLOutOfTimeDigitsModule::event()
       m_out_of_time_digits[pv_name] = 0;
 
       std::string hist_name    = "ECL/out_of_time_" + var_name;
-      auto prof = (TProfile*)findHist(hist_name, m_onlyIfUpdated);
+      auto hist = (TH1F*)findHist(hist_name, m_onlyIfUpdated);
 
-      if (!prof) continue;
+      if (!hist) continue;
 
-      m_out_of_time_digits[pv_name] = prof->GetBinContent(1);
+      m_out_of_time_digits[pv_name] = hist->GetMean();
 
       //== Set EPICS PVs
 
@@ -75,20 +76,37 @@ void DQMHistAnalysisECLOutOfTimeDigitsModule::endRun()
 {
   B2DEBUG(20, "DQMHistAnalysisECLOutOfTimeDigits: endRun called");
 
-  if (findHist("ECL/out_of_time_physics_All") == nullptr) {
+  auto main_hist = (TH1F*)findHist("ECL/out_of_time_physics_All");
+
+  if (main_hist == nullptr) {
     m_monObj->setVariable("comment_out_of_time_digits", "No ECL out-of-time ECLCalDigits histograms available");
     B2INFO("Histogram named ECL/out_of_time_physics_All is not found.");
     return;
   }
 
+  TF1 gaus("fit_func", "gaus");
+
   for (auto& event_type : {"rand", "dphy", "physics"}) {
     for (auto& ecl_part : {"All", "FWDEndcap", "Barrel", "BWDEndcap"}) {
-      std::string pv_name  = event_type + std::string(":") + ecl_part;
-      std::string var_name = "out_of_time_digits_" + pv_name;
+      std::string pv_name   = event_type + std::string(":") + ecl_part;
+      std::string hist_name = "ECL/out_of_time_" + pv_name;
+      std::string var_name  = "out_of_time_digits_" + pv_name;
+
+      std::replace(hist_name.begin(), hist_name.end(), ':', '_');
       std::replace(var_name.begin(), var_name.end(), ':', '_');
-      // set values of monitoring variables (if variable already exists this will
-      // change its value, otherwise it will insert new variable)
-      m_monObj->setVariable(var_name, m_out_of_time_digits[pv_name]);
+
+      // If enough statistics, obtain more detailed information for MiraBelle
+      auto hist = (TH1F*)findHist(hist_name);
+      if (hist && hist->GetEntries() > 1000) {
+        // Fit the histogram to get the peak of a distribution
+        hist->Fit(&gaus);
+        m_monObj->setVariable(var_name, gaus.GetParameter(1));
+        m_monObj->setVariable(var_name + "_stddev", gaus.GetParameter(2));
+      } else {
+        // Use simple mean from the histogram
+        m_monObj->setVariable(var_name, m_out_of_time_digits[pv_name]);
+        m_monObj->setVariable(var_name + "_stddev", 0);
+      }
     }
   }
 }