Daq Task

Clean up config file

Author: Barthelemy

Common/CMakeLists.txt

@@ -128,7 +128,7 @@ O2_GENERATE_TESTS(
  MODULE_LIBRARY_NAME ${LIBRARY_NAME}
  BUCKET_NAME ${BUCKET_NAME}
  TEST_SRCS ${TEST_SRCS}
- TIMEOUT 15 # seconds
+ TIMEOUT 5 # seconds
 )
 
 # Library for Tcl

DataSampling/test/testDataBlockProducer.cxx

@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(test_blockproducer)
   cout << "headerSize : " << std::dec << block->getData()->header.headerSize << endl;
   BOOST_CHECK_EQUAL(block->getData()->header.headerSize, 0x60);
   cout << "payload size : " << std::dec << block->getData()->header.dataSize << endl;
-  BOOST_CHECK_EQUAL(block->getData()->header.dataSize/8, payloadSize);
+  BOOST_CHECK_EQUAL(block->getData()->header.dataSize, payloadSize);
 
   DataBlockProducer producerRandom(true);
   DataBlockContainerReference block2 = producer.getDataBlockContainer();
@@ -119,7 +119,7 @@ BOOST_AUTO_TEST_CASE(test_setproducer)
   cout << "headerSize : " << std::dec << block->getData()->header.headerSize << endl;
   BOOST_CHECK_EQUAL(block->getData()->header.headerSize, 0x60);
   cout << "payload size : " << std::dec << block->getData()->header.dataSize << endl;
-  BOOST_CHECK_EQUAL(block->getData()->header.dataSize/8, payloadSize);
+  BOOST_CHECK_EQUAL(block->getData()->header.dataSize, payloadSize);
 
   set = producer.getDataSet(10);
   BOOST_CHECK_EQUAL(set->size(), 10);

QualityControl/example-default.ini

@@ -13,14 +13,10 @@ taskDefinition=taskDefinition_1
 taskDefinition=taskDefinition_1
 
 [taskDefinition_1]
-;className=AliceO2::QualityControlModules::Skeleton::TemplateTask
+;className=AliceO2::QualityControlModules::Skeleton::SkeletonTask
 className=AliceO2::QualityControlModules::Example::ExampleTask
 moduleName=QcExample
 cycleDurationSeconds=10
-numberHistos=1000
-numberChecks=10
-typeOfChecks=AliceO2::QualityControlModules::Example::FakeCheck
-;typeOfChecks=AliceO2::QualityControlModules::Skeleton::TemplateCheck
 ; set to -1 for no maximum or remove the line
 maxNumberCycles=-1
 ;exampleTaskOutput=0
@@ -49,6 +45,14 @@ typeOfChecks=AliceO2::QualityControlModules::Example::FakeCheck
 moduleOfChecks=QcExample
 cycleDurationSeconds=1
 
+[daqTask]
+taskDefinition=daqTaskDefinition
+
+[daqTaskDefinition]
+className=AliceO2::QualityControlModules::Daq::DaqTask
+moduleName=QcDaq
+moduleOfChecks=QcExample
+
 [Checks]
 checkMeanIsAbove/threshold=1
 

QualityControl/include/QualityControl/TaskConfig.h

@@ -20,12 +20,10 @@ struct TaskConfig
     std::string taskName;
     std::string moduleName;
     std::string className;
-//    std::string address;
-    int numberHistos;
-    int numberChecks;
-    std::string typeOfChecks;
+//    int numberHistos;
+//    int numberChecks;
+//    std::string typeOfChecks;
     int cycleDurationSeconds;
-    std::string publisherClassName;
     int maxNumberCycles;
 };
 

QualityControl/include/QualityControl/TaskInterface.h

@@ -6,10 +6,11 @@
 #ifndef QUALITYCONTROL_LIBS_CORE_QCTASK_H_
 #define QUALITYCONTROL_LIBS_CORE_QCTASK_H_
 
-#include "DataFormat/DataBlockContainer.h"
-#include "QualityControl/ObjectsManager.h"
 #include <memory>
 
+#include "QualityControl/ObjectsManager.h"
+#include <DataFormat/DataSet.h>
+
 namespace AliceO2 {
 namespace QualityControl {
 namespace Core {
@@ -63,7 +64,7 @@ class TaskInterface
     virtual void startOfActivity(Activity &activity) = 0;
     virtual void startOfCycle() = 0;
     //    virtual void monitorDataBlock(vector<pair<DataHeader*, char*>>& datablock) = 0;
-    virtual void monitorDataBlock(std::vector<std::shared_ptr<DataBlockContainer>> &block) = 0;
+    virtual void monitorDataBlock(DataSetReference block) = 0;
     virtual void endOfCycle() = 0;
     virtual void endOfActivity(Activity &activity) = 0;
     virtual void reset() = 0;

QualityControl/src/TaskDevice.cxx

@@ -91,15 +91,9 @@ void TaskDevice::populateConfig(std::string taskName)
 
   mTaskConfig.taskName = taskName;
   mTaskConfig.moduleName = mConfigFile->get<string>(taskDefinitionName + "/moduleName").value();
-  mTaskConfig.numberHistos = mConfigFile->get<int>(taskDefinitionName + "/numberHistos").value();
-  mTaskConfig.numberChecks = mConfigFile->get<int>(taskDefinitionName + "/numberChecks").value();
-  mTaskConfig.typeOfChecks = mConfigFile->get<string>(taskDefinitionName + "/typeOfChecks").value();
   mTaskConfig.className = mConfigFile->get<string>(taskDefinitionName + "/className").value();
-  mTaskConfig.cycleDurationSeconds = mConfigFile->get<int>(taskDefinitionName + "/cycleDurationSeconds").value();
-  mTaskConfig.publisherClassName = mConfigFile->get<string>("Publisher/className").value();
-  mTaskConfig.maxNumberCycles = mConfigFile->exists(taskDefinitionName + "/maxNumberCycles") ?
-                                mConfigFile->get<int>(taskDefinitionName + "/maxNumberCycles").value() :
-                                -1;
+  mTaskConfig.cycleDurationSeconds = mConfigFile->get<int>(taskDefinitionName + "/cycleDurationSeconds").value_or(10);
+  mTaskConfig.maxNumberCycles = mConfigFile->get<int>(taskDefinitionName + "/maxNumberCycles").value_or(-1);
 }
 
 void TaskDevice::InitTask()
@@ -153,9 +147,9 @@ void TaskDevice::monitorCycle()
   auto end = start + seconds(mTaskConfig.cycleDurationSeconds);
   int numberBlocks = 0;
   while (system_clock::now() < end) {
-    DataSetReference block = mSampler->getData(100);
-    if (block) {
-      mTask->monitorDataBlock(*block);
+    DataSetReference dataSetReference = mSampler->getData(100);
+    if (dataSetReference) {
+      mTask->monitorDataBlock(dataSetReference);
       mSampler->releaseData(); // invalids the block !!!
       numberBlocks++;
     }

QualityControl/test/testQCTask.cxx

@@ -87,9 +87,6 @@ class TestTask : public TaskInterface
 BOOST_AUTO_TEST_CASE(TestInstantiate)
 {
   TaskConfig config;
-  config.publisherClassName="MockPublisher";
-  config.taskName="my task name";
-  ObjectsManager objectsManager(config);
 //  Test::TestTask tt(&objectsManager);
 //  BOOST_CHECK_EQUAL(tt.test, 0);
 //  tt.initialize();

QualityControlModules/Daq/CMakeLists.txt

@@ -4,7 +4,6 @@ O2_SETUP(NAME ${MODULE_NAME})
 
 set(SRCS
         src/DaqTask.cxx
-        src/DaqCheck.cxx
         )
 
 include_directories(
@@ -13,7 +12,6 @@ include_directories(
 
 set(HEADERS
         include/Daq/DaqTask.h
-        include/Daq/DaqCheck.h
         )
 
 set(LIBRARY_NAME ${MODULE_NAME})

QualityControlModules/Daq/include/Daq/DaqCheck.h

@@ -31,14 +31,16 @@ class DaqTask /*final*/: public TaskInterface // todo add back the "final" when
     void initialize() override;
     void startOfActivity(Activity &activity) override;
     void startOfCycle() override;
-    void monitorDataBlock(std::vector<std::shared_ptr<DataBlockContainer>> &block) override;
+    void monitorDataBlock(DataSetReference block) override;
     void endOfCycle() override;
     void endOfActivity(Activity &activity) override;
     void reset() override;
 
   private:
 
-    TH1F *mHistogram;
+    TH1F *mPayloadSize, *mIds;
+    TH1F *mNumberSubblocks;
+    TH1F *mSubPayloadSize;
 };
 
 }