Skip to content

Commit 1f94a27

Browse files
author
ccaillol
committed
debug and code format
1 parent c0251f3 commit 1f94a27

File tree

7 files changed

+1282
-1357
lines changed

7 files changed

+1282
-1357
lines changed

‎L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker.cc‎

Lines changed: 1252 additions & 1260 deletions
Large diffs are not rendered by default.

‎L1Trigger/VertexFinder/interface/InputData.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@ namespace l1tVertexFinder {
3333
const AnalysisSettings& settings,
3434
const edm::EDGetTokenT<edm::HepMCProduct> hepMCToken,
3535
const edm::EDGetTokenT<edm::View<reco::GenParticle>> genParticlesToken,
36-
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeometryToken_,
37-
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> trackerTopologyToken_,
38-
const edm::EDGetTokenT<TrackingParticleCollection> tpToken,
39-
const edm::EDGetTokenT<DetSetVec> stubToken,
40-
const edm::EDGetTokenT<TTStubAssMap> stubTruthToken,
41-
const edm::EDGetTokenT<TTClusterAssMap> clusterTruthToken);
36+
const edm::EDGetTokenT<edm::View<TrackingParticle>> tpToken,
37+
const edm::EDGetTokenT<edm::ValueMap<l1tVertexFinder::TP>> tpValueMapToken,
38+
const edm::EDGetTokenT<DetSetVec> stubToken);
4239
~InputData();
4340

4441
// Sort Tracking Particles by vertex z position

‎L1Trigger/VertexFinder/interface/VertexFinder.h‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ namespace l1tVertexFinder {
4040

4141
/// Accessors
4242

43-
/// Storage for tracks out of the L1 Track finder
44-
const FitTrackCollection& FitTracks() const { return fitTracks_; }
4543
/// Number of iterations
4644
unsigned int IterationsPerTrack() const { return double(iterations_) / double(fitTracks_.size()); }
4745
/// Storage for tracks out of the L1 Track finder
@@ -61,17 +59,17 @@ namespace l1tVertexFinder {
6159
}
6260
/// Reconstructed Primary Vertex Id
6361
unsigned int primaryVertexId() const { return pv_index_; }
62+
/// Returns the z positions of the reconstructed primary vertices
63+
const std::vector<RecoVertex<>>& vertices() const { return vertices_; }
6464
/// Storage for tracks out of the L1 Track finder
6565
const FitTrackCollection& fitTracks() const { return fitTracks_; }
66-
/// Storage for tracks out of the L1 Track finder
67-
unsigned int numInputTracks() const { return fitTracks_.size(); }
6866

6967
/// Find the primary vertex
7068
void findPrimaryVertex();
7169
/// Associate the primary vertex with the real one
7270
void associatePrimaryVertex(double trueZ0);
7371
/// Gap Clustering Algorithm
74-
void gapClustering();
72+
void GapClustering();
7573
/// Find maximum distance in two clusters of tracks
7674
float maxDistance(RecoVertex<> cluster0, RecoVertex<> cluster1);
7775
/// Find minimum distance in two clusters of tracks
@@ -82,17 +80,9 @@ namespace l1tVertexFinder {
8280
float centralDistance(RecoVertex<> cluster0, RecoVertex<> cluster1);
8381
/// Simple Merge Algorithm
8482
void agglomerativeHierarchicalClustering();
85-
/// DBSCAN algorithm
86-
void DBSCAN();
87-
/// Principal Vertex Reconstructor algorithm
88-
void PVR();
8983
/// Adaptive Vertex Reconstruction algorithm
9084
void adaptiveVertexReconstruction();
9185
/// High pT Vertex Algorithm
92-
void HPV();
93-
/// Kmeans Algorithm
94-
void Kmeans();
95-
/// TDR histogramming algorithmn
9686
void fastHistoLooseAssociation();
9787
/// Histogramming algorithm
9888
void fastHisto(const TrackerTopology* tTopo);
@@ -139,8 +129,6 @@ namespace l1tVertexFinder {
139129
void FastHistoLooseAssociation();
140130
/// Histogramming algorithm
141131
void FastHisto(const TrackerTopology* tTopo);
142-
/// Gap Clustering Algorithm
143-
void GapClustering();
144132
/// High pT Vertex Algorithm
145133
void HPV();
146134
/// Kmeans Algorithm

‎L1Trigger/VertexFinder/plugins/VertexNTupler.cc‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ namespace l1tVertexFinder {
161161
const edm::EDGetTokenT<std::vector<PileupSummaryInfo>> pileupSummaryToken_;
162162
const edm::EDGetTokenT<edm::View<reco::GenParticle>> genParticlesToken_;
163163
const edm::EDGetTokenT<std::vector<reco::GenJet>> genJetsToken_;
164-
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeometryToken_;
165-
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> trackerTopologyToken_;
164+
const edm::EDGetTokenT<std::vector<l1tVertexFinder::TP>> allMatchedTPsToken_;
165+
const edm::EDGetTokenT<edm::ValueMap<l1tVertexFinder::TP>> vTPsToken_;
166166
std::map<std::string, edm::EDGetTokenT<TTTrackCollectionView>> l1TracksTokenMap_;
167167
std::map<std::string, edm::EDGetTokenT<TTTrackAssociationMap<Ref_Phase2TrackerDigi_>>> l1TracksMapTokenMap_;
168168
std::map<std::string, edm::EDGetTokenT<std::vector<l1t::Vertex>>> l1VerticesTokenMap_;
@@ -208,8 +208,10 @@ namespace l1tVertexFinder {
208208
genParticlesToken_(
209209
consumes<edm::View<reco::GenParticle>>(iConfig.getParameter<edm::InputTag>("genParticleInputTag"))),
210210
genJetsToken_(consumes<std::vector<reco::GenJet>>(iConfig.getParameter<edm::InputTag>("genJetsInputTag"))),
211-
trackerGeometryToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>(edm::ESInputTag("", ""))),
212-
trackerTopologyToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("", ""))),
211+
allMatchedTPsToken_(
212+
consumes<std::vector<l1tVertexFinder::TP>>(iConfig.getParameter<edm::InputTag>("l1TracksTPInputTags"))),
213+
vTPsToken_(consumes<edm::ValueMap<l1tVertexFinder::TP>>(
214+
iConfig.getParameter<edm::InputTag>("l1TracksTPValueMapInputTags"))),
213215
outputTree_(fs_->make<TTree>("l1VertexReco", "L1 vertex-related info")),
214216
printResults_(iConfig.getParameter<bool>("printResults")),
215217
settings_(iConfig) {
@@ -386,23 +388,13 @@ namespace l1tVertexFinder {
386388

387389
void VertexNTupler::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
388390
// Note useful info about MC truth particles and about reconstructed stubs
389-
InputData inputData(iEvent,
390-
iSetup,
391-
settings_,
392-
hepMCToken_,
393-
genParticlesToken_,
394-
trackerGeometryToken_,
395-
trackerTopologyToken_,
396-
tpToken_,
397-
stubToken_,
398-
stubTruthToken_,
399-
clusterTruthToken_);
400-
401-
// Fill the handles which change only once per event
402-
edm::Handle<TTStubAssMap> mcTruthTTStubHandle;
403-
edm::Handle<TTClusterAssMap> mcTruthTTClusterHandle;
404-
iEvent.getByToken(stubTruthToken_, mcTruthTTStubHandle);
405-
iEvent.getByToken(clusterTruthToken_, mcTruthTTClusterHandle);
391+
edm::Handle<l1tVertexFinder::InputData> inputDataHandle;
392+
iEvent.getByToken(inputDataToken_, inputDataHandle);
393+
InputData inputData = *inputDataHandle;
394+
395+
edm::Handle<edm::ValueMap<TP>> tpValueMapHandle;
396+
iEvent.getByToken(vTPsToken_, tpValueMapHandle);
397+
edm::ValueMap<TP> tpValueMap = *tpValueMapHandle;
406398

407399
// Create collections to hold the desired objects
408400
std::map<std::string, std::vector<L1TrackTruthMatched>> l1TrackCollections;

‎L1Trigger/VertexFinder/plugins/VertexProducer.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void VertexProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::Event
8787
vf.fastHistoLooseAssociation();
8888
break;
8989
case Algorithm::GapClustering:
90-
vf.gapClustering();
90+
vf.GapClustering();
9191
break;
9292
case Algorithm::AgglomerativeHierarchical:
9393
vf.agglomerativeHierarchicalClustering();
@@ -115,7 +115,7 @@ void VertexProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::Event
115115
// //=== Store output EDM track and hardware stub collections.
116116
std::unique_ptr<l1t::VertexCollection> lProduct(new std::vector<l1t::Vertex>());
117117

118-
for (const auto& vtx : vf.Vertices()) {
118+
for (const auto& vtx : vf.vertices()) {
119119
std::vector<edm::Ptr<l1t::Vertex::Track_t>> lVtxTracks;
120120
lVtxTracks.reserve(vtx.tracks().size());
121121
for (const auto& t : vtx.tracks())

‎L1Trigger/VertexFinder/src/InputData.cc‎

Lines changed: 7 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "FWCore/Framework/interface/Event.h"
44
#include "FWCore/Framework/interface/EventSetup.h"
55
#include "FWCore/Utilities/interface/InputTag.h"
6+
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
7+
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
68
#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
79
#include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
810
#include "SimDataFormats/Track/interface/SimTrack.h"
@@ -24,60 +26,17 @@ namespace l1tVertexFinder {
2426
const AnalysisSettings& settings,
2527
const edm::EDGetTokenT<edm::HepMCProduct> hepMCToken,
2628
const edm::EDGetTokenT<edm::View<reco::GenParticle>> genParticlesToken,
27-
edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeometryToken_,
28-
edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> trackerTopologyToken_,
29-
const edm::EDGetTokenT<TrackingParticleCollection> tpToken,
30-
const edm::EDGetTokenT<DetSetVec> stubToken,
31-
const edm::EDGetTokenT<TTStubAssMap> stubTruthToken,
32-
const edm::EDGetTokenT<TTClusterAssMap> clusterTruthToken) {
33-
vTPs_.reserve(2500);
34-
vAllStubs_.reserve(35000);
35-
36-
// Get TrackingParticle info
37-
edm::Handle<TrackingParticleCollection> tpHandle;
38-
iEvent.getByToken(tpToken, tpHandle);
39-
40-
genPt_ = 0.;
41-
genPt_PU_ = 0.;
42-
43-
for (unsigned int i = 0; i < tpHandle->size(); i++) {
44-
TrackingParticlePtr tpPtr(tpHandle, i);
45-
// Store the TrackingParticle info, using class TP to provide easy access to the most useful info.
46-
TP tp(&tpHandle->at(i), settings);
47-
48-
if (tp.physicsCollision()) {
49-
genPt_ += tp->pt();
50-
} else {
51-
genPt_PU_ += tp->pt();
52-
}
53-
54-
// Only bother storing tp if it could be useful for tracking efficiency or fake rate measurements.
55-
// Also create map relating edm::Ptr<TrackingParticle> to TP.
56-
if (tp.use()) {
57-
vTPs_.push_back(tp);
58-
translateTP_[tpPtr] = &vTPs_.back();
59-
}
60-
}
61-
62-
if (settings.debug() > 0) {
63-
edm::LogInfo("InputData") << "InputData::genPt in the event " << genPt_;
64-
}
65-
29+
const edm::EDGetTokenT<edm::View<TrackingParticle>> tpToken,
30+
const edm::EDGetTokenT<edm::ValueMap<l1tVertexFinder::TP>> tpValueMapToken,
31+
const edm::EDGetTokenT<DetSetVec> stubToken) {
6632
// Get the tracker geometry info needed to unpack the stub info.
67-
/*edm::ESHandle<TrackerGeometry> trackerGeometryHandle;
33+
edm::ESHandle<TrackerGeometry> trackerGeometryHandle;
6834
iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeometryHandle);
6935
const TrackerGeometry* trackerGeometry = trackerGeometryHandle.product();
7036

7137
edm::ESHandle<TrackerTopology> trackerTopologyHandle;
7238
iSetup.get<TrackerTopologyRcd>().get(trackerTopologyHandle);
73-
const TrackerTopology* trackerTopology = trackerTopologyHandle.product();*/
74-
// trackerGeometryToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>(edm::ESInputTag("",""))),
75-
// trackerTopologyToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("",""))),
76-
77-
const auto& trackerGeometry_ = iSetup.getData(trackerGeometryToken_);
78-
const auto& trackerTopology_ = iSetup.getData(trackerTopologyToken_);
79-
const TrackerGeometry* trackerGeometry = &trackerGeometry_;
80-
const TrackerTopology* trackerTopology = &trackerTopology_;
39+
const TrackerTopology* trackerTopology = trackerTopologyHandle.product();
8140

8241
// Get stub info, by looping over modules and then stubs inside each module.
8342
// Also get the association map from stubs to tracking particles.

‎L1Trigger/VertexFinder/src/VertexFinder.cc‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,8 @@ namespace l1tVertexFinder {
115115
}
116116

117117
float VertexFinder::centralDistance(RecoVertex<> cluster0, RecoVertex<> cluster1) {
118-
cluster0.computeParameters(
119-
settings_->vx_weightedmean(), settings_->vx_TrackMaxPt(), settings_->vx_TrackMaxPtBehavior());
120-
cluster1.computeParameters(
121-
settings_->vx_weightedmean(), settings_->vx_TrackMaxPt(), settings_->vx_TrackMaxPtBehavior());
122-
118+
computeAndSetVertexParameters(cluster0, {}, {});
119+
computeAndSetVertexParameters(cluster1, {}, {});
123120
float distance = std::abs(cluster0.z0() - cluster1.z0());
124121
return distance;
125122
}

0 commit comments

Comments
 (0)