Merge pull request #32311 from jsalfeld/adjustToEsConsumes

changing to esConsumes after fix in #32217
cms-sw · Dec 2, 2020 · 6f77d78 · 6f77d78
2 parents 9be9e4c + 7120df7
commit 6f77d78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/HLTrigger/Egamma/plugins/HLTScoutingEgammaProducer.cc b/HLTrigger/Egamma/plugins/HLTScoutingEgammaProducer.cc
@@ -68,6 +68,7 @@ HLTScoutingEgammaProducer::HLTScoutingEgammaProducer(const edm::ParameterSet& iC
   //register products
   produces<Run3ScoutingElectronCollection>();
   produces<Run3ScoutingPhotonCollection>();
+  topologyToken_ = esConsumes();
 }
 
 HLTScoutingEgammaProducer::~HLTScoutingEgammaProducer() = default;
@@ -179,9 +180,7 @@ void HLTScoutingEgammaProducer::produce(edm::StreamID sid, edm::Event& iEvent, e
   iEvent.getByToken(ecalRechitEB_, rechitsEB);
   iEvent.getByToken(ecalRechitEE_, rechitsEE);
 
-  edm::ESHandle<CaloTopology> pTopology;
-  setup.get<CaloTopologyRecord>().get(pTopology);
-  const CaloTopology* topology = pTopology.product();
+  const CaloTopology* topology = &setup.getData(topologyToken_);
 
   // Produce electrons and photons
   int index = 0;

diff --git a/HLTrigger/Egamma/plugins/HLTScoutingEgammaProducer.h b/HLTrigger/Egamma/plugins/HLTScoutingEgammaProducer.h
@@ -88,6 +88,7 @@ class HLTScoutingEgammaProducer : public edm::global::EDProducer<> {
 
   const edm::EDGetTokenT<EcalRecHitCollection> ecalRechitEB_;
   const edm::EDGetTokenT<EcalRecHitCollection> ecalRechitEE_;
+  edm::ESGetToken<CaloTopology, CaloTopologyRecord> topologyToken_;
 };
 
 #endif