Merge pull request #19176 from bsunanda/Run2-hcx134

Run2-hcx134 Make use of HcalGeometry for getPosition of Hcal DetIds
cms-sw · Jun 11, 2017 · e7b534b · e7b534b
2 parents af5a052 + dff8a13
commit e7b534b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml
@@ -4,6 +4,7 @@
 <use   name="FWCore/ParameterSet"/>
 <use   name="clhep"/>
 <use   name="Geometry/CaloTopology"/>
+<use   name="Geometry/HcalTowerAlgo"/>
 <use   name="Geometry/Records"/>
 <use   name="DataFormats/TrackReco"/>
 <use   name="CommonTools/UtilAlgos"/>

diff --git a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc
@@ -15,6 +15,7 @@
 
 // Geometry
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 #include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
 // strip geometry
 #include "CalibFormats/SiStripObjects/interface/SiStripRegionCabling.h"
@@ -471,8 +472,8 @@ void SelectedElectronFEDListProducer<TEle,TCand>::produce(edm::Event & iEvent, c
 	      HBHERecHitCollection::const_iterator itHcalRecHit = hcalRecHitCollection->begin();
 	      for( ; itHcalRecHit != hcalRecHitCollection->end() ; ++itHcalRecHit) {
 		HcalDetId recHitId(itHcalRecHit->id());
-		const CaloCellGeometry* cellGeometry = GeometryCalo_->getSubdetectorGeometry(recHitId)->getGeometry(recHitId);
-		float dR = reco::deltaR(scRef->eta(),scRef->phi(),cellGeometry->getPosition().eta(),cellGeometry->getPosition().phi());
+		const HcalGeometry* cellGeometry = (HcalGeometry*)(GeometryCalo_->getSubdetectorGeometry(recHitId));
+		float dR = reco::deltaR(scRef->eta(),scRef->phi(),cellGeometry->getPosition(recHitId).eta(),cellGeometry->getPosition(recHitId).phi());
 		if(dR <= dRHcalRegion_) {
 		  const HcalElectronicsId electronicId = HcalReadoutMap_->lookup(recHitId);
 		  int hitFED = electronicId.dccid() + FEDNumbering::MINHCALFEDID;