@@ -76,7 +76,6 @@ DECLARE_SOA_COLUMN(ImpactParameter, impactParameter, float); //! ImpactParamete
7676} // namespace resocollision
7777DECLARE_SOA_TABLE (ResoCollisions, " AOD" , " RESOCOLLISION" ,
7878 o2::soa::Index<>,
79- resocollision::CollisionId,
8079 o2::aod::mult::MultNTracksPV,
8180 collision::PosX,
8281 collision::PosY,
@@ -85,6 +84,10 @@ DECLARE_SOA_TABLE(ResoCollisions, "AOD", "RESOCOLLISION",
8584 resocollision::BMagField);
8685using ResoCollision = ResoCollisions::iterator;
8786
87+ DECLARE_SOA_TABLE (ResoCollisionColls, " AOD" , " RESOCOLLISIONCOL" ,
88+ resocollision::CollisionId);
89+ using ResoCollisionColl = ResoCollisionColls::iterator;
90+
8891DECLARE_SOA_TABLE (ResoMCCollisions, " AOD" , " RESOMCCOLLISION" ,
8992 o2::soa::Index<>,
9093 resocollision::IsVtxIn10,
@@ -97,13 +100,11 @@ using ResoMCCollision = ResoMCCollisions::iterator;
97100
98101DECLARE_SOA_TABLE (ResoSpheroCollisions, " AOD" , " RESOSPHEROCOLLISION" ,
99102 o2::soa::Index<>,
100- resocollision::CollisionId,
101103 resocollision::Spherocity);
102104using ResoSpheroCollision = ResoSpheroCollisions::iterator;
103105
104106DECLARE_SOA_TABLE (ResoEvtPlCollisions, " AOD" , " RESOEVTPLCOLLISION" ,
105107 o2::soa::Index<>,
106- resocollision::CollisionId,
107108 resocollision::EvtPl,
108109 resocollision::EvtPlResAB,
109110 resocollision::EvtPlResAC,
@@ -113,7 +114,6 @@ using ResoEvtPlCollision = ResoEvtPlCollisions::iterator;
113114// For DF mixing study
114115DECLARE_SOA_TABLE (ResoCollisionDFs, " AOD" , " RESOCOLLISIONDF" ,
115116 o2::soa::Index<>,
116- // resocollision::CollisionId,
117117 o2::aod::mult::MultNTracksPV,
118118 collision::PosX,
119119 collision::PosY,
@@ -476,7 +476,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt, [](float px, float py) -> float { return Reco
476476DECLARE_SOA_TABLE (ResoTracks, " AOD" , " RESOTRACK" ,
477477 o2::soa::Index<>,
478478 resodaughter::ResoCollisionId,
479- resodaughter::TrackId,
480479 resodaughter::Pt,
481480 resodaughter::Px,
482481 resodaughter::Py,
@@ -516,10 +515,13 @@ DECLARE_SOA_TABLE(ResoTracks, "AOD", "RESOTRACK",
516515 resodaughter::Sign<resodaughter::TrackFlags>);
517516using ResoTrack = ResoTracks::iterator;
518517
518+ DECLARE_SOA_TABLE (ResoTrackTracks, " AOD" , " RESOTRACKTRACK" ,
519+ resodaughter::TrackId);
520+ using ResoTrackTrack = ResoTrackTracks::iterator;
521+
519522DECLARE_SOA_TABLE (ResoMicroTracks, " AOD" , " RESOMICROTRACK" ,
520523 o2::soa::Index<>,
521524 resodaughter::ResoCollisionId,
522- resodaughter::TrackId,
523525 resodaughter::Px,
524526 resodaughter::Py,
525527 resodaughter::Pz,
@@ -542,11 +544,14 @@ DECLARE_SOA_TABLE(ResoMicroTracks, "AOD", "RESOMICROTRACK",
542544 resodaughter::Sign<resodaughter::TrackFlags>);
543545using ResoMicroTrack = ResoMicroTracks::iterator;
544546
547+ DECLARE_SOA_TABLE (ResoMicroTrackTracks, " AOD" , " RESOMICROTRACKTRACK" ,
548+ resodaughter::TrackId);
549+ using ResoMicroTrackTrack = ResoMicroTrackTracks::iterator;
550+
545551// For DF mixing study
546552DECLARE_SOA_TABLE (ResoTrackDFs, " AOD" , " RESOTRACKDF" ,
547553 o2::soa::Index<>,
548554 resodaughter::ResoCollisionDFId,
549- // resodaughter::TrackId,
550555 resodaughter::Pt,
551556 resodaughter::Px,
552557 resodaughter::Py,
@@ -589,7 +594,6 @@ using ResoTrackDF = ResoTrackDFs::iterator;
589594DECLARE_SOA_TABLE (ResoV0s, " AOD" , " RESOV0" ,
590595 o2::soa::Index<>,
591596 resodaughter::ResoCollisionId,
592- resodaughter::V0Id,
593597 resodaughter::Pt,
594598 resodaughter::Px,
595599 resodaughter::Py,
@@ -636,10 +640,13 @@ DECLARE_SOA_TABLE(ResoV0s, "AOD", "RESOV0",
636640 resodaughter::DaughterTOFNSigmaNegPr<resodaughter::DaughterTOFNSigmaNegPr10>);
637641using ResoV0 = ResoV0s::iterator;
638642
643+ DECLARE_SOA_TABLE (ResoV0V0s, " AOD" , " RESOV0V0" ,
644+ resodaughter::V0Id);
645+ using ResoV0V0 = ResoV0V0s::iterator;
646+
639647DECLARE_SOA_TABLE (ResoCascades, " AOD" , " RESOCASCADE" ,
640648 o2::soa::Index<>,
641649 resodaughter::ResoCollisionId,
642- resodaughter::CascadeId,
643650 resodaughter::Pt,
644651 resodaughter::Px,
645652 resodaughter::Py,
@@ -704,10 +711,13 @@ DECLARE_SOA_TABLE(ResoCascades, "AOD", "RESOCASCADE",
704711 resodaughter::DaughterTOFNSigmaBachPr<resodaughter::DaughterTOFNSigmaBachPr10>);
705712using ResoCascade = ResoCascades::iterator;
706713
714+ DECLARE_SOA_TABLE (ResoCascadeCascades, " AOD" , " RESOCASCADECASCADE" ,
715+ resodaughter::CascadeId);
716+ using ResoCascadeCascade = ResoCascadeCascades::iterator;
717+
707718DECLARE_SOA_TABLE (ResoCascadeDFs, " AOD" , " RESOCASCADEDF" ,
708719 o2::soa::Index<>,
709720 resodaughter::ResoCollisionDFId,
710- // resodaughter::CascadeId,
711721 resodaughter::Pt,
712722 resodaughter::Px,
713723 resodaughter::Py,
0 commit comments