Skip to content

[PWGLF] Fix estimator parameters #17486

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

Draft
njacazio wants to merge 2 commits into
base: master
Choose a base branch
from
+95 −95
Draft

[PWGLF] Fix estimator parameters #17486

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4a06da
Fix estimator parameters
njacazio Aug 17, 2026
28f7d5f
Refactor particle and estimator default arrays
njacazio Aug 18, 2026
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
190 changes: 95 additions & 95 deletions PWGLF/Tasks/QC/mcParticlePrediction.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,73 +55,72 @@ using namespace o2::framework;
using namespace o2::pwglf;

// Particles
static const std::vector<std::string> parameterNames{"Enable", "SelectPrimaries"};
static constexpr int nParameters = 2;
static const int defaultParticles[PIDExtended::NIDsTot][nParameters]{{0, 1}, // Electron
{0, 1}, // Muon
{0, 1}, // Pion
{0, 1}, // Kaon
{0, 1}, // Proton
{0, 1}, // Deuteron
{0, 1}, // Triton
{0, 1}, // Helium3
{0, 1}, // Alpha
{0, 1}, // PI0
{0, 1}, // Photon
{1, 1}, // K0
{0, 1}, // Lambda
{0, 1}, // HyperTriton
{0, 1}, // Hyperhydrog4
{0, 1}, // XiMinus
{0, 1}, // OmegaMinus
{0, 1}, // HyperHelium4
{0, 1}, // HyperHelium5
{0, 1}, // Positron
{0, 1}, // MuonPlus
{0, 1}, // PionMinus
{0, 1}, // KaonMinus
{0, 1}, // AntiProton
{0, 1}, // AntiDeuteron
{0, 1}, // AntiTriton
{0, 1}, // AntiHelium3
{0, 1}, // AntiAlpha
{0, 1}, // AntiLambda
{0, 1}, // AntiHyperTriton
{0, 1}, // AntiHyperhydrog4
{0, 1}, // XiPlus
{0, 1}, // OmegaPlus
{0, 1}, // AntiHyperHelium4
{0, 1}, // AntiHyperHelium5
{0, 1}, // Neutron
{0, 1}, // AntiNeutron
{0, 0}, // Phi
{0, 1}, // BZero
{0, 1}, // BPlus
{0, 1}, // BS
{0, 1}, // D0
{0, 1}, // DPlus
{0, 1}, // DS
{0, 1}, // DStar
{0, 1}, // ChiC1
{0, 1}, // JPsi
{0, 1}, // LambdaB0
{0, 1}, // LambdaCPlus
{0, 1}, // OmegaC0
{0, 1}, // SigmaC0
{0, 1}, // SigmaCPlusPlus
{0, 1}, // X3872
{0, 1}, // Xi0
{0, 1}, // XiB0
{0, 1}, // XiCCPlusPlus
{0, 1}, // XiCPlus
{0, 1}, // XiC0
{0, 0}, // Kstar
{0, 0}, // KstarPM
{0, 1}, // Kshort
{0, 0}, // Xi1530
{0, 0}}; // Lambda1520
bool enabledParticlesArray[PIDExtended::NIDsTot];
bool selectPrimariesArray[PIDExtended::NIDsTot];
static constexpr std::array<std::array<int, 2>, PIDExtended::NIDsTot>
defaultParticles{{{0, 1}, // Electron
{0, 1}, // Muon
{0, 1}, // Pion
{0, 1}, // Kaon
{0, 1}, // Proton
{0, 1}, // Deuteron
{0, 1}, // Triton
{0, 1}, // Helium3
{0, 1}, // Alpha
{0, 1}, // PI0
{0, 1}, // Photon
{1, 1}, // K0
{0, 1}, // Lambda
{0, 1}, // HyperTriton
{0, 1}, // Hyperhydrog4
{0, 1}, // XiMinus
{0, 1}, // OmegaMinus
{0, 1}, // HyperHelium4
{0, 1}, // HyperHelium5
{0, 1}, // Positron
{0, 1}, // MuonPlus
{0, 1}, // PionMinus
{0, 1}, // KaonMinus
{0, 1}, // AntiProton
{0, 1}, // AntiDeuteron
{0, 1}, // AntiTriton
{0, 1}, // AntiHelium3
{0, 1}, // AntiAlpha
{0, 1}, // AntiLambda
{0, 1}, // AntiHyperTriton
{0, 1}, // AntiHyperhydrog4
{0, 1}, // XiPlus
{0, 1}, // OmegaPlus
{0, 1}, // AntiHyperHelium4
{0, 1}, // AntiHyperHelium5
{0, 1}, // Neutron
{0, 1}, // AntiNeutron
{0, 0}, // Phi
{0, 1}, // BZero
{0, 1}, // BPlus
{0, 1}, // BS
{0, 1}, // D0
{0, 1}, // DPlus
{0, 1}, // DS
{0, 1}, // DStar
{0, 1}, // ChiC1
{0, 1}, // JPsi
{0, 1}, // LambdaB0
{0, 1}, // LambdaCPlus
{0, 1}, // OmegaC0
{0, 1}, // SigmaC0
{0, 1}, // SigmaCPlusPlus
{0, 1}, // X3872
{0, 1}, // Xi0
{0, 1}, // XiB0
{0, 1}, // XiCCPlusPlus
{0, 1}, // XiCPlus
{0, 1}, // XiC0
{0, 0}, // Kstar
{0, 0}, // KstarPM
{0, 1}, // Kshort
{0, 0}, // Xi1530
{0, 0}}}; // Lambda1520
std::array<bool, PIDExtended::NIDsTot> enabledParticlesArray = {false};
std::array<bool, PIDExtended::NIDsTot> selectPrimariesArray = {false};

// Estimators
struct Estimators {
Expand Down Expand Up @@ -180,27 +179,28 @@ struct Estimators {
return names;
}
};
bool enabledEstimatorsArray[Estimators::nEstimators];
static const int defaultEstimators[Estimators::nEstimators][nParameters]{{0}, // FT0A
{0}, // FT0C
{1}, // FT0AC
{0}, // FV0A
{0}, // FDDA
{0}, // FDDC
{0}, // FDDAC
{0}, // ZNA
{0}, // ZNC
{0}, // ZEM1
{0}, // ZEM2
{0}, // ZPA
{0}, // ZPC
{0}, // ITSIB
{0}, // ETA05
{0}, // ETA08
{0}, // V0A (Run2)
{0}, // V0C (Run2)
{0}, // V0AC (Run2 V0M)
{0}}; // ImpactParamter
std::array<bool, Estimators::nEstimators> enabledEstimatorsArray = {false};
static constexpr std::array<std::array<int, 1>, Estimators::nEstimators>
defaultEstimators{{{0}, // FT0A
{0}, // FT0C
{1}, // FT0AC
{0}, // FV0A
{0}, // FDDA
{0}, // FDDC
{0}, // FDDAC
{0}, // ZNA
{0}, // ZNC
{0}, // ZEM1
{0}, // ZEM2
{0}, // ZPA
{0}, // ZPC
{0}, // ITSIB
{0}, // ETA05
{0}, // ETA08
{0}, // V0A (Run2)
{0}, // V0C (Run2)
{0}, // V0AC (Run2 V0M)
{0}}}; // ImpactParamter

// Histograms
std::array<std::shared_ptr<TH1>, Estimators::nEstimators> hestimators;
Expand Down Expand Up @@ -253,10 +253,10 @@ struct McParticlePrediction {
} cfgPrediction;

Configurable<LabeledArray<int>> enabledSpecies{"enabledSpecies",
{defaultParticles[0], PIDExtended::NIDsTot, nParameters, PIDExtended::arrayNames(), parameterNames},
{defaultParticles[0], PIDExtended::NIDsTot, defaultParticles[0].size(), PIDExtended::arrayNames(), {"Enable", "SelectPrimaries"}},
"Particles enabled"};
Configurable<LabeledArray<int>> enabledEstimators{"enabledEstimators",
{defaultEstimators[0], Estimators::nEstimators, nParameters, Estimators::arrayNames(), parameterNames},
{defaultEstimators[0], Estimators::nEstimators, defaultEstimators[0].size(), Estimators::arrayNames(), {"Enable"}},
"Estimators enabled"};
Configurable<bool> selectInelGt0{"selectInelGt0", true, "Select only inelastic events"};
Configurable<bool> selectPrimariesForMultiplicity{"selectPrimariesForMultiplicity", true, "Select only primary particles for multiplicity computation"};
Expand All @@ -278,8 +278,8 @@ struct McParticlePrediction {
Configurable<bool> enableVsImpactParameterHistograms{"enableVsImpactParameterHistograms", true, "Enables the correlation between impact parameter and other estimators"};
Configurable<float> chargetolerance{"chargetolerance", 1e-3, "Tolerance to consider a particle as charged based on its charge"};

Service<o2::framework::O2DatabasePDG> pdgDB;
o2::pwglf::ParticleCounter<o2::framework::O2DatabasePDG> mCounter;
Service<o2::framework::O2DatabasePDG> pdgDB{};
o2::pwglf::ParticleCounter<o2::framework::O2DatabasePDG> mCounter{};

void init(o2::framework::InitContext&)
{
Expand Down Expand Up @@ -499,7 +499,7 @@ struct McParticlePrediction {

std::array<float, Estimators::nEstimators> genMult(const auto& mcCollision, const auto& mcParticles)
{
std::array<float, Estimators::nEstimators> nMult;
std::array<float, Estimators::nEstimators> nMult = {0};
if (enabledEstimatorsArray[Estimators::FT0A] || enabledEstimatorsArray[Estimators::FT0AC]) {
nMult[Estimators::FT0A] = mCounter.countFT0A(mcParticles);
}
Expand Down Expand Up @@ -814,7 +814,7 @@ struct McParticlePrediction {

const std::array<float, Estimators::nEstimators>& nMult = genMult(mcCollision, particlesInCollision);

float nMultReco[Estimators::nEstimators];
std::array<float, Estimators::nEstimators> nMultReco = {0};
nMultReco[Estimators::FT0A] = collision.multFT0A();
nMultReco[Estimators::FT0C] = collision.multFT0C();
nMultReco[Estimators::FT0AC] = collision.multFT0M();
Expand All @@ -826,7 +826,7 @@ struct McParticlePrediction {
nMultReco[Estimators::ZNC] = collision.multZNC();
nMultReco[Estimators::ITSIB] = collision.multNTracksPV();

float nMultRecoMCBC[Estimators::nEstimators] = {0};
std::array<float, Estimators::nEstimators> nMultRecoMCBC = {0};
if (mcBC.has_ft0()) {
const auto& ft0 = mcBC.ft0();
for (const auto& amplitude : ft0.amplitudeA()) {
Expand Down
Loading