diff --git a/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc b/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc index 2c6b0ce9bfa7f..b3a7d0641504e 100644 --- a/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc +++ b/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc @@ -75,6 +75,9 @@ class ModuleInfo_Phase2 : public edm::EDAnalyzer { private: // ----------member data --------------------------- + edm::ESGetToken geom_esToken; + edm::ESGetToken geomDet_esToken; + edm::ESGetToken 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 tTopoHandle; - iSetup.get().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 rDD; + const GeometricDet* rDD = &iSetup.getData(geomDet_esToken); - iSetup.get().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 pDD; - iSetup.get().get(pDD); + const TrackerGeometry* pDD = &iSetup.getData(geom_esToken); // // counters diff --git a/SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc b/SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc index 1daf3e791ba3f..599d343ce5a0f 100644 --- a/SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc +++ b/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 geom_esToken; + edm::ESGetToken topo_esToken; + edm::ESGetToken ttkb_esToken; + edm::ESGetToken tthb_esToken; + TrackerHitAssociator::Config trackerHitAssociatorConfig_; edm::EDGetTokenT> pixelRecHits_token_; - std::string ttrhBuilder_; edm::EDGetTokenT> recoTracks_token_; edm::EDGetTokenT 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("ttrhBuilder")))), + trackerHitAssociatorConfig_(conf, consumesCollector()), pixelRecHits_token_(consumes>(edm::InputTag("siPixelRecHits"))), - ttrhBuilder_(conf.getParameter("ttrhBuilder")), //ttrhBuilder_token def recoTracks_token_(consumes>(conf.getParameter("trackProducer"))), tta_token_(consumes(conf.getParameter("trajectoryInput"))), verbose_(conf.getUntrackedParameter("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 tTopoHandle; - es.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); + const TrackerTopology* const tTopo = &es.getData(topo_esToken); // geometry setup - edm::ESHandle geometry; - - es.get().get(geometry); - const TrackerGeometry* theGeometry = &(*geometry); + const TrackerGeometry* theGeometry = &es.getData(geom_esToken); std::vector 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 theB; - es.get().get("TransientTrackBuilder", theB); - - //ttrh builder def - ESHandle hitBuilder; - es.get().get(ttrhBuilder_, hitBuilder); const TkTransientTrackingRecHitBuilder* builder = - static_cast(hitBuilder.product()); + static_cast(&es.getData(tthb_esToken)); auto hitCloner = builder->cloner(); if ((recHitColl.product())->dataSize() > 0) { diff --git a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc index e3c1b84cd4002..c0cfd4e98e345 100644 --- a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc +++ b/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("src")), rphiRecHits_(conf.getParameter("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 tTopoHandle; - es.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); + const TrackerTopology* const tTopo = &es.getData(topo_esToken); // geometry setup - edm::ESHandle geometry; - - es.get().get(geometry); - const TrackerGeometry* theGeometry = &(*geometry); + const TrackerGeometry* theGeometry = &es.getData(geom_esToken); // fastsim rechits //edm::Handle theGSRecHits; diff --git a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h index 044ebc9d88954..1eaa48e8bbd85 100644 --- a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h +++ b/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 geom_esToken; + edm::ESGetToken topo_esToken; edm::ParameterSet conf_; TrackerHitAssociator::Config trackerHitAssociatorConfig_; edm::InputTag src_;