From 59c6d011ad107aad396d757c782f5c335727251d Mon Sep 17 00:00:00 2001 From: Aimeric Landou Date: Wed, 20 May 2026 16:24:57 +0100 Subject: [PATCH 1/4] [PWGJE] jetSpectraCharged: FT0CVariant1 and mcdmcpetaconstraint histograms --- PWGJE/Tasks/jetSpectraCharged.cxx | 41 ++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/PWGJE/Tasks/jetSpectraCharged.cxx b/PWGJE/Tasks/jetSpectraCharged.cxx index adc4fde7839..cf630bfc2c3 100644 --- a/PWGJE/Tasks/jetSpectraCharged.cxx +++ b/PWGJE/Tasks/jetSpectraCharged.cxx @@ -84,6 +84,7 @@ struct JetSpectraCharged { Configurable isMCGenOnly{"isMCGenOnly", false, "analysis is run over mcGen only"}; Configurable kappa{"kappa", 1.0, "angularity kappa"}; Configurable alpha{"alpha", 1.0, "angularity alpha"}; + Configurable useFT0Cvariant{"useFT0CVariant", false, "IF checkCentFT0M is false: false -> use standard FT0C centrality selection; true -> use FT0CVariant1"}; std::vector eventSelectionBits; int trackSelection = -1; @@ -233,6 +234,7 @@ struct JetSpectraCharged { if (checkGeoMatched) { registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_mcdetaconstraint", "pT mcd vs. pT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}}, doSumw2); registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_mcpetaconstraint", "pT mcd vs. pT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}}, doSumw2); + registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_mcpmcdetaconstraint", "pT mcd vs. pT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}}, doSumw2); registry.add("h2_jet_eta_mcd_jet_eta_mcp_matchedgeo", "Eta mcd vs. Eta mcp;#eta_{jet}^{mcd};#eta_{jet}^{mcp}", {HistType::kTH2F, {jetEtaAxis, jetEtaAxis}}, doSumw2); registry.add("h2_jet_phi_mcd_jet_phi_mcp_matchedgeo_mcdetaconstraint", "Phi mcd vs. Phi mcp;#varphi_{jet}^{mcd};#varphi_{jet}^{mcp}", {HistType::kTH2F, {phiAxis, phiAxis}}, doSumw2); registry.add("h2_jet_phi_mcd_jet_phi_mcp_matchedgeo_mcpetaconstraint", "Phi mcd vs. Phi mcp;#varphi_{jet}^{mcd};#varphi_{jet}^{mcp}", {HistType::kTH2F, {phiAxis, phiAxis}}, doSumw2); @@ -246,6 +248,7 @@ struct JetSpectraCharged { if (checkPtMatched) { registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedpt_mcdetaconstraint", "pT mcd vs. pT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}}, doSumw2); registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedpt_mcpetaconstraint", "pT mcd vs. pT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}}, doSumw2); + registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedpt_mcpmcdetaconstraint", "pT mcd vs. pT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}}, doSumw2); registry.add("h2_jet_eta_mcd_jet_eta_mcp_matchedpt", "Eta mcd vs. Eta mcp;#eta_{jet}^{mcd};#eta_{jet}^{mcp}", {HistType::kTH2F, {jetEtaAxis, jetEtaAxis}}, doSumw2); registry.add("h2_jet_phi_mcd_jet_phi_mcp_matchedgpt_mcdetaconstraint", "Phi mcd vs. Phi mcp;#varphi_{jet}^{mcd};#varphi_{jet}^{mcp}", {HistType::kTH2F, {phiAxis, phiAxis}}, doSumw2); registry.add("h2_jet_phi_mcd_jet_phi_mcp_matchedgpt_mcpetaconstraint", "Phi mcd vs. Phi mcp;#varphi_{jet}^{mcd};#varphi_{jet}^{mcp}", {HistType::kTH2F, {phiAxis, phiAxis}}, doSumw2); @@ -259,6 +262,7 @@ struct JetSpectraCharged { if (checkGeoPtMatched) { registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedgeopt_mcdetaconstraint", "pT mcd vs. pT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}}, doSumw2); registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedgeopt_mcpetaconstraint", "pT mcd vs. pT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}}, doSumw2); + registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedgeopt_mcpmcdetaconstraint", "pT mcd vs. pT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxis, jetPtAxis}}, doSumw2); registry.add("h2_jet_eta_mcd_jet_eta_mcp_matchedgeopt", "Eta mcd vs. Eta mcp;#eta_{jet}^{mcd};#eta_{jet}^{mcp}", {HistType::kTH2F, {jetEtaAxis, jetEtaAxis}}, doSumw2); registry.add("h2_jet_phi_mcd_jet_phi_mcp_matchedgeopt_mcdetaconstraint", "Phi mcd vs. Phi mcp;#varphi_{jet}^{mcd};#varphi_{jet}^{mcp}", {HistType::kTH2F, {phiAxis, phiAxis}}, doSumw2); registry.add("h2_jet_phi_mcd_jet_phi_mcp_matchedgeopt_mcpetaconstraint", "Phi mcd vs. Phi mcp;#varphi_{jet}^{mcd};#varphi_{jet}^{mcp}", {HistType::kTH2F, {phiAxis, phiAxis}}, doSumw2); @@ -274,6 +278,7 @@ struct JetSpectraCharged { if (doprocessJetsMatchedAreaSub || doprocessJetsMatchedAreaSubWeighted) { registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_rhoareasubtracted_mcdetaconstraint", "corr pT mcd vs. corr cpT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxisRhoAreaSub, jetPtAxisRhoAreaSub}}, doSumw2); registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_rhoareasubtracted_mcpetaconstraint", "corr pT mcd vs. corr cpT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxisRhoAreaSub, jetPtAxisRhoAreaSub}}, doSumw2); + registry.add("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_rhoareasubtracted_mcpmcdetaconstraint", "corr pT mcd vs. corr cpT mcp;#it{p}_{T,jet}^{mcd} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxisRhoAreaSub, jetPtAxisRhoAreaSub}}, doSumw2); registry.add("h2_jet_pt_mcd_rhoareasubtracted_jet_pt_mcp_matchedgeo_mcdetaconstraint", "UEsub pT mcd vs. raw pT mcp;#it{p}_{T,jet}^{mcd} - #rho#it{A} (GeV/#it{c});#it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxisRhoAreaSub, jetPtAxis}}, doSumw2); registry.add("h2_jet_pt_mcp_jet_pt_diff_matchedgeo_rhoareasubtracted", "jet mcp corr pT vs. corr delta pT / jet mcp corr pt;#it{p}_{T,jet}^{mcp} (GeV/#it{c}); (#it{p}_{T,jet}^{mcp} (GeV/#it{c}) - #it{p}_{T,jet}^{mcd} (GeV/#it{c})) / #it{p}_{T,jet}^{mcp} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxisRhoAreaSub, {1000, -5.0, 5.0}}}, doSumw2); registry.add("h2_jet_pt_mcd_jet_pt_diff_matchedgeo_rhoareasubtracted", "jet mcd corr pT vs. corr delta pT / jet mcd corr pt;#it{p}_{T,jet}^{mcd} (GeV/#it{c}); (#it{p}_{T,jet}^{mcd} (GeV/#it{c}) - #it{p}_{T,jet}^{mcp} (GeV/#it{c})) / #it{p}_{T,jet}^{mcd} (GeV/#it{c})", {HistType::kTH2F, {jetPtAxisRhoAreaSub, {1000, -5.0, 5.0}}}, doSumw2); @@ -393,7 +398,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C()); if ((centralityMin < centrality) && (centrality < centralityMax)) { centralityIsGood = true; } @@ -437,7 +442,7 @@ struct JetSpectraCharged { bool applyCollisionCuts(TColl const& collision, bool fillHistograms = false, bool isWeighted = false, float eventWeight = 1.0) { float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); if (fillHistograms) { registry.fill(HIST("h_collisions"), 0.5); @@ -616,6 +621,9 @@ struct JetSpectraCharged { angularityMcd /= (jetMCD.pt() * (jetMCD.r() / 100.f)); if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_mcdetaconstraint"), jetMCD.pt(), jetMCP.pt(), weight); + if (jetfindingutilities::isInEtaAcceptance(jetMCP, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { + registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_mcpmcdetaconstraint"), jetMCD.pt(), jetMCP.pt(), weight); + } registry.fill(HIST("h2_jet_phi_mcd_jet_phi_mcp_matchedgeo_mcdetaconstraint"), jetMCD.phi(), jetMCP.phi(), weight); registry.fill(HIST("h2_jet_pt_mcd_jet_pt_diff_matchedgeo"), jetMCD.pt(), dpt / jetMCD.pt(), weight); registry.fill(HIST("h2_jet_ntracks_mcd_jet_ntracks_mcp_matchedgeo"), jetMCD.tracksIds().size(), jetMCP.tracksIds().size(), weight); @@ -652,6 +660,9 @@ struct JetSpectraCharged { angularityMcd /= (jetMCD.pt() * (jetMCD.r() / 100.f)); if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedpt_mcdetaconstraint"), jetMCD.pt(), jetMCP.pt(), weight); + if (jetfindingutilities::isInEtaAcceptance(jetMCP, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { + registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedpt_mcpmcdetaconstraint"), jetMCD.pt(), jetMCP.pt(), weight); + } registry.fill(HIST("h2_jet_phi_mcd_jet_phi_mcp_matchedpt_mcdetaconstraint"), jetMCD.phi(), jetMCP.phi(), weight); registry.fill(HIST("h2_jet_pt_mcd_jet_pt_diff_matchedpt"), jetMCD.pt(), dpt / jetMCD.pt(), weight); registry.fill(HIST("h2_jet_ntracks_mcd_jet_ntracks_mcp_matchedpt"), jetMCD.tracksIds().size(), jetMCP.tracksIds().size(), weight); @@ -688,6 +699,9 @@ struct JetSpectraCharged { angularityMcd /= (jetMCD.pt() * (jetMCD.r() / 100.f)); if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeopt_mcdetaconstraint"), jetMCD.pt(), jetMCP.pt(), weight); + if (jetfindingutilities::isInEtaAcceptance(jetMCP, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { + registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeopt_mcpmcdetaconstraint"), jetMCD.pt(), jetMCP.pt(), weight); + } registry.fill(HIST("h2_jet_phi_mcd_jet_phi_mcp_matchedgeopt_mcdetaconstraint"), jetMCD.phi(), jetMCP.phi(), weight); registry.fill(HIST("h2_jet_pt_mcd_jet_pt_diff_matchedgeopt"), jetMCD.pt(), dpt / jetMCD.pt(), weight); registry.fill(HIST("h2_jet_ntracks_mcd_jet_ntracks_mcp_matchedgeopt"), jetMCD.tracksIds().size(), jetMCP.tracksIds().size(), weight); @@ -729,6 +743,9 @@ struct JetSpectraCharged { angularityMcd /= (corrBasejetpt * (jetMCD.r() / 100.f)); if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_rhoareasubtracted_mcdetaconstraint"), corrBasejetpt, corrTagjetpt, weight); + if (jetfindingutilities::isInEtaAcceptance(jetMCP, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { + registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_rhoareasubtracted_mcpmcdetaconstraint"), corrBasejetpt, corrTagjetpt, weight); + } registry.fill(HIST("h2_jet_pt_mcd_rhoareasubtracted_jet_pt_mcp_matchedgeo_mcdetaconstraint"), corrBasejetpt, jetMCP.pt(), weight); registry.fill(HIST("h2_jet_pt_mcd_jet_pt_diff_matchedgeo_rhoareasubtracted"), corrBasejetpt, dcorrpt / corrBasejetpt, weight); registry.fill(HIST("h3_jet_pt_mcd_jet_pt_mcp_jet_mcd_angularity_matchedgeo_rhoareasubtracted_mcdetaconstraint"), corrBasejetpt, corrTagjetpt, angularityMcd, weight); @@ -815,7 +832,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -838,7 +855,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -861,7 +878,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -884,7 +901,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -911,7 +928,7 @@ struct JetSpectraCharged { } float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < 999.0f ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -938,7 +955,7 @@ struct JetSpectraCharged { } float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < 999.0f ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -1009,7 +1026,7 @@ struct JetSpectraCharged { occupancyIsGood = true; } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); if ((centralityMin < centrality) && (centrality < centralityMax)) { centralityIsGood = true; } @@ -1092,7 +1109,7 @@ struct JetSpectraCharged { occupancyIsGood = true; } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); if ((centralityMin < centrality) && (centrality < centralityMax)) { centralityIsGood = true; } @@ -1235,7 +1252,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -1258,7 +1275,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = collision.centFT0C(); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { From ae7275ae74634faffe8637ed77bdbc1b470f70c5 Mon Sep 17 00:00:00 2001 From: Aimeric Landou Date: Thu, 21 May 2026 01:30:08 +0100 Subject: [PATCH 2/4] clang fixes --- PWGJE/Tasks/jetSpectraCharged.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGJE/Tasks/jetSpectraCharged.cxx b/PWGJE/Tasks/jetSpectraCharged.cxx index cf630bfc2c3..8eddf346d78 100644 --- a/PWGJE/Tasks/jetSpectraCharged.cxx +++ b/PWGJE/Tasks/jetSpectraCharged.cxx @@ -743,9 +743,9 @@ struct JetSpectraCharged { angularityMcd /= (corrBasejetpt * (jetMCD.r() / 100.f)); if (jetfindingutilities::isInEtaAcceptance(jetMCD, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_rhoareasubtracted_mcdetaconstraint"), corrBasejetpt, corrTagjetpt, weight); - if (jetfindingutilities::isInEtaAcceptance(jetMCP, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { - registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_rhoareasubtracted_mcpmcdetaconstraint"), corrBasejetpt, corrTagjetpt, weight); - } + if (jetfindingutilities::isInEtaAcceptance(jetMCP, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { + registry.fill(HIST("h2_jet_pt_mcd_jet_pt_mcp_matchedgeo_rhoareasubtracted_mcpmcdetaconstraint"), corrBasejetpt, corrTagjetpt, weight); + } registry.fill(HIST("h2_jet_pt_mcd_rhoareasubtracted_jet_pt_mcp_matchedgeo_mcdetaconstraint"), corrBasejetpt, jetMCP.pt(), weight); registry.fill(HIST("h2_jet_pt_mcd_jet_pt_diff_matchedgeo_rhoareasubtracted"), corrBasejetpt, dcorrpt / corrBasejetpt, weight); registry.fill(HIST("h3_jet_pt_mcd_jet_pt_mcp_jet_mcd_angularity_matchedgeo_rhoareasubtracted_mcdetaconstraint"), corrBasejetpt, corrTagjetpt, angularityMcd, weight); From 0078dcde37d9d774328f004bc78d7eaf36e87a37 Mon Sep 17 00:00:00 2001 From: Aimeric Landou Date: Thu, 21 May 2026 09:43:29 +0100 Subject: [PATCH 3/4] O2Linter fixes --- PWGJE/Tasks/jetSpectraCharged.cxx | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/PWGJE/Tasks/jetSpectraCharged.cxx b/PWGJE/Tasks/jetSpectraCharged.cxx index 8eddf346d78..1fc5372ab8a 100644 --- a/PWGJE/Tasks/jetSpectraCharged.cxx +++ b/PWGJE/Tasks/jetSpectraCharged.cxx @@ -93,6 +93,9 @@ struct JetSpectraCharged { float configSwitchLow = -98.0; float configSwitchHigh = 9998.0; + + float ptHardCalcMethodSwitch = 999.0; + enum AcceptSplitCollisionsOptions { NonSplitOnly = 0, SplitOkCheckAnyAssocColl, // 1 @@ -615,7 +618,7 @@ struct JetSpectraCharged { if (jetMCD.r() == round(selectedJetsRadius * 100.0f)) { double dpt = jetMCD.pt() - jetMCP.pt(); float angularityMcd = 0.; - for (auto& constituent : jetMCD.template tracks_as()) { + for (const auto& constituent : jetMCD.template tracks_as()) { angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent), alpha); } angularityMcd /= (jetMCD.pt() * (jetMCD.r() / 100.f)); @@ -654,7 +657,7 @@ struct JetSpectraCharged { if (jetMCD.r() == round(selectedJetsRadius * 100.0f)) { double dpt = jetMCD.pt() - jetMCP.pt(); float angularityMcd = 0.; - for (auto& constituent : jetMCD.template tracks_as()) { + for (const auto& constituent : jetMCD.template tracks_as()) { angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent), alpha); } angularityMcd /= (jetMCD.pt() * (jetMCD.r() / 100.f)); @@ -693,7 +696,7 @@ struct JetSpectraCharged { if (jetMCD.template matchedJetGeo_first_as>().globalIndex() == jetMCD.template matchedJetPt_first_as>().globalIndex()) { // not a good way to do this double dpt = jetMCD.pt() - jetMCP.pt(); float angularityMcd = 0.; - for (auto& constituent : jetMCD.template tracks_as()) { + for (const auto& constituent : jetMCD.template tracks_as()) { angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent), alpha); } angularityMcd /= (jetMCD.pt() * (jetMCD.r() / 100.f)); @@ -737,7 +740,7 @@ struct JetSpectraCharged { double corrBasejetpt = jetMCD.pt() - (rho * jetMCD.area()); double dcorrpt = corrBasejetpt - corrTagjetpt; float angularityMcd = 0.; - for (auto& constituent : jetMCD.template tracks_as()) { + for (const auto& constituent : jetMCD.template tracks_as()) { angularityMcd += std::pow(constituent.pt(), kappa) * std::pow(jetutilities::deltaR(jetMCD, constituent), alpha); } angularityMcd /= (corrBasejetpt * (jetMCD.r() / 100.f)); @@ -926,7 +929,7 @@ struct JetSpectraCharged { if (!applyCollisionCuts(collision, fillHistograms, isWeighted, eventWeight)) { return; } - float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < 999.0f ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); + float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < ptHardCalcMethodSwitch ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); float centrality = -1.0; checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); @@ -953,7 +956,7 @@ struct JetSpectraCharged { if (!applyCollisionCuts(collision, fillHistograms, isWeighted, eventWeight)) { return; } - float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < 999.0f ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); + float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < ptHardCalcMethodSwitch ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); float centrality = -1.0; checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); @@ -1196,7 +1199,7 @@ struct JetSpectraCharged { if (!applyMCCollisionCuts(mccollision, collisions, fillHistograms, isWeighted, eventWeight)) { return; } - float pTHat = mccollision.ptHard() < 999.0f ? mccollision.ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); + float pTHat = mccollision.ptHard() < ptHardCalcMethodSwitch ? mccollision.ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { continue; @@ -1228,7 +1231,7 @@ struct JetSpectraCharged { if (!applyMCCollisionCuts(mccollision, collisions, fillHistograms, isWeighted, eventWeight)) { return; } - float pTHat = mccollision.ptHard() < 999.0f ? mccollision.ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); + float pTHat = mccollision.ptHard() < ptHardCalcMethodSwitch ? mccollision.ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); registry.fill(HIST("h_mccollisions_rho"), mccollision.rho(), eventWeight); for (auto const& jet : jets) { @@ -1319,7 +1322,7 @@ struct JetSpectraCharged { if (!applyCollisionCuts(collision, fillHistograms, isWeighted, eventWeight)) { return; } - float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < 999.0f ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); + float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < ptHardCalcMethodSwitch ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); for (const auto& mcdjet : mcdjets) { if (!isAcceptedJet(mcdjet)) { continue; @@ -1362,7 +1365,7 @@ struct JetSpectraCharged { if (!applyCollisionCuts(collision, fillHistograms, isWeighted, eventWeight)) { return; } - float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < 999.0f ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); + float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < ptHardCalcMethodSwitch ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); double mcrho = collision.has_mcCollision() ? collision.mcCollision_as().rho() : -1; From c3c7fae5e0825f0346f413af12e5cf45b56f056d Mon Sep 17 00:00:00 2001 From: Aimeric Landou Date: Thu, 21 May 2026 09:46:59 +0100 Subject: [PATCH 4/4] O2Linter fixes 2 --- PWGJE/Tasks/jetSpectraCharged.cxx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/PWGJE/Tasks/jetSpectraCharged.cxx b/PWGJE/Tasks/jetSpectraCharged.cxx index 1fc5372ab8a..6e19be7a128 100644 --- a/PWGJE/Tasks/jetSpectraCharged.cxx +++ b/PWGJE/Tasks/jetSpectraCharged.cxx @@ -84,7 +84,7 @@ struct JetSpectraCharged { Configurable isMCGenOnly{"isMCGenOnly", false, "analysis is run over mcGen only"}; Configurable kappa{"kappa", 1.0, "angularity kappa"}; Configurable alpha{"alpha", 1.0, "angularity alpha"}; - Configurable useFT0Cvariant{"useFT0CVariant", false, "IF checkCentFT0M is false: false -> use standard FT0C centrality selection; true -> use FT0CVariant1"}; + Configurable useFT0CVariant{"useFT0CVariant", false, "IF checkCentFT0M is false: false -> use standard FT0C centrality selection; true -> use FT0CVariant1"}; std::vector eventSelectionBits; int trackSelection = -1; @@ -401,7 +401,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C()); + checkCentFT0M ? centrality = collision.centFT0M() : centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C()); if ((centralityMin < centrality) && (centrality < centralityMax)) { centralityIsGood = true; } @@ -445,7 +445,7 @@ struct JetSpectraCharged { bool applyCollisionCuts(TColl const& collision, bool fillHistograms = false, bool isWeighted = false, float eventWeight = 1.0) { float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); if (fillHistograms) { registry.fill(HIST("h_collisions"), 0.5); @@ -835,7 +835,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -858,7 +858,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -881,7 +881,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -904,7 +904,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -931,7 +931,7 @@ struct JetSpectraCharged { } float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < ptHardCalcMethodSwitch ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -958,7 +958,7 @@ struct JetSpectraCharged { } float pTHat = collision.has_mcCollision() && collision.mcCollision().ptHard() < ptHardCalcMethodSwitch ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -1029,7 +1029,7 @@ struct JetSpectraCharged { occupancyIsGood = true; } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); if ((centralityMin < centrality) && (centrality < centralityMax)) { centralityIsGood = true; } @@ -1112,7 +1112,7 @@ struct JetSpectraCharged { occupancyIsGood = true; } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); if ((centralityMin < centrality) && (centrality < centralityMax)) { centralityIsGood = true; } @@ -1255,7 +1255,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) { @@ -1278,7 +1278,7 @@ struct JetSpectraCharged { } float centrality = -1.0; - checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0Cvariant ? collision.centFT0CVariant1() : collision.centFT0C())); + checkCentFT0M ? centrality = collision.centFT0M() : (centrality = (useFT0CVariant ? collision.centFT0CVariant1() : collision.centFT0C())); for (auto const& jet : jets) { if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {