[PWGLF] Fix clang-tidy findings in the K1 micro analysis and ML exporter

Include Math/Vector4Dfwd.h where ROOT::Math::PxPyPzMVector is used, drop
the unused LFResonanceTables.h and PhysicsConstants.h includes, simplify
the candidate-cut boolean expressions, use designated initializers for
EncodedValue and remove redundant int64_t casts. No change in behaviour.

Author: BongHwi

PWGLF/Core/K1AnalysisMicroCore.h

@@ -21,7 +21,6 @@
 
 #include "PWGLF/Core/K1MlFeatures.h"
 #include "PWGLF/Core/ResoAnalysisSelectionCore.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
 
 #include <CommonConstants/PhysicsConstants.h>
 #include <Framework/ASoAHelpers.h>
@@ -32,6 +31,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>
@@ -521,7 +521,7 @@ class K1AnalysisMicroCore
         }
 
         // Stage L common acceptance uses the existing inclusive rapidity window.
-        values.inRapidity = !(lResonanceK1.Rapidity() > mCandidateCuts.cK1MaxRap || lResonanceK1.Rapidity() < mCandidateCuts.cK1MinRap);
+        values.inRapidity = lResonanceK1.Rapidity() >= mCandidateCuts.cK1MinRap && lResonanceK1.Rapidity() <= mCandidateCuts.cK1MaxRap;
         if (!values.inRapidity) {
           if constexpr (HasCandidateHook) {
             if (tripletSelected) {
@@ -553,11 +553,11 @@ class K1AnalysisMicroCore
 
         // Candidate cuts (each one is evaluated only if switched on)
         values.passesCandidateCuts =
-          !(isK892Mode && mSecondaryWindowOn && (!isInWindow(values.mass13, o2::constants::physics::MassK0Star892, mSecondaryCuts.cSecondaryMasswindow) || pion1.sign() == bTrack.sign())) &&
-          !(mAnotherMassCutOn && !isInRange(isK892Mode ? lResonanceSecondary.M() : values.mass13, mSecondaryCuts.cMinAnotherSecondaryMassCut, mSecondaryCuts.cMaxAnotherSecondaryMassCut)) &&
-          !(mPiKaMassCutOn && !isInRange(values.mass23, mSecondaryCuts.cMinPiKaMassCut, mSecondaryCuts.cMaxPiKaMassCut)) &&
-          !(mAngleCutOn && !isInRange(values.angle, mSecondaryCuts.cMinAngle, mSecondaryCuts.cMaxAngle)) &&
-          !(mPairAsymCutOn && !isInRange(values.pairAsym, mSecondaryCuts.cMinPairAsym, mSecondaryCuts.cMaxPairAsym));
+          (!isK892Mode || !mSecondaryWindowOn || (isInWindow(values.mass13, o2::constants::physics::MassK0Star892, mSecondaryCuts.cSecondaryMasswindow) && pion1.sign() != bTrack.sign())) &&
+          (!mAnotherMassCutOn || isInRange(isK892Mode ? lResonanceSecondary.M() : values.mass13, mSecondaryCuts.cMinAnotherSecondaryMassCut, mSecondaryCuts.cMaxAnotherSecondaryMassCut)) &&
+          (!mPiKaMassCutOn || isInRange(values.mass23, mSecondaryCuts.cMinPiKaMassCut, mSecondaryCuts.cMaxPiKaMassCut)) &&
+          (!mAngleCutOn || isInRange(values.angle, mSecondaryCuts.cMinAngle, mSecondaryCuts.cMaxAngle)) &&
+          (!mPairAsymCutOn || isInRange(values.pairAsym, mSecondaryCuts.cMinPairAsym, mSecondaryCuts.cMaxPairAsym));
         auto exportCandidate = [&](uint16_t passBits) {
           if constexpr (IsResoMicrotrack && !IsMix && HasExportHook) {
             onExport(collision, bTrack, pion2, pion1, flowChannel, passBits);

PWGLF/Core/K1MlFeatures.h

@@ -169,21 +169,21 @@ struct EncodedValue {
 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) ? -3.5f : 3.5f, 1.f, 1.f};
+    return {.value = std::signbit(decoded) ? -3.5f : 3.5f, .valid = 1.f, .overflow = 1.f};
   }
-  return {decoded, 1.f, 0.f};
+  return {.value = decoded, .valid = 1.f, .overflow = 0.f};
 }
 
 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};
 }
 
 struct Kinematics {
@@ -798,7 +798,7 @@ inline FeaturePack buildMasterFeatures(CandidateSnapshot const& candidate)
       detail::append(pack.master, index, detail::encodePID(decoded));
     }
     for (const float& decoded : track.tofNSigma) {
-      detail::append(pack.master, index, track.hasTOF ? detail::encodePID(decoded) : detail::EncodedValue{0.f, 0.f, 0.f});
+      detail::append(pack.master, index, track.hasTOF ? detail::encodePID(decoded) : detail::EncodedValue{.value = 0.f, .valid = 0.f, .overflow = 0.f});
     }
     detail::append(pack.master, index, detail::encodeDCA(track.dcaXY));
     detail::append(pack.master, index, detail::encodeDCA(track.dcaZ));

PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx

@@ -18,7 +18,6 @@
 #include "PWGLF/Core/ResoAnalysisSelectionCore.h"
 #include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include <CommonConstants/PhysicsConstants.h>
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisTask.h>
@@ -34,6 +33,7 @@
 #include <Framework/runDataProcessing.h>
 
 #include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
+#include <Math/Vector4Dfwd.h>
 
 #include <array>
 #include <cmath>

PWGLF/Tasks/Resonances/k1TrainingTable.cxx

@@ -34,6 +34,7 @@
 #include <Framework/runDataProcessing.h>
 
 #include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
+#include <Math/Vector4Dfwd.h>
 #include <TH1.h>
 
 #include <array>
@@ -145,7 +146,7 @@ struct K1TrainingTable {
     k1MlTracks(k1MlEventRow, 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>(k1MlTracks.lastIndex());
+    const int64_t row = k1MlTracks.lastIndex();
     k1MlTrackRows.emplace(id, row);
     return row;
   }
@@ -155,9 +156,9 @@ struct K1TrainingTable {
   {
     k1MlTrackRows.clear();
     // ResoCollisions_001 carries no run number or BC; the reduced collision row identifies the event within its DF.
-    k1MlEvents(static_cast<int64_t>(collision.globalIndex()),
+    k1MlEvents(collision.globalIndex(),
                collision.posZ(), collision.bMagField(), collision.cent(), collision.multiplicity(), collision.isRecINELgt0());
-    k1MlEventRow = static_cast<int64_t>(k1MlEvents.lastIndex());
+    k1MlEventRow = k1MlEvents.lastIndex();
   }
 
   template <typename Collision>
@@ -168,7 +169,7 @@ struct K1TrainingTable {
     }
     uint64_t hash = FnvOffsetBasis;
     for (const auto& value : pack.master) {
-      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;
       }
@@ -209,7 +210,7 @@ struct K1TrainingTable {
                    static_cast<float>(mother.Pt()), static_cast<float>(mother.Rapidity()),
                    static_cast<float>(mother.Eta()), static_cast<float>(mother.Phi()),
                    static_cast<int8_t>(kaon.sign()), passBits);
-    const auto row = static_cast<int64_t>(k1MlCandidates.lastIndex());
+    const int64_t row = k1MlCandidates.lastIndex();
     k1MlInputs(row, pack.master.data(), static_cast<uint8_t>(pack.status));
     if constexpr (IsMC) {
       const bool matched = channel != K1TruthChannel::None;
@@ -266,7 +267,7 @@ struct K1TrainingTable {
       return;
     }
     core.forEachGeneratedK1(histos, resoParents, [&](auto const& part, K1TruthChannel channel) {
-      k1MlGenAudit(static_cast<int64_t>(collision.globalIndex()), static_cast<int64_t>(part.originalMcParticleId()),
+      k1MlGenAudit(collision.globalIndex(), static_cast<int64_t>(part.originalMcParticleId()),
                    part.pdgCode(), part.daughterPDG1(), part.daughterPDG2(), static_cast<uint8_t>(channel),
                    part.pt(), part.y(), true);
     });