Skip to content

[PWGDQ] fix missing match type for custom matching candidates #14736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcoquet642 merged 1 commit into from
Feb 1, 2026
+26 −5
Merged

[PWGDQ] fix missing match type for custom matching candidates #14736

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 26 additions & 5 deletions PWGDQ/Tasks/qaMatching.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2316,11 +2316,12 @@ struct qaMatching {
template <class C, class TMUON, class TMFT, class CMFT>
void RunChi2Matching(C const& collisions,
TMUON const& muonTracks,
TMFT const& /*mftTracks*/,
TMFT const& mftTracks,
CMFT const& mftCovs,
std::string funcName,
float matchingPlaneZ,
int extrapMethod,
const std::vector<std::pair<int64_t, int64_t>>& matchablePairs,
const MatchingCandidates& matchingCandidates,
MatchingCandidates& newMatchingCandidates)
{
Expand Down Expand Up @@ -2410,6 +2411,15 @@ struct qaMatching {

for (auto& [mchIndex, globalTracksVector] : newMatchingCandidates) {
std::sort(globalTracksVector.begin(), globalTracksVector.end(), compareMatchingScore);

int ranking = 1;
for (auto& candidate : globalTracksVector) {
const auto& muonTrack = muonTracks.rawIteratorAt(candidate.globalTrackId);

candidate.matchRanking = ranking;
candidate.matchType = GetMatchType(muonTrack, muonTracks, mftTracks, matchablePairs, ranking);
ranking += 1;
}
}
}

Expand All @@ -2419,6 +2429,7 @@ struct qaMatching {
TMFT const& mftTracks,
CMFT const& mftCovs,
std::string label,
const std::vector<std::pair<int64_t, int64_t>>& matchablePairs,
const MatchingCandidates& matchingCandidates,
MatchingCandidates& newMatchingCandidates)
{
Expand All @@ -2442,15 +2453,16 @@ struct qaMatching {
auto matchingPlaneZ = matchingPlanesZ[label];
auto extrapMethod = matchingExtrapMethod[label];

RunChi2Matching(collisions, muonTracks, mftTracks, mftCovs, funcName, matchingPlaneZ, extrapMethod, matchingCandidates, newMatchingCandidates);
RunChi2Matching(collisions, muonTracks, mftTracks, mftCovs, funcName, matchingPlaneZ, extrapMethod, matchablePairs, matchingCandidates, newMatchingCandidates);
}

template <class C, class TMUON, class TMFT, class CMFT>
void RunMLMatching(C const& collisions,
TMUON const& muonTracks,
TMFT const& /*mftTracks*/,
TMFT const& mftTracks,
CMFT const& mftCovs,
std::string label,
const std::vector<std::pair<int64_t, int64_t>>& matchablePairs,
const MatchingCandidates& matchingCandidates,
MatchingCandidates& newMatchingCandidates)
{
Expand Down Expand Up @@ -2539,6 +2551,15 @@ struct qaMatching {

for (auto& [mchIndex, globalTracksVector] : newMatchingCandidates) {
std::sort(globalTracksVector.begin(), globalTracksVector.end(), compareMatchingScore);

int ranking = 1;
for (auto& candidate : globalTracksVector) {
const auto& muonTrack = muonTracks.rawIteratorAt(candidate.globalTrackId);

candidate.matchRanking = ranking;
candidate.matchType = GetMatchType(muonTrack, muonTracks, mftTracks, matchablePairs, ranking);
ranking += 1;
}
}
}

Expand All @@ -2558,7 +2579,7 @@ struct qaMatching {
FillMatchingPlotsMC(collision, collisionInfo, muonTracks, mftTracks, collisionInfo.matchingCandidates, collisionInfo.matchingCandidates, collisionInfo.matchablePairs, fMatchingChi2ScoreMftMchLow, fChi2MatchingPlotter.get(), false);
for (auto& [label, func] : matchingChi2Functions) {
MatchingCandidates matchingCandidates;
RunChi2Matching(collisions, muonTracks, mftTracks, mftCovs, label, collisionInfo.matchingCandidates, matchingCandidates);
RunChi2Matching(collisions, muonTracks, mftTracks, mftCovs, label, collisionInfo.matchablePairs, collisionInfo.matchingCandidates, matchingCandidates);

auto* plotter = fMatchingPlotters.at(label).get();
double matchingScoreCut = matchingScoreCuts.at(label);
Expand All @@ -2569,7 +2590,7 @@ struct qaMatching {
// ML-based matching analysis
for (auto& [label, mlResponse] : matchingMlResponses) {
MatchingCandidates matchingCandidates;
RunMLMatching(collisions, muonTracks, mftTracks, mftCovs, label, collisionInfo.matchingCandidates, matchingCandidates);
RunMLMatching(collisions, muonTracks, mftTracks, mftCovs, label, collisionInfo.matchablePairs, collisionInfo.matchingCandidates, matchingCandidates);

auto* plotter = fMatchingPlotters.at(label).get();
double matchingScoreCut = matchingScoreCuts.at(label);
Expand Down
Loading