migrate ElectronHcalHelper to esConsumes

Author: guitargeek

RecoEgamma/EgammaElectronAlgos/interface/ElectronHcalHelper.h

@@ -3,14 +3,17 @@
 
 #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "RecoEgamma/EgammaIsolationAlgos/interface/EgammaHcalIsolation.h"
 #include "RecoEgamma/EgammaIsolationAlgos/interface/EgammaTowerIsolation.h"
+#include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
 
+class ConsumesCollector;
 class EgammaHadTower;
 class HcalTopology;
 class HcalChannelQuality;
@@ -35,7 +38,7 @@ class ElectronHcalHelper {
     double hOverEHFMinE;
   };
 
-  ElectronHcalHelper(const Configuration &cfg) : cfg_(cfg) {}
+  ElectronHcalHelper(const Configuration &cfg, edm::ConsumesCollector &&cc);
 
   void beginEvent(const edm::Event &, const edm::EventSetup &);
 
@@ -56,9 +59,10 @@ class ElectronHcalHelper {
 private:
   const Configuration cfg_;
 
-  // event setup data (rechits strategy)
-  unsigned long long caloGeomCacheId_ = 0;
-  edm::ESHandle<CaloGeometry> caloGeom_;
+  edm::ESGetToken<HcalChannelQuality, HcalChannelQualityRcd> hcalChannelQualityToken_;
+  edm::ESGetToken<HcalTopology, HcalRecNumberingRecord> hcalTopologyToken_;
+  edm::ESGetToken<CaloTowerConstituentsMap, CaloGeometryRecord> towerMapToken_;
+  edm::ESGetToken<CaloGeometry, CaloGeometryRecord> caloGeometryToken_;
 
   // event data (rechits strategy)
   std::unique_ptr<EgammaHcalIsolation> hcalIso_ = nullptr;

RecoEgamma/EgammaElectronAlgos/src/ElectronHcalHelper.cc

@@ -3,46 +3,49 @@
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 using namespace reco;
 
-void ElectronHcalHelper::beginEvent(const edm::Event& evt, const edm::EventSetup& es) {
+ElectronHcalHelper::ElectronHcalHelper(const Configuration& cfg, edm::ConsumesCollector&& cc) : cfg_(cfg) {
+  if (cfg_.hOverEConeSize == 0) {
+    return;
+  }
+
+  if (cfg_.useTowers) {
+    hcalChannelQualityToken_ = cc.esConsumes(edm::ESInputTag("", "withTopo"));
+    hcalTopologyToken_ = cc.esConsumes();
+    towerMapToken_ = cc.esConsumes();
+  } else {
+    caloGeometryToken_ = cc.esConsumes();
+  }
+}
+
+void ElectronHcalHelper::beginEvent(const edm::Event& evt, const edm::EventSetup& eventSetup) {
   if (cfg_.hOverEConeSize == 0) {
     return;
   }
 
   if (cfg_.useTowers) {
     towersFromCollection_ = &evt.get(cfg_.hcalTowers);
+
+    towerMap_ = &eventSetup.getData(towerMapToken_);
+    hcalQuality_ = &eventSetup.getData(hcalChannelQualityToken_);
+    hcalTopology_ = &eventSetup.getData(hcalTopologyToken_);
+
     towerIso1_ =
         std::make_unique<EgammaTowerIsolation>(cfg_.hOverEConeSize, 0., cfg_.hOverEPtMin, 1, towersFromCollection_);
     towerIso2_ =
         std::make_unique<EgammaTowerIsolation>(cfg_.hOverEConeSize, 0., cfg_.hOverEPtMin, 2, towersFromCollection_);
-
-    edm::ESHandle<CaloTowerConstituentsMap> ctmaph;
-    es.get<CaloGeometryRecord>().get(ctmaph);
-    towerMap_ = ctmaph.product();
-
-    edm::ESHandle<HcalChannelQuality> hQuality;
-    es.get<HcalChannelQualityRcd>().get("withTopo", hQuality);
-    hcalQuality_ = hQuality.product();
-    edm::ESHandle<HcalTopology> hcalTopology;
-    es.get<HcalRecNumberingRecord>().get(hcalTopology);
-    hcalTopology_ = hcalTopology.product();
   } else {
-    edm::Handle<HBHERecHitCollection> hbhe_;
-    if (!evt.getByToken(cfg_.hcalRecHits, hbhe_)) {
-      edm::LogError("ElectronHcalHelper::readEvent") << "failed to get the rechits";
-    }
-
-    hcalIso_ = std::make_unique<EgammaHcalIsolation>(
-        cfg_.hOverEConeSize, 0., cfg_.hOverEHBMinE, cfg_.hOverEHFMinE, 0., 0., caloGeom_, *hbhe_);
-
-    unsigned long long newCaloGeomCacheId_ = es.get<CaloGeometryRecord>().cacheIdentifier();
-    if (caloGeomCacheId_ != newCaloGeomCacheId_) {
-      caloGeomCacheId_ = newCaloGeomCacheId_;
-      es.get<CaloGeometryRecord>().get(caloGeom_);
-    }
+    hcalIso_ = std::make_unique<EgammaHcalIsolation>(cfg_.hOverEConeSize,
+                                                     0.,
+                                                     cfg_.hOverEHBMinE,
+                                                     cfg_.hOverEHFMinE,
+                                                     0.,
+                                                     0.,
+                                                     eventSetup.getHandle(caloGeometryToken_),
+                                                     evt.get(cfg_.hcalRecHits));
   }
 }
 

RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc

@@ -383,12 +383,12 @@ GsfElectronAlgo::GsfElectronAlgo(const Tokens& input,
       tkIsol04CalcCfg_(tkIsol04),
       tkIsolHEEP03CalcCfg_(tkIsolHEEP03),
       tkIsolHEEP04CalcCfg_(tkIsolHEEP04),
-      magneticFieldToken_{cc.esConsumes<MagneticField, IdealMagneticFieldRecord>()},
-      caloGeometryToken_{cc.esConsumes<CaloGeometry, CaloGeometryRecord>()},
-      caloTopologyToken_{cc.esConsumes<CaloTopology, CaloTopologyRecord>()},
-      trackerGeometryToken_{cc.esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()},
-      ecalSeveretyLevelAlgoToken_{cc.esConsumes<EcalSeverityLevelAlgo, EcalSeverityLevelAlgoRcd>()},
-      hcalHelper_{hcal},
+      magneticFieldToken_{cc.esConsumes()},
+      caloGeometryToken_{cc.esConsumes()},
+      caloTopologyToken_{cc.esConsumes()},
+      trackerGeometryToken_{cc.esConsumes()},
+      ecalSeveretyLevelAlgoToken_{cc.esConsumes()},
+      hcalHelper_{hcal, std::move(cc)},
       superClusterErrorFunction_{
           std::forward<std::unique_ptr<EcalClusterFunctionBaseClass>>(superClusterErrorFunction)},
       crackCorrectionFunction_{std::forward<std::unique_ptr<EcalClusterFunctionBaseClass>>(crackCorrectionFunction)},

RecoEgamma/EgammaElectronProducers/plugins/ElectronSeedProducer.cc

@@ -84,7 +84,7 @@ ElectronSeedProducer::ElectronSeedProducer(const edm::ParameterSet& conf)
       hcalCfg.hcalTowers = consumes<CaloTowerCollection>(conf.getParameter<edm::InputTag>("hcalTowers"));
       hcalCfg.hOverEPtMin = conf.getParameter<double>("hOverEPtMin");
     }
-    hcalHelper_ = std::make_unique<ElectronHcalHelper>(hcalCfg);
+    hcalHelper_ = std::make_unique<ElectronHcalHelper>(hcalCfg, consumesCollector());
 
     allowHGCal_ = conf.getParameter<bool>("allowHGCal");
     if (allowHGCal_) {