[PWGCF] Femto: Apply linter and formatting fixes

Author: IgorPtak

PWGCF/Femto/Core/charmHadronBuilder.h

@@ -20,6 +20,7 @@
 #include "PWGCF/Femto/Core/femtoUtils.h"
 #include "PWGCF/Femto/Core/modes.h"
 #include "PWGCF/Femto/DataModel/FemtoTables.h"
+
 #include "Common/Core/RecoDecay.h"
 
 #include <CommonConstants/MathConstants.h>
@@ -236,12 +237,12 @@ class McBuilder
   template <modes::System system, typename T1, typename T2, typename T3, typename T4>
   void fillMcParticle(T1 const& mcParticle, T2 const& mcParticles, T3 const& mcCol, T4& mcProducts)
   {
-    // charm hadrons get a prompt/non-prompt origin (see resolveCharmOrigin), consistent with the
-    // reco-matched path; all other particles use the generic getOrigin inside getOrCreateMcParticleRow.
+    // charm hadrons get a prompt/non-prompt origin, consistent with the reco-matched path;
+    // all other particles use the generic getOrigin inside getOrCreateMcParticleRow
     if (std::abs(mcParticle.pdgCode()) == o2::constants::physics::Pdg::kD0) {
-      // truth-level acceptance for the efficiency denominator 
-      // keep only generated D0 -> K pi decays within the rapidity acceptance.
-      int8_t sign = 0; 
+      // truth-level acceptance for the efficiency denominator: keep only
+      // generated D0 -> K pi decays inside the rapidity acceptance
+      int8_t sign = 0;
       if (!RecoDecay::isMatchedMCGen(mcParticles, mcParticle, o2::constants::physics::Pdg::kD0, std::array{+kPiPlus, -kKPlus}, true, &sign)) {
         return;
       }
@@ -285,11 +286,10 @@ class McBuilder
     fillMcLabelGeneric<system>(col, mcCols, k0short, mcParticles, mcProducts, [](auto& prod, int64_t p) { prod.producedK0shortLabels(p); });
   }
 
-  // D0 has no direct MC label (it is a 2-prong hypothesis built by PWGHF), so we cannot reuse
-  // fillMcLabelGeneric (which needs has_mcParticle). Instead we match the two prongs to a generated
-  // D0 -> K pi decay with RecoDecay::getMatchedMCRec, which returns
-  // the index of the generated mother. If matched, we resolve/create its FMcParticles row and write
-  // the FD0Labels row; otherwise we write -1.
+  // D0 has no direct MC label (2-prong hypothesis built by PWGHF), so fillMcLabelGeneric
+  // cannot be reused. Both prongs are matched to a generated D0 -> K pi decay with
+  // RecoDecay::getMatchedMCRec, which returns the index of the generated mother;
+  // unmatched candidates get -1.
   template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
   void fillMcD0WithLabel(T1 const& /*col*/, T2 const& /*mcCols*/, T3 const& d0candidate, T4 const& /*tracks*/, T5 const& mcParticles, T6& mcProducts)
   {
@@ -386,15 +386,14 @@ class McBuilder
   }
 
  private:
-  // HF origin: charm hadrons are classified prompt (charm from a c quark) vs non-prompt (charm from
-  // a beauty decay), resolved from the mc decay tree. Shared by the reco-matched (fillMcD0WithLabel)
-  // and generator-level (fillMcParticle) paths so both write a consistent origin.
+  // classify a charm hadron as prompt (charm from a c quark) or non-prompt (charm from a
+  // beauty decay) from the mc decay tree; shared by the reco-matched and generator-level paths
   template <typename T1, typename T2>
   modes::McOrigin resolveCharmOrigin(T1 const& mcParticle, T2 const& mcParticles)
   {
     const int charmOrigin = RecoDecay::getCharmHadronOrigin(mcParticles, mcParticle);
     return (charmOrigin == RecoDecay::OriginType::NonPrompt) ? modes::McOrigin::kNonPrompt : modes::McOrigin::kPrompt;
-  }  
+  }
 
   template <typename T1, typename T2, typename T3>
   modes::McOrigin getOrigin(T1 const& col, T2 const& /*mcCols*/, T3 const& mcParticle)
@@ -458,8 +457,8 @@ class McBuilder
     return this->buildMcParticleRow<system>(mcParticle, mcParticles, mcCol, origin, mcProducts);
   }
 
-  /// Origin-injecting entry point: the caller already resolved the origin (e.g. prompt vs non-prompt
-  /// for a charm hadron, which getOrigin does not classify), so we skip getOrigin and store it directly.
+  /// \brief Overload for a caller-provided origin, e.g. prompt vs non-prompt for a charm
+  /// hadron, which getOrigin does not classify; the origin is stored as given
   template <modes::System system, typename T1, typename T2, typename T3, typename T4>
   int64_t getOrCreateMcParticleRow(T1 const& mcParticle, T2 const& mcParticles, T3 const& mcCol, modes::McOrigin origin, T4& mcProducts)
   {

PWGCF/Femto/Core/charmHadronHistManager.h

@@ -600,7 +600,7 @@ class PairTrackD0Builder
     mTrackCleaner.init(confTrackCleaner);
     mD0Cleaner.init(confD0Cleaner);
 
-    // PDG codes of the D0 prongs depend on the hypothesis (set via confD0Selection.sign):
+    // pdg codes of the D0 prongs depend on the hypothesis:
     //   D0    -> pi+ K-  => PosDau = pion, NegDau = kaon
     //   D0bar -> K+ pi-  => PosDau = kaon, NegDau = pion
     int posDauPdg = 0;
@@ -691,7 +691,6 @@ class PairTrackD0Builder
     }
   }
 
-
  private:
   colhistmanager::CollisionHistManager mColHistManager;
   trackhistmanager::TrackHistManager<prefixTrack> mTrackHistManager;

PWGCF/Femto/Core/mcBuilder.h

@@ -1167,7 +1167,7 @@ namespace femtocharmhadrons
 // bitmask column
 DECLARE_SOA_COLUMN(Mask, mask, o2::analysis::femto::datatypes::CharmHadronMaskType); //! selection bitmask
 
-// daughter links - row indices into the femto TRACK table
+// daughter links: row indices into the femto track table
 DECLARE_SOA_INDEX_COLUMN_FULL(PosDau, posDau, int32_t, FTracks, "_PosDau"); //! + prong (pion in D0)
 DECLARE_SOA_INDEX_COLUMN_FULL(NegDau, negDau, int32_t, FTracks, "_NegDau"); //! - prong (kaon in D0)
 
@@ -1181,14 +1181,14 @@ DECLARE_SOA_COLUMN(DecayLengthXY, decayLengthXY, float);
 DECLARE_SOA_COLUMN(ImpactParameterProduct, impactParameterProduct, float); //! d0*d0 of the two prongs
 DECLARE_SOA_COLUMN(CosThetaStar, cosThetaStar, float);
 // ML BDT scores: [0] background, [1] prompt (D0 from c), [2] non-prompt (D0 from b decay)
-DECLARE_SOA_COLUMN(MlProbD0Bkg, mlProbD0Bkg, float);             //! D0 hypothesis: background score
-DECLARE_SOA_COLUMN(MlProbD0Prompt, mlProbD0Prompt, float);       //! D0 hypothesis: prompt score
-DECLARE_SOA_COLUMN(MlProbD0NonPrompt, mlProbD0NonPrompt, float); //! D0 hypothesis: non-prompt score
+DECLARE_SOA_COLUMN(MlProbD0Bkg, mlProbD0Bkg, float);                   //! D0 hypothesis: background score
+DECLARE_SOA_COLUMN(MlProbD0Prompt, mlProbD0Prompt, float);             //! D0 hypothesis: prompt score
+DECLARE_SOA_COLUMN(MlProbD0NonPrompt, mlProbD0NonPrompt, float);       //! D0 hypothesis: non-prompt score
 DECLARE_SOA_COLUMN(MlProbD0barBkg, mlProbD0barBkg, float);             //! D0bar hypothesis: background
 DECLARE_SOA_COLUMN(MlProbD0barPrompt, mlProbD0barPrompt, float);       //! D0bar hypothesis: prompt
 DECLARE_SOA_COLUMN(MlProbD0barNonPrompt, mlProbD0barNonPrompt, float); //! D0bar hypothesis: non-prompt
-DECLARE_SOA_COLUMN(IsSelD0, isSelD0, int8_t);        //! PWGHF verdict (cross-check)
-DECLARE_SOA_COLUMN(IsSelD0bar, isSelD0bar, int8_t);  //! PWGHF verdict (cross-check)
+DECLARE_SOA_COLUMN(IsSelD0, isSelD0, int8_t);                          //! PWGHF selection flag
+DECLARE_SOA_COLUMN(IsSelD0bar, isSelD0bar, int8_t);                    //! PWGHF selection flag
 } // namespace femtocharmhadrons
 
 DECLARE_SOA_TABLE_STAGED_VERSIONED(FD0s_001, "FD0", 1, //! femto D0/D0bar (kinematics only)
@@ -1216,8 +1216,8 @@ using FD0Masks = FD0Masks_001;
 using StoredFD0Masks = StoredFD0Masks_001;
 
 DECLARE_SOA_TABLE_STAGED_VERSIONED(FD0Extras_001, "FD0EXTRA", 1, //! femto D0 QA / debug
-                                   femtocharmhadrons::MassD0,                 // BOTH hypotheses, always
-                                   femtocharmhadrons::MassD0bar,              //   (main table only has the accepted one)
+                                   femtocharmhadrons::MassD0,    // both hypotheses; the main
+                                   femtocharmhadrons::MassD0bar, // table only stores the accepted one
                                    femtocharmhadrons::Cpa,
                                    femtocharmhadrons::CpaXY,
                                    femtocharmhadrons::DecayLength,
@@ -1230,7 +1230,7 @@ DECLARE_SOA_TABLE_STAGED_VERSIONED(FD0Extras_001, "FD0EXTRA", 1, //! femto D0 QA
                                    femtocharmhadrons::MlProbD0barBkg,
                                    femtocharmhadrons::MlProbD0barPrompt,
                                    femtocharmhadrons::MlProbD0barNonPrompt,
-                                   femtocharmhadrons::IsSelD0,                 // raw PWGHF verdicts
+                                   femtocharmhadrons::IsSelD0, // raw PWGHF selection flags
                                    femtocharmhadrons::IsSelD0bar);
 using FD0Extras = FD0Extras_001;
 } // namespace o2::aod

PWGCF/Femto/Core/pairBuilder.h

@@ -116,7 +116,7 @@ struct FemtoProducer {
   v0builder::V0Builder<modes::V0::kLambda, v0builder::LambdaSelHistName, v0builder::LambdaFilterHistName> lambdaBuilder;
   v0builder::V0Builder<modes::V0::kAntiLambda, v0builder::AntilambdaSelHistName, v0builder::AntiLambdaFilterHistName> antilambdaBuilder;
 
-  // charm hadron builder 
+  // charm hadron builder
   charmhadronbuilder::CharmHadronBuilderProducts charmHadronBuilderProducts;
   charmhadronbuilder::ConfD0Filters confD0Filters;
   charmhadronbuilder::ConfD0Bits confD0Bits;
@@ -206,7 +206,7 @@ struct FemtoProducer {
     lambdaBuilder.init(&hRegistry, confLambdaBits, confV0Filters, confV0Tables, context, trackBuilder);
     antilambdaBuilder.init(&hRegistry, confLambdaBits, confV0Filters, confV0Tables, context, trackBuilder);
 
-    // configure d0 builder 
+    // configure d0 builder
     d0Builder.init(&hRegistry, confD0Bits, confD0Filters, confD0Tables, context);
     d0barBuilder.init(&hRegistry, confD0Bits, confD0Filters, confD0Tables, context);
 
@@ -280,7 +280,7 @@ struct FemtoProducer {
 
   // processing D0s
   template <modes::System system, typename T1, typename T2, typename T3>
-  void processD0s(T1 const& col, T2 const& tracks, T3 const& candidates) 
+  void processD0s(T1 const& col, T2 const& tracks, T3 const& candidates)
   {
     d0Builder.fillD0s<system>(col, collisionBuilder, collisionBuilderProducts, trackBuilderProducts, charmHadronBuilderProducts, candidates, tracks, trackBuilder);
     d0barBuilder.fillD0s<system>(col, collisionBuilder, collisionBuilderProducts, trackBuilderProducts, charmHadronBuilderProducts, candidates, tracks, trackBuilder);
@@ -382,26 +382,28 @@ struct FemtoProducer {
 
   // process tracks and D0s
   void processTracksD0sRun3pp(rawinputs::Run3PpCollisions::iterator const& col,
-                            o2::aod::BCsWithTimestamps const& bcs,
-                            rawinputs::Run3FullPidTracks const& tracks,
-                            rawinputs::Run3D0Candidates const& candidates)
+                              o2::aod::BCsWithTimestamps const& bcs,
+                              rawinputs::Run3FullPidTracks const& tracks,
+                              rawinputs::Run3D0Candidates const& candidates)
   {
-    if (!processCollisions<modes::System::kPP_Run3>(col, bcs, tracks)) return;
-      auto tracksWithItsPid = o2::soa::Attach<rawinputs::Run3FullPidTracks, o2::aod::pidits::ITSNSigmaEl, o2::aod::pidits::ITSNSigmaPi, o2::aod::pidits::ITSNSigmaKa,
-                                              o2::aod::pidits::ITSNSigmaPr, o2::aod::pidits::ITSNSigmaDe, o2::aod::pidits::ITSNSigmaTr, o2::aod::pidits::ITSNSigmaHe>(tracks);
+    if (!processCollisions<modes::System::kPP_Run3>(col, bcs, tracks))
+      return;
+    auto tracksWithItsPid = o2::soa::Attach<rawinputs::Run3FullPidTracks, o2::aod::pidits::ITSNSigmaEl, o2::aod::pidits::ITSNSigmaPi, o2::aod::pidits::ITSNSigmaKa,
+                                            o2::aod::pidits::ITSNSigmaPr, o2::aod::pidits::ITSNSigmaDe, o2::aod::pidits::ITSNSigmaTr, o2::aod::pidits::ITSNSigmaHe>(tracks);
     processTracks<modes::System::kPP_Run3>(col, tracksWithItsPid);
     processD0s<modes::System::kPP_Run3>(col, tracks, candidates);
   }
   PROCESS_SWITCH(FemtoProducer, processTracksD0sRun3pp, "Process tracks and D0s", false);
 
   void processTracksD0sRun3PbPb(rawinputs::Run3PbPbCollisions::iterator const& col,
-                          o2::aod::BCsWithTimestamps const& bcs,
-                          rawinputs::Run3FullPidTracks const& tracks,
-                          rawinputs::Run3D0Candidates const& candidates)
+                                o2::aod::BCsWithTimestamps const& bcs,
+                                rawinputs::Run3FullPidTracks const& tracks,
+                                rawinputs::Run3D0Candidates const& candidates)
   {
-    if (!processCollisions<modes::System::kPbPb_Run3>(col, bcs, tracks)) return;
-      auto tracksWithItsPid = o2::soa::Attach<rawinputs::Run3FullPidTracks, o2::aod::pidits::ITSNSigmaEl, o2::aod::pidits::ITSNSigmaPi, o2::aod::pidits::ITSNSigmaKa,
-                                              o2::aod::pidits::ITSNSigmaPr, o2::aod::pidits::ITSNSigmaDe, o2::aod::pidits::ITSNSigmaTr, o2::aod::pidits::ITSNSigmaHe>(tracks);
+    if (!processCollisions<modes::System::kPbPb_Run3>(col, bcs, tracks))
+      return;
+    auto tracksWithItsPid = o2::soa::Attach<rawinputs::Run3FullPidTracks, o2::aod::pidits::ITSNSigmaEl, o2::aod::pidits::ITSNSigmaPi, o2::aod::pidits::ITSNSigmaKa,
+                                            o2::aod::pidits::ITSNSigmaPr, o2::aod::pidits::ITSNSigmaDe, o2::aod::pidits::ITSNSigmaTr, o2::aod::pidits::ITSNSigmaHe>(tracks);
     processTracks<modes::System::kPbPb_Run3>(col, tracksWithItsPid);
     processD0s<modes::System::kPbPb_Run3>(col, tracks, candidates);
   }
@@ -442,7 +444,6 @@ struct FemtoProducer {
   }
   PROCESS_SWITCH(FemtoProducer, processTracksD0sRun3PbPbMc, "Provide reconstructed and generated tracks and D0s in PbPb collisions", false);
 
-
   // process tracks and kinks
   void processTracksKinksRun3pp(rawinputs::Run3PpCollisions::iterator const& col,
                                 o2::aod::BCsWithTimestamps const& bcs,

PWGCF/Femto/DataModel/FemtoTables.h

@@ -11,12 +11,12 @@
 
 /// \file femtoD0Qa.cxx
 /// \brief QA task for D0 mesons
-/// \author Igor Ptak, WUT, igor.ptak.stud@pw.edu.pl
+/// \author Igor Ptak, WUT, igor.tomasz.ptak@cern.ch
 
+#include "PWGCF/Femto/Core/charmHadronBuilder.h"
 #include "PWGCF/Femto/Core/charmHadronHistManager.h"
 #include "PWGCF/Femto/Core/collisionBuilder.h"
 #include "PWGCF/Femto/Core/collisionHistManager.h"
-#include "PWGCF/Femto/Core/charmHadronBuilder.h"
 #include "PWGCF/Femto/Core/modes.h"
 #include "PWGCF/Femto/Core/partitions.h"
 #include "PWGCF/Femto/Core/trackHistManager.h"
@@ -45,12 +45,12 @@ struct FemtoD0Qa {
   using FilteredFemtoCollisions = o2::soa::Filtered<FemtoCollisions>;
   using FilteredFemtoCollision = FilteredFemtoCollisions::iterator;
 
-  // D0s joined with mask (partition) and extras (QA columns)
+  // setup D0s, joined with the mask for the partition and the QA columns
   using FemtoD0s = o2::soa::Join<o2::aod::FD0s, o2::aod::FD0Masks, o2::aod::FD0Extras>;
-  // full-PID tracks so daughter TPC/TOF/PID QA can be booked
+  // setup tracks with full pid information for the daughter QA
   using FemtoTracks = o2::soa::Join<o2::aod::FTracks, o2::aod::FTrackMass, o2::aod::FTrackDcas, o2::aod::FTrackExtras, o2::aod::FTrackPids>;
-  
-  // MC: same tables joined with their labels (link reco -> generated particle)
+
+  // setup monte carlo, joining the labels that link reco to generated particles
   using FemtoCollisionsWithLabel = o2::soa::Join<FemtoCollisions, o2::aod::FColLabels>;
   using FilteredFemtoCollisionsWithLabel = o2::soa::Filtered<FemtoCollisionsWithLabel>;
   using FilteredFemtoCollisionWithLabel = FilteredFemtoCollisionsWithLabel::iterator;
@@ -59,7 +59,6 @@ struct FemtoD0Qa {
   using FemtoTracksWithLabel = o2::soa::Join<FemtoTracks, o2::aod::FTrackLabels>;
   using FemtoMcParticlesWithLabel = o2::soa::Join<o2::aod::FMcParticles, o2::aod::FMcMotherLabels>;
 
-
   o2::framework::SliceCache cache;
 
   // setup for collisions
@@ -95,7 +94,7 @@ struct FemtoD0Qa {
 
   o2::framework::HistogramRegistry hRegistry{"FemtoD0Qa", {}, o2::framework::OutputObjHandlingPolicy::AnalysisObject};
 
-    void init(o2::framework::InitContext&)
+  void init(o2::framework::InitContext&)
   {
     bool processData = doprocessD0;
 
@@ -151,8 +150,6 @@ struct FemtoD0Qa {
     }
   }
   PROCESS_SWITCH(FemtoD0Qa, processD0Mc, "Process D0s with MC information", false);
-
-
 };
 
 o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& context)
@@ -161,4 +158,4 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
     adaptAnalysisTask<FemtoD0Qa>(context),
   };
   return workflow;
-}
+}

PWGCF/Femto/TableProducer/femtoProducer.cxx

@@ -11,7 +11,7 @@
 
 /// \file femtoPairTrackD0.cxx
 /// \brief Tasks that computes correlation between tracks and D0 mesons
-/// \author Igor Ptak, WUT, igor.ptak.stud@pw.edu.pl
+/// \author Igor Ptak, WUT, igor.tomasz.ptak@cern.ch
 
 #include "PWGCF/Femto/Core/charmHadronBuilder.h"
 #include "PWGCF/Femto/Core/charmHadronHistManager.h"
@@ -62,7 +62,6 @@ struct FemtoPairTrackD0 {
   using FemtoD0sWithLabel = o2::soa::Join<FemtoD0s, o2::aod::FD0Labels>;
   using FemtoMcParticlesWithLabel = o2::soa::Join<o2::aod::FMcParticles, o2::aod::FMcMotherLabels>;
 
-
   o2::framework::SliceCache cache;
 
   // setup collisions
@@ -193,7 +192,6 @@ struct FemtoPairTrackD0 {
     pairTrackD0Builder.processMixedEvent<modes::Mode::kMe_Reco_Mc>(cols, mcCols, tracks, trackWithLabelPartition, d0WithLabelPartition, mcParticles, mcMothers, mcPartonicMothers, cache, mixBinsVtxMult, mixBinsVtxCent, mixBinsVtxMultCent);
   }
   PROCESS_SWITCH(FemtoPairTrackD0, processMixedEventMc, "Enable processing mixed event processing for tracks and D0s with MC information", false);
-
 };
 
 o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& context)