Skip to content

[PWGLF] rigidity & linter fix #11351

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
maciacco merged 13 commits into from
May 26, 2025
Merged

[PWGLF] rigidity & linter fix #11351

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b521cd7
added tof mass cut
mherzer28 Apr 14, 2025
fc4591c
Please consider the following formatting changes
alibuild Apr 14, 2025
f1d3b5e
Merge pull request #6 from alibuild/alibot-cleanup-10844
mherzer28 Apr 14, 2025
6b377c2
Merge branch 'AliceO2Group:master' into master
mherzer28 May 6, 2025
47f8791
Merge branch 'AliceO2Group:master' into master
mherzer28 May 12, 2025
0cafff3
Merge branch 'AliceO2Group:master' into master
mherzer28 May 20, 2025
177676e
Merge branch 'AliceO2Group:master' into master
mherzer28 May 25, 2025
3081997
rebase
mherzer28 May 25, 2025
efb5749
minor linter fix
mherzer28 May 25, 2025
cbfa163
linter fix
mherzer28 May 25, 2025
4199ba5
linter fix 2
mherzer28 May 25, 2025
8f73d71
fix
mherzer28 May 25, 2025
6771246
fix error
mherzer28 May 25, 2025
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
43 changes: 24 additions & 19 deletions PWGLF/TableProducer/Nuspex/trHeAnalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class Particle
int charge;
float resolution;
std::vector<float> betheParams;
static constexpr int kNumBetheParams = 5;
static constexpr int NNumBetheParams = 5;

Particle(const std::string name_, int pdgCode_, float mass_, int charge_,
LabeledArray<float> bethe)
Expand All @@ -150,7 +150,7 @@ class Particle
bethe.get(name, "resolution"); // Access the "resolution" parameter

betheParams.clear();
for (int i = 0; i < kNumBetheParams; ++i) {
for (int i = 0; i < NNumBetheParams; ++i) {
betheParams.push_back(bethe.get(name, i));
}
}
Expand Down Expand Up @@ -366,10 +366,11 @@ struct TrHeAnalysis {
histos.fill(HIST("histogram/pT"), track.pt());
histos.fill(HIST("histogram/p"), track.p());
histos.fill(HIST("histogram/TPCsignVsTPCmomentum"),
getRigidity(track),
getRigidity(track) * track.sign(),
track.tpcSignal());
histos.fill(HIST("histogram/TOFbetaVsP"),
getRigidity(track), track.beta());
getRigidity(track) * track.sign(),
track.beta());
if (enableTr && trRapCut) {
if (std::abs(getTPCnSigma(track, particles.at(0))) <
nsigmaTPCvar.nsigmaTPCTr) {
Expand All @@ -391,10 +392,11 @@ struct TrHeAnalysis {
continue;
}
histos.fill(HIST("histogram/H3/H3-TPCsignVsTPCmomentum"),
getRigidity(track),
getRigidity(track) * track.sign(),
track.tpcSignal());
histos.fill(HIST("histogram/H3/H3-TOFbetaVsP"),
getRigidity(track), track.beta());
getRigidity(track) * track.sign(),
track.beta());
float tPt = track.pt();
float tEta = track.eta();
float tPhi = track.phi();
Expand Down Expand Up @@ -437,10 +439,11 @@ struct TrHeAnalysis {
continue;
}
histos.fill(HIST("histogram/He/He-TPCsignVsTPCmomentum"),
getRigidity(track),
getRigidity(track) * track.sign(),
track.tpcSignal());
histos.fill(HIST("histogram/He/He-TOFbetaVsP"),
getRigidity(track), track.beta());
getRigidity(track) * track.sign(),
track.beta());
float tPt = track.pt();
float tEta = track.eta();
float tPhi = track.phi();
Expand Down Expand Up @@ -520,10 +523,10 @@ struct TrHeAnalysis {
histos.fill(HIST("histogram/pT"), track.pt());
histos.fill(HIST("histogram/p"), track.p());
histos.fill(HIST("histogram/TPCsignVsTPCmomentum"),
getRigidity(track) / (1.f * track.sign()),
getRigidity(track) * (1.f * track.sign()),
track.tpcSignal());
histos.fill(HIST("histogram/TOFbetaVsP"),
track.p() / (1.f * track.sign()), track.beta());
track.p() * (1.f * track.sign()), track.beta());
if (enableTr && trRapCut) {
if (std::abs(track.tpcNSigmaTr()) < nsigmaTPCvar.nsigmaTPCTr) {
if (track.itsChi2NCl() > cfgCutMaxChi2ItsH3) {
Expand All @@ -544,10 +547,11 @@ struct TrHeAnalysis {
continue;
}
histos.fill(HIST("histogram/H3/H3-TPCsignVsTPCmomentum"),
getRigidity(track) / (1.f * track.sign()),
getRigidity(track) * (1.f * track.sign()),
track.tpcSignal());
histos.fill(HIST("histogram/H3/H3-TOFbetaVsP"),
track.p() / (1.f * track.sign()), track.beta());
track.p() * (1.f * track.sign()),
track.beta());
float tPt = track.pt();
float tEta = track.eta();
float tPhi = track.phi();
Expand Down Expand Up @@ -589,10 +593,11 @@ struct TrHeAnalysis {
continue;
}
histos.fill(HIST("histogram/He/He-TPCsignVsTPCmomentum"),
getRigidity(track),
getRigidity(track) * track.sign(),
track.tpcSignal());
histos.fill(HIST("histogram/He/He-TOFbetaVsP"),
getRigidity(track), track.beta());
getRigidity(track) * track.sign(),
track.beta());
float tPt = track.pt();
float tEta = track.eta();
float tPhi = track.phi();
Expand Down Expand Up @@ -643,12 +648,12 @@ struct TrHeAnalysis {
template <class T>
float getMeanItsClsSize(T const& track)
{
constexpr int kNumLayers = 8;
constexpr int kBitsPerLayer = 4;
constexpr int kBitMask = (1 << kBitsPerLayer) - 1;
constexpr int NNumLayers = 8;
constexpr int NBitsPerLayer = 4;
constexpr int NBitMask = (1 << NBitsPerLayer) - 1;
int sum = 0, n = 0;
for (int i = 0; i < kNumLayers; i++) {
int clsSize = (track.itsClusterSizes() >> (kBitsPerLayer * i)) & kBitMask;
for (int i = 0; i < NNumLayers; i++) {
int clsSize = (track.itsClusterSizes() >> (NBitsPerLayer * i)) & NBitMask;
sum += clsSize;
if (clsSize)
n++;
Expand Down
Loading