change TOF digit structure: longBC to InteractionRecord

Author: noferini

Detectors/TOF/base/include/TOFBase/Digit.h

@@ -32,6 +32,7 @@ class Digit
   Digit() = default;
 
   Digit(Int_t channel, Int_t tdc, Int_t tot, uint64_t bc, Int_t label = -1, uint32_t triggerorbit = 0, uint16_t triggerbunch = 0);
+  Digit(Int_t channel, Int_t tdc, Int_t tot, uint32_t orbit, uint16_t bc, Int_t label = -1, uint32_t triggerorbit = 0, uint16_t triggerbunch = 0);
   ~Digit() = default;
 
   /// Get global ordering key made of
@@ -41,7 +42,7 @@ class Digit
   }
   ULong64_t getOrderingKey()
   {
-    return getOrderingKey(mChannel, mBC, mTDC);
+    return getOrderingKey(mChannel, mIR.toLong(), mTDC);
   }
 
   Int_t getChannel() const { return mChannel; }
@@ -53,8 +54,8 @@ class Digit
   uint16_t getTOT() const { return mTOT; }
   void setTOT(uint16_t tot) { mTOT = tot; }
 
-  uint64_t getBC() const { return mBC; }
-  void setBC(uint64_t bc) { mBC = bc; }
+  uint64_t getBC() const { return mIR.toLong(); }
+  void setBC(uint64_t bc) { mIR.setFromLong(bc); }
 
   Int_t getLabel() const { return mLabel; }
   void setLabel(Int_t label) { mLabel = label; }
@@ -91,19 +92,19 @@ class Digit
  private:
   friend class boost::serialization::access;
 
-  Double_t mCalibratedTime; //!< time of the digits after calibration (not persistent; it will be filled during clusterization)
   Int_t mChannel;          ///< TOF channel index
   uint16_t mTDC;           ///< TDC bin number
   uint16_t mTOT;           ///< TOT bin number
-  uint64_t mBC;            ///< Bunch Crossing // RS: since it is used as absolute bunch counter from orbit 0, it has to be 64 bits
+  InteractionRecord mIR{0, 0}; ///< InteractionRecord (orbit and bc) when digit occurs
   Int_t mLabel;            ///< Index of the corresponding entry in the MC label array
+  Double_t mCalibratedTime; //!< time of the digits after calibration (not persistent; it will be filled during clusterization)
   Int_t mElectronIndex;    //!/< index in electronic format
   uint32_t mTriggerOrbit = 0;    //!< orbit id of trigger event // RS: orbit must be 32bits long
   uint16_t mTriggerBunch = 0;    //!< bunch id of trigger event
   Bool_t mIsUsedInCluster;       //!/< flag to declare that the digit was used to build a cluster
   Bool_t mIsProblematic = false; //!< flag to tell whether the channel of the digit was problemati; not persistent; default = ok
 
-  ClassDefNV(Digit, 3);
+  ClassDefNV(Digit, 4);
 };
 
 std::ostream& operator<<(std::ostream& stream, const Digit& dig);

Detectors/TOF/base/src/Digit.cxx

@@ -17,15 +17,20 @@ using namespace o2::tof;
 ClassImp(o2::tof::Digit);
 
 Digit::Digit(Int_t channel, Int_t tdc, Int_t tot, uint64_t bc, Int_t label, uint32_t triggerorbit, uint16_t triggerbunch)
-  : mChannel(channel), mTDC(tdc), mTOT(tot), mBC(bc), mLabel(label), mTriggerOrbit(triggerorbit), mTriggerBunch(triggerbunch), mIsUsedInCluster(kFALSE)
+  : mChannel(channel), mTDC(tdc), mTOT(tot), mIR(0, 0), mLabel(label), mTriggerOrbit(triggerorbit), mTriggerBunch(triggerbunch), mIsUsedInCluster(kFALSE)
+{
+  mIR.setFromLong(bc);
+}
+//______________________________________________________________________
+Digit::Digit(Int_t channel, Int_t tdc, Int_t tot, uint32_t orbit, uint16_t bc, Int_t label, uint32_t triggerorbit, uint16_t triggerbunch)
+  : mChannel(channel), mTDC(tdc), mTOT(tot), mIR(bc, orbit), mLabel(label), mTriggerOrbit(triggerorbit), mTriggerBunch(triggerbunch), mIsUsedInCluster(kFALSE)
 {
 }
-
 //______________________________________________________________________
 
 void Digit::printStream(std::ostream& stream) const
 {
-  stream << "TOF Digit: Channel " << mChannel << " TDC " << mTDC << " TOT " << mTOT << "Bunch Crossing index" << mBC << " Label " << mLabel << "\n";
+  stream << "TOF Digit: Channel " << mChannel << " TDC " << mTDC << " TOT " << mTOT << "Bunch Crossing index" << mIR.toLong() << " Label " << mLabel << "\n";
 }
 
 //______________________________________________________________________

Detectors/TOF/base/src/WindowFiller.cxx

@@ -175,6 +175,13 @@ void WindowFiller::flushOutputContainer(std::vector<Digit>& digits)
     for (Int_t i = 0; i < MAXWINDOWS; i++) {
       fillOutputContainer(digits); // fill last readout windows
     }
+
+    int nwindowperTF = o2::raw::HBFUtils::Instance().getNOrbitsPerTF() * Geo::NWINDOW_IN_ORBIT;
+
+    // check that all orbits are complete in terms of number of readout windows
+    while ((mReadoutWindowData.size() % nwindowperTF)) {
+      fillOutputContainer(digits); // fill windows without digits to complete all orbits in the last TF
+    }
   }
 }
 //______________________________________________________________________

Detectors/TOF/workflow/src/CompressedDecodingTask.cxx

@@ -52,8 +52,6 @@ void CompressedDecodingTask::postData(ProcessingContext& pc)
   mHasToBePosted = false;
   mDecoder.FillWindows();
 
-  int nwindowperTF = o2::raw::HBFUtils::Instance().getNOrbitsPerTF() * 3;
-
   // send output message
   std::vector<o2::tof::Digit>* alldigits = mDecoder.getDigitPerTimeFrame();
   std::vector<o2::tof::ReadoutWindowData>* row = mDecoder.getReadoutWindowData();
@@ -67,6 +65,8 @@ void CompressedDecodingTask::postData(ProcessingContext& pc)
     lastIR = last->mFirstIR;
   }
 
+  /*
+  int nwindowperTF = o2::raw::HBFUtils::Instance().getNOrbitsPerTF() * 3;
   while (row->size() < nwindowperTF) {
     // complete timeframe with empty readout windows
     auto& dummy = row->emplace_back(lastval, 0);
@@ -76,6 +76,7 @@ void CompressedDecodingTask::postData(ProcessingContext& pc)
     // remove extra readout windows after a check they are empty
     row->pop_back();
   }
+*/
 
   int n_tof_window = row->size();
   int n_orbits = n_tof_window / 3;