Skip to content

Commit 7123683

Browse files
committed
[PWGDQ] updated feature extraction for ML matching in tableMaker
The call to getInpuFeatures() is updated to reflect the changes to the MuonMatchingMlResponse class.
1 parent e478191 commit 7123683

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,12 +1041,6 @@ struct TableMakerMC {
10411041
if (static_cast<int>(muon.trackType()) < 2) {
10421042
auto muonID = muon.matchMCHTrackId();
10431043
auto chi2 = muon.chi2MatchMCHMFT();
1044-
if (fConfigVariousOptions.fUseML.value) {
1045-
std::vector<float> output;
1046-
std::vector<float> inputML = matchingMlResponse.getInputFeaturesTest(muon);
1047-
matchingMlResponse.isSelectedMl(inputML, 0, output);
1048-
chi2 = output[0];
1049-
}
10501044
if (mCandidates.find(muonID) == mCandidates.end()) {
10511045
mCandidates[muonID] = {chi2, muon.globalIndex()};
10521046
} else {
@@ -1078,7 +1072,7 @@ struct TableMakerMC {
10781072
muonprop = VarManager::PropagateMuon(muontrack, collision, VarManager::kToMatching);
10791073
}
10801074
std::vector<float> output;
1081-
std::vector<float> inputML = matchingMlResponse.getInputFeaturesGlob(muon, muonprop, mftprop, collision);
1075+
std::vector<float> inputML = matchingMlResponse.getInputFeatures(muon, mfttrack, muontrack, mftprop, muonprop, collision);
10821076
matchingMlResponse.isSelectedMl(inputML, 0, output);
10831077
float score = output[0];
10841078
if (mCandidates.find(muonID) == mCandidates.end()) {

PWGDQ/TableProducer/tableMaker_withAssoc.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ struct TableMaker {
14941494
muonprop = VarManager::PropagateMuon(muontrack, collision, VarManager::kToMatching);
14951495
}
14961496
std::vector<float> output;
1497-
std::vector<float> inputML = matchingMlResponse.getInputFeaturesGlob(muon, muonprop, mftprop, collision);
1497+
std::vector<float> inputML = matchingMlResponse.getInputFeatures(muon, mfttrack, muontrack, mftprop, muonprop, collision);
14981498
matchingMlResponse.isSelectedMl(inputML, 0, output);
14991499
float score = output[0];
15001500
if (mCandidates.find(muonID) == mCandidates.end()) {

0 commit comments

Comments
 (0)