ensure proper creation time in TOF test data generator

Author: shahor02

Detectors/TOF/calibration/testWorkflow/DataGeneratorSpec.h

@@ -42,7 +42,7 @@ class TFDispatcher : public o2::framework::Task
   void init(o2::framework::InitContext& ic) final
   {
     mMaxTF = ic.options().get<int64_t>("max-timeframes");
-    mMinSize = ic.options().get<int64_t>("min-number-of-info");
+    mMinSize = ic.options().get<int>("min-number-of-info");
   }
 
   void run(o2::framework::ProcessingContext& pc) final
@@ -221,7 +221,7 @@ DataProcessorSpec getTFDispatcherSpec(int slot, int ngen, int nlanes, int latenc
     Outputs{{{"output"}, "TOF", "DATASIZE"}},
     AlgorithmSpec{adaptFromTask<o2::calibration::TFDispatcher>(slot, ngen, nlanes, latency)},
     Options{{"max-timeframes", VariantType::Int64, 99999999999ll, {"max TimeFrames to generate"}},
-            {"min-number-of-info", VariantType::Int64, 99999999999ll, {"min number of Info (CalibTOFInfo, or Diagnostic) to generate"}}}};
+            {"min-number-of-info", VariantType::Int, 9999, {"min number of Info (CalibTOFInfo, or Diagnostic) to generate"}}}};
 }
 
 DataProcessorSpec getTFProcessorCalibInfoTOFSpec(int latency, int latencyRMS)

Detectors/TOF/calibration/testWorkflow/README.md

@@ -55,7 +55,7 @@ o2-calibration-ccdb-populator-workflow --ccdb-path localhost:8080
 
 ## TOF channel calibration:
 
-To obtain the TOF channel offsets (at end of processing). Input from simulation, but is should work if attached to reco+calib flow
+To obtain the TOF channel offsets (at end of processing). Input from simulation, but it should work if attached to reco+calib flow
 
 * simulating reading from ccdb, and using it, with "-b", in "test" mode --> to use this, we need an appropriate CCDB object in the CCDB
 
@@ -109,6 +109,9 @@ o2-calibration-data-generator-workflow --lanes 8 --max-timeframes 5000 --gen-nor
 o2-calibration-data-generator-workflow --lanes 8 --max-timeframes 5000 --gen-norm 3 --gen-slot 2
 ```
 
+Note that the `o2-calibration-data-generator-workflow` parses the string passed via `--configKeyValues` option and the DataHeaders to generate can be steered using HBFUtils class,
+e.g. the "run start" time as HBFUtils.startTime (if 0, `now()` will be used), starting orbit via HBFUtils.orbitFirstSampled etc.
+
 * To run the calibration with cosmics:
 
 ```shell

Detectors/TOF/calibration/testWorkflow/data-generator-diagnostic-workflow.cxx

@@ -10,10 +10,30 @@
 // or submit itself to any jurisdiction.
 
 #include "Framework/DataProcessorSpec.h"
+#include "Framework/CallbacksPolicy.h"
 #include "DataGeneratorSpec.h"
 
 using namespace o2::framework;
 
+void customize(std::vector<o2::framework::CallbacksPolicy>& policies)
+{
+  policies.push_back(o2::framework::CallbacksPolicy{
+    [](o2::framework::DeviceSpec const& spec, o2::framework::ConfigContext const& context) -> bool {
+      return spec.name == "calib-tf-dispatcher"; // apply policy only to the upstream device
+    },
+    [](o2::framework::CallbackService& service, o2::framework::InitContext& context) {
+      const auto& hbfu = o2::raw::HBFUtils::Instance();
+      long startTime = hbfu.startTime > 0 ? hbfu.startTime : std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now()).time_since_epoch().count();
+      service.set(o2::framework::CallbackService::Id::NewTimeslice,
+                  [startTime](o2::header::DataHeader& dh, o2::framework::DataProcessingHeader& dph) {
+                    const auto& hbfu = o2::raw::HBFUtils::Instance();
+                    dh.firstTForbit = hbfu.getFirstIRofTF({0, hbfu.orbitFirstSampled}).orbit + int64_t(hbfu.nHBFPerTF) * dh.tfCounter;
+                    dh.runNumber = hbfu.runNumber;
+                    dph.creation = startTime + (dh.firstTForbit - hbfu.orbitFirst) * o2::constants::lhc::LHCOrbitMUS * 1.e-3;
+                  });
+    }});
+}
+
 // we need to add workflow options before including Framework/runDataProcessing
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 {
@@ -24,6 +44,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
   workflowOptions.push_back(ConfigParamSpec{"pressure", o2::framework::VariantType::Float, 1.f, {"generation / processing rate factor"}});
   workflowOptions.push_back(ConfigParamSpec{"mean-latency", o2::framework::VariantType::Int, 1000, {"mean latency of the processor in microseconds"}});
   workflowOptions.push_back(ConfigParamSpec{"latency-spread", o2::framework::VariantType::Int, 100, {"latency gaussian RMS of the processor in microseconds"}});
+  workflowOptions.push_back(ConfigParamSpec{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}});
 }
 
 // ------------------------------------------------------------------
@@ -33,6 +54,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
 {
   WorkflowSpec specs;
+  o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
   auto nlanes = std::max(1, configcontext.options().get<int>("lanes"));
   auto ngen = std::max(1, configcontext.options().get<int>("gen-norm"));
   auto slot = std::max(0, configcontext.options().get<int>("gen-slot"));

Detectors/TOF/calibration/testWorkflow/data-generator-workflow.cxx

@@ -10,10 +10,30 @@
 // or submit itself to any jurisdiction.
 
 #include "Framework/DataProcessorSpec.h"
+#include "Framework/CallbacksPolicy.h"
 #include "DataGeneratorSpec.h"
 
 using namespace o2::framework;
 
+void customize(std::vector<o2::framework::CallbacksPolicy>& policies)
+{
+  policies.push_back(o2::framework::CallbacksPolicy{
+    [](o2::framework::DeviceSpec const& spec, o2::framework::ConfigContext const& context) -> bool {
+      return spec.name == "calib-tf-dispatcher"; // apply policy only to the upstream device
+    },
+    [](o2::framework::CallbackService& service, o2::framework::InitContext& context) {
+      const auto& hbfu = o2::raw::HBFUtils::Instance();
+      long startTime = hbfu.startTime > 0 ? hbfu.startTime : std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now()).time_since_epoch().count();
+      service.set(o2::framework::CallbackService::Id::NewTimeslice,
+                  [startTime](o2::header::DataHeader& dh, o2::framework::DataProcessingHeader& dph) {
+                    const auto& hbfu = o2::raw::HBFUtils::Instance();
+                    dh.firstTForbit = hbfu.getFirstIRofTF({0, hbfu.orbitFirstSampled}).orbit + int64_t(hbfu.nHBFPerTF) * dh.tfCounter;
+                    dh.runNumber = hbfu.runNumber;
+                    dph.creation = startTime + (dh.firstTForbit - hbfu.orbitFirst) * o2::constants::lhc::LHCOrbitMUS * 1.e-3;
+                  });
+    }});
+}
+
 // we need to add workflow options before including Framework/runDataProcessing
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 {
@@ -24,6 +44,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
   workflowOptions.push_back(ConfigParamSpec{"pressure", o2::framework::VariantType::Float, 1.f, {"generation / processing rate factor"}});
   workflowOptions.push_back(ConfigParamSpec{"mean-latency", o2::framework::VariantType::Int, 1000, {"mean latency of the processor in microseconds"}});
   workflowOptions.push_back(ConfigParamSpec{"latency-spread", o2::framework::VariantType::Int, 100, {"latency gaussian RMS of the processor in microseconds"}});
+  workflowOptions.push_back(ConfigParamSpec{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}});
 }
 
 // ------------------------------------------------------------------
@@ -33,6 +54,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
 {
   WorkflowSpec specs;
+  o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
   auto nlanes = std::max(1, configcontext.options().get<int>("lanes"));
   auto ngen = std::max(1, configcontext.options().get<int>("gen-norm"));
   auto slot = std::max(0, configcontext.options().get<int>("gen-slot"));