From 738ee202d37195210313657a2505e3738836900e Mon Sep 17 00:00:00 2001 From: Lucamicheletti92 Date: Wed, 9 Sep 2026 16:14:51 +0200 Subject: [PATCH 1/3] Fixing reserve issue and adding extra cut --- PWGDQ/Core/CutsLibrary.cxx | 10 ++++++++++ PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx | 6 +++--- PWGDQ/Tasks/taskFwdTrackPid.cxx | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 187a1ec1700..227174a31fb 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -3067,6 +3067,11 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } + if (nameStr == "muonEtaCut") { + cut->AddCut(GetAnalysisCut("muonEtaCut")); + return cut; + } + if (nameStr == "muonMinimalCuts") { cut->AddCut(GetAnalysisCut("muonMinimalCuts")); return cut; @@ -6558,6 +6563,11 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } + if (nameStr == "muonEtaCut") { + cut->AddCut(VarManager::kEta, -4.0, -2.5); + return cut; + } + if (nameStr == "muonMinimalCuts") { cut->AddCut(VarManager::kEta, -4.0, -2.5); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 17.6, 89.5); diff --git a/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx b/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx index 84d9a42bbbc..db23106623d 100644 --- a/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx +++ b/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx @@ -420,7 +420,7 @@ struct tableMakerMuonMchTrkEfficiency { for (int i = 0; i < ncuts; i++) nselmuons.push_back(0); - rowCandidateBase.reserve(tracksMuon.size()); + //rowCandidateBase.reserve(tracksMuon.size()); for (auto& muon : tracksMuon) { VarManager::FillTrack(muon); @@ -486,8 +486,8 @@ struct tableMakerMuonMchTrkEfficiency { for (int i = 0; i < ncuts; i++) nselmuons.push_back(0); - rowCandidateBase.reserve(tracksMuon.size()); - rowCandidateGen.reserve(tracksMuon.size()); + //rowCandidateBase.reserve(tracksMuon.size()); + //rowCandidateGen.reserve(tracksMuon.size()); for (auto& muon : tracksMuon) { /// /// First compute MC matched quantities using either the DQ skimmed or the Framework data models diff --git a/PWGDQ/Tasks/taskFwdTrackPid.cxx b/PWGDQ/Tasks/taskFwdTrackPid.cxx index 8f7febbbf28..f98ee654897 100644 --- a/PWGDQ/Tasks/taskFwdTrackPid.cxx +++ b/PWGDQ/Tasks/taskFwdTrackPid.cxx @@ -131,7 +131,7 @@ struct taskFwdTrackPid { template void runFwdTrackPid(TEvent const& event, Muons const& muons, MftTracks const& mftTracks) { - fwdPidAllList.reserve(1); + //fwdPidAllList.reserve(1); for (const auto& muon : muons) { if (muon.has_matchMFTTrack() && muon.trackType() == 0 && TMath::Abs(muon.fwdDcaX()) < fConfigMaxDCA && TMath::Abs(muon.fwdDcaY()) < fConfigMaxDCA) { auto mftTrack = muon.template matchMFTTrack_as(); @@ -157,7 +157,7 @@ struct taskFwdTrackPid { template void runFwdTrackPidMC(TEvent const& event, Muons const& muons, MftTracks const& mftTracks, TEventsMC const& /*eventsMC*/, TTracksMC const& /*tracksMC*/) { - fwdPidAllList.reserve(1); + //fwdPidAllList.reserve(1); for (const auto& muon : muons) { if (muon.has_matchMFTTrack() && muon.trackType() == 0 && TMath::Abs(muon.fwdDcaX()) < fConfigMaxDCA && TMath::Abs(muon.fwdDcaY()) < fConfigMaxDCA) { auto mftTrack = muon.template matchMFTTrack_as(); From 71527465a87731bd9dd41734d5b284721b624f71 Mon Sep 17 00:00:00 2001 From: Lucamicheletti92 Date: Wed, 9 Sep 2026 16:17:19 +0200 Subject: [PATCH 2/3] Clang fix --- PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx | 6 +++--- PWGDQ/Tasks/taskFwdTrackPid.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx b/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx index db23106623d..05b202eb6aa 100644 --- a/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx +++ b/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx @@ -420,7 +420,7 @@ struct tableMakerMuonMchTrkEfficiency { for (int i = 0; i < ncuts; i++) nselmuons.push_back(0); - //rowCandidateBase.reserve(tracksMuon.size()); + // rowCandidateBase.reserve(tracksMuon.size()); for (auto& muon : tracksMuon) { VarManager::FillTrack(muon); @@ -486,8 +486,8 @@ struct tableMakerMuonMchTrkEfficiency { for (int i = 0; i < ncuts; i++) nselmuons.push_back(0); - //rowCandidateBase.reserve(tracksMuon.size()); - //rowCandidateGen.reserve(tracksMuon.size()); + // rowCandidateBase.reserve(tracksMuon.size()); + // rowCandidateGen.reserve(tracksMuon.size()); for (auto& muon : tracksMuon) { /// /// First compute MC matched quantities using either the DQ skimmed or the Framework data models diff --git a/PWGDQ/Tasks/taskFwdTrackPid.cxx b/PWGDQ/Tasks/taskFwdTrackPid.cxx index f98ee654897..d4e9a6c7e77 100644 --- a/PWGDQ/Tasks/taskFwdTrackPid.cxx +++ b/PWGDQ/Tasks/taskFwdTrackPid.cxx @@ -131,7 +131,7 @@ struct taskFwdTrackPid { template void runFwdTrackPid(TEvent const& event, Muons const& muons, MftTracks const& mftTracks) { - //fwdPidAllList.reserve(1); + // fwdPidAllList.reserve(1); for (const auto& muon : muons) { if (muon.has_matchMFTTrack() && muon.trackType() == 0 && TMath::Abs(muon.fwdDcaX()) < fConfigMaxDCA && TMath::Abs(muon.fwdDcaY()) < fConfigMaxDCA) { auto mftTrack = muon.template matchMFTTrack_as(); @@ -157,7 +157,7 @@ struct taskFwdTrackPid { template void runFwdTrackPidMC(TEvent const& event, Muons const& muons, MftTracks const& mftTracks, TEventsMC const& /*eventsMC*/, TTracksMC const& /*tracksMC*/) { - //fwdPidAllList.reserve(1); + // fwdPidAllList.reserve(1); for (const auto& muon : muons) { if (muon.has_matchMFTTrack() && muon.trackType() == 0 && TMath::Abs(muon.fwdDcaX()) < fConfigMaxDCA && TMath::Abs(muon.fwdDcaY()) < fConfigMaxDCA) { auto mftTrack = muon.template matchMFTTrack_as(); From f67fb5cbaa579f98b90d1bdf9bf3b99d41a09735 Mon Sep 17 00:00:00 2001 From: Lucamicheletti92 Date: Wed, 9 Sep 2026 16:37:29 +0200 Subject: [PATCH 3/3] Comments removed --- PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx | 3 --- PWGDQ/Tasks/taskFwdTrackPid.cxx | 2 -- 2 files changed, 5 deletions(-) diff --git a/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx b/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx index 05b202eb6aa..6706073625b 100644 --- a/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx +++ b/PWGDQ/TableProducer/tableMakerMuonMchTrkEfficiency.cxx @@ -420,7 +420,6 @@ struct tableMakerMuonMchTrkEfficiency { for (int i = 0; i < ncuts; i++) nselmuons.push_back(0); - // rowCandidateBase.reserve(tracksMuon.size()); for (auto& muon : tracksMuon) { VarManager::FillTrack(muon); @@ -486,8 +485,6 @@ struct tableMakerMuonMchTrkEfficiency { for (int i = 0; i < ncuts; i++) nselmuons.push_back(0); - // rowCandidateBase.reserve(tracksMuon.size()); - // rowCandidateGen.reserve(tracksMuon.size()); for (auto& muon : tracksMuon) { /// /// First compute MC matched quantities using either the DQ skimmed or the Framework data models diff --git a/PWGDQ/Tasks/taskFwdTrackPid.cxx b/PWGDQ/Tasks/taskFwdTrackPid.cxx index d4e9a6c7e77..d47f95a913e 100644 --- a/PWGDQ/Tasks/taskFwdTrackPid.cxx +++ b/PWGDQ/Tasks/taskFwdTrackPid.cxx @@ -131,7 +131,6 @@ struct taskFwdTrackPid { template void runFwdTrackPid(TEvent const& event, Muons const& muons, MftTracks const& mftTracks) { - // fwdPidAllList.reserve(1); for (const auto& muon : muons) { if (muon.has_matchMFTTrack() && muon.trackType() == 0 && TMath::Abs(muon.fwdDcaX()) < fConfigMaxDCA && TMath::Abs(muon.fwdDcaY()) < fConfigMaxDCA) { auto mftTrack = muon.template matchMFTTrack_as(); @@ -157,7 +156,6 @@ struct taskFwdTrackPid { template void runFwdTrackPidMC(TEvent const& event, Muons const& muons, MftTracks const& mftTracks, TEventsMC const& /*eventsMC*/, TTracksMC const& /*tracksMC*/) { - // fwdPidAllList.reserve(1); for (const auto& muon : muons) { if (muon.has_matchMFTTrack() && muon.trackType() == 0 && TMath::Abs(muon.fwdDcaX()) < fConfigMaxDCA && TMath::Abs(muon.fwdDcaY()) < fConfigMaxDCA) { auto mftTrack = muon.template matchMFTTrack_as();