Skip to content

[PWGLF,Tutorial] Upload k1analysismicro.cxx and fix typo #11528

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
BongHwi merged 9 commits into from
Jun 20, 2025
Merged

[PWGLF,Tutorial] Upload k1analysismicro.cxx and fix typo #11528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c194d2d
Upload k1analysismicro.cxx and fix typo
SuJeong-Ji Jun 10, 2025
7a7180a
Please consider the following formatting changes
alibuild Jun 10, 2025
afdcc3b
Merge pull request #9 from alibuild/alibot-cleanup-11528
SuJeong-Ji Jun 10, 2025
7fed98f
fix typo in Tutorials/PWGLF/Resonance/resonancesMicrotrack.cxx
SuJeong-Ji Jun 10, 2025
6c6c793
Modify 'CMakeLists.txt' and fix o2linter errors for 'k1AnalysisMicro.…
SuJeong-Ji Jun 12, 2025
4a0555f
Please consider the following formatting changes
alibuild Jun 12, 2025
f1115a6
Merge pull request #10 from alibuild/alibot-cleanup-11528
SuJeong-Ji Jun 12, 2025
66a9746
modified mass of K892 to use 'MassK0Star892'
SuJeong-Ji Jun 15, 2025
b024341
Use existing constants instead of redefining particle masses
SuJeong-Ji Jun 16, 2025
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
16 changes: 8 additions & 8 deletions PWGLF/DataModel/LFResonanceTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Sign, sign,

} // namespace resodaughter

namespace resodmciroaughter
namespace resomicrodaughter
{
// micro track for primary pion

Expand Down Expand Up @@ -471,7 +471,7 @@ struct ResoMicroTrackSelFlag {
};

DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt, [](float px, float py) -> float { return RecoDecay::sqrtSumOfSquares(px, py); });
} // namespace resodmciroaughter
} // namespace resomicrodaughter

DECLARE_SOA_TABLE(ResoTracks, "AOD", "RESOTRACK",
o2::soa::Index<>,
Expand Down Expand Up @@ -525,13 +525,13 @@ DECLARE_SOA_TABLE(ResoMicroTracks, "AOD", "RESOMICROTRACK",
resodaughter::Px,
resodaughter::Py,
resodaughter::Pz,
resodmciroaughter::PidNSigmaPiFlag,
resodmciroaughter::PidNSigmaKaFlag,
resodmciroaughter::PidNSigmaPrFlag,
resodmciroaughter::TrackSelectionFlags,
resomicrodaughter::PidNSigmaPiFlag,
resomicrodaughter::PidNSigmaKaFlag,
resomicrodaughter::PidNSigmaPrFlag,
resomicrodaughter::TrackSelectionFlags,
resodaughter::TrackFlags,
// Dynamic columns
resodmciroaughter::Pt<resodaughter::Px, resodaughter::Py>,
resomicrodaughter::Pt<resodaughter::Px, resodaughter::Py>,
resodaughter::Eta<resodaughter::Px, resodaughter::Py, resodaughter::Pz>,
resodaughter::Phi<resodaughter::Px, resodaughter::Py>,
resodaughter::PassedITSRefit<resodaughter::TrackFlags>,
Expand All @@ -540,7 +540,7 @@ DECLARE_SOA_TABLE(ResoMicroTracks, "AOD", "RESOMICROTRACK",
resodaughter::IsGlobalTrack<resodaughter::TrackFlags>,
resodaughter::IsPrimaryTrack<resodaughter::TrackFlags>,
resodaughter::IsPVContributor<resodaughter::TrackFlags>,
resodmciroaughter::HasTOF<resodmciroaughter::PidNSigmaPiFlag>,
resomicrodaughter::HasTOF<resomicrodaughter::PidNSigmaPiFlag>,
resodaughter::Sign<resodaughter::TrackFlags>);
using ResoMicroTrack = ResoMicroTracks::iterator;

Expand Down
8 changes: 4 additions & 4 deletions PWGLF/TableProducer/Resonances/resonanceInitializer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ struct ResonanceInitializer {
continue;
if (!filterMicroTrack(track))
continue;
o2::aod::resodmciroaughter::ResoMicroTrackSelFlag trackSelFlag(track.dcaXY(), track.dcaZ());
o2::aod::resomicrodaughter::ResoMicroTrackSelFlag trackSelFlag(track.dcaXY(), track.dcaZ());
if (std::abs(track.dcaXY()) < (0.004 + (0.013 / track.pt()))) {
trackSelFlag.setDCAxy0();
}
Expand All @@ -673,9 +673,9 @@ struct ResonanceInitializer {
track.px(),
track.py(),
track.pz(),
static_cast<uint8_t>(o2::aod::resodmciroaughter::PidNSigma(std::abs(track.tpcNSigmaPi()), std::abs(track.tofNSigmaPi()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resodmciroaughter::PidNSigma(std::abs(track.tpcNSigmaKa()), std::abs(track.tofNSigmaKa()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resodmciroaughter::PidNSigma(std::abs(track.tpcNSigmaPr()), std::abs(track.tofNSigmaPr()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resomicrodaughter::PidNSigma(std::abs(track.tpcNSigmaPi()), std::abs(track.tofNSigmaPi()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resomicrodaughter::PidNSigma(std::abs(track.tpcNSigmaKa()), std::abs(track.tofNSigmaKa()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resomicrodaughter::PidNSigma(std::abs(track.tpcNSigmaPr()), std::abs(track.tofNSigmaPr()), track.hasTOF())),
static_cast<uint8_t>(trackSelFlag),
trackFlags);
if (!cfgBypassTrackIndexFill) {
Expand Down
8 changes: 4 additions & 4 deletions PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ struct ResonanceDaughterInitializer {
for (auto const& track : tracks) {
if (!filterMicroTrack(track))
continue;
o2::aod::resodmciroaughter::ResoMicroTrackSelFlag trackSelFlag(track.dcaXY(), track.dcaZ());
o2::aod::resomicrodaughter::ResoMicroTrackSelFlag trackSelFlag(track.dcaXY(), track.dcaZ());
if (std::abs(track.dcaXY()) < (0.004 + (0.013 / track.pt()))) {
trackSelFlag.setDCAxy0();
}
Expand All @@ -836,9 +836,9 @@ struct ResonanceDaughterInitializer {
track.px(),
track.py(),
track.pz(),
static_cast<uint8_t>(o2::aod::resodmciroaughter::PidNSigma(std::abs(track.tpcNSigmaPi()), std::abs(track.tofNSigmaPi()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resodmciroaughter::PidNSigma(std::abs(track.tpcNSigmaKa()), std::abs(track.tofNSigmaKa()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resodmciroaughter::PidNSigma(std::abs(track.tpcNSigmaPr()), std::abs(track.tofNSigmaPr()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resomicrodaughter::PidNSigma(std::abs(track.tpcNSigmaPi()), std::abs(track.tofNSigmaPi()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resomicrodaughter::PidNSigma(std::abs(track.tpcNSigmaKa()), std::abs(track.tofNSigmaKa()), track.hasTOF())),
static_cast<uint8_t>(o2::aod::resomicrodaughter::PidNSigma(std::abs(track.tpcNSigmaPr()), std::abs(track.tofNSigmaPr()), track.hasTOF())),
static_cast<uint8_t>(trackSelFlag),
trackFlags);
if (!cfgBypassTrackIndexFill) {
Expand Down
5 changes: 5 additions & 0 deletions PWGLF/Tasks/Resonances/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ o2physics_add_dpl_workflow(k1analysis
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(k1analysismicro
SOURCES k1AnalysisMicro.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(phianalysisrun3
SOURCES phianalysisrun3.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
Expand Down
22 changes: 11 additions & 11 deletions PWGLF/Tasks/Resonances/doubleResonanceScan.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,13 @@ struct DoubleResonanceScan {
if (std::abs(track.pt()) < cMinPtcut)
return false;
if (cUsePtDependentDCArCut) {
if (o2::aod::resodmciroaughter::ResoMicroTrackSelFlag::decodeDCAxy(track.trackSelectionFlags()) > -Epsilon)
if (o2::aod::resomicrodaughter::ResoMicroTrackSelFlag::decodeDCAxy(track.trackSelectionFlags()) > -Epsilon)
return false;
} else {
if (o2::aod::resodmciroaughter::ResoMicroTrackSelFlag::decodeDCAxy(track.trackSelectionFlags()) > cMaxDCArToPVcut - Epsilon)
if (o2::aod::resomicrodaughter::ResoMicroTrackSelFlag::decodeDCAxy(track.trackSelectionFlags()) > cMaxDCArToPVcut - Epsilon)
return false;
}
if (o2::aod::resodmciroaughter::ResoMicroTrackSelFlag::decodeDCAz(track.trackSelectionFlags()) > cMaxDCAzToPVcut - Epsilon)
if (o2::aod::resomicrodaughter::ResoMicroTrackSelFlag::decodeDCAz(track.trackSelectionFlags()) > cMaxDCAzToPVcut - Epsilon)
return false;
if (cfgPrimaryTrack && !track.isPrimaryTrack())
return false;
Expand Down Expand Up @@ -268,11 +268,11 @@ struct DoubleResonanceScan {
} else {
switch (particleType) {
case 0: // pion
return o2::aod::resodmciroaughter::PidNSigma::getTPCnSigma(candidate.pidNSigmaPiFlag());
return o2::aod::resomicrodaughter::PidNSigma::getTPCnSigma(candidate.pidNSigmaPiFlag());
case 1: // kaon
return o2::aod::resodmciroaughter::PidNSigma::getTPCnSigma(candidate.pidNSigmaKaFlag());
return o2::aod::resomicrodaughter::PidNSigma::getTPCnSigma(candidate.pidNSigmaKaFlag());
case 2: // proton
return o2::aod::resodmciroaughter::PidNSigma::getTPCnSigma(candidate.pidNSigmaPrFlag());
return o2::aod::resomicrodaughter::PidNSigma::getTPCnSigma(candidate.pidNSigmaPrFlag());
default:
return -999;
}
Expand All @@ -297,11 +297,11 @@ struct DoubleResonanceScan {
} else {
switch (particleType) {
case 0: // pion
return candidate.hasTOF() ? o2::aod::resodmciroaughter::PidNSigma::getTOFnSigma(candidate.pidNSigmaPiFlag()) : -999;
return candidate.hasTOF() ? o2::aod::resomicrodaughter::PidNSigma::getTOFnSigma(candidate.pidNSigmaPiFlag()) : -999;
case 1: // kaon
return candidate.hasTOF() ? o2::aod::resodmciroaughter::PidNSigma::getTOFnSigma(candidate.pidNSigmaKaFlag()) : -999;
return candidate.hasTOF() ? o2::aod::resomicrodaughter::PidNSigma::getTOFnSigma(candidate.pidNSigmaKaFlag()) : -999;
case 2: // proton
return candidate.hasTOF() ? o2::aod::resodmciroaughter::PidNSigma::getTOFnSigma(candidate.pidNSigmaPrFlag()) : -999;
return candidate.hasTOF() ? o2::aod::resomicrodaughter::PidNSigma::getTOFnSigma(candidate.pidNSigmaPrFlag()) : -999;
default:
return -999;
}
Expand Down Expand Up @@ -338,8 +338,8 @@ struct DoubleResonanceScan {
dcaXY = track.dcaXY();
dcaZ = track.dcaZ();
} else {
dcaXY = o2::aod::resodmciroaughter::ResoMicroTrackSelFlag::decodeDCAxy(track.trackSelectionFlags());
dcaZ = o2::aod::resodmciroaughter::ResoMicroTrackSelFlag::decodeDCAz(track.trackSelectionFlags());
dcaXY = o2::aod::resomicrodaughter::ResoMicroTrackSelFlag::decodeDCAxy(track.trackSelectionFlags());
dcaZ = o2::aod::resomicrodaughter::ResoMicroTrackSelFlag::decodeDCAz(track.trackSelectionFlags());
}
// FIXME: Apply better method
switch (daughterIndex) {
Expand Down
Loading