Skip to content
Merged
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
13 changes: 8 additions & 5 deletions PWGDQ/Tasks/qaMatching.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -2933,7 +2933,7 @@ struct QaMatching {

//-------------------------------
// Chi2-based matching from production
fillQaMatchingAodTablesForCollision(collision, muonTracks, collisionInfo.matchingCandidates, matchingMethodCounter, collisionInfo.reducedEventId, collisionInfo.reducedMchTrackIds);
fillQaMatchingAodTablesForCollision(collision, muonTracks, mftTracks, collisionInfo.matchingCandidates, matchingMethodCounter, collisionInfo.reducedEventId, collisionInfo.reducedMchTrackIds);
if constexpr (isMC) {
fillMatchingPlotsMc(collision, collisionInfo, muonTracks, mftTracks, collisionInfo.matchingCandidates, collisionInfo.matchingCandidates, collisionInfo.matchablePairs, cfgMatchingChi2ScoreMftMchLow, fChi2MatchingPlotter.get(), false);
} else {
Expand Down Expand Up @@ -2987,7 +2987,7 @@ struct QaMatching {
double matchingScoreCut = matchingScoreCuts.at(label);

matchingMethodCounter += 1;
fillQaMatchingAodTablesForCollision(collision, muonTracks, matchingCandidates, matchingMethodCounter, collisionInfo.reducedEventId, collisionInfo.reducedMchTrackIds);
fillQaMatchingAodTablesForCollision(collision, muonTracks, mftTracks, matchingCandidates, matchingMethodCounter, collisionInfo.reducedEventId, collisionInfo.reducedMchTrackIds);
if constexpr (isMC) {
fillMatchingPlotsMc(collision, collisionInfo, muonTracks, mftTracks, matchingCandidates, collisionInfo.matchingCandidates, collisionInfo.matchablePairs, matchingScoreCut, plotter, false);
} else {
Expand All @@ -3005,7 +3005,7 @@ struct QaMatching {
double matchingScoreCut = matchingScoreCuts.at(label);

matchingMethodCounter += 1;
fillQaMatchingAodTablesForCollision(collision, muonTracks, matchingCandidates, matchingMethodCounter, collisionInfo.reducedEventId, collisionInfo.reducedMchTrackIds);
fillQaMatchingAodTablesForCollision(collision, muonTracks, mftTracks, matchingCandidates, matchingMethodCounter, collisionInfo.reducedEventId, collisionInfo.reducedMchTrackIds);
if constexpr (isMC) {
fillMatchingPlotsMc(collision, collisionInfo, muonTracks, mftTracks, matchingCandidates, collisionInfo.matchingCandidates, collisionInfo.matchablePairs, matchingScoreCut, plotter);
} else {
Expand All @@ -3018,9 +3018,10 @@ struct QaMatching {
fillDimuonPlotsMc(collisionInfo, collisions, muonTracks, mftTracks);
}

template <class TCOLLISION, class TMUON>
template <class TCOLLISION, class TMUON, class TMFT>
void fillQaMatchingAodTablesForCollision(TCOLLISION const& collision,
TMUON const& muonTracks,
TMFT const& mftTracks,
const MatchingCandidates& matchingCandidates,
int8_t matchLabel,
int32_t reducedEventId,
Expand All @@ -3044,7 +3045,9 @@ struct QaMatching {

for (const auto& candidate : candidates) {
const auto& candidateTrack = muonTracks.rawIteratorAt(candidate.globalTrackId);
auto candidateTrackAtVertex = VarManager::PropagateMuon(candidateTrack, collision, VarManager::kToVertex);
const auto& mftTrack = mftTracks.rawIteratorAt(candidate.mftTrackId);
// propagate global forward track to vertex using momentum rescaling method
auto candidateTrackAtVertex = propagateToVertexMft(mftTrack, mchTrack, collision);
qaMatchingCandidates(
reducedEventId,
reducedMchTrackId,
Expand Down
Loading