Merge pull request #31835 from makortel/esConsumesHcal2

Complete EventSetup-consumes migration for HBHEIsolatedNoiseReflagger
cms-sw · Oct 17, 2020 · 2a6e915 · 2a6e915
2 parents 900f6f7 + 8ce9546
commit 2a6e915
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/RecoLocalCalo/HcalRecAlgos/interface/HBHEIsolatedNoiseAlgos.h b/RecoLocalCalo/HcalRecAlgos/interface/HBHEIsolatedNoiseAlgos.h
@@ -45,6 +45,7 @@ class EcalRecHit;
 class HcalChannelQuality;
 class HcalSeverityLevelComputer;
 class EcalSeverityLevelAlgo;
+class CaloGeometry;
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -173,14 +174,13 @@ class PhysicsTowerOrganizer {
     bool operator()(const PhysicsTower& lhs, const PhysicsTower& rhs) const { return (lhs.id < rhs.id); }
   };
 
-  PhysicsTowerOrganizer(const edm::Event& iEvent,
-                        const edm::EventSetup& evSetup,
-                        const edm::Handle<HBHERecHitCollection>& hbhehitcoll_h,
+  PhysicsTowerOrganizer(const edm::Handle<HBHERecHitCollection>& hbhehitcoll_h,
                         const edm::Handle<EcalRecHitCollection>& ebhitcoll_h,
                         const edm::Handle<EcalRecHitCollection>& eehitcoll_h,
                         const edm::Handle<std::vector<reco::TrackExtrapolation> >& trackextrapcoll_h,
                         const ObjectValidatorAbs& objectvalidator,
-                        const CaloTowerConstituentsMap& ctcm);
+                        const CaloTowerConstituentsMap& ctcm,
+                        const CaloGeometry& geo);
 
   virtual ~PhysicsTowerOrganizer() {}
 

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HBHEIsolatedNoiseAlgos.cc b/RecoLocalCalo/HcalRecAlgos/src/HBHEIsolatedNoiseAlgos.cc
@@ -149,20 +149,16 @@ bool ObjectValidator::validTrack(const reco::Track& trk) const {
 ////////////////////////////////////////////////////////////
 
 PhysicsTowerOrganizer::PhysicsTowerOrganizer(
-    const edm::Event& iEvent,
-    const edm::EventSetup& evSetup,
     const edm::Handle<HBHERecHitCollection>& hbhehitcoll_h,
     const edm::Handle<EcalRecHitCollection>& ebhitcoll_h,
     const edm::Handle<EcalRecHitCollection>& eehitcoll_h,
     const edm::Handle<std::vector<reco::TrackExtrapolation> >& trackextrapcoll_h,
     const ObjectValidatorAbs& objectvalidator,
-    const CaloTowerConstituentsMap& ctcm) {
+    const CaloTowerConstituentsMap& ctcm,
+    const CaloGeometry& geo) {
   // get some geometries
-  edm::ESHandle<CaloGeometry> pG;
-  evSetup.get<CaloGeometryRecord>().get(pG);
-  const CaloGeometry* geo = pG.product();
-  const CaloSubdetectorGeometry* gEB = geo->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-  const CaloSubdetectorGeometry* gEE = geo->getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
+  const CaloSubdetectorGeometry* gEB = geo.getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
+  const CaloSubdetectorGeometry* gEE = geo.getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
 
   // do the HCAL hits
   for (HBHERecHitCollection::const_iterator it = hbhehitcoll_h->begin(); it != hbhehitcoll_h->end(); ++it) {

diff --git a/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc b/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc
@@ -70,6 +70,7 @@ HBHEIsolatedNoiseReflagger::HBHEIsolatedNoiseReflagger(const edm::ParameterSet&
   ecalSevToken_ = esConsumes<EcalSeverityLevelAlgo, EcalSeverityLevelAlgoRcd>();
   ctcmToken_ = esConsumes<CaloTowerConstituentsMap, CaloGeometryRecord>();
   hfemapToken_ = esConsumes<HcalFrontEndMap, HcalFrontEndMapRcd>();
+  geoToken_ = esConsumes();
 
   produces<HBHERecHitCollection>();
 }
@@ -116,7 +117,8 @@ void HBHEIsolatedNoiseReflagger::produce(edm::Event& iEvent, const edm::EventSet
   objvalidator_.setEERecHitCollection(&(*eehits_h));
 
   // organizer the hits
-  PhysicsTowerOrganizer pto(iEvent, evSetup, hbhehits_h, ebhits_h, eehits_h, trackextraps_h, objvalidator_, ctcm);
+  PhysicsTowerOrganizer pto(
+      hbhehits_h, ebhits_h, eehits_h, trackextraps_h, objvalidator_, ctcm, evSetup.getData(geoToken_));
   HBHEHitMapOrganizer organizer(hbhehits_h, objvalidator_, pto, hfemap);
 
   // get the rbxs, hpds, dihits, and monohits

diff --git a/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.h b/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.h
@@ -79,6 +79,7 @@ class HBHEIsolatedNoiseReflagger : public edm::stream::EDProducer<> {
   edm::ESGetToken<EcalSeverityLevelAlgo, EcalSeverityLevelAlgoRcd> ecalSevToken_;
   edm::ESGetToken<CaloTowerConstituentsMap, CaloGeometryRecord> ctcmToken_;
   edm::ESGetToken<HcalFrontEndMap, HcalFrontEndMapRcd> hfemapToken_;
+  edm::ESGetToken<CaloGeometry, CaloGeometryRecord> geoToken_;
 };
 
 #endif