Skip to content

[PWGJE] MC fixes for jetCorrelationD0 task #16818

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
nzardosh merged 11 commits into from
Jun 25, 2026
+65 −29
Merged

[PWGJE] MC fixes for jetCorrelationD0 task #16818

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f4e401
column name fixes jetCorrelationD0
MattOckleton Apr 13, 2026
25f3617
removing custom index columns
MattOckleton Apr 13, 2026
5044716
Merge remote-tracking branch 'refs/remotes/upstream/master'
MattOckleton May 8, 2026
3f7b78e
Adding reflections to jetCorrelationD0 task
MattOckleton May 12, 2026
ba5a80b
Merge remote-tracking branch 'refs/remotes/upstream/master'
MattOckleton May 24, 2026
ee99bb3
Fixes for MC
MattOckleton Jun 25, 2026
191d38a
Merge remote-tracking branch 'upstream/master'
MattOckleton Jun 25, 2026
dfae714
removing whitespace
MattOckleton Jun 25, 2026
faf4e90
clang-format
MattOckleton Jun 25, 2026
c7c69af
formatting tableD0McDetector
MattOckleton Jun 25, 2026
e33800b
formatting headers
MattOckleton Jun 25, 2026
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
94 changes: 65 additions & 29 deletions PWGJE/Tasks/jetCorrelationD0.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,14 @@

#include "Common/Core/RecoDecay.h"

#include <CommonConstants/MathConstants.h>
#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/Configurable.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/Logger.h>
#include <Framework/runDataProcessing.h>

#include <cstdlib>
#include <string>
#include <type_traits>
#include <vector>

#include <math.h>
Expand Down Expand Up @@ -84,7 +78,8 @@ DECLARE_SOA_COLUMN(D0MD, d0MD, float);
DECLARE_SOA_COLUMN(D0PtD, d0PtD, float);
DECLARE_SOA_COLUMN(D0EtaD, d0EtaD, float);
DECLARE_SOA_COLUMN(D0PhiD, d0PhiD, float);
DECLARE_SOA_COLUMN(D0Reflection, d0Reflection, int);
DECLARE_SOA_COLUMN(D0MatchedFrom, d0MatchedFrom, int);
DECLARE_SOA_COLUMN(D0SelectedAs, d0SelectedAs, int);
} // namespace d0Info

DECLARE_SOA_TABLE(D0Tables, "AOD", "D0TABLE",
Expand All @@ -99,6 +94,20 @@ DECLARE_SOA_TABLE(D0Tables, "AOD", "D0TABLE",
d0Info::D0Phi,
d0Info::D0Y);

DECLARE_SOA_TABLE(D0McDTables, "AOD", "D0MCDTABLE",
o2::soa::Index<>,
collisionInfo::McCollisionTableId,
d0Info::D0PromptBDT,
d0Info::D0NonPromptBDT,
d0Info::D0BkgBDT,
d0Info::D0M,
d0Info::D0Pt,
d0Info::D0Eta,
d0Info::D0Phi,
d0Info::D0Y,
d0Info::D0MatchedFrom,
d0Info::D0SelectedAs);

DECLARE_SOA_TABLE(D0McPTables, "AOD", "D0MCPTABLE",
o2::soa::Index<>,
collisionInfo::McCollisionTableId,
Expand All @@ -112,6 +121,7 @@ namespace jetInfo
{
// D0 tables
DECLARE_SOA_INDEX_COLUMN(D0Table, d0Table);
DECLARE_SOA_INDEX_COLUMN(D0McDTable, d0McDTable);
DECLARE_SOA_INDEX_COLUMN(D0McPTable, d0McPTable);
// Jet
DECLARE_SOA_COLUMN(JetPt, jetPt, float);
Expand All @@ -134,6 +144,15 @@ DECLARE_SOA_TABLE_STAGED(JetTables, "JETTABLE",
jetInfo::JetPhi,
jetInfo::D0JetDeltaPhi);

DECLARE_SOA_TABLE_STAGED(JetMcDTables, "JETMCDTABLE",
o2::soa::Index<>,
collisionInfo::CollisionTableId,
jetInfo::D0McDTableId,
jetInfo::JetPt,
jetInfo::JetEta,
jetInfo::JetPhi,
jetInfo::D0JetDeltaPhi);

DECLARE_SOA_TABLE_STAGED(JetMcPTables, "JETMCPTABLE",
o2::soa::Index<>,
collisionInfo::McCollisionTableId,
Expand All @@ -160,18 +179,20 @@ DECLARE_SOA_TABLE_STAGED(JetMatchedTables, "JETMATCHEDTABLE",
struct JetCorrelationD0 {
// Define new table
Produces<aod::CollisionTables> tableCollision;
Produces<aod::MatchCollTables> tableMatchedCollision;
Produces<aod::McCollisionTables> tableMcCollision;
Produces<aod::MatchCollTables> tableMatchedCollision;
Produces<aod::D0Tables> tableD0;
Produces<aod::D0McDTables> tableD0McDetector;
Produces<aod::D0McPTables> tableD0McParticle;
Produces<aod::JetTables> tableJet;
Produces<aod::JetMcDTables> tableJetMcDetector;
Produces<aod::JetMcPTables> tableJetMcParticle;
Produces<aod::JetMatchedTables> tableJetMatched;

// Configurables
Configurable<std::string> eventSelections{"eventSelections", "sel8", "choose event selection"};
Configurable<bool> skipMBGapEvents{"skipMBGapEvents", false, "decide to run over MB gap events or not"};
Configurable<bool> applyRCTSelections{"applyRCTSelections", true, "decide to apply RCT selections"};
Configurable<bool> applyRCTSelections{"applyRCTSelections", false, "decide to apply RCT selections"};

@nzardosh nzardosh Jun 25, 2026

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.

you can set this back to true. On hyperloop it should be ok

@nzardosh nzardosh Jun 25, 2026

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.

although in general it should already be applied in the jet finder

Configurable<float> jetPtCutMin{"jetPtCutMin", 5.0, "minimum value of jet pt"};
Configurable<float> d0PtCutMin{"d0PtCutMin", 1.0, "minimum value of d0 pt"};
Configurable<float> jetMcPtCutMin{"jetMcPtCutMin", 3.0, "minimum value of jet pt particle level"};
Expand Down Expand Up @@ -318,15 +339,33 @@ struct JetCorrelationD0 {
}
const auto scores = d0Candidate.mlScores();
fillD0Histograms(d0Candidate, scores);
tableD0(tableCollision.lastIndex(), // might want to add some more detector level D0 quantities like prompt or non prompt info
scores[2],
scores[1],
scores[0],
d0Candidate.m(),
d0Candidate.pt(),
d0Candidate.eta(),
d0Candidate.phi(),
d0Candidate.y());

int matchedFrom = 0;
int decayChannel = o2::hf_decay::hf_cand_2prong::DecayChannelMain::D0ToPiK;
int selectedAs = 0;

if (d0Candidate.flagMcMatchRec() == decayChannel) { // matched to D0 on truth level
matchedFrom = 1;
} else if (d0Candidate.flagMcMatchRec() == -decayChannel) { // matched to D0bar on truth level
matchedFrom = -1;
}
if (d0Candidate.candidateSelFlag() & BIT(0)) { // CandidateSelFlag == BIT(0) -> selected as D0
selectedAs = 1;
} else if (d0Candidate.candidateSelFlag() & BIT(1)) { // CandidateSelFlag == BIT(1) -> selected as D0bar
selectedAs = -1;
}

tableD0McDetector(tableCollision.lastIndex(), // might want to add some more detector level D0 quantities like prompt or non prompt info
scores[2],
scores[1],
scores[0],
d0Candidate.m(),
d0Candidate.pt(),
d0Candidate.eta(),
d0Candidate.phi(),
d0Candidate.y(),
matchedFrom,
selectedAs);
for (const auto& jet : jets) {
if (jet.pt() < jetPtCutMin) {
continue;
Expand All @@ -336,12 +375,12 @@ struct JetCorrelationD0 {
continue;
}
fillJetHistograms(jet, dPhi);
tableJet(tableCollision.lastIndex(),
tableD0.lastIndex(),
jet.pt(),
jet.eta(),
jet.phi(),
dPhi);
tableJetMcDetector(tableCollision.lastIndex(),
tableD0McDetector.lastIndex(),
jet.pt(),
jet.eta(),
jet.phi(),
dPhi);
}
}
}
Expand Down Expand Up @@ -417,9 +456,6 @@ struct JetCorrelationD0 {
if (McDJet.has_matchedJetGeo()) { // geometric matching
for (auto const& McPJet : McDJet.template matchedJetGeo_as<aod::ChargedMCParticleLevelJets>()) {
float dPhiP = RecoDecay::constrainAngle(McPJet.phi() - d0Particle.phi(), -o2::constants::math::PI);
// if (std::abs(dPhiP - o2::constants::math::PI) > (o2::constants::math::PI / 2)) {
// continue;
// }
tableJetMatched(tableMatchedCollision.lastIndex(),
McDJet.pt(),
McDJet.eta(),
Expand Down
Loading