Use ESGetToken in some of the codes in SimGeneral/DataMixingModule and SimGeneral/Debugging

Author: Sunanda

SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.cc

@@ -4,11 +4,7 @@
 //
 //--------------------------------------------
 
-#include "CondFormats/DataRecord/interface/EcalGainRatiosRcd.h"
-#include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
-#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
 #include "CondFormats/EcalObjects/interface/EcalMGPAGainRatio.h"
-#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -59,6 +55,9 @@ namespace edm {
     EBDigiCollectionDM_ = ps.getParameter<std::string>("EBDigiCollectionDM");
     EEDigiCollectionDM_ = ps.getParameter<std::string>("EEDigiCollectionDM");
     ESDigiCollectionDM_ = ps.getParameter<std::string>("ESDigiCollectionDM");
+
+    pedToken_ = iC.esConsumes<EcalPedestals, EcalPedestalsRcd>();
+    grToken_ = iC.esConsumes<EcalGainRatios, EcalGainRatiosRcd>();
   }
 
   // Virtual destructor needed.
@@ -530,8 +529,7 @@ namespace edm {
     std::vector<float> pedeStals(3);
 
     // get pedestals
-    edm::ESHandle<EcalPedestals> pedHandle;
-    ES.get<EcalPedestalsRcd>().get(pedHandle);
+    const auto& pedHandle = ES.getHandle(pedToken_);
 
     const EcalPedestalsMap &pedMap = pedHandle.product()->getMap();  // map of pedestals
     EcalPedestalsMapIterator pedIter;                                // pedestal iterator
@@ -556,8 +554,7 @@ namespace edm {
   const std::vector<float> DataMixingEMDigiWorker::GetGainRatios(const edm::EventSetup &ES, const DetId &detid) {
     std::vector<float> gainRatios(3);
     // get gain ratios
-    edm::ESHandle<EcalGainRatios> grHandle;
-    ES.get<EcalGainRatiosRcd>().get(grHandle);
+    const auto& grHandle = ES.getHandle(grToken_);
     EcalMGPAGainRatio theRatio = (*grHandle)[detid];
 
     gainRatios[0] = 1.;

SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.h

@@ -30,6 +30,11 @@
 #include "DataFormats/EcalDigi/interface/ESDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
+#include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
+#include "CondFormats/DataRecord/interface/EcalGainRatiosRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
+
 #include <map>
 #include <string>
 #include <vector>
@@ -105,6 +110,9 @@ namespace edm {
     //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
 
     std::string label_;
+
+    edm::ESGetToken<EcalPedestals, EcalPedestalsRcd> pedToken_;
+    edm::ESGetToken<EcalGainRatios, EcalGainRatiosRcd> grToken_;
   };
 }  // namespace edm
 

SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc

@@ -13,8 +13,6 @@
 // calibration headers, for future reference
 #include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
 #include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
 //
 //
 #include "DataMixingHcalDigiWorker.h"
@@ -285,6 +283,9 @@ namespace edm {
     ZDCDigiCollectionDM_ = ps.getParameter<std::string>("ZDCDigiCollectionDM");
     QIE10DigiCollectionDM_ = ps.getParameter<std::string>("QIE10DigiCollectionDM");
     QIE11DigiCollectionDM_ = ps.getParameter<std::string>("QIE11DigiCollectionDM");
+
+    dbToken_ = iC.esConsumes<HcalDbService, HcalDbRecord>();
+
   }
 
   // Virtual destructor needed.
@@ -293,8 +294,7 @@ namespace edm {
   void DataMixingHcalDigiWorker::addHcalSignals(const edm::Event &e, const edm::EventSetup &ES) {
     // Calibration stuff will look like this:
     // get conditions
-    edm::ESHandle<HcalDbService> conditions;
-    ES.get<HcalDbRecord>().get(conditions);
+    const auto& conditions = ES.getHandle(dbToken_);
 
     // fill in maps of hits
 
@@ -359,8 +359,7 @@ namespace edm {
                                          << " for bunchcrossing " << bcr;
 
     // get conditions
-    edm::ESHandle<HcalDbService> conditions;
-    ES.get<HcalDbRecord>().get(conditions);
+    const auto& conditions = ES.getHandle(dbToken_);
 
     convertPileupHcalDigis<HBHEDigiCollection>(*ep, HBHEPileInputTag_, mcc, *conditions, HBHEDigiStorage_);
     convertPileupHcalDigis<HODigiCollection>(*ep, HOPileInputTag_, mcc, *conditions, HODigiStorage_);
@@ -407,8 +406,7 @@ namespace edm {
   }
 
   void DataMixingHcalDigiWorker::putHcal(edm::Event &e, const edm::EventSetup &ES) {
-    edm::ESHandle<HcalDbService> conditions;
-    ES.get<HcalDbRecord>().get(conditions);
+    const auto& conditions = ES.getHandle(dbToken_);
 
     // collection of digis to put in the event
     std::unique_ptr<HBHEDigiCollection> HBHEdigis = buildHcalDigis<HBHEDigiCollection>(HBHEDigiStorage_, *conditions);

SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.h

@@ -21,6 +21,8 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/HcalDigi/interface/HBHEDataFrame.h"
 #include "DataFormats/HcalDigi/interface/HFDataFrame.h"
@@ -114,6 +116,7 @@ namespace edm {
     bool DoZDC_;
 
     std::string label_;
+    edm::ESGetToken<HcalDbService, HcalDbRecord> dbToken_;
   };
 }  // namespace edm
 

SimGeneral/Debugging/plugins/CaloParticleDebugger.cc

@@ -70,6 +70,7 @@ class CaloParticleDebugger : public edm::one::EDAnalyzer<> {
   edm::EDGetTokenT<std::vector<CaloParticle>> caloParticlesToken_;
   edm::EDGetTokenT<std::vector<SimCluster>> simClustersToken_;
   std::vector<edm::EDGetTokenT<std::vector<PCaloHit>>> collectionTagsToken_;
+  edm::ESGetToken<CaloGeometry, CaloGeometryRecord> geomToken_;
   int geometryType_ = 0;
   // ----------member data ---------------------------
 };
@@ -103,6 +104,7 @@ CaloParticleDebugger::CaloParticleDebugger(const edm::ParameterSet& iConfig)
   for (auto const& collectionTag : collectionTags_) {
     collectionTagsToken_.push_back(iC.consumes<std::vector<PCaloHit>>(collectionTag));
   }
+  geomToken_ = iC.esConsumes<CaloGeometry, CaloGeometryRecord>();
 }
 
 CaloParticleDebugger::~CaloParticleDebugger() {}
@@ -282,8 +284,7 @@ void CaloParticleDebugger::fillSimHits(std::map<int, float>& detIdToTotalSimEner
                                        const edm::Event& iEvent,
                                        const edm::EventSetup& iSetup) {
   // Taken needed quantities from the EventSetup
-  edm::ESHandle<CaloGeometry> geom;
-  iSetup.get<CaloGeometryRecord>().get(geom);
+  const auto& geom = iSetup.getHandle(geomToken_);
   const HGCalGeometry *eegeom = nullptr, *fhgeom = nullptr, *bhgeomnew = nullptr;
   const HcalGeometry* bhgeom = nullptr;
   const HGCalDDDConstants* hgddd[3];