@@ -79,9 +79,13 @@ DECLARE_SOA_COLUMN(VtxITSTPC, vtxITSTPC, int);
7979DECLARE_SOA_COLUMN (TotalFT0AmplitudeA, totalFT0AmplitudeA, float );
8080DECLARE_SOA_COLUMN (TotalFT0AmplitudeC, totalFT0AmplitudeC, float );
8181DECLARE_SOA_COLUMN (TotalFV0AmplitudeA, totalFV0AmplitudeA, float );
82+ DECLARE_SOA_COLUMN (EnergyCommonZNA, energyCommonZNA, float );
83+ DECLARE_SOA_COLUMN (EnergyCommonZNC, energyCommonZNC, float );
8284DECLARE_SOA_COLUMN (TimeFT0A, timeFT0A, float );
8385DECLARE_SOA_COLUMN (TimeFT0C, timeFT0C, float );
8486DECLARE_SOA_COLUMN (TimeFV0A, timeFV0A, float );
87+ DECLARE_SOA_COLUMN (TimeZNA, timeZNA, float );
88+ DECLARE_SOA_COLUMN (TimeZNC, timeZNC, float );
8589// tracks
8690DECLARE_SOA_COLUMN (TrkPx, trkPx, float [2 ]);
8791DECLARE_SOA_COLUMN (TrkPy, trkPy, float [2 ]);
@@ -90,6 +94,8 @@ DECLARE_SOA_COLUMN(TrkSign, trkSign, int[2]);
9094DECLARE_SOA_COLUMN (TrkDCAxy, trkDCAxy, float [2 ]);
9195DECLARE_SOA_COLUMN (TrkDCAz, trkDCAz, float [2 ]);
9296DECLARE_SOA_COLUMN (TrkTimeRes, trkTimeRes, float [2 ]);
97+ DECLARE_SOA_COLUMN (Trk1ITSclusterSizes, trk1ITSclusterSizes, uint32_t );
98+ DECLARE_SOA_COLUMN (Trk2ITSclusterSizes, trk2ITSclusterSizes, uint32_t );
9399DECLARE_SOA_COLUMN (TrkTPCsignal, trkTPCsignal, float [2 ]);
94100DECLARE_SOA_COLUMN (TrkTPCnSigmaEl, trkTPCnSigmaEl, float [2 ]);
95101DECLARE_SOA_COLUMN (TrkTPCnSigmaMu, trkTPCnSigmaMu, float [2 ]);
@@ -103,18 +109,19 @@ DECLARE_SOA_COLUMN(TrkTOFnSigmaMu, trkTOFnSigmaMu, float[2]);
103109DECLARE_SOA_COLUMN (TrkTOFnSigmaPi, trkTOFnSigmaPi, float [2 ]);
104110DECLARE_SOA_COLUMN (TrkTOFnSigmaKa, trkTOFnSigmaKa, float [2 ]);
105111DECLARE_SOA_COLUMN (TrkTOFnSigmaPr, trkTOFnSigmaPr, float [2 ]);
106- DECLARE_SOA_COLUMN (TrkTPCexpMom, trkTPCexpMom , float [2 ]);
112+ DECLARE_SOA_COLUMN (TrkTOFexpMom, trkTOFexpMom , float [2 ]);
107113
108114} // namespace tau_tree
109115DECLARE_SOA_TABLE (TauTwoTracks, " AOD" , " TAUTWOTRACK" ,
110116 tau_tree::RunNumber, tau_tree::Bc, tau_tree::TotalTracks, tau_tree::NumContrib, tau_tree::GlobalNonPVtracks, tau_tree::PosX, tau_tree::PosY, tau_tree::PosZ,
111117 tau_tree::RecoMode, tau_tree::OccupancyInTime, tau_tree::HadronicRate,
112118 tau_tree::Trs, tau_tree::Trofs, tau_tree::Hmpr, tau_tree::Tfb, tau_tree::ItsRofb, tau_tree::Sbp, tau_tree::ZvtxFT0vsPv, tau_tree::VtxITSTPC,
113- tau_tree::TotalFT0AmplitudeA, tau_tree::TotalFT0AmplitudeC, tau_tree::TotalFV0AmplitudeA,
114- tau_tree::TimeFT0A, tau_tree::TimeFT0C, tau_tree::TimeFV0A,
119+ tau_tree::TotalFT0AmplitudeA, tau_tree::TotalFT0AmplitudeC, tau_tree::TotalFV0AmplitudeA, tau_tree::EnergyCommonZNA, tau_tree::EnergyCommonZNC,
120+ tau_tree::TimeFT0A, tau_tree::TimeFT0C, tau_tree::TimeFV0A, tau_tree::TimeZNA, tau_tree::TimeZNC,
115121 tau_tree::TrkPx, tau_tree::TrkPy, tau_tree::TrkPz, tau_tree::TrkSign, tau_tree::TrkDCAxy, tau_tree::TrkDCAz, tau_tree::TrkTimeRes,
122+ tau_tree::Trk1ITSclusterSizes, tau_tree::Trk2ITSclusterSizes,
116123 tau_tree::TrkTPCsignal, tau_tree::TrkTPCnSigmaEl, tau_tree::TrkTPCnSigmaMu, tau_tree::TrkTPCnSigmaPi, tau_tree::TrkTPCnSigmaKa, tau_tree::TrkTPCnSigmaPr, tau_tree::TrkTPCinnerParam,
117- tau_tree::TrkTOFsignal, tau_tree::TrkTOFnSigmaEl, tau_tree::TrkTOFnSigmaMu, tau_tree::TrkTOFnSigmaPi, tau_tree::TrkTOFnSigmaKa, tau_tree::TrkTOFnSigmaPr, tau_tree::TrkTPCexpMom );
124+ tau_tree::TrkTOFsignal, tau_tree::TrkTOFnSigmaEl, tau_tree::TrkTOFnSigmaMu, tau_tree::TrkTOFnSigmaPi, tau_tree::TrkTOFnSigmaKa, tau_tree::TrkTOFnSigmaPr, tau_tree::TrkTOFexpMom );
118125
119126} // namespace o2::aod
120127
@@ -2117,6 +2124,8 @@ struct UpcTauRl {
21172124 float dcaxy[2 ] = {trk1.dcaXY (), trk2.dcaXY ()};
21182125 float dcaz[2 ] = {trk1.dcaZ (), trk2.dcaZ ()};
21192126 float trkTimeRes[2 ] = {trk1.trackTimeRes (), trk2.trackTimeRes ()};
2127+ uint32_t itsClusterSizesTrk1 = trk1.itsClusterSizes ();
2128+ uint32_t itsClusterSizesTrk2 = trk2.itsClusterSizes ();
21202129 float tpcSignal[2 ] = {trk1.tpcSignal (), trk2.tpcSignal ()};
21212130 float tpcEl[2 ] = {trk1.tpcNSigmaEl (), trk2.tpcNSigmaEl ()};
21222131 float tpcMu[2 ] = {trk1.tpcNSigmaMu (), trk2.tpcNSigmaMu ()};
@@ -2131,13 +2140,21 @@ struct UpcTauRl {
21312140 float tofKa[2 ] = {trk1.tofNSigmaKa (), trk2.tofNSigmaKa ()};
21322141 float tofPr[2 ] = {trk1.tofNSigmaPr (), trk2.tofNSigmaPr ()};
21332142 float tofEP[2 ] = {trk1.tofExpMom (), trk2.tofExpMom ()};
2143+ float ZNinfo[4 ] = {-999 ., -999 ., -999 ., -999 .};
2144+ if constexpr (requires { collision.udZdcsReduced (); }) {
2145+ ZNinfo[0 ] = collision.energyCommonZNA ();
2146+ ZNinfo[1 ] = collision.energyCommonZNC ();
2147+ ZNinfo[2 ] = collision.timeZNA ();
2148+ ZNinfo[3 ] = collision.timeZNC ();
2149+ }
21342150
21352151 tauTwoTracks (collision.runNumber (), collision.globalBC (), countTracksPerCollision, collision.numContrib (), countGoodNonPVtracks, collision.posX (), collision.posY (), collision.posZ (),
21362152 collision.flags (), collision.occupancyInTime (), collision.hadronicRate (), collision.trs (), collision.trofs (), collision.hmpr (),
21372153 collision.tfb (), collision.itsROFb (), collision.sbp (), collision.zVtxFT0vPV (), collision.vtxITSTPC (),
2138- collision.totalFT0AmplitudeA (), collision.totalFT0AmplitudeC (), collision.totalFV0AmplitudeA (),
2139- collision.timeFT0A (), collision.timeFT0C (), collision.timeFV0A (),
2154+ collision.totalFT0AmplitudeA (), collision.totalFT0AmplitudeC (), collision.totalFV0AmplitudeA (), ZNinfo[ 0 ], ZNinfo[ 1 ],
2155+ collision.timeFT0A (), collision.timeFT0C (), collision.timeFV0A (), ZNinfo[ 2 ], ZNinfo[ 3 ],
21402156 px, py, pz, sign, dcaxy, dcaz, trkTimeRes,
2157+ itsClusterSizesTrk1, itsClusterSizesTrk2,
21412158 tpcSignal, tpcEl, tpcMu, tpcPi, tpcKa, tpcPr, tpcIP,
21422159 tofSignal, tofEl, tofMu, tofPi, tofKa, tofPr, tofEP);
21432160 } else {
0 commit comments