Skip to content

Commit 9483d01

Browse files
committed
Fix missing initialisation
1 parent c20e574 commit 9483d01

36 files changed

+148
-148
lines changed

PWGHF/Core/HfHelper.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ class HfHelper
290290
auto cosPiKPhiRestFrame(const T& candidate, int option)
291291
{
292292
// Ported from AliAODRecoDecayHF3Prong::CosPiKPhiRFrame
293-
std::array<float, 3> momPi;
294-
std::array<float, 3> momK1;
295-
std::array<float, 3> momK2;
293+
std::array<float, 3> momPi{};
294+
std::array<float, 3> momK1{};
295+
std::array<float, 3> momK2{};
296296

297297
if (option == 0) { // KKPi
298298
momPi = candidate.pVectorProng2();

PWGHF/D2H/Macros/HFInvMassFitter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class HFInvMassFitter : public TNamed
7373
if (mHistoInvMass) {
7474
delete mHistoInvMass;
7575
}
76-
mHistoInvMass = static_cast<TH1*>(histoToFit->Clone("mHistoInvMass"));
76+
mHistoInvMass = dynamic_cast<TH1*>(histoToFit->Clone("mHistoInvMass"));
7777
mHistoInvMass->SetDirectory(0);
7878
}
7979
void setUseLikelihoodFit() { mFitOption = "L,E"; }
@@ -193,7 +193,7 @@ class HFInvMassFitter : public TNamed
193193
if (!histoRefl) {
194194
mEnableReflections = kFALSE;
195195
}
196-
mHistoTemplateRefl = static_cast<TH1*>(histoRefl->Clone("mHistoTemplateRefl"));
196+
mHistoTemplateRefl = dynamic_cast<TH1*>(histoRefl->Clone("mHistoTemplateRefl"));
197197
}
198198
void setDrawBgPrefit(Bool_t value = true) { mDrawBgPrefit = value; }
199199
void setHighlightPeakRegion(Bool_t value = true) { mHighlightPeakRegion = value; }

PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ struct HfDataCreatorCharmHadPiReduced {
210210
// CCDB service
211211
Service<o2::ccdb::BasicCCDBManager> ccdb;
212212
o2::base::Propagator::MatCorrType noMatCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
213-
int runNumber;
213+
int runNumber{};
214214

215215
// O2DatabasePDG service
216216
Service<o2::framework::O2DatabasePDG> pdg;
@@ -626,7 +626,7 @@ struct HfDataCreatorCharmHadPiReduced {
626626
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(particlesMc, std::array{vecDaughtersB[0], vecDaughtersB[1], vecDaughtersB[2]}, -Pdg::kDS, std::array{-kKPlus, +kKPlus, -kPiPlus}, true, &sign, 2);
627627
if (indexRec > -1) {
628628
std::vector<int> arrDaughDsIndex;
629-
std::array<int, 2> arrPDGDaughDs;
629+
std::array<int, 2> arrPDGDaughDs{};
630630
RecoDecay::getDaughters(particlesMc.rawIteratorAt(indexRec), &arrDaughDsIndex, std::array{0}, 1);
631631
if (arrDaughDsIndex.size() == NDaughtersDs) {
632632
for (auto iProng = 0u; iProng < arrDaughDsIndex.size(); ++iProng) {
@@ -663,7 +663,7 @@ struct HfDataCreatorCharmHadPiReduced {
663663
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(particlesMc, std::array{vecDaughtersB[0], vecDaughtersB[1], vecDaughtersB[2]}, -Pdg::kDS, std::array{-kKPlus, +kKPlus, -kPiPlus}, true, &sign, 2);
664664
if (indexRec > -1) {
665665
std::vector<int> arrDaughDsIndex;
666-
std::array<int, 2> arrPDGDaughDs;
666+
std::array<int, 2> arrPDGDaughDs{};
667667
RecoDecay::getDaughters(particlesMc.rawIteratorAt(indexRec), &arrDaughDsIndex, std::array{0}, 1);
668668
if (arrDaughDsIndex.size() == NDaughtersDs) {
669669
for (auto iProng = 0u; iProng < arrDaughDsIndex.size(); ++iProng) {
@@ -688,7 +688,7 @@ struct HfDataCreatorCharmHadPiReduced {
688688
indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(particlesMc, std::array{vecDaughtersB[0], vecDaughtersB[1], vecDaughtersB[2]}, -Pdg::kDS, std::array{-kKPlus, +kKPlus, -kPiPlus}, true, &sign, 2);
689689
if (indexRec > -1) {
690690
std::vector<int> arrDaughDsIndex;
691-
std::array<int, 2> arrPDGDaughDs;
691+
std::array<int, 2> arrPDGDaughDs{};
692692
RecoDecay::getDaughters(particlesMc.rawIteratorAt(indexRec), &arrDaughDsIndex, std::array{0}, 1);
693693
if (arrDaughDsIndex.size() == NDaughtersDs) {
694694
for (auto iProng = 0u; iProng < arrDaughDsIndex.size(); ++iProng) {
@@ -1545,9 +1545,9 @@ struct HfDataCreatorCharmHadPiReduced {
15451545
auto yParticle = RecoDecay::y(particle.pVector(), massB);
15461546
auto etaParticle = particle.eta();
15471547

1548-
std::array<float, 2> ptProngs;
1549-
std::array<float, 2> yProngs;
1550-
std::array<float, 2> etaProngs;
1548+
std::array<float, 2> ptProngs{};
1549+
std::array<float, 2> yProngs{};
1550+
std::array<float, 2> etaProngs{};
15511551
int counter = 0;
15521552
for (const auto& daught : particle.daughters_as<aod::McParticles>()) {
15531553
ptProngs[counter] = daught.pt();
@@ -1565,7 +1565,7 @@ struct HfDataCreatorCharmHadPiReduced {
15651565
auto candCMC = particlesMc.rawIteratorAt(particle.daughtersIds().front());
15661566
if (RecoDecay::isMatchedMCGen(particlesMc, candCMC, -static_cast<int>(Pdg::kDS), std::array{-kKPlus, +kKPlus, -kPiPlus}, true, &sign, 2)) {
15671567
std::vector<int> arrDaughDsIndex;
1568-
std::array<int, 2> arrPDGDaughDs;
1568+
std::array<int, 2> arrPDGDaughDs{};
15691569
RecoDecay::getDaughters(candCMC, &arrDaughDsIndex, std::array{0}, 1);
15701570
if (arrDaughDsIndex.size() == NDaughtersDs) {
15711571
for (auto jProng = 0u; jProng < arrDaughDsIndex.size(); ++jProng) {
@@ -1591,7 +1591,7 @@ struct HfDataCreatorCharmHadPiReduced {
15911591
auto candCMC = particlesMc.rawIteratorAt(particle.daughtersIds().front());
15921592
if (RecoDecay::isMatchedMCGen(particlesMc, candCMC, -static_cast<int>(Pdg::kDS), std::array{-kKPlus, +kKPlus, -kPiPlus}, true, &sign, 2)) {
15931593
std::vector<int> arrDaughDsIndex;
1594-
std::array<int, 2> arrPDGDaughDs;
1594+
std::array<int, 2> arrPDGDaughDs{};
15951595
RecoDecay::getDaughters(candCMC, &arrDaughDsIndex, std::array{0}, 1);
15961596
if (arrDaughDsIndex.size() == NDaughtersDs) {
15971597
for (auto jProng = 0u; jProng < arrDaughDsIndex.size(); ++jProng) {
@@ -1620,9 +1620,9 @@ struct HfDataCreatorCharmHadPiReduced {
16201620
auto yParticle = RecoDecay::y(particle.pVector(), massB);
16211621
auto etaParticle = particle.eta();
16221622

1623-
std::array<float, 2> ptProngs;
1624-
std::array<float, 2> yProngs;
1625-
std::array<float, 2> etaProngs;
1623+
std::array<float, 2> ptProngs{};
1624+
std::array<float, 2> yProngs{};
1625+
std::array<float, 2> etaProngs{};
16261626
int counter = 0;
16271627
for (const auto& daught : particle.daughters_as<aod::McParticles>()) {
16281628
ptProngs[counter] = daught.pt();
@@ -1653,9 +1653,9 @@ struct HfDataCreatorCharmHadPiReduced {
16531653
auto yParticle = RecoDecay::y(particle.pVector(), massB);
16541654
auto etaParticle = particle.eta();
16551655

1656-
std::array<float, 2> ptProngs;
1657-
std::array<float, 2> yProngs;
1658-
std::array<float, 2> etaProngs;
1656+
std::array<float, 2> ptProngs{};
1657+
std::array<float, 2> yProngs{};
1658+
std::array<float, 2> etaProngs{};
16591659
int counter = 0;
16601660
for (const auto& daught : particle.daughters_as<aod::McParticles>()) {
16611661
ptProngs[counter] = daught.pt();
@@ -1686,9 +1686,9 @@ struct HfDataCreatorCharmHadPiReduced {
16861686
auto yParticle = RecoDecay::y(particle.pVector(), massB);
16871687
auto etaParticle = particle.eta();
16881688

1689-
std::array<float, 2> ptProngs;
1690-
std::array<float, 2> yProngs;
1691-
std::array<float, 2> etaProngs;
1689+
std::array<float, 2> ptProngs{};
1690+
std::array<float, 2> yProngs{};
1691+
std::array<float, 2> etaProngs{};
16921692
int counter = 0;
16931693
for (const auto& daught : particle.daughters_as<aod::McParticles>()) {
16941694
ptProngs[counter] = daught.pt();
@@ -1719,9 +1719,9 @@ struct HfDataCreatorCharmHadPiReduced {
17191719
auto yParticle = RecoDecay::y(particle.pVector(), massB);
17201720
auto etaParticle = particle.eta();
17211721

1722-
std::array<float, 2> ptProngs;
1723-
std::array<float, 2> yProngs;
1724-
std::array<float, 2> etaProngs;
1722+
std::array<float, 2> ptProngs{};
1723+
std::array<float, 2> yProngs{};
1724+
std::array<float, 2> etaProngs{};
17251725
int counter = 0;
17261726
for (const auto& daught : particle.daughters_as<aod::McParticles>()) {
17271727
ptProngs[counter] = daught.pt();

PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ struct HfDataCreatorCharmResoReduced {
203203
int runNumber{0}; // needed to detect if the run changed and trigger update of calibrations etc.
204204

205205
// material correction for track propagation
206-
o2::base::MatLayerCylSet* lut;
206+
o2::base::MatLayerCylSet* lut{};
207207
o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
208208

209209
// O2DatabasePDG service
@@ -228,7 +228,7 @@ struct HfDataCreatorCharmResoReduced {
228228
float mK0Short;
229229
float mLambda;
230230
uint8_t v0Type;
231-
} candidateV0;
231+
} candidateV0{};
232232

233233
struct {
234234
float invMassD;
@@ -241,7 +241,7 @@ struct HfDataCreatorCharmResoReduced {
241241
std::array<float, 3> pVectorProng0;
242242
std::array<float, 3> pVectorProng1;
243243
std::array<float, 3> pVectorProng2;
244-
} varUtils;
244+
} varUtils{};
245245

246246
// Dplus
247247
using CandsDplusFiltered = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi>>;
@@ -449,7 +449,7 @@ struct HfDataCreatorCharmResoReduced {
449449
if (!selectV0Daughter(trackPos, dDaughtersIds) || !selectV0Daughter(trackNeg, dDaughtersIds))
450450
return false;
451451
// daughters DCA to V0's collision primary vertex
452-
std::array<float, 2> dcaInfo;
452+
std::array<float, 2> dcaInfo{};
453453
auto trackPosPar = getTrackPar(trackPos);
454454
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, trackPosPar, 2.f, fitter.getMatCorrType(), &dcaInfo);
455455
auto trackPosDcaXY = dcaInfo[0];
@@ -1027,8 +1027,8 @@ struct HfDataCreatorCharmResoReduced {
10271027
for (const auto& candD : candsD) {
10281028
// initialize variables depending on D meson type
10291029
bool fillHfCandD = false;
1030-
std::array<float, 3> secondaryVertexD;
1031-
std::array<int, 3> prongIdsD;
1030+
std::array<float, 3> secondaryVertexD{};
1031+
std::array<int, 3> prongIdsD{};
10321032
std::array<float, 6> bdtScores = {-1.f, -1.f, -1.f, -1.f, -1.f, -1.f};
10331033
std::vector<std::decay_t<typename TrIU::iterator>> charmHadDauTracks{};
10341034
varUtils.ptD = candD.pt();
@@ -1152,7 +1152,7 @@ struct HfDataCreatorCharmResoReduced {
11521152
// propagate V0 to primary vertex (if enabled)
11531153
if (propagateV0toPV) {
11541154
std::array<float, 3> pVecV0Orig = {candidateV0.mom[0], candidateV0.mom[1], candidateV0.mom[2]};
1155-
std::array<float, 2> dcaInfo;
1155+
std::array<float, 2> dcaInfo{};
11561156
auto trackParK0 = o2::track::TrackPar(candidateV0.pos, pVecV0Orig, 0, true);
11571157
trackParK0.setPID(o2::track::PID::K0);
11581158
trackParK0.setAbsCharge(0);
@@ -1694,9 +1694,9 @@ struct HfDataCreatorCharmResoReduced {
16941694
auto yParticle = RecoDecay::y(particle.pVector(), invMassGen);
16951695
auto etaParticle = particle.eta();
16961696

1697-
std::array<float, 2> ptProngs;
1698-
std::array<float, 2> yProngs;
1699-
std::array<float, 2> etaProngs;
1697+
std::array<float, 2> ptProngs{};
1698+
std::array<float, 2> yProngs{};
1699+
std::array<float, 2> etaProngs{};
17001700
int counter = 0;
17011701
for (const auto& daught : particle.template daughters_as<McParticles>()) {
17021702
ptProngs[counter] = daught.pt();

PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ struct HfDataCreatorJpsiHadReduced {
207207
PresliceUnsorted<CollisionsWCMcLabels> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
208208

209209
o2::base::Propagator::MatCorrType noMatCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
210-
int runNumber;
210+
int runNumber{};
211211
double bz{0.};
212-
double invMass2JpsiHadMin, invMass2JpsiHadMax;
212+
double invMass2JpsiHadMin{}, invMass2JpsiHadMax{};
213213
bool isHfCandBhadConfigFilled = false;
214214

215215
o2::hf_evsel::HfEventSelection hfEvSel;
@@ -658,9 +658,9 @@ struct HfDataCreatorJpsiHadReduced {
658658
auto yParticle = RecoDecay::y(particle.pVector(), MassBPlus);
659659
auto etaParticle = particle.eta();
660660

661-
std::array<float, 2> ptProngs;
662-
std::array<float, 2> yProngs;
663-
std::array<float, 2> etaProngs;
661+
std::array<float, 2> ptProngs{};
662+
std::array<float, 2> yProngs{};
663+
std::array<float, 2> etaProngs{};
664664
int counter = 0;
665665
for (const auto& daught : particle.daughters_as<aod::McParticles>()) {
666666
ptProngs[counter] = daught.pt();
@@ -698,9 +698,9 @@ struct HfDataCreatorJpsiHadReduced {
698698
auto yParticle = RecoDecay::y(particle.pVector(), MassBPlus);
699699
auto etaParticle = particle.eta();
700700

701-
std::array<float, 2> ptProngs;
702-
std::array<float, 2> yProngs;
703-
std::array<float, 2> etaProngs;
701+
std::array<float, 2> ptProngs{};
702+
std::array<float, 2> yProngs{};
703+
std::array<float, 2> etaProngs{};
704704
int counter = 0;
705705
for (const auto& daught : particle.daughters_as<aod::McParticles>()) {
706706
ptProngs[counter] = daught.pt();

PWGHF/D2H/Tasks/taskB0.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ struct HfTaskB0 {
290290
continue;
291291
}
292292

293-
std::array<float, 2> ptProngs;
294-
std::array<float, 2> yProngs;
295-
std::array<float, 2> etaProngs;
293+
std::array<float, 2> ptProngs{};
294+
std::array<float, 2> yProngs{};
295+
std::array<float, 2> etaProngs{};
296296
int counter = 0;
297297
for (const auto& daught : particle.daughters_as<aod::McParticles>()) {
298298
ptProngs[counter] = daught.pt();

PWGHF/D2H/Tasks/taskBs.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,9 @@ struct HfTaskBs {
287287
continue;
288288
}
289289

290-
std::array<float, 2> ptProngs;
291-
std::array<float, 2> yProngs;
292-
std::array<float, 2> etaProngs;
290+
std::array<float, 2> ptProngs{};
291+
std::array<float, 2> yProngs{};
292+
std::array<float, 2> etaProngs{};
293293
int counter = 0;
294294
for (const auto& daught : particle.daughters_as<aod::McParticles>()) {
295295
ptProngs[counter] = daught.pt();

PWGHF/D2H/Tasks/taskDs.cxx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ struct HfTaskDs {
166166
ConfigurableAxis axisOccupancy{"axisOccupancy", {14, 0., 14000.}, "axis for occupancy"};
167167

168168
int mRunNumber{0};
169-
bool lCalibLoaded;
170-
TList* lCalibObjects;
171-
TProfile* hVtxZFT0A;
172-
TProfile* hVtxZFT0C;
173-
TProfile* hVtxZNTracks;
169+
bool lCalibLoaded{};
170+
TList* lCalibObjects{};
171+
TProfile* hVtxZFT0A{};
172+
TProfile* hVtxZFT0C{};
173+
TProfile* hVtxZNTracks{};
174174

175175
HistogramRegistry registry{"registry", {}};
176176

@@ -844,9 +844,9 @@ struct HfTaskDs {
844844

845845
if (lCalibObjects) {
846846
LOG(info) << "CCDB objects loaded successfully";
847-
hVtxZFT0A = static_cast<TProfile*>(lCalibObjects->FindObject("hVtxZFT0A"));
848-
hVtxZFT0C = static_cast<TProfile*>(lCalibObjects->FindObject("hVtxZFT0C"));
849-
hVtxZNTracks = static_cast<TProfile*>(lCalibObjects->FindObject("hVtxZNTracksPV"));
847+
hVtxZFT0A = dynamic_cast<TProfile*>(lCalibObjects->FindObject("hVtxZFT0A"));
848+
hVtxZFT0C = dynamic_cast<TProfile*>(lCalibObjects->FindObject("hVtxZFT0C"));
849+
hVtxZNTracks = dynamic_cast<TProfile*>(lCalibObjects->FindObject("hVtxZNTracksPV"));
850850
lCalibLoaded = true;
851851
// Capture error
852852
if (!hVtxZFT0A || !hVtxZFT0C || !hVtxZNTracks) {
@@ -909,9 +909,9 @@ struct HfTaskDs {
909909

910910
if (lCalibObjects) {
911911
LOG(info) << "CCDB objects loaded successfully";
912-
hVtxZFT0A = static_cast<TProfile*>(lCalibObjects->FindObject("hVtxZFT0A"));
913-
hVtxZFT0C = static_cast<TProfile*>(lCalibObjects->FindObject("hVtxZFT0C"));
914-
hVtxZNTracks = static_cast<TProfile*>(lCalibObjects->FindObject("hVtxZNTracksPV"));
912+
hVtxZFT0A = dynamic_cast<TProfile*>(lCalibObjects->FindObject("hVtxZFT0A"));
913+
hVtxZFT0C = dynamic_cast<TProfile*>(lCalibObjects->FindObject("hVtxZFT0C"));
914+
hVtxZNTracks = dynamic_cast<TProfile*>(lCalibObjects->FindObject("hVtxZNTracksPV"));
915915
lCalibLoaded = true;
916916
// Capture error
917917
if (!hVtxZFT0A || !hVtxZFT0C || !hVtxZNTracks) {

PWGHF/D2H/Tasks/taskSigmac.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ struct HfTaskSigmac {
6565
Configurable<bool> addSoftPiDcaToSigmacSparse{"addSoftPiDcaToSigmacSparse", false, "enable the filling of sof-pion dcaXY, dcaZ in the Σc0,++ THnSparse"};
6666

6767
HfHelper hfHelper;
68-
bool isMc;
68+
bool isMc{};
6969
static constexpr std::size_t NDaughters{2u};
7070

7171
using RecoLc = soa::Join<aod::HfCand3Prong, aod::HfSelLc>;

PWGHF/D2H/Tasks/taskXicToXiPiPi.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -518,12 +518,12 @@ struct HfTaskXicToXiPiPi {
518518
}
519519

520520
// get kinematic variables of Ξ π π
521-
std::array<float, 3> ptProngs;
522-
std::array<float, 3> yProngs;
523-
std::array<float, 3> etaProngs;
524-
std::array<float, 3> prodVtxXProngs;
525-
std::array<float, 3> prodVtxYProngs;
526-
std::array<float, 3> prodVtxZProngs;
521+
std::array<float, 3> ptProngs{};
522+
std::array<float, 3> yProngs{};
523+
std::array<float, 3> etaProngs{};
524+
std::array<float, 3> prodVtxXProngs{};
525+
std::array<float, 3> prodVtxYProngs{};
526+
std::array<float, 3> prodVtxZProngs{};
527527
int counter = 0;
528528
RecoDecay::getDaughters(particle, &arrDaughIndex, std::array{+kXiMinus, +kPiPlus, +kPiPlus}, 2);
529529
for (auto iProng = 0u; iProng < arrDaughIndex.size(); ++iProng) {

0 commit comments

Comments
 (0)