Skip to content

PWGHF: Add KFParticle to D0 creator#3046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vkucera merged 45 commits into from
Oct 4, 2023
Merged

PWGHF: Add KFParticle to D0 creator #3046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
5a30ceb
Skip DF with 0 collisions (#2351)
mpuccio Apr 8, 2023
7f14ead
Merge remote-tracking branch 'upstream/master' into stable-async
chiarazampolli Apr 8, 2023
7d25e11
Merge remote-tracking branch 'upstream/master' into stable-async
chiarazampolli May 12, 2023
0d01475
Merge remote-tracking branch 'upstream/master' into stable-async
chiarazampolli May 15, 2023
f8140e6
PWGHF: Add KFParticle to D0 creator
lupengzhong Jul 12, 2023
0ae8a1f
Merge commit 'eea7d2de5d18c475c5f08a145989da9f509e42b0'
lupengzhong Jul 23, 2023
5bf3cb1
PWGHF: Added topological chi2 to HfCand2Prong table
lupengzhong Jul 23, 2023
594ee2d
PWGHF: Add topological chi2 to treeCreatorD0ToKPi
lupengzhong Jul 23, 2023
76117d4
PWGHF: Added histograms for D0 and D0bar after topological constraint
lupengzhong Jul 24, 2023
c4bd582
Merge commit '2c5db3f196471770021e018422e2aa018b8a3226'
lupengzhong Jul 24, 2023
8867c6f
Merge commit '4915231531fa757753f51fdd3c7c3af9b36ec4b2'
lupengzhong Aug 2, 2023
bbd85d8
PWGHF: Add geometrical mass to the output table
lupengzhong Aug 2, 2023
498e158
Merge commit 'b8512ab30c8bc177e0156255dc04d8e834ac27e4'
lupengzhong Aug 8, 2023
94279bb
PWGHF: Use the extra table to store KFParticle topological chi2 and g…
lupengzhong Aug 8, 2023
ee6315d
PWGHF: git-cland-format for candidateCreator2Prong
lupengzhong Aug 8, 2023
d6214c0
PWGHF:git-clang-format
lupengzhong Aug 8, 2023
f206832
PWGHF: candidateCreator2Prong.cxx with git-clang-format
lupengzhong Aug 11, 2023
adf51db
PWGHF: optimize the code to add Kf to D0
lupengzhong Aug 16, 2023
8ef882c
Merge commit '1579762279b0f2553c3437bef0e2e29aae425109'
lupengzhong Aug 16, 2023
79f7ef2
PWGHF: candidateSelectorD0.cxx conflict fix
lupengzhong Aug 16, 2023
7880316
Merge remote-tracking branch 'upstream/master' into stable-async
chiarazampolli Sep 4, 2023
41d2345
Merge remote-tracking branch 'upstream/master' into stable-async
chiarazampolli Sep 8, 2023
bb0e581
Merge commit '76acd5f6ff94b2fa82fd234526cf84f09daf68a9'
lupengzhong Sep 13, 2023
a4c00a0
Merge commit '76acd5f6ff94b2fa82fd234526cf84f09daf68a9', fix conflict…
lupengzhong Sep 13, 2023
11be4ea
Updates for adding KF to HF-D0
lupengzhong Sep 13, 2023
57101d3
git-clang-format for "PWGHF/DataModel/CandidateReconstructionTables.h"
lupengzhong Sep 13, 2023
784ca99
Merge commit 'ec0d714f2ebc2aa21f56c4396a981b78f7837c9c'
lupengzhong Sep 13, 2023
f2ba845
PWGHF: Try to respect the grouping and sorting of the head files
lupengzhong Sep 13, 2023
49dcd39
Merge commit '9f198d086266401964c622e8aff5046944f78c1c'
lupengzhong Sep 15, 2023
004d84e
Update PR
lupengzhong Sep 15, 2023
108f458
Merge commit '4dec09f445c0898afbe20e32fec7d25b15b4fd5f'
lupengzhong Sep 17, 2023
502bbf9
Update PR
lupengzhong Sep 17, 2023
a603281
Merge remote-tracking branch 'upstream/master' into stable-async
chiarazampolli Sep 18, 2023
e5c4a40
Merge remote-tracking branch 'upstream/master' into stable-async
chiarazampolli Sep 20, 2023
0a47e7c
Merge commit 'f114654cb03ea365b91a70f58778cce174b43f56'
lupengzhong Sep 20, 2023
845a2f2
Merge remote-tracking branch 'upstream/master' into stable-async
chiarazampolli Sep 23, 2023
0c55d57
Merge commit '845a2f26657fe6e412b0695654d8f1b8fd37aa1a'
lupengzhong Sep 24, 2023
da7f951
PWGHF: update PR
lupengzhong Sep 24, 2023
5dc95fb
PWGHF: update git-clang-format
lupengzhong Sep 24, 2023
e8a71ea
Merge commit '583cf6b9ef0f0d9b70845b6288a9f282c79520fc'
lupengzhong Sep 27, 2023
b03deb6
PWGHF: update PR
lupengzhong Sep 27, 2023
44304cd
Merge commit 'c88f00e60f025a6afa9fe7e4b149a2fc75bb269d'
lupengzhong Oct 1, 2023
55ba45d
PWGHF: update PR
lupengzhong Oct 1, 2023
0454367
Merge commit '0071844663e66dd0f34b33188e32aea77a3765ad'
lupengzhong Oct 4, 2023
4ea01a5
Remove unused variables in runCreator2ProngWithKFParticle
lupengzhong Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 69 additions & 14 deletions PWGHF/D2H/Tasks/taskD0.cxx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ using namespace o2;
using namespace o2::framework;
using namespace o2::framework::expressions;
using namespace o2::aod::hf_cand_2prong;
using namespace o2::aod::hf_cand;
Comment thread
vkucera marked this conversation as resolved.
using namespace o2::analysis::hf_cuts_d0_to_pi_k;

/// D0 analysis task
Expand All@@ -40,8 +41,15 @@ struct HfTaskD0 {
Configurable<int> selectionPid{"selectionPid", 1, "Selection Flag for reco PID candidates"};
Configurable<std::vector<double>> binsPt{"binsPt", std::vector<double>{hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits"};

Partition<soa::Join<aod::HfCand2Prong, aod::HfSelD0>> selectedD0Candidates = aod::hf_sel_candidate_d0::isSelD0 >= selectionFlagD0 || aod::hf_sel_candidate_d0::isSelD0bar >= selectionFlagD0bar;
Partition<soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec>> recoFlag2Prong = aod::hf_sel_candidate_d0::isRecoHfFlag >= selectionFlagHf;
using D0Candidates = soa::Join<aod::HfCand2Prong, aod::HfSelD0>;
using D0CandidatesMc = soa::Join<D0Candidates, aod::HfCand2ProngMcRec>;
using D0CandidatesKF = soa::Join<D0Candidates, aod::HfCand2ProngKF>;
using D0CandidatesMcKF = soa::Join<D0CandidatesKF, aod::HfCand2ProngMcRec>;

Partition<D0Candidates> selectedD0Candidates = aod::hf_sel_candidate_d0::isSelD0 >= selectionFlagD0 || aod::hf_sel_candidate_d0::isSelD0bar >= selectionFlagD0bar;
Partition<D0CandidatesKF> selectedD0CandidatesKF = aod::hf_sel_candidate_d0::isSelD0 >= selectionFlagD0 || aod::hf_sel_candidate_d0::isSelD0bar >= selectionFlagD0bar;
Partition<D0CandidatesMc> selectedD0CandidatesMc = aod::hf_sel_candidate_d0::isRecoHfFlag >= selectionFlagHf;
Partition<D0CandidatesMcKF> selectedD0CandidatesMcKF = aod::hf_sel_candidate_d0::isRecoHfFlag >= selectionFlagHf;

HistogramRegistry registry{
"registry",
Expand DownExpand Up@@ -121,6 +129,14 @@ struct HfTaskD0 {

void init(InitContext&)
{
std::array<bool, 4> doprocess{doprocessDataWithDCAFitterN, doprocessDataWithKFParticle, doprocessMcWithDCAFitterN, doprocessMcWithKFParticle};
if ((std::accumulate(doprocess.begin(), doprocess.end(), 0)) == 0) {
LOGP(fatal, "At least one process function should be enabled at a time.");
}
if ((doprocessDataWithDCAFitterN || doprocessMcWithDCAFitterN) && (doprocessDataWithKFParticle || doprocessMcWithKFParticle)) {
LOGP(fatal, "DCAFitterN and KFParticle can not be enabled at a time.");
}

auto vbins = (std::vector<double>)binsPt;
registry.add("hMass", "2-prong candidates;inv. mass (#pi K) (GeV/#it{c}^{2});entries", {HistType::kTH2F, {{500, 0., 5.}, {vbins, "#it{p}_{T} (GeV/#it{c})"}}});
registry.add("hMassVsPhi", "2-prong candidates vs phi;inv. mass (#pi K) (GeV/#it{c}^{2});phi (rad);entries", {HistType::kTH3F, {{120, 1.5848, 2.1848}, {vbins, "#it{p}_{T} (GeV/#it{c})"}, {32, 0, o2::constants::math::TwoPI}}});
Expand DownExpand Up@@ -161,18 +177,25 @@ struct HfTaskD0 {
registry.add("hDecLengthxyVsPtSig", "2-prong candidates;decay length xy (cm) vs #it{p}_{T} for signal;entries", {HistType::kTH2F, {{800, 0., 4.}, {vbins, "#it{p}_{T} (GeV/#it{c})"}}});
}

void process(soa::Join<aod::HfCand2Prong, aod::HfSelD0> const& candidates)
template <int reconstructionType, typename CandType>
void processData(CandType const& candidates)
{
for (const auto& candidate : selectedD0Candidates) {
for (const auto& candidate : candidates) {
if (!(candidate.hfflag() & 1 << DecayType::D0ToPiK)) {
continue;
}
if (yCandRecoMax >= 0. && std::abs(yD0(candidate)) > yCandRecoMax) {
continue;
}

auto massD0 = invMassD0ToPiK(candidate);
auto massD0bar = invMassD0barToKPi(candidate);
float massD0, massD0bar;
if constexpr (reconstructionType == VertexerType::KfParticle) {
massD0 = candidate.kfGeoMassD0();
massD0bar = candidate.kfGeoMassD0bar();
} else {
massD0 = invMassD0ToPiK(candidate);
massD0bar = invMassD0barToKPi(candidate);
}
auto ptCandidate = candidate.pt();

if (candidate.isSelD0() >= selectionFlagD0) {
Expand DownExpand Up@@ -215,28 +238,46 @@ struct HfTaskD0 {
registry.fill(HIST("hCPAXYFinerBinning"), candidate.cpaXY(), ptCandidate);
}
}
void processDataWithDCAFitterN(D0Candidates const&)
{
processData<VertexerType::DCAFitter>(selectedD0Candidates);
}
PROCESS_SWITCH(HfTaskD0, processDataWithDCAFitterN, "process taskD0 with DCAFitterN", true);

void processDataWithKFParticle(D0CandidatesKF const&)
{
processData<VertexerType::KfParticle>(selectedD0CandidatesKF);
}
PROCESS_SWITCH(HfTaskD0, processDataWithKFParticle, "process taskD0 with KFParticle", false);

void processMc(soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec> const& candidates,
template <int reconstructionType, typename CandType>
void processMc(CandType const& candidates,
soa::Join<aod::McParticles, aod::HfCand2ProngMcGen> const& mcParticles,
aod::TracksWMc const& tracks)
{
// MC rec.
for (const auto& candidate : recoFlag2Prong) {
for (const auto& candidate : candidates) {
if (!(candidate.hfflag() & 1 << DecayType::D0ToPiK)) {
continue;
}
if (yCandRecoMax >= 0. && std::abs(yD0(candidate)) > yCandRecoMax) {
continue;
}
auto massD0 = invMassD0ToPiK(candidate);
auto massD0bar = invMassD0barToKPi(candidate);
float massD0, massD0bar;
if constexpr (reconstructionType == VertexerType::KfParticle) {
massD0 = candidate.kfGeoMassD0();
massD0bar = candidate.kfGeoMassD0bar();
} else {
massD0 = invMassD0ToPiK(candidate);
massD0bar = invMassD0barToKPi(candidate);
}
if (std::abs(candidate.flagMcMatchRec()) == 1 << DecayType::D0ToPiK) {
// Get the corresponding MC particle.
auto indexMother = RecoDecay::getMother(mcParticles, candidate.prong0_as<aod::TracksWMc>().mcParticle_as<soa::Join<aod::McParticles, aod::HfCand2ProngMcGen>>(), pdg::Code::kD0, true);
auto indexMother = RecoDecay::getMother(mcParticles, candidate.template prong0_as<aod::TracksWMc>().template mcParticle_as<soa::Join<aod::McParticles, aod::HfCand2ProngMcGen>>(), pdg::Code::kD0, true);
auto particleMother = mcParticles.rawIteratorAt(indexMother);
auto ptGen = particleMother.pt(); // gen. level pT
auto ptGen = particleMother.pt(); // gen. level pT
auto yGen = RecoDecay::y(std::array{particleMother.px(), particleMother.py(), particleMother.pz()}, RecoDecay::getMassPDG(particleMother.pdgCode())); // gen. level y
registry.fill(HIST("hPtGenSig"), ptGen); // gen. level pT
registry.fill(HIST("hPtGenSig"), ptGen); // gen. level pT
auto ptRec = candidate.pt();
auto yRec = yD0(candidate);
if (candidate.isRecoHfFlag() >= selectionFlagHf) {
Expand DownExpand Up@@ -402,7 +443,21 @@ struct HfTaskD0 {
}
}

PROCESS_SWITCH(HfTaskD0, processMc, "Process MC", false);
void processMcWithDCAFitterN(D0CandidatesMc const&,
soa::Join<aod::McParticles, aod::HfCand2ProngMcGen> const& mcParticles,
aod::TracksWMc const& tracks)
{
processMc<VertexerType::DCAFitter>(selectedD0CandidatesMc, mcParticles, tracks);
}
PROCESS_SWITCH(HfTaskD0, processMcWithDCAFitterN, "Process MC with DCAFitterN", false);

void processMcWithKFParticle(D0CandidatesMcKF const&,
soa::Join<aod::McParticles, aod::HfCand2ProngMcGen> const& mcParticles,
aod::TracksWMc const& tracks)
{
processMc<VertexerType::KfParticle>(selectedD0CandidatesMcKF, mcParticles, tracks);
}
PROCESS_SWITCH(HfTaskD0, processMcWithKFParticle, "Process MC with KFParticle", false);
};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
Expand Down
12 changes: 12 additions & 0 deletions PWGHF/DataModel/CandidateReconstructionTables.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -442,6 +442,11 @@ DECLARE_SOA_DYNAMIC_COLUMN(Ct, ct, //!
[](float xVtxP, float yVtxP, float zVtxP, float xVtxS, float yVtxS, float zVtxS, float px, float py, float pz, double m) -> float { return RecoDecay::ct(std::array{px, py, pz}, RecoDecay::distance(std::array{xVtxP, yVtxP, zVtxP}, std::array{xVtxS, yVtxS, zVtxS}), m); });
DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterXY, impactParameterXY, //!
[](float xVtxP, float yVtxP, float zVtxP, float xVtxS, float yVtxS, float zVtxS, float px, float py, float pz) -> float { return RecoDecay::impParXY(std::array{xVtxP, yVtxP, zVtxP}, std::array{xVtxS, yVtxS, zVtxS}, std::array{px, py, pz}); });
DECLARE_SOA_COLUMN(KfTopolChi2OverNdf, kfTopolChi2OverNdf, float); //! chi2overndf of the KFParticle topological constraint

// method of secondary-vertex reconstruction
enum VertexerType { DCAFitter = 0,
KfParticle };
} // namespace hf_cand

// specific 2-prong decay properties
Expand DownExpand Up@@ -470,6 +475,9 @@ DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t); //! reconstruction l
DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t); //! generator level
DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); //! particle origin, reconstruction level
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); //! particle origin, generator level
// KF related properties
DECLARE_SOA_COLUMN(KfGeoMassD0, kfGeoMassD0, float); //! mass of the D0 candidate from the KFParticle geometric fit
DECLARE_SOA_COLUMN(KfGeoMassD0bar, kfGeoMassD0bar, float); //! mass of the D0bar candidate from the KFParticle geometric fit

// mapping of decay types
enum DecayType { D0ToPiK = 0,
Expand DownExpand Up@@ -621,6 +629,10 @@ DECLARE_SOA_EXTENDED_TABLE_USER(HfCand2ProngExt, HfCand2ProngBase, "HFCAND2PEXT"

using HfCand2Prong = HfCand2ProngExt;

DECLARE_SOA_TABLE(HfCand2ProngKF, "AOD", "HFCAND2PKF",
hf_cand::KfTopolChi2OverNdf,
hf_cand_2prong::KfGeoMassD0, hf_cand_2prong::KfGeoMassD0bar);

// table with results of reconstruction level MC matching
DECLARE_SOA_TABLE(HfCand2ProngMcRec, "AOD", "HFCAND2PMCREC", //!
hf_cand_2prong::FlagMcMatchRec,
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ o2physics_add_dpl_workflow(refit-pv-dummy

o2physics_add_dpl_workflow(candidate-creator-2prong
SOURCES candidateCreator2Prong.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle

@vkuceravkuceraSep 20, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How much extra memory does linking the new library cost?

@lupengzhonglupengzhongSep 24, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I compared on the residentSetSize from performanceMetrics.json between using the hf-tree-creator-d0-to-k-pi:processMcWithDCAFitterAll with KFParticle linked and hf-tree-creator-d0-to-k-pi:processMc + fillOnlyBackground:false and fillOnlySignal:false with the current version in the upstream master. There are about 10M extra memories costs for both the hf-candidate-creator-2prong and hf-candidate-creator-2prong-expressions

@vkuceravkuceraSep 26, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you mean 20 MB extra in total?

@lupengzhonglupengzhongSep 27, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I compared the proportionalSetSize, actually every task has a very similar consumption of memory, and the differences are always smaller than 10 MB. They are only fluctuations for me.

@vkuceravkuceraSep 28, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for checking!

COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-3prong
Expand Down
Loading