raw-file-reader optionaly propagates HBFUtils.startTime + orbit increment as DPH.creation

Author: shahor02

Detectors/Raw/include/DetectorsRaw/RawFileReader.h

@@ -46,7 +46,6 @@ struct ReaderInp {
   uint32_t errMap = 0xffffffff;
   uint32_t minTF = 0;
   uint32_t maxTF = 0xffffffff;
-  uint32_t startTime = 0;
   bool partPerSP = true;
   bool cache = false;
   bool autodetectTF0 = false;

Detectors/Raw/src/RawFileReaderWorkflow.cxx

@@ -68,7 +68,6 @@ class RawReaderSpecs : public o2f::Task
   uint32_t mDelayUSec = 0;        // Delay in microseconds between TFs
   uint32_t mMinTFID = 0;          // 1st TF to extract
   uint32_t mMaxTFID = 0xffffffff; // last TF to extrct
-  uint64_t mStartTimeMS = 0;      // start time to inject to DPH
   size_t mLoopsDone = 0;
   size_t mSentSize = 0;
   size_t mSentMessages = 0;
@@ -144,6 +143,11 @@ void RawReaderSpecs::init(o2f::InitContext& ic)
   if (mMaxTFID >= mReader->getNTimeFrames()) {
     mMaxTFID = mReader->getNTimeFrames() ? mReader->getNTimeFrames() - 1 : 0;
   }
+  const auto& hbfU = HBFUtils::Instance();
+  if (!hbfU.startTime) {
+    hbfU.setValue("HBFUtils.startTime", std::to_string(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()));
+    LOG(warning) << "Run start time is not provided via HBFUtils.startTime, will use now() = " << hbfU.startTime << " ms.";
+  }
 }
 
 //___________________________________________________________
@@ -208,21 +212,22 @@ void RawReaderSpecs::run(o2f::ProcessingContext& ctx)
       return;
     }
   }
-  uint64_t creationTime = mStartTimeMS ? 0UL : std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
 
   if (tfID < mMinTFID) {
     tfID = mMinTFID;
   }
   mReader->setNextTFToRead(tfID);
   std::vector<RawFileReader::PartStat> partsSP;
-  const auto& hbfU = HBFUtils::Instance();
 
   // read next time frame
   LOG(info) << "Reading TF#" << mTFCounter << " (" << tfID << " at iteration " << mLoopsDone << ')';
   o2::header::Stack dummyStack{o2h::DataHeader{}, o2::framework::DataProcessingHeader{0}}; // dummy stack to just to get stack size
   auto hstackSize = dummyStack.size();
 
   uint32_t firstOrbit = 0;
+  uint64_t creationTime = 0;
+  const auto& hbfU = HBFUtils::Instance();
+
   for (int il = 0; il < nlinks; il++) {
     auto& link = mReader->getLink(il);
 
@@ -265,9 +270,7 @@ void RawReaderSpecs::run(o2f::ProcessingContext& ctx)
         auto ir = o2::raw::RDHUtils::getHeartBeatIR(plMessage->GetData());
         auto tfid = hbfU.getTF(ir);
         firstOrbit = hdrTmpl.firstTForbit = hbfU.getIRTF(tfid).orbit; // will be picked for the following parts
-        if (!creationTime) {
-          creationTime = mStartTimeMS + std::ceil(firstOrbit * o2::constants::lhc::LHCOrbitMUS * 1e-3);
-        }
+        creationTime = hbfU.getTFTimeStamp({0, firstOrbit});
       }
       o2::header::Stack headerStack{hdrTmpl, o2::framework::DataProcessingHeader{mTFCounter, 1, creationTime}};
       memcpy(hdMessage->GetData(), headerStack.data(), headerStack.size());
@@ -307,8 +310,8 @@ void RawReaderSpecs::run(o2f::ProcessingContext& ctx)
   }
   mTimer[TimerTotal].Stop();
 
-  LOGF(info, "Sent payload of %zu bytes in %zu parts in %zu messages for TF %d | Timing (total/IO): %.3e / %.3e", tfSize, tfNParts,
-       messagesPerRoute.size(), mTFCounter, mTimer[TimerTotal].CpuTime() - tTotStart, mTimer[TimerIO].CpuTime() - tIOStart);
+  LOGP(info, "Sent payload of {} bytes in {} parts in {} messages for TF#{} firstTForbit={} timeStamp={} | Timing (total/IO): {} / {}", tfSize, tfNParts,
+       messagesPerRoute.size(), mTFCounter, firstOrbit, creationTime, mTimer[TimerTotal].CpuTime() - tTotStart, mTimer[TimerIO].CpuTime() - tIOStart);
 
   mSentSize += tfSize;
   mSentMessages += tfNParts;

Detectors/Raw/src/rawfile-reader-workflow.cxx

@@ -11,6 +11,7 @@
 
 #include "RawFileReaderWorkflow.h"
 #include "DetectorsRaw/RawFileReader.h"
+#include "DetectorsCommonDataFormats/NameConf.h"
 #include "CommonUtils/ConfigurableParam.h"
 #include "Framework/Logger.h"
 #include <string>
@@ -37,8 +38,8 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
   options.push_back(ConfigParamSpec{"detect-tf0", VariantType::Bool, false, {"autodetect HBFUtils start Orbit/BC from 1st TF seen"}});
   options.push_back(ConfigParamSpec{"calculate-tf-start", VariantType::Bool, false, {"calculate TF start instead of using TType"}});
   options.push_back(ConfigParamSpec{"drop-tf", VariantType::String, "none", {"Drop each TFid%(1)==(2) of detector, e.g. ITS,2,4;TPC,4[,0];..."}});
-  options.push_back(ConfigParamSpec{"start-time", VariantType::Int64, 0L, {"define TF creation time as start-time + firstTForbit*orbit_duration, ms, otherwise: current time"}});
   options.push_back(ConfigParamSpec{"configKeyValues", VariantType::String, "", {"semicolon separated key=value strings"}});
+  options.push_back(ConfigParamSpec{"hbfutils-config", VariantType::String, std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE), {"configKeyValues ini file for HBFUtils (used if exists)"}});
   // options for error-check suppression
 
   for (int i = 0; i < RawFileReader::NErrorsDefined; i++) {
@@ -68,7 +69,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   rinp.rawChannelConfig = configcontext.options().get<std::string>("raw-channel-config");
   rinp.delay_us = uint32_t(1e6 * configcontext.options().get<float>("delay")); // delay in microseconds
   rinp.dropTF = configcontext.options().get<std::string>("drop-tf");
-  rinp.startTime = configcontext.options().get<int64_t>("start-time");
   rinp.errMap = 0;
   for (int i = RawFileReader::NErrorsDefined; i--;) {
     auto ei = RawFileReader::ErrTypes(i);
@@ -78,6 +78,9 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
     }
   }
   o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
-
+  auto hbfini = configcontext.options().get<std::string>("hbfutils-config");
+  if (!hbfini.empty() && o2::utils::Str::pathExists(hbfini)) {
+    o2::conf::ConfigurableParam::updateFromFile(hbfini, "HBFUtils", true); // update only those values which were not touched yet (provenance == kCODE)
+  }
   return std::move(o2::raw::getRawFileReaderWorkflow(rinp));
 }