Fix: fix namespaces

Author: ariedel-cern

PWGCF/Femto/Core/cascadeBuilder.h

@@ -37,11 +37,8 @@
 #include <unordered_map>
 #include <vector>
 
-namespace o2::analysis::femto
+namespace o2::analysis::femto::cascadebuilder
 {
-namespace cascadebuilder
-{
-
 struct ConfCascadeFilters : o2::framework::ConfigurableGroup {
   std::string prefix = std::string("CascadeFilters");
   o2::framework::Configurable<float> ptMin{"ptMin", 0.f, "Minimum pT"};
@@ -102,7 +99,7 @@ struct ConfOmegaBits : o2::framework::ConfigurableGroup {
   o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"};                                 \
   o2::framework::Configurable<float> massMin{"massMin", defaultMassMin, "Minimum invariant mass for Cascade"};                          \
   o2::framework::Configurable<float> massMax{"massMax", defaultMassMax, "Maximum invariant mass for Cascade"};                          \
-  o2::framework::Configurable<o2::aod::femtodatatypes::CascadeMaskType> mask{"mask", 0x0, "Bitmask for cascade selection"};
+  o2::framework::Configurable<o2::analysis::femto::datatypes::CascadeMaskType> mask{"mask", 0x0, "Bitmask for cascade selection"};
 
 struct ConfXiSelection : o2::framework::ConfigurableGroup {
   std::string prefix = std::string("XiSelection");
@@ -171,7 +168,7 @@ const std::unordered_map<CascadeSels, std::string> cascadeSelectionNames = {
 /// \class FemtoDreamTrackCuts
 /// \brief Cut class to contain and execute all cuts applied to tracks
 template <modes::Cascade cascadeType, const char* HistName>
-class CascadeSelection : public BaseSelection<float, o2::aod::femtodatatypes::CascadeMaskType, kCascadeSelsMax>
+class CascadeSelection : public BaseSelection<float, o2::analysis::femto::datatypes::CascadeMaskType, kCascadeSelsMax>
 {
  public:
   CascadeSelection() = default;
@@ -536,6 +533,5 @@ class CascadeBuilder
   bool mProduceOmegaExtras = false;
 };
 
-} // namespace cascadebuilder
-} // namespace o2::analysis::femto
+} // namespace o2::analysis::femto::cascadebuilder
 #endif // PWGCF_FEMTO_CORE_CASCADEBUILDER_H_

PWGCF/Femto/Core/cascadeHistManager.h

@@ -36,9 +36,7 @@
 #include <string_view>
 #include <vector>
 
-namespace o2::analysis::femto
-{
-namespace cascadehistmanager
+namespace o2::analysis::femto::cascadehistmanager
 {
 // enum for track histograms
 enum CascadeHist {
@@ -687,6 +685,5 @@ class CascadeHistManager
   trackhistmanager::TrackHistManager<posDauPrefix> mPosDauManager;
   trackhistmanager::TrackHistManager<negDauPrefix> mNegDauManager;
 };
-}; // namespace cascadehistmanager
-}; // namespace o2::analysis::femto
+} // namespace o2::analysis::femto::cascadehistmanager
 #endif // PWGCF_FEMTO_CORE_CASCADEHISTMANAGER_H_

PWGCF/Femto/Core/closePairRejection.h

@@ -38,9 +38,7 @@
 #include <string>
 #include <vector>
 
-namespace o2::analysis::femto
-{
-namespace closepairrejection
+namespace o2::analysis::femto::closepairrejection
 {
 // enum for track histograms
 enum CprHist {
@@ -566,11 +564,7 @@ class ClosePairRejectionTrackCascade
     }
   }
 
-  bool
-    isClosePair() const
-  {
-    return mCtrBachelor.isClosePair();
-  }
+  bool isClosePair() const { return mCtrBachelor.isClosePair(); }
 
   void fill(float kstar)
   {
@@ -639,6 +633,5 @@ class ClosePairRejectionMcParticleMcParticle
   CloseTrackRejection<prefix> mCtr;
 };
 
-}; // namespace closepairrejection
-}; // namespace o2::analysis::femto
+}; // namespace o2::analysis::femto::closepairrejection
 #endif // PWGCF_FEMTO_CORE_CLOSEPAIRREJECTION_H_

PWGCF/Femto/Core/closeTripletRejection.h

@@ -24,11 +24,8 @@
 #include <map>
 #include <vector>
 
-namespace o2::analysis::femto
+namespace o2::analysis::femto::closetripletrejection
 {
-namespace closetripletrejection
-{
-
 constexpr const char PrefixCtrTrackTrackTrack[] = "CtrTrackTrackTrack";
 using ConfCtrTrackTrackTrack = closepairrejection::ConfCpr<PrefixCtrTrackTrackTrack>;
 
@@ -223,6 +220,5 @@ class CloseTripletRejectionTrackTrackCascade
   closepairrejection::ClosePairRejectionTrackCascade<prefixTrack2Bachelor, prefixTrack2V0Daughter> mCtrTrack2Cascade;
 };
 
-} // namespace closetripletrejection
-} // namespace o2::analysis::femto
+} // namespace o2::analysis::femto::closetripletrejection
 #endif // PWGCF_FEMTO_CORE_CLOSETRIPLETREJECTION_H_

PWGCF/Femto/Core/collisionBuilder.h

@@ -41,11 +41,8 @@
 #include <unordered_map>
 #include <vector>
 
-namespace o2::analysis::femto
+namespace o2::analysis::femto::collisionbuilder
 {
-namespace collisionbuilder
-{
-
 // configurables for collision selection
 struct ConfCollisionFilters : o2::framework::ConfigurableGroup {
   std::string prefix = std::string("CollisionFilter");
@@ -112,7 +109,7 @@ struct ConfCollisionSelection : o2::framework::ConfigurableGroup {
   o2::framework::Configurable<float> centMax{"centMax", 100.f, "Maximum centrality (multiplicity percentile)"};
   o2::framework::Configurable<int> magFieldMin{"magFieldMin", -5, "Minimum magnetic field strength (kG)"};
   o2::framework::Configurable<int> magFieldMax{"magFieldMax", 5, "Maximum magnetic field strength (kG)"};
-  o2::framework::Configurable<aod::femtodatatypes::CollisionMaskType> collisionMask{"collisionMask", 0x0, "Bitmask for collision"};
+  o2::framework::Configurable<datatypes::CollisionMaskType> collisionMask{"collisionMask", 0x0, "Bitmask for collision"};
 };
 
 /// enum for all collision selections
@@ -167,7 +164,7 @@ const std::unordered_map<CollisionSels, std::string> collisionSelectionNames = {
 };
 
 template <const char* HistName>
-class CollisionSelection : public BaseSelection<float, o2::aod::femtodatatypes::CollisionMaskType, kCollisionSelsMax>
+class CollisionSelection : public BaseSelection<float, o2::analysis::femto::datatypes::CollisionMaskType, kCollisionSelsMax>
 {
  public:
   CollisionSelection() = default;
@@ -652,7 +649,6 @@ class CollisionBuilderDerivedToDerived
   }
 };
 
-} // namespace collisionbuilder
-} // namespace o2::analysis::femto
+} // namespace o2::analysis::femto::collisionbuilder
 ;
 #endif // PWGCF_FEMTO_CORE_COLLISIONBUILDER_H_

PWGCF/Femto/Core/collisionHistManager.h

@@ -29,11 +29,8 @@
 #include <string_view>
 #include <vector>
 
-namespace o2::analysis::femto
+namespace o2::analysis::femto::colhistmanager
 {
-namespace colhistmanager
-{
-
 enum ColHist {
   kPosZ,
   kMult,
@@ -345,6 +342,5 @@ class CollisionHistManager
   o2::framework::HistogramRegistry* mHistogramRegistry = nullptr;
   bool mPlot2d = false;
 };
-} // namespace colhistmanager
-} // namespace o2::analysis::femto
+} // namespace o2::analysis::femto::colhistmanager
 #endif // PWGCF_FEMTO_CORE_COLLISIONHISTMANAGER_H_

PWGCF/Femto/Core/dataTypes.h

@@ -18,9 +18,7 @@
 
 #include <cstdint>
 
-namespace o2::aod
-{
-namespace femtodatatypes
+namespace o2::analysis::femto::datatypes
 {
 // Note: Length of the bitmask is the limit of how many selections can be configured
 
@@ -59,8 +57,6 @@ using ParticleType = uint16_t;
 using MomentumType = uint16_t;
 using TransverseMassType = uint16_t;
 
-} // namespace femtodatatypes
-
-} // namespace o2::aod
+} // namespace o2::analysis::femto::datatypes
 
 #endif // PWGCF_FEMTO_CORE_DATATYPES_H_

PWGCF/Femto/Core/histManager.h

@@ -21,11 +21,8 @@
 #include <string>
 #include <string_view>
 
-namespace o2::analysis::femto
+namespace o2::analysis::femto::histmanager
 {
-namespace histmanager
-{
-
 // plot level for secondaries during mc processing
 enum SecondaryPlotLevel {
   kSecondaryPlotLevel1 = 1,
@@ -80,6 +77,5 @@ constexpr const char* getHistDesc(EnumType variable, const ArrayType& array)
 
   return it != array.end() ? it->histdesc.data() : "";
 }
-} // namespace histmanager
-} // namespace o2::analysis::femto
+} // namespace o2::analysis::femto::histmanager
 #endif // PWGCF_FEMTO_CORE_HISTMANAGER_H_

PWGCF/Femto/Core/kinkBuilder.h

@@ -41,11 +41,8 @@
 #include <unordered_map>
 #include <vector>
 
-namespace o2::analysis::femto
+namespace o2::analysis::femto::kinkbuilder
 {
-namespace kinkbuilder
-{
-
 // filters applied in the producer task
 struct ConfKinkFilters : o2::framework::ConfigurableGroup {
   std::string prefix = std::string("KinkFilters");
@@ -104,7 +101,7 @@ struct ConfSigmaPlusBits : o2::framework::ConfigurableGroup {
   o2::framework::Configurable<float> phiMax{"phiMax", 1.f * o2::constants::math::TwoPI, "Maximum phi"};                \
   o2::framework::Configurable<float> massMin{"massMin", defaultMassMin, "Minimum invariant mass for Sigma"};           \
   o2::framework::Configurable<float> massMax{"massMax", defaultMassMax, "Maximum invariant mass for Sigma"};           \
-  o2::framework::Configurable<o2::aod::femtodatatypes::KinkMaskType> mask{"mask", 0x0, "Bitmask for kink selection"};
+  o2::framework::Configurable<o2::analysis::femto::datatypes::KinkMaskType> mask{"mask", 0x0, "Bitmask for kink selection"};
 
 // base selection for analysis task for sigmas
 template <const char* Prefix>
@@ -178,7 +175,7 @@ const std::unordered_map<KinkSeles, std::string> kinkSelectionNames = {
 /// \class KinkCuts
 /// \brief Cut class to contain and execute all cuts applied to kinks
 template <modes::Kink kinkType, const char* HistName>
-class KinkSelection : public BaseSelection<float, o2::aod::femtodatatypes::KinkMaskType, kKinkSelsMax>
+class KinkSelection : public BaseSelection<float, o2::analysis::femto::datatypes::KinkMaskType, kKinkSelsMax>
 {
  public:
   KinkSelection() = default;
@@ -668,7 +665,5 @@ class KinkBuilderDerivedToDerived
   int mLimitSigma = 0;
   int mLimitSigmaPlus = 0;
 };
-
-} // namespace kinkbuilder
-} // namespace o2::analysis::femto
+} // namespace o2::analysis::femto::kinkbuilder
 #endif // PWGCF_FEMTO_CORE_KINKBUILDER_H_

PWGCF/Femto/Core/kinkHistManager.h

@@ -37,9 +37,7 @@
 #include <string_view>
 #include <vector>
 
-namespace o2::analysis::femto
-{
-namespace kinkhistmanager
+namespace o2::analysis::femto::kinkhistmanager
 {
 // enum for kink histograms
 enum KinkHist {
@@ -625,6 +623,5 @@ class KinkHistManager
   int mPlotNSecondaries = 0;
   std::array<int, MaxSecondary> mPdgCodesSecondaryMother = {0};
 };
-}; // namespace kinkhistmanager
-}; // namespace o2::analysis::femto
+}; // namespace o2::analysis::femto::kinkhistmanager
 #endif // PWGCF_FEMTO_CORE_KINKHISTMANAGER_H_