Feat: finish MC for tracks and V0s

Author: ariedel-cern

PWGCF/Femto/Core/cascadeHistManager.h

@@ -157,6 +157,8 @@ constexpr char PrefixLambdaCascade[] = "LambdaCascadeQa/";
 constexpr std::string_view AnalysisDir = "Kinematics/";
 constexpr std::string_view QaDir = "QA/";
 
+constexpr int AbsChargeDaughters = 1;
+
 /// \class FemtoDreamEventHisto
 /// \brief Class for histogramming event properties
 // template <femtomodes::Mode mode>
@@ -179,9 +181,9 @@ class CascadeHistManager
             std::map<trackhistmanager::TrackHist, std::vector<o2::framework::AxisSpec>> const& NegDauSpecs)
   {
     mHistogramRegistry = registry;
-    mBachelorManager.template init<mode>(registry, BachelorSpecs);
-    mPosDauManager.template init<mode>(registry, PosDauSpecs);
-    mNegDauManager.template init<mode>(registry, NegDauSpecs);
+    mBachelorManager.template init<mode>(registry, BachelorSpecs, AbsChargeDaughters);
+    mPosDauManager.template init<mode>(registry, PosDauSpecs, AbsChargeDaughters);
+    mNegDauManager.template init<mode>(registry, NegDauSpecs, AbsChargeDaughters);
     if constexpr (modes::isFlagSet(mode, modes::Mode::kAnalysis)) {
       initAnalysis(cascadeSpecs);
     }
@@ -190,15 +192,6 @@ class CascadeHistManager
     }
   }
 
-  template <typename T1, typename T2, typename T3, typename T4>
-  void enableOptionalHistograms(T1 const& CascadeConfBinningQa, T2 const& BachelorConfBinningQa, T3 const& PosDauConfBinningQa, T4 const& NegDauConfBinningQa)
-  {
-    mBachelorManager.enableOptionalHistograms(BachelorConfBinningQa);
-    mPosDauManager.enableOptionalHistograms(PosDauConfBinningQa);
-    mNegDauManager.enableOptionalHistograms(NegDauConfBinningQa);
-    mPlot2d = CascadeConfBinningQa.plot2d.value;
-  }
-
   template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4>
   void init(o2::framework::HistogramRegistry* registry,
             std::map<CascadeHist, std::vector<o2::framework::AxisSpec>> const& cascadeSpecs,
@@ -210,8 +203,17 @@ class CascadeHistManager
             std::map<trackhistmanager::TrackHist, std::vector<o2::framework::AxisSpec>> const& NegDauSpecs,
             T4 const& NegDauConfBinningQa)
   {
-    enableOptionalHistograms(CascadeConfBinningQa, BachelorConfBinningQa, PosDauConfBinningQa, NegDauConfBinningQa);
-    this->template init<mode>(registry, cascadeSpecs, BachelorSpecs, PosDauSpecs, NegDauSpecs);
+    mHistogramRegistry = registry;
+    mBachelorManager.template init<mode>(registry, BachelorSpecs, BachelorConfBinningQa, AbsChargeDaughters);
+    mPosDauManager.template init<mode>(registry, PosDauSpecs, PosDauConfBinningQa, AbsChargeDaughters);
+    mNegDauManager.template init<mode>(registry, NegDauSpecs, NegDauConfBinningQa, AbsChargeDaughters);
+    this->enableOptionalHistograms(CascadeConfBinningQa);
+    if constexpr (modes::isFlagSet(mode, modes::Mode::kAnalysis)) {
+      initAnalysis(cascadeSpecs);
+    }
+    if constexpr (modes::isFlagSet(mode, modes::Mode::kQa)) {
+      initQa(cascadeSpecs);
+    }
   }
 
   template <modes::Mode mode, typename T1, typename T2>
@@ -237,6 +239,12 @@ class CascadeHistManager
   }
 
  private:
+  template <typename T>
+  void enableOptionalHistograms(T const& CascadeConfBinningQa)
+  {
+    mPlot2d = CascadeConfBinningQa.plot2d.value;
+  }
+
   void initAnalysis(std::map<CascadeHist, std::vector<o2::framework::AxisSpec>> const& cascadeSpecs)
   {
     std::string analysisDir = std::string(cascadePrefix) + std::string(AnalysisDir);

PWGCF/Femto/Core/collisionBuilder.h

@@ -87,7 +87,7 @@ struct ConfCollisionBits : o2::framework::ConfigurableGroup {
 struct ConfCcdb : o2::framework::ConfigurableGroup {
   std::string prefix = std::string("ConfCcdb");
   o2::framework::Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "URL to ccdb"};
-  o2::framework::Configurable<std::string> grpPath{"grpPath", "GLO/Config/GRPMagField", "Path to GRP object (Run3 -> GLO/Config/GRPMagField/Run2 -> GLO/GRP/GRP"};
+  o2::framework::Configurable<std::string> grpPath{"grpPath", "GLO/Config/GRPMagField", "Path to GRP object (Run3 -> GLO/Config/GRPMagField, Run2 -> GLO/GRP/GRP"};
   o2::framework::Configurable<std::string> triggerPath{"triggerPath", "EventFiltering/Zorro/", "CCDB path for trigger information"};
 };
 
@@ -525,11 +525,7 @@ class CollisionBuilder
     mcBuilder.template fillMcCollisionWithLabel<system>(mcProducts, col, mcCols);
   }
 
-  void
-    reset()
-  {
-    mCollisionAlreadyFilled = false;
-  }
+  void reset() { mCollisionAlreadyFilled = false; }
 
  private:
   CollisionSelection<HistName> mCollisionSelection;

PWGCF/Femto/Core/femtoUtils.h

@@ -210,7 +210,7 @@ using HasSign = decltype(std::declval<T&>().sign());
 template <typename T>
 inline int signum(T x)
 {
-  return (T(0) < x) - (x < T(0)); // works for floats too
+  return (T(0) < x) - (x < T(0));
 }
 
 }; // namespace utils

PWGCF/Femto/Core/histManager.h

@@ -26,6 +26,13 @@ namespace o2::analysis::femto
 namespace histmanager
 {
 
+// plot level for secondaries during mc processing
+enum SecondaryPlotLevel {
+  kSecondaryPlotLevel1 = 1,
+  kSecondaryPlotLevel2 = 2,
+  kSecondaryPlotLevel3 = 3
+};
+
 template <typename Hist>
 struct HistInfo {
   Hist hist;

PWGCF/Femto/Core/kinkHistManager.h

@@ -171,6 +171,8 @@ constexpr char PrefixSigmaPlus2[] = "SigmaPlus2/";
 constexpr std::string_view AnalysisDir = "Kinematics/";
 constexpr std::string_view QaDir = "QA/";
 
+constexpr int AbsChargeDaughters = 1;
+
 /// \class KinkHistManager
 /// \brief Class for histogramming event properties
 // template <femtomodes::Mode mode>
@@ -189,7 +191,7 @@ class KinkHistManager
             std::map<trackhistmanager::TrackHist, std::vector<o2::framework::AxisSpec>> const& ChaDauSpecs)
   {
     mHistogramRegistry = registry;
-    mChaDauManager.template init<mode>(registry, ChaDauSpecs);
+    mChaDauManager.template init<mode>(registry, ChaDauSpecs, AbsChargeDaughters);
     if constexpr (isFlagSet(mode, modes::Mode::kAnalysis)) {
       initAnalysis(KinkSpecs);
     }
@@ -198,22 +200,22 @@ class KinkHistManager
     }
   }
 
-  template <typename T1, typename T2>
-  void enableOptionalHistograms(T1 const& KinkConfBinningQa, T2 const& ChaDauConfBinningQa)
-  {
-    mChaDauManager.enableOptionalHistograms(ChaDauConfBinningQa);
-    mPlot2d = KinkConfBinningQa.plot2d.value;
-  }
-
   template <modes::Mode mode, typename T1, typename T2>
   void init(o2::framework::HistogramRegistry* registry,
             std::map<KinkHist, std::vector<o2::framework::AxisSpec>> const& KinkSpecs,
             T1 const& KinkConfBinningQa,
             std::map<trackhistmanager::TrackHist, std::vector<o2::framework::AxisSpec>> const& ChaDauSpecs,
             T2 const& ChaDauConfBinningQa)
   {
-    enableOptionalHistograms(KinkConfBinningQa, ChaDauConfBinningQa);
-    this->template init<mode>(registry, KinkSpecs, ChaDauSpecs);
+    mHistogramRegistry = registry;
+    mChaDauManager.template init<mode>(registry, ChaDauSpecs, ChaDauConfBinningQa, AbsChargeDaughters);
+    this->enableOptionalHistograms(KinkConfBinningQa);
+    if constexpr (isFlagSet(mode, modes::Mode::kAnalysis)) {
+      initAnalysis(KinkSpecs);
+    }
+    if constexpr (isFlagSet(mode, modes::Mode::kQa)) {
+      initQa(KinkSpecs);
+    }
   }
 
   template <modes::Mode mode, typename T1, typename T2>
@@ -232,6 +234,12 @@ class KinkHistManager
   }
 
  private:
+  template <typename T1>
+  void enableOptionalHistograms(T1 const& KinkConfBinningQa)
+  {
+    mPlot2d = KinkConfBinningQa.plot2d.value;
+  }
+
   void initAnalysis(std::map<KinkHist, std::vector<o2::framework::AxisSpec>> const& KinkSpecs)
   {
     std::string analysisDir = std::string(kinkPrefix) + std::string(AnalysisDir);