Merge pull request #10661 from wddgit/enableConsumesException

Make missing consumes calls an exception
cms-sw · Aug 13, 2015 · 30ebfb9 · 30ebfb9
2 parents 936e2be + f5fe00b
commit 30ebfb9
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 17 deletions.
diff --git a/CalibMuon/DTCalibration/interface/DTCalibMuonSelection.h b/CalibMuon/DTCalibration/interface/DTCalibMuonSelection.h
@@ -6,8 +6,9 @@
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDFilter.h"
-#include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
+#include "DataFormats/MuonReco/interface/MuonFwd.h"
 
 #include <vector>
 #include <string>
@@ -26,7 +27,7 @@ class DTCalibMuonSelection : public edm::EDFilter {
 
   virtual void endJob() ;
 
-  edm::InputTag muonList;
+  edm::EDGetTokenT<reco::MuonCollection> muonList;
 
   double etaMin;
   double etaMax;

diff --git a/CalibMuon/DTCalibration/src/DTCalibMuonSelection.cc b/CalibMuon/DTCalibration/src/DTCalibMuonSelection.cc
@@ -9,9 +9,9 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DataFormats/MuonReco/interface/Muon.h"
-#include "DataFormats/MuonReco/interface/MuonFwd.h"
 
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
@@ -21,7 +21,7 @@ using namespace reco;
 
 DTCalibMuonSelection::DTCalibMuonSelection(const edm::ParameterSet& iConfig)
 {
-  muonList = iConfig.getParameter<edm::InputTag>("src");
+  muonList = consumes<MuonCollection>(iConfig.getParameter<edm::InputTag>("src"));
   etaMin = iConfig.getParameter<double>("etaMin");
   etaMax = iConfig.getParameter<double>("etaMax");
   ptMin = iConfig.getParameter<double>("ptMin");
@@ -37,7 +37,7 @@ bool DTCalibMuonSelection::filter(edm::Event& iEvent, const edm::EventSetup& iSe
 
   //Retrieve the muons list
   Handle<MuonCollection> MuHandle;
-  iEvent.getByLabel(muonList,MuHandle);
+  iEvent.getByToken(muonList,MuHandle);
 
   for (MuonCollection::const_iterator nmuon = MuHandle->begin(); nmuon != MuHandle->end(); ++nmuon) {
 

diff --git a/FWCore/Framework/src/Principal.cc b/FWCore/Framework/src/Principal.cc
@@ -110,19 +110,24 @@ namespace edm {
 
   namespace {
     void failedToRegisterConsumesMany(edm::TypeID const& iType) {
-      LogError("GetManyWithoutRegistration")<<"::getManyByType called for "<<iType<<" without a corresponding consumesMany being called for this module. \n";
+      cms::Exception exception("GetManyWithoutRegistration");
+      exception << "::getManyByType called for " << iType
+                << " without a corresponding consumesMany being called for this module. \n";
+      throw exception;
     }
 
     void failedToRegisterConsumes(KindOfType kindOfType,
                                   TypeID const& productType,
                                   std::string const& moduleLabel,
                                   std::string const& productInstanceName,
                                   std::string const& processName) {
-      LogError("GetByLabelWithoutRegistration")<<"::getByLabel without corresponding call to consumes or mayConsumes for this module.\n"
-      << (kindOfType == PRODUCT_TYPE ? "  type: " : " type: edm::View<")<<productType
-      << (kindOfType == PRODUCT_TYPE ? "\n  module label: " : ">\n  module label: ")<<moduleLabel
-      <<"\n  product instance name: '"<<productInstanceName
-      <<"'\n  process name: '"<<processName<<"'\n";
+      cms::Exception exception("GetByLabelWithoutRegistration");
+      exception << "::getByLabel without corresponding call to consumes or mayConsumes for this module.\n"
+                << (kindOfType == PRODUCT_TYPE ? "  type: " : " type: edm::View<") << productType
+                << (kindOfType == PRODUCT_TYPE ? "\n  module label: " : ">\n  module label: ") << moduleLabel
+                <<"\n  product instance name: '" << productInstanceName
+                <<"'\n  process name: '" << processName << "'\n";
+      throw exception;
     }
 }
 

diff --git a/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.cc b/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.cc
@@ -40,7 +40,7 @@ namespace edmtest {
     } else {
       expectedRunLumisEvents1_ = pset.getUntrackedParameter<std::vector<unsigned long long> >("expectedRunLumiEvents1", std::vector<unsigned long long>());
     }
-
+    triggerResultsToken_ = consumes<edm::TriggerResults>(edm::InputTag("TriggerResults"));
   }
 
   void RunLumiEventAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&) {
@@ -54,7 +54,7 @@ namespace edmtest {
 
     if(dumpTriggerResults_) {
       edm::Handle<edm::TriggerResults> triggerResults;
-      event.getByLabel("TriggerResults", triggerResults);
+      event.getByToken(triggerResultsToken_, triggerResults);
       if(triggerResults.isValid()) {
         edm::LogAbsolute("RunLumiEvent") << "TestFailuresAnalyzer dumping TriggerResults";
         edm::LogAbsolute("RunLumiEvent") << *triggerResults;

diff --git a/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.h b/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.h
@@ -3,9 +3,14 @@
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 #include <vector>
 
+namespace edm {
+  class TriggerResults;
+}
+
 namespace edmtest {
 
   class RunLumiEventAnalyzer : public edm::EDAnalyzer {
@@ -34,6 +39,7 @@ namespace edmtest {
     int expectedEndingIndex0_;
     int expectedEndingIndex1_;
     int expectedEndingIndex_;
+    edm::EDGetTokenT<edm::TriggerResults> triggerResultsToken_;
   };
 }
 

diff --git a/FWCore/Integration/test/ViewAnalyzer.cc b/FWCore/Integration/test/ViewAnalyzer.cc
@@ -77,7 +77,7 @@ namespace edmtest
     consumes<OVSimpleProduct>(edm::InputTag{"ovsimple"});
     consumes<edm::View<OVSimpleProduct::value_type>>(edm::InputTag{"ovsimple"});
     consumes<AVSimpleProduct>(edm::InputTag{"avsimple"});
-    consumes<edm::View<AVSimpleProduct>::value_type>(edm::InputTag{"avsimple"});
+    consumes<edm::View<AVSimpleProduct::value_type>>(edm::InputTag{"avsimple"});
     consumes<edmtest::DSVSimpleProduct>(edm::InputTag{"dsvsimple"});
     consumes<edm::View<edmtest::DSVSimpleProduct::value_type>>(edm::InputTag{"dsvsimple"});
 

diff --git a/Validation/HcalDigis/interface/HcalDigisValidation.h b/Validation/HcalDigis/interface/HcalDigisValidation.h
@@ -14,6 +14,7 @@
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 
@@ -112,6 +113,8 @@ class HcalDigisValidation : public DQMEDAnalyzer {
     edm::EDGetTokenT<edm::SortedCollection<HBHEDataFrame> > tok_hbhe_; 
     edm::EDGetTokenT<edm::SortedCollection<HODataFrame> > tok_ho_;
     edm::EDGetTokenT<edm::SortedCollection<HFDataFrame> > tok_hf_;
+    edm::EDGetTokenT<HcalTrigPrimDigiCollection> tok_emulTPs_;
+    edm::EDGetTokenT<HcalTrigPrimDigiCollection> tok_dataTPs_;
 
     edm::ESHandle<CaloGeometry> geometry;
     edm::ESHandle<HcalDbService> conditions;

diff --git a/Validation/HcalDigis/src/HcalDigisValidation.cc b/Validation/HcalDigis/src/HcalDigisValidation.cc
@@ -35,6 +35,8 @@ HcalDigisValidation::HcalDigisValidation(const edm::ParameterSet& iConfig) {
     tok_hbhe_ = consumes<edm::SortedCollection<HBHEDataFrame> >(inputTag_);
     tok_ho_ = consumes<edm::SortedCollection<HODataFrame> >(inputTag_);
     tok_hf_ = consumes<edm::SortedCollection<HFDataFrame> >(inputTag_);
+    tok_emulTPs_ = consumes<HcalTrigPrimDigiCollection>(edm::InputTag("emulDigis"));
+    tok_dataTPs_ = consumes<HcalTrigPrimDigiCollection>(edm::InputTag("simHcalTriggerPrimitiveDigis"));
 
     nevent1 = 0;
     nevent2 = 0;
@@ -467,12 +469,12 @@ void HcalDigisValidation::analyze(const edm::Event& iEvent, const edm::EventSetu
 
     //Get all handles
     edm::Handle<HcalTrigPrimDigiCollection> emulTPs;
-    iEvent.getByLabel("emulDigis", emulTPs);
+    iEvent.getByToken(tok_emulTPs_, emulTPs);
 
     edm::Handle<HcalTrigPrimDigiCollection> dataTPs;
-    iEvent.getByLabel("simHcalTriggerPrimitiveDigis", dataTPs);
+    iEvent.getByToken(tok_dataTPs_, dataTPs);
     //iEvent.getByLabel("hcalDigis", dataTPs);
-   
+
     //~TP Code
 
     //  std::cout << " >>>>> HcalDigiTester::analyze  hcalselector = "