Skip to content

Commit 17391fc

Browse files
shahor02shahor02
committed
Set TrackPar default PID to pion
1 parent 5e0d4ea commit 17391fc

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

‎DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackParametrization.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,15 @@ class TrackParametrization
129129
#endif
130130

131131
GPUdDefault() TrackParametrization() = default;
132-
GPUd() TrackParametrization(value_t x, value_t alpha, const params_t& par, int charge = 1);
133-
GPUd() TrackParametrization(const dim3_t& xyz, const dim3_t& pxpypz, int charge, bool sectorAlpha = true);
132+
GPUd() TrackParametrization(value_t x, value_t alpha, const params_t& par, int charge = 1, const PID pid = PID::Pion);
133+
GPUd() TrackParametrization(const dim3_t& xyz, const dim3_t& pxpypz, int charge, bool sectorAlpha = true, const PID pid = PID::Pion);
134134
GPUdDefault() TrackParametrization(const TrackParametrization&) = default;
135135
GPUdDefault() TrackParametrization(TrackParametrization&&) = default;
136136
GPUdDefault() TrackParametrization& operator=(const TrackParametrization& src) = default;
137137
GPUdDefault() TrackParametrization& operator=(TrackParametrization&& src) = default;
138138
GPUdDefault() ~TrackParametrization() = default;
139139

140-
GPUd() void set(value_t x, value_t alpha, const params_t& par, int charge = 1);
140+
GPUd() void set(value_t x, value_t alpha, const params_t& par, int charge = 1, const PID pid = PID::Pion);
141141
GPUd() const value_t* getParams() const;
142142
GPUd() value_t getParam(int i) const;
143143
GPUd() value_t getX() const;
@@ -229,16 +229,16 @@ class TrackParametrization
229229
value_t mAlpha = 0.f; /// track frame angle
230230
value_t mP[kNParams] = {0.f}; /// 5 parameters: Y,Z,sin(phi),tg(lambda),q/pT
231231
char mAbsCharge = 1; /// Extra info about the abs charge, to be taken into account only if not 1
232-
PID mPID{}; /// 8 bit PID
232+
PID mPID{PID::Pion}; /// 8 bit PID
233233
uint16_t mUserField = 0; /// field provided to user
234234

235235
ClassDefNV(TrackParametrization, 3);
236236
};
237237

238238
//____________________________________________________________
239239
template <typename value_T>
240-
GPUdi() TrackParametrization<value_T>::TrackParametrization(value_t x, value_t alpha, const params_t& par, int charge)
241-
: mX{x}, mAlpha{alpha}, mAbsCharge{char(gpu::CAMath::Abs(charge))}
240+
GPUdi() TrackParametrization<value_T>::TrackParametrization(value_t x, value_t alpha, const params_t& par, int charge, const PID pid)
241+
: mX{x}, mAlpha{alpha}, mAbsCharge{char(gpu::CAMath::Abs(charge))}, mPID{pid}
242242
{
243243
// explicit constructor
244244
for (int i = 0; i < kNParams; i++) {
@@ -248,14 +248,15 @@ GPUdi() TrackParametrization<value_T>::TrackParametrization(value_t x, value_t a
248248

249249
//____________________________________________________________
250250
template <typename value_T>
251-
GPUdi() void TrackParametrization<value_T>::set(value_t x, value_t alpha, const params_t& par, int charge)
251+
GPUdi() void TrackParametrization<value_T>::set(value_t x, value_t alpha, const params_t& par, int charge, const PID pid)
252252
{
253253
mX = x;
254254
mAlpha = alpha;
255255
mAbsCharge = char(gpu::CAMath::Abs(charge));
256256
for (int i = 0; i < kNParams; i++) {
257257
mP[i] = par[i];
258258
}
259+
mPID = pid;
259260
}
260261

261262
//____________________________________________________________

‎DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackParametrizationWithError.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ class TrackParametrizationWithError : public TrackParametrization<value_T>
4242
using covMat_t = gpu::gpustd::array<value_t, kCovMatSize>;
4343

4444
GPUd() TrackParametrizationWithError();
45-
GPUd() TrackParametrizationWithError(value_t x, value_t alpha, const params_t& par, const covMat_t& cov, int charge = 1);
45+
GPUd() TrackParametrizationWithError(value_t x, value_t alpha, const params_t& par, const covMat_t& cov, int charge = 1, const PID pid = PID::Pion);
4646
GPUd() TrackParametrizationWithError(const dim3_t& xyz, const dim3_t& pxpypz,
47-
const gpu::gpustd::array<value_t, kLabCovMatSize>& cv, int sign, bool sectorAlpha = true);
47+
const gpu::gpustd::array<value_t, kLabCovMatSize>& cv, int sign, bool sectorAlpha = true, const PID pid = PID::Pion);
4848

4949
GPUdDefault() TrackParametrizationWithError(const TrackParametrizationWithError& src) = default;
5050
GPUdDefault() TrackParametrizationWithError(TrackParametrizationWithError&& src) = default;
@@ -53,7 +53,7 @@ class TrackParametrizationWithError : public TrackParametrization<value_T>
5353
GPUdDefault() ~TrackParametrizationWithError() = default;
5454
using TrackParametrization<value_T>::TrackParametrization;
5555

56-
GPUd() void set(value_t x, value_t alpha, const params_t& par, const covMat_t& cov, int charge = 1);
56+
GPUd() void set(value_t x, value_t alpha, const params_t& par, const covMat_t& cov, int charge = 1, const PID pid = PID::Pion);
5757
GPUd() const value_t* getCov() const;
5858
GPUd() value_t getSigmaY2() const;
5959
GPUd() value_t getSigmaZY() const;
@@ -127,8 +127,8 @@ GPUdi() TrackParametrizationWithError<value_T>::TrackParametrizationWithError()
127127
//__________________________________________________________________________
128128
template <typename value_T>
129129
GPUdi() TrackParametrizationWithError<value_T>::TrackParametrizationWithError(value_t x, value_t alpha, const params_t& par,
130-
const covMat_t& cov, int charge)
131-
: TrackParametrization<value_T>{x, alpha, par, charge}
130+
const covMat_t& cov, int charge, const PID pid)
131+
: TrackParametrization<value_T>{x, alpha, par, charge, pid}
132132
{
133133
// explicit constructor
134134
for (int i = 0; i < kCovMatSize; i++) {
@@ -138,9 +138,9 @@ GPUdi() TrackParametrizationWithError<value_T>::TrackParametrizationWithError(va
138138

139139
//__________________________________________________________________________
140140
template <typename value_T>
141-
GPUdi() void TrackParametrizationWithError<value_T>::set(value_t x, value_t alpha, const params_t& par, const covMat_t& cov, int charge)
141+
GPUdi() void TrackParametrizationWithError<value_T>::set(value_t x, value_t alpha, const params_t& par, const covMat_t& cov, int charge, const PID pid)
142142
{
143-
TrackParametrization<value_T>::set(x, alpha, par, charge);
143+
TrackParametrization<value_T>::set(x, alpha, par, charge, pid);
144144
for (int i = 0; i < kCovMatSize; i++) {
145145
mC[i] = cov[i];
146146
}

‎DataFormats/Reconstruction/src/TrackParametrization.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ using namespace o2::track;
4242

4343
//______________________________________________________________
4444
template <typename value_T>
45-
GPUd() TrackParametrization<value_T>::TrackParametrization(const dim3_t& xyz, const dim3_t& pxpypz, int charge, bool sectorAlpha)
45+
GPUd() TrackParametrization<value_T>::TrackParametrization(const dim3_t& xyz, const dim3_t& pxpypz, int charge, bool sectorAlpha, const PID pid)
4646
: mX{0.f}, mAlpha{0.f}, mP{0.f}
4747
{
4848
// construct track param from kinematics
@@ -100,6 +100,7 @@ GPUd() TrackParametrization<value_T>::TrackParametrization(const dim3_t& xyz, co
100100
mP[kTgl] = mom[2] * ptI;
101101
mAbsCharge = gpu::CAMath::Abs(charge);
102102
mP[kQ2Pt] = charge ? ptI * charge : ptI;
103+
mPID = pid;
103104
//
104105
if (gpu::CAMath::Abs(1 - getSnp()) < kSafe) {
105106
mP[kSnp] = 1.f - kSafe; // Protection

‎DataFormats/Reconstruction/src/TrackParametrizationWithError.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ GPUd() bool TrackParametrizationWithError<value_T>::propagateToDCA(const o2::dat
262262
//______________________________________________________________
263263
template <typename value_T>
264264
GPUd() TrackParametrizationWithError<value_T>::TrackParametrizationWithError(const dim3_t& xyz, const dim3_t& pxpypz,
265-
const gpu::gpustd::array<value_t, kLabCovMatSize>& cv, int charge, bool sectorAlpha)
265+
const gpu::gpustd::array<value_t, kLabCovMatSize>& cv, int charge, bool sectorAlpha, const PID pid)
266266
{
267267
// construct track param and covariance from kinematics and lab errors
268268

@@ -320,6 +320,7 @@ GPUd() TrackParametrizationWithError<value_T>::TrackParametrizationWithError(con
320320
this->setTgl(mom[2] * ptI); // tg(lambda)
321321
this->setAbsCharge(gpu::CAMath::Abs(charge));
322322
this->setQ2Pt(charge ? ptI * charge : ptI);
323+
this->setPID(pid);
323324
//
324325
if (gpu::CAMath::Abs(1.f - this->getSnp()) < kSafe) {
325326
this->setSnp(1.f - kSafe); // Protection

0 commit comments

Comments
 (0)