Merge pull request #29544 from lwang046/HcalDQM-FixLegacy

Hcal DQM remove OneLumiEDAnalyzer
cms-sw · Apr 30, 2020 · 5c4dae8 · 5c4dae8
2 parents bbb47cf + e7295e7
commit 5c4dae8
Show file tree

Hide file tree

Showing 34 changed files with 163 additions and 944 deletions.
diff --git a/DQM/HcalCommon/interface/DQTask.h b/DQM/HcalCommon/interface/DQTask.h
@@ -22,8 +22,15 @@
 #include "FWCore/Utilities/interface/ESGetToken.h"
 
 namespace hcaldqm {
+
+  struct Cache {
+    int EvtCntLS;
+    int currentLS;
+    ContainerXXX<uint32_t> xQuality;
+  };
+
   enum UpdateFreq { fEvent = 0, f1LS = 1, f10LS = 2, f50LS = 3, f100LS = 4, nUpdateFreq = 5 };
-  class DQTask : public DQMOneLumiEDAnalyzer<>, public DQModule {
+  class DQTask : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<hcaldqm::Cache>>, public DQModule {
   public:
     //	constructor
     DQTask(edm::ParameterSet const &);
@@ -33,8 +40,9 @@ namespace hcaldqm {
     void analyze(edm::Event const &, edm::EventSetup const &) override;
     void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
     void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
-    void dqmBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
-    void dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+    std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
+                                                               edm::EventSetup const &) const override;
+    void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
 
   protected:
     // protected funcs

diff --git a/DQM/HcalCommon/src/DQTask.cc b/DQM/HcalCommon/src/DQTask.cc
@@ -35,8 +35,12 @@ namespace hcaldqm {
 
     _evsTotal++;
     _cEvsTotal.fill(_evsTotal);
-    _evsPerLS++;
+
+    auto lumiCache = luminosityBlockCache(e.getLuminosityBlock().index());
+    lumiCache->EvtCntLS++;
+    _evsPerLS = lumiCache->EvtCntLS;
     _cEvsPerLS.fill(_evsPerLS);
+
     this->_process(e, es);
   }
 
@@ -88,19 +92,25 @@ namespace hcaldqm {
     this->_resetMonitors(f100LS);
   }
 
-  void DQTask::dqmBeginLuminosityBlock(edm::LuminosityBlock const &lb, edm::EventSetup const &es) {
-    _currentLS = lb.luminosityBlock();
-    this->_resetMonitors(f1LS);
+  std::shared_ptr<hcaldqm::Cache> DQTask::globalBeginLuminosityBlock(edm::LuminosityBlock const &lb,
+                                                                     edm::EventSetup const &es) const {
+    auto d = std::make_shared<hcaldqm::Cache>();
+    d->currentLS = lb.luminosityBlock();
+    d->EvtCntLS = 0;
 
+    /*   //// these resets were not useful anymore
+    this->_resetMonitors(f1LS);
     if (_procLSs % 10 == 0)
       this->_resetMonitors(f10LS);
     if (_procLSs % 50 == 0)
       this->_resetMonitors(f50LS);
     if (_procLSs % 100 == 0)
       this->_resetMonitors(f100LS);
+*/
 
     //	get the Channel Quality Status for all the channels
-    _xQuality.reset();
+    d->xQuality.initialize(hashfunctions::fDChannel);
+    d->xQuality.reset();
     const HcalChannelQuality &cq = es.getData(hcalChannelQualityToken_);
     std::vector<DetId> detids = cq.getAllChannels();
     for (std::vector<DetId>::const_iterator it = detids.begin(); it != detids.end(); ++it) {
@@ -112,13 +122,14 @@ namespace hcaldqm {
         HcalDetId did(*it);
         uint32_t mask = (cq.getValues(did))->getValue();
         if (mask != 0) {
-          _xQuality.push(did, mask);
+          d->xQuality.push(did, mask);
         }
       }
     }
+    return d;
   }
 
-  void DQTask::dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) { _procLSs++; }
+  void DQTask::globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) { _procLSs++; }
 
   void DQTask::_resetMonitors(UpdateFreq uf) {
     //	reset per event

diff --git a/DQM/HcalTasks/interface/DigiComparisonTask.h b/DQM/HcalTasks/interface/DigiComparisonTask.h
@@ -22,7 +22,7 @@ class DigiComparisonTask : public hcaldqm::DQTask {
   ~DigiComparisonTask() override {}
 
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
 
 protected:
   //	funcs

diff --git a/DQM/HcalTasks/interface/DigiPhase1Task.h b/DQM/HcalTasks/interface/DigiPhase1Task.h
diff --git a/DQM/HcalTasks/interface/DigiTask.h b/DQM/HcalTasks/interface/DigiTask.h
@@ -32,8 +32,9 @@ class DigiTask : public hcaldqm::DQTask {
   ~DigiTask() override {}
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void dqmBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+  std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
+                                                             edm::EventSetup const &) const override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
 
 protected:
   void _process(edm::Event const &, edm::EventSetup const &) override;

diff --git a/DQM/HcalTasks/interface/LaserTask.h b/DQM/HcalTasks/interface/LaserTask.h
@@ -35,7 +35,7 @@ class LaserTask : public hcaldqm::DQTask {
         this->_dump();
     }
   }
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
 
 protected:
   //	funcs

diff --git a/DQM/HcalTasks/interface/NoCQTask.h b/DQM/HcalTasks/interface/NoCQTask.h
@@ -16,15 +16,16 @@
 
 class NoCQTask : public hcaldqm::DQTask {
 public:
-  NoCQTask(edm::ParameterSet const&);
+  NoCQTask(edm::ParameterSet const &);
   ~NoCQTask() override {}
 
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void dqmBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
+                                                             edm::EventSetup const &) const override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
 
 protected:
-  void _process(edm::Event const&, edm::EventSetup const&) override;
+  void _process(edm::Event const &, edm::EventSetup const &) override;
   void _resetMonitors(hcaldqm::UpdateFreq) override;
 
   edm::InputTag _tagHBHE;

diff --git a/DQM/HcalTasks/interface/PedestalTask.h b/DQM/HcalTasks/interface/PedestalTask.h
@@ -20,19 +20,20 @@
 
 class PedestalTask : public hcaldqm::DQTask {
 public:
-  PedestalTask(edm::ParameterSet const&);
+  PedestalTask(edm::ParameterSet const &);
   ~PedestalTask() override {}
 
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void dqmBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
-  void dqmEndRun(edm::Run const&, edm::EventSetup const&) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
+                                                             edm::EventSetup const &) const override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+  void dqmEndRun(edm::Run const &, edm::EventSetup const &) override;
 
 protected:
   //	funcs
-  void _process(edm::Event const&, edm::EventSetup const&) override;
+  void _process(edm::Event const &, edm::EventSetup const &) override;
   void _resetMonitors(hcaldqm::UpdateFreq) override;
-  bool _isApplicable(edm::Event const&) override;
+  bool _isApplicable(edm::Event const &) override;
   virtual void _dump();
 
   //	tags and tokens

diff --git a/DQM/HcalTasks/interface/QIE10Task.h b/DQM/HcalTasks/interface/QIE10Task.h
@@ -25,7 +25,7 @@ class QIE10Task : public hcaldqm::DQTask {
   ~QIE10Task() override {}
 
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
 
 protected:
   void _process(edm::Event const&, edm::EventSetup const&) override;

diff --git a/DQM/HcalTasks/interface/QIE11Task.h b/DQM/HcalTasks/interface/QIE11Task.h
@@ -25,7 +25,7 @@ class QIE11Task : public hcaldqm::DQTask {
   ~QIE11Task() override {}
 
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
 
 protected:
   void _process(edm::Event const&, edm::EventSetup const&) override;

diff --git a/DQM/HcalTasks/interface/RawTask.h b/DQM/HcalTasks/interface/RawTask.h
@@ -23,15 +23,16 @@
 
 class RawTask : public hcaldqm::DQTask {
 public:
-  RawTask(edm::ParameterSet const&);
+  RawTask(edm::ParameterSet const &);
   ~RawTask() override {}
 
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void dqmBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
+                                                             edm::EventSetup const &) const override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
 
 protected:
-  void _process(edm::Event const&, edm::EventSetup const&) override;
+  void _process(edm::Event const &, edm::EventSetup const &) override;
   void _resetMonitors(hcaldqm::UpdateFreq) override;
 
   edm::InputTag _tagFEDs;

diff --git a/DQM/HcalTasks/interface/RecHitTask.h b/DQM/HcalTasks/interface/RecHitTask.h
@@ -29,8 +29,9 @@ class RecHitTask : public hcaldqm::DQTask {
   ~RecHitTask() override {}
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void dqmBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+  std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
+                                                             edm::EventSetup const &) const override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
 
 protected:
   void _process(edm::Event const &, edm::EventSetup const &) override;

diff --git a/DQM/HcalTasks/interface/TPComparisonTask.h b/DQM/HcalTasks/interface/TPComparisonTask.h
@@ -23,7 +23,7 @@ class TPComparisonTask : public hcaldqm::DQTask {
   ~TPComparisonTask() override {}
 
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
 
 protected:
   //	funcs

diff --git a/DQM/HcalTasks/interface/TPTask.h b/DQM/HcalTasks/interface/TPTask.h
@@ -25,8 +25,9 @@ class TPTask : public hcaldqm::DQTask {
   ~TPTask() override {}
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
-  void dqmBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+  std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
+                                                             edm::EventSetup const &) const override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
 
 protected:
   void _process(edm::Event const &, edm::EventSetup const &) override;

diff --git a/DQM/HcalTasks/interface/UMNioTask.h b/DQM/HcalTasks/interface/UMNioTask.h
@@ -32,7 +32,7 @@ class UMNioTask : public hcaldqm::DQTask {
         return;
     }
   }
-  void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
 
 protected:
   //	funcs