Skip to content

Commit bb8ee4f

Browse files
njacazionjacazio
authored
[PWGLF] Fix codechecker in mcParticlePrediction (#17544)
1 parent 92aa89a commit bb8ee4f

1 file changed

Lines changed: 45 additions & 47 deletions

File tree

‎PWGLF/Tasks/QC/mcParticlePrediction.cxx‎

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ static constexpr std::array<std::array<int, 2>, PIDExtended::NIDsTot>
119119
{0, 1}, // Kshort
120120
{0, 0}, // Xi1530
121121
{0, 0}}}; // Lambda1520
122-
std::array<bool, PIDExtended::NIDsTot> enabledParticlesArray = {false};
123-
std::array<bool, PIDExtended::NIDsTot> selectPrimariesArray = {false};
124-
125122
// Estimators
126123
struct Estimators {
127124
typedef int estID;
@@ -147,26 +144,26 @@ struct Estimators {
147144
static constexpr estID ImpactParameter = 19; // (Run2 V0M)
148145
static constexpr estID nEstimators = 20;
149146

150-
static constexpr const char* estimatorNames[nEstimators] = {"FT0A",
151-
"FT0C",
152-
"FT0AC",
153-
"FV0A",
154-
"FDDA",
155-
"FDDC",
156-
"FDDAC",
157-
"ZNA",
158-
"ZNC",
159-
"ZEM1",
160-
"ZEM2",
161-
"ZPA",
162-
"ZPC",
163-
"ITSIB",
164-
"ETA05",
165-
"ETA08",
166-
"V0A",
167-
"V0C",
168-
"V0AC",
169-
"ImpactParameter"};
147+
static constexpr std::array<const char*, nEstimators> estimatorNames{"FT0A",
148+
"FT0C",
149+
"FT0AC",
150+
"FV0A",
151+
"FDDA",
152+
"FDDC",
153+
"FDDAC",
154+
"ZNA",
155+
"ZNC",
156+
"ZEM1",
157+
"ZEM2",
158+
"ZPA",
159+
"ZPC",
160+
"ITSIB",
161+
"ETA05",
162+
"ETA08",
163+
"V0A",
164+
"V0C",
165+
"V0AC",
166+
"ImpactParameter"};
170167
static std::vector<std::string> arrayNames()
171168
{
172169
static std::vector<std::string> names;
@@ -179,7 +176,6 @@ struct Estimators {
179176
return names;
180177
}
181178
};
182-
std::array<bool, Estimators::nEstimators> enabledEstimatorsArray = {false};
183179
static constexpr std::array<std::array<int, 1>, Estimators::nEstimators>
184180
defaultEstimators{{{0}, // FT0A
185181
{0}, // FT0C
@@ -202,27 +198,6 @@ static constexpr std::array<std::array<int, 1>, Estimators::nEstimators>
202198
{0}, // V0AC (Run2 V0M)
203199
{0}}}; // ImpactParamter
204200

205-
// Histograms
206-
std::array<std::shared_ptr<TH1>, Estimators::nEstimators> hestimators;
207-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsVsITS;
208-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsVsETA05;
209-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsVsETA08;
210-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsVsImpactParameter;
211-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvGenVsReco;
212-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvGenVsReco_BCMC;
213-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvGenVsRecoITS;
214-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsITS;
215-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsRecoITS;
216-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsRecoITS_BCMC;
217-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsFT0A;
218-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsBCId;
219-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvVsBCId;
220-
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hvertexPosZ;
221-
std::array<std::array<std::shared_ptr<TH2>, PIDExtended::NIDsTot>, Estimators::nEstimators> hpt;
222-
std::array<std::array<std::shared_ptr<TH2>, PIDExtended::NIDsTot>, Estimators::nEstimators> hy;
223-
std::array<std::array<std::shared_ptr<TH2>, PIDExtended::NIDsTot>, Estimators::nEstimators> heta;
224-
std::array<std::array<std::shared_ptr<TH1>, PIDExtended::NIDsTot>, Estimators::nEstimators> hyield;
225-
226201
struct McParticlePrediction {
227202

228203
// Histograms
@@ -233,6 +208,29 @@ struct McParticlePrediction {
233208
HistogramRegistry histosEta{"HistosEta", {}, OutputObjHandlingPolicy::AnalysisObject};
234209
HistogramRegistry histosY{"HistosY", {}, OutputObjHandlingPolicy::AnalysisObject};
235210

211+
std::array<bool, PIDExtended::NIDsTot> enabledParticlesArray{false};
212+
std::array<bool, PIDExtended::NIDsTot> selectPrimariesArray{false};
213+
std::array<bool, Estimators::nEstimators> enabledEstimatorsArray{false};
214+
std::array<std::shared_ptr<TH1>, Estimators::nEstimators> hestimators;
215+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsVsITS;
216+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsVsETA05;
217+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsVsETA08;
218+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsVsImpactParameter;
219+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvGenVsReco;
220+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvGenVsReco_BCMC;
221+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvGenVsRecoITS;
222+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsITS;
223+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsRecoITS;
224+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsRecoITS_BCMC;
225+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsFT0A;
226+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvRecoVsBCId;
227+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hestimatorsRecoEvVsBCId;
228+
std::array<std::shared_ptr<TH2>, Estimators::nEstimators> hvertexPosZ;
229+
std::array<std::array<std::shared_ptr<TH2>, PIDExtended::NIDsTot>, Estimators::nEstimators> hpt;
230+
std::array<std::array<std::shared_ptr<TH2>, PIDExtended::NIDsTot>, Estimators::nEstimators> hy;
231+
std::array<std::array<std::shared_ptr<TH2>, PIDExtended::NIDsTot>, Estimators::nEstimators> heta;
232+
std::array<std::array<std::shared_ptr<TH1>, PIDExtended::NIDsTot>, Estimators::nEstimators> hyield;
233+
236234
struct : ConfigurableGroup {
237235
std::string prefix = "Binning"; // JSON group name
238236
ConfigurableAxis binsEta{"binsEta", {100, -20, 20}, "Binning of the Eta axis"};
@@ -253,10 +251,10 @@ struct McParticlePrediction {
253251
} cfgPrediction;
254252

255253
Configurable<LabeledArray<int>> enabledSpecies{"enabledSpecies",
256-
{&defaultParticles[0][0], PIDExtended::NIDsTot, defaultParticles[0].size(), PIDExtended::arrayNames(), {"Enable", "SelectPrimaries"}},
254+
{defaultParticles.front().data(), PIDExtended::NIDsTot, defaultParticles[0].size(), PIDExtended::arrayNames(), {"Enable", "SelectPrimaries"}},
257255
"Particles enabled"};
258256
Configurable<LabeledArray<int>> enabledEstimators{"enabledEstimators",
259-
{&defaultEstimators[0][0], Estimators::nEstimators, defaultEstimators[0].size(), Estimators::arrayNames(), {"Enable"}},
257+
{defaultEstimators.front().data(), Estimators::nEstimators, defaultEstimators[0].size(), Estimators::arrayNames(), {"Enable"}},
260258
"Estimators enabled"};
261259
Configurable<bool> selectInelGt0{"selectInelGt0", true, "Select only inelastic events"};
262260
Configurable<bool> selectPrimariesForMultiplicity{"selectPrimariesForMultiplicity", true, "Select only primary particles for multiplicity computation"};

0 commit comments

Comments
 (0)