Skip to content

Commit f70dfb5

Browse files
gsokmengsokmen
committed
Updating pT calculation
1 parent 75a461b commit f70dfb5

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

‎RecoHGCal/TICL/plugins/SuperclusteringSampleDumper.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ void SuperclusteringSampleDumper::analyze(const edm::Event& evt, const edm::Even
151151
std::iota(trackstersIndicesPt.begin(), trackstersIndicesPt.end(), 0);
152152
std::stable_sort(
153153
trackstersIndicesPt.begin(), trackstersIndicesPt.end(), [&inputTracksters](unsigned int i1, unsigned int i2) {
154-
return (*inputTracksters)[i1].raw_energy() * std::sin((*inputTracksters)[i1].barycenter().Theta()) >
155-
(*inputTracksters)[i2].raw_energy() * std::sin((*inputTracksters)[i2].barycenter().Theta());
154+
return (*inputTracksters)[i1].raw_pt() > (*inputTracksters)[i2].raw_pt();
156155
});
157156

158157
// Order of loops are reversed compared to SuperclusteringProducer (here outer is seed, inner is candidate), for performance reasons.
@@ -163,7 +162,7 @@ void SuperclusteringSampleDumper::analyze(const edm::Event& evt, const edm::Even
163162
trackstersIndicesPt[ts_seed_idx_pt]; // Index of seed trackster in input collection (not in pT sorted collection)
164163
Trackster const& ts_seed = (*inputTracksters)[ts_seed_idx_input];
165164

166-
if (ts_seed.raw_energy() * std::sin(ts_seed.barycenter().Theta()) < seedPtThreshold_)
165+
if (ts_seed.raw_pt() < seedPtThreshold_)
167166
break; // All further seeds will have lower pT than threshold (due to pT sorting)
168167

169168
if (!checkExplainedVarianceRatioCut(ts_seed))

‎RecoHGCal/TICL/plugins/TracksterLinkingbySuperClusteringDNN.cc‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ void TracksterLinkingbySuperClusteringDNN::linkTracksters(
119119
std::iota(trackstersIndicesPt.begin(), trackstersIndicesPt.end(), 0);
120120
std::stable_sort(
121121
trackstersIndicesPt.begin(), trackstersIndicesPt.end(), [&inputTracksters](unsigned int i1, unsigned int i2) {
122-
return inputTracksters[i1].raw_energy() * std::sin(inputTracksters[i1].barycenter().Theta()) >
123-
inputTracksters[i2].raw_energy() * std::sin(inputTracksters[i2].barycenter().Theta());
122+
return inputTracksters[i1].raw_pt() > inputTracksters[i2].raw_pt();
124123
});
125124

126125
/* Evaluate in minibatches since running with trackster count = 3000 leads to a short-lived ~15GB memory allocation
@@ -169,7 +168,7 @@ void TracksterLinkingbySuperClusteringDNN::linkTracksters(
169168

170169
Trackster const& ts_seed = inputTracksters[trackstersIndicesPt[ts_seed_idx_pt]];
171170

172-
if (ts_seed.raw_energy() * std::sin(ts_seed.barycenter().Theta()) < seedPtThreshold_)
171+
if (ts_seed.raw_pt() < seedPtThreshold_)
173172
break; // All further seeds will have lower pT than threshold (due to pT sorting)
174173

175174
if (!checkExplainedVarianceRatioCut(ts_seed) || !trackstersPassesPIDCut(ts_seed))
@@ -324,9 +323,7 @@ void TracksterLinkingbySuperClusteringDNN::linkTracksters(
324323

325324
// Create singleton superclusters for unused tracksters with enough pt
326325
for (unsigned int ts_id = 0; ts_id < tracksterCount; ts_id++) {
327-
if (!tracksterMask[ts_id] &&
328-
inputTracksters[ts_id].raw_energy() * std::sin(inputTracksters[ts_id].barycenter().Theta()) >=
329-
seedPtThreshold_) {
326+
if (!tracksterMask[ts_id] && inputTracksters[ts_id].raw_pt() >= seedPtThreshold_) {
330327
outputSuperclusters.emplace_back(std::initializer_list<unsigned int>{ts_id});
331328
resultTracksters.emplace_back(inputTracksters[ts_id]);
332329
linkedTracksterIdToInputTracksterId.emplace_back(std::initializer_list<unsigned int>{ts_id});

‎RecoHGCal/TICL/src/SuperclusteringDNNInputs.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ namespace ticl {
3232
ts_toCluster.barycenter().Phi() - ts_base.barycenter().phi(), //DeltaPhiBaryc
3333
ts_toCluster.raw_energy(), //multi_en
3434
ts_toCluster.barycenter().Eta(), //multi_eta
35-
(ts_toCluster.raw_energy() * std::sin(ts_toCluster.barycenter().Theta())), //multi_pt
35+
ts_toCluster.raw_pt(), //multi_pt
3636
ts_base.barycenter().Eta(), //seedEta
3737
ts_base.barycenter().Phi(), //seedPhi
3838
ts_base.raw_energy(), //seedEn
39-
(ts_base.raw_energy() * std::sin(ts_base.barycenter().Theta())), //seedPt
39+
ts_base.raw_pt(), //seedPt
4040
}};
4141
}
4242

@@ -91,11 +91,11 @@ namespace ticl {
9191
ts_toCluster.barycenter().Phi() - ts_base.barycenter().phi(), //DeltaPhiBaryc
9292
ts_toCluster.raw_energy(), //multi_en
9393
ts_toCluster.barycenter().Eta(), //multi_eta
94-
(ts_toCluster.raw_energy() * std::sin(ts_toCluster.barycenter().Theta())), //multi_pt
94+
ts_toCluster.raw_pt(), //multi_pt
9595
ts_base.barycenter().Eta(), //seedEta
9696
ts_base.barycenter().Phi(), //seedPhi
9797
ts_base.raw_energy(), //seedEn
98-
(ts_base.raw_energy() * std::sin(ts_base.barycenter().Theta())), //seedPt
98+
ts_base.raw_pt(), //seedPt
9999
static_cast<float>(Angle(pca_cand_cmsFrame, pca_seed_cmsFrame)), // theta : angle between seed and candidate
100100
Angle2D(XYVectorF(pca_cand_seedFrame.x(), pca_cand_seedFrame.z()), XYVectorF(0, 1)), // theta_xz_seedFrame
101101
Angle2D(XYVectorF(pca_cand_seedFrame.y(), pca_cand_seedFrame.z()), XYVectorF(0, 1)), // theta_yz_seedFrame
@@ -140,11 +140,11 @@ namespace ticl {
140140
ts_toCluster.barycenter().Phi() - ts_base.barycenter().phi(), // DeltaPhiBaryc
141141
ts_toCluster.raw_energy(), // multi_en
142142
ts_toCluster.barycenter().Eta(), // multi_eta
143-
ts_toCluster.raw_energy() * std::sin(ts_toCluster.barycenter().Theta()), // multi_pt
143+
ts_toCluster.raw_pt(), // multi_pt
144144
ts_base.barycenter().Eta(), // seedEta
145145
ts_base.barycenter().Phi(), // seedPhi
146146
ts_base.raw_energy(), // seedEn
147-
ts_base.raw_energy() * std::sin(ts_base.barycenter().Theta()), // seedPt
147+
ts_base.raw_pt(), // seedPt
148148
static_cast<float>(Angle(pca_cand_cmsFrame, pca_seed_cmsFrame)), // theta
149149
Angle2D(XYVectorF(pca_cand_seedFrame.x(), pca_cand_seedFrame.z()), // theta_xz_seedFrame
150150
XYVectorF(0, 1)),

0 commit comments

Comments
 (0)