diff --git a/docs/datamodel/ao2dTables.md b/docs/datamodel/ao2dTables.md
index 27b5b526..cf3cbd10 100644
--- a/docs/datamodel/ao2dTables.md
+++ b/docs/datamodel/ao2dTables.md
@@ -597,6 +597,13 @@ For better overview the tables are grouped into the following categories: \| [Ge
short
Charge: positive: 1, negative: -1
+
+
o2::aod::0
+
GI
+
+
?
+
+
o2::aod::track::Pt
E
@@ -781,6 +788,13 @@ For better overview the tables are grouped into the following categories: \| [Ge
short
Charge: positive: 1, negative: -1
+
+
o2::aod::0
+
GI
+
+
?
+
+
o2::aod::track::Pt
E
@@ -948,6 +962,13 @@ For better overview the tables are grouped into the following categories: \| [Ge
int8_t
Covariance matrix in compressed form
+
+
o2::aod::0
+
GI
+
+
?
+
+
o2::aod::track::CYY
E
@@ -1188,6 +1209,13 @@ For better overview the tables are grouped into the following categories: \| [Ge
int8_t
Covariance matrix in compressed form
+
+
o2::aod::0
+
GI
+
+
?
+
+
o2::aod::track::CYY
E
@@ -1612,6 +1640,13 @@ For better overview the tables are grouped into the following categories: \| [Ge
float
Resolution of the track time in ns (see TrackFlags::TrackTimeResIsRange)
+
+
o2::aod::0
+
GI
+
+
?
+
+
o2::aod::track::DetectorMap
E
@@ -1978,6 +2013,13 @@ For better overview the tables are grouped into the following categories: \| [Ge
float
Resolution of the track time in ns (see TrackFlags::TrackTimeResIsRange)
+
+
o2::aod::1
+
GI
+
+
?
+
+
o2::aod::track::v001::DetectorMap
E
@@ -1989,14 +2031,19 @@ For better overview the tables are grouped into the following categories: \| [Ge
-
+
- On disk version of the track parameters at collision vertex
+ Additional track information (clusters, PID, etc.)
@@ -2006,155 +2053,379 @@ For better overview the tables are grouped into the following categories: \| [Ge
Comment
-
o2::soa::Index
-
GI
-
globalIndex
-
int64_t
+
o2::aod::track::TPCInnerParam
+
tpcInnerParam
+
float
+
Momentum at inner wall of the TPC
-
o2::aod::track::CollisionId
-
I
-
collisionId
-
int32
-
Collision to which this track belongs
+
o2::aod::track::Flags
+
+
flags
+
uint32_t
+
Track flags. Run 2: see TrackFlagsRun2Enum | Run 3: see TrackFlags
-
o2::aod::track::TrackType
+
o2::aod::track::ITSClusterSizes
-
trackType
+
itsClusterSizes
+
uint32_t
+
Clusters sizes, four bits per a layer, starting from the innermost
+
+
+
o2::aod::track::TPCNClsFindable
+
+
tpcNClsFindable
uint8_t
-
Type of track. See enum TrackTypeEnum. This cannot be used to decide which detector has contributed to this track. Use hasITS, hasTPC, etc.
+
Findable TPC clusters for this track geometry
-
o2::aod::track::X
+
o2::aod::track::TPCNClsFindableMinusFound
-
x
-
float
+
tpcNClsFindableMinusFound
+
int8_t
+
TPC Clusters: Findable - Found
+
+
+
o2::aod::track::TPCNClsFindableMinusPID
+
tpcNClsFindableMinusPID
+
int8_t
+
TPC Clusters: Findable - Found clusters used for PID
-
o2::aod::track::Alpha
+
o2::aod::track::TPCNClsFindableMinusCrossedRows
-
alpha
+
tpcNClsFindableMinusCrossedRows
+
int8_t
+
TPC Clusters: Findable - crossed rows
+
+
+
o2::aod::track::TPCNClsShared
+
+
tpcNClsShared
+
uint8_t
+
Number of shared TPC clusters
+
+
+
o2::aod::track::v001::extensions::TPCDeltaTFwd
+
D
+
tpcDeltaTFwd
+
float
+
Delta Forward of track time in TPC time bis
+
+
+
o2::aod::track::v001::extensions::TPCDeltaTBwd
+
D
+
tpcDeltaTBwd
float
+
Delta Backward of track time in TPC time bis
+
+
+
o2::aod::track::TRDPattern
+
trdPattern
+
uint8_t
+
Contributor to the track on TRD layer in bits 0-5, starting from the innermost, bit 6 indicates a potentially split tracklet, bit 7 if the track crossed a padrow
-
o2::aod::track::Y
+
o2::aod::track::ITSChi2NCl
-
y
+
itsChi2NCl
float
-
+
Chi2 / cluster for the ITS track segment
-
o2::aod::track::Z
+
o2::aod::track::TPCChi2NCl
-
z
+
tpcChi2NCl
float
+
Chi2 / cluster for the TPC track segment
+
+
+
o2::aod::track::TRDChi2
+
trdChi2
+
float
+
Chi2 for the TRD track segment
-
o2::aod::track::Snp
+
o2::aod::track::TOFChi2
-
snp
+
tofChi2
float
+
Chi2 for the TOF track segment
+
+
+
o2::aod::track::TPCSignal
+
tpcSignal
+
float
+
dE/dx signal in the TPC
-
o2::aod::track::Tgl
+
o2::aod::track::TRDSignal
-
tgl
+
trdSignal
float
+
PID signal in the TRD
+
+
+
o2::aod::track::Length
+
length
+
float
+
Track length
-
o2::aod::track::Signed1Pt
+
o2::aod::track::TOFExpMom
-
signed1Pt
+
tofExpMom
float
-
(sign of charge)/Pt in c/GeV. Use pt() and sign() instead
+
TOF expected momentum obtained in tracking, used to compute the expected times
-
o2::aod::track::IsWithinBeamPipe
+
o2::aod::track::PIDForTracking
D
-
isWithinBeamPipe
+
pidForTracking
+
uint32_t
+
PID hypothesis used during tracking. See the constants in the class PID in PID.h
+
+
+
o2::aod::track::IsPVContributor
+
D
+
isPVContributor
bool
-
Is the track within the beam pipe (= successfully propagated to a collision vertex)
+
Run 3: Has this track contributed to the collision vertex fit
-
o2::aod::track::Px
+
o2::aod::track::HasITS
D
-
px
-
float
-
Momentum in x-direction in GeV/c
+
hasITS
+
bool
+
Flag to check if track has a ITS match
-
o2::aod::track::Py
+
o2::aod::track::HasTPC
D
-
py
-
float
-
Momentum in y-direction in GeV/c
+
hasTPC
+
bool
+
Flag to check if track has a TPC match
-
o2::aod::track::Pz
+
o2::aod::track::HasTRD
D
-
pz
-
float
-
Momentum in z-direction in GeV/c
+
hasTRD
+
bool
+
Flag to check if track has a TRD match
-
o2::aod::track::PVector
+
o2::aod::track::HasTOF
D
-
pVector
-
std::array<float,3>
-
Momentum vector in x,y,z-directions in GeV/c
+
hasTOF
+
bool
+
Flag to check if track has a TOF measurement
-
o2::aod::track::Energy
+
o2::aod::track::TPCNClsFound
D
-
energy
-
float
-
Track energy, computed under the mass assumption given as input
+
tpcNClsFound
+
int16_t
+
Number of found TPC clusters
-
o2::aod::track::Rapidity
+
o2::aod::track::TPCNClsCrossedRows
D
-
rapidity
-
float
-
Track rapidity, computed under the mass assumption given as input
+
tpcNClsCrossedRows
+
int16_t
+
Number of crossed TPC Rows
-
o2::aod::track::Sign
+
o2::aod::track::v001::ITSClusterMap
D
-
sign
-
short
-
Charge: positive: 1, negative: -1
+
itsClusterMap
+
uint8_t
+
ITS cluster map, one bit per a layer, starting from the innermost
-
-
-
-
-
-
-
- On disk version of the track parameters at inner most update (e.g. ITS) as it comes from the tracking
-
@@ -2281,10 +2552,10 @@ For better overview the tables are grouped into the following categories: \| [Ge
-
+
- On disk version of the TracksCov table at collision vertex
+ On disk version of the track parameters at inner most update (e.g. ITS) as it comes from the tracking
Track flags. Run 2: see TrackFlagsRun2Enum | Run 3: see TrackFlags
+
+
+
o2::aod::track::ITSClusterMap
+
+
itsClusterMap
+
uint8_t
+
Old cluster ITS cluster map, kept for version 0 compatibility
+
+
+
o2::aod::track::TPCNClsFindable
+
+
tpcNClsFindable
+
uint8_t
+
Findable TPC clusters for this track geometry
+
+
+
o2::aod::track::TPCNClsFindableMinusFound
+
+
tpcNClsFindableMinusFound
+
int8_t
+
TPC Clusters: Findable - Found
+
+
+
o2::aod::track::TPCNClsFindableMinusCrossedRows
+
+
tpcNClsFindableMinusCrossedRows
+
int8_t
+
TPC Clusters: Findable - crossed rows
+
+
+
o2::aod::track::TPCNClsShared
+
+
tpcNClsShared
+
uint8_t
+
Number of shared TPC clusters
+
+
+
o2::aod::track::TRDPattern
+
+
trdPattern
+
uint8_t
+
Contributor to the track on TRD layer in bits 0-5, starting from the innermost, bit 6 indicates a potentially split tracklet, bit 7 if the track crossed a padrow
+
+
+
o2::aod::track::ITSChi2NCl
+
+
itsChi2NCl
+
float
+
Chi2 / cluster for the ITS track segment
+
+
+
o2::aod::track::TPCChi2NCl
+
+
tpcChi2NCl
+
float
+
Chi2 / cluster for the TPC track segment
+
+
+
o2::aod::track::TRDChi2
+
+
trdChi2
+
float
+
Chi2 for the TRD track segment
+
+
+
o2::aod::track::TOFChi2
+
+
tofChi2
+
float
+
Chi2 for the TOF track segment
+
+
+
o2::aod::track::TPCSignal
+
+
tpcSignal
+
float
+
dE/dx signal in the TPC
+
+
+
o2::aod::track::TRDSignal
+
+
trdSignal
+
float
+
PID signal in the TRD
+
+
+
o2::aod::track::Length
+
+
length
+
float
+
Track length
+
+
+
o2::aod::track::TOFExpMom
+
+
tofExpMom
+
float
+
TOF expected momentum obtained in tracking, used to compute the expected times
+
+
+
o2::aod::track::PIDForTracking
+
D
+
pidForTracking
+
uint32_t
+
PID hypothesis used during tracking. See the constants in the class PID in PID.h
+
+
+
o2::aod::track::IsPVContributor
+
D
+
isPVContributor
+
bool
+
Run 3: Has this track contributed to the collision vertex fit
+
+
+
o2::aod::track::HasITS
+
D
+
hasITS
+
bool
+
Flag to check if track has a ITS match
+
+
+
o2::aod::track::HasTPC
+
D
+
hasTPC
+
bool
+
Flag to check if track has a TPC match
+
+
+
o2::aod::track::HasTRD
+
D
+
hasTRD
+
bool
+
Flag to check if track has a TRD match
+
+
+
o2::aod::track::HasTOF
+
D
+
hasTOF
+
bool
+
Flag to check if track has a TOF measurement
+
+
+
o2::aod::track::TPCNClsFound
+
D
+
tpcNClsFound
+
int16_t
+
Number of found TPC clusters
+
+
+
o2::aod::track::TPCNClsCrossedRows
+
D
+
tpcNClsCrossedRows
+
int16_t
+
Number of crossed TPC Rows
-
o2::aod::track::Rho1PtZ
-
-
rho1PtZ
-
int8_t
-
Covariance matrix in compressed form
+
o2::aod::track::TOFExpTimeEl
+
D
+
tofExpTimeEl
+
float
+
Expected time for the track to reach the TOF under the electron hypothesis
-
o2::aod::track::Rho1PtSnp
-
-
rho1PtSnp
-
int8_t
-
Covariance matrix in compressed form
+
o2::aod::track::TOFExpTimeMu
+
D
+
tofExpTimeMu
+
float
+
Expected time for the track to reach the TOF under the muon hypothesis
-
o2::aod::track::Rho1PtTgl
-
-
rho1PtTgl
-
int8_t
-
Covariance matrix in compressed form
+
o2::aod::track::TOFExpTimePi
+
D
+
tofExpTimePi
+
float
+
Expected time for the track to reach the TOF under the pion hypothesis
-
-
-
-
-
-
-
- On disk version of the TracksCov table at inner most update (e.g. ITS) as it comes from the tracking
-
tracklet bitmask - track defining 8 tracklets (152=8*19 rows) bit set if nCluster>thr (default 5)
+
+
+
o2::aod::trackqa::TPCdEdxMax0R
+
+
tpcdEdxMax0R
+
uint8_t
+
TPC dEdxQMax -ROC0/dEdx
+
+
+
o2::aod::trackqa::TPCdEdxMax1R
+
+
tpcdEdxMax1R
+
uint8_t
+
TPC dEdxQMax -ROC1/dEdx
+
+
+
o2::aod::trackqa::TPCdEdxMax2R
+
+
tpcdEdxMax2R
+
uint8_t
+
TPC dEdxQMax -ROC2/dEdx
+
+
+
o2::aod::trackqa::TPCdEdxMax3R
+
+
tpcdEdxMax3R
+
uint8_t
+
TPC dEdxQMax -ROC3/dEdx
+
+
+
o2::aod::trackqa::TPCdEdxTot0R
+
+
tpcdEdxTot0R
+
uint8_t
+
TPC dEdxQtot -ROC0/dEdx
+
+
+
o2::aod::trackqa::TPCdEdxTot1R
+
+
tpcdEdxTot1R
+
uint8_t
+
TPC dEdxQtot -ROC1/dEdx
+
+
+
o2::aod::trackqa::TPCdEdxTot2R
+
+
tpcdEdxTot2R
+
uint8_t
+
TPC dEdxQtot -ROC2/dEdx
+
+
+
o2::aod::trackqa::TPCdEdxTot3R
+
+
tpcdEdxTot3R
+
uint8_t
+
TPC dEdxQtot -ROC3/dEdx
+
+
+
+
+
+
- trackQA information - sampled QA information currently for the TPC
+ trackQA information - version 1 - including contributor residuals of matched tracks at reference radius
Track flags. Run 2: see TrackFlagsRun2Enum | Run 3: see TrackFlags
+
+
+
o2::aod::track::ITSClusterSizes
+
+
itsClusterSizes
+
uint32_t
+
Clusters sizes, four bits per a layer, starting from the innermost
+
+
+
o2::aod::track::TPCNClsFindable
+
+
tpcNClsFindable
+
uint8_t
+
Findable TPC clusters for this track geometry
+
+
+
o2::aod::track::TPCNClsFindableMinusFound
+
+
tpcNClsFindableMinusFound
+
int8_t
+
TPC Clusters: Findable - Found
+
+
+
o2::aod::track::TPCNClsFindableMinusCrossedRows
+
+
tpcNClsFindableMinusCrossedRows
+
int8_t
+
TPC Clusters: Findable - crossed rows
+
+
+
o2::aod::track::TPCNClsShared
+
+
tpcNClsShared
+
uint8_t
+
Number of shared TPC clusters
+
+
+
o2::aod::track::v001::extensions::TPCDeltaTFwd
+
D
+
tpcDeltaTFwd
+
float
+
Delta Forward of track time in TPC time bis
+
+
+
o2::aod::track::v001::extensions::TPCDeltaTBwd
+
D
+
tpcDeltaTBwd
+
float
+
Delta Backward of track time in TPC time bis
+
+
+
o2::aod::track::TRDPattern
+
+
trdPattern
+
uint8_t
+
Contributor to the track on TRD layer in bits 0-5, starting from the innermost, bit 6 indicates a potentially split tracklet, bit 7 if the track crossed a padrow
+
+
+
o2::aod::track::ITSChi2NCl
+
+
itsChi2NCl
+
float
+
Chi2 / cluster for the ITS track segment
+
+
+
o2::aod::track::TPCChi2NCl
+
+
tpcChi2NCl
+
float
+
Chi2 / cluster for the TPC track segment
+
+
+
o2::aod::track::TRDChi2
+
+
trdChi2
+
float
+
Chi2 for the TRD track segment
+
+
+
o2::aod::track::TOFChi2
+
+
tofChi2
+
float
+
Chi2 for the TOF track segment
+
+
+
o2::aod::track::TPCSignal
+
+
tpcSignal
+
float
+
dE/dx signal in the TPC
+
+
+
o2::aod::track::TRDSignal
+
+
trdSignal
+
float
+
PID signal in the TRD
+
+
+
o2::aod::track::Length
+
+
length
+
float
+
Track length
+
+
+
o2::aod::track::TOFExpMom
+
+
tofExpMom
+
float
+
TOF expected momentum obtained in tracking, used to compute the expected times
+
+
+
o2::aod::track::PIDForTracking
+
D
+
pidForTracking
+
uint32_t
+
PID hypothesis used during tracking. See the constants in the class PID in PID.h
+
+
+
o2::aod::track::IsPVContributor
+
D
+
isPVContributor
+
bool
+
Run 3: Has this track contributed to the collision vertex fit
+
+
+
o2::aod::track::HasITS
+
D
+
hasITS
+
bool
+
Flag to check if track has a ITS match
+
+
+
o2::aod::track::HasTPC
+
D
+
hasTPC
+
bool
+
Flag to check if track has a TPC match
+
+
+
o2::aod::track::HasTRD
+
D
+
hasTRD
+
bool
+
Flag to check if track has a TRD match
+
+
+
o2::aod::track::HasTOF
+
D
+
hasTOF
+
bool
+
Flag to check if track has a TOF measurement
+
+
+
o2::aod::track::TPCNClsFound
+
D
+
tpcNClsFound
+
int16_t
+
Number of found TPC clusters
+
+
+
o2::aod::track::TPCNClsCrossedRows
+
D
+
tpcNClsCrossedRows
+
int16_t
+
Number of crossed TPC Rows
+
+
+
o2::aod::track::v001::ITSClusterMap
+
D
+
itsClusterMap
+
uint8_t
+
ITS cluster map, one bit per a layer, starting from the innermost
+
+
+
o2::aod::track::v001::ITSNCls
+
D
+
itsNCls
+
uint8_t
+
Number of ITS clusters
+
+
+
o2::aod::track::v001::ITSNClsInnerBarrel
+
D
+
itsNClsInnerBarrel
+
uint8_t
+
Number of ITS clusters in the Inner Barrel
+
+
+
o2::aod::track::v001::ITSClsSizeInLayer
+
D
+
itsClsSizeInLayer
+
uint8_t
+
Size of the ITS cluster in a given layer
+
+
+
o2::aod::track::v001::IsITSAfterburner
+
D
+
isITSAfterburner
+
bool
+
If the track used the afterburner in the ITS
+
+
+
o2::aod::track::TOFExpTimeEl
+
D
+
tofExpTimeEl
+
float
+
Expected time for the track to reach the TOF under the electron hypothesis
+
+
+
o2::aod::track::TOFExpTimeMu
+
D
+
tofExpTimeMu
+
float
+
Expected time for the track to reach the TOF under the muon hypothesis
+
+
+
o2::aod::track::TOFExpTimePi
+
D
+
tofExpTimePi
+
float
+
Expected time for the track to reach the TOF under the pion hypothesis
+
+
+
o2::aod::track::TOFExpTimeKa
+
D
+
tofExpTimeKa
+
float
+
Expected time for the track to reach the TOF under the kaon hypothesis
+
+
+
o2::aod::track::TOFExpTimePr
+
D
+
tofExpTimePr
+
float
+
Expected time for the track to reach the TOF under the proton hypothesis
+
+
+
o2::aod::track::TOFExpTimeDe
+
D
+
tofExpTimeDe
+
float
+
Expected time for the track to reach the TOF under the deuteron hypothesis
+
+
+
o2::aod::track::TOFExpTimeTr
+
D
+
tofExpTimeTr
+
float
+
Expected time for the track to reach the TOF under the triton hypothesis
+
+
+
o2::aod::track::TOFExpTimeHe
+
D
+
tofExpTimeHe
+
float
+
Expected time for the track to reach the TOF under the helium3 hypothesis
+
+
+
o2::aod::track::TOFExpTimeAl
+
D
+
tofExpTimeAl
+
float
+
Expected time for the track to reach the TOF under the helium4 hypothesis
+
+
+
o2::aod::track::TPCCrossedRowsOverFindableCls
+
D
+
tpcCrossedRowsOverFindableCls
+
float
+
Ratio crossed rows over findable clusters
+
+
+
o2::aod::track::TPCFoundOverFindableCls
+
D
+
tpcFoundOverFindableCls
+
float
+
Ratio of found over findable clusters
+
+
+
o2::aod::track::TPCFractionSharedCls
+
D
+
tpcFractionSharedCls
+
float
+
Fraction of shared TPC clusters
+
+
+
o2::aod::track::TrackEtaEMCAL
+
+
trackEtaEmcal
+
float
+
+
+
+
o2::aod::track::TrackPhiEMCAL
+
+
trackPhiEmcal
+
float
+
+
+
+
o2::aod::track::TrackTime
+
+
trackTime
+
float
+
Estimated time of the track in ns wrt collision().bc() or ambiguoustrack.bcSlice()[0]
+
+
+
o2::aod::track::TrackTimeRes
+
+
trackTimeRes
+
float
+
Resolution of the track time in ns (see TrackFlags::TrackTimeResIsRange)
Track flags. Run 2: see TrackFlagsRun2Enum | Run 3: see TrackFlags
+
+
+
o2::aod::track::ITSClusterSizes
+
+
itsClusterSizes
+
uint32_t
+
Clusters sizes, four bits per a layer, starting from the innermost
+
+
+
o2::aod::track::TPCNClsFindable
+
+
tpcNClsFindable
+
uint8_t
+
Findable TPC clusters for this track geometry
+
+
+
o2::aod::track::TPCNClsFindableMinusFound
+
+
tpcNClsFindableMinusFound
+
int8_t
+
TPC Clusters: Findable - Found
+
+
+
o2::aod::track::TPCNClsFindableMinusPID
+
+
tpcNClsFindableMinusPID
+
int8_t
+
TPC Clusters: Findable - Found clusters used for PID
o2::aod::track::TPCNClsFindableMinusCrossedRows
diff --git a/docs/datamodel/joinsAndIterators.md b/docs/datamodel/joinsAndIterators.md
index a7d0d9e9..a33168d0 100644
--- a/docs/datamodel/joinsAndIterators.md
+++ b/docs/datamodel/joinsAndIterators.md
@@ -121,10 +121,17 @@ Click on the labels to display the definitions. Click buttons to
-
+