Merge pull request #447 in B2/basf2 from bugfix/BII-8727-tracking-dqm-patch03 to release/06-00

* commit 'b7d479fca04744323c524b73447330e092571de2':
  bug-fix: you have to create a new histogram before filling it..
  improvements after Thomas' comments + added th2f of n of events vs time after inj and time withing a beam cycle
  added 2D histogram with aborted events in (time after injection, time within beam cycle) for HER and LER
  removed unused data members
  add monitoring object only if the histogram esists, otherwise leave a hole in Mirabelle
  Tracking DQM: ER analysis module
  bug-fix: 1D and 2D residual plots are now filled
  removed strange characters + bug-fix on production of 1D/2D residuals
  correct title of 1D/2D unbiased residuals for each VXD sensor
  FATAL instead of WARNING if VXD geometry is missing

Author: GiacomoXT

dqm/analysis/modules/include/DQMHistAnalysisTrackingER.h

@@ -0,0 +1,42 @@
+/**************************************************************************
+ * basf2 (Belle II Analysis Software Framework)                           *
+ * Author: The Belle II Collaboration                                     *
+ *                                                                        *
+ * See git log for contributors and copyright holders.                    *
+ * This file is licensed under LGPL-3.0, see LICENSE.md.                  *
+ **************************************************************************/
+
+#pragma once
+
+#include <dqm/analysis/modules/DQMHistAnalysis.h>
+
+#include <TCanvas.h>
+
+namespace Belle2 {
+
+  /** Analysis of ER Tracking DQM plots */
+  class DQMHistAnalysisTrackingERModule : public DQMHistAnalysisModule {
+
+    // Public functions
+  public:
+
+    /** Constructor */
+    DQMHistAnalysisTrackingERModule();
+    /**Destructor */
+    ~DQMHistAnalysisTrackingERModule() {};
+
+    /** Module function initialize */
+    void initialize() override;
+    /** Module function event */
+    void event() override;
+
+  private:
+
+    float m_onTimeHalfWidth = 50; /**< [ns], cluster is on time if within ± onTimeHalfWidth */
+
+    /** Monitoring Object to be produced by this module, which contain defined canvases and monitoring variables */
+    MonitoringObject* m_monObj = nullptr;
+
+  };
+} // end namespace Belle2
+

dqm/analysis/modules/include/DQMHistAnalysisTrackingHLT.h

@@ -29,8 +29,6 @@ namespace Belle2 {
     void initialize() override;
     /** Module function event */
     void event() override;
-    /** Module function terminate */
-    void terminate() override;
 
     // parameters
     bool m_printCanvas = false; /**< if true print the pdf of the canvases */
@@ -43,9 +41,6 @@ namespace Belle2 {
     /** Monitoring Object to be produced by this module, which contain defined canvases and monitoring variables */
     MonitoringObject* m_monObj = nullptr;
 
-    TH1* m_rtype = nullptr; /**< histogram from DQMInfo with runtype */
-    TString m_runtype = ""; /**< string with runtype: physics or cosmic */
-
     TCanvas* m_cAbortRate = nullptr;  /**< canvas for the abort rate plot */
   };
 } // end namespace Belle2

dqm/analysis/modules/src/DQMHistAnalysisTrackingER.cc

@@ -0,0 +1,91 @@
+/**************************************************************************
+ * basf2 (Belle II Analysis Software Framework)                           *
+ * Author: The Belle II Collaboration                                     *
+ *                                                                        *
+ * See git log for contributors and copyright holders.                    *
+ * This file is licensed under LGPL-3.0, see LICENSE.md.                  *
+ **************************************************************************/
+
+#include <dqm/analysis/modules/DQMHistAnalysisTrackingER.h>
+
+#include <TROOT.h>
+#include <TString.h>
+
+#include <TMath.h>
+#include <iostream>
+
+using namespace std;
+using namespace Belle2;
+
+//-----------------------------------------------------------------
+//                 Register the Module
+//-----------------------------------------------------------------
+REG_MODULE(DQMHistAnalysisTrackingER)
+
+//-----------------------------------------------------------------
+//                 Implementation
+//-----------------------------------------------------------------
+
+DQMHistAnalysisTrackingERModule::DQMHistAnalysisTrackingERModule()
+  : DQMHistAnalysisModule()
+{
+
+  setDescription("DQM Analysis Module of the Tracking ER Plots.");
+
+  addParam("onTimeHalfWidth", m_onTimeHalfWidth, "a cluster is on time if within ± onTimeHalfWidth [ns]", float(m_onTimeHalfWidth));
+
+}
+
+void DQMHistAnalysisTrackingERModule::initialize()
+{
+
+  gROOT->cd();
+
+  // add MonitoringObject
+  m_monObj = getMonitoringObject("trackingER");
+
+}
+
+
+void DQMHistAnalysisTrackingERModule::event()
+{
+
+  //compute fraction of tracks with no PXD hits
+
+  TH1* hNoPXDHits = findHist("TrackingERDQM/NoOfHitsInTrack_PXD");
+  if (hNoPXDHits != nullptr) {
+
+    int nTracks = hNoPXDHits->GetEntries();
+    int nTracksNoPXD = hNoPXDHits->GetBinContent(1);
+
+    if (nTracks > 0)
+      m_monObj->setVariable("tracksNoPXDHit", (double)nTracksNoPXD / nTracks);
+  }
+
+  //fraction of offtime SVD hits
+  //considering L3V and L456V clusters (separately)
+
+  TH1* hSVDL3VTime = findHist("SVDClsTrk/SVDTRK_ClusterTimeV3");
+  if (hSVDL3VTime != nullptr) {
+    int all = hSVDL3VTime->GetEntries();
+    if (all > 0) {
+      int bin_min = hSVDL3VTime->GetXaxis()->FindBin(-m_onTimeHalfWidth);
+      int bin_max = hSVDL3VTime->GetXaxis()->FindBin(+m_onTimeHalfWidth);
+      int offtime = all - hSVDL3VTime->Integral(bin_min, bin_max);
+      double offtimeL3Hits = (double)offtime / all;
+      m_monObj->setVariable("offtimeL3Hits", offtimeL3Hits);
+    }
+  }
+
+  TH1* hSVDL456VTime = findHist("SVDClsTrk/SVDTRK_ClusterTimeV456");
+  if (hSVDL456VTime != nullptr) {
+    int all = hSVDL456VTime->GetEntries();
+    if (all > 0) {
+      int bin_min = hSVDL456VTime->GetXaxis()->FindBin(-m_onTimeHalfWidth);
+      int bin_max = hSVDL456VTime->GetXaxis()->FindBin(+m_onTimeHalfWidth);
+      int offtime = all - hSVDL456VTime->Integral(bin_min, bin_max);
+      double offtimeL456Hits = (double)offtime / all;
+      m_monObj->setVariable("offtimeL456Hits", offtimeL456Hits);
+    }
+  }
+}

dqm/analysis/modules/src/DQMHistAnalysisTrackingHLT.cc

@@ -48,11 +48,8 @@ void DQMHistAnalysisTrackingHLTModule::initialize()
   // add MonitoringObject
   m_monObj = getMonitoringObject("trackingHLT");
 
-  m_rtype = findHist("DQMInfo/rtype");
-  m_runtype = m_rtype ? m_rtype->GetTitle() : "";
 }
 
-
 void DQMHistAnalysisTrackingHLTModule::event()
 {
 
@@ -64,8 +61,7 @@ void DQMHistAnalysisTrackingHLTModule::event()
     bool hasError = false;
     int nEvents = hAbort->GetEntries();
     double abortRate = hAbort->GetMean();
-    hAbort->SetTitle(Form("Fraction of Events in which Tracking aborts = %.6f ", abortRate));
-
+    hAbort->SetTitle(Form("Fraction of Events in which Tracking aborts = %.4f %%", abortRate * 100));
     m_monObj->setVariable("abortRate", abortRate);
     //check if number of errors is above the allowed limit
     if (abortRate > m_failureRateThreshold)
@@ -92,35 +88,28 @@ void DQMHistAnalysisTrackingHLTModule::event()
     m_cAbortRate->Print("c_AbortRate.pdf");
 
   // add average number of tracks per event to Mirabelle
-  double averageNTracks = -1;
   TH1* hnTracks = findHist("TrackingHLTDQM/NoOfTracks");
-  if (hnTracks != NULL)
-    averageNTracks = hnTracks->GetMean();
-  double averageNVXDTracks = -1;
-  TH1* hnVXDTracks = findHist("TrackingHLTDQM/NoOfTracksInVXDOnly");
-  if (hnVXDTracks != NULL)
-    averageNVXDTracks = hnVXDTracks->GetMean();
-  double averageNCDCTracks = -1;
-  TH1* hnCDCTracks = findHist("TrackingHLTDQM/NoOfTracksInCDCOnly");
-  if (hnCDCTracks != NULL)
-    averageNCDCTracks = hnCDCTracks->GetMean();
-  double averageNVXDCDCTracks = -1;
-  TH1* hnVXDCDCTracks = findHist("TrackingHLTDQM/NoOfTracksInVXDCDC");
-  if (hnVXDCDCTracks != NULL)
-    averageNVXDCDCTracks = hnVXDCDCTracks->GetMean();
-
-  m_monObj->setVariable("nTracksPerEvent", averageNTracks);
-  m_monObj->setVariable("nVXDTracksPerEvent", averageNVXDTracks);
-  m_monObj->setVariable("nCDCTracksPerEvent", averageNCDCTracks);
-  m_monObj->setVariable("nVXDCDCTracksPerEvent", averageNVXDCDCTracks);
+  if (hnTracks != NULL) {
+    double averageNTracks = hnTracks->GetMean();
+    m_monObj->setVariable("nTracksPerEvent", averageNTracks);
+  }
 
-}
+  TH1* hnVXDTracks = findHist("TrackingHLTDQM/NoOfTracksInVXDOnly");
+  if (hnVXDTracks != NULL) {
+    double averageNVXDTracks = hnVXDTracks->GetMean();
+    m_monObj->setVariable("nVXDTracksPerEvent", averageNVXDTracks);
+  }
 
-void DQMHistAnalysisTrackingHLTModule::terminate()
-{
+  TH1* hnCDCTracks = findHist("TrackingHLTDQM/NoOfTracksInCDCOnly");
+  if (hnCDCTracks != NULL) {
+    double averageNCDCTracks = hnCDCTracks->GetMean();
+    m_monObj->setVariable("nCDCTracksPerEvent", averageNCDCTracks);
+  }
 
-  delete m_rtype;
+  TH1* hnVXDCDCTracks = findHist("TrackingHLTDQM/NoOfTracksInVXDCDC");
+  if (hnVXDCDCTracks != NULL) {
+    double averageNVXDCDCTracks = hnVXDCDCTracks->GetMean();
+    m_monObj->setVariable("nVXDCDCTracksPerEvent", averageNVXDCDCTracks);
+  }
 
 }
-
-

tracking/dqmUtils/include/DQMEventProcessorBase.h

@@ -46,7 +46,7 @@ namespace Belle2 {
     /**Call this if you want to produce 1D Track Residual plots for each VXD sensor */
     void produce1Dres() {m_produce1Dres = true;};
     /**Call this if you want to produce 2D Track Residual plots for each VXD sensor */
-    void produce2Dres() {m_produce1Dres = true;};
+    void produce2Dres() {m_produce2Dres = true;};
 
   protected:
     /** Find RecoTrack for given track. Calls ProcessSuccesfulFit if the RecoTrack has a successful fit. */
@@ -107,10 +107,10 @@ namespace Belle2 {
     /** true if the DQM is run on HLT */
     bool m_runningOnHLT;
 
-    /** if true, produce 1D Track residuals plots for each VXD sensor*/
+    /** if true, produce 1D Track residuals plots for each VXD sensor */
     bool m_produce1Dres = false;
 
-    /** if true, produce 2D Track residuals plots for each VXD sensor*/
+    /** if true, produce 2D Track residuals plots for each VXD sensor */
     bool m_produce2Dres = false;
 
     /** index of track (with valid TrackFitResult and related RecoTrack) */

tracking/dqmUtils/src/DQMEventProcessorBase.cc

@@ -167,6 +167,11 @@ void DQMEventProcessorBase::ProcessPXDRecoHit(RecoHitInformation* recoHitInfo)
   m_histoModule->FillUBResidualsPXD(m_residual_um);
   m_histoModule->FillHalfShellsPXD(m_globalResidual_um, IsNotYang(m_sensorID.getLadderNumber(), m_layerNumber));
 
+  if (m_produce1Dres)
+    m_histoModule->FillUB1DResidualsSensor(m_residual_um, m_sensorIndex);
+  if (m_produce2Dres)
+    m_histoModule->FillUB2DResidualsSensor(m_residual_um, m_sensorIndex);
+
   SetCommonPrevVariables();
 }
 
@@ -189,6 +194,11 @@ void DQMEventProcessorBase::ProcessSVDRecoHit(RecoHitInformation* recoHitInfo)
 
       m_histoModule->FillUBResidualsSVD(m_residual_um);
       m_histoModule->FillHalfShellsSVD(m_globalResidual_um, IsNotMat(m_sensorID.getLadderNumber(), m_layerNumber));
+
+      if (m_produce1Dres)
+        m_histoModule->FillUB1DResidualsSensor(m_residual_um, m_sensorIndex);
+      if (m_produce2Dres)
+        m_histoModule->FillUB2DResidualsSensor(m_residual_um, m_sensorIndex);
     }
 
     SetCommonPrevVariables();

tracking/dqmUtils/src/DQMHistoModuleBase.cc

@@ -418,9 +418,9 @@ void DQMHistoModuleBase::Define1DSensors()
   factory.yTitleDefault("counts");
 
   m_UBResidualsSensorU = factory.xAxis(residualU).CreateSensorsTH1F(format("UBResidualsU_%1%"),
-                         format("PXD Unbiased U Residuals for sensor %1%"));
+                         format("VXD Unbiased U Residuals for sensor %1%"));
   m_UBResidualsSensorV = factory.xAxis(residualV).CreateSensorsTH1F(format("UBResidualsV_%1%"),
-                         format("PXD Unbiased V Residuals for sensor %1%"));
+                         format("VXD Unbiased V Residuals for sensor %1%"));
 
 }
 
@@ -435,7 +435,7 @@ void DQMHistoModuleBase::Define2DSensors()
   auto factory = Factory(this);
 
   m_UBResidualsSensor = factory.xAxis(residualU).yAxis(residualV).zTitle("counts").CreateSensorsTH2F(format("UBResiduals_%1%"),
-                        format("PXD Unbiased Residuals for sensor %1%"));
+                        format("VXD Unbiased Residuals for sensor %1%"));
 }
 
 void DQMHistoModuleBase::FillTrackIndexes(int iTrack, int iTrackVXD, int iTrackCDC, int iTrackVXDCDC)

tracking/modules/trackingDQM/SConscript

@@ -1,5 +1,5 @@
 Import('env')
 
-env['LIBS'] = ['vxd', 'tracking_dqmUtils', 'framework', 'mdst_dataobjects']
+env['LIBS'] = ['vxd', 'tracking_dqmUtils', 'framework', 'mdst_dataobjects', 'rawdata_dataobjects']
 
 Return('env')

tracking/modules/trackingDQM/include/TrackingHLTDQMModule.h

@@ -11,6 +11,8 @@
 #include <tracking/dqmUtils/DQMHistoModuleBase.h>
 #include <framework/datastore/StoreObjPtr.h>
 #include <mdst/dataobjects/EventLevelTrackingInfo.h>
+#include <framework/datastore/StoreArray.h>
+#include <rawdata/dataobjects/RawFTSW.h>
 #include <TH1.h>
 
 namespace Belle2 {
@@ -39,6 +41,9 @@ namespace Belle2 {
      * For the creation of histograms the THFFactory or the Create- functions should be used. */
     virtual void DefineFlags();
 
+    /** Input array for DAQ Status. */
+    StoreArray<RawFTSW> m_rawTTD;
+
     /** Acccess to the EventLevelTrackingInfo object in the datastore. */
     StoreObjPtr<EventLevelTrackingInfo> m_eventLevelTrackingInfo;
 
@@ -47,5 +52,44 @@ namespace Belle2 {
      * and UnspecifiedTrackFindingFailure.
      * The histogram records if any flag was set. */
     TH1F* m_trackingErrorFlags = nullptr;
+
+    /** abort rate as a function of time after injection and time within a beam cycle - HER*/
+    TH2F* m_abortVStimeHER = nullptr;
+
+    /** number of events as a function of time after injection and time within a beam cycle - HER*/
+    TH2F* m_allVStimeHER = nullptr;
+
+    /** abort rate as a function of time after injection and time within a beam cycle - LER*/
+    TH2F* m_abortVStimeLER = nullptr;
+
+    /** number of events as a function of time after injection and time within a beam cycle - LER*/
+    TH2F* m_allVStimeLER = nullptr;
+
+    /** Beam revolution time in microseconds (approximated).
+     *
+     * The exact time could be obtained as
+     * `5120 / HardwareClockSettings::getAcceleratorRF() * 1e3`
+     * but this would run after defineHisto() if used in initialize().
+     * Since defineHisto() uses this value, using a run-independent
+     * approximated constant value is the only way.
+     */
+    static constexpr double c_revolutionTime = 5120.0 / 508.0;
+
+    /** Defines the range of the x axis of the 2D time histogram */
+    static constexpr double c_noInjectionTime = 30e3;
+
+    /** Approximated global clock frequency in MHz.
+     *
+     * Used to convert TTD timing to us.
+     *
+     * The exact frequency could be obtained as
+     * `HardwareClockSettings::getGlobalClockFrequency() * 1e3`
+     * but this would produce inconsistent histograms since I am
+     * forced to use an approximated accelerator RF (508 MHz) for the
+     * beam revolution period.
+     *
+     * @sa c_revolutionTime
+     */
+    static constexpr double c_globalClock = 127.0;
   };
 }

tracking/modules/trackingDQM/src/TrackingExpressRecoDQMModule.cc

@@ -53,7 +53,7 @@ void TrackingExpressRecoDQMModule::defineHisto()
   DQMHistoModuleBase::defineHisto();
 
   if (VXD::GeoCache::getInstance().getGeoTools()->getNumberOfLayers() == 0)
-    B2WARNING("Missing geometry for VXD.");
+    B2FATAL("Missing geometry for VXD.");
 
   // Create a separate histogram directories and cd into it.
   TDirectory* originalDirectory = gDirectory;