Remove hacks to extract TF 1st orbit (#5709)

Author: shahor02

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

@@ -457,14 +457,12 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
 
   findMinMaxBc(ft0RecPoints, primVertices, mcRecords);
 
-  // TODO: determine the beginning of a TF in case when there are no reconstructed vertices
+  const auto* dh = o2::header::get<o2::header::DataHeader*>(pc.inputs().getByPos(0).header);
+  o2::InteractionRecord startIR = {0, dh->firstTForbit};
+
   uint64_t firstVtxGlBC = minGlBC;
-  uint64_t startBCofTF = 0;
-  if (primVertices.empty()) {
-    auto startIRofTF = o2::raw::HBFUtils::Instance().getFirstIRofTF(primVertices[0].getIRMin());
-    startBCofTF = startIRofTF.orbit * o2::constants::lhc::LHCMaxBunches + startIRofTF.bc;
-    firstVtxGlBC = std::round(startBCofTF + primVertices[0].getTimeStamp().getTimeStamp() / o2::constants::lhc::LHCBunchSpacingMS);
-  }
+  uint64_t startBCofTF = startIR.toLong();
+  firstVtxGlBC = std::round(startBCofTF + primVertices[0].getTimeStamp().getTimeStamp() / o2::constants::lhc::LHCBunchSpacingMS);
 
   uint64_t tfNumber;
   int runNumber = 244918; // TODO: get real run number

Detectors/GlobalTracking/src/RecoContainer.cxx

@@ -172,7 +172,6 @@ void RecoContainer::collectData(ProcessingContext& pc, const DataRequest& reques
 {
   auto& reqMap = requests.requestMap;
 
-  /// RS FIXME: this will not work until the framework does not propagate the dh->firstTForbit
   const auto* dh = o2::header::get<o2::header::DataHeader*>(pc.inputs().getByPos(0).header);
   startIR = {0, dh->firstTForbit};
 
@@ -231,11 +230,6 @@ void RecoContainer::addITSTracks(ProcessingContext& pc, bool mc)
   if (mc) {
     tracksMCPool.registerContainer(pc.inputs().get<gsl::span<o2::MCCompLabel>>("trackITSMCTR"), GTrackID::ITS);
   }
-  //RSTODO: below is a hack, to remove once the framework will start propagating the header.firstTForbit
-  const auto tracksITSROF = getITSTracksROFRecords<o2::itsmft::ROFRecord>();
-  if (tracksITSROF.size()) {
-    startIR = o2::raw::HBFUtils::Instance().getFirstIRofTF(tracksITSROF[0].getBCData());
-  }
 }
 
 //____________________________________________________________

Detectors/GlobalTrackingWorkflow/src/TPCITSMatchingSpec.cxx

@@ -160,14 +160,9 @@ void TPCITSMatchingDPL::run(ProcessingContext& pc)
     mMatching.setFITInfoInp(fitInfo);
   }
 
-  const auto* dh = o2::header::get<o2::header::DataHeader*>(pc.inputs().get("trackITSROF").header);
+  const auto* dh = o2::header::get<o2::header::DataHeader*>(pc.inputs().getByPos(0).header);
   mMatching.setStartIR({0, dh->firstTForbit});
 
-  //RSTODO: below is a hack, to remove once the framework will start propagating the header.firstTForbit
-  if (tracksITSROF.size()) {
-    mMatching.setStartIR(o2::raw::HBFUtils::Instance().getFirstIRofTF(tracksITSROF[0].getBCData()));
-  }
-
   mMatching.run();
 
   pc.outputs().snapshot(Output{"GLO", "TPCITS", 0, Lifetime::Timeframe}, mMatching.getMatchedTracks());

Detectors/TOF/workflow/src/CompressedDecodingTask.cxx

@@ -109,18 +109,6 @@ void CompressedDecodingTask::postData(ProcessingContext& pc)
   DigitHeader& digitH = mDecoder.getDigitHeader();
   pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "DIGITHEADER", 0, Lifetime::Timeframe}, digitH);
 
-  // RS this is a hack to be removed once we have correct propagation of the firstTForbit by the framework
-  auto setFirstTFOrbit = [&](const Output& spec, uint32_t orb) {
-    auto* hd = pc.outputs().findMessageHeader(spec);
-    if (!hd) {
-      throw std::runtime_error(o2::utils::concat_string("failed to find output message header for ", spec.origin.str, "/", spec.description.str, "/", std::to_string(spec.subSpec)));
-    }
-    hd->firstTForbit = orb;
-  };
-
-  setFirstTFOrbit(Output{o2::header::gDataOriginTOF, "DIGITS", 0, Lifetime::Timeframe}, mInitOrbit);
-  setFirstTFOrbit(Output{o2::header::gDataOriginTOF, "READOUTWINDOW", 0, Lifetime::Timeframe}, mInitOrbit);
-
   mDecoder.clear();
 
   mNTF++;
@@ -132,13 +120,10 @@ void CompressedDecodingTask::run(ProcessingContext& pc)
 {
   mTimer.Start(false);
 
-  if (pc.inputs().getNofParts(0) && !mConetMode && 0) { // it doesn't work
-    //RS set the 1st orbit of the TF from the O2 header, relying on rdhHandler is not good (in fact, the RDH might be eliminated in the derived data)
-    const auto* dh = o2::header::get<o2::header::DataHeader*>(pc.inputs().getByPos(0).header);
-    mInitOrbit = dh->firstTForbit;
-  }
-
-  //  mDecoder.setFirstIR({0, mInitOrbit});
+  //RS set the 1st orbit of the TF from the O2 header, relying on rdhHandler is not good (in fact, the RDH might be eliminated in the derived data)
+  const auto* dh = o2::header::get<o2::header::DataHeader*>(pc.inputs().getByPos(0).header);
+  mInitOrbit = dh->firstTForbit;
+  mDecoder.setFirstIR({0, mInitOrbit});
 
   /** loop over inputs routes **/
   for (auto iit = pc.inputs().begin(), iend = pc.inputs().end(); iit != iend; ++iit) {
@@ -178,16 +163,6 @@ void CompressedDecodingTask::headerHandler(const CrateHeader_t* crateHeader, con
 {
   if (mConetMode) {
     LOG(DEBUG) << "Crate found" << crateHeader->drmID;
-
-    mInitOrbit = crateOrbit->orbitID;
-    if (mCurrentOrbit > 0) {
-      mInitOrbit = mCurrentOrbit;
-    }
-
-    if (mNCrateOpenTF == 0) {
-      mDecoder.setFirstIR({0, mInitOrbit});
-    }
-
     mNCrateOpenTF++;
   }
 }
@@ -350,10 +325,6 @@ void CompressedDecodingTask::rdhHandler(const o2::header::RAWDataHeader* rdh)
   const auto& rdhr = *rdh;
   // set first orbtìt here (to be check in future), please not remove this!!!
   mCurrentOrbit = RDHUtils::getHeartBeatOrbit(rdhr);
-  if (mNCrateOpenTF == 0) {
-    mInitOrbit = mCurrentOrbit;
-    mDecoder.setFirstIR({0, mInitOrbit});
-  }
 
   // rdh close
   if (RDHUtils::getStop(rdhr) && RDHUtils::getHeartBeatOrbit(rdhr) == o2::raw::HBFUtils::Instance().getNOrbitsPerTF() - 1 + mInitOrbit) {

Detectors/TOF/workflow/src/TOFClusterizerSpec.cxx

@@ -77,19 +77,8 @@ class TOFDPLClustererTask
     auto digits = pc.inputs().get<gsl::span<o2::tof::Digit>>("tofdigits");
     auto row = pc.inputs().get<std::vector<o2::tof::ReadoutWindowData>*>("readoutwin");
 
-    //auto header = o2::header::get<o2::header::DataHeader*>(pc.inputs().get("tofdigits").header);
-
-    if (row->size() > 0) {
-      mClusterer.setFirstOrbit(row->at(0).mFirstIR.orbit);
-    }
-
-    //RSTODO: below is a hack, to remove once the framework will start propagating the header.firstTForbit
-    //Here I extract the orbit/BC from the abs.BC, since the triggerer orbit/bunch are not set. Then why they are needed?
-    //    if (digits.size()) {
-    //      auto bcabs = digits[0].getBC();
-    //      auto ir0 = o2::raw::HBFUtils::Instance().getFirstIRofTF({uint16_t(bcabs % Geo::BC_IN_ORBIT), uint32_t(bcabs / Geo::BC_IN_ORBIT)});
-    //      mClusterer.setFirstOrbit(ir0.orbit);
-    //    }
+    const auto* dh = o2::header::get<o2::header::DataHeader*>(pc.inputs().getByPos(0).header);
+    mClusterer.setFirstOrbit(dh->firstTForbit);
 
     auto labelvector = std::make_shared<std::vector<o2::dataformats::MCTruthContainer<o2::MCCompLabel>>>();
     if (mUseMC) {