FU: Fixing O2 linter, MegaLinter and code-checks

Author: kgwizdzi

PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerMCTruthTask.cxx

@@ -42,6 +42,7 @@
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
+#include <set>
 #include <vector>
 
 using namespace o2;
@@ -91,6 +92,9 @@ struct FemtoUniverseProducerMCTruthTask {
 
   RCTFlagsChecker rctChecker;
 
+  static constexpr int kHadElasticScatt = 20;   // kPHElastic - hadronic elastic scattering
+  static constexpr int kHadInelasticScatt = 23; // kPHInhelastic - hadronic inelastic scattering
+
   // Analysis configs
   Configurable<bool> confIsRun3{"confIsRun3", false, "Running on Run3 or pilot"};
   Configurable<std::vector<int>> confPDGCodes{"confPDGCodes", std::vector<int>{211, -211, 2212, -2212, 333}, "PDG of particles to be stored"};
@@ -185,26 +189,25 @@ struct FemtoUniverseProducerMCTruthTask {
     if (col.selection_bit(aod::evsel::kNoSameBunchPileup) && col.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) && col.selection_bit(aod::evsel::kIsVertexITSTPC)) {
       recoCollCuts.fillQA(col);
       return true;
-    } else {
-      return false;
     }
+    return false;
   }
 
   template <typename ParticleType>
-  int getMotherPDG(ParticleType particle)
+  int getMotherPDG(ParticleType const& particle)
   {
     if (particle.isPhysicalPrimary()) {
       return 0;
-    } else if (particle.has_mothers()) {
-      if (particle.getProcess() == 20 || particle.getProcess() == 23) { // treat particles from hadronic scattering (20, 23) as primary
+    }
+    if (particle.has_mothers()) {
+      if (particle.getProcess() == kHadElasticScatt || particle.getProcess() == kHadInelasticScatt) { // treat particles from hadronic scattering (20, 23) as primary
         return 0;
       }
       auto motherparticlesMC = particle.template mothers_as<aod::McParticles>();
-      auto motherparticleMC = motherparticlesMC.front();
+      const auto& motherparticleMC = motherparticlesMC.front();
       return motherparticleMC.pdgCode();
-    } else {
-      return 999;
     }
+    return 999;
   }
 
   template <typename TrackType>

PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx

@@ -316,7 +316,8 @@ struct FemtoUniversePairTaskTrackD0 {
   {
     if (mom <= ConfTrack.minMomPidTpcTofProton) {
       return std::abs(nsigmaTPCPr) < ConfTrack.confNsigmaTPCProton;
-    } else if (mom > ConfTrack.minMomPidTpcTofProton) {
+    }
+    if (mom > ConfTrack.minMomPidTpcTofProton) {
       return std::hypot(nsigmaTOFPr, nsigmaTPCPr) < ConfTrack.confNsigmaCombinedProton;
     }
     return false;
@@ -337,7 +338,8 @@ struct FemtoUniversePairTaskTrackD0 {
   {
     if (mom <= ConfTrack.minMomPidTpcTofKaon) {
       return std::abs(nsigmaTPCKa) < ConfTrack.confNsigmaTPCKaon;
-    } else if (mom > ConfTrack.minMomPidTpcTofKaon) {
+    }
+    if (mom > ConfTrack.minMomPidTpcTofKaon) {
       return std::hypot(nsigmaTOFKa, nsigmaTPCKa) < ConfTrack.confNsigmaCombinedKaon;
     }
     return false;
@@ -358,7 +360,8 @@ struct FemtoUniversePairTaskTrackD0 {
   {
     if (mom <= ConfTrack.minMomPidTpcTofPion) {
       return std::abs(nsigmaTPCPi) < ConfTrack.confNsigmaTPCPion;
-    } else if (mom > ConfTrack.minMomPidTpcTofPion) {
+    }
+    if (mom > ConfTrack.minMomPidTpcTofPion) {
       return std::hypot(nsigmaTOFPi, nsigmaTPCPi) < ConfTrack.confNsigmaCombinedPion;
     }
     return false;
@@ -784,7 +787,7 @@ struct FemtoUniversePairTaskTrackD0 {
       trackHistoPartD0D0bar.fillQA<isMC, false>(d0candidate);
     }
 
-    float tpcNSigmaPr, tofNSigmaPr, tpcNSigmaPi, tofNSigmaPi, tpcNSigmaKa, tofNSigmaKa = 0.;
+    float tpcNSigmaPr = 0.0f, tofNSigmaPr = 0.0f, tpcNSigmaPi = 0.0f, tofNSigmaPi = 0.0f, tpcNSigmaKa = 0.0f, tofNSigmaKa = 0.0f;
 
     if (!ConfTrack.confIsSame) {
       for (auto const& track : groupPartsTrack) {