From af1136043d2bf25a706b25b8004f3f86d263ce73 Mon Sep 17 00:00:00 2001 From: Nima Zardoshti Date: Thu, 1 Jun 2023 20:25:36 +0200 Subject: [PATCH 01/10] PWGHF : Adding new coloumns to tree creator for candidate indexing for HF studies --- PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx | 13 +++++++++---- PWGHF/TableProducer/treeCreatorD0ToKPi.cxx | 13 +++++++++---- PWGHF/TableProducer/treeCreatorLcToPKPi.cxx | 16 +++++++++++----- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx index 40f3ea96c9e..89140ae4f0e 100644 --- a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx +++ b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx @@ -94,6 +94,7 @@ DECLARE_SOA_COLUMN(NSigmaTPCTrk1Pi, nSigmaTPCTrk1Pi, float); // Events DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); DECLARE_SOA_COLUMN(RunNumber, runNumber, int); +DECLARE_SOA_COLUMN(HFGlobalIndex, hfGlobalIndex, int); } // namespace full // put the arguments into the table @@ -158,7 +159,8 @@ DECLARE_SOA_TABLE(HfCandBplusFull, "AOD", "HFCANDBPFull", full::NSigmaTOFTrk1Pi, full::NSigmaTOFTrk1Ka, full::NSigmaTPCTrk1Pi, - full::NSigmaTPCTrk1Ka); + full::NSigmaTPCTrk1Ka, + full::HFGlobalIndex); DECLARE_SOA_TABLE(HfCandBplusFullEvents, "AOD", "HFCANDBPFullE", collision::BCId, @@ -175,7 +177,8 @@ DECLARE_SOA_TABLE(HfCandBplusFullParticles, "AOD", "HFCANDBPFullP", full::Eta, full::Phi, full::Y, - full::MCflag); + full::MCflag, + full::HFGlobalIndex); } // namespace o2::aod @@ -297,7 +300,8 @@ struct HfTreeCreatorBplusToD0Pi { d0Daughter1.tofNSigmaPi(), d0Daughter1.tofNSigmaKa(), d0Daughter1.tpcNSigmaPi(), - d0Daughter1.tpcNSigmaKa()); + d0Daughter1.tpcNSigmaKa(), + candidate.globalIndex()); } }; @@ -315,7 +319,8 @@ struct HfTreeCreatorBplusToD0Pi { particle.eta(), particle.phi(), RecoDecay::y(array{particle.px(), particle.py(), particle.pz()}, RecoDecay::getMassPDG(particle.pdgCode())), - particle.flagMcMatchGen()); + particle.flagMcMatchGen(), + particle.globalIndex()); } } } diff --git a/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx b/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx index 5aaaabe1193..51b6df90cc8 100644 --- a/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx @@ -70,6 +70,7 @@ DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); DECLARE_SOA_COLUMN(RunNumber, runNumber, int); DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); // is prompt or non-prompt, reco level DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // is prompt or non-prompt, Gen level +DECLARE_SOA_COLUMN(HFGlobalIndex, hfGlobalIndex, int); } // namespace full DECLARE_SOA_TABLE(HfCand2ProngFull, "AOD", "HFCAND2PFull", @@ -127,7 +128,8 @@ DECLARE_SOA_TABLE(HfCand2ProngFull, "AOD", "HFCAND2PFull", full::Y, full::E, full::FlagMc, - full::OriginMcRec); + full::OriginMcRec, + full::HFGlobalIndex); DECLARE_SOA_TABLE(HfCand2ProngFullEvents, "AOD", "HFCAND2PFullE", collision::BCId, @@ -145,7 +147,8 @@ DECLARE_SOA_TABLE(HfCand2ProngFullParticles, "AOD", "HFCAND2PFullP", full::Phi, full::Y, full::FlagMc, - full::OriginMcGen); + full::OriginMcGen, + full::HFGlobalIndex); } // namespace o2::aod @@ -232,7 +235,8 @@ struct HfTreeCreatorD0ToKPi { y, e, flagMc, - origin); + origin, + candidate.globalIndex()); } } @@ -296,7 +300,8 @@ struct HfTreeCreatorD0ToKPi { particle.phi(), RecoDecay::y(array{particle.px(), particle.py(), particle.pz()}, RecoDecay::getMassPDG(particle.pdgCode())), particle.flagMcMatchGen(), - particle.originMcGen()); + particle.originMcGen(), + particle.globalIndex()); } } } diff --git a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx index 8e13dbc0de9..2a9aab02253 100644 --- a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx @@ -81,6 +81,7 @@ DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int8_t); // Events DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); DECLARE_SOA_COLUMN(RunNumber, runNumber, int); +DECLARE_SOA_COLUMN(HFGlobalIndex, hfGlobalIndex, int); } // namespace full DECLARE_SOA_TABLE(HfCand3ProngFull, "AOD", "HFCAND3PFull", @@ -155,7 +156,8 @@ DECLARE_SOA_TABLE(HfCand3ProngFull, "AOD", "HFCAND3PFull", full::E, full::MCflag, full::OriginMcRec, - full::IsCandidateSwapped); + full::IsCandidateSwapped, + full::HFGlobalIndex); DECLARE_SOA_TABLE(HfCand3ProngFullEvents, "AOD", "HFCAND3PFullE", collision::BCId, @@ -173,7 +175,8 @@ DECLARE_SOA_TABLE(HfCand3ProngFullParticles, "AOD", "HFCAND3PFullP", full::Phi, full::Y, full::MCflag, - full::OriginMcGen); + full::OriginMcGen, + full::HFGlobalIndex); } // namespace o2::aod @@ -295,7 +298,8 @@ struct HfTreeCreatorLcToPKPi { FunctionE, candidate.flagMcMatchRec(), candidate.originMcRec(), - candidate.isCandidateSwapped()); + candidate.isCandidateSwapped(), + candidate.globalIndex()); } }; @@ -314,7 +318,8 @@ struct HfTreeCreatorLcToPKPi { particle.phi(), RecoDecay::y(array{particle.px(), particle.py(), particle.pz()}, RecoDecay::getMassPDG(particle.pdgCode())), particle.flagMcMatchGen(), - particle.originMcGen()); + particle.originMcGen(), + particle.globalIndex()); } } } @@ -424,7 +429,8 @@ struct HfTreeCreatorLcToPKPi { FunctionE, 0., 0., - 0.); + 0., + candidate.globalIndex()); } }; From ee36625a82492bb138f434f976b9a8434a7d7a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 2 Jun 2023 15:38:36 +0200 Subject: [PATCH 02/10] Change column name --- PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx index 89140ae4f0e..ac04cfb67f7 100644 --- a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx +++ b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx @@ -94,7 +94,7 @@ DECLARE_SOA_COLUMN(NSigmaTPCTrk1Pi, nSigmaTPCTrk1Pi, float); // Events DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); DECLARE_SOA_COLUMN(RunNumber, runNumber, int); -DECLARE_SOA_COLUMN(HFGlobalIndex, hfGlobalIndex, int); +DECLARE_SOA_COLUMN(GlobalIndex, globalIndex, int); } // namespace full // put the arguments into the table From 55b19e9b042ca11e6503ccac4c94d3e49ecb996d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 2 Jun 2023 15:38:46 +0200 Subject: [PATCH 03/10] Change column name --- PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx index ac04cfb67f7..efd63f01680 100644 --- a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx +++ b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx @@ -160,7 +160,7 @@ DECLARE_SOA_TABLE(HfCandBplusFull, "AOD", "HFCANDBPFull", full::NSigmaTOFTrk1Ka, full::NSigmaTPCTrk1Pi, full::NSigmaTPCTrk1Ka, - full::HFGlobalIndex); + full::GlobalIndex); DECLARE_SOA_TABLE(HfCandBplusFullEvents, "AOD", "HFCANDBPFullE", collision::BCId, From c4d7c6903a51668864d14d20e171c633e3efa493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 2 Jun 2023 15:38:55 +0200 Subject: [PATCH 04/10] Change column name --- PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx index efd63f01680..d06400c40d8 100644 --- a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx +++ b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx @@ -178,7 +178,7 @@ DECLARE_SOA_TABLE(HfCandBplusFullParticles, "AOD", "HFCANDBPFullP", full::Phi, full::Y, full::MCflag, - full::HFGlobalIndex); + full::GlobalIndex); } // namespace o2::aod From 540b9785eb98e1f680a1234b5c89f53b4deb1b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 2 Jun 2023 15:39:02 +0200 Subject: [PATCH 05/10] Change column name --- PWGHF/TableProducer/treeCreatorD0ToKPi.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx b/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx index 51b6df90cc8..4c461adb781 100644 --- a/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx @@ -70,7 +70,7 @@ DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); DECLARE_SOA_COLUMN(RunNumber, runNumber, int); DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); // is prompt or non-prompt, reco level DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // is prompt or non-prompt, Gen level -DECLARE_SOA_COLUMN(HFGlobalIndex, hfGlobalIndex, int); +DECLARE_SOA_COLUMN(GlobalIndex, globalIndex, int); } // namespace full DECLARE_SOA_TABLE(HfCand2ProngFull, "AOD", "HFCAND2PFull", From deed37706a5e325eb4b010ca151d02e124eaffd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 2 Jun 2023 15:39:09 +0200 Subject: [PATCH 06/10] Change column name --- PWGHF/TableProducer/treeCreatorD0ToKPi.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx b/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx index 4c461adb781..4b4c4707aa3 100644 --- a/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx @@ -129,7 +129,7 @@ DECLARE_SOA_TABLE(HfCand2ProngFull, "AOD", "HFCAND2PFull", full::E, full::FlagMc, full::OriginMcRec, - full::HFGlobalIndex); + full::GlobalIndex); DECLARE_SOA_TABLE(HfCand2ProngFullEvents, "AOD", "HFCAND2PFullE", collision::BCId, From e867716a6e26f299ef6a9f93061f07e6188d3a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 2 Jun 2023 15:39:18 +0200 Subject: [PATCH 07/10] Change column name --- PWGHF/TableProducer/treeCreatorD0ToKPi.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx b/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx index 4b4c4707aa3..6505c1103dc 100644 --- a/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorD0ToKPi.cxx @@ -148,7 +148,7 @@ DECLARE_SOA_TABLE(HfCand2ProngFullParticles, "AOD", "HFCAND2PFullP", full::Y, full::FlagMc, full::OriginMcGen, - full::HFGlobalIndex); + full::GlobalIndex); } // namespace o2::aod From dbd46faa990d0e0a996bd349a9ca361ca37e2f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 2 Jun 2023 15:39:26 +0200 Subject: [PATCH 08/10] Change column name --- PWGHF/TableProducer/treeCreatorLcToPKPi.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx index 2a9aab02253..24cc4dd8da3 100644 --- a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx @@ -81,7 +81,7 @@ DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int8_t); // Events DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); DECLARE_SOA_COLUMN(RunNumber, runNumber, int); -DECLARE_SOA_COLUMN(HFGlobalIndex, hfGlobalIndex, int); +DECLARE_SOA_COLUMN(GlobalIndex, globalIndex, int); } // namespace full DECLARE_SOA_TABLE(HfCand3ProngFull, "AOD", "HFCAND3PFull", From fba678a6c80eed43a38568f5bf5fb0f4e4e4756e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 2 Jun 2023 15:39:35 +0200 Subject: [PATCH 09/10] Change column name --- PWGHF/TableProducer/treeCreatorLcToPKPi.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx index 24cc4dd8da3..0233c55aa60 100644 --- a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx @@ -157,7 +157,7 @@ DECLARE_SOA_TABLE(HfCand3ProngFull, "AOD", "HFCAND3PFull", full::MCflag, full::OriginMcRec, full::IsCandidateSwapped, - full::HFGlobalIndex); + full::GlobalIndex); DECLARE_SOA_TABLE(HfCand3ProngFullEvents, "AOD", "HFCAND3PFullE", collision::BCId, From a7f31759fc013cfd3ca2aa9357c10b1e181aabf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 2 Jun 2023 15:39:43 +0200 Subject: [PATCH 10/10] Change column name --- PWGHF/TableProducer/treeCreatorLcToPKPi.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx index 0233c55aa60..15ce1556652 100644 --- a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx @@ -176,7 +176,7 @@ DECLARE_SOA_TABLE(HfCand3ProngFullParticles, "AOD", "HFCAND3PFullP", full::Y, full::MCflag, full::OriginMcGen, - full::HFGlobalIndex); + full::GlobalIndex); } // namespace o2::aod