Skip to content

Commit 0c104dc

Browse files
OliverRietmannOliverRietmann
committed
Cleanup
1 parent 98dc251 commit 0c104dc

5 files changed

Lines changed: 64 additions & 75 deletions

File tree

‎GPU/GPUTracking/SectorTracker/GPUTPCTrack.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ class GPUTPCTrackSkeleton
3333
{
3434
public:
3535
#if !defined(GPUCA_GPUCODE)
36-
GPUTPCTrackSkeleton() : mFirstHitID(0), mNHits(0), mLocalTrackId(-1), mParam() {}
36+
GPUTPCTrackSkeleton() : mFirstHitID(0), mNHits(0), mLocalTrackId(-1), mParam()
37+
{
38+
}
3739
~GPUTPCTrackSkeleton() = default;
3840
#endif //! GPUCA_GPUCODE
3941

‎GPU/GPUTracking/SectorTracker/GPUTPCTrackLinearisation.h‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ class GPUTPCTrackLinearisation
4141
GPUTPCTrackLinearisation() : mSinPhi(0), mCosPhi(1), mDzDs(0), mQPt(0) {}
4242
GPUTPCTrackLinearisation(float SinPhi1, float CosPhi1, float DzDs1, float QPt1) : mSinPhi(SinPhi1), mCosPhi(CosPhi1), mDzDs(DzDs1), mQPt(QPt1) {}
4343

44-
GPUd() GPUTPCTrackLinearisation(const GPUTPCTrackParam& t);
45-
4644
GPUd() GPUTPCTrackLinearisation(GPUTPCTrackParamSkeleton<wrapper::const_reference> t);
4745

4846
GPUd() void Set(float SinPhi1, float CosPhi1, float DzDs1, float QPt1);
@@ -69,19 +67,6 @@ class GPUTPCTrackLinearisation
6967
float mQPt; // QPt
7068
};
7169

72-
GPUdi() GPUTPCTrackLinearisation::GPUTPCTrackLinearisation(const GPUTPCTrackParam& GPUrestrict() t) : mSinPhi(t.SinPhi()), mCosPhi(0), mDzDs(t.DzDs()), mQPt(t.QPt())
73-
{
74-
if (mSinPhi > GPUCA_MAX_SIN_PHI) {
75-
mSinPhi = GPUCA_MAX_SIN_PHI;
76-
} else if (mSinPhi < -GPUCA_MAX_SIN_PHI) {
77-
mSinPhi = -GPUCA_MAX_SIN_PHI;
78-
}
79-
mCosPhi = CAMath::Sqrt(1 - mSinPhi * mSinPhi);
80-
if (t.SignCosPhi() < 0) {
81-
mCosPhi = -mCosPhi;
82-
}
83-
}
84-
8570
GPUdi() GPUTPCTrackLinearisation::GPUTPCTrackLinearisation(GPUTPCTrackParamSkeleton<wrapper::const_reference> t) : mSinPhi(t.SinPhi()), mCosPhi(0), mDzDs(t.DzDs()), mQPt(t.QPt())
8671
{
8772
if (mSinPhi > GPUCA_MAX_SIN_PHI) {

‎GPU/GPUTracking/SectorTracker/GPUTPCTrackParam.cxx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ using namespace o2::gpu;
3131
//
3232

3333
template <template <class> class F>
34-
GPUd() float GPUTPCTrackParamSkeleton<F>::GetDist2(GPUTPCTrackParamSkeleton<wrapper::const_reference> t) const
34+
GPUd() float GPUTPCTrackParamSkeleton<F>::GetDist2(GPUTPCTrackParamSkeleton<wrapper::const_reference_restrict> t) const
3535
{
3636
// get squared distance between tracks
3737

@@ -42,7 +42,7 @@ GPUd() float GPUTPCTrackParamSkeleton<F>::GetDist2(GPUTPCTrackParamSkeleton<wrap
4242
}
4343

4444
template <template <class> class F>
45-
GPUd() float GPUTPCTrackParamSkeleton<F>::GetDistXZ2(GPUTPCTrackParamSkeleton<wrapper::const_reference> t) const
45+
GPUd() float GPUTPCTrackParamSkeleton<F>::GetDistXZ2(GPUTPCTrackParamSkeleton<wrapper::const_reference_restrict> t) const
4646
{
4747
// get squared distance between tracks in X&Z
4848

@@ -880,5 +880,4 @@ namespace o2::gpu {
880880
template class GPUTPCTrackParamSkeleton<wrapper::value>;
881881
template class GPUTPCTrackParamSkeleton<wrapper::reference>;
882882
template class GPUTPCTrackParamSkeleton<wrapper::reference_restrict>;
883-
//template class GPUTPCTrackParamSkeleton<wrapper::const_reference>;
884883
} // namespace o2::gpu

‎GPU/GPUTracking/SectorTracker/GPUTPCTrackParam.h‎

Lines changed: 59 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -90,57 +90,8 @@ class GPUTPCTrackParamSkeleton : public CRTP<GPUTPCTrackParamSkeleton, F>
9090
};
9191

9292
GPUd() GPUTPCBaseTrackParamSkeleton<wrapper::const_reference> GetParam() const { return mParam; }
93-
GPUd() void SetParam(GPUTPCBaseTrackParamSkeleton<wrapper::const_reference> v) {
94-
mParam.mX = v.mX;
95-
mParam.mC[0] = v.mC[0];
96-
mParam.mC[1] = v.mC[1];
97-
mParam.mC[2] = v.mC[2];
98-
mParam.mC[3] = v.mC[3];
99-
mParam.mC[4] = v.mC[4];
100-
mParam.mC[5] = v.mC[5];
101-
mParam.mC[6] = v.mC[6];
102-
mParam.mC[7] = v.mC[7];
103-
mParam.mC[8] = v.mC[8];
104-
mParam.mC[9] = v.mC[9];
105-
mParam.mC[10] = v.mC[10];
106-
mParam.mC[11] = v.mC[11];
107-
mParam.mC[12] = v.mC[12];
108-
mParam.mC[13] = v.mC[13];
109-
mParam.mC[14] = v.mC[14];
110-
mParam.mZOffset = v.mZOffset;
111-
mParam.mP[0] = v.mP[0];
112-
mParam.mP[1] = v.mP[1];
113-
mParam.mP[2] = v.mP[2];
114-
mParam.mP[3] = v.mP[3];
115-
mParam.mP[4] = v.mP[4];
116-
}
117-
118-
GPUd() void InitParam()
119-
{
120-
// Initialize Tracklet Parameters using default values
121-
SetSinPhi(0);
122-
SetDzDs(0);
123-
SetQPt(0);
124-
SetSignCosPhi(1);
125-
SetChi2(0);
126-
SetNDF(-3);
127-
SetCov(0, 1);
128-
SetCov(1, 0);
129-
SetCov(2, 1);
130-
SetCov(3, 0);
131-
SetCov(4, 0);
132-
SetCov(5, 1);
133-
SetCov(6, 0);
134-
SetCov(7, 0);
135-
SetCov(8, 0);
136-
SetCov(9, 1);
137-
SetCov(10, 0);
138-
SetCov(11, 0);
139-
SetCov(12, 0);
140-
SetCov(13, 0);
141-
SetCov(14, 1000.f);
142-
SetZOffset(0);
143-
}
93+
GPUd() void SetParam(GPUTPCBaseTrackParamSkeleton<wrapper::const_reference> v);
94+
GPUd() void InitParam();
14495

14596
GPUd() float X() const { return mParam.X(); }
14697
GPUd() float Y() const { return mParam.Y(); }
@@ -193,8 +144,8 @@ class GPUTPCTrackParamSkeleton : public CRTP<GPUTPCTrackParamSkeleton, F>
193144
GPUd() void SetChi2(float v) { mChi2 = v; }
194145
GPUd() void SetNDF(int32_t v) { mNDF = v; }
195146

196-
GPUd() float GetDist2(GPUTPCTrackParamSkeleton<wrapper::const_reference> t) const;
197-
GPUd() float GetDistXZ2(GPUTPCTrackParamSkeleton<wrapper::const_reference> t) const;
147+
GPUd() float GetDist2(GPUTPCTrackParamSkeleton<wrapper::const_reference_restrict> t) const;
148+
GPUd() float GetDistXZ2(GPUTPCTrackParamSkeleton<wrapper::const_reference_restrict> t) const;
198149

199150
GPUd() float GetS(float x, float y, float Bz) const;
200151

@@ -243,7 +194,7 @@ class GPUTPCTrackParamSkeleton : public CRTP<GPUTPCTrackParamSkeleton, F>
243194
#ifndef GPUCA_GPUCODE
244195
//private:
245196
#endif //! GPUCA_GPUCODE
246-
GPUTPCBaseTrackParamSkeleton<F> mParam; // Track Parameters
197+
GPUTPCBaseTrackParamSkeleton<F> mParam;
247198

248199
//private:
249200
// WARNING, Track Param Data is copied in the GPU Tracklet Constructor element by element instead of using copy constructor!!!
@@ -254,6 +205,60 @@ class GPUTPCTrackParamSkeleton : public CRTP<GPUTPCTrackParamSkeleton, F>
254205
F<int32_t> mNDF; // the Number of Degrees of Freedom
255206
};
256207

208+
template <template <class> class F>
209+
GPUd() void GPUTPCTrackParamSkeleton<F>::SetParam(GPUTPCBaseTrackParamSkeleton<wrapper::const_reference> v) {
210+
mParam.mX = v.mX;
211+
mParam.mC[0] = v.mC[0];
212+
mParam.mC[1] = v.mC[1];
213+
mParam.mC[2] = v.mC[2];
214+
mParam.mC[3] = v.mC[3];
215+
mParam.mC[4] = v.mC[4];
216+
mParam.mC[5] = v.mC[5];
217+
mParam.mC[6] = v.mC[6];
218+
mParam.mC[7] = v.mC[7];
219+
mParam.mC[8] = v.mC[8];
220+
mParam.mC[9] = v.mC[9];
221+
mParam.mC[10] = v.mC[10];
222+
mParam.mC[11] = v.mC[11];
223+
mParam.mC[12] = v.mC[12];
224+
mParam.mC[13] = v.mC[13];
225+
mParam.mC[14] = v.mC[14];
226+
mParam.mZOffset = v.mZOffset;
227+
mParam.mP[0] = v.mP[0];
228+
mParam.mP[1] = v.mP[1];
229+
mParam.mP[2] = v.mP[2];
230+
mParam.mP[3] = v.mP[3];
231+
mParam.mP[4] = v.mP[4];
232+
}
233+
234+
template <template <class> class F>
235+
GPUd() void GPUTPCTrackParamSkeleton<F>::InitParam()
236+
{
237+
// Initialize Tracklet Parameters using default values
238+
SetSinPhi(0);
239+
SetDzDs(0);
240+
SetQPt(0);
241+
SetSignCosPhi(1);
242+
SetChi2(0);
243+
SetNDF(-3);
244+
SetCov(0, 1);
245+
SetCov(1, 0);
246+
SetCov(2, 1);
247+
SetCov(3, 0);
248+
SetCov(4, 0);
249+
SetCov(5, 1);
250+
SetCov(6, 0);
251+
SetCov(7, 0);
252+
SetCov(8, 0);
253+
SetCov(9, 1);
254+
SetCov(10, 0);
255+
SetCov(11, 0);
256+
SetCov(12, 0);
257+
SetCov(13, 0);
258+
SetCov(14, 1000.f);
259+
SetZOffset(0);
260+
}
261+
257262
} // namespace o2::gpu
258263

259264
#endif // GPUTPCTRACKPARAM_H

‎GPU/GPUTracking/SectorTracker/GPUTPCTracklet.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ class GPUTPCTrackletSkeleton
7878
F<uint32_t> mFirstHit; // first hit in row hit array
7979
};
8080

81-
using GPUTPCTracklet = GPUTPCTrackletSkeleton<wrapper::value>;
82-
8381
} // namespace o2::gpu
8482

8583
#endif // GPUTPCTRACKLET_H

0 commit comments

Comments
 (0)