[PWGCF] FemtoUniverse -- FemtoUniverse.h O2 linter fixes (#9116)

Co-authored-by: Zuzanna Chochulska <01150674@pw.edu.pl>

Author: zchochul

PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h

@@ -88,7 +88,7 @@ class FemtoUniverseCascadeSelection
   }
 
   /// Initializes histograms for the task
-  template <o2::aod::femtouniverseparticle::ParticleType part, o2::aod::femtouniverseparticle::ParticleType daugh, o2::aod::femtouniverseparticle::ParticleType bach, typename cutContainerType>
+  template <o2::aod::femtouniverseparticle::ParticleType part, o2::aod::femtouniverseparticle::ParticleType daugh, o2::aod::femtouniverseparticle::ParticleType bach, typename CutContainerType>
   void init(HistogramRegistry* registry, bool isSelectCascOmega = false);
 
   template <typename Col, typename Casc, typename Track>
@@ -285,7 +285,7 @@ class FemtoUniverseCascadeSelection
 
 }; // namespace femto_universe
 
-template <o2::aod::femtouniverseparticle::ParticleType part, o2::aod::femtouniverseparticle::ParticleType daugh, o2::aod::femtouniverseparticle::ParticleType bach, typename cutContainerType>
+template <o2::aod::femtouniverseparticle::ParticleType part, o2::aod::femtouniverseparticle::ParticleType daugh, o2::aod::femtouniverseparticle::ParticleType bach, typename CutContainerType>
 void FemtoUniverseCascadeSelection::init(HistogramRegistry* registry, bool isSelectCascOmega)
 {
 
@@ -308,22 +308,22 @@ void FemtoUniverseCascadeSelection::init(HistogramRegistry* registry, bool isSel
     /// \todo this should be an automatic check in the parent class, and the
     /// return type should be templated
     size_t nSelections = getNSelections();
-    if (nSelections > 17 * sizeof(cutContainerType)) {
+    if (nSelections > 17 * sizeof(CutContainerType)) {
       LOG(fatal) << "FemtoUniverseCascadeCuts: Number of selections to large for your "
                     "container - quitting!";
     }
 
     posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
                        aod::femtouniverseparticle::TrackType::kPosChild,
-                       aod::femtouniverseparticle::cutContainerType>(
+                       aod::femtouniverseparticle::CutContainerType>(
       mHistogramRegistry);
     negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
                        aod::femtouniverseparticle::TrackType::kNegChild,
-                       aod::femtouniverseparticle::cutContainerType>(
+                       aod::femtouniverseparticle::CutContainerType>(
       mHistogramRegistry);
     bachTrackSel.init<aod::femtouniverseparticle::ParticleType::kCascadeBachelor,
                       aod::femtouniverseparticle::TrackType::kBachelor,
-                      aod::femtouniverseparticle::cutContainerType>(
+                      aod::femtouniverseparticle::CutContainerType>(
       mHistogramRegistry);
 
     // V0 (Lambda)

PWGCF/FemtoUniverse/Core/FemtoUniverseCutculator.h

@@ -200,7 +200,7 @@ class FemtoUniverseCutculator
   /// \param selectionType Selection type under investigation, as defined in the
   /// selection class
   template <typename T1, typename T2>
-  void checkForSelection(aod::femtouniverseparticle::cutContainerType& output,
+  void checkForSelection(aod::femtouniverseparticle::CutContainerType& output,
                          size_t& counter, T1 objectSelection, T2 selectionType,
                          bool SysChecks, float sign)
   {
@@ -294,9 +294,9 @@ class FemtoUniverseCutculator
   /// container that will be put to the user task incorporating the user choice
   /// of selections
   template <typename T>
-  aod::femtouniverseparticle::cutContainerType iterateSelection(T objectSelection, bool SysChecks, float sign)
+  aod::femtouniverseparticle::CutContainerType iterateSelection(T objectSelection, bool SysChecks, float sign)
   {
-    aod::femtouniverseparticle::cutContainerType output = 0;
+    aod::femtouniverseparticle::CutContainerType output = 0;
     size_t counter = 0;
     auto selectionVariables = objectSelection.getSelectionVariables();
     for (auto selVarIt : selectionVariables) {
@@ -309,7 +309,7 @@ class FemtoUniverseCutculator
   /// selection bit-wise container incorporating the user choice of selections
   void analyseCuts(std::string choice, bool SysChecks = false, float sign = 1)
   {
-    aod::femtouniverseparticle::cutContainerType output = -1;
+    aod::femtouniverseparticle::CutContainerType output = -1;
     if (choice == std::string("T")) {
       output = iterateSelection(mTrackSel, SysChecks, sign);
     } else if (choice == std::string("V")) {
@@ -319,7 +319,7 @@ class FemtoUniverseCutculator
       std::cout << "Option " << choice << " not recognized - available options are (T/V)" << std::endl;
       return;
     }
-    std::bitset<8 * sizeof(aod::femtouniverseparticle::cutContainerType)>
+    std::bitset<8 * sizeof(aod::femtouniverseparticle::CutContainerType)>
       bitOutput = output;
     // LOGF(info, "+++++++++++++++++++++++++++++++++");
     // LOGF(info, "CutCulator has spoken - your selection bit is");

PWGCF/FemtoUniverse/Core/FemtoUniversePhiSelection.h

@@ -72,7 +72,7 @@ class FemtoUniversePhiSelection
   /// Initializes histograms for the task
   template <o2::aod::femtouniverseparticle::ParticleType part,
             o2::aod::femtouniverseparticle::ParticleType daugh,
-            typename cutContainerType>
+            typename CutContainerType>
   void init(HistogramRegistry* registry);
 
   template <typename C, typename V, typename T>
@@ -85,8 +85,8 @@ class FemtoUniversePhiSelection
 
   /// \todo for the moment the PID of the tracks is factored out into a separate
   /// field, hence 5 values in total \\ASK: what does it mean?
-  template <typename cutContainerType, typename C, typename V, typename T>
-  std::array<cutContainerType, 5> getCutContainer(C const& col, V const& phi,
+  template <typename CutContainerType, typename C, typename V, typename T>
+  std::array<CutContainerType, 5> getCutContainer(C const& col, V const& phi,
                                                   T const& posTrack,
                                                   T const& negTrack);
 
@@ -273,7 +273,7 @@ class FemtoUniversePhiSelection
 
 template <o2::aod::femtouniverseparticle::ParticleType part,
           o2::aod::femtouniverseparticle::ParticleType daugh,
-          typename cutContainerType>
+          typename CutContainerType>
 void FemtoUniversePhiSelection::init(HistogramRegistry* registry)
 {
 
@@ -290,7 +290,7 @@ void FemtoUniversePhiSelection::init(HistogramRegistry* registry)
     /// \todo this should be an automatic check in the parent class, and the
     /// return type should be templated
     size_t nSelections = getNSelections();
-    if (nSelections > 8 * sizeof(cutContainerType)) {
+    if (nSelections > 8 * sizeof(CutContainerType)) {
       LOG(fatal) << "FemtoUniversePhiCuts: Number of selections to large for your "
                     "container - quitting!";
     }
@@ -309,11 +309,11 @@ void FemtoUniversePhiSelection::init(HistogramRegistry* registry)
 
     posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kPhiChild,
                        aod::femtouniverseparticle::TrackType::kPosChild,
-                       aod::femtouniverseparticle::cutContainerType>(
+                       aod::femtouniverseparticle::CutContainerType>(
       mHistogramRegistry);
     negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kPhiChild,
                        aod::femtouniverseparticle::TrackType::kNegChild,
-                       aod::femtouniverseparticle::cutContainerType>(
+                       aod::femtouniverseparticle::CutContainerType>(
       mHistogramRegistry);
 
     // mHistogramRegistry->add("LambdaQA/hInvMassLambdaNoCuts", "No cuts", kTH1F,
@@ -519,13 +519,13 @@ void FemtoUniversePhiSelection::fillLambdaQA(C const& col, V const& phi,
 
 /// the CosPA of Phi needs as argument the posXYZ of collisions vertex so we need
 /// to pass the collsion as well
-template <typename cutContainerType, typename C, typename V, typename T>
-std::array<cutContainerType, 5>
+template <typename CutContainerType, typename C, typename V, typename T>
+std::array<CutContainerType, 5>
   FemtoUniversePhiSelection::getCutContainer(C const& col, V const& phi, T const& posTrack, T const& negTrack)
 {
-  auto outputPosTrack = posDaughTrack.getCutContainer<cutContainerType>(posTrack);
-  auto outputNegTrack = negDaughTrack.getCutContainer<cutContainerType>(negTrack);
-  cutContainerType output = 0;
+  auto outputPosTrack = posDaughTrack.getCutContainer<CutContainerType>(posTrack);
+  auto outputNegTrack = negDaughTrack.getCutContainer<CutContainerType>(negTrack);
+  CutContainerType output = 0;
   size_t counter = 0;
 
   auto lambdaMassNominal = o2::constants::physics::MassPhi;

PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h

@@ -96,9 +96,9 @@ class FemtoUniverseTrackSelection : public FemtoUniverseObjectSelection<float, f
   /// Initializes histograms for the task
   /// \tparam part Type of the particle for proper naming of the folders for QA
   /// \tparam tracktype Type of track (track, positive child, negative child) for proper naming of the folders for QA
-  /// \tparam cutContainerType Data type of the bit-wise container for the selections
+  /// \tparam CutContainerType Data type of the bit-wise container for the selections
   /// \param registry HistogramRegistry for QA output
-  template <o2::aod::femtouniverseparticle::ParticleType part, o2::aod::femtouniverseparticle::TrackType tracktype, typename cutContainerType>
+  template <o2::aod::femtouniverseparticle::ParticleType part, o2::aod::femtouniverseparticle::TrackType tracktype, typename CutContainerType>
   void init(HistogramRegistry* registry);
 
   /// Passes the species to the task for which PID needs to be stored
@@ -138,12 +138,12 @@ class FemtoUniverseTrackSelection : public FemtoUniverseObjectSelection<float, f
 
   /// Obtain the bit-wise container for the selections
   /// \todo For the moment, PID is separated from the other selections, hence instead of a single value an std::array of size two is returned
-  /// \tparam cutContainerType Data type of the bit-wise container for the selections
+  /// \tparam CutContainerType Data type of the bit-wise container for the selections
   /// \tparam T Data type of the track
   /// \param track Track
   /// \return The bit-wise container for the selections, separately with all selection criteria, and the PID
-  template <typename cutContainerType, typename T>
-  std::array<cutContainerType, 2> getCutContainer(T const& track);
+  template <typename CutContainerType, typename T>
+  std::array<CutContainerType, 2> getCutContainer(T const& track);
 
   /// Some basic QA histograms
   /// \tparam part Type of the particle for proper naming of the folders for QA
@@ -289,7 +289,7 @@ class FemtoUniverseTrackSelection : public FemtoUniverseObjectSelection<float, f
                                                                           "Maximal PID (nSigma)"}; ///< Helper information for the different selections
 }; // namespace femto_universe
 
-template <o2::aod::femtouniverseparticle::ParticleType part, o2::aod::femtouniverseparticle::TrackType tracktype, typename cutContainerType>
+template <o2::aod::femtouniverseparticle::ParticleType part, o2::aod::femtouniverseparticle::TrackType tracktype, typename CutContainerType>
 void FemtoUniverseTrackSelection::init(HistogramRegistry* registry)
 {
   if (registry) {
@@ -298,7 +298,7 @@ void FemtoUniverseTrackSelection::init(HistogramRegistry* registry)
 
     /// check whether the number of selection exceeds the bitmap size
     unsigned int nSelections = getNSelections() - getNSelections(femto_universe_track_selection::kPIDnSigmaMax);
-    if (nSelections > 8 * sizeof(cutContainerType)) {
+    if (nSelections > 8 * sizeof(CutContainerType)) {
       LOG(fatal) << "FemtoUniverseTrackCuts: Number of selections too large for your container - quitting!";
     }
 
@@ -456,12 +456,12 @@ bool FemtoUniverseTrackSelection::isSelectedMinimal(T const& track)
   return true;
 }
 
-template <typename cutContainerType, typename T>
-std::array<cutContainerType, 2> FemtoUniverseTrackSelection::getCutContainer(T const& track)
+template <typename CutContainerType, typename T>
+std::array<CutContainerType, 2> FemtoUniverseTrackSelection::getCutContainer(T const& track)
 {
-  cutContainerType output = 0;
+  CutContainerType output = 0;
   size_t counter = 0;
-  cutContainerType outputPID = 0;
+  CutContainerType outputPID = 0;
   const auto sign = track.sign();
   const auto pT = track.pt();
   const auto eta = track.eta();

PWGCF/FemtoUniverse/Core/FemtoUniverseV0Selection.h

@@ -71,7 +71,7 @@ class FemtoUniverseV0Selection
   /// Initializes histograms for the task
   template <o2::aod::femtouniverseparticle::ParticleType part,
             o2::aod::femtouniverseparticle::ParticleType daugh,
-            typename cutContainerType>
+            typename CutContainerType>
   void init(HistogramRegistry* registry);
 
   template <typename C, typename V, typename T>
@@ -84,8 +84,8 @@ class FemtoUniverseV0Selection
 
   /// \todo for the moment the PID of the tracks is factored out into a separate
   /// field, hence 5 values in total \\ASK: what does it mean?
-  template <typename cutContainerType, typename C, typename V, typename T>
-  std::array<cutContainerType, 5> getCutContainer(C const& col, V const& v0,
+  template <typename CutContainerType, typename C, typename V, typename T>
+  std::array<CutContainerType, 5> getCutContainer(C const& col, V const& v0,
                                                   T const& posTrack,
                                                   T const& negTrack);
 
@@ -273,7 +273,7 @@ class FemtoUniverseV0Selection
 
 template <o2::aod::femtouniverseparticle::ParticleType part,
           o2::aod::femtouniverseparticle::ParticleType daugh,
-          typename cutContainerType>
+          typename CutContainerType>
 void FemtoUniverseV0Selection::init(HistogramRegistry* registry)
 {
   if (registry) {
@@ -288,7 +288,7 @@ void FemtoUniverseV0Selection::init(HistogramRegistry* registry)
     /// \todo this should be an automatic check in the parent class, and the
     /// return type should be templated
     size_t nSelections = getNSelections();
-    if (nSelections > 8 * sizeof(cutContainerType)) {
+    if (nSelections > 8 * sizeof(CutContainerType)) {
       LOG(fatal) << "FemtoUniverseV0Cuts: Number of selections to large for your "
                     "container - quitting!";
     }
@@ -332,11 +332,11 @@ void FemtoUniverseV0Selection::init(HistogramRegistry* registry)
 
     posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
                        aod::femtouniverseparticle::TrackType::kPosChild,
-                       aod::femtouniverseparticle::cutContainerType>(
+                       aod::femtouniverseparticle::CutContainerType>(
       mHistogramRegistry);
     negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
                        aod::femtouniverseparticle::TrackType::kNegChild,
-                       aod::femtouniverseparticle::cutContainerType>(
+                       aod::femtouniverseparticle::CutContainerType>(
       mHistogramRegistry);
 
     mHistogramRegistry->add("LambdaQA/hInvMassLambdaNoCuts", "No cuts", kTH1F,
@@ -542,13 +542,13 @@ void FemtoUniverseV0Selection::fillLambdaQA(C const& /*col*/, V const& v0,
 
 /// the CosPA of V0 needs as argument the posXYZ of collisions vertex so we need
 /// to pass the collsion as well
-template <typename cutContainerType, typename C, typename V, typename T>
-std::array<cutContainerType, 5>
+template <typename CutContainerType, typename C, typename V, typename T>
+std::array<CutContainerType, 5>
   FemtoUniverseV0Selection::getCutContainer(C const& /*col*/, V const& v0, T const& posTrack, T const& negTrack)
 {
-  auto outputPosTrack = posDaughTrack.getCutContainer<cutContainerType>(posTrack);
-  auto outputNegTrack = negDaughTrack.getCutContainer<cutContainerType>(negTrack);
-  cutContainerType output = 0;
+  auto outputPosTrack = posDaughTrack.getCutContainer<CutContainerType>(posTrack);
+  auto outputNegTrack = negDaughTrack.getCutContainer<CutContainerType>(negTrack);
+  CutContainerType output = 0;
   size_t counter = 0;
 
   auto lambdaMassNominal = o2::constants::physics::MassLambda; // FIXME: Get from the common header

PWGCF/FemtoUniverse/Core/femtoUtils.h

@@ -53,7 +53,7 @@ int getPIDselection(float nSigma, std::vector<float> vNsigma)
 /// \param vNsigma vector with available n-sigma selections for PID (to check if chosen nSigma value is avialable + size to get the bit number)
 /// \param KDetector enum corresponding to the PID technique
 /// \return Whether the PID selection specified in the vectors is fulfilled
-bool isPIDSelected(aod::femtouniverseparticle::cutContainerType pidcut,
+bool isPIDSelected(aod::femtouniverseparticle::CutContainerType pidcut,
                    int vSpecies,
                    int nSpecies,
                    float nSigma,
@@ -76,7 +76,7 @@ bool isPIDSelected(aod::femtouniverseparticle::cutContainerType pidcut,
 /// \param nSigmaTPC Number of TPC sigmas for selection
 /// \param nSigmaTPCTOF Number of TPC+TOF sigmas for selection (circular selection)
 /// \return Whether the PID selection is fulfilled
-bool isFullPIDSelected(aod::femtouniverseparticle::cutContainerType const& pidCut,
+bool isFullPIDSelected(aod::femtouniverseparticle::CutContainerType const& pidCut,
                        float momentum,
                        float pidThresh,
                        int vSpecies,