[Common] Enclose Metadata and CollisionType Helper in o2 namespace (#11657)

Author: njacazio

Common/Core/CollisionTypeHelper.cxx

@@ -16,11 +16,14 @@
 ///
 
 #include "Common/Core/CollisionTypeHelper.h"
+
+#include "DataFormatsParameters/GRPLHCIFData.h"
+
 #include <fairlogger/Logger.h>
+
 #include <string>
-#include "DataFormatsParameters/GRPLHCIFData.h"
 
-std::string CollisionSystemType::getCollisionSystemName(collType collSys)
+std::string o2::common::core::CollisionSystemType::getCollisionSystemName(collType collSys)
 {
   switch (collSys) {
     case kCollSyspp:
@@ -36,7 +39,7 @@ std::string CollisionSystemType::getCollisionSystemName(collType collSys)
   }
 }
 
-int CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif)
+int o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif)
 {
   const int ZBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA);
   const int ZBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC);

Common/Core/CollisionTypeHelper.h

@@ -18,9 +18,12 @@
 #ifndef COMMON_CORE_COLLISIONTYPEHELPER_H_
 #define COMMON_CORE_COLLISIONTYPEHELPER_H_
 
-#include <string>
 #include "DataFormatsParameters/GRPLHCIFData.h"
 
+#include <string>
+
+namespace o2::common::core
+{
 // Container for the collision system type
 struct CollisionSystemType {
   // Enum type for the collision system
@@ -38,4 +41,8 @@ struct CollisionSystemType {
   static int getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif);
 };
 
+} // namespace o2::common::core
+
+using CollisionSystemType = o2::common::core::CollisionSystemType;
+
 #endif // COMMON_CORE_COLLISIONTYPEHELPER_H_

Common/Core/MetadataHelper.cxx

@@ -20,6 +20,8 @@
 #include "Framework/InitContext.h"
 #include "Framework/RunningWorkflowInfo.h"
 
+using namespace o2::common::core;
+
 MetadataHelper::MetadataHelper()
 {
   const std::array<std::string, 8> keyList = {"DataType",

Common/Core/MetadataHelper.h

@@ -18,10 +18,14 @@
 #ifndef COMMON_CORE_METADATAHELPER_H_
 #define COMMON_CORE_METADATAHELPER_H_
 
-#include <string>
-#include <map>
 #include "Framework/ConfigContext.h"
 
+#include <map>
+#include <string>
+
+namespace o2::common::core
+{
+
 struct MetadataHelper {
   /// @brief Constructor for the MetadataHelper. Defines the all the metadata keys that will be looked for and accessible
   MetadataHelper();
@@ -64,4 +68,8 @@ struct MetadataHelper {
   bool mIsInitialized = false;                  /// < Flag to check if the metadata has been initialized
 };
 
+} // namespace o2::common::core
+
+using MetadataHelper = o2::common::core::MetadataHelper; // Alias for the MetadataHelper
+
 #endif // COMMON_CORE_METADATAHELPER_H_