Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion PWGLF/Tasks/QC/mcParticlePrediction.cxx
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/QC/mcParticlePrediction.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 @@ -57,7 +57,7 @@
// Particles
static const std::vector<std::string> parameterNames{"Enable"};
static constexpr int nParameters = 1;
static const int defaultParticles[PIDExtended::NIDsTot][nParameters]{{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {1}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}};
static const int defaultParticles[PIDExtended::NIDsTot][nParameters]{{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {1}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}};
bool enabledParticlesArray[PIDExtended::NIDsTot];

// Estimators
Expand Down Expand Up @@ -455,7 +455,7 @@
}

histos.fill(HIST("collisions/generated"), 1);
if (std::abs(mcCollision.posZ()) > 10.f) {

Check failure on line 458 in PWGLF/Tasks/QC/mcParticlePrediction.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;
}
histos.fill(HIST("collisions/generated"), 2);
Expand Down Expand Up @@ -499,14 +499,14 @@

TParticlePDG* p = pdgDB->GetParticle(particle.pdgCode());
if (p) {
if (std::abs(p->Charge()) > 1e-3) {

Check failure on line 502 in PWGLF/Tasks/QC/mcParticlePrediction.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.
histos.fill(HIST("particles/eta/charged"), particle.eta());
} else {
histos.fill(HIST("particles/eta/neutral"), particle.eta());
}
}

if (std::abs(particle.y()) > 0.5) {

Check failure on line 509 in PWGLF/Tasks/QC/mcParticlePrediction.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.
continue;
}

Expand Down Expand Up @@ -672,10 +672,10 @@
float nMultRecoMCBC[Estimators::nEstimators] = {0};
if (mcBC.has_ft0()) {
const auto& ft0 = mcBC.ft0();
for (auto amplitude : ft0.amplitudeA()) {

Check failure on line 675 in PWGLF/Tasks/QC/mcParticlePrediction.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
nMultRecoMCBC[Estimators::FT0A] += amplitude;
}
for (auto amplitude : ft0.amplitudeC()) {

Check failure on line 678 in PWGLF/Tasks/QC/mcParticlePrediction.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
nMultRecoMCBC[Estimators::FT0C] += amplitude;
}
nMultRecoMCBC[Estimators::FT0AC] = nMultRecoMCBC[Estimators::FT0A] + nMultRecoMCBC[Estimators::FT0C];
Expand Down
6 changes: 5 additions & 1 deletion PWGLF/Utils/mcParticle.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ class PIDExtended
static constexpr ID XiCCPlusPlus = PIDCounts + 36;
static constexpr ID XiCPlus = PIDCounts + 37;
static constexpr ID XiC0 = PIDCounts + 38;
static constexpr ID NIDsTot = PIDCounts + 39;
static constexpr ID Kstar = PIDCounts + 39;
static constexpr ID NIDsTot = PIDCounts + 40;

static constexpr const char* sNames[NIDsTot + 1] = {
o2::track::pid_constants::sNames[Electron], // Electron
Expand Down Expand Up @@ -191,6 +192,7 @@ class PIDExtended
"XiCCPlusPlus", // XiCCPlusPlus
"XiCPlus", // XiCPlus
"XiC0", // XiC0
"Kstar", // Kstar
nullptr};

static std::vector<std::string> arrayNames()
Expand Down Expand Up @@ -325,6 +327,8 @@ class PIDExtended
return XiCPlus;
case o2::constants::physics::Pdg::kXiC0:
return XiC0;
case o2::constants::physics::Pdg::kK0Star892:
return Kstar;
default:
LOG(debug) << "Cannot identify particle with PDG code " << particle.pdgCode();
break;
Expand Down
Loading