DataFormat in Common

Author: Barthelemy

CMakeLists.txt

@@ -67,7 +67,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -fPIC")
 # Module, library and executable definition
 ####################################
 
-link_o2_subproject(DataFormat)
 link_o2_subproject(DataSampling)
 
 set(MODULE_NAME "Readout")

cmake/ReadoutDependencies.cmake

@@ -25,7 +25,6 @@ o2_define_bucket(
 
         DEPENDENCIES
         pthread
-        DataFormat
         DataSampling
         ${Configuration_LIBRARIES}
         ${Monitoring_LIBRARIES}

src/Consumer.h

@@ -1,9 +1,9 @@
 #include <Common/Configuration.h>
 
 
-#include <DataFormat/DataBlock.h>
-#include <DataFormat/DataBlockContainer.h>
-#include <DataFormat/DataSet.h>
+#include <Common/DataBlock.h>
+#include <Common/DataBlockContainer.h>
+#include <Common/DataSet.h>
 
 #include <memory>
 
@@ -19,7 +19,7 @@ class Consumer {
   virtual ~Consumer() {
   };
   virtual int pushData(DataBlockContainerReference &b)=0;
-  
+
   protected:
     InfoLogger theLog;
 };

src/ConsumerStats.cxx

@@ -1,8 +1,8 @@
 #include "Consumer.h"
 
-#include <DataFormat/DataBlock.h>
-#include <DataFormat/DataBlockContainer.h>
-#include <DataFormat/DataSet.h>
+#include <Common/DataBlock.h>
+#include <Common/DataBlockContainer.h>
+#include <Common/DataSet.h>
 
 #include <memory>
 

src/DataBlockAggregator.h

@@ -3,9 +3,9 @@
 #include <Common/Thread.h>
 #include <Common/Timer.h>
 
-#include <DataFormat/DataBlock.h>
-#include <DataFormat/DataBlockContainer.h>
-#include <DataFormat/DataSet.h>
+#include <Common/DataBlock.h>
+#include <Common/DataBlockContainer.h>
+#include <Common/DataSet.h>
 
 #include <memory>
 
@@ -16,19 +16,19 @@ class DataBlockAggregator {
   public:
   DataBlockAggregator(AliceO2::Common::Fifo<DataSetReference> *output, std::string name="Aggregator");
   ~DataBlockAggregator();
-  
+
   int addInput(std::shared_ptr<AliceO2::Common::Fifo<DataBlockContainerReference>> input); // add a FIFO to be used as input
-  
+
   void start(); // starts processing thread
   void stop(int waitStopped=1);  // stop processing thread (and possibly wait it terminates)
 
 
-  static Thread::CallbackResult  threadCallback(void *arg);  
- 
+  static Thread::CallbackResult  threadCallback(void *arg);
+
   private:
   std::vector<std::shared_ptr<AliceO2::Common::Fifo<DataBlockContainerReference>>> inputs;
   AliceO2::Common::Fifo<DataSetReference> *output;    //todo: unique_ptr
-  
+
   std::unique_ptr<Thread> aggregateThread;
   AliceO2::Common::Timer incompletePendingTimer;
   int isIncompletePending;

src/ReadoutEquipment.h

@@ -3,9 +3,9 @@
 #include <Common/Thread.h>
 #include <Common/Timer.h>
 
-#include <DataFormat/DataBlock.h>
-#include <DataFormat/DataBlockContainer.h>
-#include <DataFormat/DataSet.h>
+#include <Common/DataBlock.h>
+#include <Common/DataBlockContainer.h>
+#include <Common/DataSet.h>
 
 #include <memory>
 
@@ -16,24 +16,24 @@ class ReadoutEquipment {
   public:
   ReadoutEquipment(ConfigFile &cfg, std::string cfgEntryPoint);
   virtual ~ReadoutEquipment();
-  
+
   DataBlockContainerReference getBlock();
 
   void start();
   void stop();
   const std::string & getName();
 
-//  protected: 
+//  protected:
 // todo: give direct access to output FIFO?
   std::shared_ptr<AliceO2::Common::Fifo<DataBlockContainerReference>> dataOut;
 
   private:
-  std::unique_ptr<Thread> readoutThread;  
+  std::unique_ptr<Thread> readoutThread;
   static Thread::CallbackResult  threadCallback(void *arg);
   virtual Thread::CallbackResult  populateFifoOut()=0;  // function called iteratively in dedicated thread to populate FIFO
   AliceO2::Common::Timer clk;
   AliceO2::Common::Timer clk0;
-  
+
   unsigned long long nBlocksOut;
   double readoutRate;
   protected:

src/mainReadout.cxx

@@ -5,10 +5,10 @@
 
 #include <InfoLogger/InfoLogger.hxx>
 #include <Common/Configuration.h>
-#include <DataFormat/DataBlock.h>
-#include <DataFormat/DataBlockContainer.h>
-#include <DataFormat/MemPool.h>
-#include <DataFormat/DataSet.h>
+#include <Common/DataBlock.h>
+#include <Common/DataBlockContainer.h>
+#include <Common/MemPool.h>
+#include <Common/DataSet.h>
 
 #include <atomic>
 #ifndef __APPLE__