Skip to content

[PWGUD] Split tables to 4 and 6 tracks #17576

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
rolavick merged 2 commits into from
Aug 24, 2026
+249 −93
Merged

[PWGUD] Split tables to 4 and 6 tracks #17576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2bdf2a
Split tables to 4 and 6 tracks
amatyja Aug 24, 2026
9fb069c
Avoid magic numbers
amatyja Aug 24, 2026
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
150 changes: 119 additions & 31 deletions PWGUD/DataModel/TauThreeProngEventTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include <cstdint>
// derived tables for tautau->4 (=1+3) tracks
// derived tables for tautau->6 (=3+3) tracks
namespace o2::aod
{
namespace tautree
Expand Down Expand Up @@ -60,32 +61,60 @@ DECLARE_SOA_COLUMN(TotalFV0AmplitudeA, totalFV0AmplitudeA, float);
// DECLARE_SOA_COLUMN(TimeFT0A, timeFT0A, float);
// DECLARE_SOA_COLUMN(TimeFT0C, timeFT0C, float);
// DECLARE_SOA_COLUMN(TimeFV0A, timeFV0A, float);
// tracks
DECLARE_SOA_COLUMN(TrkPx, trkPx, float[6]);
DECLARE_SOA_COLUMN(TrkPy, trkPy, float[6]);
DECLARE_SOA_COLUMN(TrkPz, trkPz, float[6]);
DECLARE_SOA_COLUMN(TrkSign, trkSign, int[6]);
DECLARE_SOA_COLUMN(TrkDCAxy, trkDCAxy, float[6]);
DECLARE_SOA_COLUMN(TrkDCAz, trkDCAz, float[6]);
DECLARE_SOA_COLUMN(TrkTPCcr, trkTPCcr, int[6]);
DECLARE_SOA_COLUMN(TrkTPCfind, trkTPCfind, int[6]);
DECLARE_SOA_COLUMN(TrkTPCchi2, trkTPCchi2, float[6]);
DECLARE_SOA_COLUMN(TrkITSchi2, trkITSchi2, float[6]);
DECLARE_SOA_COLUMN(TrkITScl, trkITScl, int[6]);
// PID
DECLARE_SOA_COLUMN(TrkTPCsignal, trkTPCsignal, float[6]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaEl, trkTPCnSigmaEl, float[6]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaPi, trkTPCnSigmaPi, float[6]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaKa, trkTPCnSigmaKa, float[6]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaPr, trkTPCnSigmaPr, float[6]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaMu, trkTPCnSigmaMu, float[6]);
DECLARE_SOA_COLUMN(TrkTOFbeta, trkTOFbeta, float[6]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaEl, trkTOFnSigmaEl, float[6]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaPi, trkTOFnSigmaPi, float[6]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaKa, trkTOFnSigmaKa, float[6]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaPr, trkTOFnSigmaPr, float[6]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaMu, trkTOFnSigmaMu, float[6]);
DECLARE_SOA_COLUMN(TrkTOFchi2, trkTOFchi2, float[6]);
// tracks - 4 tracks
DECLARE_SOA_COLUMN(TrkPx, trkPx, float[4]);
DECLARE_SOA_COLUMN(TrkPy, trkPy, float[4]);
DECLARE_SOA_COLUMN(TrkPz, trkPz, float[4]);
DECLARE_SOA_COLUMN(TrkSign, trkSign, int[4]);
DECLARE_SOA_COLUMN(TrkDCAxy, trkDCAxy, float[4]);
DECLARE_SOA_COLUMN(TrkDCAz, trkDCAz, float[4]);
DECLARE_SOA_COLUMN(TrkTPCcr, trkTPCcr, int[4]);
DECLARE_SOA_COLUMN(TrkTPCfind, trkTPCfind, int[4]);
DECLARE_SOA_COLUMN(TrkTPCchi2, trkTPCchi2, float[4]);
DECLARE_SOA_COLUMN(TrkITSchi2, trkITSchi2, float[4]);
DECLARE_SOA_COLUMN(TrkITScl, trkITScl, int[4]);
// PID - 4 tracks
DECLARE_SOA_COLUMN(TrkTPCsignal, trkTPCsignal, float[4]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaEl, trkTPCnSigmaEl, float[4]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaPi, trkTPCnSigmaPi, float[4]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaKa, trkTPCnSigmaKa, float[4]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaPr, trkTPCnSigmaPr, float[4]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaMu, trkTPCnSigmaMu, float[4]);
DECLARE_SOA_COLUMN(TrkTOFbeta, trkTOFbeta, float[4]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaEl, trkTOFnSigmaEl, float[4]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaPi, trkTOFnSigmaPi, float[4]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaKa, trkTOFnSigmaKa, float[4]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaPr, trkTOFnSigmaPr, float[4]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaMu, trkTOFnSigmaMu, float[4]);
DECLARE_SOA_COLUMN(TrkTOFchi2, trkTOFchi2, float[4]);

// tracks - 6 tracks
DECLARE_SOA_COLUMN(Trk6Px, trk6Px, float[6]);
DECLARE_SOA_COLUMN(Trk6Py, trk6Py, float[6]);
DECLARE_SOA_COLUMN(Trk6Pz, trk6Pz, float[6]);
DECLARE_SOA_COLUMN(Trk6Sign, trk6Sign, int[6]);
DECLARE_SOA_COLUMN(Trk6DCAxy, trk6DCAxy, float[6]);
DECLARE_SOA_COLUMN(Trk6DCAz, trk6DCAz, float[6]);
DECLARE_SOA_COLUMN(Trk6TPCcr, trk6TPCcr, int[6]);
DECLARE_SOA_COLUMN(Trk6TPCfind, trk6TPCfind, int[6]);
DECLARE_SOA_COLUMN(Trk6TPCchi2, trk6TPCchi2, float[6]);
DECLARE_SOA_COLUMN(Trk6ITSchi2, trk6ITSchi2, float[6]);
DECLARE_SOA_COLUMN(Trk6ITScl, trk6ITScl, int[6]);
// PID - 6 tracks
DECLARE_SOA_COLUMN(Trk6TPCsignal, trk6TPCsignal, float[6]);
DECLARE_SOA_COLUMN(Trk6TPCnSigmaEl, trk6TPCnSigmaEl, float[6]);
DECLARE_SOA_COLUMN(Trk6TPCnSigmaPi, trk6TPCnSigmaPi, float[6]);
DECLARE_SOA_COLUMN(Trk6TPCnSigmaKa, trk6TPCnSigmaKa, float[6]);
DECLARE_SOA_COLUMN(Trk6TPCnSigmaPr, trk6TPCnSigmaPr, float[6]);
DECLARE_SOA_COLUMN(Trk6TPCnSigmaMu, trk6TPCnSigmaMu, float[6]);
DECLARE_SOA_COLUMN(Trk6TOFbeta, trk6TOFbeta, float[6]);
DECLARE_SOA_COLUMN(Trk6TOFnSigmaEl, trk6TOFnSigmaEl, float[6]);
DECLARE_SOA_COLUMN(Trk6TOFnSigmaPi, trk6TOFnSigmaPi, float[6]);
DECLARE_SOA_COLUMN(Trk6TOFnSigmaKa, trk6TOFnSigmaKa, float[6]);
DECLARE_SOA_COLUMN(Trk6TOFnSigmaPr, trk6TOFnSigmaPr, float[6]);
DECLARE_SOA_COLUMN(Trk6TOFnSigmaMu, trk6TOFnSigmaMu, float[6]);
DECLARE_SOA_COLUMN(Trk6TOFchi2, trk6TOFchi2, float[6]);

// truth event
DECLARE_SOA_COLUMN(TrueChannel, trueChannel, int);
// DECLARE_SOA_COLUMN(TrueHasRecoColl, trueHasRecoColl, bool);
Expand All @@ -96,11 +125,16 @@ DECLARE_SOA_COLUMN(TruePosZ, truePosZ, float);
DECLARE_SOA_COLUMN(TrueTauPx, trueTauPx, float[2]);
DECLARE_SOA_COLUMN(TrueTauPy, trueTauPy, float[2]);
DECLARE_SOA_COLUMN(TrueTauPz, trueTauPz, float[2]);
// truth tau daughter particles
DECLARE_SOA_COLUMN(TrueDaugPx, trueDaugPx, float[6]);
DECLARE_SOA_COLUMN(TrueDaugPy, trueDaugPy, float[6]);
DECLARE_SOA_COLUMN(TrueDaugPz, trueDaugPz, float[6]);
DECLARE_SOA_COLUMN(TrueDaugPdgCode, trueDaugPdgCode, int[6]);
// truth tau daughter particles - 4 particles
DECLARE_SOA_COLUMN(TrueDaugPx, trueDaugPx, float[4]);
DECLARE_SOA_COLUMN(TrueDaugPy, trueDaugPy, float[4]);
DECLARE_SOA_COLUMN(TrueDaugPz, trueDaugPz, float[4]);
DECLARE_SOA_COLUMN(TrueDaugPdgCode, trueDaugPdgCode, int[4]);
// truth tau daughter particles - 6 particles
DECLARE_SOA_COLUMN(True6DaugPx, true6DaugPx, float[6]);
DECLARE_SOA_COLUMN(True6DaugPy, true6DaugPy, float[6]);
DECLARE_SOA_COLUMN(True6DaugPz, true6DaugPz, float[6]);
DECLARE_SOA_COLUMN(True6DaugPdgCode, true6DaugPdgCode, int[6]);
DECLARE_SOA_COLUMN(Problem, problem, int8_t);
} // namespace tautree

Expand Down Expand Up @@ -158,6 +192,60 @@ DECLARE_SOA_TABLE(TrueTauFourTracks, "AOD", "TRUETAU",
tautree::TrueDaugPdgCode,
tautree::Problem);

DECLARE_SOA_TABLE(DataTauSixTracks, "AOD", "TAUSIXTRACK",
tautree::RunNumber, tautree::Bc, tautree::TotalTracks, tautree::NumContrib,
tautree::RctOk,
// tautree::GlobalNonPVtracks,
// tautree::PosX, tautree::PosY,
tautree::PosZ,
tautree::FlagUPC, tautree::OccupancyInTime, tautree::HadronicRate,
//
tautree::Trs, tautree::Trofs, tautree::Hmpr,
tautree::Tfb, tautree::ItsRofb, tautree::Sbp, tautree::ZvtxFT0vsPv, tautree::VtxITSTPC,
tautree::ZdcAenergy, tautree::ZdcCenergy,
tautree::ZdcAtime, tautree::ZdcCtime,
// tautree::Qtot,
tautree::TotalFT0AmplitudeA, tautree::TotalFT0AmplitudeC, tautree::TotalFV0AmplitudeA,
// tautree::TimeFT0A, tautree::TimeFT0C, tautree::TimeFV0A,
tautree::Trk6Px, tautree::Trk6Py, tautree::Trk6Pz,
tautree::Trk6Sign,
tautree::Trk6DCAxy, tautree::Trk6DCAz,
tautree::Trk6TPCcr,
tautree::Trk6TPCfind, tautree::Trk6TPCchi2, tautree::Trk6ITSchi2, tautree::Trk6ITScl,
tautree::Trk6TPCsignal, tautree::Trk6TPCnSigmaEl, tautree::Trk6TPCnSigmaPi, tautree::Trk6TPCnSigmaKa, tautree::Trk6TPCnSigmaPr, tautree::Trk6TPCnSigmaMu,
tautree::Trk6TOFbeta, tautree::Trk6TOFnSigmaEl, tautree::Trk6TOFnSigmaPi, tautree::Trk6TOFnSigmaKa, tautree::Trk6TOFnSigmaPr, tautree::Trk6TOFnSigmaMu,
tautree::Trk6TOFchi2);

DECLARE_SOA_TABLE(TrueTauSixTracks, "AOD", "TRUETAUSIX",
tautree::RunNumber, tautree::Bc, tautree::TotalTracks, tautree::NumContrib,
tautree::RctOk,
// tautree::GlobalNonPVtracks,
// tautree::PosX, tautree::PosY,
tautree::PosZ,
tautree::FlagUPC, tautree::OccupancyInTime, tautree::HadronicRate,
tautree::Trs, tautree::Trofs, tautree::Hmpr,
tautree::Tfb, tautree::ItsRofb, tautree::Sbp, tautree::ZvtxFT0vsPv, tautree::VtxITSTPC,
tautree::ZdcAenergy, tautree::ZdcCenergy,
tautree::ZdcAtime, tautree::ZdcCtime,
// tautree::Qtot,
tautree::TotalFT0AmplitudeA, tautree::TotalFT0AmplitudeC, tautree::TotalFV0AmplitudeA,
// tautree::TimeFT0A, tautree::TimeFT0C, tautree::TimeFV0A,
tautree::Trk6Px, tautree::Trk6Py, tautree::Trk6Pz,
tautree::Trk6Sign,
tautree::Trk6DCAxy, tautree::Trk6DCAz,
tautree::Trk6TPCcr,
tautree::Trk6TPCfind, tautree::Trk6TPCchi2, tautree::Trk6ITSchi2, tautree::Trk6ITScl,
tautree::Trk6TPCsignal, tautree::Trk6TPCnSigmaEl, tautree::Trk6TPCnSigmaPi, tautree::Trk6TPCnSigmaKa, tautree::Trk6TPCnSigmaPr, tautree::Trk6TPCnSigmaMu,
tautree::Trk6TOFbeta, tautree::Trk6TOFnSigmaEl, tautree::Trk6TOFnSigmaPi, tautree::Trk6TOFnSigmaKa, tautree::Trk6TOFnSigmaPr, tautree::Trk6TOFnSigmaMu,
tautree::Trk6TOFchi2,
tautree::TrueChannel,
// tautree::TrueHasRecoColl,
tautree::TruePosZ,
tautree::TrueTauPx, tautree::TrueTauPy, tautree::TrueTauPz,
tautree::True6DaugPx, tautree::True6DaugPy, tautree::True6DaugPz,
tautree::True6DaugPdgCode,
tautree::Problem);

} // namespace o2::aod

#endif // PWGUD_DATAMODEL_TAUTHREEPRONGEVENTTABLES_H_
Loading
Loading