Skip to content

Add DCAxy recalculation for muons #6233

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
iarsene merged 16 commits into from
May 24, 2024
Merged

Add DCAxy recalculation for muons #6233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0818ac2
Add search window for matching
motomioya Oct 25, 2023
229096c
Fixed bugs in filter
motomioya Oct 25, 2023
7d43425
Merge branch 'AliceO2Group:master' into master
motomioya Oct 26, 2023
b61e431
Modify for formatting
motomioya Oct 26, 2023
c4d7a07
Merge branch 'AliceO2Group:master' into master
motomioya Nov 16, 2023
6c43b5a
Merge branch 'AliceO2Group:master' into master
motomioya Nov 30, 2023
5d93541
Fixed to select one mfttrack per fwdtrack
motomioya Nov 30, 2023
4eed1ae
Fixed MCH track to match single MFT track
motomioya Dec 1, 2023
1392447
Modified white space
motomioya Dec 1, 2023
b2d0237
Merge branch 'AliceO2Group:master' into master
motomioya Jan 30, 2024
5e4f064
Merge branch 'AliceO2Group:master' into master
motomioya Apr 18, 2024
22b02a1
Merge branch 'AliceO2Group:master' into master
motomioya May 6, 2024
81a7c67
Add process to associated muons
motomioya May 8, 2024
fd3fe9e
Modified to follow conventions
motomioya May 18, 2024
8dfc8b0
Merge branch 'AliceO2Group:master' into master
motomioya May 21, 2024
4f76a96
Add DCA recalculation for muons
motomioya May 22, 2024
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
12 changes: 12 additions & 0 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,6 +2049,18 @@ void VarManager::FillTrackCollision(T const& track, C const& collision, float* v
}
}
}
if constexpr ((fillMap & MuonCov) > 0 || (fillMap & ReducedMuonCov) > 0) {

o2::dataformats::GlobalFwdTrack propmuon = PropagateMuon(track, collision);
o2::dataformats::GlobalFwdTrack propmuonAtDCA = PropagateMuon(track, collision, kToDCA);

float dcaX = (propmuonAtDCA.getX() - collision.posX());
float dcaY = (propmuonAtDCA.getY() - collision.posY());
float dcaXY = std::sqrt(dcaX * dcaX + dcaY * dcaY);
values[kMuonPDca] = track.p() * dcaXY;
values[kMuonDCAx] = dcaX;
values[kMuonDCAy] = dcaY;
}
}

template <uint32_t fillMap, typename T, typename C, typename M, typename P>
Expand Down
14 changes: 7 additions & 7 deletions PWGDQ/TableProducer/tableMaker.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,9 +668,9 @@ struct TableMaker {
// recalculte pDca for global muon tracks
if (static_cast<int>(muon.trackType()) < 2) {
auto const& matchMCH = muon.template matchMCHTrack_as<TMuons>();
VarManager::FillMuonPDca<TMuonFillMap>(matchMCH, collision);
VarManager::FillTrackCollision<TMuonFillMap>(matchMCH, collision);
} else if (static_cast<int>(muon.trackType()) > 2) {
VarManager::FillMuonPDca<TMuonFillMap>(muon, collision);
VarManager::FillTrackCollision<TMuonFillMap>(muon, collision);
}

if (fPropMuon) {
Expand Down Expand Up @@ -1039,9 +1039,9 @@ struct TableMaker {
// recalculte pDca for global muon tracks
if (static_cast<int>(muon.trackType()) < 2) {
auto const& matchMCH = tracksMuon.rawIteratorAt(static_cast<int>(muon.matchMCHTrackId()));
VarManager::FillMuonPDca<TMuonFillMap>(matchMCH, collision);
VarManager::FillTrackCollision<TMuonFillMap>(matchMCH, collision);
} else if (static_cast<int>(muon.trackType()) > 2) {
VarManager::FillMuonPDca<TMuonFillMap>(muon, collision);
VarManager::FillTrackCollision<TMuonFillMap>(muon, collision);
}

if (fPropMuon) {
Expand Down Expand Up @@ -1545,7 +1545,7 @@ struct TableMaker {
{
for (auto& collision : collisions) {
auto muonIdsThisCollision = fwdtrackIndices.sliceBy(fwdtrackIndicesPerCollision, collision.globalIndex());
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMapWithCovAmbi>(collision, bcs, nullptr, tracksMuon, nullptr, muonIdsThisCollision);
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMapWithCov>(collision, bcs, nullptr, tracksMuon, nullptr, muonIdsThisCollision);
}
}

Expand All @@ -1554,7 +1554,7 @@ struct TableMaker {
{
for (auto& collision : collisions) {
auto muonIdsThisCollision = fwdtrackIndices.sliceBy(fwdtrackIndicesPerCollision, collision.globalIndex());
fullSkimmingIndices<gkEventFillMapWithCent, 0u, gkMuonFillMapWithCovAmbi>(collision, bcs, nullptr, tracksMuon, nullptr, muonIdsThisCollision);
fullSkimmingIndices<gkEventFillMapWithCent, 0u, gkMuonFillMapWithCov>(collision, bcs, nullptr, tracksMuon, nullptr, muonIdsThisCollision);
}
}

Expand All @@ -1563,7 +1563,7 @@ struct TableMaker {
{
for (auto& collision : collisions) {
auto muonIdsThisCollision = fwdtrackIndices.sliceBy(fwdtrackIndicesPerCollision, collision.globalIndex());
fullSkimmingIndices<gkEventFillMapWithMult, 0u, gkMuonFillMapWithCovAmbi>(collision, bcs, nullptr, tracksMuon, nullptr, muonIdsThisCollision);
fullSkimmingIndices<gkEventFillMapWithMult, 0u, gkMuonFillMapWithCov>(collision, bcs, nullptr, tracksMuon, nullptr, muonIdsThisCollision);
}
}

Expand Down
22 changes: 11 additions & 11 deletions PWGDQ/TableProducer/tableMakerMC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,9 +1254,9 @@ struct TableMakerMC {
// recalculte pDca for global muon tracks
if (static_cast<int>(muon.trackType()) < 2) {
auto const& matchMCH = tracksMuon.rawIteratorAt(static_cast<int>(muon.matchMCHTrackId()));
VarManager::FillMuonPDca<TMuonFillMap>(matchMCH, collision);
VarManager::FillTrackCollision<TMuonFillMap>(matchMCH, collision);
} else if (static_cast<int>(muon.trackType()) > 2) {
VarManager::FillMuonPDca<TMuonFillMap>(muon, collision);
VarManager::FillTrackCollision<TMuonFillMap>(muon, collision);
}
if (fPropMuon) {
VarManager::FillPropagateMuon<TMuonFillMap>(muon, collision);
Expand Down Expand Up @@ -1595,28 +1595,28 @@ struct TableMakerMC {
soa::Filtered<MyMuonsColl> const& tracksMuon,
aod::McCollisions const& mcEvents, aod::McParticles_001 const& mcTracks, aod::FwdTrackAssoc const& fwdtrackIndices)
{
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMapWithAmbi>(collisions, bcs, nullptr, tracksMuon, mcEvents, mcTracks, nullptr, fwdtrackIndices);
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMap>(collisions, bcs, nullptr, tracksMuon, mcEvents, mcTracks, nullptr, fwdtrackIndices);
}

void processAssociatedMuonOnlyWithCov(MyEvents const& collisions, aod::BCsWithTimestamps const& bcs,
soa::Filtered<MyMuonsColl> const& tracksMuon,
soa::Filtered<MyMuonsCollWithCov> const& tracksMuon,
aod::McCollisions const& mcEvents, aod::McParticles_001 const& mcTracks, aod::FwdTrackAssoc const& fwdtrackIndices)
{
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMapWithAmbi>(collisions, bcs, nullptr, tracksMuon, mcEvents, mcTracks, nullptr, fwdtrackIndices);
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMapWithCov>(collisions, bcs, nullptr, tracksMuon, mcEvents, mcTracks, nullptr, fwdtrackIndices);
}

void processAssociatedMuonOnlyWithCovAndCent(MyEvents const& collisions, aod::BCsWithTimestamps const& bcs,
soa::Filtered<MyMuonsColl> const& tracksMuon,
void processAssociatedMuonOnlyWithCovAndCent(MyEventsWithCent const& collisions, aod::BCsWithTimestamps const& bcs,
soa::Filtered<MyMuonsCollWithCov> const& tracksMuon,
aod::McCollisions const& mcEvents, aod::McParticles_001 const& mcTracks, aod::FwdTrackAssoc const& fwdtrackIndices)
{
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMapWithAmbi>(collisions, bcs, nullptr, tracksMuon, mcEvents, mcTracks, nullptr, fwdtrackIndices);
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMapWithCov>(collisions, bcs, nullptr, tracksMuon, mcEvents, mcTracks, nullptr, fwdtrackIndices);
}

void processAssociatedMuonOnlyWithCovAndMults(MyEvents const& collisions, aod::BCsWithTimestamps const& bcs,
soa::Filtered<MyMuonsColl> const& tracksMuon,
void processAssociatedMuonOnlyWithCovAndMults(MyEventsWithCentAndMults const& collisions, aod::BCsWithTimestamps const& bcs,
soa::Filtered<MyMuonsCollWithCov> const& tracksMuon,
aod::McCollisions const& mcEvents, aod::McParticles_001 const& mcTracks, aod::FwdTrackAssoc const& fwdtrackIndices)
{
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMapWithAmbi>(collisions, bcs, nullptr, tracksMuon, mcEvents, mcTracks, nullptr, fwdtrackIndices);
fullSkimmingIndices<gkEventFillMap, 0u, gkMuonFillMapWithCov>(collisions, bcs, nullptr, tracksMuon, mcEvents, mcTracks, nullptr, fwdtrackIndices);
}
// Produce muon tables only for ambiguous tracks studies --------------------------------------------------------------------------------------
void processAmbiguousMuonOnly(MyEvents const& collisions, aod::BCsWithTimestamps const& bcs,
Expand Down