Skip to content

[PWGLF] Added rapidity range for handling pO analysis #17801

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
mario-krueger merged 1 commit into from
Sep 6, 2026
+29 −27
Merged

[PWGLF] Added rapidity range for handling pO analysis #17801

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
56 changes: 29 additions & 27 deletions PWGLF/Tasks/Nuspex/spectraTOF.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGLF/Tasks/Nuspex/spectraTOF.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file] 

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -131,7 +131,8 @@
Configurable<float> cfgCutNsigma{"cfgCutNsigma", 100.0f, "nsigma cut range for tracks"};
Configurable<float> cfgCutEtaMin{"cfgCutEtaMin", -0.8f, "Min eta range for tracks"};
Configurable<float> cfgCutdcaZMin{"cfgCutdcaZMin", -0.02f, "Min dcaZ range for tracks"};
Configurable<float> cfgCutY{"cfgCutY", 0.5f, "Y range for tracks"};
Configurable<float> cfgCutYMax{"cfgCutYMax", 0.5f, "Max Y range for tracks"};
Configurable<float> cfgCutYMin{"cfgCutYMin", -0.5f, "Min Y range for tracks"};
Configurable<int> lastRequiredTrdCluster{"lastRequiredTrdCluster", 5, "Last cluster to require in TRD for track selection. -1 does not require any TRD cluster"};
Configurable<bool> requireTrdOnly{"requireTrdOnly", false, "Require only tracks from TRD"};
Configurable<bool> requireNoTrd{"requireNoTrd", false, "Require tracks without TRD"};
Expand Down Expand Up @@ -900,7 +901,8 @@
template <bool fillFullInfo, PID::ID id, typename T, typename C>
void fillParticleHistos(const T& track, const C& collision)
{
if (std::abs(track.rapidity(PID::getMass(id))) > trkselOptions.cfgCutY) {
const auto rapidity = track.rapidity(PID::getMass(id));
if (rapidity < trkselOptions.cfgCutYMin || rapidity > trkselOptions.cfgCutYMax) {
return;
}
if constexpr (id == PID::Kaon) {
Expand Down Expand Up @@ -1532,7 +1534,7 @@
continue;
}
// trackwoCut++;
if (std::abs(track.dcaXY()) > 0.05) { // Skipping tracks that don't pass the standard cuts

Check failure on line 1537 in PWGLF/Tasks/Nuspex/spectraTOF.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.
return;
}

Expand All @@ -1556,14 +1558,14 @@
bool isTOFKaon = track.hasTOF() && std::abs(nsigmaTOFKa) < trkselOptions.cfgCutNsigma;
bool isTOFProton = track.hasTOF() && std::abs(nsigmaTOFPr) < trkselOptions.cfgCutNsigma;
// Precompute rapidity values to avoid redundant calculations
double rapidityPi = std::abs(track.rapidity(PID::getMass(2)));
double rapidityKa = std::abs(track.rapidity(PID::getMass(3)));
double rapidityPr = std::abs(track.rapidity(PID::getMass(4)));
double rapidityPi = track.rapidity(PID::getMass(2));
double rapidityKa = track.rapidity(PID::getMass(3));
double rapidityPr = track.rapidity(PID::getMass(4));
if (track.eta() < trkselOptions.cfgCutEtaMin || track.eta() > trkselOptions.cfgCutEtaMax) {
return;
}
if (mcParticle.isPhysicalPrimary()) {
if (isTPCPion && rapidityPi <= trkselOptions.cfgCutY) {
if (isTPCPion && rapidityPi >= trkselOptions.cfgCutYMin && rapidityPi <= trkselOptions.cfgCutYMax) {
if (usePDGcode) {
if (pdgCode == kPiPlus) {
histos.fill(HIST("nsigmatpc/mc_closure/pos/pi"), track.pt(), nsigmaTPCPi, multiplicity);
Expand All @@ -1575,7 +1577,7 @@
histos.fill(HIST("nsigmatpc/mc_closure/neg/pi"), track.pt(), nsigmaTPCPi, multiplicity);
}
}
if (isTPCKaon && rapidityKa <= trkselOptions.cfgCutY) {
if (isTPCKaon && rapidityKa >= trkselOptions.cfgCutYMin && rapidityKa <= trkselOptions.cfgCutYMax) {
if (usePDGcode) {
if (pdgCode == kKPlus) {
histos.fill(HIST("nsigmatpc/mc_closure/pos/ka"), track.pt(), nsigmaTPCKa, multiplicity);
Expand All @@ -1587,7 +1589,7 @@
histos.fill(HIST("nsigmatpc/mc_closure/neg/ka"), track.pt(), nsigmaTPCKa, multiplicity);
}
}
if (isTPCProton && rapidityPr <= trkselOptions.cfgCutY) {
if (isTPCProton && rapidityPr >= trkselOptions.cfgCutYMin && rapidityPr <= trkselOptions.cfgCutYMax) {
if (usePDGcode) {
if (pdgCode == kProton) {
histos.fill(HIST("nsigmatpc/mc_closure/pos/pr"), track.pt(), nsigmaTPCPr, multiplicity);
Expand All @@ -1601,7 +1603,7 @@
}

// TOF Selection and Histogram Filling
if (isTOFPion && rapidityPi <= trkselOptions.cfgCutY) {
if (isTOFPion && rapidityPi >= trkselOptions.cfgCutYMin && rapidityPi <= trkselOptions.cfgCutYMax) {
if (usePDGcode) {
if (pdgCode == kPiPlus) {
histos.fill(HIST("nsigmatof/mc_closure/pos/pi"), track.pt(), nsigmaTOFPi, multiplicity);
Expand All @@ -1613,7 +1615,7 @@
histos.fill(HIST("nsigmatof/mc_closure/neg/pi"), track.pt(), nsigmaTOFPi, multiplicity);
}
}
if (isTOFKaon && rapidityKa <= trkselOptions.cfgCutY) {
if (isTOFKaon && rapidityKa >= trkselOptions.cfgCutYMin && rapidityKa <= trkselOptions.cfgCutYMax) {
if (usePDGcode) {
if (pdgCode == kKPlus) {
histos.fill(HIST("nsigmatof/mc_closure/pos/ka"), track.pt(), nsigmaTOFKa, multiplicity);
Expand All @@ -1625,7 +1627,7 @@
histos.fill(HIST("nsigmatof/mc_closure/neg/ka"), track.pt(), nsigmaTOFKa, multiplicity);
}
}
if (isTOFProton && rapidityPr <= trkselOptions.cfgCutY) {
if (isTOFProton && rapidityPr >= trkselOptions.cfgCutYMin && rapidityPr <= trkselOptions.cfgCutYMax) {
if (usePDGcode) {
if (pdgCode == kProton) {
histos.fill(HIST("nsigmatof/mc_closure/pos/pr"), track.pt(), nsigmaTOFPr, multiplicity);
Expand Down Expand Up @@ -1693,21 +1695,21 @@
const bool isTOFProton = track.hasTOF() && std::abs(nsigmaTOFPr) < trkselOptions.cfgCutNsigma;

// Apply rapidity cut for identified particles
if (isTPCPion && std::abs(track.rapidity(PID::getMass(2))) < trkselOptions.cfgCutY) {
if (isTPCPion && track.rapidity(PID::getMass(2)) >= trkselOptions.cfgCutYMin && track.rapidity(PID::getMass(2)) <= trkselOptions.cfgCutYMax) {
tpcCount++;
if (track.sign() > 0) {
histos.fill(HIST("nsigmatpc/test_occupancy/pos/pi"), track.pt(), nsigmaTPCPi, multiplicity, occupancy);
} else {
histos.fill(HIST("nsigmatpc/test_occupancy/neg/pi"), track.pt(), nsigmaTPCPi, multiplicity, occupancy);
}
} else if (isTPCKaon && std::abs(track.rapidity(PID::getMass(3))) < trkselOptions.cfgCutY) {
} else if (isTPCKaon && track.rapidity(PID::getMass(3)) >= trkselOptions.cfgCutYMin && track.rapidity(PID::getMass(3)) <= trkselOptions.cfgCutYMax) {
tpcCount++;
if (track.sign() > 0) {
histos.fill(HIST("nsigmatpc/test_occupancy/pos/ka"), track.pt(), nsigmaTPCKa, multiplicity, occupancy);
} else {
histos.fill(HIST("nsigmatpc/test_occupancy/neg/ka"), track.pt(), nsigmaTPCKa, multiplicity, occupancy);
}
} else if (isTPCProton && std::abs(track.rapidity(PID::getMass(4))) < trkselOptions.cfgCutY) {
} else if (isTPCProton && track.rapidity(PID::getMass(4)) >= trkselOptions.cfgCutYMin && track.rapidity(PID::getMass(4)) <= trkselOptions.cfgCutYMax) {
tpcCount++;
if (track.sign() > 0) {
histos.fill(HIST("nsigmatpc/test_occupancy/pos/pr"), track.pt(), nsigmaTPCPr, multiplicity, occupancy);
Expand All @@ -1717,21 +1719,21 @@
}

// TOF PID histograms
if (isTOFPion && std::abs(track.rapidity(PID::getMass(2))) < trkselOptions.cfgCutY) {
if (isTOFPion && track.rapidity(PID::getMass(2)) >= trkselOptions.cfgCutYMin && track.rapidity(PID::getMass(2)) <= trkselOptions.cfgCutYMax) {
tofCount++;
if (track.sign() > 0) {
histos.fill(HIST("nsigmatof/test_occupancy/pos/pi"), track.pt(), nsigmaTOFPi, multiplicity, occupancy);
} else {
histos.fill(HIST("nsigmatof/test_occupancy/neg/pi"), track.pt(), nsigmaTOFPi, multiplicity, occupancy);
}
} else if (isTOFKaon && std::abs(track.rapidity(PID::getMass(3))) < trkselOptions.cfgCutY) {
} else if (isTOFKaon && track.rapidity(PID::getMass(3)) >= trkselOptions.cfgCutYMin && track.rapidity(PID::getMass(3)) <= trkselOptions.cfgCutYMax) {
tofCount++;
if (track.sign() > 0) {
histos.fill(HIST("nsigmatof/test_occupancy/pos/ka"), track.pt(), nsigmaTOFKa, multiplicity, occupancy);
} else {
histos.fill(HIST("nsigmatof/test_occupancy/neg/ka"), track.pt(), nsigmaTOFKa, multiplicity, occupancy);
}
} else if (isTOFProton && std::abs(track.rapidity(PID::getMass(4))) < trkselOptions.cfgCutY) {
} else if (isTOFProton && track.rapidity(PID::getMass(4)) >= trkselOptions.cfgCutYMin && track.rapidity(PID::getMass(4)) <= trkselOptions.cfgCutYMax) {
tofCount++;
if (track.sign() > 0) {
histos.fill(HIST("nsigmatof/test_occupancy/pos/pr"), track.pt(), nsigmaTOFPr, multiplicity, occupancy);
Expand Down Expand Up @@ -1975,7 +1977,7 @@
return;
}

if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY) {
if (mcParticle.y() < trkselOptions.cfgCutYMin || mcParticle.y() > trkselOptions.cfgCutYMax) {
return;
}
if (enablePureDCAHistogram) {
Expand Down Expand Up @@ -2624,7 +2626,7 @@
const float multiplicity = getMultiplicity(collision);
for (const auto& mcParticle : particlesInCollision) {

if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY) {
if (mcParticle.y() < trkselOptions.cfgCutYMin || mcParticle.y() > trkselOptions.cfgCutYMax) {
continue;
}
static_for<0, 17>([&](auto i) {
Expand All @@ -2634,7 +2636,7 @@
}
} else {
for (const auto& mcParticle : mcParticles) {
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY) {
if (mcParticle.y() < trkselOptions.cfgCutYMin || mcParticle.y() > trkselOptions.cfgCutYMax) {
continue;
}

Expand All @@ -2658,7 +2660,7 @@
continue;
}
}
if (evselOptions.cfgINELCut.value == 2) {

Check failure on line 2663 in PWGLF/Tasks/Nuspex/spectraTOF.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 (!o2::pwglf::isINELgt1mc(particlesInCollision, pdgDB)) {
continue;
}
Expand All @@ -2668,7 +2670,7 @@
histos.fill(HIST("MC/MultiplicityRecoEv"), getMultiplicityMC(mcCollision));
}
for (const auto& mcParticle : particlesInCollision) {
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY) {
if (mcParticle.y() < trkselOptions.cfgCutYMin || mcParticle.y() > trkselOptions.cfgCutYMax) {
continue;
}
static_for<0, 17>([&](auto i) {
Expand Down Expand Up @@ -2699,7 +2701,7 @@
}
histos.fill(HIST("MC/MultiplicityMCINELgt1"), getMultiplicityMC(mcCollision));
for (const auto& mcParticle : particlesInCollision) {
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY) {
if (mcParticle.y() < trkselOptions.cfgCutYMin || mcParticle.y() > trkselOptions.cfgCutYMax) {
continue;
}
static_for<0, 17>([&](auto i) {
Expand Down Expand Up @@ -2729,8 +2731,8 @@
continue;
int pdgCode = mcParticleGen.pdgCode();
float pt = mcParticleGen.pt();
float absY = std::abs(mcParticleGen.y());
if (absY > trkselOptions.cfgCutY) {
float rapidity = mcParticleGen.y();
if (rapidity < trkselOptions.cfgCutYMin || rapidity > trkselOptions.cfgCutYMax) {
continue;
}

Expand Down Expand Up @@ -2793,8 +2795,8 @@

int pdgCode = mcParticle.pdgCode();
float pt = mcParticle.pt();
float absY = std::abs(mcParticle.y());
if (absY > trkselOptions.cfgCutY) {
float rapidity = mcParticle.y();
if (rapidity < trkselOptions.cfgCutYMin || rapidity > trkselOptions.cfgCutYMax) {
continue;
}

Expand Down Expand Up @@ -2877,7 +2879,7 @@
// Precompute rapidity values to avoid redundant calculations
double rapiditypar = std::abs(track.rapidity(PID::getMass(par)));
// TPC Selection and histogram filling
if (isTPCpar && rapiditypar <= trkselOptions.cfgCutY) {
if (isTPCpar && rapiditypar >= trkselOptions.cfgCutYMin && rapiditypar <= trkselOptions.cfgCutYMax) {
static_for<0, NpCharge - 1>([&](auto i) {
if (pdgCode == PDGs[i]) {
hMCPdgNsigmaTPC[par - 2][i]->Fill(track.pt(), nsigmaTPCpar, multiplicity);
Expand Down
Loading