Merge pull request #40958 from jeongeun/rmconsumesMany

Migrate consumesMany to GetterOfProducts in DQMServices
cms-sw · Mar 9, 2023 · 0b5edc6 · 0b5edc6
2 parents 28df1c4 + f33f491
commit 0b5edc6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/DQMServices/Components/plugins/MEtoEDMConverter.cc b/DQMServices/Components/plugins/MEtoEDMConverter.cc
@@ -21,6 +21,8 @@
 #include "FWCore/Framework/interface/one/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/GetterOfProducts.h"
+#include "FWCore/Framework/interface/ProcessMatch.h"
 
 //DQM services
 #include "DQMServices/Core/interface/DQMStore.h"
@@ -94,6 +96,8 @@ class MEtoEDMConverter : public edm::one::EDProducer<edm::RunCache<meedm::Void>,
 
   // private statistics information
   std::map<int, int> iCount;
+  edm::GetterOfProducts<DQMToken> lumigetter_;
+  edm::GetterOfProducts<DQMToken> rungetter_;
 
 };  // end class declaration
 
@@ -158,8 +162,12 @@ MEtoEDMConverter::MEtoEDMConverter(const edm::ParameterSet& iPSet) : fName(""),
   produces<MEtoEDM<long long>, edm::Transition::EndLuminosityBlock>(sName);
   produces<MEtoEDM<TString>, edm::Transition::EndLuminosityBlock>(sName);
 
-  consumesMany<DQMToken, edm::InLumi>();
-  consumesMany<DQMToken, edm::InRun>();
+  lumigetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InLumi);
+  rungetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InRun);
+  callWhenNewProductsRegistered([this](edm::BranchDescription const& bd) {
+    this->lumigetter_(bd);
+    this->rungetter_(bd);
+  });
   usesResource("DQMStore");
 
   static_assert(sizeof(int64_t) == sizeof(long long), "type int64_t is not the same length as long long");

diff --git a/DQMServices/FileIO/plugins/DQMFileSaverBase.cc b/DQMServices/FileIO/plugins/DQMFileSaverBase.cc
@@ -8,6 +8,8 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/JobReport.h"
 #include "FWCore/Utilities/interface/TimeOfDay.h"
+#include "FWCore/Framework/interface/GetterOfProducts.h"
+#include "FWCore/Framework/interface/ProcessMatch.h"
 #include "DataFormats/Histograms/interface/DQMToken.h"
 
 #include "DQMFileSaverBase.h"
@@ -43,8 +45,12 @@ DQMFileSaverBase::DQMFileSaverBase(const edm::ParameterSet &ps) {
   runNumber_ = ps.getUntrackedParameter<int>("runNumber", 111);
 
   // This makes sure a file saver runs in a very end
-  consumesMany<DQMToken, edm::InLumi>();
-  consumesMany<DQMToken, edm::InRun>();
+  lumigetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InLumi);
+  rungetter_ = edm::GetterOfProducts<DQMToken>(edm::ProcessMatch("*"), this, edm::InRun);
+  callWhenNewProductsRegistered([this](edm::BranchDescription const &bd) {
+    this->lumigetter_(bd);
+    this->rungetter_(bd);
+  });
 }
 
 DQMFileSaverBase::~DQMFileSaverBase() = default;

diff --git a/DQMServices/FileIO/plugins/DQMFileSaverBase.h b/DQMServices/FileIO/plugins/DQMFileSaverBase.h
@@ -9,6 +9,10 @@
 
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Framework/interface/GetterOfProducts.h"
+#include "FWCore/Framework/interface/ProcessMatch.h"
+
+#include "DataFormats/Histograms/interface/DQMToken.h"
 
 #include <sys/time.h>
 #include <string>
@@ -71,10 +75,12 @@ namespace dqm {
     FileParameters initial_fp_;
     int runNumber_;
 
+    edm::GetterOfProducts<DQMToken> lumigetter_;
+    edm::GetterOfProducts<DQMToken> rungetter_;
+
   public:
     static void fillDescription(edm::ParameterSetDescription &d);
   };
-
 }  // namespace dqm
 
 #endif  // DQMSERVICES_COMPONENTS_DQMFILESAVERBASE_H