Skip to content

Please consider the following formatting changes to #13685 #493

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
ddobrigk merged 1 commit into from
Nov 4, 2025
Merged

Please consider the following formatting changes to #13685 #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 32 additions & 33 deletions PWGLF/DataModel/LFStrangenessPIDTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
//**********************************************************************

//**********************************************************************
// Nota bene: when using, do not check track.hasTOF! That conditional may not match
// the calculation of strangeness TOF, which requires e.g. a successful calculation
// Nota bene: when using, do not check track.hasTOF! That conditional may not match
// the calculation of strangeness TOF, which requires e.g. a successful calculation
// of the collision time for the reassociated collision
//**********************************************************************

Expand Down Expand Up @@ -82,21 +82,21 @@
namespace dautrack_legacy
{
// ==== LEGACY TPC INFORMATION (full size tables) ===
DECLARE_SOA_COLUMN(TPCNSigmaEl, tpcNSigmaEl, float); //! Nsigma proton

Check failure on line 85 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float); //! Nsigma proton

Check failure on line 86 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCNSigmaKa, tpcNSigmaKa, float); //! Nsigma proton

Check failure on line 87 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCNSigmaPr, tpcNSigmaPr, float); //! Nsigma proton

Check failure on line 88 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCNSigmaHe, tpcNSigmaHe, float); //! Nsigma proton

Check failure on line 89 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
} // namespace dautrack_legacy

namespace dautrack
{
// ==== COMPACT TPC INFORMATION (full size tables) ===
DECLARE_SOA_COLUMN(TPCSignal, tpcSignal, float); //! track TPC signal

Check failure on line 95 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(PackedTPCNSigmaEl, packedTpcNSigmaEl, int8_t); //! Nsigma proton

Check failure on line 96 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(PackedTPCNSigmaPi, packedTpcNSigmaPi, int8_t); //! Nsigma proton

Check failure on line 97 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(PackedTPCNSigmaKa, packedTpcNSigmaKa, int8_t); //! Nsigma proton

Check failure on line 98 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(PackedTPCNSigmaPr, packedTpcNSigmaPr, int8_t); //! Nsigma proton

Check failure on line 99 in PWGLF/DataModel/LFStrangenessPIDTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaEl, tpcNSigmaEl, //! unpacked TPC nsigma
[](int8_t nsigma_packed) -> float { return o2::aod::dautrack::packing::unpackInt8(nsigma_packed); });
Expand Down Expand Up @@ -213,21 +213,21 @@

// dynamics to replace hasTOF (note: that condition does not match track hasTOF!)
// note: only single hypothesis check necessary; other hypotheses will always be valid
DECLARE_SOA_DYNAMIC_COLUMN(PositiveHasTOF, positiveHasTOF, //! positive daughter TOF calculation valid
DECLARE_SOA_DYNAMIC_COLUMN(PositiveHasTOF, positiveHasTOF, //! positive daughter TOF calculation valid
[](float TOFNSigmaLaPr) -> bool {
bool returnStatus = true;
if(std::abs(TOFNSigmaLaPr - kNoTOFValue) < kEpsilon){
returnStatus = false;
}
return returnStatus;
bool returnStatus = true;
if (std::abs(TOFNSigmaLaPr - kNoTOFValue) < kEpsilon) {
returnStatus = false;
}
return returnStatus;
});
DECLARE_SOA_DYNAMIC_COLUMN(NegativeHasTOF, negativeHasTOF, //! negative daughter TOF calculation valid
DECLARE_SOA_DYNAMIC_COLUMN(NegativeHasTOF, negativeHasTOF, //! negative daughter TOF calculation valid
[](float TOFNSigmaALaPr) -> bool {
bool returnStatus = true;
if(std::abs(TOFNSigmaALaPr - kNoTOFValue) < kEpsilon){
returnStatus = false;
}
return returnStatus;
bool returnStatus = true;
if (std::abs(TOFNSigmaALaPr - kNoTOFValue) < kEpsilon) {
returnStatus = false;
}
return returnStatus;
});

// dynamics based on n-sigmas with use-only-if-tof-present logic
Expand Down Expand Up @@ -356,31 +356,30 @@

// dynamics to replace hasTOF (note: that condition does not match track hasTOF!)
// note: only single hypothesis check necessary; other hypotheses will always be valid
DECLARE_SOA_DYNAMIC_COLUMN(PositiveHasTOF, positiveHasTOF, //! positive daughter TOF calculation valid
DECLARE_SOA_DYNAMIC_COLUMN(PositiveHasTOF, positiveHasTOF, //! positive daughter TOF calculation valid
[](float PosTOFDeltaTXiPr) -> bool {
bool returnStatus = true;
if(std::abs(PosTOFDeltaTXiPr - kNoTOFValue) < kEpsilon){
returnStatus = false;
}
return returnStatus;
bool returnStatus = true;
if (std::abs(PosTOFDeltaTXiPr - kNoTOFValue) < kEpsilon) {
returnStatus = false;
}
return returnStatus;
});
DECLARE_SOA_DYNAMIC_COLUMN(NegativeHasTOF, negativeHasTOF, //! positive daughter TOF calculation valid
DECLARE_SOA_DYNAMIC_COLUMN(NegativeHasTOF, negativeHasTOF, //! positive daughter TOF calculation valid
[](float NegTOFDeltaTXiPr) -> bool {
bool returnStatus = true;
if(std::abs(NegTOFDeltaTXiPr - kNoTOFValue) < kEpsilon){
returnStatus = false;
}
return returnStatus;
bool returnStatus = true;
if (std::abs(NegTOFDeltaTXiPr - kNoTOFValue) < kEpsilon) {
returnStatus = false;
}
return returnStatus;
});
DECLARE_SOA_DYNAMIC_COLUMN(BachelorHasTOF, bachelorHasTOF, //! bachelor daughter TOF calculation valid
DECLARE_SOA_DYNAMIC_COLUMN(BachelorHasTOF, bachelorHasTOF, //! bachelor daughter TOF calculation valid
[](float BachTOFDeltaTXiPi) -> bool {
bool returnStatus = true;
if(std::abs(BachTOFDeltaTXiPi - kNoTOFValue) < kEpsilon){
returnStatus = false;
}
return returnStatus;
bool returnStatus = true;
if (std::abs(BachTOFDeltaTXiPi - kNoTOFValue) < kEpsilon) {
returnStatus = false;
}
return returnStatus;
});


// dynamics based on n-sigmas with use-only-if-tof-present logic
DECLARE_SOA_DYNAMIC_COLUMN(TofXiCompatibility, tofXiCompatibility, //! compatibility with being lambda, checked only if TOF present. Argument: number of sigmas
Expand Down
10 changes: 5 additions & 5 deletions PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ struct strangenesstofpid {
const o2::math_utils::Point3D<float> trackVertex{trackCollision.posX(), trackCollision.posY(), trackCollision.posZ()};
o2::track::TrackLTIntegral ltIntegral;
bool successPropag = o2::base::Propagator::Instance()->propagateToDCA(trackVertex, posTrack, d_bz, 2.f, o2::base::Propagator::MatCorrType::USEMatCorrNONE, nullptr, &ltIntegral);
if(doQA){
if (doQA) {
histos.fill(HIST("hPropagationBookkeeping"), kPropagPosV0, static_cast<float>(successPropag));
}
if (successPropag) {
Expand Down Expand Up @@ -901,7 +901,7 @@ struct strangenesstofpid {
const o2::math_utils::Point3D<float> trackVertex{trackCollision.posX(), trackCollision.posY(), trackCollision.posZ()};
o2::track::TrackLTIntegral ltIntegral;
bool successPropag = o2::base::Propagator::Instance()->propagateToDCA(trackVertex, negTrack, d_bz, 2.f, o2::base::Propagator::MatCorrType::USEMatCorrNONE, nullptr, &ltIntegral);
if(doQA){
if (doQA) {
histos.fill(HIST("hPropagationBookkeeping"), kPropagNegV0, static_cast<float>(successPropag));
}
if (successPropag) {
Expand Down Expand Up @@ -1096,7 +1096,7 @@ struct strangenesstofpid {
const o2::math_utils::Point3D<float> trackVertex{trackCollision.posX(), trackCollision.posY(), trackCollision.posZ()};
o2::track::TrackLTIntegral ltIntegral;
bool successPropag = o2::base::Propagator::Instance()->propagateToDCA(trackVertex, posTrack, d_bz, 2.f, o2::base::Propagator::MatCorrType::USEMatCorrNONE, nullptr, &ltIntegral);
if(doQA){
if (doQA) {
histos.fill(HIST("hPropagationBookkeeping"), kPropagPosCasc, static_cast<float>(successPropag));
}
if (successPropag) {
Expand Down Expand Up @@ -1188,7 +1188,7 @@ struct strangenesstofpid {
const o2::math_utils::Point3D<float> trackVertex{trackCollision.posX(), trackCollision.posY(), trackCollision.posZ()};
o2::track::TrackLTIntegral ltIntegral;
bool successPropag = o2::base::Propagator::Instance()->propagateToDCA(trackVertex, negTrack, d_bz, 2.f, o2::base::Propagator::MatCorrType::USEMatCorrNONE, nullptr, &ltIntegral);
if(doQA){
if (doQA) {
histos.fill(HIST("hPropagationBookkeeping"), kPropagNegCasc, static_cast<float>(successPropag));
}
if (successPropag) {
Expand Down Expand Up @@ -1280,7 +1280,7 @@ struct strangenesstofpid {
const o2::math_utils::Point3D<float> trackVertex{trackCollision.posX(), trackCollision.posY(), trackCollision.posZ()};
o2::track::TrackLTIntegral ltIntegral;
bool successPropag = o2::base::Propagator::Instance()->propagateToDCA(trackVertex, bachTrack, d_bz, 2.f, o2::base::Propagator::MatCorrType::USEMatCorrNONE, nullptr, &ltIntegral);
if(doQA){
if (doQA) {
histos.fill(HIST("hPropagationBookkeeping"), kPropagBachCasc, static_cast<float>(successPropag));
}
if (successPropag) {
Expand Down
Loading