Photons esConsumes migration v1

Author: archiron

Validation/RecoEgamma/plugins/PhotonPostprocessing.cc

@@ -57,14 +57,14 @@ PhotonPostprocessing::~PhotonPostprocessing() {}
 
 void PhotonPostprocessing::beginJob() {}
 
-void PhotonPostprocessing::analyze(const edm::Event& e, const edm::EventSetup& esup) {}
+void PhotonPostprocessing::analyze(const edm::Event& e, const edm::EventSetup& ) {}
 
 void PhotonPostprocessing::endJob() {
   if (standAlone_)
     runPostprocessing();
 }
 
-void PhotonPostprocessing::endRun(const edm::Run& run, const edm::EventSetup& setup) {
+void PhotonPostprocessing::endRun(const edm::Run& run, const edm::EventSetup& ) {
   if (!standAlone_)
     runPostprocessing();
 }

Validation/RecoEgamma/plugins/PhotonValidator.cc

@@ -28,8 +28,6 @@
 #include "TrackingTools/PatternTools/interface/TwoTrackMinimumDistance.h"
 #include "TrackingTools/TransientTrack/interface/TrackTransientTrack.h"
 //
-#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
-#include "TrackingTools/Records/interface/TransientTrackRecord.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include "CommonTools/Statistics/interface/ChiSquaredProbability.h"
 
@@ -60,12 +58,9 @@
 #include "RecoEgamma/EgammaMCTools/interface/ElectronMCTruth.h"
 #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"
 
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/CaloTopology/interface/CaloTopology.h"
 #include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
-//
-//#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-//
+
 #include "TFile.h"
 #include "TH1.h"
 #include "TH2.h"
@@ -84,8 +79,9 @@
 using namespace std;
 
 PhotonValidator::PhotonValidator(const edm::ParameterSet& pset)
-
-{
+    : magneticFieldToken_{esConsumes<edm::Transition::BeginRun>()},
+      caloGeometryToken_{esConsumes()},
+      transientTrackBuilderToken_{esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))} {
   fName_ = pset.getParameter<std::string>("analyzerName");
   verbosity_ = pset.getUntrackedParameter<int>("Verbosity");
   parameters_ = pset;
@@ -158,7 +154,7 @@ PhotonValidator::PhotonValidator(const edm::ParameterSet& pset)
 
 PhotonValidator::~PhotonValidator() {}
 
-void PhotonValidator::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const& run, edm::EventSetup const& es) {
+void PhotonValidator::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const& run, edm::EventSetup const&) {
   double resMin = parameters_.getParameter<double>("resMin");
   double resMax = parameters_.getParameter<double>("resMax");
   int resBin = parameters_.getParameter<int>("resBin");
@@ -3161,14 +3157,12 @@ void PhotonValidator::dqmBeginRun(edm::Run const& r, edm::EventSetup const& theE
   //get magnetic field
   edm::LogInfo("ConvertedPhotonProducer") << " get magnetic field"
                                           << "\n";
-  theEventSetup.get<IdealMagneticFieldRecord>().get(theMF_);
+  theMF_ = theEventSetup.getHandle(magneticFieldToken_);
 
   thePhotonMCTruthFinder_ = std::make_unique<PhotonMCTruthFinder>();
 }
 
-void PhotonValidator::dqmEndRun(edm::Run const& r, edm::EventSetup const& theEventSetup) {
-  thePhotonMCTruthFinder_.reset();
-}
+void PhotonValidator::dqmEndRun(edm::Run const& r, edm::EventSetup const&) { thePhotonMCTruthFinder_.reset(); }
 
 void PhotonValidator::analyze(const edm::Event& e, const edm::EventSetup& esup) {
   thePhotonMCTruthFinder_->clear();
@@ -3191,15 +3185,14 @@ void PhotonValidator::analyze(const edm::Event& e, const edm::EventSetup& esup)
                              << "\n";
 
   // get the geometry from the event setup:
-  esup.get<CaloGeometryRecord>().get(theCaloGeom_);
+  theCaloGeom_ = esup.getHandle(caloGeometryToken_);
 
   edm::Handle<reco::VertexCollection> vtxH;
   e.getByToken(offline_pvToken_, vtxH);
   h_nRecoVtx_->Fill(float(vtxH->size()));
 
   // Transform Track into TransientTrack (needed by the Vertex fitter)
-  edm::ESHandle<TransientTrackBuilder> theTTB;
-  esup.get<TransientTrackRecord>().get("TransientTrackBuilder", theTTB);
+  auto theTTB = esup.getHandle(transientTrackBuilderToken_);
 
   ///// Get the recontructed  photons
   Handle<reco::PhotonCollection> photonHandle;

Validation/RecoEgamma/plugins/PhotonValidator.h

@@ -24,6 +24,9 @@
 #include "SimDataFormats/Vertex/interface/SimVertex.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
+#include "TrackingTools/Records/interface/TransientTrackRecord.h"
 //
 //DQM services
 #include "DQMServices/Core/interface/DQMStore.h"
@@ -119,6 +122,10 @@ class PhotonValidator : public DQMOneEDAnalyzer<> {
   edm::EDGetTokenT<edm::HepMCProduct> hepMC_Token_;
   edm::EDGetTokenT<reco::GenJetCollection> genjets_Token_;
 
+  const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magneticFieldToken_;
+  const edm::ESGetToken<CaloGeometry, CaloGeometryRecord> caloGeometryToken_;
+  const edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> transientTrackBuilderToken_;
+
   std::unique_ptr<PhotonMCTruthFinder> thePhotonMCTruthFinder_;
 
   bool fastSim_;

Validation/RecoEgamma/plugins/PhotonValidatorMiniAOD.cc

@@ -45,7 +45,7 @@ PhotonValidatorMiniAOD::~PhotonValidatorMiniAOD() {}
 
 void PhotonValidatorMiniAOD::bookHistograms(DQMStore::IBooker &iBooker,
                                             edm::Run const &run,
-                                            edm::EventSetup const &es) {
+                                            edm::EventSetup const &) {
   double eMin = parameters_.getParameter<double>("eMin");
   double eMax = parameters_.getParameter<double>("eMax");
   int eBin = parameters_.getParameter<int>("eBin");
@@ -193,7 +193,7 @@ void PhotonValidatorMiniAOD::bookHistograms(DQMStore::IBooker &iBooker,
   h_phoIso_[2] = iBooker.book1D(histname + "Endcap_miniAOD", "PF photonIso:  Endcap", etBin, etMin, 20.);
 }
 
-void PhotonValidatorMiniAOD::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+void PhotonValidatorMiniAOD::analyze(const edm::Event &iEvent, const edm::EventSetup &) {
   // ********************************************************************************
   using namespace edm;