Skip to content

Commit 7bb5c29

Browse files
solved linter issues
1 parent c5b0cf1 commit 7bb5c29

1 file changed

Lines changed: 23 additions & 25 deletions

File tree

PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -146,30 +146,30 @@ enum ParticleFlags {
146146
kFromOtherDecays = BIT(4), // from other (weak) decays
147147
};
148148

149-
constexpr double kItsParamsDefault[static_cast<int>(Species::kAllSpecies)][6] = {
149+
constexpr std::array<std::array<double, 6>, static_cast<int>(Species::kAllSpecies)> kItsParamsDefault = {{
150150
{-1.e32, -1.e32, -1.e32, -1.e32, -1.e32, -1.e32}, // He3
151151
{-1.e32, -1.e32, -1.e32, -1.e32, -1.e32, -1.e32} // hadron
152-
};
152+
}};
153153
static const std::vector<std::string> kItsParNames{"p0", "p1", "p2", "res0", "res1", "res2"};
154154

155-
constexpr double kBetheBlochDefault[1][6]{{-1.e32, -1.e32, -1.e32, -1.e32, -1.e32, -1.e32}};
155+
constexpr std::array<std::array<double, 6>, 1> kBetheBlochDefault = {{{-1.e32, -1.e32, -1.e32, -1.e32, -1.e32, -1.e32}}};
156156
static const std::vector<std::string> kBetheBlochParNames{"p0", "p1", "p2", "p3", "p4", "resolution"};
157157

158-
constexpr double kBetheBlochCorrectionDefault[1][6]{{0.0, -1.e32, -1.e32, 0.0, -1.e32, -1.e32}};
158+
constexpr std::array<std::array<double, 6>, 1> kBetheBlochCorrectionDefault = {{{0.0, -1.e32, -1.e32, 0.0, -1.e32, -1.e32}}};
159159
static const std::vector<std::string> kBetheBlochCorrectionParNames{"p0", "p1", "p2", "p3", "p4", "p5"};
160160

161-
constexpr double kDCAxyResDefault[static_cast<int>(Species::kAllSpecies)][4] = {
161+
constexpr std::array<std::array<double, 4>, static_cast<int>(Species::kAllSpecies)> kDCAxyResDefault = {{
162162
{1.09e-4, 0.0011, 0.0065, 1.0399}, // He3
163163
{8.19e-5, 0.004, 0.0026, 1.1741} // Pr
164-
};
165-
constexpr double kDCAzResDefault[static_cast<int>(Species::kAllSpecies)][4] = {
164+
}};
165+
constexpr std::array<std::array<double, 4>, static_cast<int>(Species::kAllSpecies)> kDCAzResDefault = {{
166166
{9.36e-5, 0.0019, 0.0080, 1.416}, // He3
167167
{1.18e-4, 0.0020, 0.0025, 1.3460} // Pr
168-
};
168+
}};
169169
static const std::vector<std::string> kDCAResParNames{"res0", "res1", "res2", "mean"};
170170

171-
constexpr double kHePidTrkPtParamsHeDefault[3] = {0.3101, -0.1759, 0.0262};
172-
constexpr double kHePidTrkPParamsHeDefault[3] = {1.1157, -0.9171, 0.1987};
171+
constexpr std::array<double, 3> kHePidTrkPtParamsHeDefault = {0.3101, -0.1759, 0.0262};
172+
constexpr std::array<double, 3> kHePidTrkPParamsHeDefault = {0., 0., 0.};
173173

174174
} // namespace
175175

@@ -311,13 +311,13 @@ struct he3HadronFemto {
311311
Configurable<std::string> settingGeoPath{"settingGeoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"};
312312
Configurable<std::string> settingPidPath{"settingPidPath", "", "Path to the PID response object"};
313313

314-
Configurable<LabeledArray<double>> settingBetheBlochParams{"settingBetheBlochParams", {kBetheBlochDefault[0], 1, 6, {"He3"}, kBetheBlochParNames}, "TPC Bethe-Bloch parameterisation for He3"};
315-
Configurable<LabeledArray<double>> settingBetheBlochCorrectionParams{"settingBetheBlochCorrectionParams", {kBetheBlochCorrectionDefault[0], 1, 6, {"He3"}, kBetheBlochCorrectionParNames}, "TPC Bethe-Bloch correction parameterisation for He3"};
316-
Configurable<LabeledArray<double>> settingItsParams{"settingItsParams", {kItsParamsDefault[0], 2, 6, {"He3", "Had"}, kItsParNames}, "ITS parameterisation"};
317-
Configurable<LabeledArray<double>> settingDCAxyResParams{"settingDCAxyResParams", {kDCAxyResDefault[0], 2, 4, {"He3", "Had"}, kDCAResParNames}, "DCAxy resolution parameterisation"};
318-
Configurable<LabeledArray<double>> settingDCAzResParams{"settingDCAzResParams", {kDCAzResDefault[0], 2, 4, {"He3", "Had"}, kDCAResParNames}, "DCAz resolution parameterisation"};
319-
Configurable<LabeledArray<double>> settingHePidTrkPtParams{"settingHePidTrkPtParams", {kHePidTrkPtParamsHeDefault, 1, 3, {"He3"}, {"p0", "p1", "p2"}}, "PID in tracking pT dependence for He3"};
320-
Configurable<LabeledArray<double>> settingHePidTrkPParams{"settingHePidTrkPParams", {kHePidTrkPParamsHeDefault, 1, 3, {"He3"}, {"p0", "p1", "p2"}}, "PID in tracking p dependence for He3"};
314+
Configurable<LabeledArray<double>> settingBetheBlochParams{"settingBetheBlochParams", {kBetheBlochDefault[0].data(), 1, 6, {"He3"}, kBetheBlochParNames}, "TPC Bethe-Bloch parameterisation for He3"};
315+
Configurable<LabeledArray<double>> settingBetheBlochCorrectionParams{"settingBetheBlochCorrectionParams", {kBetheBlochCorrectionDefault[0].data(), 1, 6, {"He3"}, kBetheBlochCorrectionParNames}, "TPC Bethe-Bloch correction parameterisation for He3"};
316+
Configurable<LabeledArray<double>> settingItsParams{"settingItsParams", {kItsParamsDefault[0].data(), 2, 6, {"He3", "Had"}, kItsParNames}, "ITS parameterisation"};
317+
Configurable<LabeledArray<double>> settingDCAxyResParams{"settingDCAxyResParams", {kDCAxyResDefault[0].data(), 2, 4, {"He3", "Had"}, kDCAResParNames}, "DCAxy resolution parameterisation"};
318+
Configurable<LabeledArray<double>> settingDCAzResParams{"settingDCAzResParams", {kDCAzResDefault[0].data(), 2, 4, {"He3", "Had"}, kDCAResParNames}, "DCAz resolution parameterisation"};
319+
Configurable<LabeledArray<double>> settingHePidTrkPtParams{"settingHePidTrkPtParams", {kHePidTrkPtParamsHeDefault.data(), 1, 3, {"He3"}, {"p0", "p1", "p2"}}, "PID in tracking pT dependence for He3"};
320+
Configurable<LabeledArray<double>> settingHePidTrkPParams{"settingHePidTrkPParams", {kHePidTrkPParamsHeDefault.data(), 1, 3, {"He3"}, {"p0", "p1", "p2"}}, "PID in tracking p dependence for He3"};
321321

322322
Configurable<bool> settingCompensatePIDinTracking{"settingCompensatePIDinTracking", false, "If true, divide tpcInnerParam by the electric charge"};
323323
Configurable<int> settingMaterialCorrection{"settingMaterialCorrection", static_cast<int>(o2::base::Propagator::MatCorrType::USEMatCorrNONE), "Material correction type"};
@@ -334,24 +334,23 @@ struct he3HadronFemto {
334334
SameKindPair<CollisionsFull, TrackCandidates, BinningType> mPair{binningPolicy, settingNoMixedEvents, -1, &cache};
335335

336336
struct He3HadronParams {
337-
std::array<float, 6> betheBlochParams;
338-
std::array<float, 6> betheBlochCorrectionParams;
337+
std::array<float, 6> betheBlochParams = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
338+
std::array<float, 6> betheBlochCorrectionParams = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
339339
std::array<std::array<float, 6>, static_cast<int>(Species::kAllSpecies)> itsParams;
340340
std::array<std::array<float, 4>, static_cast<int>(Species::kAllSpecies)> dcaxyResParams;
341341
std::array<std::array<float, 4>, static_cast<int>(Species::kAllSpecies)> dcazResParams;
342-
std::array<float, 3> hePidTrkPtParams;
343-
std::array<float, 3> hePidTrkPParams;
342+
std::array<float, 3> hePidTrkPtParams = {0.0f, 0.0f, 0.0f};
343+
std::array<float, 3> hePidTrkPParams = {0.0f, 0.0f, 0.0f};
344344
} mHe3HadronParams;
345345

346346
o2::aod::ITSResponse mResponseITS;
347347

348-
std::vector<int> mRecoCollisionIDs;
349348
std::vector<bool> mGoodCollisions;
350349
std::vector<SVCand> mTrackPairs;
351350
o2::vertexing::DCAFitterN<2> mFitter;
352351
svPoolCreator mSvPoolCreator{He3PDG, ProtonPDG};
353-
int mRunNumber;
354-
float mDbz;
352+
int mRunNumber = 0;
353+
float mDbz = 0.f;
355354
Service<o2::ccdb::BasicCCDBManager> mCcdb;
356355
Zorro mZorro;
357356
OutputObj<ZorroSummary> mZorroSummary{"zorroSummary"};
@@ -1291,7 +1290,6 @@ struct he3HadronFemto {
12911290
}
12921291

12931292
fillHistograms(he3Hadcand, /*isMc*/ true);
1294-
auto collision = collisions.rawIteratorAt(he3Hadcand.collisionID);
12951293
fillTable(he3Hadcand, collision, /*isMC*/ true);
12961294
}
12971295
}

0 commit comments

Comments
 (0)