Skip to content
16 changes: 8 additions & 8 deletions PWGLF/DataModel/LFResonanceTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@

} // namespace resodaughter

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

Expand All @@ -343,8 +343,8 @@
/// @brief Constructor: Convert TPC & TOF values and save
PidNSigma(float TPCnSigma, float TOFnSigma, bool hasTOF)
{
uint8_t TPCencoded = encodeNSigma(TPCnSigma);

Check failure on line 346 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
uint8_t TOFencoded = hasTOF ? encodeNSigma(TOFnSigma) : 0x0F; // If TOF is not available, set all 4 bits to 1

Check failure on line 347 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
flag = (TPCencoded << 4) | TOFencoded; // Upper 4 bits = TPC, Lower 4 bits = TOF
}

Expand Down Expand Up @@ -378,12 +378,12 @@
/// @brief Restore TOF nSigma value (if not available, return NAN)
static float getTOFnSigma(uint8_t encoded)
{
uint8_t TOFencoded = encoded & 0x0F; // Extract lower 4 bits

Check failure on line 381 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
return (TOFencoded == 0x0F) ? NAN : decodeNSigma(TOFencoded);
}

/// @brief Operator to convert to uint8_t (automatic conversion support)
operator uint8_t() const

Check failure on line 386 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
{
return flag;
}
Expand Down Expand Up @@ -411,15 +411,15 @@
/// @brief Constructor: Convert DCAxy/DCAz and save (default 1~15 values)
ResoMicroTrackSelFlag(float DCAxy, float DCAz)
{
uint8_t DCAxyEncoded = encodeDCA(DCAxy);

Check failure on line 414 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
uint8_t DCAzEncoded = encodeDCA(DCAz);

Check failure on line 415 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
flag = (DCAxyEncoded << 4) | DCAzEncoded; // Upper 4 bits = DCAxy, Lower 4 bits = DCAz
}

/// @brief Convert DCA to 1~15 steps (0 value is not used)
static uint8_t encodeDCA(float DCA)
{
for (uint8_t i = 1; i < 15; i++) {

Check failure on line 422 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (DCA < i * 0.1f)
return i;
}
Expand All @@ -427,7 +427,7 @@
}

/// @brief Operator to convert to `uint8_t` (for SOA storage)
operator uint8_t() const

Check failure on line 430 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
{
return flag;
}
Expand Down Expand Up @@ -458,20 +458,20 @@
/// @brief Decode DCAxy
static float decodeDCAxy(uint8_t flag_saved)
{
uint8_t DCAxyFlag = (flag_saved >> 4) & 0x0F; // Extract upper 4 bits

Check failure on line 461 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
return (DCAxyFlag == 0) ? 0.0f : DCAxyFlag * 0.1f; // Tight cut(0) is 0.0, otherwise flag * 0.1 cm
}

/// @brief Decode DCAz
static float decodeDCAz(uint8_t flag_saved)
{
uint8_t DCAzFlag = flag_saved & 0x0F; // Extract lower 4 bits

Check failure on line 468 in PWGLF/DataModel/LFResonanceTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
return (DCAzFlag == 0) ? 0.0f : DCAzFlag * 0.1f; // Tight cut(0) is 0.0, otherwise flag * 0.1 cm
}
};

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 @@
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 @@
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
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
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
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
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
Loading