Merge pull request cms-sw#992 from abdoulline/Validation_HcalHits_fix

Consumes migration -- Validation/HcalHits bug-fix.
perrozzi · Oct 4, 2013 · 7c67c74 · 7c67c74
2 parents e69c720 + 8570c70
commit 7c67c74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Validation/HcalHits/interface/HcalSimHitsValidation.h b/Validation/HcalHits/interface/HcalSimHitsValidation.h
@@ -60,7 +60,8 @@ class HcalSimHitsValidation : public edm::EDAnalyzer {
 
   edm::EDGetTokenT<edm::HepMCProduct> tok_evt_;
   edm::EDGetTokenT<edm::PCaloHitContainer> tok_hcal_;
-  edm::EDGetTokenT<edm::PCaloHitContainer> tok_ecal_;
+  edm::EDGetTokenT<edm::PCaloHitContainer> tok_ecalEB_;
+  edm::EDGetTokenT<edm::PCaloHitContainer> tok_ecalEE_;
 
 
   // Hits counters

diff --git a/Validation/HcalHits/src/HcalSimHitsValidation.cc b/Validation/HcalHits/src/HcalSimHitsValidation.cc
@@ -9,7 +9,8 @@ HcalSimHitsValidation::HcalSimHitsValidation(edm::ParameterSet const& conf) {
   // register for data access
   tok_evt_ = consumes<edm::HepMCProduct>(edm::InputTag("generator"));
   tok_hcal_ = consumes<edm::PCaloHitContainer>(edm::InputTag("g4SimHits","HcalHits"));
-  tok_ecal_ = consumes<edm::PCaloHitContainer>(edm::InputTag("g4SimHits","EcalHitsEE"));
+  tok_ecalEB_ = consumes<edm::PCaloHitContainer>(edm::InputTag("g4SimHits","EcalHitsEB"));
+  tok_ecalEE_ = consumes<edm::PCaloHitContainer>(edm::InputTag("g4SimHits","EcalHitsEE"));
 
   if ( outputFile_.size() != 0 ) {    edm::LogInfo("OutputInfo") << " Hcal SimHit Task histograms will be saved to '" << outputFile_.c_str() << "'";
   } else {
@@ -294,7 +295,7 @@ void HcalSimHitsValidation::analyze(edm::Event const& ev, edm::EventSetup const&
 
   //Ecal EB SimHits
   edm::Handle<PCaloHitContainer> ecalEBHits;
-  ev.getByToken(tok_ecal_,ecalEBHits);
+  ev.getByToken(tok_ecalEB_,ecalEBHits);
   const PCaloHitContainer * SimHitResultEB = ecalEBHits.product () ;
 
   double EcalCone = 0;
@@ -315,7 +316,7 @@ void HcalSimHitsValidation::analyze(edm::Event const& ev, edm::EventSetup const&
 
   //Ecal EE SimHits
   edm::Handle<PCaloHitContainer> ecalEEHits;
-  ev.getByToken(tok_ecal_,ecalEEHits);
+  ev.getByToken(tok_ecalEE_,ecalEEHits);
   const PCaloHitContainer * SimHitResultEE = ecalEEHits.product () ;
 
   for (std::vector<PCaloHit>::const_iterator SimHits = SimHitResultEE->begin () ; SimHits != SimHitResultEE->end(); ++SimHits) {