Merge pull request cms-sw#34058 from archiron/DQMOffline_EGamma_esConsumes_1

DQMOffline EGamma esConsumes modifications

Author: cmsbuild

DQMOffline/EGamma/plugins/PiZeroAnalyzer.cc

@@ -17,7 +17,8 @@
 
 using namespace std;
 
-PiZeroAnalyzer::PiZeroAnalyzer(const edm::ParameterSet& pset) {
+PiZeroAnalyzer::PiZeroAnalyzer(const edm::ParameterSet& pset)
+    : caloGeometryToken_{esConsumes()}, caloTopologyToken_{esConsumes()} {
   fName_ = pset.getUntrackedParameter<std::string>("Name");
   prescaleFactor_ = pset.getUntrackedParameter<int>("prescaleFactor", 1);
 
@@ -113,11 +114,13 @@ void PiZeroAnalyzer::makePizero(const edm::EventSetup& es,
                                 const edm::Handle<EcalRecHitCollection> rhEE) {
   const EcalRecHitCollection* hitCollection_p = rhEB.product();
 
-  edm::ESHandle<CaloGeometry> geoHandle;
-  es.get<CaloGeometryRecord>().get(geoHandle);
+  //edm::ESHandle<CaloGeometry> geoHandle;
+  //es.get<CaloGeometryRecord>().get(geoHandle);
+  auto geoHandle = es.getHandle(caloGeometryToken_);
 
-  edm::ESHandle<CaloTopology> theCaloTopology;
-  es.get<CaloTopologyRecord>().get(theCaloTopology);
+  //edm::ESHandle<CaloTopology> theCaloTopology;
+  //es.get<CaloTopologyRecord>().get(theCaloTopology);
+  auto theCaloTopology = es.getHandle(caloTopologyToken_);
 
   const CaloSubdetectorTopology* topology_p;
   const CaloSubdetectorGeometry* geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);

DQMOffline/EGamma/plugins/PiZeroAnalyzer.h

@@ -93,6 +93,10 @@ class PiZeroAnalyzer : public DQMEDAnalyzer {
 
   edm::EDGetTokenT<edm::SortedCollection<EcalRecHit, edm::StrictWeakOrdering<EcalRecHit> > > barrelEcalHits_token_;
   edm::EDGetTokenT<edm::SortedCollection<EcalRecHit, edm::StrictWeakOrdering<EcalRecHit> > > endcapEcalHits_token_;
+
+  const edm::ESGetToken<CaloGeometry, CaloGeometryRecord> caloGeometryToken_;
+  const edm::ESGetToken<CaloTopology, CaloTopologyRecord> caloTopologyToken_;
+
   double minPhoEtCut_;
 
   double cutStep_;