Skip to content

[PWGJE] Add secondary track's contamination inside jet #12514

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 15 commits into from
Sep 4, 2025
Merged

[PWGJE] Add secondary track's contamination inside jet #12514

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
52394f1
add validation function and small fix
hanseopark Mar 7, 2025
d96048e
Merge branch 'master' into HFTagging
hanseopark Mar 25, 2025
f542f10
fix axis name
hanseopark Jun 14, 2025
ca85f44
Merge branch 'master' into HFTagging
hanseopark Jul 14, 2025
059be8e
update secondary contamination inside jets
hanseopark Aug 4, 2025
59f03f1
Merge branch 'master' into HFTagging
hanseopark Aug 4, 2025
b9e68df
add secondary track inside jet when comapred to data with mc for syst…
hanseopark Aug 10, 2025
6c8aabb
Merge branch 'master' into HFTagging
hanseopark Aug 10, 2025
edb921f
fix clang-format and o2-linter
hanseopark Aug 10, 2025
93b1062
change int to std::size_t
hanseopark Aug 15, 2025
111dae5
update issue of o2-linter ofr task name
hanseopark Aug 19, 2025
f44f588
Merge branch 'master' into HFTagging
hanseopark Aug 22, 2025
082f540
reduce member of struct because of limit under 100 and add o2-linter …
hanseopark Aug 26, 2025
94fbaf6
change comment for o2-linter
hanseopark Sep 3, 2025
f4391ee
change the name of const variable and move them in function
hanseopark Sep 4, 2025
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
104 changes: 92 additions & 12 deletions PWGJE/Tasks/jetTaggerHFQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ struct JetTaggerHFQA {
// Axis
AxisSpec axisJetFlavour = {binJetFlavour, "Jet flavour"};
AxisSpec axisJetPt = {binJetPt, "#it{p}_{T, jet}"};
AxisSpec axisMCDJetPt = {binJetPt, "#it{p}_{T, jet}^{rec}"};
AxisSpec axisMCPJetPt = {binJetPt, "#it{p}_{T, jet}^{gen}"};
AxisSpec axisEta = {binEta, "#eta"};
AxisSpec axisPhi = {binPhi, "#phi"};
AxisSpec axisNTracks = {binNtracks, "#it{N}_{tracks}"};
Expand All @@ -149,6 +151,7 @@ struct JetTaggerHFQA {
AxisSpec axisMass = {binMass, "#it{m}_{SV}"};
AxisSpec axisSigmaLxy = {binSigmaLxy, "#sigma_{L_{XY}} [cm]"};
AxisSpec axisSigmaLxyz = {binSigmaLxyz, "#sigma_{L_{XYZ}} [cm]"};
AxisSpec axisFracSecPt = {100, 0, 1, "#frac{#Sigma#it{p}_{T}^{secondary track}}{#it{p}_{T, jet}}"};

if (doprocessTracksDca) {
if (fillIPxy) {
Expand All @@ -164,6 +167,14 @@ struct JetTaggerHFQA {
registry.add("h_impact_parameter_xyz_significance", "", {HistType::kTH1F, {{axisImpactParameterXYZSignificance}}});
}
}
if (doprocessTracksInJetsData) {
registry.add("h3_track_pt_impact_parameter_xy", "", {HistType::kTH3F, {{axisJetPt}, {axisTrackPt}, {axisImpactParameterXY}}});
}
if (doprocessSecondaryContaminationMCD) {
registry.add("hn_jet_pt_track_pt_impact_parameter_xy_physical_primary_flavour", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisTrackPt}, {axisImpactParameterXY}, {axisJetFlavour}}});
registry.add("hn_jet_pt_track_pt_impact_parameter_xy_secondary_flavour", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisTrackPt}, {axisImpactParameterXY}, {axisJetFlavour}}});
registry.add("h3_jet_pt_frac_secondary_pt_per_jet_flavour", "", {HistType::kTH3F, {{axisJetPt}, {axisFracSecPt}, {axisJetFlavour}}});
}
if (doprocessValFlavourDefMCD) {
registry.add("h2_flavour_dist_quark_flavour_dist_hadron", "", {HistType::kTH2F, {{axisJetFlavour}, {axisJetFlavour}}});
registry.add("h2_flavour_const_quark_flavour_const_hadron", "", {HistType::kTH2F, {{axisJetFlavour}, {axisJetFlavour}}});
Expand Down Expand Up @@ -289,7 +300,7 @@ struct JetTaggerHFQA {
registry.add("h2_jet_phi_part_flavour", "", {HistType::kTH2F, {{axisPhi}, {axisJetFlavour}}});
}
if (doprocessIPsMCPMCDMatched || doprocessIPsMCPMCDMatchedWeighted) {
registry.add("h3_jet_pt_jet_pt_part_matchedgeo_flavour", "", {HistType::kTH3F, {{axisJetPt}, {axisJetPt}, {axisJetFlavour}}});
registry.add("h3_jet_pt_jet_pt_part_matchedgeo_flavour", "", {HistType::kTH3F, {{axisMCDJetPt}, {axisMCPJetPt}, {axisJetFlavour}}});
}
if (doprocessJPData) {
if (!doprocessIPsData && !doprocessSV2ProngData && !doprocessSV3ProngData) {
Expand Down Expand Up @@ -435,14 +446,17 @@ struct JetTaggerHFQA {
template <typename T, typename U>
bool isAcceptedJet(U const& jet)
{
if (jetAreaFractionMin > -98.0) {
const float noJetAreaFractionFilter = -98.0;
const float noConstituentPtMinFilter = -98.0;
const float noConstituentPtMaxFilter = 9998.0;
if (jetAreaFractionMin > noJetAreaFractionFilter) {
if (jet.area() < jetAreaFractionMin * o2::constants::math::PI * (jet.r() / 100.0) * (jet.r() / 100.0)) {
return false;
}
}
bool checkConstituentPt = true;
bool checkConstituentMinPt = (leadingConstituentPtMin > -98.0);
bool checkConstituentMaxPt = (leadingConstituentPtMax < 9998.0);
bool checkConstituentMinPt = (leadingConstituentPtMin > noConstituentPtMinFilter);
bool checkConstituentMaxPt = (leadingConstituentPtMax < noConstituentPtMaxFilter);
if (!checkConstituentMinPt && !checkConstituentMaxPt) {
checkConstituentPt = false;
}
Expand Down Expand Up @@ -520,6 +534,9 @@ struct JetTaggerHFQA {
template <typename T, typename U>
void fillHistogramIPsData(T const& jet, U const& /*tracks*/)
{
std::size_t firstTaggerForTrackCounting = 0;
std::size_t secondTaggerForTrackCounting = 1;
std::size_t thirdTaggerForTrackCounting = 2;
float eventWeight = 1.0;
float pTHat = 10. / (std::pow(eventWeight, 1.0 / pTHatExponent));
if (jet.pt() > pTHatMaxMCD * pTHat) {
Expand Down Expand Up @@ -585,23 +602,23 @@ struct JetTaggerHFQA {
if (fillIPxyz)
std::sort(vecSignImpXYZSig.begin(), vecSignImpXYZSig.end(), sortImp);

if (vecSignImpXYSig.size() > 0) { // N1
if (vecSignImpXYSig.size() > firstTaggerForTrackCounting) { // N1
if (fillIPxy)
registry.fill(HIST("h2_jet_pt_sign_impact_parameter_xy_significance_N1"), jet.pt(), vecSignImpXYSig[0][0]);
if (fillIPz)
registry.fill(HIST("h2_jet_pt_sign_impact_parameter_z_significance_N1"), jet.pt(), vecSignImpZSig[0][0]);
if (fillIPxyz)
registry.fill(HIST("h2_jet_pt_sign_impact_parameter_xyz_significance_N1"), jet.pt(), vecSignImpXYZSig[0][0]);
}
if (vecSignImpXYSig.size() > 1) { // N2
if (vecSignImpXYSig.size() > secondTaggerForTrackCounting) { // N2
if (fillIPxy)
registry.fill(HIST("h2_jet_pt_sign_impact_parameter_xy_significance_N2"), jet.pt(), vecSignImpXYSig[1][0]);
if (fillIPz)
registry.fill(HIST("h2_jet_pt_sign_impact_parameter_z_significance_N2"), jet.pt(), vecSignImpZSig[1][0]);
if (fillIPxyz)
registry.fill(HIST("h2_jet_pt_sign_impact_parameter_xyz_significance_N2"), jet.pt(), vecSignImpXYZSig[1][0]);
}
if (vecSignImpXYSig.size() > 2) { // N3
if (vecSignImpXYSig.size() > thirdTaggerForTrackCounting) { // N3
if (fillIPxy)
registry.fill(HIST("h2_jet_pt_sign_impact_parameter_xy_significance_N3"), jet.pt(), vecSignImpXYSig[2][0]);
if (fillIPz)
Expand Down Expand Up @@ -638,6 +655,9 @@ struct JetTaggerHFQA {
template <typename T, typename U>
void fillHistogramIPsMCD(T const& mcdjet, U const& /*tracks*/, float eventWeight = 1.0)
{
std::size_t firstTaggerForTrackCounting = 0;
std::size_t secondTaggerForTrackCounting = 1;
std::size_t thirdTaggerForTrackCounting = 2;
float pTHat = 10. / (std::pow(eventWeight, 1.0 / pTHatExponent));
if (mcdjet.pt() > pTHatMaxMCD * pTHat) {
return;
Expand Down Expand Up @@ -739,23 +759,23 @@ struct JetTaggerHFQA {
sort(vecSignImpZSig[jetflavour].begin(), vecSignImpZSig[jetflavour].end(), std::greater<float>());
sort(vecSignImpXYZSig[jetflavour].begin(), vecSignImpXYZSig[jetflavour].end(), std::greater<float>());

if (vecImpXY[jetflavour].size() > 0) { // N1
if (vecImpXY[jetflavour].size() > firstTaggerForTrackCounting) { // N1
if (fillIPxy)
registry.fill(HIST("h3_jet_pt_sign_impact_parameter_xy_significance_flavour_N1"), mcdjet.pt(), vecSignImpXYSig[jetflavour][0], jetflavour, eventWeight);
if (fillIPz)
registry.fill(HIST("h3_jet_pt_sign_impact_parameter_z_significance_flavour_N1"), mcdjet.pt(), vecSignImpZSig[jetflavour][0], jetflavour, eventWeight);
if (fillIPxyz)
registry.fill(HIST("h3_jet_pt_sign_impact_parameter_xyz_significance_flavour_N1"), mcdjet.pt(), vecSignImpXYZSig[jetflavour][0], jetflavour, eventWeight);
}
if (vecImpXY[jetflavour].size() > 1) { // N2
if (vecImpXY[jetflavour].size() > secondTaggerForTrackCounting) { // N2
if (fillIPxy)
registry.fill(HIST("h3_jet_pt_sign_impact_parameter_xy_significance_flavour_N2"), mcdjet.pt(), vecSignImpXYSig[jetflavour][1], jetflavour, eventWeight);
if (fillIPz)
registry.fill(HIST("h3_jet_pt_sign_impact_parameter_z_significance_flavour_N2"), mcdjet.pt(), vecSignImpZSig[jetflavour][1], jetflavour, eventWeight);
if (fillIPxyz)
registry.fill(HIST("h3_jet_pt_sign_impact_parameter_xyz_significance_flavour_N2"), mcdjet.pt(), vecSignImpXYZSig[jetflavour][1], jetflavour, eventWeight);
}
if (vecImpXY[jetflavour].size() > 2) { // N3
if (vecImpXY[jetflavour].size() > thirdTaggerForTrackCounting) { // N3
if (fillIPxy)
registry.fill(HIST("h3_jet_pt_sign_impact_parameter_xy_significance_flavour_N3"), mcdjet.pt(), vecSignImpXYSig[jetflavour][2], jetflavour, eventWeight);
if (fillIPz)
Expand Down Expand Up @@ -1093,6 +1113,66 @@ struct JetTaggerHFQA {
}
PROCESS_SWITCH(JetTaggerHFQA, processTracksDca, "Fill inclusive tracks' imformation for data", false);

void processTracksInJetsData(soa::Filtered<aod::JetCollisions>::iterator const& collision, soa::Join<JetTableData, TagTableData> const& jets)
{
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
for (auto const& jet : jets) {
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
continue;
}
if (!isAcceptedJet<aod::JetTracks>(jet)) {
continue;
}
for (auto const& track : jet.template tracks_as<JetTagTracksMCD>()) {
float varImpXY = track.dcaXY() * jettaggingutilities::cmTomum;
registry.fill(HIST("h2_track_pt_impact_parameter_xy"), track.pt(), varImpXY);
}
}
}
PROCESS_SWITCH(JetTaggerHFQA, processTracksInJetsData, "Fill QA comtamination of secondary-track inside jets for data jets", false);

void processSecondaryContaminationMCD(soa::Filtered<soa::Join<aod::JetCollisions, aod::JCollisionPIs, aod::JMcCollisionLbs>>::iterator const& collision, soa::Join<JetTableMCD, TagTableMCD, weightMCD> const& mcdjets, JetTagTracksMCD const& /*tracks*/, aod::JetParticles const& /*particles*/)
{
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {
continue;
}
if (!isAcceptedJet<aod::JetTracks>(mcdjet)) {
continue;
}
float pTHat = 10. / (std::pow(mcdjet.eventWeight(), 1.0 / pTHatExponent));
if (mcdjet.pt() > pTHatMaxMCD * pTHat) {
continue;
}
int jetflavour = mcdjet.origin();
float secondaryPt = 0;
float totalJetPt = 0;
for (auto const& track : mcdjet.template tracks_as<JetTagTracksMCD>()) {
float varImpXY = track.dcaXY() * jettaggingutilities::cmTomum;
if (!track.has_mcParticle())
continue;
auto mcParticle = track.mcParticle();
totalJetPt += track.pt();
if (mcParticle.isPhysicalPrimary()) {
registry.fill(HIST("hn_jet_pt_track_pt_impact_parameter_xy_physical_primary_flavour"), mcdjet.pt(), track.pt(), varImpXY, jetflavour, mcdjet.eventWeight());
} else {
registry.fill(HIST("hn_jet_pt_track_pt_impact_parameter_xy_secondary_flavour"), mcdjet.pt(), track.pt(), varImpXY, jetflavour, mcdjet.eventWeight());
secondaryPt += track.pt();
}
}
if (totalJetPt > 0) {
float fracSecondary = secondaryPt / totalJetPt;
registry.fill(HIST("h3_jet_pt_frac_secondary_pt_per_jet_flavour"), mcdjet.pt(), fracSecondary, jetflavour, mcdjet.eventWeight());
}
}
}
PROCESS_SWITCH(JetTaggerHFQA, processSecondaryContaminationMCD, "Fill QA comtamination of secondary-track inside jets for mcd jets", false);

void processValFlavourDefMCD(soa::Filtered<soa::Join<aod::JCollisions, aod::JCollisionPIs, aod::JMcCollisionLbs>>::iterator const& collision, soa::Join<JetTableMCD, TagTableMCD, JetTableMCDMCP, weightMCD> const& mcdjets, soa::Join<JetTableMCP, JetTableMCPMCD> const& /*mcpjets*/, JetTagTracksMCD const& tracks, aod::JetParticles const& particles)
{
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
Expand Down Expand Up @@ -1558,10 +1638,10 @@ using JetTaggerQAChargedDataJets = soa::Join<aod::ChargedJets, aod::ChargedJetCo
using JetTaggerQAChargedMCDJets = soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents, aod::ChargedMCDetectorLevelJetFlavourDef>;
using JetTaggerQAChargedMCPJets = soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents, aod::ChargedMCParticleLevelJetFlavourDef>;

using JetTaggerhfQACharged = JetTaggerHFQA<JetTaggerQAChargedDataJets, aod::ChargedJetTags, JetTaggerQAChargedMCDJets, aod::ChargedMCDetectorLevelJetEventWeights, aod::ChargedMCDetectorLevelJetTags, JetTaggerQAChargedMCPJets, aod::ChargedMCParticleLevelJetEventWeights, aod::ChargedMCDetectorLevelJetsMatchedToChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetsMatchedToChargedMCDetectorLevelJets>;
using JetTaggerhfQaCharged = JetTaggerHFQA<JetTaggerQAChargedDataJets, aod::ChargedJetTags, JetTaggerQAChargedMCDJets, aod::ChargedMCDetectorLevelJetEventWeights, aod::ChargedMCDetectorLevelJetTags, JetTaggerQAChargedMCPJets, aod::ChargedMCParticleLevelJetEventWeights, aod::ChargedMCDetectorLevelJetsMatchedToChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetsMatchedToChargedMCDetectorLevelJets>;
Copy link
Collaborator

@vkucera vkucera Aug 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

It would be more readable to name the struct JetTaggerHfQaCharged so that it's hyphenated as jet-tagger-hf-qa-charged.
I see that JetTaggerHfQaCharged is actually an instance of a JetTaggerHFQA template which makes me suspect that the resulting device name would be jet-tagger-h-f-q-a by default. Can you please check it when you run the workflow?

Copy link
Contributor Author

@hanseopark hanseopark Aug 26, 2025

Choose a reason for hiding this comment

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

I've tried to modified to remove taskName but it doesn't work.
errors occur below

adaptAnalysisTask<JetTaggerhfQaCharged>(cfgc)};
[ERROR] invalid workflow in /Users/hanseopark/alice/sw/BUILD/c5d64f62ec99e24d89636f0e2145bbbcb900277d/O2Physics/stage/bin/o2-          analysis-je-jet-taggerhf-qa: Cannot use any of ,;:"'$ as DataProcessor name

Copy link
Collaborator

@vkucera vkucera Sep 1, 2025

Choose a reason for hiding this comment

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

I've tried to modified to remove taskName but it doesn't work. errors occur below

adaptAnalysisTask<JetTaggerhfQaCharged>(cfgc)};
[ERROR] invalid workflow in /Users/hanseopark/alice/sw/BUILD/c5d64f62ec99e24d89636f0e2145bbbcb900277d/O2Physics/stage/bin/o2-          analysis-je-jet-taggerhf-qa: Cannot use any of ,;:"'$ as DataProcessor name

That looks like invalid syntax. What was the exact line you tried to compile?

Copy link
Contributor Author

@hanseopark hanseopark Sep 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I've tried to modified to remove taskName but it doesn't work. errors occur below

adaptAnalysisTask<JetTaggerhfQaCharged>(cfgc)};
[ERROR] invalid workflow in /Users/hanseopark/alice/sw/BUILD/c5d64f62ec99e24d89636f0e2145bbbcb900277d/O2Physics/stage/bin/o2-          analysis-je-jet-taggerhf-qa: Cannot use any of ,;:"'$ as DataProcessor name

That looks like invalid syntax. What was the exact line you tried to compile?

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<JetTaggerhfQaCharged>(cfgc)};
 }

it happen the error [ERROR] invalid workflow in /Users/hanseopark/alice/sw/BUILD/c5d64f62ec99e24d89636f0e2145bbbcb900277d/O2Physics/stage/bin/o2-analysis-je-jet-taggerhf-qa: Cannot use any of ,;:"'$ as DataProcessor name

Copy link
Collaborator

@vkucera vkucera Sep 2, 2025

Choose a reason for hiding this comment

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

OK. Thanks for trying. Looks like TaskName is needed because of the template. Please use using JetTaggerHfQaCharged = ... and

adaptAnalysisTask<JetTaggerHfQaCharged>(cfgc, TaskName{"jet-tagger-hf-qa-charged"})}; // o2-linter: disable=name/o2-task (templated struct)

Copy link
Contributor Author

@hanseopark hanseopark Sep 3, 2025

Choose a reason for hiding this comment

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

I understand then I've changed them.
If I change "jet-tagger-hf-qa-charged" I should change "jet-taggerhf-data-charged" to "jet-tagger-hf-data-charged" and "jet-taggerhf-mcd-charged" to "jet-tagger-hf-mcd-charged" in TableProducer/jetTaggerHF.cxx for uniformity. Do you think changing everything is for unity?
And what do you think about the suggestion for the “no matching function” error that occurs when there are more than 100 configurations?

Copy link
Collaborator

@vkucera vkucera Sep 4, 2025

Choose a reason for hiding this comment

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

Ideally, it should be fixed everywhere, but let's keep the PR focused on this file only.
Concerning the number of struct members, that is a limitation in the O2 framework which you should not touch. You have to reduce the number of members or group them.

Copy link
Contributor Author

@hanseopark hanseopark Sep 4, 2025

Choose a reason for hiding this comment

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

I understood.
I am keeping "jet-taggerhf-data-charged" for now. I will change to "tagger-hf" as soon as possible.


WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
adaptAnalysisTask<JetTaggerhfQACharged>(cfgc, TaskName{"jet-taggerhf-qa-charged"})}; // o2-linter: disable=name/o2-task
adaptAnalysisTask<JetTaggerhfQaCharged>(cfgc, TaskName{"jet-taggerhf-qa-charged"})}; // o2-linter: disable=name/o2-task (templated struct)
}
Loading