Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ enum DauType : int {

struct ClusAttachments {

std::array<unsigned int, 7> arr;
std::array<int, 7> arr;
};

class StrangenessTracker
Expand Down Expand Up @@ -357,10 +357,7 @@ class StrangenessTracker
std::vector<DCAFitter4> mFitter4Body; // optional DCA Fitter for final 4 Body refit (per thread)

o2::base::PropagatorImpl<float>::MatCorrType mCorrType = o2::base::PropagatorImpl<float>::MatCorrType::USEMatCorrNONE; // use mat correction

std::vector<std::vector<o2::track::TrackParCovF>> mDaughterTracks; // vector of daughter tracks (per thread)
ClusAttachments mStructClus; // # of attached tracks, 1 for mother, 2 for daughter

std::vector<std::vector<o2::track::TrackParCovF>> mDaughterTracks; // vector of daughter tracks (per thread)
ClassDefNV(StrangenessTracker, 1);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ void StrangenessTracker::processCascade(int iCasc, const Cascade& casc, const Ca
strangeTrack.mDecayRef = iCasc;
strangeTrack.mITSRef = mSortedITSindexes[iTrack];
mStrangeTrackVec[iThread].push_back(strangeTrack);
mClusAttachments[iThread].push_back(mStructClus);
mClusAttachments[iThread].push_back(structClus);
if (mMCTruthON) {
auto lab = getStrangeTrackLabel(itsTrack, strangeTrack, structClus);
mStrangeTrackLabels[iThread].push_back(lab);
Expand Down Expand Up @@ -350,7 +350,7 @@ bool StrangenessTracker::matchDecayToITStrack(float decayR, StrangeTrack& strang
auto nMinClusMother = trackClusters.size() < 4 ? 2 : mStrParams->mMinMotherClus;

std::vector<ITSCluster> motherClusters;
std::array<unsigned int, 7> nAttachments;
std::array<int, 7> nAttachments;
nAttachments.fill(-1); // fill arr with -1

int nUpdates = 0;
Expand Down Expand Up @@ -412,13 +412,13 @@ bool StrangenessTracker::matchDecayToITStrack(float decayR, StrangeTrack& strang

std::reverse(motherClusters.begin(), motherClusters.end());

mGlobalChi2 = -1;
mGlobalChi2 = 0;
for (auto& clus : motherClusters) {
if (!updateTrack(clus, motherTrackClone)) {
break;
}
}
strangeTrack.mMatchChi2 = mGlobalChi2;
strangeTrack.mMatchChi2 = mGlobalChi2 / motherClusters.size();

LOG(debug) << "Inward-outward refit finished, starting final topology refit";
// final Topology refit
Expand Down Expand Up @@ -481,7 +481,6 @@ bool StrangenessTracker::matchDecayToITStrack(float decayR, StrangeTrack& strang
strangeTrack.mTopoChi2 = mFitter3Body[iThread].getChi2AtPCACandidate();
}
structClus.arr = nAttachments;

return true;
}

Expand All @@ -508,9 +507,8 @@ bool StrangenessTracker::updateTrack(const ITSCluster& clus, o2::track::TrackPar
return false;
}
}
auto chi2 = std::abs(track.getPredictedChi2Quiet(clus)); // abs to be understood
LOG(debug) << "Chi2: " << chi2;
if (chi2 > mStrParams->mMaxChi2 || chi2 < 0) {
auto chi2 = track.getPredictedChi2Quiet(clus); // abs to be understood
if (std::abs(chi2) > mStrParams->mMaxChi2) {
return false;
}

Expand Down