@@ -71,7 +71,7 @@ namespace o2::aod
7171namespace testcol
7272{
7373// Event properties
74- DECLARE_SOA_COLUMN (Gi, gi, int64_t );
74+ // DECLARE_SOA_COLUMN(Gi, gi, int64_t);
7575DECLARE_SOA_COLUMN (Rn, rn, int32_t ); // run number
7676DECLARE_SOA_COLUMN (Cent, cent, float ); // FT0C centrality
7777DECLARE_SOA_COLUMN (Mult, mult, int32_t ); // TPC multiplicity
@@ -83,19 +83,9 @@ DECLARE_SOA_COLUMN(VertexZ, vertexZ, float);
8383DECLARE_SOA_COLUMN (Psi2, psi2, int16_t );
8484DECLARE_SOA_COLUMN (Psi3, psi3, int16_t );
8585} // namespace testcol
86- namespace testtrack
87- {
8886
89- // Track properties
90- DECLARE_SOA_COLUMN (Colid, colid, int32_t ); // Collision ID
91- DECLARE_SOA_COLUMN (Charge, charge, int16_t );
92- DECLARE_SOA_COLUMN (P, p, uint64_t );
93- DECLARE_SOA_COLUMN (Dedx, dedx, uint16_t );
94- DECLARE_SOA_COLUMN (Dcaxy, dcaxy, int16_t );
95- DECLARE_SOA_COLUMN (Dcaz, dcaz, int16_t );
96- } // namespace testtrack
9787DECLARE_SOA_TABLE (TableCol, " AOD" , " TABLECOL" ,
98- testcol::Gi ,
88+ o2::soa::Index<> ,
9989 testcol::Rn,
10090 testcol::Cent,
10191 testcol::Mult,
@@ -106,8 +96,23 @@ DECLARE_SOA_TABLE(TableCol, "AOD", "TABLECOL",
10696 testcol::VertexZ,
10797 testcol::Psi2,
10898 testcol::Psi3);
99+ using Collision = TableCol::iterator;
100+
101+ namespace testtrack
102+ {
103+
104+ // Track properties
105+ DECLARE_SOA_INDEX_COLUMN (Collision, collision);
106+ DECLARE_SOA_COLUMN (Charge, charge, int16_t );
107+ DECLARE_SOA_COLUMN (P, p, uint64_t );
108+ DECLARE_SOA_COLUMN (Dedx, dedx, uint16_t );
109+ DECLARE_SOA_COLUMN (Dcaxy, dcaxy, int16_t );
110+ DECLARE_SOA_COLUMN (Dcaz, dcaz, int16_t );
111+ } // namespace testtrack
112+
109113DECLARE_SOA_TABLE (TableTrack, " AOD" , " TABLETRACK" ,
110- testtrack::Colid,
114+ o2::soa::Index<>,
115+ testtrack::CollisionId,
111116 testtrack::Charge,
112117 testtrack::P,
113118 testtrack::Dedx,
0 commit comments