Skip to content

Commit a201815

Browse files
author
ccaillol
committed
change ESHandle
1 parent 8a58412 commit a201815

File tree

6 files changed

+48
-53
lines changed

6 files changed

+48
-53
lines changed

‎L1Trigger/L1TTrackMatch/plugins/L1TkFastVertexProducer.cc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ L1TkFastVertexProducer::L1TkFastVertexProducer(const edm::ParameterSet& iConfig)
109109
consumes<std::vector<reco::GenParticle> >(iConfig.getParameter<edm::InputTag>("GenParticleInputTag"))),
110110
trackToken_(consumes<std::vector<TTTrack<Ref_Phase2TrackerDigi_> > >(
111111
iConfig.getParameter<edm::InputTag>("L1TrackInputTag"))),
112-
topoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>()) {
112+
topoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("", ""))) {
113113
zMax_ = (float)iConfig.getParameter<double>("ZMAX");
114114
chi2Max_ = (float)iConfig.getParameter<double>("CHI2MAX");
115115
pTMinTra_ = (float)iConfig.getParameter<double>("PTMINTRA");
@@ -147,8 +147,7 @@ void L1TkFastVertexProducer::produce(edm::StreamID, edm::Event& iEvent, const ed
147147
auto result = std::make_unique<TkPrimaryVertexCollection>();
148148

149149
// Tracker Topology
150-
edm::ESHandle<TrackerTopology> tTopoHandle = iSetup.getHandle(topoToken_);
151-
const TrackerTopology* tTopo = tTopoHandle.product();
150+
const TrackerTopology& tTopo = iSetup.getData(topoToken_);
152151

153152
TH1F htmp("htmp", ";z (cm); Tracks", nBinning_, xmin_, xmax_);
154153
TH1F htmp_weight("htmp_weight", ";z (cm); Tracks", nBinning_, xmin_, xmax_);
@@ -271,9 +270,9 @@ void L1TkFastVertexProducer::produce(edm::StreamID, edm::Event& iEvent, const ed
271270
bool isPS = false;
272271
DetId detId(stub->getDetId());
273272
if (detId.det() == DetId::Detector::Tracker) {
274-
if (detId.subdetId() == StripSubdetector::TOB && tTopo->tobLayer(detId) <= 3)
273+
if (detId.subdetId() == StripSubdetector::TOB && tTopo.tobLayer(detId) <= 3)
275274
isPS = true;
276-
else if (detId.subdetId() == StripSubdetector::TID && tTopo->tidRing(detId) <= 9)
275+
else if (detId.subdetId() == StripSubdetector::TID && tTopo.tidRing(detId) <= 9)
277276
isPS = true;
278277
}
279278
if (isPS)

‎L1Trigger/L1TTrackMatch/plugins/L1TrackFastJetProducer.cc‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,15 @@ class L1TrackFastJetProducer : public edm::EDProducer {
7878

7979
const edm::EDGetTokenT<std::vector<TTTrack<Ref_Phase2TrackerDigi_> > > trackToken_;
8080
edm::EDGetTokenT<TkPrimaryVertexCollection> pvToken_;
81+
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
8182
};
8283

8384
// constructor
8485
L1TrackFastJetProducer::L1TrackFastJetProducer(const edm::ParameterSet& iConfig)
8586
: trackToken_(consumes<std::vector<TTTrack<Ref_Phase2TrackerDigi_> > >(
8687
iConfig.getParameter<edm::InputTag>("L1TrackInputTag"))),
87-
pvToken_(consumes<TkPrimaryVertexCollection>(iConfig.getParameter<edm::InputTag>("L1PrimaryVertexTag"))) {
88+
pvToken_(consumes<TkPrimaryVertexCollection>(iConfig.getParameter<edm::InputTag>("L1PrimaryVertexTag"))),
89+
tTopoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("", ""))) {
8890
trkZMax_ = (float)iConfig.getParameter<double>("trk_zMax");
8991
trkChi2dofMax_ = (float)iConfig.getParameter<double>("trk_chi2dofMax");
9092
trkBendChi2Max_ = iConfig.getParameter<double>("trk_bendChi2Max");
@@ -115,11 +117,7 @@ void L1TrackFastJetProducer::produce(edm::Event& iEvent, const edm::EventSetup&
115117
std::vector<TTTrack<Ref_Phase2TrackerDigi_> >::const_iterator iterL1Track;
116118

117119
// Tracker Topology
118-
edm::ESHandle<TrackerTopology> tTopoHandle_;
119-
iSetup.get<TrackerTopologyRcd>().get(tTopoHandle_);
120-
const TrackerTopology* tTopo = tTopoHandle_.product();
121-
ESHandle<TrackerGeometry> tGeomHandle;
122-
iSetup.get<TrackerDigiGeometryRecord>().get(tGeomHandle);
120+
const TrackerTopology& tTopo = iSetup.getData(tTopoToken_);
123121

124122
edm::Handle<TkPrimaryVertexCollection> TkPrimaryVertexHandle;
125123
iEvent.getByToken(pvToken_, TkPrimaryVertexHandle);
@@ -159,9 +157,9 @@ void L1TrackFastJetProducer::produce(edm::Event& iEvent, const edm::EventSetup&
159157
DetId detId(theStubs.at(istub)->getDetId());
160158
bool tmp_isPS = false;
161159
if (detId.det() == DetId::Detector::Tracker) {
162-
if (detId.subdetId() == StripSubdetector::TOB && tTopo->tobLayer(detId) <= 3)
160+
if (detId.subdetId() == StripSubdetector::TOB && tTopo.tobLayer(detId) <= 3)
163161
tmp_isPS = true;
164-
else if (detId.subdetId() == StripSubdetector::TID && tTopo->tidRing(detId) <= 9)
162+
else if (detId.subdetId() == StripSubdetector::TID && tTopo.tidRing(detId) <= 9)
165163
tmp_isPS = true;
166164
}
167165
if (tmp_isPS)

‎L1Trigger/L1TTrackMatch/plugins/L1TrackJetProducer.cc‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ class L1TrackJetProducer : public stream::EDProducer<> {
6262
// ----------member data ---------------------------
6363

6464
const EDGetTokenT<vector<TTTrack<Ref_Phase2TrackerDigi_> > > trackToken_;
65+
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
66+
6567
vector<Ptr<L1TTTrackType> > L1TrkPtrs_;
6668
vector<int> zBinCount_;
6769
vector<int> ttrk_;
@@ -100,7 +102,8 @@ class L1TrackJetProducer : public stream::EDProducer<> {
100102

101103
L1TrackJetProducer::L1TrackJetProducer(const ParameterSet &iConfig)
102104
: trackToken_(
103-
consumes<vector<TTTrack<Ref_Phase2TrackerDigi_> > >(iConfig.getParameter<InputTag>("L1TrackInputTag"))) {
105+
consumes<vector<TTTrack<Ref_Phase2TrackerDigi_> > >(iConfig.getParameter<InputTag>("L1TrackInputTag"))),
106+
tTopoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("", ""))) {
104107
trkZMax_ = (float)iConfig.getParameter<double>("trk_zMax");
105108
trkPtMax_ = (float)iConfig.getParameter<double>("trk_ptMax");
106109
trkPtMin_ = (float)iConfig.getParameter<double>("trk_ptMin");
@@ -144,11 +147,7 @@ void L1TrackJetProducer::produce(Event &iEvent, const EventSetup &iSetup) {
144147
unique_ptr<TkJetCollection> L1L1TrackJetProducer(new TkJetCollection);
145148

146149
// For TTStubs
147-
ESHandle<TrackerTopology> tTopoHandle;
148-
iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
149-
ESHandle<TrackerGeometry> tGeomHandle;
150-
iSetup.get<TrackerDigiGeometryRecord>().get(tGeomHandle);
151-
const TrackerTopology *const tTopo = tTopoHandle.product();
150+
const TrackerTopology &tTopo = iSetup.getData(tTopoToken_);
152151

153152
edm::Handle<vector<TTTrack<Ref_Phase2TrackerDigi_> > > TTTrackHandle;
154153
iEvent.getByToken(trackToken_, TTTrackHandle);
@@ -174,8 +173,8 @@ void L1TrackJetProducer::produce(Event &iEvent, const EventSetup &iSetup) {
174173
for (int istub = 0; istub < trk_nstubs; istub++) { // loop over the stubs
175174
DetId detId(trkPtr->getStubRefs().at(istub)->getDetId());
176175
if (detId.det() == DetId::Detector::Tracker) {
177-
if ((detId.subdetId() == StripSubdetector::TOB && tTopo->tobLayer(detId) <= 3) ||
178-
(detId.subdetId() == StripSubdetector::TID && tTopo->tidRing(detId) <= 9))
176+
if ((detId.subdetId() == StripSubdetector::TOB && tTopo.tobLayer(detId) <= 3) ||
177+
(detId.subdetId() == StripSubdetector::TID && tTopo.tidRing(detId) <= 9))
179178
trk_nPS++;
180179
}
181180
}

‎L1Trigger/L1TTrackMatch/plugins/L1TrackerEtMissProducer.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,15 @@ class L1TrackerEtMissProducer : public edm::EDProducer {
5555

5656
const edm::EDGetTokenT<TkPrimaryVertexCollection> pvToken_;
5757
const edm::EDGetTokenT<std::vector<TTTrack<Ref_Phase2TrackerDigi_> > > trackToken_;
58+
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
5859
};
5960

6061
//constructor//
6162
L1TrackerEtMissProducer::L1TrackerEtMissProducer(const edm::ParameterSet& iConfig)
6263
: pvToken_(consumes<TkPrimaryVertexCollection>(iConfig.getParameter<edm::InputTag>("L1VertexInputTag"))),
6364
trackToken_(consumes<std::vector<TTTrack<Ref_Phase2TrackerDigi_> > >(
64-
iConfig.getParameter<edm::InputTag>("L1TrackInputTag"))) {
65+
iConfig.getParameter<edm::InputTag>("L1TrackInputTag"))),
66+
tTopoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("", ""))) {
6567
maxZ0_ = (float)iConfig.getParameter<double>("maxZ0");
6668
deltaZ_ = (float)iConfig.getParameter<double>("deltaZ");
6769
chi2dofMax_ = (float)iConfig.getParameter<double>("chi2dofMax");
@@ -88,9 +90,7 @@ void L1TrackerEtMissProducer::produce(edm::Event& iEvent, const edm::EventSetup&
8890
std::unique_ptr<TkEtMissCollection> METCollection(new TkEtMissCollection);
8991

9092
// Tracker Topology
91-
edm::ESHandle<TrackerTopology> tTopoHandle_;
92-
iSetup.get<TrackerTopologyRcd>().get(tTopoHandle_);
93-
const TrackerTopology* tTopo = tTopoHandle_.product();
93+
const TrackerTopology& tTopo = iSetup.getData(tTopoToken_);
9494

9595
edm::Handle<TkPrimaryVertexCollection> L1VertexHandle;
9696
iEvent.getByToken(pvToken_, L1VertexHandle);
@@ -151,8 +151,8 @@ void L1TrackerEtMissProducer::produce(edm::Event& iEvent, const edm::EventSetup&
151151
for (unsigned int istub = 0; istub < (unsigned int)theStubs.size(); istub++) {
152152
DetId detId(theStubs.at(istub)->getDetId());
153153
if (detId.det() == DetId::Detector::Tracker) {
154-
if ((detId.subdetId() == StripSubdetector::TOB && tTopo->tobLayer(detId) <= 3) ||
155-
(detId.subdetId() == StripSubdetector::TID && tTopo->tidRing(detId) <= 9))
154+
if ((detId.subdetId() == StripSubdetector::TOB && tTopo.tobLayer(detId) <= 3) ||
155+
(detId.subdetId() == StripSubdetector::TID && tTopo.tidRing(detId) <= 9))
156156
nPS++;
157157
}
158158
}

‎L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker.cc‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@ class L1TrackObjectNtupleMaker : public edm::EDAnalyzer {
176176
edm::EDGetTokenT<l1t::TkJetCollection> TrackJetsToken_;
177177
edm::EDGetTokenT<l1t::TkJetCollection> TrackJetsExtendedToken_;
178178

179+
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
180+
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tGeomToken_;
181+
179182
//-----------------------------------------------------------------------------------------------
180183
// tree & branches for mini-ntuple
181184

@@ -464,6 +467,8 @@ L1TrackObjectNtupleMaker::L1TrackObjectNtupleMaker(edm::ParameterSet const& iCon
464467
GenJetToken_ = consumes<std::vector<reco::GenJet> >(GenJetInputTag);
465468
GenParticleToken_ = consumes<std::vector<reco::GenParticle> >(GenParticleInputTag);
466469
L1VertexToken_ = consumes<l1t::VertexCollection>(RecoVertexInputTag);
470+
tTopoToken_ = esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("", ""));
471+
tGeomToken_ = esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>(edm::ESInputTag("", ""));
467472
}
468473

469474
/////////////
@@ -1144,17 +1149,8 @@ void L1TrackObjectNtupleMaker::analyze(const edm::Event& iEvent, const edm::Even
11441149

11451150
// -----------------------------------------------------------------------------------------------
11461151
// more for TTStubs
1147-
edm::ESHandle<TrackerGeometry> geometryHandle;
1148-
iSetup.get<TrackerDigiGeometryRecord>().get(geometryHandle);
1149-
1150-
edm::ESHandle<TrackerTopology> tTopoHandle;
1151-
iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
1152-
1153-
edm::ESHandle<TrackerGeometry> tGeomHandle;
1154-
iSetup.get<TrackerDigiGeometryRecord>().get(tGeomHandle);
1155-
1156-
const TrackerTopology* const tTopo = tTopoHandle.product();
1157-
const TrackerGeometry* const theTrackerGeom = tGeomHandle.product();
1152+
const TrackerTopology& tTopo = iSetup.getData(tTopoToken_);
1153+
const TrackerGeometry& tGeom = iSetup.getData(tGeomToken_);
11581154

11591155
//Gen particles
11601156
edm::Handle<std::vector<reco::GenParticle> > GenParticleHandle;
@@ -1240,20 +1236,20 @@ void L1TrackObjectNtupleMaker::analyze(const edm::Event& iEvent, const edm::Even
12401236
// loop over L1 stubs
12411237
// ----------------------------------------------------------------------------------------------
12421238
if (SaveStubs) {
1243-
for (auto gd = theTrackerGeom->dets().begin(); gd != theTrackerGeom->dets().end(); gd++) {
1239+
for (auto gd = tGeom.dets().begin(); gd != tGeom.dets().end(); gd++) {
12441240
DetId detid = (*gd)->geographicalId();
12451241
if (detid.subdetId() != StripSubdetector::TOB && detid.subdetId() != StripSubdetector::TID)
12461242
continue;
1247-
if (!tTopo->isLower(detid))
1248-
continue; // loop on the stacks: choose the lower arbitrarily
1249-
DetId stackDetid = tTopo->stack(detid); // Stub module detid
1243+
if (!tTopo.isLower(detid))
1244+
continue; // loop on the stacks: choose the lower arbitrarily
1245+
DetId stackDetid = tTopo.stack(detid); // Stub module detid
12501246

12511247
if (TTStubHandle->find(stackDetid) == TTStubHandle->end())
12521248
continue;
12531249

12541250
// Get the DetSets of the Clusters
12551251
edmNew::DetSet<TTStub<Ref_Phase2TrackerDigi_> > stubs = (*TTStubHandle)[stackDetid];
1256-
const GeomDetUnit* det0 = theTrackerGeom->idToDetUnit(detid);
1252+
const GeomDetUnit* det0 = tGeom.idToDetUnit(detid);
12571253
const auto* theGeomDet = dynamic_cast<const PixelGeomDetUnit*>(det0);
12581254
const PixelTopology* topol = dynamic_cast<const PixelTopology*>(&(theGeomDet->specificTopology()));
12591255

@@ -1266,10 +1262,10 @@ void L1TrackObjectNtupleMaker::analyze(const edm::Event& iEvent, const edm::Even
12661262
int layer = -999999;
12671263
if (detid.subdetId() == StripSubdetector::TOB) {
12681264
isBarrel = 1;
1269-
layer = static_cast<int>(tTopo->layer(detid));
1265+
layer = static_cast<int>(tTopo.layer(detid));
12701266
} else if (detid.subdetId() == StripSubdetector::TID) {
12711267
isBarrel = 0;
1272-
layer = static_cast<int>(tTopo->layer(detid));
1268+
layer = static_cast<int>(tTopo.layer(detid));
12731269
} else {
12741270
edm::LogVerbatim("Tracklet") << "WARNING -- neither TOB or TID stub, shouldn't happen...";
12751271
layer = -1;

‎L1Trigger/VertexFinder/plugins/TPStubValueMapProducer.cc‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ class TPStubValueMapProducer : public edm::global::EDProducer<> {
7777
const edm::EDGetTokenT<DetSetVec> stubToken_;
7878
const edm::EDGetTokenT<TTStubAssMap> stubTruthToken_;
7979
const edm::EDGetTokenT<TTClusterAssMap> clusterTruthToken_;
80+
81+
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
82+
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tGeomToken_;
8083
};
8184

8285
//
@@ -89,7 +92,9 @@ TPStubValueMapProducer::TPStubValueMapProducer(const edm::ParameterSet& iConfig)
8992
tpToken_(consumes<TrackingParticleCollection>(iConfig.getParameter<edm::InputTag>("tpInputTag"))),
9093
stubToken_(consumes<DetSetVec>(iConfig.getParameter<edm::InputTag>("stubInputTag"))),
9194
stubTruthToken_(consumes<TTStubAssMap>(iConfig.getParameter<edm::InputTag>("stubTruthInputTag"))),
92-
clusterTruthToken_(consumes<TTClusterAssMap>(iConfig.getParameter<edm::InputTag>("clusterTruthInputTag"))) {
95+
clusterTruthToken_(consumes<TTClusterAssMap>(iConfig.getParameter<edm::InputTag>("clusterTruthInputTag"))),
96+
tTopoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("", ""))),
97+
tGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>(edm::ESInputTag("", ""))) {
9398
// Define EDM output to be written to file (if required)
9499
produces<TrackingParticleCollection>();
95100
produces<edm::ValueMap<l1tVertexFinder::TP>>(outputCollectionNames_[0]);
@@ -147,13 +152,11 @@ void TPStubValueMapProducer::produce(edm::StreamID, edm::Event& iEvent, const ed
147152
}
148153

149154
// Get the tracker geometry info needed to unpack the stub info.
150-
edm::ESHandle<TrackerGeometry> trackerGeometryHandle;
151-
iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeometryHandle);
152-
const TrackerGeometry* trackerGeometry = trackerGeometryHandle.product();
155+
const TrackerTopology& tTopo = iSetup.getData(tTopoToken_);
156+
const TrackerGeometry& tGeom = iSetup.getData(tGeomToken_);
153157

154-
edm::ESHandle<TrackerTopology> trackerTopologyHandle;
155-
iSetup.get<TrackerTopologyRcd>().get(trackerTopologyHandle);
156-
const TrackerTopology* trackerTopology = trackerTopologyHandle.product();
158+
const TrackerTopology* tTopology = &tTopo;
159+
const TrackerGeometry* tGeometry = &tGeom;
157160

158161
//Create the vector of Stub for the TTStubRef->Stub value map
159162
unsigned int nStubs = ttStubHandle->size();
@@ -163,7 +166,7 @@ void TPStubValueMapProducer::produce(edm::StreamID, edm::Event& iEvent, const ed
163166
for (DetSet::const_iterator p_ttstub = p_module->begin(); p_ttstub != p_module->end(); p_ttstub++) {
164167
TTStubRef ttStubRef = edmNew::makeRefTo(ttStubHandle, p_ttstub);
165168
// Store the Stub info, using class Stub to provide easy access to the most useful info.
166-
l1tVertexFinder::Stub stub(ttStubRef, settings_, trackerGeometry, trackerTopology);
169+
l1tVertexFinder::Stub stub(ttStubRef, settings_, tGeometry, tTopology);
167170
// Also fill truth associating stubs to tracking particles.
168171
stub.fillTruth(mcTruthTTStubHandle, mcTruthTTClusterHandle);
169172
vAllStubs->push_back(stub);

0 commit comments

Comments
 (0)