@@ -298,7 +298,7 @@ struct OnTheFlyTracker {
298298 int isUsedInCascading = 0 ; // /< 0: not at all, 1: is a cascade, 2: is a bachelor, 3: is a pion, 4: is a proton
299299 int nSiliconHits = 0 ; // /< number of silicon hits
300300 int nTPCHits = 0 ; // /< number of TPC hits
301- TrackType trackType;
301+ TrackType trackType = TrackType:: kNone ;
302302 };
303303
304304 // Helper struct to pass cascade information
@@ -388,8 +388,6 @@ struct OnTheFlyTracker {
388388 // For processing and vertexing
389389 std::vector<TrackAlice3> recoPrimaries;
390390 std::vector<TrackAlice3> ghostPrimaries;
391- std::vector<TrackAlice3> recoV0Daugs;
392- std::vector<TrackAlice3> recoCascDaugs;
393391 std::vector<TrackAlice3> tracksAlice3;
394392 std::vector<TrackAlice3> ghostTracksAlice3;
395393 std::vector<o2::InteractionRecord> bcData;
@@ -409,7 +407,6 @@ struct OnTheFlyTracker {
409407 static constexpr float TimeResolutionUs = TimeResolutionNs * NsToMus; // us
410408
411409 o2::dataformats::DCA dcaInfo;
412- o2::dataformats::VertexBase vtx;
413410
414411 template <typename T>
415412 std::shared_ptr<T> getHist (const std::string& name)
@@ -1141,9 +1138,9 @@ struct OnTheFlyTracker {
11411138 nTrackAtPCA.getPxPyPzGlo (negP);
11421139
11431140 // get decay vertex coordinates
1144- const auto & vtx = fitter.getPCACandidate ();
1141+ const auto & pcaCandidate = fitter.getPCACandidate ();
11451142 for (int i = 0 ; i < NDim3D; i++) {
1146- pos[i] = vtx [i];
1143+ pos[i] = pcaCandidate [i];
11471144 }
11481145
11491146 // calculate basic V0 properties here
@@ -1348,8 +1345,7 @@ struct OnTheFlyTracker {
13481345 }
13491346
13501347 o2::track::TrackParCov newCascadeTrack = fitter.getTrack (0 ); // (cascade)
1351- std::array<float , 3 > kinkVtx = {-999 , -999 , -999 };
1352- kinkVtx = fitter.getPCACandidatePos ();
1348+ std::array<float , 3 > kinkVtx = fitter.getPCACandidatePos ();
13531349 thisCascade.dcaV0dau = -1 .f ; // unknown
13541350 thisCascade.v0radius = -1 .f ; // unknown
13551351 thisCascade.dcacascdau = std::sqrt (fitter.getChi2AtPCACandidate ());
@@ -1364,7 +1360,6 @@ struct OnTheFlyTracker {
13641360 std::array{o2::constants::physics::MassPionCharged, o2::constants::physics::MassLambda});
13651361 newCascadeTrack.setPID (pdgCodeToPID (PDG_t::kXiMinus )); // FIXME: not OK for omegas
13661362 float trackTime = (eventCollisionTimeNS + gRandom ->Gaus (0 ., TimeResolutionNs)) * NsToMus;
1367-
13681363 tracksCascadeProngs[NCascProngs + 1 ] = TrackAlice3{newCascadeTrack, mcParticle.globalIndex (), trackTime, TimeResolutionUs, false , false , false , 1 , thisCascade.foundClusters , TrackType::kRecoCascDaug };
13691364
13701365 fillCascadeTable = true ;
@@ -1462,7 +1457,7 @@ struct OnTheFlyTracker {
14621457 o2::track::TrackParCov trackParCov;
14631458 o2::upgrade::convertMCParticleToO2Track (mcParticle, trackParCov, pdgDB);
14641459 std::vector<TLorentzVector> v0DecayProducts;
1465- std::vector<double > laDecayVertex, v0DecayVertex;
1460+ std::vector<double > v0DecayVertex;
14661461 decayV0Particle (mcParticle, v0DecayProducts, v0DecayVertex, mcParticle.pdgCode ());
14671462
14681463 if (v0DecayProducts.size () != NV0Prongs) {
@@ -1513,12 +1508,13 @@ struct OnTheFlyTracker {
15131508
15141509 // Store not reconstructed daughters, will update them in case reconstruction is successful
15151510 float trackTime = (eventCollisionTimeNS + gRandom ->Gaus (0 ., TimeResolutionNs)) * NsToMus;
1516- tracksV0Daugs.push_back (TrackAlice3{v0DaughterTrackParCovsPerfect[0 ], mcParticle.globalIndex (), 0 .f , TimeResolutionUs, true , false , true , 1 , TrackType::kGhostV0Daug });
1511+ tracksV0Daugs.push_back (TrackAlice3{v0DaughterTrackParCovsPerfect[0 ], mcParticle.globalIndex (), trackTime, TimeResolutionUs, true , false , true , 1 , TrackType::kGhostV0Daug });
1512+ trackTime = (eventCollisionTimeNS + gRandom ->Gaus (0 ., TimeResolutionNs)) * NsToMus;
1513+ tracksV0Daugs.push_back (TrackAlice3{v0DaughterTrackParCovsPerfect[1 ], mcParticle.globalIndex (), trackTime, TimeResolutionUs, true , false , true , 1 , TrackType::kGhostV0Daug });
15171514 trackTime = (eventCollisionTimeNS + gRandom ->Gaus (0 ., TimeResolutionNs)) * NsToMus;
1518- tracksV0Daugs.push_back (TrackAlice3{v0DaughterTrackParCovsPerfect[1 ], mcParticle.globalIndex (), 0 .f , TimeResolutionUs, true , false , true , 1 , TrackType::kGhostV0Daug });
1519- tracksV0Daugs.push_back (TrackAlice3{v0DaughterTrackParCovsPerfect[0 ], mcParticle.globalIndex (), 0 .f , TimeResolutionUs, true , false , true , 1 , 0 , 0 , TrackType::kGhostV0Daug });
1515+ tracksV0Daugs.push_back (TrackAlice3{v0DaughterTrackParCovsPerfect[0 ], mcParticle.globalIndex (), trackTime, TimeResolutionUs, true , false , true , 1 , 0 , 0 , TrackType::kGhostV0Daug });
15201516 trackTime = (eventCollisionTimeNS + gRandom ->Gaus (0 ., TimeResolutionNs)) * NsToMus;
1521- tracksV0Daugs.push_back (TrackAlice3{v0DaughterTrackParCovsPerfect[1 ], mcParticle.globalIndex (), 0 . f , TimeResolutionUs, true , false , true , 1 , 0 , 0 , TrackType::kGhostV0Daug });
1517+ tracksV0Daugs.push_back (TrackAlice3{v0DaughterTrackParCovsPerfect[1 ], mcParticle.globalIndex (), trackTime , TimeResolutionUs, true , false , true , 1 , 0 , 0 , TrackType::kGhostV0Daug });
15221518
15231519 bool fillV0Table{false };
15241520 for (int i = 0 ; i < NV0Prongs; i++) {
@@ -1631,9 +1627,9 @@ struct OnTheFlyTracker {
16311627 nTrackAtPCA.getPxPyPzGlo (negP);
16321628
16331629 // get decay vertex coordinates
1634- const auto & vtx = fitter.getPCACandidate ();
1630+ const auto & pcaCandidate = fitter.getPCACandidate ();
16351631 for (int i = 0 ; i < NDim3D; i++) {
1636- pos[i] = vtx [i];
1632+ pos[i] = pcaCandidate [i];
16371633 }
16381634
16391635 // calculate basic V0 properties here
@@ -1798,7 +1794,7 @@ struct OnTheFlyTracker {
17981794 dcaXY = dcaInfo.getY ();
17991795 dcaZ = dcaInfo.getZ ();
18001796 }
1801- if (doExtraQA && (!extraQAwithoutDecayDaughters || (extraQAwithoutDecayDaughters && !trackParCov.isDecayDau ) )) {
1797+ if (doExtraQA && (!extraQAwithoutDecayDaughters || !trackParCov.isDecayDau )) {
18021798 getHist<TH2 >(histPath + " h2dDCAxy" )->Fill (trackParametrization.getPt (), dcaXY * 1e+4 );
18031799 getHist<TH2 >(histPath + " h2dDCAz" )->Fill (trackParametrization.getPt (), dcaZ * 1e+4 );
18041800 histos.fill (HIST (" hTrackXatDCA" ), trackParametrization.getX ());
0 commit comments