Merge pull request #19 from Barthelemy/feature-remove-ds

Remove dependency on DataSampling (QC-96)

Author: sy-c

cmake/FindDataSampling.cmake

@@ -5,7 +5,6 @@ find_package(Configuration REQUIRED)
 find_package(Common REQUIRED)
 find_package(InfoLogger REQUIRED)
 find_package(ReadoutCard REQUIRED)
-find_package(DataSampling REQUIRED)
 find_package(ZeroMQ REQUIRED)
 find_package(Numa)
 

cmake/ReadoutDependencies.cmake

@@ -21,17 +21,6 @@ rate=1.0
 exitTimeout=5
 
 
-###################################
-# data sampling
-###################################
-
-[sampling]
-# enable/disable data sampling (1/0)
-enabled=1
-# which class of datasampling to use (FairInjector, MockInjector)
-class=MockInjector
-
-
 ###################################
 # memory banks
 ###################################

configDummy.cfg

@@ -21,19 +21,6 @@ exitTimeout=-1
 
 
 
-###################################
-# data sampling
-###################################
-
-[sampling]
-
-# enable/disable data sampling (1/0)
-enabled=0
-
-# which class of datasampling to use (FairInjector, MockInjector)
-class=MockInjector
-
-
 ###################################
 # memory banks
 ###################################

readout.cfg

@@ -18,10 +18,6 @@
 #include <memory>
 #include <signal.h>
 
-#ifdef WITH_DATASAMPLING
-#include "DataSampling/InjectorFactory.h"
-#endif
-
 #include "ReadoutEquipment.h"
 #include "DataBlockAggregator.h"
 #include "Consumer.h"
@@ -354,26 +350,6 @@ int main(int argc, char* argv[])
   }
   theLog.log("Aggregator: %d equipments", nEquipmentsAggregated);
 
-
-  // configuration of data sampling
-#ifdef WITH_DATASAMPLING
-  int dataSampling=0;
-  cfg.getOptionalValue<int>("sampling.enabled",dataSampling);
-  std::unique_ptr<AliceO2::DataSampling::InjectorInterface> dataSamplingInjector;
-  if (dataSampling) {
-    theLog.log("Data sampling enabled");
-    // todo: create(...) should not need an argument and should get its configuration by itself.
-    std::string injector = cfg.getValue<std::string>("sampling.class");
-    if(injector=="")
-      injector = "MockInjector";
-    dataSamplingInjector = AliceO2::DataSampling::InjectorFactory::create(injector);
-  } else {
-    theLog.log("Data sampling disabled");
-  }
-  // todo: add time counter to measure how much time is spent waiting for data sampling injection (And other consumers)
-#endif
-
-
   theLog.log("Starting aggregator");
   agg->start();
 
@@ -431,14 +407,6 @@ int main(int argc, char* argv[])
 
 
     if (bc!=nullptr) {
-      // push to data sampling, if configured
-      #ifdef WITH_DATASAMPLING
-        if (dataSampling) {
-          dataSamplingInjector->injectSamples(bc);
-        }
-      #endif
-      // todo: datasampling can become a consumer, now that consumer interface accepts datasets instead of blocks
-      
       for (auto& c : dataConsumers) {
         c->pushData(bc);
       }