[PWGLF] Fix clang-tidy findings in the Omega(2012) analysis and ML exporter

Author: Bong-Hwi Lim

PWGLF/Core/Omega2012AnalysisCore.h

@@ -24,7 +24,6 @@
 
 #include "PWGLF/Core/Omega2012MlFeatures.h"
 #include "PWGLF/Core/ResoAnalysisSelectionCore.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include <CommonConstants/PhysicsConstants.h>
 #include <Framework/Configurable.h>
@@ -35,6 +34,7 @@
 
 #include <Math/GenVector/VectorUtil.h>
 #include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
+#include <Math/Vector4Dfwd.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TPDGCode.h>
@@ -74,27 +74,27 @@ inline constexpr int NGeneratedChannels = 3;
 
 // Last stage passed by a cascade (Xi selection, common to both modes).
 enum XiStage : int {
-  kXiInput = 0,    // failed |eta| or pT
-  kXiKinematics,   // passed |eta| and pT
-  kXiDCA,          // passed the cascade DCA to PV
-  kXiV0Topology,   // passed the Lambda topology and mass window
-  kXiCascTopology, // passed the cascade topology
-  kXiMass,         // passed the Xi mass window
+  kXiInput = 0,        // failed |eta| or pT
+  kXiKinematics = 1,   // passed |eta| and pT
+  kXiDCA = 2,          // passed the cascade DCA to PV
+  kXiV0Topology = 3,   // passed the Lambda topology and mass window
+  kXiCascTopology = 4, // passed the cascade topology
+  kXiMass = 5,         // passed the Xi mass window
   kXiSelected = kXiMass,
-  kXiNStages
+  kXiNStages = 6
 };
 
 // Last stage passed by a V0 (K0S selection of mode A).
 enum K0sStage : int {
-  kK0sInput = 0,  // failed |eta| or pT
-  kK0sKinematics, // passed |eta| and pT
-  kK0sTopology,   // passed cosPA, daughter DCAs, radius and DCA to PV
-  kK0sLifetime,   // passed the proper lifetime and the minimum qT
-  kK0sMass,       // passed the K0S mass window and the (anti)Lambda rejection
-  kK0sDaughters,  // passed the daughter pion TPC nSigma and crossed rows
-  kK0sArmenteros, // passed the Armenteros qT > coefficient * |alpha| cut
+  kK0sInput = 0,      // failed |eta| or pT
+  kK0sKinematics = 1, // passed |eta| and pT
+  kK0sTopology = 2,   // passed cosPA, daughter DCAs, radius and DCA to PV
+  kK0sLifetime = 3,   // passed the proper lifetime and the minimum qT
+  kK0sMass = 4,       // passed the K0S mass window and the (anti)Lambda rejection
+  kK0sDaughters = 5,  // passed the daughter pion TPC nSigma and crossed rows
+  kK0sArmenteros = 6, // passed the Armenteros qT > coefficient * |alpha| cut
   kK0sSelected = kK0sArmenteros,
-  kK0sNStages
+  kK0sNStages = 7
 };
 
 // The value is the species index of the PID configuration in ResoAnalysisSelectionCore.

PWGLF/Core/Omega2012MlFeatures.h

@@ -28,6 +28,7 @@
 #include <Math/GenVector/Boost.h>
 #include <Math/GenVector/VectorUtil.h>
 #include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
+#include <Math/Vector4Dfwd.h>
 
 #include <algorithm>
 #include <array>
@@ -368,31 +369,31 @@ struct EncodedValue {
 inline EncodedValue encodeNSigma10(int8_t code)
 {
   if (code == SaturatedLow || code == SaturatedHigh) {
-    return {0.f, 0.f, 0.f};
+    return {.value = 0.f, .valid = 0.f, .overflow = 0.f};
   }
-  return {static_cast<float>(code) / NSigmaScale, 1.f, 0.f};
+  return {.value = static_cast<float>(code) / NSigmaScale, .valid = 1.f, .overflow = 0.f};
 }
 
 // micro001 nSigma, as the K1 contract
 inline EncodedValue encodePID(float decoded)
 {
   if (std::isnan(decoded)) {
-    return {0.f, 0.f, 0.f};
+    return {.value = 0.f, .valid = 0.f, .overflow = 0.f};
   }
   if (std::isinf(decoded)) {
-    return {std::signbit(decoded) ? -MicroPidOverflow : MicroPidOverflow, 1.f, 1.f};
+    return {.value = std::signbit(decoded) ? -MicroPidOverflow : MicroPidOverflow, .valid = 1.f, .overflow = 1.f};
   }
-  return {decoded, 1.f, 0.f};
+  return {.value = decoded, .valid = 1.f, .overflow = 0.f};
 }
 
 // micro001 DCA, as the K1 contract
 inline EncodedValue encodeDCA(float decoded)
 {
   if (!std::isfinite(decoded)) {
-    return {0.f, 0.f, 0.f};
+    return {.value = 0.f, .valid = 0.f, .overflow = 0.f};
   }
   const bool overflow = decoded == o2::aod::resomicrodaughter001::DCAEncoding::MaxDCA;
-  return {decoded, 1.f, overflow ? 1.f : 0.f};
+  return {.value = decoded, .valid = 1.f, .overflow = overflow ? 1.f : 0.f};
 }
 
 template <std::size_t N>
@@ -501,7 +502,7 @@ void appendTrack(Writer<N>& w, TrackSnapshot const& track)
     w.addFull(encodePID(decoded));
   }
   for (const float& decoded : track.tofNSigma) {
-    w.addFull(track.hasTOF ? encodePID(decoded) : EncodedValue{0.f, 0.f, 0.f});
+    w.addFull(track.hasTOF ? encodePID(decoded) : EncodedValue{.value = 0.f, .valid = 0.f, .overflow = 0.f});
   }
   w.addFull(encodeDCA(track.dcaXY));
   w.addFull(encodeDCA(track.dcaZ));

PWGLF/Tasks/Resonances/omega2012Analysis.cxx

@@ -55,7 +55,6 @@
 #include <TPDGCode.h>
 
 #include <cmath>
-#include <cstdint>
 #include <tuple>
 
 using namespace o2;
@@ -481,8 +480,9 @@ struct Omega2012Analysis {
       // Look for Omega(2012)
       int pdg = mcParticle.pdgCode();
 
-      if (std::abs(pdg) != kOmega2012Minus)
+      if (std::abs(pdg) != kOmega2012Minus) {
         continue;
+      }
 
       // Fill generated level histograms
       auto pt = mcParticle.pt();
@@ -495,8 +495,9 @@ struct Omega2012Analysis {
 
       // Get daughters
       auto daughters = mcParticle.daughters_as<aod::McParticles>();
-      if (daughters.size() != NumExpectedDaughters)
+      if (daughters.size() != NumExpectedDaughters) {
         continue;
+      }
 
       int daughter1PDG = 0, daughter2PDG = 0;
       ROOT::Math::PxPyPzEVector p1, p2, pMother;
@@ -593,7 +594,7 @@ struct Omega2012Analysis {
     };
 
     const bool fillWrongSign = core.fillWrongSign();
-    auto onCandidate = [&](auto const& xi, auto const& pion, auto const& kaon, Xi1530KCandidateValues const& c) {
+    auto onCandidate = [&]([[maybe_unused]] auto const& xi, [[maybe_unused]] auto const& pion, [[maybe_unused]] auto const& kaon, Xi1530KCandidateValues const& c) {
       if (c.chargePattern != o2::analysis::omega2012ml::kSignalPattern) {
         // Charge-pattern controls: same event only, never in the signal histograms
         if constexpr (!IsMix) {

PWGLF/Tasks/Resonances/omega2012TrainingTable.cxx

@@ -167,7 +167,7 @@ struct Omega2012TrainingTable {
   {
     uint64_t hash = FnvOffsetBasis;
     for (const auto& value : features) {
-      const uint32_t bits = std::bit_cast<uint32_t>(value);
+      const auto bits = std::bit_cast<uint32_t>(value);
       for (unsigned int shift = 0; shift < BitsPerFloat; shift += BitsPerByte) {
         hash = (hash ^ ((bits >> shift) & ByteMask)) * FnvPrime;
       }
@@ -184,7 +184,7 @@ struct Omega2012TrainingTable {
     // ResoCollisions_001 carries no run number or BC; the reduced collision row identifies the event within its DF.
     mlEvents(static_cast<uint8_t>(mode), static_cast<int64_t>(collision.globalIndex()),
              collision.posZ(), collision.bMagField(), collision.cent(), collision.multiplicity(), collision.isRecINELgt0());
-    mlEventRow = static_cast<int64_t>(mlEvents.lastIndex());
+    mlEventRow = mlEvents.lastIndex();
   }
 
   template <typename Cascade>
@@ -207,7 +207,7 @@ struct Omega2012TrainingTable {
                xi.daughterTOFNSigmaNegPi10(), xi.daughterTOFNSigmaNegKa10(), xi.daughterTOFNSigmaNegPr10(),
                xi.daughterTOFNSigmaBachPi10(), xi.daughterTOFNSigmaBachKa10(), xi.daughterTOFNSigmaBachPr10(),
                xi.nCrossedRowsPos(), xi.nCrossedRowsNeg(), xi.nCrossedRowsBach(), daughterIds.data());
-    const auto row = static_cast<int64_t>(mlCascades.lastIndex());
+    const auto row = mlCascades.lastIndex();
     mlCascadeRows.emplace(id, row);
     return row;
   }
@@ -229,7 +229,7 @@ struct Omega2012TrainingTable {
           v0.daughterTOFNSigmaPosPi10(), v0.daughterTOFNSigmaPosKa10(), v0.daughterTOFNSigmaPosPr10(),
           v0.daughterTOFNSigmaNegPi10(), v0.daughterTOFNSigmaNegKa10(), v0.daughterTOFNSigmaNegPr10(),
           v0.nCrossedRowsPos(), v0.nCrossedRowsNeg(), daughterIds.data());
-    const auto row = static_cast<int64_t>(mlV0s.lastIndex());
+    const auto row = mlV0s.lastIndex();
     mlV0Rows.emplace(id, row);
     return row;
   }
@@ -244,7 +244,7 @@ struct Omega2012TrainingTable {
     mlTracks(mlEventRow, static_cast<int64_t>(track.trackId()), track.px(), track.py(), track.pz(),
              track.pidNSigmaPiFlag(), track.pidNSigmaKaFlag(), track.pidNSigmaPrFlag(),
              track.trackSelectionFlags(), track.trackFlags(), track.tpcNClsCrossedRows(), track.itsClusterMap());
-    const auto row = static_cast<int64_t>(mlTracks.lastIndex());
+    const auto row = mlTracks.lastIndex();
     mlTrackRows.emplace(id, row);
     return row;
   }
@@ -273,7 +273,7 @@ struct Omega2012TrainingTable {
                       static_cast<float>(values.omega.M()), static_cast<float>(values.omega.Pt()),
                       static_cast<float>(values.omega.Rapidity()), static_cast<float>(values.omega.Eta()),
                       static_cast<float>(values.omega.Phi()), values.alpha, static_cast<int8_t>(xi.sign()), passBits);
-    const auto row = static_cast<int64_t>(mlXiK0sCandidates.lastIndex());
+    const auto row = mlXiK0sCandidates.lastIndex();
     mlXiK0sInputs(row, pack.master.data(), static_cast<uint8_t>(pack.status));
     if constexpr (IsMC) {
       const bool matched = classifyXiK0sTruth(xi, v0) == XiK0sTruth::Matched;
@@ -316,7 +316,7 @@ struct Omega2012TrainingTable {
                         static_cast<float>(values.omega.Pt()), static_cast<float>(values.omega.Rapidity()),
                         static_cast<float>(values.omega.Eta()), static_cast<float>(values.omega.Phi()),
                         values.chargePattern, passBits);
-    const auto row = static_cast<int64_t>(mlXi1530KCandidates.lastIndex());
+    const auto row = mlXi1530KCandidates.lastIndex();
     mlXi1530KInputs(row, pack.master.data(), static_cast<uint8_t>(pack.status));
     if constexpr (IsMC) {
       const bool matched = classifyXi1530KTruth(xi, pion, kaon) == Xi1530KTruth::Matched;
@@ -333,7 +333,7 @@ struct Omega2012TrainingTable {
     writeEvent(collision, DecayMode::XiK0s);
     // Selection only: the analysis histograms belong to the Omega(2012) analysis task
     core.forEachXiK0sCandidate<IsMC, false>(histos, collision, collision, cascades, v0s, true, nullptr, nullptr, nullptr,
-                                            [this](auto const& coll, auto const& xi, auto const& v0, XiK0sCandidateValues const& values, uint16_t passBits) {
+                                            [&](auto const& coll, auto const& xi, auto const& v0, XiK0sCandidateValues const& values, uint16_t passBits) {
                                               writeXiK0sCandidate<IsMC>(coll, xi, v0, values, passBits);
                                             });
   }
@@ -343,8 +343,8 @@ struct Omega2012TrainingTable {
   {
     writeEvent(collision, DecayMode::Xi1530K);
     core.forEachXi1530KCandidate<IsMC, false, true>(histos, collision, cascades, tracks, nullptr, true, nullptr, nullptr, nullptr,
-                                                    [this](auto const& coll, auto const& xi, auto const& pion, auto const& kaon,
-                                                           Xi1530KCandidateValues const& values, uint16_t passBits) {
+                                                    [&](auto const& coll, auto const& xi, auto const& pion, auto const& kaon,
+                                                        Xi1530KCandidateValues const& values, uint16_t passBits) {
                                                       writeXi1530KCandidate<IsMC>(coll, xi, pion, kaon, values, passBits);
                                                     });
   }
@@ -391,7 +391,7 @@ struct Omega2012TrainingTable {
       return;
     }
     core.forEachGeneratedOmega2012(histos, resoParents, [&](auto const& part, GeneratedChannel channel) {
-      mlGenAudit(static_cast<int64_t>(collision.globalIndex()), static_cast<int64_t>(part.originalMcParticleId()),
+      mlGenAudit(collision.globalIndex(), static_cast<int64_t>(part.originalMcParticleId()),
                  part.pdgCode(), part.daughterPDG1(), part.daughterPDG2(), static_cast<uint8_t>(channel), part.pt(), part.y());
     });
   }