@@ -45,13 +45,18 @@ namespace lambdacollision
4545{
4646DECLARE_SOA_COLUMN (Cent, cent, float );
4747DECLARE_SOA_COLUMN (Mult, mult, float );
48+ DECLARE_SOA_COLUMN (TimeStamp, timeStamp, float );
49+ // DECALRE_SOA_
4850} // namespace lambdacollision
4951DECLARE_SOA_TABLE (LambdaCollisions, " AOD" , " LAMBDACOLS" , o2::soa::Index<>,
5052 lambdacollision::Cent,
5153 lambdacollision::Mult,
5254 aod::collision::PosX,
5355 aod::collision::PosY,
54- aod::collision::PosZ);
56+ aod::collision::PosZ,
57+ lambdacollision::TimeStamp
58+ // , lambdacollision::CollisionId
59+ );
5560using LambdaCollision = LambdaCollisions::iterator;
5661
5762namespace lambdamcgencollision
@@ -156,7 +161,8 @@ DECLARE_SOA_COLUMN(CollisionIndex, collisionIndex, int);
156161DECLARE_SOA_TABLE (LambdaMixEventCollisions, " AOD" , " LAMBDAMIXCOLS" , o2::soa::Index<>,
157162 lambdamixeventcollision::CollisionIndex,
158163 lambdacollision::Cent,
159- aod::collision::PosZ);
164+ aod::collision::PosZ,
165+ lambdacollision::TimeStamp);
160166
161167using LambdaMixEventCollision = LambdaMixEventCollisions::iterator;
162168
@@ -165,6 +171,8 @@ namespace lambdamixeventtracks
165171// DECLARE_SOA_INDEX_COLUMN(LambdaMixEventCollision, lambdaMixEventCollision);
166172DECLARE_SOA_COLUMN (LambdaMixEventCollisionIdx, lambdaMixEventCollisionIdx, int );
167173DECLARE_SOA_COLUMN (LambdaMixEventTrackIdx, lambdaMixEventTrackIdx, int );
174+ DECLARE_SOA_COLUMN (LambdaMixEventTimeStamp, lambdaMixEventTimeStamp, float );
175+
168176} // namespace lambdamixeventtracks
169177
170178DECLARE_SOA_TABLE (LambdaMixEventTracks, " AOD" , " LAMBDAMIXTRKS" , o2::soa::Index<>,
@@ -178,7 +186,8 @@ DECLARE_SOA_TABLE(LambdaMixEventTracks, "AOD", "LAMBDAMIXTRKS", o2::soa::Index<>
178186 lambdatrack::PrPx,
179187 lambdatrack::PrPy,
180188 lambdatrack::PrPz,
181- lambdatrack::V0Type);
189+ lambdatrack::V0Type,
190+ lambdamixeventtracks::LambdaMixEventTimeStamp);
182191
183192using LambdaMixEventTrack = LambdaMixEventTracks::iterator;
184193} // namespace o2::aod
@@ -459,7 +468,7 @@ struct LambdaTableProducer {
459468 histos.addClone (" McRec/Lambda/" , " McRec/AntiLambda/" );
460469
461470 // MC Generated Histograms
462- if (doprocessMCRun3 || doprocessMCRun2 || doprocessMCRecoRun3 || doprocessMCRecoRun2) {
471+ /* if (doprocessMCRun3 || doprocessMCRun2 || doprocessMCRecoRun3 || doprocessMCRecoRun2) {
463472 // McReco Histos
464473 histos.add("Tracks/h2f_tracks_pid_before_sel", "PIDs", kTH2F, {axisPID, axisV0Pt});
465474 histos.add("Tracks/h2f_tracks_pid_after_sel", "PIDs", kTH2F, {axisPID, axisV0Pt});
@@ -499,7 +508,7 @@ struct LambdaTableProducer {
499508 histos.get<TH1>(HIST("Tracks/h1f_tracks_info"))->GetXaxis()->SetBinLabel(TrackLabels::kGenLambdaNoDau, "kGenLambdaNoDau");
500509 histos.get<TH1>(HIST("Tracks/h1f_tracks_info"))->GetXaxis()->SetBinLabel(TrackLabels::kGenLambdaToPrPi, "kGenLambdaToPrPi");
501510 }
502-
511+ */
503512 // set bin labels
504513 histos.get <TH1>(HIST (" Events/h1f_collisions_info" ))->GetXaxis ()->SetBinLabel (CollisionLabels::kTotCol , " kTotCol" );
505514 histos.get <TH1>(HIST (" Events/h1f_collisions_info" ))->GetXaxis ()->SetBinLabel (CollisionLabels::kPassSelCol , " kPassSelCol" );
@@ -1008,8 +1017,8 @@ struct LambdaTableProducer {
10081017 }
10091018
10101019 // Reconstructed Level Tables
1011- template <RunType run, DMCType dmc, typename C, typename V, typename T>
1012- void fillLambdaRecoTables (C const & collision, V const & v0tracks, T const & tracks)
1020+ template <RunType run, DMCType dmc, typename C, typename B, typename V, typename T>
1021+ void fillLambdaRecoTables (C const & collision, B const & bc, V const & v0tracks, T const & tracks)
10131022 {
10141023 // Total Collisions
10151024 histos.fill (HIST (" Events/h1f_collisions_info" ), kTotCol );
@@ -1025,7 +1034,7 @@ struct LambdaTableProducer {
10251034 histos.fill (HIST (" Events/h1f_collision_posZ" ), collision.posZ ());
10261035
10271036 // Fill Collision Table
1028- lambdaCollisionTable (cent, mult, collision.posX (), collision.posY (), collision.posZ ());
1037+ lambdaCollisionTable (cent, mult, collision.posX (), collision.posY (), collision.posZ (), bc. timestamp () );
10291038
10301039 // initialize v0track objects
10311040 ParticleType v0Type = kLambda ;
@@ -1281,7 +1290,7 @@ struct LambdaTableProducer {
12811290 histos.fill (HIST (" McGen/h1f_collisions_info" ), kPassSelCol );
12821291 histos.fill (HIST (" McGen/h2f_collision_posZ" ), mcCollision.posZ (), collisions.begin ().posZ ());
12831292 auto v0Tracks = V0s.sliceBy (perCollision, collisions.begin ().globalIndex ());
1284- fillLambdaRecoTables<run, dmc>(collisions.begin (), v0Tracks, tracks);
1293+ // fillLambdaRecoTables<run, dmc>(collisions.begin(), v0Tracks, tracks);
12851294 fillLambdaMcGenTables<run>(mcCollision, mcParticles);
12861295 }
12871296
@@ -1296,14 +1305,15 @@ struct LambdaTableProducer {
12961305 using TracksMCRun2 = soa::Join<TracksRun2, aod::McTrackLabels>;
12971306 using McV0Tracks = soa::Join<aod::V0Datas, aod::McV0Labels>;
12981307
1299- void processDataRun3 (CollisionsRun3::iterator const & collision, aod::V0Datas const & V0s, Tracks const & tracks)
1308+ void processDataRun3 (CollisionsRun3::iterator const & collision, aod::BCsWithTimestamps const &, aod:: V0Datas const & V0s, Tracks const & tracks)
13001309 {
1301- fillLambdaRecoTables<kRun3 , kData >(collision, V0s, tracks);
1310+ auto bc = collision.bc_as <aod::BCsWithTimestamps>();
1311+ fillLambdaRecoTables<kRun3 , kData >(collision, bc, V0s, tracks);
13021312 }
13031313
13041314 PROCESS_SWITCH (LambdaTableProducer, processDataRun3, " Process for Run3 DATA" , true );
13051315
1306- void processDataRun2 (CollisionsRun2::iterator const & collision, aod::V0Datas const & V0s, TracksRun2 const & tracks)
1316+ /* void processDataRun2(CollisionsRun2::iterator const& collision, aod::V0Datas const& V0s, TracksRun2 const& tracks)
13071317 {
13081318 fillLambdaRecoTables<kRun2, kData>(collision, V0s, tracks);
13091319 }
@@ -1332,7 +1342,7 @@ struct LambdaTableProducer {
13321342 fillLambdaRecoTables<kRun2, kMC>(collision, V0s, tracks);
13331343 }
13341344
1335- PROCESS_SWITCH (LambdaTableProducer, processMCRecoRun2, " Process for Run2 McReco DATA" , false );
1345+ // PROCESS_SWITCH(LambdaTableProducer, processMCRecoRun2, "Process for Run2 McReco DATA", false);
13361346
13371347 void processMCRun3(aod::McCollisions::iterator const& mcCollision,
13381348 soa::SmallGroups<soa::Join<CollisionsRun3, aod::McCollisionLabels>> const& collisions,
@@ -1342,7 +1352,7 @@ struct LambdaTableProducer {
13421352 analyzeMcRecoGen<kRun3, kMC>(mcCollision, collisions, V0s, tracks, mcParticles);
13431353 }
13441354
1345- PROCESS_SWITCH (LambdaTableProducer, processMCRun3, " Process for Run3 MC RecoGen" , false );
1355+ // PROCESS_SWITCH(LambdaTableProducer, processMCRun3, "Process for Run3 MC RecoGen", false);
13461356
13471357 void processMCRun2(aod::McCollisions::iterator const& mcCollision,
13481358 soa::SmallGroups<soa::Join<CollisionsRun2, aod::McCollisionLabels>> const& collisions,
@@ -1352,7 +1362,7 @@ struct LambdaTableProducer {
13521362 analyzeMcRecoGen<kRun2, kMC>(mcCollision, collisions, V0s, tracks, mcParticles);
13531363 }
13541364
1355- PROCESS_SWITCH (LambdaTableProducer, processMCRun2, " Process for Run2 MC RecoGen" , false );
1365+ PROCESS_SWITCH(LambdaTableProducer, processMCRun2, "Process for Run2 MC RecoGen", false);*/
13561366};
13571367
13581368struct LambdaTracksExtProducer {
@@ -1689,11 +1699,11 @@ struct LambdaSpinPolarization {
16891699 }
16901700
16911701 // fill collision table
1692- lambdaMixEvtCol (collision.index (), collision.cent (), collision.posZ ());
1702+ lambdaMixEvtCol (collision.index (), collision.cent (), collision.posZ (), collision. timeStamp () );
16931703
16941704 for (auto const & track : tracks) {
16951705 lambdaMixEvtTrk (collision.index (), track.globalIndex (), track.px (), track.py (), track.pz (), track.mass (),
1696- track.prPx (), track.prPy (), track.prPz (), track.v0Type ());
1706+ track.prPx (), track.prPy (), track.prPz (), track.v0Type (), collision. timeStamp () );
16971707 }
16981708 }
16991709
0 commit comments