fix code-checker errors and warnings

Author: Stefanie Mrozinski

PWGEM/PhotonMeson/DataModel/gammaTables.h

@@ -301,7 +301,7 @@ DECLARE_SOA_COLUMN(Z, z, float);                 //! z (cm), TPC-only legs after
 DECLARE_SOA_COLUMN(Snp, snp, float);             //! sin(phi) in the local frame
 DECLARE_SOA_COLUMN(Tgl, tgl, float);             //! tan(lambda)
 DECLARE_SOA_COLUMN(Signed1Pt, signed1Pt, float); //! q/pT (c/GeV)
-DECLARE_SOA_COLUMN(Cov, cov, float[15]);         //! covariance matrix, o2::track::TrackParCov order
+DECLARE_SOA_COLUMN(Cov, cov, float[15]);         // NOLINT(modernize-avoid-c-arrays) //! covariance matrix, o2::track::TrackParCov order
 } // namespace v0legcov
 
 // leg track parameters as used in the V0 fit, one row per V0Legs row (optional builder output, joinable with V0Legs)

PWGEM/PhotonMeson/TableProducer/photonMixedEventProducer.cxx

@@ -303,7 +303,7 @@ struct PhotonMixedEventProducer {
     c.snp = legCov.snp();
     c.tgl = legCov.tgl();
     c.signed1Pt = legCov.signed1Pt();
-    const auto* cov = legCov.cov();
+    const auto& cov = legCov.cov();
     for (size_t i = 0; i < c.cov.size(); ++i) {
       c.cov[i] = cov[i];
     }
@@ -391,8 +391,8 @@ struct PhotonMixedEventProducer {
         registry.fill(HIST("Mix/hPhotonPtEta"), type, std::hypot(p->px, p->py), std::asinh(p->pz / std::hypot(p->px, p->py)));
       }
       for (const auto& l : p->legs) {
-        const bool hasITS = l.detectorMap & o2::aod::track::ITS;
-        const bool hasTPC = l.detectorMap & o2::aod::track::TPC;
+        const bool hasITS = (l.detectorMap & o2::aod::track::ITS) != 0;
+        const bool hasTPC = (l.detectorMap & o2::aod::track::TPC) != 0;
         registry.fill(HIST("Mix/hLegTypes"), type, hasITS && hasTPC ? 0.f : (hasTPC ? 1.f : (hasITS ? 2.f : 3.f)));
         writeLeg(l, *p);
       }

PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h

@@ -64,7 +64,7 @@
 #include <MathUtils/Primitive2D.h>
 #include <ReconstructionDataFormats/HelixHelper.h>
 #include <ReconstructionDataFormats/PID.h>
-#include <ReconstructionDataFormats/TrackParametrization.h>
+#include <ReconstructionDataFormats/Track.h>
 
 #include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
 #include <Math/Vector4Dfwd.h>
@@ -87,6 +87,7 @@
 #include <map>
 #include <numeric>
 #include <optional>
+#include <ratio>
 #include <set>
 #include <string>
 #include <tuple>
@@ -201,17 +202,17 @@ struct PairFit {
 struct SourcePV {
   float x = 0.f, y = 0.f, z = 0.f, cXX = 0.f, cXY = 0.f, cXZ = 0.f, cYY = 0.f, cYZ = 0.f, cZZ = 0.f, c2 = 0.f;
   uint16_t nContrib = 0;
-  float posX() const { return x; }
-  float posY() const { return y; }
-  float posZ() const { return z; }
-  float covXX() const { return cXX; }
-  float covXY() const { return cXY; }
-  float covXZ() const { return cXZ; }
-  float covYY() const { return cYY; }
-  float covYZ() const { return cYZ; }
-  float covZZ() const { return cZZ; }
-  float chi2() const { return c2; }
-  uint16_t numContrib() const { return nContrib; }
+  [[nodiscard]] float posX() const { return x; }
+  [[nodiscard]] float posY() const { return y; }
+  [[nodiscard]] float posZ() const { return z; }
+  [[nodiscard]] float covXX() const { return cXX; }
+  [[nodiscard]] float covXY() const { return cXY; }
+  [[nodiscard]] float covXZ() const { return cXZ; }
+  [[nodiscard]] float covYY() const { return cYY; }
+  [[nodiscard]] float covYZ() const { return cYZ; }
+  [[nodiscard]] float covZZ() const { return cZZ; }
+  [[nodiscard]] float chi2() const { return c2; }
+  [[nodiscard]] uint16_t numContrib() const { return nContrib; }
 };
 
 struct LegDcaKey {
@@ -1853,7 +1854,7 @@ struct PhotonConversionBuilder {
     };
     const auto tglLess = [](const FinderLeg& c, float v) { return c.tgl < v; };
     // time-binning of the negative legs: the time window of a positive leg is intersected with the time windows of the negative legs in the same bin. Reason for implementation:  faster than checking all negative legs for each positive leg
-    const bool timeBinned = !(isMC && mDiag != nullptr) && !eleLegs.empty();
+    const bool timeBinned = (!isMC || mDiag == nullptr) && !eleLegs.empty();
     std::vector<std::vector<uint32_t>> eleInBin;
     double tBin0 = 0.;
     const double binWidth = 5000.; // ns
@@ -2975,7 +2976,7 @@ struct PhotonConversionBuilder {
         if (q >= 0.2f) { // o2-linter: disable=magic-number (diagnostic range)
           continue;
         }
-        const float nIts = static_cast<float>(a.posMC.its + a.eleMC.its + b.posMC.its + b.eleMC.its);
+        const auto nIts = static_cast<float>(a.posMC.its + a.eleMC.its + b.posMC.its + b.eleMC.its);
         const float amb = (candLegs.contains({colId, a.posRow, b.eleRow}) || candLegs.contains({colId, b.posRow, a.eleRow})) ? 1.f : 0.f;
         const float cls = mixPairClass(a, b);
         registry.fill(HIST("Mixed/Pairs/hFakeClass"), type, stage, 0.f, q, nIts, amb);
@@ -3082,7 +3083,7 @@ struct PhotonConversionBuilder {
           continue;
         }
         const float q = qInv(a.px, a.py, a.pz, b.px, b.py, b.pz);
-        const float truth = static_cast<float>(mixPairTruth(a, b));
+        const auto truth = static_cast<float>(mixPairTruth(a, b));
         if constexpr (after) {
           registry.fill(HIST("Mixed/Pairs/hQAfter"), type, 0.f, q);
           registry.fill(HIST("Mixed/Pairs/hQAfter"), type, truth, q);
@@ -3295,7 +3296,7 @@ struct PhotonConversionBuilder {
     setMixPairLegs(p1, legs.rawIteratorAt(t1.posID), legs.rawIteratorAt(t1.eleID));
     setMixPairLegs(p2, legs.rawIteratorAt(t2.posID), legs.rawIteratorAt(t2.eleID));
     const int relKind = mixRelKind(p1, p2);
-    const float rel = static_cast<float>(relKind);
+    const auto rel = static_cast<float>(relKind);
     const float rel2 = relKind > 0 ? 1.f : 0.f;
     const float s0 = dedup.groupMatchingScoreThreshold.value;
     const float qTrue = qInv(t1.pxAtPV, t1.pyAtPV, t1.pzAtPV, t2.pxAtPV, t2.pyAtPV, t2.pzAtPV);
@@ -3664,7 +3665,7 @@ struct PhotonConversionBuilder {
                                   (pos.sourceEventUid() != ele.sourceEventUid() || pos.mcMotherId() != ele.mcMotherId());
           const float qTwo = twoPhotons ? qInv(pos.mcMotherPx(), pos.mcMotherPy(), pos.mcMotherPz(), ele.mcMotherPx(), ele.mcMotherPy(), ele.mcMotherPz()) : 1.f;
           const float genuineClose = (twoPhotons && qTwo < 0.05f) ? 1.f : 0.f; // o2-linter: disable=magic-number (diagnostic range)
-          const float nITSx = static_cast<float>((pos.hasITS() ? 1 : 0) + (ele.hasITS() ? 1 : 0));
+          const auto nITSx = static_cast<float>((pos.hasITS() ? 1 : 0) + (ele.hasITS() ? 1 : 0));
           if (mixed.prefilterCrossed && !crossedPrefilterCached(ip, ie)) {
             if (mixed.mixedDiagnostics) {
               registry.fill(HIST("Mixed/Decision/hCrossedFit"), type, genuineClose, 1.f, nITSx, std::min(qTwo, 0.0499f));
@@ -3692,7 +3693,7 @@ struct PhotonConversionBuilder {
             };
             const int lenient = trial(FitOptions{.relaxAP = mixed.crossedRelaxAP.value});
             const int run1 = trial(FitOptions{.nonSVertexer = finderLike, .purityGate = finderLike && recovery.runFinder.value});
-            const float nFree = static_cast<float>((pos.sourceV0Id() == -2 ? 1 : 0) + (ele.sourceV0Id() == -2 ? 1 : 0)); // o2-linter: disable=magic-number (pooled free leg)
+            const auto nFree = static_cast<float>((pos.sourceV0Id() == -2 ? 1 : 0) + (ele.sourceV0Id() == -2 ? 1 : 0)); // o2-linter: disable=magic-number (pooled free leg)
             registry.fill(HIST("Mixed/Decision/hFreeLegFit"), type, genuineClose > 0.5f ? 0.f : 1.f, static_cast<float>(std::min(lenient, 1999)), static_cast<float>(std::min(run1, 1999)), nITSx, nFree);
           }
           const int mask = mixed.freeLegRuleMask.value;
@@ -4544,7 +4545,7 @@ struct PhotonConversionBuilder {
             if (pairFate == 3 || pairFate == 4) { // o2-linter: disable=magic-number (swap, one crossed stored)
               auto o = crossedOriginOfPair.at(std::minmax(mids[a], mids[b]));
               const int o1 = std::min(o[0], o.size() > 1 ? o[1] : o[0]), o2 = std::max(o[0], o.size() > 1 ? o[1] : o[0]);
-              static constexpr int OriginCode[3][3] = {{0, 1, 3}, {1, 2, 4}, {3, 4, 5}};
+              static constexpr std::array<std::array<int, 3>, 3> OriginCode{{{0, 1, 3}, {1, 2, 4}, {3, 4, 5}}};
               if (hA < hB) {
                 std::swap(hA, hB);
               }

PWGEM/PhotonMeson/Tasks/photonhbt.cxx

@@ -4558,7 +4558,7 @@ struct Photonhbt {
       return;
     }
     const float clean = std::max({a.pos.sharedFrac, a.ele.sharedFrac, b.pos.sharedFrac, b.ele.sharedFrac}) < qaflags.cfgPairClassMaxSharedFrac.value ? 1.f : 0.f;
-    const float cls = static_cast<float>(pcPairClass(a, b));
+    const auto cls = static_cast<float>(pcPairClass(a, b));
     fRegistryPairMC.fill(HIST("PairClass/Pairs/hPairClass"), sample, cls, q, static_cast<float>(pcPairOrigin(a, b)), clean);
     fRegistryPairMC.fill(HIST("PairClass/Pairs/hKtQ"), sample, cls, q, 0.5f * std::hypot(a.px + b.px, a.py + b.py));
     if (cls == 4.f) { // o2-linter: disable=magic-number (half swap)
@@ -4567,7 +4567,7 @@ struct Photonhbt {
           if (x->mpdg == kPcGamma && pcSameMother(*x, *y)) {
             const float src = (x->free && y->free) ? 0.f : (x->free || y->free) ? 3.f
                                                                                 : (x->srcPhoton == y->srcPhoton ? 1.f : 2.f);
-            fRegistryPairMC.fill(HIST("PairClass/Pairs/hHalfSwapLegs"), sample, q, src, static_cast<float>((a.nFree > 0) + (b.nFree > 0)));
+            fRegistryPairMC.fill(HIST("PairClass/Pairs/hHalfSwapLegs"), sample, q, src, static_cast<float>((a.nFree > 0 ? 1 : 0) + (b.nFree > 0 ? 1 : 0)));
           }
         }
       }
@@ -4576,7 +4576,7 @@ struct Photonhbt {
       const float eA = std::sqrt(a.px * a.px + a.py * a.py + a.pz * a.pz), eB = std::sqrt(b.px * b.px + b.py * b.py + b.pz * b.pz);
       fRegistryPairMC.fill(HIST("PairClass/Pairs/hDEQinv"), sample, cls, q, std::fabs(eA - eB), 0.5f * std::hypot(a.px + b.px, a.py + b.py));
     }
-    fRegistryPairMC.fill(HIST("PairClass/Pairs/hFreeLegPair"), sample, cls, q, static_cast<float>((a.nFree > 0) + (b.nFree > 0)), static_cast<float>(!a.original + !b.original));
+    fRegistryPairMC.fill(HIST("PairClass/Pairs/hFreeLegPair"), sample, cls, q, static_cast<float>((a.nFree > 0 ? 1 : 0) + (b.nFree > 0 ? 1 : 0)), static_cast<float>((a.original ? 0 : 1) + (b.original ? 0 : 1)));
     {
       const ROOT::Math::PxPyPzMVector v1(a.px, a.py, a.pz, 0.f), v2(b.px, b.py, b.pz, 0.f);
       const auto sum = v1 + v2;
@@ -4612,7 +4612,7 @@ struct Photonhbt {
     }
     fRegistryPairMC.fill(HIST("PairClass/Pairs/hPairDist"), sample, cls, q, std::hypot(a.vx - b.vx, a.vy - b.vy, a.vz - b.vz), pcTrueDist({&a.pos, &a.ele, &b.pos, &b.ele}));
     ROOT::Math::PxPyPzMVector sum4;
-    const PcLeg* legs4[4] = {&a.pos, &a.ele, &b.pos, &b.ele};
+    const std::array<const PcLeg*, 4> legs4{&a.pos, &a.ele, &b.pos, &b.ele};
     for (const auto* l : legs4) {
       sum4 += ROOT::Math::PxPyPzMVector(l->px, l->py, l->pz, o2::constants::physics::MassElectron);
     }
@@ -4639,7 +4639,7 @@ struct Photonhbt {
     if (q < 0.1f) {
       auto dtgl = [](PcPhoton const& p) { const float ptp = std::hypot(p.pos.px, p.pos.py), pte = std::hypot(p.ele.px, p.ele.py); return (ptp > 0.f && pte > 0.f) ? std::fabs(p.pos.pz / ptp - p.ele.pz / pte) : 0.3f; };
       const float pmin = std::min({std::hypot(a.pos.px, a.pos.py, a.pos.pz), std::hypot(a.ele.px, a.ele.py, a.ele.pz), std::hypot(b.pos.px, b.pos.py, b.pos.pz), std::hypot(b.ele.px, b.ele.py, b.ele.pz)});
-      const float nIts = static_cast<float>((a.pos.its ? 1 : 0) + (a.ele.its ? 1 : 0) + (b.pos.its ? 1 : 0) + (b.ele.its ? 1 : 0));
+      const auto nIts = static_cast<float>((a.pos.its ? 1 : 0) + (a.ele.its ? 1 : 0) + (b.pos.its ? 1 : 0) + (b.ele.its ? 1 : 0));
       fRegistryPairMC.fill(HIST("PairClass/Pairs/hPairLegs"), sample, cls, q, std::min(std::max(dtgl(a), dtgl(b)), 0.299f), std::min(pmin, 0.999f), nIts, static_cast<float>(pcPairOrigin(a, b)));
       constexpr float kTpcRin = 85.f, kTpcRout = 247.f; // o2-linter: disable=magic-number (TPC drift volume, diagnostic)
       auto crossesCE = [&](PcLeg const& l) {
@@ -4753,12 +4753,15 @@ struct Photonhbt {
               default:
                 break;
             }
-            if (pdg == 11 || pdg == 13 || pdg == 22)
+            if (pdg == 11 || pdg == 13 || pdg == 22) {
               return 8.f; // o2-linter: disable=magic-number (leptons, photon: other)
-            if (pdg > 1000)
+            }
+            if (pdg > 1000) {
               return 6.f; // o2-linter: disable=magic-number (baryons)
-            if (pdg < 100)
+            }
+            if (pdg < 100) {
               return 7.f; // o2-linter: disable=magic-number (no hadron mother: quark, gluon, string, cluster, none)
+            }
             return 8.f;
           };
           fRegistryPairMC.fill(HIST("PairClass/Pairs/hBremsAncestry"), sample, cls == 16.f ? 0.f : 1.f, q, ancClass(y->gpdg), ancClass(y->ggpdg), ancClass(y->rootPdg)); // o2-linter: disable=magic-number (class)
@@ -4838,7 +4841,7 @@ struct Photonhbt {
       p.pos = pos;
       p.ele = ele;
       p.svertexer = p.original && posV0 >= 0;
-      p.nFree = (posV0 == -2) + (eleV0 == -2); // o2-linter: disable=magic-number (free-leg stub v0Id of the mixer)
+      p.nFree = (posV0 == -2 ? 1 : 0) + (eleV0 == -2 ? 1 : 0); // o2-linter: disable=magic-number (free-leg stub v0Id of the mixer)
       p.chi2 = photon.chiSquareNDF();
       p.dcaxy = photon.dcaXYtopv();
       p.dcaz = photon.dcaZtopv();
@@ -5298,7 +5301,7 @@ struct Photonhbt {
           fRegistryCF.fill(HIST("Pair/mix/hPhi_lowerPtV0"), (g1.pt() < g2.pt()) ? g1.phi() : g2.phi());
         }
         ndiphoton++;
-        const float origin = static_cast<float>(pcPairOrigin(a, b));
+        const auto origin = static_cast<float>(pcPairOrigin(a, b));
         const float sameSign = pcAlpha(a) * pcAlpha(b) > 0.f ? 1.f : 0.f;
         fRegistry.fill(HIST("CoReco/hPairOrigin"), kSample, origin, obs.qinv, obs.kt, sameSign);
 
@@ -5308,7 +5311,7 @@ struct Photonhbt {
           } else {
             fillMixTruth(collision, pwl1.fIsTruePhoton, pwl2.fIsTruePhoton, obs);
           }
-          const float cls = static_cast<float>(pcPairClass(a, b));
+          const auto cls = static_cast<float>(pcPairClass(a, b));
           const auto q3 = lcmsQ(obs.v1, obs.v2);
           fRegistryPairMC.fill(HIST("CoReco/MC/hClass3D"), kSample, cls, q3[0], q3[1], q3[2], obs.kt);
           fRegistryPairMC.fill(HIST("CoReco/MC/hClassQ"), kSample, cls, obs.qinv, pcTrueQ(a, b), obs.kt);