Skip to content

Commit 4a70830

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47405 from SegmentLinking/CMSSW_15_0_0_pre3_wfsAndFuncs
Follow up on using cms::alpakatools deltaPhi functions
2 parents 3e1f127 + aa40afe commit 4a70830

File tree

4 files changed

+28
-29
lines changed

4 files changed

+28
-29
lines changed

‎RecoTracker/LSTCore/src/alpaka/Hit.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef RecoTracker_LSTCore_src_alpaka_Hit_h
22
#define RecoTracker_LSTCore_src_alpaka_Hit_h
33

4-
#include "DataFormats/Math/interface/deltaPhi.h"
54
#include "HeterogeneousCore/AlpakaInterface/interface/workdivision.h"
65
#include "HeterogeneousCore/AlpakaInterface/interface/alpakastdAlgorithm.h"
76
#include "HeterogeneousCore/AlpakaMath/interface/deltaPhi.h"

‎RecoTracker/LSTCore/src/alpaka/Kernels.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
163163
float eta2 = __H2F(quintuplets.eta()[jx]);
164164
float phi2 = __H2F(quintuplets.phi()[jx]);
165165
float dEta = alpaka::math::abs(acc, eta1 - eta2);
166-
float dPhi = reco::deltaPhi(phi1, phi2);
166+
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);
167167
float score_rphisum2 = __H2F(quintuplets.score_rphisum()[jx]);
168168

169169
if (dEta > 0.1f)
@@ -238,7 +238,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
238238
float score_rphisum2 = __H2F(quintuplets.score_rphisum()[jx]);
239239

240240
float dEta = alpaka::math::abs(acc, eta1 - eta2);
241-
float dPhi = reco::deltaPhi(phi1, phi2);
241+
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);
242242

243243
if (dEta > 0.1f)
244244
continue;
@@ -395,7 +395,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
395395
}
396396
if (secondpass) {
397397
float dEta = alpaka::math::abs(acc, eta_pix1 - eta_pix2);
398-
float dPhi = reco::deltaPhi(phi_pix1, phi_pix2);
398+
float dPhi = cms::alpakatools::deltaPhi(acc, phi_pix1, phi_pix2);
399399

400400
float dR2 = dEta * dEta + dPhi * dPhi;
401401
if ((npMatched >= 1) || (dR2 < 1e-5f)) {

‎RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef RecoTracker_LSTCore_src_alpaka_NeuralNetwork_h
22
#define RecoTracker_LSTCore_src_alpaka_NeuralNetwork_h
33

4-
#include "DataFormats/Math/interface/deltaPhi.h"
54
#include "FWCore/Utilities/interface/CMSUnrollLoop.h"
5+
#include "HeterogeneousCore/AlpakaMath/interface/deltaPhi.h"
66

77
#include "RecoTracker/LSTCore/interface/alpaka/Common.h"
88
#include "RecoTracker/LSTCore/interface/MiniDoubletsSoA.h"
@@ -85,25 +85,25 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst::t5dnn {
8585
z1 / kZ_max, // inner T3: First hit z normalized
8686
r1 / kR_max, // inner T3: First hit r normalized
8787

88-
eta2 - eta1, // inner T3: Difference in eta between hit 2 and 1
89-
reco::deltaPhi(phi2, phi1) / kPhi_norm, // inner T3: Difference in phi between hit 2 and 1
90-
(z2 - z1) / kZ_max, // inner T3: Difference in z between hit 2 and 1 normalized
91-
(r2 - r1) / kR_max, // inner T3: Difference in r between hit 2 and 1 normalized
92-
93-
eta3 - eta2, // inner T3: Difference in eta between hit 3 and 2
94-
reco::deltaPhi(phi3, phi2) / kPhi_norm, // inner T3: Difference in phi between hit 3 and 2
95-
(z3 - z2) / kZ_max, // inner T3: Difference in z between hit 3 and 2 normalized
96-
(r3 - r2) / kR_max, // inner T3: Difference in r between hit 3 and 2 normalized
97-
98-
eta4 - eta3, // outer T3: Difference in eta between hit 4 and 3
99-
reco::deltaPhi(phi4, phi3) / kPhi_norm, // inner T3: Difference in phi between hit 4 and 3
100-
(z4 - z3) / kZ_max, // outer T3: Difference in z between hit 4 and 3 normalized
101-
(r4 - r3) / kR_max, // outer T3: Difference in r between hit 4 and 3 normalized
102-
103-
eta5 - eta4, // outer T3: Difference in eta between hit 5 and 4
104-
reco::deltaPhi(phi5, phi4) / kPhi_norm, // inner T3: Difference in phi between hit 5 and 4
105-
(z5 - z4) / kZ_max, // outer T3: Difference in z between hit 5 and 4 normalized
106-
(r5 - r4) / kR_max, // outer T3: Difference in r between hit 5 and 4 normalized
88+
eta2 - eta1, // inner T3: Difference in eta between hit 2 and 1
89+
cms::alpakatools::deltaPhi(acc, phi2, phi1) / kPhi_norm, // inner T3: Difference in phi between hit 2 and 1
90+
(z2 - z1) / kZ_max, // inner T3: Difference in z between hit 2 and 1 normalized
91+
(r2 - r1) / kR_max, // inner T3: Difference in r between hit 2 and 1 normalized
92+
93+
eta3 - eta2, // inner T3: Difference in eta between hit 3 and 2
94+
cms::alpakatools::deltaPhi(acc, phi3, phi2) / kPhi_norm, // inner T3: Difference in phi between hit 3 and 2
95+
(z3 - z2) / kZ_max, // inner T3: Difference in z between hit 3 and 2 normalized
96+
(r3 - r2) / kR_max, // inner T3: Difference in r between hit 3 and 2 normalized
97+
98+
eta4 - eta3, // outer T3: Difference in eta between hit 4 and 3
99+
cms::alpakatools::deltaPhi(acc, phi4, phi3) / kPhi_norm, // inner T3: Difference in phi between hit 4 and 3
100+
(z4 - z3) / kZ_max, // outer T3: Difference in z between hit 4 and 3 normalized
101+
(r4 - r3) / kR_max, // outer T3: Difference in r between hit 4 and 3 normalized
102+
103+
eta5 - eta4, // outer T3: Difference in eta between hit 5 and 4
104+
cms::alpakatools::deltaPhi(acc, phi5, phi4) / kPhi_norm, // inner T3: Difference in phi between hit 5 and 4
105+
(z5 - z4) / kZ_max, // outer T3: Difference in z between hit 5 and 4 normalized
106+
(r5 - r4) / kR_max, // outer T3: Difference in r between hit 5 and 4 normalized
107107

108108
alpaka::math::log10(acc, innerRadius), // T5 inner radius (t5_innerRadius)
109109
alpaka::math::log10(acc, bridgeRadius), // T5 bridge radius (t5_bridgeRadius)

‎RecoTracker/LSTCore/src/alpaka/TrackCandidate.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
132132
float eta2 = pixelSegments.eta()[pLS_jx - prefix];
133133
float phi2 = pixelSegments.phi()[pLS_jx - prefix];
134134
float dEta = alpaka::math::abs(acc, (eta1 - eta2));
135-
float dPhi = reco::deltaPhi(phi1, phi2);
135+
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);
136136

137137
float dR2 = dEta * dEta + dPhi * dPhi;
138138
if (dR2 < 1e-5f)
@@ -179,7 +179,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
179179
}
180180

181181
float dEta = alpaka::math::abs(acc, eta1 - eta2);
182-
float dPhi = reco::deltaPhi(phi1, phi2);
182+
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);
183183

184184
float dR2 = dEta * dEta + dPhi * dPhi;
185185
if (dR2 < 1e-3f)
@@ -221,7 +221,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
221221
float eta2 = __H2F(quintuplets.eta()[quintupletIndex]);
222222
float phi2 = __H2F(quintuplets.phi()[quintupletIndex]);
223223
float dEta = alpaka::math::abs(acc, eta1 - eta2);
224-
float dPhi = reco::deltaPhi(phi1, phi2);
224+
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);
225225

226226
float dR2 = dEta * dEta + dPhi * dPhi;
227227
if (dR2 < 1e-3f)
@@ -237,7 +237,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
237237
float eta2 = __H2F(pixelTriplets.eta_pix()[pT3Index]);
238238
float phi2 = __H2F(pixelTriplets.phi_pix()[pT3Index]);
239239
float dEta = alpaka::math::abs(acc, eta1 - eta2);
240-
float dPhi = reco::deltaPhi(phi1, phi2);
240+
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);
241241

242242
float dR2 = dEta * dEta + dPhi * dPhi;
243243
if (dR2 < 0.000001f)
@@ -253,7 +253,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
253253
float eta2 = pixelSegments.eta()[pLSIndex - prefix];
254254
float phi2 = pixelSegments.phi()[pLSIndex - prefix];
255255
float dEta = alpaka::math::abs(acc, eta1 - eta2);
256-
float dPhi = reco::deltaPhi(phi1, phi2);
256+
float dPhi = cms::alpakatools::deltaPhi(acc, phi1, phi2);
257257

258258
float dR2 = dEta * dEta + dPhi * dPhi;
259259
if (dR2 < 0.000001f)

0 commit comments

Comments
 (0)