namespace compliant with O2 coding guidelines

Author: Barthelemy

Framework/CMakeLists.txt

@@ -69,23 +69,33 @@ set(SRCS
         src/CheckInterface.cxx
         src/DatabaseFactory.cxx
         src/ClientDataProvider.cxx
+        src/AlfaReceiverForTests.cxx
+        src/TaskDevice.cxx
+        src/SpyDevice.cxx
+        src/SpyMainFrame.cxx
         )
 
 set(HEADERS # needed for the dictionary generation
         include/QualityControl/MonitorObject.h
         include/QualityControl/Quality.h
         include/QualityControl/CheckInterface.h
         include/QualityControl/SpyMainFrame.h
-)
 
-if (FAIRROOT_FOUND)
-    list(APPEND SRCS
-            src/AlfaReceiverForTests.cxx
-            src/TaskDevice.cxx
-            src/SpyDevice.cxx
-            src/SpyMainFrame.cxx
-            )
-endif (FAIRROOT_FOUND)
+        include/QualityControl/TaskInterface.h
+        include/QualityControl/ObjectsManager.h
+        include/QualityControl/TaskFactory.h
+        include/QualityControl/Checker.h
+        include/QualityControl/DatabaseFactory.h
+        include/QualityControl/ClientDataProvider.h
+        include/QualityControl/AlfaReceiverForTests.h
+        include/QualityControl/TaskDevice.h
+        include/QualityControl/SpyDevice.h
+        include/QualityControl/CheckerConfig.h
+        include/QualityControl/Consumer.h
+        include/QualityControl/DatabaseInterface.h
+        include/QualityControl/QcInfoLogger.h
+        include/QualityControl/TaskConfig.h
+)
 
 if(MYSQL_FOUND)
     list(APPEND SRCS src/MySqlDatabase.cxx)

Framework/example-default.ini

@@ -27,8 +27,8 @@ taskDefinition=taskDefinition_1
 taskDefinition=taskDefinition_1
 
 [taskDefinition_1] # Actual definition of the dummy tasks
-;className=AliceO2::QualityControlModules::Skeleton::SkeletonTask
-className=AliceO2::QualityControlModules::Example::ExampleTask
+;className=o2::quality_control_modules::skeleton::SkeletonTask
+className=o2::quality_control_modules::example::ExampleTask
 moduleName=QcExample
 cycleDurationSeconds=10
 ; set to -1 for no maximum or remove the line
@@ -39,7 +39,7 @@ maxNumberCycles=-1
 taskDefinition=daqTaskDefinition
 
 [daqTaskDefinition]
-className=AliceO2::QualityControlModules::Daq::DaqTask
+className=o2::quality_control_modules::daq::DaqTask
 moduleName=QcDaq
 moduleOfChecks=QcExample
 
@@ -50,11 +50,11 @@ taskDefinition=benchmark
 ;address=tcp://*:5556
 
 [benchmark] # Benchmark tasks definition
-className=AliceO2::QualityControlModules::Example::BenchmarkTask
+className=o2::quality_control_modules::example::BenchmarkTask
 moduleName=QcExample
 numberHistos=1
 numberChecks=1
-typeOfChecks=AliceO2::QualityControlModules::Example::FakeCheck
+typeOfChecks=o2::quality_control_modules::example::FakeCheck
 moduleOfChecks=QcExample
 cycleDurationSeconds=1
 

Framework/include/QualityControl/AlfaReceiverForTests.h

@@ -9,9 +9,9 @@
 #include <FairMQDevice.h>
 #include <TMessage.h>
 
-namespace AliceO2 {
-namespace QualityControl {
-namespace Core {
+namespace o2 {
+namespace quality_control {
+namespace core {
 
 class TestTMessage : public TMessage
 {
@@ -34,8 +34,8 @@ class AlfaReceiverForTests : public FairMQDevice
 
 };
 
-} // namespace Core
+} // namespace core
 } // namespace QualityControl
-} // namespace AliceO2
+} // namespace o2
 
 #endif // QUALITY_CONTROL_AlfaReceiverForTests_H

Framework/include/QualityControl/CheckInterface.h

@@ -9,10 +9,10 @@
 #include "QualityControl/MonitorObject.h"
 #include "QualityControl/Quality.h"
 
-using namespace AliceO2::QualityControl::Core;
+using namespace o2::quality_control::core;
 
-namespace AliceO2 {
-namespace QualityControl {
+namespace o2 {
+namespace quality_control {
 namespace Checker {
 
 /// \brief  Skeleton of a check.
@@ -76,6 +76,6 @@ class CheckInterface
 
 } /* namespace Checker */
 } /* namespace QualityControl */
-} /* namespace AliceO2 */
+} /* namespace o2 */
 
 #endif /* QUALITYCONTROL_LIBS_CHECKER_CHECKINTERFACE_H_ */

Framework/include/QualityControl/Checker.h

@@ -29,8 +29,8 @@
 
 namespace ba = boost::accumulators;
 
-namespace AliceO2 {
-namespace QualityControl {
+namespace o2 {
+namespace quality_control {
 namespace Checker {
 
 /// \brief The class in charge of running the checks on a MonitorObject.
@@ -93,8 +93,8 @@ class Checker : public FairMQDevice
     static void CustomCleanupTMessage(void *data, void *object);
     void populateConfig( std::unique_ptr<AliceO2::Configuration::ConfigurationInterface>& config, std::string checkerName);
 
-    AliceO2::QualityControl::Core::QcInfoLogger &mLogger;
-    AliceO2::QualityControl::Repository::DatabaseInterface *mDatabase;
+    o2::quality_control::core::QcInfoLogger &mLogger;
+    o2::quality_control::repository::DatabaseInterface *mDatabase;
     std::vector<std::string> mTasksAlreadyEncountered;
     CheckerConfig mCheckerConfig;
 
@@ -112,6 +112,6 @@ class Checker : public FairMQDevice
 
 } /* namespace Checker */
 } /* namespace QualityControl */
-} /* namespace AliceO2 */
+} /* namespace o2 */
 
 #endif /* QUALITYCONTROL_LIBS_CHECKER_CHECKER_H_ */

Framework/include/QualityControl/CheckerConfig.h

@@ -8,9 +8,9 @@
 
 #include <string>
 
-namespace AliceO2 {
-namespace QualityControl {
-namespace Core {
+namespace o2 {
+namespace quality_control {
+namespace core {
 
 /// \brief  Container for the configuration of a Task
 ///
@@ -28,8 +28,8 @@ struct CheckerConfig
     std::string tasksAddresses;
 };
 
-} // namespace Core
+} // namespace core
 } // namespace QualityControl
-} // namespace AliceO2
+} // namespace o2
 
 #endif // QUALITYCONTROL_CORE_CHECKERCONFIG_H_

Framework/include/QualityControl/ClientDataProvider.h

@@ -9,11 +9,12 @@
 #include "QualityControl/MonitorObject.h"
 #include "QualityControl/DatabaseInterface.h"
 
-using namespace AliceO2::QualityControl;
+using namespace o2::quality_control;
 
-namespace AliceO2 {
-namespace QualityControl {
-namespace Client {
+namespace o2 {
+namespace quality_control {
+namespace client
+{
 
 /// \brief Class to access all information a client can need.
 /// It is a Facade for the various specialized and specific data providers (eg. DB or IS)
@@ -35,12 +36,12 @@ class ClientDataProvider
 
   private:
     // Facaded systems
-    Repository::DatabaseInterface *database;
+    repository::DatabaseInterface *database;
 
 };
 
 } /* namespace Client */
 } /* namespace QualityControl */
-} /* namespace AliceO2 */
+} /* namespace o2 */
 
 #endif /* QUALITYCONTROL_CLIENT_CLIENT_DATA_PROVIDER_H_ */

Framework/include/QualityControl/Consumer.h

@@ -9,11 +9,11 @@
 // QC
 #include "QualityControl/ClientDataProvider.h"
 
-using namespace AliceO2::QualityControl;
+using namespace o2::quality_control;
 
-namespace AliceO2 {
-namespace QualityControl {
-namespace Client {
+namespace o2 {
+namespace quality_control {
+namespace client {
 
 /// \brief A special client that polls and consumes all available data.
 /// It is used to stress the system for benchmarks.
@@ -37,6 +37,6 @@ class Consumer
 
 } /* namespace Client */
 } /* namespace QualityControl */
-} /* namespace AliceO2 */
+} /* namespace o2 */
 
 #endif /* QUALITYCONTROL_CLIENT_CONSUMER_H_ */

Framework/include/QualityControl/DatabaseFactory.h

@@ -12,9 +12,9 @@
 // QC
 #include "QualityControl/DatabaseInterface.h"
 
-namespace AliceO2 {
-namespace QualityControl {
-namespace Repository {
+namespace o2 {
+namespace quality_control {
+namespace repository {
 
 /// \brief Factory to get a database accessor
 class DatabaseFactory
@@ -30,8 +30,8 @@ class DatabaseFactory
     static DatabaseInterface* create(std::string name);
 };
 
-} // namespace Core
+} // namespace core
 } // namespace QualityControl
-} // namespace AliceO2
+} // namespace o2
 
 #endif // QUALITYCONTROL_LIBS_CORE_DatabaseFactory_H_

Framework/include/QualityControl/DatabaseInterface.h

@@ -9,9 +9,9 @@
 #include "QualityControl/MonitorObject.h"
 #include <memory>
 
-namespace AliceO2 {
-namespace QualityControl {
-namespace Repository {
+namespace o2 {
+namespace quality_control {
+namespace repository {
 
 /// \brief The interface to the MonitorObject's repository.
 ///
@@ -30,15 +30,15 @@ class DatabaseInterface
 
     virtual void connect(std::string username, std::string password) = 0;
     virtual void connect(std::string host, std::string database, std::string username, std::string password) = 0;
-    virtual void store(AliceO2::QualityControl::Core::MonitorObject* mo) = 0;
+    virtual void store(o2::quality_control::core::MonitorObject* mo) = 0;
 
     /**
      * Look up an object of a task and return it.
      * \details It returns the object if found or nullptr if not.
      * TODO evaluate whether we should have more methods to retrieve objects of different types (with or without templates)
      * TODO evaluate whether we should have a method to retrieve a list of objects (optimization)
      */
-    virtual AliceO2::QualityControl::Core::MonitorObject* retrieve(std::string taskName, std::string objectName) = 0;
+    virtual o2::quality_control::core::MonitorObject* retrieve(std::string taskName, std::string objectName) = 0;
     virtual void disconnect() = 0;
     /**
      * \brief Prepare the container, such as a table in a relational database, that will contain the MonitorObject's for the given Task.
@@ -49,8 +49,8 @@ class DatabaseInterface
     virtual std::vector<std::string> getPublishedObjectNames(std::string taskName) = 0;
 };
 
-} /* namespace Repository */
+} /* namespace repository */
 } /* namespace QualityControl */
-} /* namespace AliceO2 */
+} /* namespace o2 */
 
 #endif /* QUALITYCONTROL_REPOSITORY_DATABASE_INTERFACE_H_ */