Add and fill extra members to CosmicInfo

Author: shahor02

DataFormats/Detectors/TOF/include/DataFormatsTOF/CosmicInfo.h

@@ -32,6 +32,8 @@ class CosmicInfo
   float mTot1;
   float mTot2;
   float mL;
+  float mT1;
+  float mT2;
 
  public:
   int getCH1() const { return mChan1; }
@@ -40,17 +42,21 @@ class CosmicInfo
   float getTOT1() const { return mTot1; }
   float getTOT2() const { return mTot2; }
   float getL() const { return mL; }
+  float getT1() const { return mT1; }
+  float getT2() const { return mT2; }
 
   void setCH1(int ch) { mChan1 = ch; }
   void setCH2(int ch) { mChan2 = ch; }
   void setDeltaTime(float val) { mDtime = val; }
   void setTOT1(float val) { mTot1 = val; }
   void setTOT2(float val) { mTot2 = val; }
+  void setT1(float val) { mT1 = val; }
+  void setT2(float val) { mT2 = val; }
   void setL(float val) { mL = val; }
 
-  CosmicInfo(int ch1 = 0, int ch2 = 0, float dt = 0, float tot1 = 0, float tot2 = 0, float l = 0) : mChan1(ch1), mChan2(ch2), mDtime(dt), mTot1(tot1), mTot2(tot2), mL(l) {}
+  CosmicInfo(int ch1 = 0, int ch2 = 0, float dt = 0, float tot1 = 0, float tot2 = 0, float l = 0, float tm1 = 0, float tm2 = 0) : mChan1(ch1), mChan2(ch2), mDtime(dt), mTot1(tot1), mTot2(tot2), mL(l), mT1(tm1), mT2(tm2) {}
 
-  ClassDefNV(CosmicInfo, 1);
+  ClassDefNV(CosmicInfo, 2);
 };
 } // namespace tof
 

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

@@ -56,6 +56,9 @@ class Digit
 
   uint64_t getBC() const { return mIR.toLong(); }
   void setBC(uint64_t bc) { mIR.setFromLong(bc); }
+  void setIR(const InteractionRecord& ir) { mIR = ir; }
+
+  auto getIR() const { return mIR; }
 
   Int_t getLabel() const { return mLabel; }
   void setLabel(Int_t label) { mLabel = label; }

Detectors/TOF/reconstruction/src/CosmicProcessor.cxx

@@ -14,6 +14,7 @@
 #include "FairLogger.h" // for LOG
 #include "TOFReconstruction/CosmicProcessor.h"
 #include <TStopwatch.h>
+#include "DetectorsRaw/HBFUtils.h"
 
 using namespace o2::tof;
 
@@ -32,6 +33,7 @@ void CosmicProcessor::process(DigitDataReader& reader, bool fill)
   timerProcess.Start();
 
   reader.init();
+  const o2::raw::HBFUtils& hbfutils = o2::raw::HBFUtils::Instance();
 
   auto array = reader.getDigitArray();
   int ndig = array->size();
@@ -50,12 +52,16 @@ void CosmicProcessor::process(DigitDataReader& reader, bool fill)
     if (mCounters[ch1] > 3) {
       continue;
     }
+    auto ir0 = hbfutils.getFirstIRofTF(dig1.getIR());
+
     int64_t bc1 = int64_t(dig1.getBC());
     int tdc1 = int(dig1.getTDC());
     float tot1 = dig1.getTOT() * 48.8E-3;
     Geo::getVolumeIndices(ch1, volID1);
     Geo::getPos(volID1, pos1);
 
+    float tm1 = (dig1.getIR().differenceInBC(ir0) * 1024 + tdc1) * Geo::TDCBIN; // in ps
+
     for (int j = i + 1; j < ndig2; j++) {
       auto& dig2 = (*array)[j];
       int64_t bc2 = int64_t(dig2.getBC()) - bc1;
@@ -67,6 +73,8 @@ void CosmicProcessor::process(DigitDataReader& reader, bool fill)
       if (mCounters[ch2] > 3) {
         continue;
       }
+      float tm2 = (dig2.getIR().differenceInBC(ir0) * 1024 + int(dig2.getTDC())) * Geo::TDCBIN; // in ps
+
       int tdc2 = int(dig2.getTDC()) - tdc1;
       float tot2 = dig2.getTOT() * 48.8E-3;
       Geo::getVolumeIndices(ch2, volID2);
@@ -92,7 +100,7 @@ void CosmicProcessor::process(DigitDataReader& reader, bool fill)
         continue;
       }
 
-      mCosmicInfo.emplace_back(ch1, ch2, dtime, tot1, tot2, l);
+      mCosmicInfo.emplace_back(ch1, ch2, dtime, tot1, tot2, l, tm1, tm2);
     }
   }