diff --git a/PWGJE/Tasks/CMakeLists.txt b/PWGJE/Tasks/CMakeLists.txt index 0275a7a66ed..a1b103a528c 100644 --- a/PWGJE/Tasks/CMakeLists.txt +++ b/PWGJE/Tasks/CMakeLists.txt @@ -395,8 +395,8 @@ if(FastJet_FOUND) SOURCES substructureDebug.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore COMPONENT_NAME Analysis) - o2physics_add_dpl_workflow(jet-ds-spectrum-subs - SOURCES jetDsSpectrumAndSubstructure.cxx + o2physics_add_dpl_workflow(jet-ds-spec-subs + SOURCES jetDsSpecSubs.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(jet-d0-ang-substructure diff --git a/PWGJE/Tasks/jetDsSpectrumAndSubstructure.cxx b/PWGJE/Tasks/jetDsSpecSubs.cxx similarity index 67% rename from PWGJE/Tasks/jetDsSpectrumAndSubstructure.cxx rename to PWGJE/Tasks/jetDsSpecSubs.cxx index 629ba2f75f3..a08c8220a64 100644 --- a/PWGJE/Tasks/jetDsSpectrumAndSubstructure.cxx +++ b/PWGJE/Tasks/jetDsSpecSubs.cxx @@ -8,32 +8,36 @@ // In applying this license CERN does not waive the privileges and immunities // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. - -// Jet substructure and spectrum task for D_s mesons -// -// This task is used to reconstruct and analyse jets containing charged D_s -// mesons -// -/// \author Monalisa Melo // - +/// \file jetDsSpecSubs.cxx +/// \brief Ds-tagged jet analysis with substructure histogram outputs +/// +/// This task reconstructs and analyses jets containing charged D_s mesons. +/// +/// \author Monalisa Melo , Universidade de São Paulo + +#include "PWGHF/Core/DecayChannels.h" #include "PWGJE/Core/JetDerivedDataUtilities.h" #include "PWGJE/Core/JetUtilities.h" #include "PWGJE/DataModel/Jet.h" #include "PWGJE/DataModel/JetReducedData.h" +#include "PWGJE/DataModel/JetSubtraction.h" + +#include "Common/Core/RecoDecay.h" +#include "Common/DataModel/TrackSelectionTables.h" -#include -#include -#include +#include "Framework/ASoA.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/HistogramRegistry.h" #include #include #include -#include +#include #include #include #include -#include +#include "TVector3.h" #include #include @@ -43,51 +47,6 @@ using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; -namespace o2::aod -{ -namespace jet_distance -{ -DECLARE_SOA_COLUMN(JetHfDist, jetHfDist, float); -DECLARE_SOA_COLUMN(JetPt, jetPt, float); -DECLARE_SOA_COLUMN(JetEta, jetEta, float); -DECLARE_SOA_COLUMN(JetPhi, jetPhi, float); -DECLARE_SOA_COLUMN(JetNConst, jetNConst, int); -DECLARE_SOA_COLUMN(HfPt, hfPt, float); -DECLARE_SOA_COLUMN(HfEta, hfEta, float); -DECLARE_SOA_COLUMN(HfPhi, hfPhi, float); -DECLARE_SOA_COLUMN(HfMass, hfMass, float); -DECLARE_SOA_COLUMN(HfY, hfY, float); -DECLARE_SOA_COLUMN(HfMlScore0, hfMlScore0, float); -DECLARE_SOA_COLUMN(HfMlScore1, hfMlScore1, float); -DECLARE_SOA_COLUMN(HfMlScore2, hfMlScore2, float); - -// extra -DECLARE_SOA_COLUMN(JetMass, jetMass, float); -DECLARE_SOA_COLUMN(JetGirth, jetGirth, float); -DECLARE_SOA_COLUMN(JetThrust, jetThrust, float); // lambda_2^1 -DECLARE_SOA_COLUMN(JetLambda11, jetLambda11, float); // lambda_1^1 -} // namespace jet_distance - -DECLARE_SOA_TABLE(JetDistanceTable, "AOD", "JETDISTTABLE", - jet_distance::JetHfDist, - jet_distance::JetPt, - jet_distance::JetEta, - jet_distance::JetPhi, - jet_distance::JetNConst, - jet_distance::HfPt, - jet_distance::HfEta, - jet_distance::HfPhi, - jet_distance::HfMass, - jet_distance::HfY, - jet_distance::HfMlScore0, - jet_distance::HfMlScore1, - jet_distance::HfMlScore2, - jet_distance::JetMass, - jet_distance::JetGirth, - jet_distance::JetThrust, - jet_distance::JetLambda11); -} // namespace o2::aod - struct JetDsSpecSubs { HistogramRegistry registry{ "registry", @@ -100,13 +59,14 @@ struct JetDsSpecSubs { {"h_jet_eta", "jet #eta;#eta_{jet};entries", {HistType::kTH1F, {{100, -1.0, 1.0}}}}, {"h_jet_phi", "jet #phi;#phi_{jet};entries", {HistType::kTH1F, {{80, -1.0, 7.}}}}, {"h_collision_counter", "# of collisions;", {HistType::kTH1F, {{200, 0., 200.}}}}, - {"h_jet_counter", ";# of D_{S} jets;", {HistType::kTH1F, {{6, 0., 3.0}}}}, + {"h_jet_counter", ";type;counts", {HistType::kTH1F, {{2, 0., 2.}}}}, {"h_ds_jet_projection", ";z^{D_{S},jet}_{||};dN/dz^{D_{S},jet}_{||}", {HistType::kTH1F, {{1000, 0., 2.}}}}, {"h_ds_jet_distance_vs_projection", ";#DeltaR_{D_{S},jet};z^{D_{S},jet}_{||}", {HistType::kTH2F, {{1000, 0., 1.}, {1000, 0., 2.}}}}, {"h_ds_jet_distance", ";#DeltaR_{D_{S},jet};dN/d(#DeltaR)", {HistType::kTH1F, {{1000, 0., 1.}}}}, {"h_ds_jet_pt", ";p_{T,D_{S} jet};dN/dp_{T,D_{S} jet}", {HistType::kTH1F, {{1000, 0., 100.}}}}, {"h_ds_jet_eta", ";#eta_{D_{S} jet};entries", {HistType::kTH1F, {{250, -1., 1.}}}}, {"h_ds_jet_phi", ";#phi_{D_{S} jet};entries", {HistType::kTH1F, {{250, -1., 7.}}}}, + {"hSparse_ds", ";m_{D_{S}};p_{T,D_{S}};z^{D_{S},jet}_{||};#DeltaR_{D_{S},jet}", {HistType::kTHnSparseF, {{60, 1.7, 2.1}, {60, 0., 100.}, {60, 0., 2.}, {60, 0., 1.0}}}}, {"h_ds_mass", ";m_{D_{S}} (GeV/c^{2});entries", {HistType::kTH1F, {{1000, 0., 6.}}}}, {"h_ds_eta", ";#eta_{D_{S}};entries", {HistType::kTH1F, {{250, -1., 1.}}}}, {"h_ds_phi", ";#phi_{D_{S}};entries", {HistType::kTH1F, {{250, -1., 7.}}}}, @@ -118,8 +78,6 @@ struct JetDsSpecSubs { {"h2_dsjet_pt_lambda12", ";#it{p}_{T,jet} (GeV/#it{c});#lambda_{2}^{1}", {HistType::kTH2F, {{100, 0., 100.}, {200, 0., 1.0}}}}, {"h2_dsjet_pt_mass", ";#it{p}_{T,jet} (GeV/#it{c});m_{jet}^{ch} (GeV/#it{c}^{2})", {HistType::kTH2F, {{100, 0., 100.}, {200, 0., 50.0}}}}, {"h2_dsjet_pt_girth", ";#it{p}_{T,jet} (GeV/#it{c});g", {HistType::kTH2F, {{100, 0., 100.}, {200, 0., 0.5}}}}, - {"h_ds_jet_lambda_extra", ";#lambda_{#alpha}^{#kappa};entries", {HistType::kTH1F, {{200, 0., 1.0}}}}, - {"h2_dsjet_pt_lambda_extra", ";#it{p}_{T,jet} (GeV/#it{c});#lambda_{#alpha}^{#kappa}", {HistType::kTH2F, {{100, 0., 100.}, {200, 0., 1.0}}}}, }}; Configurable vertexZCut{"vertexZCut", 10.0f, "Accepted z-vertex range"}; @@ -129,17 +87,9 @@ struct JetDsSpecSubs { Configurable eventSelections{"eventSelections", "sel8", "choose event selection"}; Configurable trackSelections{"trackSelections", "globalTracks", "set track selections"}; - // extra angularity knob - Configurable kappa{"kappa", 1.0f, "angularity kappa"}; - Configurable alpha{"alpha", 1.0f, "angularity alpha"}; - - bool doExtraAngularity = false; - std::vector eventSelectionBits; int trackSelection = -1; - Produces distJetTable; - template float computeLambda(JET const& jet, TRACKS const& tracks, float a, float k) { @@ -189,9 +139,9 @@ struct JetDsSpecSubs { eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast(eventSelections)); trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast(trackSelections)); - const bool is11 = (std::abs(kappa.value - 1.f) < 1e-6f) && (std::abs(alpha.value - 1.f) < 1e-6f); - const bool is12 = (std::abs(kappa.value - 1.f) < 1e-6f) && (std::abs(alpha.value - 2.f) < 1e-6f); - doExtraAngularity = !(is11 || is12); + auto h = registry.get(HIST("h_jet_counter")); + h->GetXaxis()->SetBinLabel(1, "All jets"); + h->GetXaxis()->SetBinLabel(2, "Ds-tagged jets"); } Filter jetCuts = aod::jet::pt > jetPtMin&& aod::jet::r == nround(jetR.node() * 100.0f); @@ -203,6 +153,7 @@ struct JetDsSpecSubs { if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) { return; } + registry.fill(HIST("h_collisions"), 1.5); for (auto const& track : tracks) { @@ -222,7 +173,7 @@ struct JetDsSpecSubs { if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) { return; } - for (auto& jet : jets) { + for (const auto& jet : jets) { registry.fill(HIST("h_jet_pt"), jet.pt()); registry.fill(HIST("h_jet_eta"), jet.eta()); registry.fill(HIST("h_jet_phi"), jet.phi()); @@ -243,43 +194,72 @@ struct JetDsSpecSubs { registry.fill(HIST("h_collision_counter"), 3.0); for (const auto& jet : jets) { + registry.fill(HIST("h_jet_counter"), 0.5); + bool hasDsCandidate = false; + TVector3 jetVector(jet.px(), jet.py(), jet.pz()); + // Compute jet-level quantities once (independent of Ds candidates) + auto jetTracks = jet.tracks_as(); + + const float lambda11 = computeLambda(jet, jetTracks, 1.f, 1.f); + const float lambda12 = computeLambda(jet, jetTracks, 2.f, 1.f); + const float mjet = computeJetMassFromTracksMass(jetTracks); + + const float R = jet.r() / 100.f; + const float girth = (lambda11 >= 0.f) ? (lambda11 * R) : -1.f; + + // Loop over Ds candidates (particle level) for (const auto& dsCandidate : jet.candidates_as()) { + + hasDsCandidate = true; + TVector3 dsVector(dsCandidate.px(), dsCandidate.py(), dsCandidate.pz()); + // zParallel defined as longitudinal momentum fraction along the jet axis const double zParallel = (jetVector * dsVector) / (jetVector * jetVector); - const double axisDistance = jetutilities::deltaR(jet, dsCandidate); + const float axisDistance = jetutilities::deltaR(jet, dsCandidate); + // --- Ds-level observables --- registry.fill(HIST("h_ds_jet_projection"), zParallel); registry.fill(HIST("h_ds_jet_distance_vs_projection"), axisDistance, zParallel); registry.fill(HIST("h_ds_jet_distance"), axisDistance); - registry.fill(HIST("h_ds_jet_pt"), jet.pt()); - registry.fill(HIST("h_ds_jet_eta"), jet.eta()); - registry.fill(HIST("h_ds_jet_phi"), jet.phi()); + registry.fill(HIST("h_ds_mass"), dsCandidate.m()); registry.fill(HIST("h_ds_eta"), dsCandidate.eta()); registry.fill(HIST("h_ds_phi"), dsCandidate.phi()); - auto jetTracks = jet.tracks_as(); + // Main THnSparse: invariant mass, pT, z, and DeltaR + registry.fill(HIST("hSparse_ds"), + dsCandidate.m(), + dsCandidate.pt(), + zParallel, + axisDistance); + } + + // Jet-level quantities (filled once per jet containing at least one Ds) + if (hasDsCandidate) { - const float lambda11 = computeLambda(jet, jetTracks, 1.f, 1.f); - const float lambda12 = computeLambda(jet, jetTracks, 2.f, 1.f); // thrust = λ_2^1 - const float mjet = computeJetMassFromTracksMass(jetTracks); + registry.fill(HIST("h_jet_counter"), 1.5); - const float R = jet.r() / 100.f; - const float girth = (lambda11 >= 0.f) ? (lambda11 * R) : -1.f; + // Jet properties + registry.fill(HIST("h_ds_jet_pt"), jet.pt()); + registry.fill(HIST("h_ds_jet_eta"), jet.eta()); + registry.fill(HIST("h_ds_jet_phi"), jet.phi()); + // Jet substructure observables if (lambda11 >= 0.f) { registry.fill(HIST("h_ds_jet_lambda11"), lambda11); registry.fill(HIST("h2_dsjet_pt_lambda11"), jet.pt(), lambda11); } + if (lambda12 >= 0.f) { registry.fill(HIST("h_ds_jet_lambda12"), lambda12); registry.fill(HIST("h2_dsjet_pt_lambda12"), jet.pt(), lambda12); } + registry.fill(HIST("h_ds_jet_mass"), mjet); registry.fill(HIST("h2_dsjet_pt_mass"), jet.pt(), mjet); @@ -287,33 +267,12 @@ struct JetDsSpecSubs { registry.fill(HIST("h_ds_jet_girth"), girth); registry.fill(HIST("h2_dsjet_pt_girth"), jet.pt(), girth); } - - if (doExtraAngularity) { - const float lambdaExtra = computeLambda(jet, jetTracks, alpha.value, kappa.value); - if (lambdaExtra >= 0.f) { - registry.fill(HIST("h_ds_jet_lambda_extra"), lambdaExtra); - registry.fill(HIST("h2_dsjet_pt_lambda_extra"), jet.pt(), lambdaExtra); - } - } - - auto scores = dsCandidate.mlScores(); - const float s0 = (scores.size() > 0) ? scores[0] : -999.f; - const float s1 = (scores.size() > 1) ? scores[1] : -999.f; - const float s2 = (scores.size() > 2) ? scores[2] : -999.f; - - distJetTable(static_cast(axisDistance), - jet.pt(), jet.eta(), jet.phi(), - static_cast(jetTracks.size()), - dsCandidate.pt(), dsCandidate.eta(), dsCandidate.phi(), - dsCandidate.m(), dsCandidate.y(), - s0, s1, s2, - mjet, girth, lambda12, lambda11); - - break; // only first Ds per jet } } } PROCESS_SWITCH(JetDsSpecSubs, processDataChargedSubstructure, "charged HF jet substructure", false); }; - -WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask(cfgc, TaskName{"jet-ds-spectrum-subs"})}; } +WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) +{ + return WorkflowSpec{adaptAnalysisTask(cfgc)}; +}