Skip to content

Please consider the following formatting changes to #16030 #8

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

Closed
alibuild wants to merge 1 commit into from
+22 −11
Closed

Please consider the following formatting changes to #16030 #8

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
33 changes: 22 additions & 11 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 @@ -1529,7 +1529,7 @@
continue;
}
// trackwoCut++;
if (std::abs(track.dcaXY()) > 0.05) { // Skipping tracks that don't pass the standard cuts

Check failure on line 1532 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 Down Expand Up @@ -2626,18 +2626,21 @@
// (Keeping your original includeCentralityMC legacy block intact to avoid breaking other parts of your code)
if (includeCentralityMC) {
for (const auto& collision : collisions) {
if (!collision.has_mcCollision()) continue;
if (!collision.has_mcCollision())
continue;
const auto& mcCollision = collision.mcCollision_as<GenMCCollisions>();
const auto& particlesInCollision = mcParticles.sliceByCached(aod::mcparticle::mcCollisionId, mcCollision.globalIndex(), cache);
const float multiplicity = getMultiplicity(collision);
for (const auto& mcParticle : particlesInCollision) {
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY) continue;
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY)
continue;
static_for<0, 17>([&](auto i) { fillParticleHistogramsMC<i>(multiplicity, mcParticle); });
}
}
} else {
for (const auto& mcParticle : mcParticles) {
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY) continue;
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY)
continue;
const auto& mcCollision = mcParticle.mcCollision_as<GenMCCollisions>();
const float multiplicity = getMultiplicityMC(mcCollision);
static_for<0, 17>([&](auto i) { fillParticleHistogramsMC<i>(multiplicity, mcParticle); });
Expand All @@ -2655,10 +2658,12 @@
const auto& particlesInCollision = mcParticles.sliceByCached(aod::mcparticle::mcCollisionId, mcCollision.globalIndex(), cache);

if (evselOptions.cfgINELCut.value == 1) {
if (!o2::pwglf::isINELgt0mc(particlesInCollision, pdgDB)) continue;
if (!o2::pwglf::isINELgt0mc(particlesInCollision, pdgDB))
continue;
}
if (evselOptions.cfgINELCut.value == 2) {

Check failure on line 2664 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;
if (!o2::pwglf::isINELgt1mc(particlesInCollision, pdgDB))
continue;
}

// -- Get Actual Reconstructed Centrality --
Expand All @@ -2667,10 +2672,11 @@
// -- Calculate True Multiplicity in |eta| < 0.5 --
int trueMultEta05 = 0;
for (const auto& mcParticle : particlesInCollision) {
if (!mcParticle.isPhysicalPrimary()) continue;
if (!mcParticle.isPhysicalPrimary())
continue;
auto* pdgParticle = pdgDB->GetParticle(mcParticle.pdgCode());
if (pdgParticle != nullptr && std::abs(pdgParticle->Charge()) > 0.01) {

Check failure on line 2678 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 (std::abs(mcParticle.eta()) < 0.5f) {

Check failure on line 2679 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.
trueMultEta05++;
}
}
Expand All @@ -2683,7 +2689,8 @@
}

for (const auto& mcParticle : particlesInCollision) {
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY) continue;
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY)
continue;
static_for<0, 17>([&](auto i) {
// Pass the actual Reco Centrality to the helper function
fillParticleHistogramsMCRecoEvs<i>(mcParticle, collision, recoCentrality);
Expand All @@ -2704,10 +2711,11 @@
// -- Calculate True Multiplicity in |eta| < 0.5 --
int trueMultEta05 = 0;
for (const auto& mcParticle : particlesInCollision) {
if (!mcParticle.isPhysicalPrimary()) continue;
if (!mcParticle.isPhysicalPrimary())
continue;
auto* pdgParticle = pdgDB->GetParticle(mcParticle.pdgCode());
if (pdgParticle != nullptr && std::abs(pdgParticle->Charge()) > 0.01) {

Check failure on line 2717 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 (std::abs(mcParticle.eta()) < 0.5f) {

Check failure on line 2718 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.
trueMultEta05++;
}
}
Expand All @@ -2716,17 +2724,20 @@
histos.fill(HIST("MC/Multiplicity"), trueMultEta05);

if (evselOptions.cfgINELCut.value == EvSelInelGt0Cut) {
if (!o2::pwglf::isINELgt0mc(particlesInCollision, pdgDB)) continue;
if (!o2::pwglf::isINELgt0mc(particlesInCollision, pdgDB))
continue;
}
histos.fill(HIST("MC/MultiplicityMCINELgt0"), trueMultEta05);

if (evselOptions.cfgINELCut.value == EvSelInelGt1Cut) {
if (!o2::pwglf::isINELgt1mc(particlesInCollision, pdgDB)) continue;
if (!o2::pwglf::isINELgt1mc(particlesInCollision, pdgDB))
continue;
}
histos.fill(HIST("MC/MultiplicityMCINELgt1"), trueMultEta05);

for (const auto& mcParticle : particlesInCollision) {
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY) continue;
if (std::abs(mcParticle.y()) > trkselOptions.cfgCutY)
continue;
static_for<0, 17>([&](auto i) {
// Pass True Multiplicity directly so it plots generated particles against it
fillParticleHistogramsMCGenEvs<i>(mcParticle, trueMultEta05);
Expand Down
Loading