Skip to content

Commit 08e6e56

Browse files
committed
updated the logic from recent pull request
1 parent d40cb79 commit 08e6e56

1 file changed

Lines changed: 34 additions & 15 deletions

File tree

PWGLF/Tasks/QC/mcParticlePrediction.cxx

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ static const std::vector<std::string> parameterNames{"Enable"};
5959
static constexpr int nParameters = 1;
6060
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}, {0}, {0}, {0}, {0}};
6161
bool enabledParticlesArray[PIDExtended::NIDsTot];
62-
6362
static constexpr bool isResonance(PIDExtended::ID id)
6463
{
6564
return id == PIDExtended::Phi ||
@@ -81,18 +80,18 @@ struct Estimators {
8180
static constexpr estID FDDAC = 6;
8281
static constexpr estID ZNA = 7;
8382
static constexpr estID ZNC = 8;
84-
// static constexpr estID ZEM1 = 9;
85-
// static constexpr estID ZEM2 = 10;
86-
// static constexpr estID ZPA = 11;
87-
// static constexpr estID ZPC = 12;
88-
static constexpr estID ITSIB = 9;
89-
static constexpr estID ETA05 = 10;
90-
static constexpr estID ETA08 = 11;
91-
static constexpr estID V0A = 12; // (Run2)
92-
static constexpr estID V0C = 13; // (Run2)
93-
static constexpr estID V0AC = 14; // (Run2 V0M)
94-
static constexpr estID ImpactParameter = 15; // (Run2 V0M)
95-
static constexpr estID nEstimators = 16;
83+
static constexpr estID ZEM1 = 9;
84+
static constexpr estID ZEM2 = 10;
85+
static constexpr estID ZPA = 11;
86+
static constexpr estID ZPC = 12;
87+
static constexpr estID ITSIB = 13;
88+
static constexpr estID ETA05 = 14;
89+
static constexpr estID ETA08 = 15;
90+
static constexpr estID V0A = 16; // (Run2)
91+
static constexpr estID V0C = 17; // (Run2)
92+
static constexpr estID V0AC = 18; // (Run2 V0M)
93+
static constexpr estID ImpactParameter = 19; // (Run2 V0M)
94+
static constexpr estID nEstimators = 20;
9695

9796
static constexpr const char* estimatorNames[nEstimators] = {"FT0A",
9897
"FT0C",
@@ -103,6 +102,10 @@ struct Estimators {
103102
"FDDAC",
104103
"ZNA",
105104
"ZNC",
105+
"ZEM1",
106+
"ZEM2",
107+
"ZPA",
108+
"ZPC",
106109
"ITSIB",
107110
"ETA05",
108111
"ETA08",
@@ -132,6 +135,10 @@ static const int defaultEstimators[Estimators::nEstimators][nParameters]{{0}, /
132135
{0}, // FDDAC
133136
{0}, // ZNA
134137
{0}, // ZNC
138+
{0}, // ZEM1
139+
{0}, // ZEM2
140+
{0}, // ZPA
141+
{0}, // ZPC
135142
{0}, // ITSIB
136143
{0}, // ETA05
137144
{0}, // ETA08
@@ -477,6 +484,18 @@ struct McParticlePrediction {
477484
if (enabledEstimatorsArray[Estimators::ZNC]) {
478485
nMult[Estimators::ZNC] = mCounter.countZNC(mcParticles);
479486
}
487+
if (enabledEstimatorsArray[Estimators::ZEM1]) {
488+
nMult[Estimators::ZEM1] = 0; // Not implemented yet
489+
}
490+
if (enabledEstimatorsArray[Estimators::ZEM2]) {
491+
nMult[Estimators::ZEM2] = 0; // Not implemented yet
492+
}
493+
if (enabledEstimatorsArray[Estimators::ZPA]) {
494+
nMult[Estimators::ZPA] = 0; // Not implemented yet
495+
}
496+
if (enabledEstimatorsArray[Estimators::ZPC]) {
497+
nMult[Estimators::ZPC] = 0; // Not implemented yet
498+
}
480499
if (enabledEstimatorsArray[Estimators::ITSIB] || enableVsITSHistograms) {
481500
nMult[Estimators::ITSIB] = mCounter.countITSIB(mcParticles);
482501
}
@@ -580,7 +599,7 @@ struct McParticlePrediction {
580599
histos.fill(HIST("particles/y/undefined"), particle.y());
581600
}
582601

583-
if (std::abs(particle.pt()) < ptCut.value) { // Fill the eta and rapidity histograms only for particles above the pt cut
602+
if (std::abs(particle.pt()) > ptCut.value) { // Fill the eta and rapidity histograms only for particles above the pt cut
584603
for (int i = 0; i < Estimators::nEstimators; i++) {
585604
if (!enabledEstimatorsArray[i]) {
586605
continue;
@@ -794,4 +813,4 @@ struct McParticlePrediction {
794813
PROCESS_SWITCH(McParticlePrediction, processReco, "Process the reco info", true);
795814
};
796815

797-
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask<McParticlePrediction>(cfgc)}; }
816+
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask<McParticlePrediction>(cfgc)}; }

0 commit comments

Comments
 (0)