[PWGJE] Rename Ds jet task and add THnSparse histograms #15749
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,26 +8,21 @@ | |
| // 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. | ||
| // | ||
| /// \file jetDsSpecSubs.cxx | ||
| /// \brief Ds-tagged jet analysis with substructure histogram outputs | ||
| /// \author Monalisa Melo <[email protected]>, Universidade de São Paulo | ||
|
|
||
| #include "PWGJE/Core/JetDerivedDataUtilities.h" | ||
| #include "PWGJE/Core/JetUtilities.h" | ||
| #include "PWGJE/DataModel/Jet.h" | ||
|
|
||
| #include <Framework/ASoA.h> | ||
| #include <Framework/AnalysisDataModel.h> | ||
| #include <Framework/AnalysisTask.h> | ||
| #include <Framework/ConfigContext.h> | ||
| #include <Framework/Configurable.h> | ||
| #include <Framework/DataProcessorSpec.h> | ||
| #include <Framework/HistogramRegistry.h> | ||
| #include <Framework/HistogramSpec.h> | ||
| #include <Framework/InitContext.h> | ||
|
|
@@ -43,51 +38,6 @@ using namespace o2; | |
| using namespace o2::framework; | ||
| using namespace o2::framework::expressions; | ||
|
|
||
| struct JetDsSpecSubs { | ||
| HistogramRegistry registry{ | ||
| "registry", | ||
|
|
@@ -100,13 +50,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", ";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 +69,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}}}}, | ||
| }}; | ||
|
|
||
| Configurable<float> vertexZCut{"vertexZCut", 10.0f, "Accepted z-vertex range"}; | ||
|
|
@@ -129,17 +78,9 @@ struct JetDsSpecSubs { | |
| Configurable<std::string> eventSelections{"eventSelections", "sel8", "choose event selection"}; | ||
| Configurable<std::string> trackSelections{"trackSelections", "globalTracks", "set track selections"}; | ||
|
|
||
| std::vector<int> eventSelectionBits; | ||
| int trackSelection = -1; | ||
|
|
||
| template <typename JET, typename TRACKS> | ||
| float computeLambda(JET const& jet, TRACKS const& tracks, float a, float k) | ||
| { | ||
|
|
@@ -151,8 +92,8 @@ struct JetDsSpecSubs { | |
| const float dr = jetutilities::deltaR(jet, trk); | ||
| sum += std::pow(trk.pt(), k) * std::pow(dr, a); | ||
| } | ||
| const float jetR = jet.r() / 100.f; | ||
| const float denom = std::pow(jet.pt(), k) * std::pow(jetR, a); | ||
| if (denom <= 0.f) { | ||
| return -1.f; | ||
| } | ||
|
|
@@ -189,9 +130,9 @@ struct JetDsSpecSubs { | |
| eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections)); | ||
| trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections)); | ||
|
|
||
| auto h = registry.get<TH1>(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 +144,7 @@ struct JetDsSpecSubs { | |
| if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) { | ||
| return; | ||
| } | ||
|
|
||
| registry.fill(HIST("h_collisions"), 1.5); | ||
|
|
||
| for (auto const& track : tracks) { | ||
|
|
@@ -222,7 +164,7 @@ struct JetDsSpecSubs { | |
| if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits)) { | ||
| return; | ||
| } | ||
| 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,77 +185,85 @@ 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<aod::JetTracks>(); | ||
|
|
||
| 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 jetR = jet.r() / 100.f; | ||
| const float girth = (lambda11 >= 0.f) ? (lambda11 * jetR) : -1.f; | ||
|
|
||
| // Loop over Ds candidates (particle level) | ||
| for (const auto& dsCandidate : jet.candidates_as<aod::CandidatesDsData>()) { | ||
|
|
||
| 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 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_mass"), dsCandidate.m()); | ||
| registry.fill(HIST("h_ds_eta"), dsCandidate.eta()); | ||
| registry.fill(HIST("h_ds_phi"), dsCandidate.phi()); | ||
|
|
||
| // 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) { | ||
|
|
||
| registry.fill(HIST("h_jet_counter"), 1.5); | ||
|
|
||
| // 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); | ||
|
|
||
| if (girth >= 0.f) { | ||
| registry.fill(HIST("h_ds_jet_girth"), girth); | ||
| registry.fill(HIST("h2_dsjet_pt_girth"), jet.pt(), girth); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| PROCESS_SWITCH(JetDsSpecSubs, processDataChargedSubstructure, "charged HF jet substructure", false); | ||
| }; | ||
| WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) | ||
| { | ||
| return WorkflowSpec{adaptAnalysisTask<JetDsSpecSubs>(cfgc)}; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.