@@ -293,24 +293,12 @@ DECLARE_SOA_TABLE(HfRedTracksCov, "AOD", "HFREDTRACKCOV", //! Table with track c
293293 HFTRACKPARCOV_COLUMNS,
294294 o2::soa::Marker<1 >);
295295
296- DECLARE_SOA_TABLE (HfRedSoftPiBases, " AOD" , " HFREDSOFTPIBASE" , // ! Table with track information for reduced workflow
297- soa::Index<>,
298- hf_track_index_reduced::TrackId,
299- hf_track_index_reduced::HfRedCollisionId,
300- HFTRACKPAR_COLUMNS,
301- hf_track_vars_reduced::ItsNCls,
302- hf_track_vars_reduced::TpcNClsCrossedRows,
303- hf_track_vars_reduced::TpcChi2NCl,
304- aod::track::Px<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>,
305- aod::track::Py<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>,
306- aod::track::Pz<aod::track::Signed1Pt, track::Tgl>,
307- aod::track::PVector<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha, aod::track::Tgl>,
308- o2::soa::Marker<2 >);
309-
310- DECLARE_SOA_TABLE (HfRedSoftPiCov, " AOD" , " HFREDSOFTPICOV" , // ! Table with track covariance information for reduced workflow
296+ DECLARE_SOA_TABLE (HfRedTracksMom, " AOD" , " HFREDTRACKMOM" , // ! Table with track momentum information for reduced workflow
311297 soa::Index<>,
312- HFTRACKPARCOV_COLUMNS,
313- o2::soa::Marker<2 >);
298+ hf_track_vars_reduced::Px,
299+ hf_track_vars_reduced::Py,
300+ hf_track_vars_reduced::Pz,
301+ hf_track_vars_reduced::Sign);
314302
315303// CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
316304// to call DECLARE_SOA_INDEX_COLUMN_FULL later on
@@ -546,6 +534,39 @@ DECLARE_SOA_TABLE(HfRed2ProngsMl, "AOD", "HFRED2PRONGML", //! Table with 2prong
546534 hf_charm_cand_reduced::MlScorePromptMassHypo1,
547535 hf_charm_cand_reduced::MlScoreNonpromptMassHypo1);
548536
537+ // CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
538+ // to call DECLARE_SOA_INDEX_COLUMN_FULL later on
539+ DECLARE_SOA_TABLE (HfRedSoftPiBases, " AOD" , " HFREDSOFTPIBASE" , // ! Table with track information for reduced workflow
540+ soa::Index<>,
541+ hf_track_index_reduced::TrackId,
542+ hf_track_index_reduced::HfRedCollisionId,
543+ HFTRACKPAR_COLUMNS,
544+ hf_track_vars_reduced::ItsNCls,
545+ hf_track_vars_reduced::TpcNClsCrossedRows,
546+ hf_track_vars_reduced::TpcChi2NCl,
547+ aod::track::Px<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>,
548+ aod::track::Py<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>,
549+ aod::track::Pz<aod::track::Signed1Pt, track::Tgl>,
550+ aod::track::PVector<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha, aod::track::Tgl>);
551+
552+ DECLARE_SOA_TABLE (HfRedSoftPiCov, " AOD" , " HFREDSOFTPICOV" , // ! Table with track covariance information for reduced workflow
553+ soa::Index<>,
554+ HFTRACKPARCOV_COLUMNS,
555+ o2::soa::Marker<2 >);
556+
557+ DECLARE_SOA_TABLE (HfRedSoftPiPid, " AOD" , " HFREDSOFTPIPID" ,
558+ soa::Index<>,
559+ hf_cand_dstar::TPCNSigmaPiSoftPi,
560+ hf_cand_dstar::TOFNSigmaPiSoftPi,
561+ hf_track_vars_reduced::HasTOF,
562+ hf_track_vars_reduced::HasTPC,
563+ hf_cand_dstar::TPCTOFNSigmaPiSoftPi<hf_cand_dstar::TPCNSigmaPiSoftPi, hf_cand_dstar::TOFNSigmaPiSoftPi>)
564+
565+ namespace hf_track_index_reduced
566+ {
567+ DECLARE_SOA_INDEX_COLUMN_FULL (SoftPi, softPi, int , HfRedSoftPiBases, " " ); // ! ReducedCollision index
568+ }; // namespace hf_track_index_reduced
569+
549570// CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
550571// to call DECLARE_SOA_INDEX_COLUMN_FULL later on
551572DECLARE_SOA_TABLE (HfRed3Prongs, " AOD" , " HFRED3PRONG" , // ! Table with 3prong candidate information for reduced workflow
@@ -583,6 +604,17 @@ DECLARE_SOA_TABLE_VERSIONED(HfRed3ProngsMl_001, "AOD", "HFRED3PRONGML", 1, //! T
583604
584605using HfRed3ProngsMl = HfRed3ProngsMl_001;
585606
607+ DECLARE_SOA_TABLE (HfRedMomDDaugs, " AOD" , " HFREDMOMDDAUGS" , // ! Table with 2prong candidate ML scores
608+ hf_cand::PxProng0,
609+ hf_cand::PyProng0,
610+ hf_cand::PzProng0,
611+ hf_cand::PxProng1,
612+ hf_cand::PyProng1,
613+ hf_cand::PzProng1,
614+ hf_cand::PxProng2,
615+ hf_cand::PyProng2,
616+ hf_cand::PzProng2);
617+
586618// CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
587619// to call DECLARE_SOA_INDEX_COLUMN_FULL later on
588620DECLARE_SOA_TABLE (HfRedJpsis, " AOD" , " HFREDJPSI" , // ! Table with J/Psi candidate information for reduced workflow
@@ -711,11 +743,15 @@ using HfRedPidDau2s = HfRedPidDau2s_001;
711743using HfRedPidDau0 = HfRedPidDau0s::iterator;
712744using HfRedPidDau1 = HfRedPidDau1s::iterator;
713745using HfRedPidDau2 = HfRedPidDau2s::iterator;
746+
714747// Beauty candidates prongs
715748namespace hf_cand_b0_reduced
716749{
717750DECLARE_SOA_INDEX_COLUMN_FULL (Prong0, prong0, int , HfRed3Prongs, " _0" ); // ! Prong0 index
718751DECLARE_SOA_INDEX_COLUMN_FULL (Prong1, prong1, int , HfRedTrackBases, " _1" ); // ! Prong1 index
752+ DECLARE_SOA_INDEX_COLUMN_FULL (ProngD0, prongD0, int , HfRed2Prongs, " _0" ); // ! ProngD0 index
753+ DECLARE_SOA_INDEX_COLUMN_FULL (ProngBachPi, prongBachPi, int , HfRedTrackBases, " _1" ); // ! ProngBachPi index
754+ DECLARE_SOA_INDEX_COLUMN_FULL (ProngSoftPi, prongSoftPi, int , HfRedSoftPiBases, " _2" ); // ! ProngSoftPi index
719755DECLARE_SOA_COLUMN (Prong0MlScoreBkg, prong0MlScoreBkg, float ); // ! Bkg ML score of the D daughter
720756DECLARE_SOA_COLUMN (Prong0MlScorePrompt, prong0MlScorePrompt, float ); // ! Prompt ML score of the D daughter
721757DECLARE_SOA_COLUMN (Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float ); // ! Nonprompt ML score of the D daughter
@@ -724,13 +760,17 @@ DECLARE_SOA_COLUMN(Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float); //! N
724760DECLARE_SOA_TABLE (HfRedB0Prongs, " AOD" , " HFREDB0PRONG" , // ! Table with B0 daughter indices
725761 hf_cand_b0_reduced::Prong0Id, hf_cand_b0_reduced::Prong1Id);
726762
763+ DECLARE_SOA_TABLE (HfRedB0ProngDStars, " AOD" , " HFREDB0PRONGDST" , // ! Table with B0 daughter indices
764+ hf_cand_b0_reduced::ProngD0Id, hf_cand_b0_reduced::ProngBachPiId, hf_cand_b0_reduced::ProngSoftPiId);
765+
727766DECLARE_SOA_TABLE (HfRedB0DpMls, " AOD" , " HFREDB0DPML" , // ! Table with ML scores for the D+ daughter
728767 hf_cand_b0_reduced::Prong0MlScoreBkg,
729768 hf_cand_b0_reduced::Prong0MlScorePrompt,
730769 hf_cand_b0_reduced::Prong0MlScoreNonprompt,
731770 o2::soa::Marker<1 >);
732771
733772using HfRedCandB0 = soa::Join<HfCandB0Ext, HfRedB0Prongs>;
773+ using HfRedCandB0DStar = soa::Join<HfCandB0DStExt, HfRedB0ProngDStars>;
734774
735775namespace hf_cand_bplus_reduced
736776{
@@ -848,6 +888,15 @@ DECLARE_SOA_TABLE(HfMcCheckDpPis, "AOD", "HFMCCHECKDPPI", //! Table with reconst
848888 hf_b0_mc::PdgCodeProng3,
849889 o2::soa::Marker<1 >);
850890
891+ // table with results of reconstruction level MC matching
892+ DECLARE_SOA_TABLE (HfMcRecRedDStarPis, " AOD" , " HFMCRECREDDSTPI" , // ! Table with reconstructed MC information on DStarPi pairs for reduced workflow
893+ hf_cand_b0_reduced::ProngD0Id,
894+ hf_cand_b0_reduced::ProngBachPiId,
895+ hf_cand_b0::FlagMcMatchRec,
896+ hf_cand_b0::FlagWrongCollision,
897+ hf_cand_b0::DebugMcRec,
898+ hf_b0_mc::PtMother);
899+
851900// Table with same size as HFCANDB0
852901DECLARE_SOA_TABLE (HfMcRecRedB0s, " AOD" , " HFMCRECREDB0" , // ! Reconstruction-level MC information on B0 candidates for reduced workflow
853902 hf_cand_b0::FlagMcMatchRec,
0 commit comments