MCH MC->raw: start from HBFUtils.FirstSampledTFIR() rather than HBFUtils.orbitFirst

Author: shahor02

Detectors/MUON/MCH/Raw/Encoder/Digit/DigitPayloadEncoder.cxx

@@ -57,7 +57,7 @@ void DigitPayloadEncoder::encodeDigits(gsl::span<o2::mch::Digit> digits,
     int dualSampaChannelId = optElecId.value().second;
     // FIXME : what to put as rel time ?
     uint10_t ts = 0;
-    auto firstIR = o2::raw::HBFUtils::Instance().getFirstIR();
+    auto firstIR = o2::raw::HBFUtils::Instance().getFirstSampledTFIR();
     uint20_t bxCount = sampaBunchCrossingCounter(orbit, bc, firstIR.orbit);
     auto clusters = {raw::SampaCluster(ts, bxCount, d.getADC(), d.getNofSamples())};
     mEncoder.addChannelData(elecId, dualSampaChannelId, clusters);

Detectors/MUON/MCH/Raw/Encoder/Digit/digits-to-raw.cxx

@@ -137,7 +137,8 @@ int main(int argc, char* argv[])
 
   // here we implicitely assume that this digits-to-raw is only called for
   // one timeframe so it's easy to detect the TF start...
-  uint32_t firstOrbitOfRun = o2::raw::HBFUtils::Instance().orbitFirst;
+  // RS: why do you need such assumption? In general, it is not correct
+  uint32_t firstOrbitOfRun = o2::raw::HBFUtils::Instance().getFirstSampledTFIR().orbit; // RS note that this is not anymore 1st orbit of the run but of the 1st filled TF
   auto dsElecIds = opts.dummyElecMap ? getAllDs<ElectronicMapperDummy>() : getAllDs<ElectronicMapperGenerated>();
   dre.addHeartbeats(dsElecIds, firstOrbitOfRun);
 

Detectors/MUON/MCH/Raw/Encoder/Payload/PayloadEncoderImpl.h

@@ -170,8 +170,8 @@ void PayloadEncoderImpl<FORMAT, CHARGESUM, VERSION>::addHeartbeatHeaders(const s
   if (dsids.empty()) {
     return;
   }
-  // get first orbit of the run
-  auto firstIR = o2::raw::HBFUtils::Instance().getFirstIR();
+  // get first orbit of the TF
+  auto firstIR = o2::raw::HBFUtils::Instance().getFirstSampledTFIR();
   auto sampaBXCount = sampaBunchCrossingCounter(firstIR.orbit, firstIR.bc, firstIR.orbit);
   for (auto dsElecId : dsids) {
     auto solarId = dsElecId.solarId();

Detectors/MUON/MCH/Raw/test/testClosureCoDec.cxx

@@ -169,7 +169,7 @@ std::vector<std::byte> createBuffer(gsl::span<std::string> data,
 {
   const o2::raw::HBFUtils& hbfutils = o2::raw::HBFUtils::Instance();
   o2::conf::ConfigurableParam::setValue<uint32_t>("HBFUtils", "orbitFirst", orbit);
-
+  o2::conf::ConfigurableParam::setValue<uint32_t>("HBFUtils", "orbitFirstSampled", orbit);
   auto encoder = createPayloadEncoder(createSolar2FeeLinkMapper<ELECMAP>(),
                                       isUserLogicFormat<FORMAT>::value,
                                       VERSION,