@@ -76,17 +76,17 @@ KFPTrack createKFPTrack(const o2::track::TrackParametrizationWithError<float>& t
7676 int16_t tpcNClsFound,
7777 float tpcChi2NCl)
7878{
79- std::array<float , 3 > trkpos_par {};
80- std::array<float , 3 > trkmom_par {};
81- std::array<float , NumberOfCovMatrixComponents> trk_cov {};
82- trackparCov.getXYZGlo (trkpos_par );
83- trackparCov.getPxPyPzGlo (trkmom_par );
84- trackparCov.getCovXYZPxPyPzGlo (trk_cov );
85- const float trkpar_KF [6 ] = {trkpos_par [0 ], trkpos_par [1 ], trkpos_par [2 ],
86- trkmom_par [0 ], trkmom_par [1 ], trkmom_par [2 ]};
79+ std::array<float , 3 > trkPositionPar {};
80+ std::array<float , 3 > trkMomentumPar {};
81+ std::array<float , NumberOfCovMatrixComponents> trkCovMatrix {};
82+ trackparCov.getXYZGlo (trkPositionPar );
83+ trackparCov.getPxPyPzGlo (trkMomentumPar );
84+ trackparCov.getCovXYZPxPyPzGlo (trkCovMatrix );
85+ const float trkParKf [6 ] = {trkPositionPar [0 ], trkPositionPar [1 ], trkPositionPar [2 ],
86+ trkMomentumPar [0 ], trkMomentumPar [1 ], trkMomentumPar [2 ]};
8787 KFPTrack kfpTrack;
88- kfpTrack.SetParameters (trkpar_KF );
89- kfpTrack.SetCovarianceMatrix (trk_cov .data ());
88+ kfpTrack.SetParameters (trkParKf );
89+ kfpTrack.SetCovarianceMatrix (trkCovMatrix .data ());
9090 kfpTrack.SetCharge (trackSign);
9191 kfpTrack.SetNDF (tpcNClsFound - 5 );
9292 kfpTrack.SetChi2 (static_cast <float >(tpcNClsFound) * tpcChi2NCl);
@@ -145,18 +145,18 @@ KFParticle createKFParticleFromTrackParCov(const o2::track::TrackParametrization
145145 }
146146
147147 KFParticle kfPart;
148- float Mini {}, SigmaMini {}, M {}, SigmaM {};
149- kfPart.GetMass (Mini, SigmaMini );
150- LOG (debug) << " Daughter KFParticle mass before creation: " << Mini << " +- " << SigmaMini ;
148+ float mInit {}, sigmaMInit {}, m {}, sigmaM {};
149+ kfPart.GetMass (mInit , sigmaMInit );
150+ LOG (debug) << " Daughter KFParticle mass before creation: " << mInit << " +- " << sigmaMInit ;
151151
152152 try {
153153 kfPart.Create (xyzpxpypz, cv.data (), charge, mass);
154154 } catch (std::runtime_error& e) {
155155 LOG (debug) << " Failed to create KFParticle from daughter TrackParCov" << e.what ();
156156 }
157157
158- kfPart.GetMass (M, SigmaM );
159- LOG (debug) << " Daughter KFParticle mass after creation: " << M << " +- " << SigmaM ;
158+ kfPart.GetMass (m, sigmaM );
159+ LOG (debug) << " Daughter KFParticle mass after creation: " << m << " +- " << sigmaM ;
160160 return kfPart;
161161}
162162
@@ -294,17 +294,17 @@ float impParXYFromKF(KFParticle kfpParticle, KFParticle Vertex)
294294// / @return l/delta l
295295float ldlFromKF (KFParticle kfpParticle, KFParticle PV)
296296{
297- const float dx_particle = PV.GetX () - kfpParticle.GetX ();
298- const float dy_particle = PV.GetY () - kfpParticle.GetY ();
299- const float dz_particle = PV.GetZ () - kfpParticle.GetZ ();
300- float l_particle = std::sqrt (dx_particle * dx_particle + dy_particle * dy_particle + dz_particle * dz_particle );
301- float dl_particle = (PV.GetCovariance (0 ) + kfpParticle.GetCovariance (0 )) * dx_particle * dx_particle + (PV.GetCovariance (2 ) + kfpParticle.GetCovariance (2 )) * dy_particle * dy_particle + (PV.GetCovariance (5 ) + kfpParticle.GetCovariance (5 )) * dz_particle * dz_particle + 2 * ((PV.GetCovariance (1 ) + kfpParticle.GetCovariance (1 )) * dx_particle * dy_particle + (PV.GetCovariance (3 ) + kfpParticle.GetCovariance (3 )) * dx_particle * dz_particle + (PV.GetCovariance (4 ) + kfpParticle.GetCovariance (4 )) * dy_particle * dz_particle );
302- if (std::fabs (l_particle ) < ArbitrarySmallNumber)
303- l_particle = ArbitrarySmallNumber;
304- dl_particle = dl_particle < 0 .f ? ArbitraryHugeNumber : std::sqrt (dl_particle ) / l_particle ;
305- if (dl_particle == 0 .)
297+ const float dxParticle = PV.GetX () - kfpParticle.GetX ();
298+ const float dyParticle = PV.GetY () - kfpParticle.GetY ();
299+ const float dzParticle = PV.GetZ () - kfpParticle.GetZ ();
300+ float lParticle = std::sqrt (dxParticle * dxParticle + dyParticle * dyParticle + dzParticle * dzParticle );
301+ float dlParticle = (PV.GetCovariance (0 ) + kfpParticle.GetCovariance (0 )) * dxParticle * dxParticle + (PV.GetCovariance (2 ) + kfpParticle.GetCovariance (2 )) * dyParticle * dyParticle + (PV.GetCovariance (5 ) + kfpParticle.GetCovariance (5 )) * dzParticle * dzParticle + 2 * ((PV.GetCovariance (1 ) + kfpParticle.GetCovariance (1 )) * dxParticle * dyParticle + (PV.GetCovariance (3 ) + kfpParticle.GetCovariance (3 )) * dxParticle * dzParticle + (PV.GetCovariance (4 ) + kfpParticle.GetCovariance (4 )) * dyParticle * dzParticle );
302+ if (std::fabs (lParticle ) < ArbitrarySmallNumber)
303+ lParticle = ArbitrarySmallNumber;
304+ dlParticle = dlParticle < 0 .f ? ArbitraryHugeNumber : std::sqrt (dlParticle ) / lParticle ;
305+ if (dlParticle == 0 .)
306306 return UndefLdLValue;
307- return l_particle / dl_particle ;
307+ return lParticle / dlParticle ;
308308}
309309
310310// / @brief distance between production vertex and decay vertex normalised by the uncertainty in xy plane
@@ -313,16 +313,16 @@ float ldlFromKF(KFParticle kfpParticle, KFParticle PV)
313313// / @return l/delta l in xy plane
314314float ldlXYFromKF (KFParticle kfpParticle, KFParticle PV)
315315{
316- const float dx_particle = PV.GetX () - kfpParticle.GetX ();
317- const float dy_particle = PV.GetY () - kfpParticle.GetY ();
318- float l_particle = std::sqrt (dx_particle * dx_particle + dy_particle * dy_particle );
319- float dl_particle = (PV.GetCovariance (0 ) + kfpParticle.GetCovariance (0 )) * dx_particle * dx_particle + (PV.GetCovariance (2 ) + kfpParticle.GetCovariance (2 )) * dy_particle * dy_particle + 2 * ((PV.GetCovariance (1 ) + kfpParticle.GetCovariance (1 )) * dx_particle * dy_particle );
320- if (std::fabs (l_particle ) < ArbitrarySmallNumber)
321- l_particle = ArbitrarySmallNumber;
322- dl_particle = dl_particle < 0 .f ? ArbitraryHugeNumber : std::sqrt (dl_particle ) / l_particle ;
323- if (dl_particle == 0 .)
316+ const float dxParticle = PV.GetX () - kfpParticle.GetX ();
317+ const float dyParticle = PV.GetY () - kfpParticle.GetY ();
318+ float lParticle = std::sqrt (dxParticle * dxParticle + dyParticle * dyParticle );
319+ float dlParticle = (PV.GetCovariance (0 ) + kfpParticle.GetCovariance (0 )) * dxParticle * dxParticle + (PV.GetCovariance (2 ) + kfpParticle.GetCovariance (2 )) * dyParticle * dyParticle + 2 * ((PV.GetCovariance (1 ) + kfpParticle.GetCovariance (1 )) * dxParticle * dyParticle );
320+ if (std::fabs (lParticle ) < ArbitrarySmallNumber)
321+ lParticle = ArbitrarySmallNumber;
322+ dlParticle = dlParticle < 0 .f ? ArbitraryHugeNumber : std::sqrt (dlParticle ) / lParticle ;
323+ if (dlParticle == 0 .)
324324 return UndefLdLValue;
325- return l_particle / dl_particle ;
325+ return lParticle / dlParticle ;
326326}
327327
328328// / @brief squared distance between track and primary vertex normalised by its uncertainty evaluated in matrix form
@@ -331,9 +331,9 @@ float ldlXYFromKF(KFParticle kfpParticle, KFParticle PV)
331331// / @return chi2 to primary vertex
332332float kfCalculateChi2ToPrimaryVertex (KFParticle track, const KFParticle& vtx)
333333{
334- const float PvPoint [3 ] = {vtx.X (), vtx.Y (), vtx.Z ()};
334+ const float pvPoint [3 ] = {vtx.X (), vtx.Y (), vtx.Z ()};
335335
336- track.TransportToPoint (PvPoint );
336+ track.TransportToPoint (pvPoint );
337337 return track.GetDeviationFromVertex (vtx);
338338}
339339
@@ -343,9 +343,9 @@ float kfCalculateChi2ToPrimaryVertex(KFParticle track, const KFParticle& vtx)
343343// / @return array with components of prong's momentum in the secondary (decay) vertex
344344std::array<float , 3 > kfCalculateProngMomentumInSecondaryVertex (KFParticle track, const KFParticle& vtx)
345345{
346- const float SvPoint [3 ] = {vtx.X (), vtx.Y (), vtx.Z ()};
346+ const float svPoint [3 ] = {vtx.X (), vtx.Y (), vtx.Z ()};
347347
348- track.TransportToPoint (SvPoint );
348+ track.TransportToPoint (svPoint );
349349 return {track.GetPx (), track.GetPy (), track.GetPz ()};
350350}
351351
0 commit comments