Skip to content
Merged
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions PWGJE/Tasks/bjetTreeCreator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@
namespace jetInfo
{
// DECLARE_SOA_INDEX_COLUMN(JetIndex, jetindex); //! The jet index
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
Expand All @@ -90,9 +90,9 @@

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 @@ -245,6 +245,7 @@

Configurable<std::vector<double>> jetRadii{"jetRadii", std::vector<double>{0.4}, "jet resolution parameters"};

Configurable<bool> produceSVTree{"produceSVTree", true, "produce the SV-correlated jet TTree”"};
Configurable<bool> produceTree{"produceTree", true, "produce the jet TTree"};

Configurable<float> vtxRes{"vtxRes", 0.01, "Vertex position resolution (cluster size) for GNN vertex predictions (cm)"};
Expand Down Expand Up @@ -415,7 +416,7 @@
double energySV = candSV.e();

if (svIndices.size() < (svReductionFactor * myJet.template tracks_as<AnyTracks>().size()) && svIndices.size() < maxConstSV) {
if (produceTree) {
if (produceSVTree) {
bjetSVParamsTable(bjetParamsTable.lastIndex() + 1, candSV.pt(), deltaRJetSV, massSV, energySV / myJet.energy(), candSV.impactParameterXY(), candSV.cpa(), candSV.chi2PCA(), candSV.dispersion(), candSV.decayLengthXY(), candSV.errorDecayLengthXY(), candSV.decayLength(), candSV.errorDecayLength());
}
svIndices.push_back(bjetSVParamsTable.lastIndex());
Expand Down Expand Up @@ -603,7 +604,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 607 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 @@ -682,7 +683,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 686 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 @@ -755,6 +756,7 @@
}

std::vector<int> indicesTracks;
std::vector<int> indicesSVs;

int16_t jetFlavor = analysisJet.origin();

Expand Down Expand Up @@ -791,7 +793,6 @@
}

if (produceTree) {
std::vector<int> indicesSVs;
bjetConstituentsTable(bjetParamsTable.lastIndex() + 1, indicesTracks, indicesSVs);
bjetParamsTable(analysisJet.pt(), analysisJet.eta(), analysisJet.phi(), indicesTracks.size(), nVertices, analysisJet.mass(), jetFlavor, analysisJet.r());
}
Expand Down
Loading