Re-introduce globalEndLuminosityBlock where needed.

I removed the cache type where it was not used.
cms-sw · Jun 23, 2020 · 3a6a90f · 3a6a90f
1 parent e46c584
commit 3a6a90f
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 25 deletions.
diff --git a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc
@@ -36,6 +36,7 @@ class CTPPSCommonDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<s
   void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
   std::shared_ptr<std::vector<int>> globalBeginLuminosityBlock(const edm::LuminosityBlock &iLumi,
                                                                const edm::EventSetup &c) const override;
+  void globalEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &c) override{};
   void dqmEndLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &c) override;
 
   void analyzeCTPPSRecord(edm::Event const &event, edm::EventSetup const &eventSetup);

diff --git a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
@@ -76,6 +76,7 @@ class CTPPSDiamondDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<
   void analyze(const edm::Event&, const edm::EventSetup&) override;
   std::shared_ptr<dds::Cache> globalBeginLuminosityBlock(const edm::LuminosityBlock&,
                                                          const edm::EventSetup&) const override;
+  void globalEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override{};
   void dqmEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
 
 private:

diff --git a/DQM/CTPPS/plugins/TotemTimingDQMSource.cc b/DQM/CTPPS/plugins/TotemTimingDQMSource.cc
@@ -57,6 +57,7 @@ class TotemTimingDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<t
   void analyze(const edm::Event &, const edm::EventSetup &) override;
   std::shared_ptr<totemds::Cache> globalBeginLuminosityBlock(const edm::LuminosityBlock &,
                                                              const edm::EventSetup &) const override;
+  void globalEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override{};
   void dqmEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
 
 private:

diff --git a/DQM/HcalCommon/interface/DQTask.h b/DQM/HcalCommon/interface/DQTask.h
@@ -42,6 +42,7 @@ namespace hcaldqm {
     void dqmBeginRun(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 dqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
 
   protected:

diff --git a/DQM/L1TMonitor/interface/L1TdeRCT.h b/DQM/L1TMonitor/interface/L1TdeRCT.h
@@ -62,6 +62,7 @@ class L1TdeRCT : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<l1tderct::Emp
   void bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) override;
   std::shared_ptr<l1tderct::Empty> globalBeginLuminosityBlock(const edm::LuminosityBlock&,
                                                               const edm::EventSetup&) const override;
+  void globalEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final {}
   void dqmEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final {}
   void readFEDVector(MonitorElement*, const edm::EventSetup&) const;
 

diff --git a/DQM/Physics/src/QcdLowPtDQM.cc b/DQM/Physics/src/QcdLowPtDQM.cc
@@ -913,11 +913,6 @@ void QcdLowPtDQM::filldNdeta(const TH3F *AlphaTracklets,
   }
 }
 
-std::shared_ptr<qlpd::Cache> QcdLowPtDQM::globalBeginLuminosityBlock(const LuminosityBlock &,
-                                                                     const EventSetup &) const {
-  return std::shared_ptr<qlpd::Cache>();
-}
-
 void QcdLowPtDQM::dqmEndLuminosityBlock(const LuminosityBlock &l, const EventSetup &iSetup) {
   // Update various histograms.
   repSummary_->Fill(1.);

diff --git a/DQM/Physics/src/QcdLowPtDQM.h b/DQM/Physics/src/QcdLowPtDQM.h
@@ -19,11 +19,7 @@ class TH1F;
 class TH2F;
 class TH3F;
 
-namespace qlpd {
-  struct Cache {};
-}  // namespace qlpd
-
-class QcdLowPtDQM : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<qlpd::Cache>> {
+class QcdLowPtDQM : public DQMOneEDAnalyzer<> {
 public:
   class Pixel {
   public:
@@ -124,8 +120,6 @@ class QcdLowPtDQM : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<qlpd::Cach
   void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override;
-  std::shared_ptr<qlpd::Cache> globalBeginLuminosityBlock(const edm::LuminosityBlock &,
-                                                          const edm::EventSetup &) const override;
   void dqmEndLuminosityBlock(const edm::LuminosityBlock &l, const edm::EventSetup &iSetup) override;
   void dqmEndRun(const edm::Run &r, const edm::EventSetup &iSetup) override;
 

diff --git a/DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h b/DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h
@@ -38,6 +38,7 @@ class SiStripMonitorDigi : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<boo
   void analyze(const edm::Event&, const edm::EventSetup&) override;
   std::shared_ptr<bool> globalBeginLuminosityBlock(const edm::LuminosityBlock& lumi,
                                                    const edm::EventSetup& iSetup) const override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override{};
   void dqmEndLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& iSetup) override;
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
   void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override;

diff --git a/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc b/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc
@@ -77,6 +77,7 @@ class SiStripFEDMonitorPlugin : public DQMOneEDAnalyzer<edm::LuminosityBlockCach
   std::shared_ptr<sifedmon::LumiErrors> globalBeginLuminosityBlock(const edm::LuminosityBlock& lumi,
                                                                    const edm::EventSetup& iSetup) const override;
 
+  void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override{};
   void dqmEndLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& iSetup) override;
 
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;

diff --git a/DQM/TrigXMonitor/interface/L1Scalers.h b/DQM/TrigXMonitor/interface/L1Scalers.h
@@ -13,18 +13,12 @@
 #define MAX_LUMI_SEG 2000
 #define MAX_LUMI_BIN 400
 
-namespace l1s {
-  struct Empty {};
-}  // namespace l1s
-class L1Scalers : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<l1s::Empty>> {
+class L1Scalers : public DQMOneEDAnalyzer<> {
 public:
   L1Scalers(const edm::ParameterSet &ps);
   ~L1Scalers() override{};
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   void analyze(const edm::Event &e, const edm::EventSetup &c) override;
-  /// DQM Client Diagnostic should be performed here:
-  std::shared_ptr<l1s::Empty> globalBeginLuminosityBlock(const edm::LuminosityBlock &lumiSeg,
-                                                         const edm::EventSetup &c) const final;
   void dqmEndLuminosityBlock(const edm::LuminosityBlock &lumiSeg, const edm::EventSetup &c) override;
 
 private:

diff --git a/DQM/TrigXMonitor/src/L1Scalers.cc b/DQM/TrigXMonitor/src/L1Scalers.cc
@@ -411,11 +411,6 @@ void L1Scalers::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   return;
 }
 
-std::shared_ptr<l1s::Empty> L1Scalers::globalBeginLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
-                                                                  const edm::EventSetup& c) const {
-  return std::shared_ptr<l1s::Empty>();
-}
-
 void L1Scalers::dqmEndLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) {
   nLumiBlock_->Fill(lumiSeg.id().luminosityBlock());
 }
diff --git a/DQMOffline/L1Trigger/interface/L1TSync_Offline.h b/DQMOffline/L1Trigger/interface/L1TSync_Offline.h
@@ -111,6 +111,7 @@ class L1TSync_Offline : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<ltso::
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;  // Analyze
   std::shared_ptr<ltso::LSValid> globalBeginLuminosityBlock(edm::LuminosityBlock const& lumiBlock,
                                                             edm::EventSetup const& c) const final;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) final {}
   void dqmEndLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) final {}
   void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) override;

diff --git a/DQMServices/Core/interface/DQMOneEDAnalyzer.h b/DQMServices/Core/interface/DQMOneEDAnalyzer.h
@@ -81,7 +81,8 @@ class DQMOneEDAnalyzer : public edm::one::EDProducer<edm::EndRunProducer,
   // This could safely be used, and might need to be used to get some types of
   // products, but it will *only* be called if subsystem code adds a lumi cache.
   // For consistency, we use endLuminosityBlockProduce and ban this.
-  void globalEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final{};
+  // TODO: for technical reasons, it is quite hard to make this final.
+  //void globalEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final{};
 
   // Subsystems could safely override this, but any changes to MEs would not be
   // noticeable since the product was made already.

diff --git a/DQMServices/StreamerIO/plugins/RamdiskMonitor.cc b/DQMServices/StreamerIO/plugins/RamdiskMonitor.cc
@@ -35,6 +35,7 @@ namespace dqm {
     void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
     std::shared_ptr<rdm::Empty> globalBeginLuminosityBlock(edm::LuminosityBlock const &lumi,
                                                            edm::EventSetup const &eSetup) const override;
+    void globalEndLuminosityBlock(edm::LuminosityBlock const &lumi, edm::EventSetup const &eSetup) final {}
     void dqmEndLuminosityBlock(edm::LuminosityBlock const &lumi, edm::EventSetup const &eSetup) final {}
     void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override{};