Get Run Number from FairMQ options and pass it to the user (QC-272) (#468)

Author: Barthelemy

Framework/include/QualityControl/TaskRunner.h

@@ -24,6 +24,7 @@
 #include <Framework/CompletionPolicy.h>
 #include <Framework/EndOfStreamContext.h>
 #include <Headers/DataHeader.h>
+#include <Framework/InitContext.h>
 // QC
 #include "QualityControl/TaskConfig.h"
 #include "QualityControl/TaskInterface.h"
@@ -102,7 +103,7 @@ class TaskRunner : public framework::Task
 
  private:
   /// \brief Callback for CallbackService::Id::Start (DPL) a.k.a. RUN transition (FairMQ)
-  void start();
+  void start(const framework::ConfigParamRegistry& options);
   /// \brief Callback for CallbackService::Id::Stop (DPL) a.k.a. STOP transition (FairMQ)
   void stop();
   /// \brief Callback for CallbackService::Id::Reset (DPL) a.k.a. RESET DEVICE transition (FairMQ)
@@ -125,6 +126,7 @@ class TaskRunner : public framework::Task
   std::shared_ptr<TaskInterface> mTask;
   bool mResetAfterPublish = false;
   std::shared_ptr<ObjectsManager> mObjectsManager;
+  int mRunNumber;
 
   std::string validateDetectorName(std::string name);
 

Framework/src/TaskRunner.cxx

@@ -33,12 +33,14 @@ using namespace o2::utilities;
 #include <Framework/TimesliceIndex.h>
 #include <Framework/DataSpecUtils.h>
 #include <Framework/DataDescriptorQueryBuilder.h>
+#include <Framework/ConfigParamRegistry.h>
 
 #include "QualityControl/QcInfoLogger.h"
 #include "QualityControl/TaskFactory.h"
 
 #include <string>
 #include <memory>
+#include <boost/property_tree/ini_parser.hpp>
 
 using namespace std;
 
@@ -56,6 +58,7 @@ using namespace AliceO2::Common;
 
 TaskRunner::TaskRunner(const std::string& taskName, const std::string& configurationSource, size_t id)
   : mDeviceName(createTaskRunnerIdString() + "-" + taskName),
+    mRunNumber(0),
     mMonitorObjectsSpec({ "mo" }, createTaskDataOrigin(), createTaskDataDescription(taskName), id)
 {
   // setup configuration
@@ -75,7 +78,7 @@ void TaskRunner::init(InitContext& iCtx)
   ILOG(Info) << "initializing TaskRunner" << ENDM;
 
   // registering state machine callbacks
-  iCtx.services().get<CallbackService>().set(CallbackService::Id::Start, [this]() { start(); });
+  iCtx.services().get<CallbackService>().set(CallbackService::Id::Start, [this, &options = iCtx.options()]() { start(options); });
   iCtx.services().get<CallbackService>().set(CallbackService::Id::Stop, [this]() { stop(); });
   iCtx.services().get<CallbackService>().set(CallbackService::Id::Reset, [this]() { reset(); });
 
@@ -200,8 +203,16 @@ void TaskRunner::endOfStream(framework::EndOfStreamContext& eosContext)
   mNoMoreCycles = true;
 }
 
-void TaskRunner::start()
+void TaskRunner::start(const ConfigParamRegistry& options)
 {
+  try {
+    mRunNumber = options.get<int>("runNumber");
+    ILOG(Info) << "Run number found in options: " << mRunNumber << ENDM;
+  } catch (std::invalid_argument& ia) {
+    ILOG(Info) << "Run number not found in options, using 0 instead." << ENDM;
+    mRunNumber = 0;
+  }
+
   startOfActivity();
 
   if (mNoMoreCycles) {
@@ -222,13 +233,15 @@ void TaskRunner::stop()
   }
   endOfActivity();
   mTask->reset();
+  mRunNumber = 0;
 }
 
 void TaskRunner::reset()
 {
   mTask.reset();
   mCollector.reset();
   mObjectsManager.reset();
+  mRunNumber = 0;
 }
 
 std::tuple<bool /*data ready*/, bool /*timer ready*/> TaskRunner::validateInputs(const framework::InputRecord& inputs)
@@ -339,15 +352,17 @@ void TaskRunner::startOfActivity()
   mTimerTotalDurationActivity.reset();
   mTotalNumberObjectsPublished = 0;
 
-  Activity activity(mConfigFile->get<int>("qc.config.Activity.number"),
+  // We take the run number as set from the FairMQ options if it is there, otherwise the one from the config file
+  int run = mRunNumber > 0 ? mRunNumber : mConfigFile->get<int>("qc.config.Activity.number");
+  Activity activity(run,
                     mConfigFile->get<int>("qc.config.Activity.type"));
   mTask->startOfActivity(activity);
   mObjectsManager->updateServiceDiscovery();
 }
 
 void TaskRunner::endOfActivity()
 {
-  Activity activity(mConfigFile->get<int>("qc.config.Activity.number"),
+  Activity activity(mRunNumber,
                     mConfigFile->get<int>("qc.config.Activity.type"));
   mTask->endOfActivity(activity);
   mObjectsManager->removeAllFromServiceDiscovery();

Modules/Skeleton/src/SkeletonTask.cxx

@@ -50,9 +50,9 @@ void SkeletonTask::initialize(o2::framework::InitContext& /*ctx*/)
   }
 }
 
-void SkeletonTask::startOfActivity(Activity& /*activity*/)
+void SkeletonTask::startOfActivity(Activity& activity)
 {
-  ILOG(Info) << "startOfActivity" << ENDM;
+  ILOG(Info) << "startOfActivity : " << activity.mId << ENDM;
   mHistogram->Reset();
 }