Skip to content

[PWGJE] Add bjetParamsExtra table #13652

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 1 commit into from
Nov 4, 2025
Merged

[PWGJE] Add bjetParamsExtra table #13652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 17 additions & 8 deletions PWGJE/Tasks/bjetTreeCreator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,15 @@
namespace jetInfo
{
// DECLARE_SOA_INDEX_COLUMN(JetIndex, jetindex); //! The jet index
DECLARE_SOA_COLUMN(JetpT, jetpt, float); //! jet pT
DECLARE_SOA_COLUMN(JetEta, jeteta, float); //! jet eta
DECLARE_SOA_COLUMN(JetPhi, jetphi, float); //! jet phi
DECLARE_SOA_COLUMN(NTracks, nTracks, int16_t); //! number of charged tracks inside the jet
DECLARE_SOA_COLUMN(NSV, nSV, int16_t); //! Number of secondary vertices in the jet
DECLARE_SOA_COLUMN(JetMass, mass, float); //! The jet mass
DECLARE_SOA_COLUMN(JetFlavor, jetFl, int16_t); //! The jet flavor (b, c, or lf)
DECLARE_SOA_COLUMN(JetR, jetR, int16_t); //! The jet radius
DECLARE_SOA_COLUMN(JetpT, jetpt, float); //! jet pT

Check failure on line 61 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(JetEta, jeteta, float); //! jet eta

Check failure on line 62 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(JetPhi, jetphi, float); //! jet phi

Check failure on line 63 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(NTracks, nTracks, int16_t); //! number of charged tracks inside the jet
DECLARE_SOA_COLUMN(NSV, nSV, int16_t); //! Number of secondary vertices in the jet
DECLARE_SOA_COLUMN(JetMass, mass, float); //! The jet mass

Check failure on line 66 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(JetFlavor, jetFl, int16_t); //! The jet flavor (b, c, or lf)

Check failure on line 67 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(JetR, jetR, int16_t); //! The jet radius
DECLARE_SOA_COLUMN(JetEventWeight, jetEventWeight, float); //! The jet event weight for pTHat weighting
} // namespace jetInfo

DECLARE_SOA_TABLE(bjetParams, "AOD", "BJETPARAM",
Expand All @@ -81,11 +82,17 @@

using bjetParam = bjetParams::iterator;

DECLARE_SOA_TABLE(bjetParamsExtra, "AOD", "BJETEXTRA",
// o2::soa::Index<>,
jetInfo::JetEventWeight);

using bjetParamExtra = bjetParamsExtra::iterator;

namespace trackInfo
{
DECLARE_SOA_INDEX_COLUMN(bjetParam, jetindex); //! The jet index

Check failure on line 93 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TrackpT, trackpt, float); //! The track pT

Check failure on line 94 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TrackEta, tracketa, float); //! The track eta

Check failure on line 95 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(DotProdTrackJet, trackdotjet, float); //! The dot product between the track and the jet
DECLARE_SOA_COLUMN(DotProdTrackJetOverJet, trackdotjetoverjet, float); //! The dot product between the track and the jet over the jet momentum
DECLARE_SOA_COLUMN(DeltaRJetTrack, rjettrack, float); //! The DR jet-track
Expand Down Expand Up @@ -192,6 +199,7 @@
struct BJetTreeCreator {

Produces<aod::bjetParams> bjetParamsTable;
Produces<aod::bjetParamsExtra> bjetParamsExtraTable;
Produces<aod::bjetTracksParams> bjetTracksParamsTable;
Produces<aod::bjetTracksParamsExtra> bjetTracksExtraTable;
Produces<aod::bjetSVParams> bjetSVParamsTable;
Expand Down Expand Up @@ -595,7 +603,7 @@
int nSVs = analysisJet.template secondaryVertices_as<aod::DataSecondaryVertex3Prongs>().size();

registry.fill(HIST("h2_nTracks_jetpT"), analysisJet.pt(), indicesTracks.size());
registry.fill(HIST("h2_nSV_jetpT"), analysisJet.pt(), nSVs < 250 ? nSVs : 249);

Check failure on line 606 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.

if (produceTree) {
bjetConstituentsTable(bjetParamsTable.lastIndex() + 1, indicesTracks, indicesSVs);
Expand Down Expand Up @@ -673,7 +681,7 @@
registry.fill(HIST("h2_jetMass_jetpT"), analysisJet.pt(), analysisJet.mass(), eventWeight);

registry.fill(HIST("h2_nTracks_jetpT"), analysisJet.pt(), indicesTracks.size());
registry.fill(HIST("h2_nSV_jetpT"), analysisJet.pt(), nSVs < 250 ? nSVs : 249);

Check failure on line 684 in PWGJE/Tasks/bjetTreeCreator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.

if (jetFlavor == JetTaggingSpecies::beauty) {
registry.fill(HIST("h2_jetMass_jetpT_bjet"), analysisJet.pt(), analysisJet.mass(), eventWeight);
Expand Down Expand Up @@ -704,6 +712,7 @@
if (produceTree) {
bjetConstituentsTable(bjetParamsTable.lastIndex() + 1, indicesTracks, indicesSVs);
bjetParamsTable(analysisJet.pt(), analysisJet.eta(), analysisJet.phi(), indicesTracks.size(), nSVs, analysisJet.mass(), jetFlavor, analysisJet.r());
bjetParamsExtraTable(analysisJet.eventWeight());
}
}
}
Expand Down
Loading