Merge pull request #33689 from mmusich/esConsumesSLHCUpgradeSimulations

migrate SLHCUpgradeSimulations/Geometry to esConsumes

SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc

@@ -75,6 +75,9 @@ class ModuleInfo_Phase2 : public edm::EDAnalyzer {
 
 private:
   // ----------member data ---------------------------
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geom_esToken;
+  edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDet_esToken;
+  edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topo_esToken;
   bool fromDDD_;
   bool printDDD_;
 };
@@ -104,9 +107,7 @@ ModuleInfo_Phase2::~ModuleInfo_Phase2() {
 // ------------ method called to produce the data  ------------
 void ModuleInfo_Phase2::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //Retrieve tracker topology from geometry
-  edm::ESHandle<TrackerTopology> tTopoHandle;
-  iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology* const tTopo = &iSetup.getData(topo_esToken);
 
   edm::LogInfo("ModuleInfo_Phase2") << "begins";
 
@@ -124,15 +125,12 @@ void ModuleInfo_Phase2::analyze(const edm::Event& iEvent, const edm::EventSetup&
   //
   // get the GeometricDet
   //
-  edm::ESHandle<GeometricDet> rDD;
+  const GeometricDet* rDD = &iSetup.getData(geomDet_esToken);
 
-  iSetup.get<IdealGeometryRecord>().get(rDD);
-  edm::LogInfo("ModuleInfo_Phase2") << " Top node is  " << rDD.product() << " " << rDD.product()->name() << std::endl;
-  edm::LogInfo("ModuleInfo_Phase2") << " And Contains  Daughters: " << rDD.product()->deepComponents().size()
-                                    << std::endl;
+  edm::LogInfo("ModuleInfo_Phase2") << " Top node is  " << rDD << " " << rDD->name() << std::endl;
+  edm::LogInfo("ModuleInfo_Phase2") << " And Contains  Daughters: " << rDD->deepComponents().size() << std::endl;
   //first instance tracking geometry
-  edm::ESHandle<TrackerGeometry> pDD;
-  iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
+  const TrackerGeometry* pDD = &iSetup.getData(geom_esToken);
   //
 
   // counters

SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc

@@ -44,7 +44,6 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -124,10 +123,13 @@ class Phase2PixelNtuple : public edm::one::EDAnalyzer<> {
                                                        const GeomDetUnit& det) const;
 
 private:
-  edm::ParameterSet const conf_;
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geom_esToken;
+  edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topo_esToken;
+  edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> ttkb_esToken;
+  edm::ESGetToken<TransientTrackingRecHitBuilder, TransientRecHitRecord> tthb_esToken;
+
   TrackerHitAssociator::Config trackerHitAssociatorConfig_;
   edm::EDGetTokenT<edmNew::DetSetVector<SiPixelRecHit>> pixelRecHits_token_;
-  std::string ttrhBuilder_;
   edm::EDGetTokenT<edm::View<reco::Track>> recoTracks_token_;
   edm::EDGetTokenT<TrajTrackAssociationCollection> tta_token_;
 
@@ -201,9 +203,12 @@ class Phase2PixelNtuple : public edm::one::EDAnalyzer<> {
 };
 
 Phase2PixelNtuple::Phase2PixelNtuple(edm::ParameterSet const& conf)
-    : trackerHitAssociatorConfig_(conf, consumesCollector()),
+    : geom_esToken(esConsumes()),
+      topo_esToken(esConsumes()),
+      ttkb_esToken(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))),
+      tthb_esToken(esConsumes(edm::ESInputTag("", conf.getParameter<std::string>("ttrhBuilder")))),
+      trackerHitAssociatorConfig_(conf, consumesCollector()),
       pixelRecHits_token_(consumes<edmNew::DetSetVector<SiPixelRecHit>>(edm::InputTag("siPixelRecHits"))),
-      ttrhBuilder_(conf.getParameter<std::string>("ttrhBuilder")),  //ttrhBuilder_token def
       recoTracks_token_(consumes<edm::View<reco::Track>>(conf.getParameter<edm::InputTag>("trackProducer"))),
       tta_token_(consumes<TrajTrackAssociationCollection>(conf.getParameter<InputTag>("trajectoryInput"))),
       verbose_(conf.getUntrackedParameter<bool>("verbose", false)),
@@ -337,15 +342,10 @@ void Phase2PixelNtuple::beginJob() {
 // Functions that gets called by framework every event
 void Phase2PixelNtuple::analyze(const edm::Event& e, const edm::EventSetup& es) {
   //Retrieve tracker topology from geometry
-  edm::ESHandle<TrackerTopology> tTopoHandle;
-  es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology* const tTopo = &es.getData(topo_esToken);
 
   // geometry setup
-  edm::ESHandle<TrackerGeometry> geometry;
-
-  es.get<TrackerDigiGeometryRecord>().get(geometry);
-  const TrackerGeometry* theGeometry = &(*geometry);
+  const TrackerGeometry* theGeometry = &es.getData(geom_esToken);
 
   std::vector<PSimHit> matched;
   const PSimHit* closest_simhit = nullptr;
@@ -357,14 +357,8 @@ void Phase2PixelNtuple::analyze(const edm::Event& e, const edm::EventSetup& es)
   TrackerHitAssociator associate(e, trackerHitAssociatorConfig_);
 
   //Transient Rechit Builders
-  edm::ESHandle<TransientTrackBuilder> theB;
-  es.get<TransientTrackRecord>().get("TransientTrackBuilder", theB);
-
-  //ttrh builder def
-  ESHandle<TransientTrackingRecHitBuilder> hitBuilder;
-  es.get<TransientRecHitRecord>().get(ttrhBuilder_, hitBuilder);
   const TkTransientTrackingRecHitBuilder* builder =
-      static_cast<TkTransientTrackingRecHitBuilder const*>(hitBuilder.product());
+      static_cast<TkTransientTrackingRecHitBuilder const*>(&es.getData(tthb_esToken));
   auto hitCloner = builder->cloner();
 
   if ((recHitColl.product())->dataSize() > 0) {

SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc

@@ -7,8 +7,6 @@
 
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -28,8 +26,6 @@
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
@@ -39,8 +35,6 @@
 
 // Geometry
 #include "MagneticField/Engine/interface/MagneticField.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
@@ -64,7 +58,9 @@ using namespace edm;
 using namespace reco;
 
 StdHitNtuplizer::StdHitNtuplizer(edm::ParameterSet const& conf)
-    : conf_(conf),
+    : geom_esToken(esConsumes()),
+      topo_esToken(esConsumes()),
+      conf_(conf),
       trackerHitAssociatorConfig_(conf, consumesCollector()),
       src_(conf.getParameter<edm::InputTag>("src")),
       rphiRecHits_(conf.getParameter<edm::InputTag>("rphiRecHits")),
@@ -117,15 +113,10 @@ void StdHitNtuplizer::beginJob() {
 // Functions that gets called by framework every event
 void StdHitNtuplizer::analyze(const edm::Event& e, const edm::EventSetup& es) {
   //Retrieve tracker topology from geometry
-  edm::ESHandle<TrackerTopology> tTopoHandle;
-  es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology* const tTopo = &es.getData(topo_esToken);
 
   // geometry setup
-  edm::ESHandle<TrackerGeometry> geometry;
-
-  es.get<TrackerDigiGeometryRecord>().get(geometry);
-  const TrackerGeometry* theGeometry = &(*geometry);
+  const TrackerGeometry* theGeometry = &es.getData(geom_esToken);
 
   // fastsim rechits
   //edm::Handle<SiTrackerGSRecHit2DCollection> theGSRecHits;

SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h

@@ -30,6 +30,11 @@
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+
 class TTree;
 class TFile;
 class RectangularPixelTopology;
@@ -68,6 +73,8 @@ class StdHitNtuplizer : public edm::EDAnalyzer {
   void fillPRecHit(const int subid, trackingRecHit_iterator pixeliter, const GeomDet* PixGeom);
 
 private:
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geom_esToken;
+  edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topo_esToken;
   edm::ParameterSet conf_;
   TrackerHitAssociator::Config trackerHitAssociatorConfig_;
   edm::InputTag src_;