use bc timing in digit ordering key

Author: maciacco

Detectors/Upgrades/ALICE3/IOTOF/DataFormatsIOTOF/include/DataFormatsIOTOF/Digit.h

@@ -19,6 +19,7 @@
 #ifndef ALICEO2_IOTOF_DIGIT_H
 #define ALICEO2_IOTOF_DIGIT_H
 
+#include "CommonConstants/LHCConstants.h"
 #include "SimulationDataFormat/MCCompLabel.h"
 #include "DataFormatsITSMFT/Digit.h"
 
@@ -39,9 +40,11 @@ class Digit : public o2::itsmft::Digit
   ULong64_t getBc() const { return mBc; }
   Int_t getTdc() const { return mTdc; }
 
-  static UInt_t getOrderingKey(UShort_t chipindex, UShort_t row, UShort_t col)
+  static ULong64_t getOrderingKey(ULong64_t bc, UShort_t row, UShort_t col)
   {
-    return (static_cast<UInt_t>(chipindex) << 16) | (static_cast<UInt_t>(row) << 8) | static_cast<UInt_t>(col);
+    uint32_t orbit = bc / o2::constants::lhc::LHCMaxBunches;
+    uint16_t bunch = bc % o2::constants::lhc::LHCMaxBunches;
+    return (static_cast<ULong64_t>(orbit) << 32) | (static_cast<UInt_t>(bunch) << 16) | (static_cast<UInt_t>(row) << 8) | static_cast<UInt_t>(col);
   }
 
  private:

Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Chip.cxx

@@ -34,6 +34,6 @@ Chip::Chip(Int_t index)
 //_______________________________________________________________________
 void Chip::addDigit(UShort_t row, UShort_t col, Int_t charge, double time, ULong64_t bc, Int_t tdc, o2::MCCompLabel label)
 {
-  ULong64_t key = Digit::getOrderingKey(mChipIndex, row, col);
+  ULong64_t key = Digit::getOrderingKey(bc, row, col);
   mDigits.emplace(std::make_pair(key, LabeledDigit(mChipIndex, row, col, charge, time, bc, tdc, label)));
 }

Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Digitizer.cxx

@@ -357,7 +357,7 @@ void Digitizer::registerDigits(Chip& chip, uint32_t roFrame, double time, int nR
   LOG(debug) << nbc << "\t" << tdc;
   double absoluteTime = tdc * digitizerParams.tdcBin * 1.e-9 + nbc * o2::constants::lhc::LHCBunchSpacingNS;
 
-  auto key = o2::iotof::Digit::getOrderingKey(chip.getChipIndex(), row, col);
+  auto key = o2::iotof::Digit::getOrderingKey(nbc, row, col);
   o2::iotof::LabeledDigit* existingDigit = chip.findDigit(key);
   if (!existingDigit) {
     // No existing digit, create a new one