Skip to content

Commit 06a9abf

Browse files
committed
Fix cppcheck for strangeness derived data
1 parent 4b409a0 commit 06a9abf

File tree

2 files changed

+9
-25
lines changed

2 files changed

+9
-25
lines changed

PWGLF/TableProducer/Strangeness/Converters/stradautracksconverter.cxx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,16 @@ struct stradautracksconverter {
2424
void process(soa::Join<aod::V0Cores, aod::V0Extras, aod::V0TOFs> const& v0s, soa::Join<aod::CascCores, aod::CascExtras, aod::CascTOFs> const& cascs, aod::DauTrackExtras const& dauTracks)
2525
{
2626
// prepare arrays with the relevant information
27-
std::vector<float> lLengths, lTOFSignals, lTOFEvTimes;
28-
lLengths.reserve(dauTracks.size());
29-
lTOFSignals.reserve(dauTracks.size());
30-
lTOFEvTimes.reserve(dauTracks.size());
31-
for (int ii = 0; ii < dauTracks.size(); ii++) {
32-
lLengths[ii] = 1e+6;
33-
lTOFSignals[ii] = -1e+3f;
34-
lTOFEvTimes[ii] = -1e+3f;
35-
}
36-
for (auto& v0 : v0s) {
27+
std::vector<float> lLengths(dauTracks.size(), 1.e+6), lTOFSignals(dauTracks.size(), -1e+3f), lTOFEvTimes(dauTracks.size(), -1e+3f);
28+
for (const auto& v0 : v0s) {
3729
lLengths[v0.posTrackExtraId()] = v0.posTOFLengthToPV();
3830
lTOFSignals[v0.posTrackExtraId()] = v0.posTOFSignal();
3931
lTOFEvTimes[v0.posTrackExtraId()] = v0.posTOFEventTime();
4032
lLengths[v0.negTrackExtraId()] = v0.negTOFLengthToPV();
4133
lTOFSignals[v0.negTrackExtraId()] = v0.negTOFSignal();
4234
lTOFEvTimes[v0.negTrackExtraId()] = v0.negTOFEventTime();
4335
}
44-
for (auto& casc : cascs) {
36+
for (const auto& casc : cascs) {
4537
lLengths[casc.posTrackExtraId()] = casc.posTOFLengthToPV();
4638
lTOFSignals[casc.posTrackExtraId()] = casc.posTOFSignal();
4739
lTOFEvTimes[casc.posTrackExtraId()] = casc.posTOFEventTime();
@@ -52,7 +44,7 @@ struct stradautracksconverter {
5244
lTOFSignals[casc.bachTrackExtraId()] = casc.bachTOFSignal();
5345
lTOFEvTimes[casc.bachTrackExtraId()] = casc.bachTOFEventTime();
5446
}
55-
for (int ii = 0; ii < dauTracks.size(); ii++) {
47+
for (unsigned int ii = 0; ii < dauTracks.size(); ii++) {
5648
dautracktofpids(lTOFSignals[ii], lTOFEvTimes[ii], lLengths[ii]);
5749
}
5850
}

PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter.cxx

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,16 @@ struct stradautrackstofpidconverter {
2424
void process(soa::Join<aod::V0Cores, aod::V0Extras, aod::V0TOFs> const& v0s, soa::Join<aod::CascCores, aod::CascExtras, aod::CascTOFs> const& cascs, aod::DauTrackExtras const& dauTracks)
2525
{
2626
// prepare arrays with the relevant information
27-
std::vector<float> lLengths, lTOFSignals, lTOFEvTimes;
28-
lLengths.reserve(dauTracks.size());
29-
lTOFSignals.reserve(dauTracks.size());
30-
lTOFEvTimes.reserve(dauTracks.size());
31-
for (int ii = 0; ii < dauTracks.size(); ii++) {
32-
lLengths[ii] = 1e+6;
33-
lTOFSignals[ii] = -1e+3f;
34-
lTOFEvTimes[ii] = -1e+3f;
35-
}
36-
for (auto& v0 : v0s) {
27+
std::vector<float> lLengths(dauTracks.size(), 1.e+6), lTOFSignals(dauTracks.size(), -1e+3f), lTOFEvTimes(dauTracks.size(), -1e+3f);
28+
for (const auto& v0 : v0s) {
3729
lLengths[v0.posTrackExtraId()] = v0.posTOFLengthToPV();
3830
lTOFSignals[v0.posTrackExtraId()] = v0.posTOFSignal();
3931
lTOFEvTimes[v0.posTrackExtraId()] = v0.posTOFEventTime();
4032
lLengths[v0.negTrackExtraId()] = v0.negTOFLengthToPV();
4133
lTOFSignals[v0.negTrackExtraId()] = v0.negTOFSignal();
4234
lTOFEvTimes[v0.negTrackExtraId()] = v0.negTOFEventTime();
4335
}
44-
for (auto& casc : cascs) {
36+
for (const auto& casc : cascs) {
4537
lLengths[casc.posTrackExtraId()] = casc.posTOFLengthToPV();
4638
lTOFSignals[casc.posTrackExtraId()] = casc.posTOFSignal();
4739
lTOFEvTimes[casc.posTrackExtraId()] = casc.posTOFEventTime();
@@ -52,7 +44,7 @@ struct stradautrackstofpidconverter {
5244
lTOFSignals[casc.bachTrackExtraId()] = casc.bachTOFSignal();
5345
lTOFEvTimes[casc.bachTrackExtraId()] = casc.bachTOFEventTime();
5446
}
55-
for (int ii = 0; ii < dauTracks.size(); ii++) {
47+
for (unsigned int ii = 0; ii < dauTracks.size(); ii++) {
5648
dautracktofpids(-1, -1, lTOFSignals[ii], lTOFEvTimes[ii], lLengths[ii], 0.0f);
5749
}
5850
}
@@ -62,4 +54,4 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
6254
{
6355
return WorkflowSpec{
6456
adaptAnalysisTask<stradautrackstofpidconverter>(cfgc)};
65-
}
57+
}

0 commit comments

Comments
 (0)