Merge pull request #671 from deguio/declareConsumesForCorePackages

declare consumes for DQM core packages
cms-sw · Sep 8, 2013 · 8045748 · 8045748
2 parents 77672c4 + c8fdefe
commit 8045748
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 24 deletions.
diff --git a/DQMServices/Components/plugins/DQMLumiMonitor.cc b/DQMServices/Components/plugins/DQMLumiMonitor.cc
@@ -27,8 +27,8 @@ DQMLumiMonitor::DQMLumiMonitor( const edm::ParameterSet& ps ) : parameters_(ps)
 
   moduleName_          = parameters_.getParameter<std::string>("ModuleName");
   folderName_          = parameters_.getParameter<std::string>("FolderName");
-  pixelClusterInputTag_= parameters_.getParameter<edm::InputTag>("PixelClusterInputTag");
-  lumiRecordName_      = parameters_.getParameter<std::string>("LumiRecordName");
+  pixelClusterInputTag_= consumes<edmNew::DetSetVector<SiPixelCluster> >(parameters_.getParameter<edm::InputTag>("PixelClusterInputTag"));
+  lumiRecordName_      = consumes<LumiSummary,edm::InLumi>(parameters_.getParameter<std::string>("LumiRecordName"));
 
   nClusME_ = 0;
   nClusVsLSME_ = 0;
@@ -91,11 +91,10 @@ void DQMLumiMonitor::analyze(edm::Event const& iEvent, edm::EventSetup const& iS
 
   //Access Pixel Clusters
   edm::Handle< edmNew::DetSetVector<SiPixelCluster> > siPixelClusters;
-  //  edm::Handle< SiPixelClusterCollectionNew > siPixelClusters;
-  iEvent.getByLabel(pixelClusterInputTag_, siPixelClusters);
+  iEvent.getByToken(pixelClusterInputTag_, siPixelClusters);
 
   if(!siPixelClusters.isValid()) {
-    edm::LogError("PixelLumiMonotor") << "Could not find Cluster Collection " << pixelClusterInputTag_;
+    edm::LogError("PixelLumiMonotor") << "Could not find Cluster Collection ";
     return;
   }
   unsigned int nClusterPix   = (*siPixelClusters).dataSize(); 
@@ -111,7 +110,7 @@ void DQMLumiMonitor::endLuminosityBlock(edm::LuminosityBlock const& lumiBlock, e
 
   // Access Lumi Summary
   edm::Handle<LumiSummary> lumiSummary_;
-  lumiBlock.getByLabel(lumiRecordName_, lumiSummary_);
+  lumiBlock.getByToken(lumiRecordName_, lumiSummary_);
   if(lumiSummary_->isValid()){
     intLumi_ = lumiSummary_->intgDelLumi();
     edm::LogInfo("PixelLumiMonotor") <<" Luminosity in this Lumi Section " << intLumi_ ;

diff --git a/DQMServices/Components/plugins/DQMLumiMonitor.h b/DQMServices/Components/plugins/DQMLumiMonitor.h
@@ -14,12 +14,16 @@
 #include <vector>
 #include <map>
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
+//DataFormats
+#include "DataFormats/Luminosity/interface/LumiSummary.h"
+#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
+
 //
 // class declaration
 //
@@ -46,8 +50,8 @@ class DQMLumiMonitor : public edm::EDAnalyzer {
 
   std::string moduleName_;
   std::string folderName_;
-  edm::InputTag pixelClusterInputTag_;
-  std::string lumiRecordName_;
+  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > pixelClusterInputTag_;
+  edm::EDGetTokenT<LumiSummary> lumiRecordName_;
 
   DQMStore * dbe_;
 

diff --git a/DQMServices/Components/src/DQMDcsInfo.cc b/DQMServices/Components/src/DQMDcsInfo.cc
@@ -22,9 +22,11 @@ DQMDcsInfo::DQMDcsInfo(const edm::ParameterSet& ps)
 
   dbe_ = edm::Service<DQMStore>().operator->();
 
-  subsystemname_ = parameters_.getUntrackedParameter<std::string>("subSystemFolder", "Info") ;
-  dcsinfofolder_ = parameters_.getUntrackedParameter<std::string>("dcsInfoFolder", "DcsInfo") ;
-
+  subsystemname_       = parameters_.getUntrackedParameter<std::string>("subSystemFolder", "Info") ;
+  dcsinfofolder_       = parameters_.getUntrackedParameter<std::string>("dcsInfoFolder", "DcsInfo") ;
+  gtCollection_        = consumes<L1GlobalTriggerReadoutRecord>(parameters_.getUntrackedParameter<std::string>("gtCollection","gtDigis"));
+  dcsStatusCollection_ = consumes<DcsStatusCollection>(parameters_.getUntrackedParameter<std::string>("dcsStatusCollection","scalersRawToDigi"));
+
   // initialize
   for (int i=0;i<25;i++) dcs[i]=true;
 }
@@ -87,7 +89,7 @@ DQMDcsInfo::makeDcsInfo(const edm::Event& e)
 {
 
   edm::Handle<DcsStatusCollection> dcsStatus;
-  if ( ! e.getByLabel("scalersRawToDigi", dcsStatus) )
+  if ( ! e.getByToken(dcsStatusCollection_, dcsStatus) )
   {
     for (int i=0;i<24;i++) dcs[i]=false;
     return;
@@ -137,7 +139,7 @@ DQMDcsInfo::makeGtInfo(const edm::Event& e)
 {
 
   edm::Handle<L1GlobalTriggerReadoutRecord> gtrr_handle;
-  if ( ! e.getByLabel("gtDigis", gtrr_handle) ) 
+  if ( ! e.getByToken(gtCollection_, gtrr_handle) ) 
   {
     dcs[24]=false; // info not available: set to false
     return;

diff --git a/DQMServices/Components/src/DQMDcsInfo.h b/DQMServices/Components/src/DQMDcsInfo.h
@@ -19,6 +19,10 @@
 #include <DQMServices/Core/interface/DQMStore.h>
 #include <DQMServices/Core/interface/MonitorElement.h>
 
+//DataFormats
+#include "DataFormats/Scalers/interface/DcsStatus.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
+
 class DQMDcsInfo: public edm::EDAnalyzer{
 
 public:
@@ -46,6 +50,8 @@ class DQMDcsInfo: public edm::EDAnalyzer{
   edm::ParameterSet parameters_;
   std::string subsystemname_;
   std::string dcsinfofolder_;
+  edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> gtCollection_;
+  edm::EDGetTokenT<DcsStatusCollection> dcsStatusCollection_;
 
   bool dcs[25];
    // histograms

diff --git a/DQMServices/Components/src/DQMMessageLogger.cc b/DQMServices/Components/src/DQMMessageLogger.cc
@@ -45,8 +45,10 @@ DQMMessageLogger::DQMMessageLogger(const ParameterSet& parameters) {
 
   //Get from cfg file
   categories_vector = parameters.getParameter< vector<string> >("Categories");
-  directoryName = parameters.getParameter<string>("Directory");
-
+  directoryName     = parameters.getParameter<string>("Directory");
+  errorSummary_     = consumes<std::vector<edm::ErrorSummaryEntry> >(parameters.getUntrackedParameter<std::string>("errorSummary","logErrorHarvester"));
+
+
 }
 
 DQMMessageLogger::~DQMMessageLogger() { 
@@ -146,7 +148,7 @@ void DQMMessageLogger::analyze(const Event& iEvent, const EventSetup& iSetup) {
 
   // Take the ErrorSummaryEntry container
   Handle<std::vector<edm::ErrorSummaryEntry> >  errors;
-  iEvent.getByLabel("logErrorHarvester",errors);
+  iEvent.getByToken(errorSummary_,errors);
   // Check that errors is valid
   if(!errors.isValid()){   return; }
   // Compare severity level of error with ELseveritylevel instance el : "-e" should be the lowest error

diff --git a/DQMServices/Components/src/DQMMessageLogger.h b/DQMServices/Components/src/DQMMessageLogger.h
@@ -53,6 +53,7 @@ class DQMMessageLogger : public edm::EDAnalyzer {
   // from parameters
   std::vector<std::string> categories_vector;
   std::string directoryName;
+  edm::EDGetTokenT<std::vector<edm::ErrorSummaryEntry> > errorSummary_;
 
   //The histos
   MonitorElement *categories_errors;

diff --git a/DQMServices/Components/src/DQMProvInfo.cc b/DQMServices/Components/src/DQMProvInfo.cc
@@ -24,10 +24,13 @@ DQMProvInfo::DQMProvInfo(const edm::ParameterSet& ps){
   parameters_ = ps;
 
   dbe_ = edm::Service<DQMStore>().operator->();
-  globalTag_ = "MODULE::DEFAULT"; 
-  runType_ = parameters_.getUntrackedParameter<std::string>("runType", "No run type selected") ;
-  provinfofolder_ = parameters_.getUntrackedParameter<std::string>("provInfoFolder", "ProvInfo") ;
-  subsystemname_ = parameters_.getUntrackedParameter<std::string>("subSystemFolder", "Info") ;
+  globalTag_           = "MODULE::DEFAULT"; 
+  runType_             = parameters_.getUntrackedParameter<std::string>("runType", "No run type selected") ;
+  provinfofolder_      = parameters_.getUntrackedParameter<std::string>("provInfoFolder", "ProvInfo") ;
+  subsystemname_       = parameters_.getUntrackedParameter<std::string>("subSystemFolder", "Info") ;
+  L1gt_                = consumes<L1GlobalTriggerReadoutRecord>(parameters_.getUntrackedParameter<std::string>("L1gt","gtDigis"));
+  L1gtEvm_             = consumes<L1GlobalTriggerEvmReadoutRecord>(parameters_.getUntrackedParameter<std::string>("L1gtEvm","gtEvmDigis"));
+  dcsStatusCollection_ = consumes<DcsStatusCollection>(parameters_.getUntrackedParameter<std::string>("dcsStatusCollection","scalersRawToDigi"));
 
   // initialize
   nameProcess_ = "HLT"; // the process name is not contained in this ps
@@ -353,7 +356,7 @@ DQMProvInfo::makeDcsInfo(const edm::Event& e)
 {
 
   edm::Handle<DcsStatusCollection> dcsStatus;
-  e.getByLabel("scalersRawToDigi", dcsStatus);
+  e.getByToken(dcsStatusCollection_, dcsStatus);
   for (DcsStatusCollection::const_iterator dcsStatusItr = dcsStatus->begin(); 
                             dcsStatusItr != dcsStatus->end(); ++dcsStatusItr) 
   {
@@ -422,7 +425,7 @@ DQMProvInfo::makeGtInfo(const edm::Event& e)
 {
 
   edm::Handle<L1GlobalTriggerReadoutRecord> gtrr_handle;
-  e.getByLabel("gtDigis", gtrr_handle);
+  e.getByToken(L1gt_, gtrr_handle);
   L1GlobalTriggerReadoutRecord const* gtrr = gtrr_handle.product();
   L1GtFdlWord fdlWord ; 
   if (gtrr)
@@ -439,7 +442,7 @@ DQMProvInfo::makeGtInfo(const edm::Event& e)
 
   //
   edm::Handle<L1GlobalTriggerEvmReadoutRecord> gtEvm_handle;
-  e.getByLabel("gtEvmDigis", gtEvm_handle);
+  e.getByToken(L1gtEvm_, gtEvm_handle);
   L1GlobalTriggerEvmReadoutRecord const* gtevm = gtEvm_handle.product();
 
   L1GtfeWord gtfeEvmWord;

diff --git a/DQMServices/Components/src/DQMProvInfo.h b/DQMServices/Components/src/DQMProvInfo.h
@@ -19,6 +19,11 @@
 #include <DQMServices/Core/interface/DQMStore.h>
 #include <DQMServices/Core/interface/MonitorElement.h>
 
+//DataFormats
+#include "DataFormats/Scalers/interface/DcsStatus.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerEvmReadoutRecord.h"
+
 #include <string>
 #include <vector>
 
@@ -56,6 +61,9 @@ class DQMProvInfo: public edm::EDAnalyzer{
   std::string globalTag_;
   std::string runType_;
   std::string nameProcess_;
+  edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> L1gt_;
+  edm::EDGetTokenT<L1GlobalTriggerEvmReadoutRecord> L1gtEvm_;
+  edm::EDGetTokenT<DcsStatusCollection> dcsStatusCollection_;
 
   bool physDecl_;
   bool dcs25[25];