Skip to content

Commit 34d28dc

Browse files
committed
fix: linter
1 parent 711f00a commit 34d28dc

1 file changed

Lines changed: 13 additions & 11 deletions

File tree

PWGLF/Tasks/Strangeness/nonPromptCascade.cxx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#include <memory>
5252
#include <string>
5353
#include <vector>
54+
#include <map>
55+
#include <algorithm>
5456

5557
using namespace o2;
5658
using namespace o2::framework;
@@ -812,7 +814,7 @@ struct NonPromptCascadeTask {
812814
std::vector<int> mcMult(mcCollisions.size(), 0);
813815
for (auto const& mcp : mcParticles) {
814816
int mcid = mcp.mcCollisionId();
815-
if (mcid < 0 || mcid >= (int)mcMult.size())
817+
if (mcid < 0 || static_cast<size_t>(mcid) >= mcMult.size())
816818
continue;
817819

818820
// apply your primary/eta/charge definition here
@@ -822,7 +824,7 @@ struct NonPromptCascadeTask {
822824
continue;
823825
int q = 0;
824826
if (auto pdg = pdgDB->GetParticle(mcp.pdgCode())) {
825-
q = int(std::round(pdg->Charge() / 3.0));
827+
q = static_cast<int>(std::round(pdg->Charge() / 3.0));
826828
}
827829
if (q == 0)
828830
continue;
@@ -837,14 +839,14 @@ struct NonPromptCascadeTask {
837839
// ------------------------------------------------------------
838840
int maxCollRowId = -1;
839841
for (auto const& trk : tracks) {
840-
maxCollRowId = std::max(maxCollRowId, (int)trk.collisionId());
842+
maxCollRowId = std::max(maxCollRowId, static_cast<int>(trk.collisionId()));
841843
}
842844
std::vector<int> collRowIdToDense(maxCollRowId + 1, -1);
843845

844846
int dense = 0;
845847
for (auto const& col : colls) {
846848
const int collRowId = col.globalIndex(); // row id in aod::Collisions
847-
if (collRowId >= 0 && collRowId < (int)collRowIdToDense.size()) {
849+
if (collRowId >= 0 && static_cast<size_t>(collRowId) < collRowIdToDense.size()) {
848850
collRowIdToDense[collRowId] = dense;
849851
}
850852
++dense;
@@ -859,7 +861,7 @@ struct NonPromptCascadeTask {
859861
continue;
860862
}
861863
const int collRowId = trk.collisionId();
862-
if (collRowId < 0 || collRowId >= (int)collRowIdToDense.size()) {
864+
if (collRowId < 0 || static_cast<size_t>(collRowId) >= collRowIdToDense.size()) {
863865
continue;
864866
}
865867
const int dIdx = collRowIdToDense[collRowId];
@@ -889,7 +891,7 @@ struct NonPromptCascadeTask {
889891

890892
// Map track's collision row id -> dense colls index
891893
const int collRowId = trk.collisionId();
892-
if (collRowId < 0 || collRowId >= (int)collRowIdToDense.size()) {
894+
if (collRowId < 0 || static_cast<size_t>(collRowId) >= collRowIdToDense.size()) {
893895
continue;
894896
}
895897
const int dIdx = collRowIdToDense[collRowId];
@@ -902,14 +904,14 @@ struct NonPromptCascadeTask {
902904

903905
// MC collision id (row index in aod::McCollisions)
904906
const int mcCollId = col.mcCollisionId();
905-
if (mcCollId < 0 || mcCollId >= (int)mcCollisions.size()) {
907+
if (mcCollId < 0 || static_cast<int64_t>(mcCollId) >= mcCollisions.size()) {
906908
continue;
907909
}
908910
mcReconstructed[mcCollId] = 1;
909911

910912
// MC particle id (row index in aod::McParticles)
911913
const int mcPid = trk.mcParticleId();
912-
if (mcPid < 0 || mcPid >= (int)mcParticles.size()) {
914+
if (mcPid < 0 || static_cast<int64_t>(mcPid) >= mcParticles.size()) {
913915
continue;
914916
}
915917

@@ -933,7 +935,7 @@ struct NonPromptCascadeTask {
933935

934936
int q = 0;
935937
if (auto pdgEntry = pdgDB->GetParticle(mcPar.pdgCode())) {
936-
q = int(std::round(pdgEntry->Charge() / 3.0));
938+
q = static_cast<int>(std::round(pdgEntry->Charge() / 3.0));
937939
}
938940
if (q == 0) {
939941
continue;
@@ -953,7 +955,7 @@ struct NonPromptCascadeTask {
953955
// ------------------------------------------------------------
954956
// MC particles with no reco track (iterate by row index)
955957
// ------------------------------------------------------------
956-
for (int pid = 0; pid < (int)mcParticles.size(); ++pid) {
958+
for (int pid = 0; pid < static_cast<int>(mcParticles.size()); ++pid) {
957959
if (!isReco[pid]) {
958960
auto mcp = mcParticles.rawIteratorAt(pid);
959961
mRegistrydNdeta.fill(HIST("hdNdetaRM/hdNdetaRMNotInRecoTrk"), isRecoMult[pid], mcp.pt());
@@ -963,7 +965,7 @@ struct NonPromptCascadeTask {
963965
// ------------------------------------------------------------
964966
// Unreconstructed MC collisions (iterate by row index)
965967
// ------------------------------------------------------------
966-
for (int mcid = 0; mcid < (int)mcCollisions.size(); ++mcid) {
968+
for (int mcid = 0; mcid < static_cast<int>(mcCollisions.size()); ++mcid) {
967969
if (!mcReconstructed[mcid]) {
968970
std::vector<float> mcptvec;
969971
const int mult = mcMult[mcid];

0 commit comments

Comments
 (0)