From 6a564043436a58dcbc3acc2602648974d414fd0b Mon Sep 17 00:00:00 2001 From: Luigi Dello Stritto Date: Thu, 13 Apr 2023 14:34:38 +0200 Subject: [PATCH 1/2] Adding candidate/particle origin MC infos in the tree creators --- PWGHF/TableProducer/treeCreatorLcToPKPi.cxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx index 3abbd4c16fb..8e13dbc0de9 100644 --- a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx @@ -75,6 +75,8 @@ DECLARE_SOA_COLUMN(CPA, cpa, float); DECLARE_SOA_COLUMN(CPAXY, cpaXY, float); DECLARE_SOA_COLUMN(Ct, ct, float); DECLARE_SOA_COLUMN(MCflag, mcflag, int8_t); +DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); +DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int8_t); // Events DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); @@ -152,6 +154,7 @@ DECLARE_SOA_TABLE(HfCand3ProngFull, "AOD", "HFCAND3PFull", full::Y, full::E, full::MCflag, + full::OriginMcRec, full::IsCandidateSwapped); DECLARE_SOA_TABLE(HfCand3ProngFullEvents, "AOD", "HFCAND3PFullE", @@ -169,7 +172,8 @@ DECLARE_SOA_TABLE(HfCand3ProngFullParticles, "AOD", "HFCAND3PFullP", full::Eta, full::Phi, full::Y, - full::MCflag); + full::MCflag, + full::OriginMcGen); } // namespace o2::aod @@ -290,6 +294,7 @@ struct HfTreeCreatorLcToPKPi { FunctionY, FunctionE, candidate.flagMcMatchRec(), + candidate.originMcRec(), candidate.isCandidateSwapped()); } }; @@ -308,7 +313,8 @@ struct HfTreeCreatorLcToPKPi { particle.eta(), particle.phi(), RecoDecay::y(array{particle.px(), particle.py(), particle.pz()}, RecoDecay::getMassPDG(particle.pdgCode())), - particle.flagMcMatchGen()); + particle.flagMcMatchGen(), + particle.originMcGen()); } } } @@ -417,6 +423,7 @@ struct HfTreeCreatorLcToPKPi { FunctionY, FunctionE, 0., + 0., 0.); } }; From 3e41ddc1e2d5a98ed8d7b841efce54eeaa4fa07e Mon Sep 17 00:00:00 2001 From: Luigi Dello Stritto Date: Fri, 14 Apr 2023 10:00:21 +0200 Subject: [PATCH 2/2] Adding MC origin flag to tree creators --- PWGHF/TableProducer/treeCreatorChicToJpsiGamma.cxx | 14 ++++++++++---- PWGHF/TableProducer/treeCreatorLbToLcPi.cxx | 7 +++++-- PWGHF/TableProducer/treeCreatorXToJpsiPiPi.cxx | 14 ++++++++++---- PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx | 14 ++++++++++---- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/PWGHF/TableProducer/treeCreatorChicToJpsiGamma.cxx b/PWGHF/TableProducer/treeCreatorChicToJpsiGamma.cxx index ccb851060f0..6df0867dc23 100644 --- a/PWGHF/TableProducer/treeCreatorChicToJpsiGamma.cxx +++ b/PWGHF/TableProducer/treeCreatorChicToJpsiGamma.cxx @@ -56,6 +56,8 @@ DECLARE_SOA_COLUMN(Phi, phi, float); DECLARE_SOA_COLUMN(Y, y, float); DECLARE_SOA_COLUMN(E, e, float); DECLARE_SOA_COLUMN(MCflag, mcflag, int8_t); +DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); +DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // Events DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); DECLARE_SOA_COLUMN(RunNumber, runNumber, int); @@ -90,7 +92,8 @@ DECLARE_SOA_TABLE(HfCandChicFull, "AOD", "HFCANDChicFull", full::Phi, full::Y, hf_cand_chic::JpsiToMuMuMass, - full::MCflag); + full::MCflag, + full::OriginMcRec); DECLARE_SOA_TABLE(HfCandChicFullEvents, "AOD", "HFCANDChicFullE", collision::BCId, @@ -108,7 +111,8 @@ DECLARE_SOA_TABLE(HfCandChicFullParticles, "AOD", "HFCANDChicFullP", full::Phi, full::Y, hf_cand_chic::JpsiToMuMuMass, - full::MCflag); + full::MCflag, + full::OriginMcGen); } // namespace o2::aod @@ -193,7 +197,8 @@ struct HfTreeCreatorChicToJpsiGamma { candidate.phi(), FunctionY, candidate.jpsiToMuMuMass(), - candidate.flagMcMatchRec()); + candidate.flagMcMatchRec(), + candidate.originMcRec()); } }; fillTable(0, candidate.isSelChicToJpsiToMuMuGamma(), invMassChicToJpsiGamma(candidate), ctChic(candidate), yChic(candidate)); @@ -212,7 +217,8 @@ struct HfTreeCreatorChicToJpsiGamma { particle.phi(), RecoDecay::y(array{particle.px(), particle.py(), particle.pz()}, massChic), 0., // put here the jpsi mass - particle.flagMcMatchGen()); + particle.flagMcMatchGen(), + particle.originMcGen()); } } } diff --git a/PWGHF/TableProducer/treeCreatorLbToLcPi.cxx b/PWGHF/TableProducer/treeCreatorLbToLcPi.cxx index aec471dbae8..b63e39f036a 100644 --- a/PWGHF/TableProducer/treeCreatorLbToLcPi.cxx +++ b/PWGHF/TableProducer/treeCreatorLbToLcPi.cxx @@ -60,6 +60,7 @@ DECLARE_SOA_COLUMN(CPA, cpa, float); DECLARE_SOA_COLUMN(CPAXY, cpaXY, float); DECLARE_SOA_COLUMN(Ct, ct, float); DECLARE_SOA_COLUMN(MCflag, mcflag, int8_t); +DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); DECLARE_SOA_COLUMN(NSigRICHTrk0Pi, nsigRICHTrk0Pi, float); DECLARE_SOA_COLUMN(NSigfRICHTrk0Pi, nsigfRICHTrk0Pi, float); DECLARE_SOA_COLUMN(NSigTOFTrk0Pi, nsigTOFTrk0Pi, float); @@ -161,7 +162,8 @@ DECLARE_SOA_TABLE(HfCandLbFull, "AOD", "HFCANDLbFull", full::Eta, full::Phi, full::Y, - full::MCflag); + full::MCflag, + full::OriginMcRec); } // namespace o2::aod @@ -318,7 +320,8 @@ struct HfTreeCreatorLbToLcPi { candidate.eta(), candidate.phi(), FunctionY, - candidate.flagMcMatchRec()); + candidate.flagMcMatchRec(), + candidate.originMcRec()); } }; fillTable(candidate.isSelLbToLcPi(), invMassLbToLcPi(candidate), ctLb(candidate), yLb(candidate)); diff --git a/PWGHF/TableProducer/treeCreatorXToJpsiPiPi.cxx b/PWGHF/TableProducer/treeCreatorXToJpsiPiPi.cxx index 5aac5617186..cbaa3c8a8ee 100644 --- a/PWGHF/TableProducer/treeCreatorXToJpsiPiPi.cxx +++ b/PWGHF/TableProducer/treeCreatorXToJpsiPiPi.cxx @@ -68,6 +68,8 @@ DECLARE_SOA_COLUMN(CPA, cpa, float); DECLARE_SOA_COLUMN(CPAXY, cpaXY, float); DECLARE_SOA_COLUMN(Ct, ct, float); DECLARE_SOA_COLUMN(MCflag, mcflag, int8_t); +DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); +DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // Events DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); DECLARE_SOA_COLUMN(RunNumber, runNumber, int); @@ -114,7 +116,8 @@ DECLARE_SOA_TABLE(HfCandXFull, "AOD", "HFCANDXFull", full::DR1, full::DR2, full::PiBalance, - full::MCflag); + full::MCflag, + full::OriginMcRec); DECLARE_SOA_TABLE(HfCandXFullEvents, "AOD", "HFCANDXFullE", collision::BCId, @@ -131,7 +134,8 @@ DECLARE_SOA_TABLE(HfCandXFullParticles, "AOD", "HFCANDXFullP", full::Eta, full::Phi, full::Y, - full::MCflag); + full::MCflag, + full::OriginMcGen); } // namespace o2::aod @@ -224,7 +228,8 @@ struct HfTreeCreatorXToJpsiPiPi { FunctionDR1, FunctionDR2, FunctionPiBalance, - candidate.flagMcMatchRec()); + candidate.flagMcMatchRec(), + candidate.originMcRec()); } }; @@ -242,7 +247,8 @@ struct HfTreeCreatorXToJpsiPiPi { particle.eta(), particle.phi(), RecoDecay::y(array{particle.px(), particle.py(), particle.pz()}, massX), - particle.flagMcMatchGen()); + particle.flagMcMatchGen(), + particle.originMcGen()); } } } diff --git a/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx b/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx index c9341aaf307..fa88533ae13 100644 --- a/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx +++ b/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx @@ -58,6 +58,8 @@ DECLARE_SOA_COLUMN(CPA, cpa, float); DECLARE_SOA_COLUMN(CPAXY, cpaXY, float); DECLARE_SOA_COLUMN(Ct, ct, float); DECLARE_SOA_COLUMN(MCflag, mcflag, int8_t); +DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); +DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // Xic selection variable DECLARE_SOA_COLUMN(XicM, xicM, float); DECLARE_SOA_COLUMN(XicCt, xicCt, float); @@ -132,7 +134,8 @@ DECLARE_SOA_TABLE(HfCandXiccFull, "AOD", "HFCANDXiccFull", full::Eta, full::Phi, full::Y, - full::MCflag); + full::MCflag, + full::OriginMcRec); DECLARE_SOA_TABLE(HfCandXiccFullEvents, "AOD", "HFCANDXiccFullE", collision::BCId, @@ -149,7 +152,8 @@ DECLARE_SOA_TABLE(HfCandXiccFullParticles, "AOD", "HFCANDXiccFullP", full::Eta, full::Phi, full::Y, - full::MCflag); + full::MCflag, + full::OriginMcGen); } // namespace o2::aod @@ -246,7 +250,8 @@ struct HfTreeCreatorXiccToPKPiPi { candidate.eta(), candidate.phi(), FunctionY, - candidate.flagMcMatchRec()); + candidate.flagMcMatchRec(), + candidate.originMcRec()); } }; @@ -263,7 +268,8 @@ struct HfTreeCreatorXiccToPKPiPi { particle.eta(), particle.phi(), RecoDecay::y(array{particle.px(), particle.py(), particle.pz()}, RecoDecay::getMassPDG(particle.pdgCode())), - particle.flagMcMatchGen()); + particle.flagMcMatchGen(), + particle.originMcGen()); } } }