adjusting TOF calib info alignment to BC

noferini · Sep 13, 2023 · 8b2a9da · 8b2a9da
1 parent 8e4388b
commit 8b2a9da
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/Detectors/GlobalTracking/src/MatchTOF.cxx b/Detectors/GlobalTracking/src/MatchTOF.cxx
@@ -1280,7 +1280,14 @@ void MatchTOF::BestMatches(std::vector<o2::dataformats::MatchInfoTOFReco>& match
     }
 
     int mask = 0;
-    float deltat = o2::tof::Utils::subtractInteractionBC(TOFClusWork[matchingPair.getTOFClIndex()].getTimeRaw() - t0info - intLT.getTOF(o2::track::PID::Pion), mask, true);
+    float deltat;
+
+    if (t0info > 0) {                                                                                                                                                                 // FT0 BC found
+      deltat = TOFClusWork[matchingPair.getTOFClIndex()].getTimeRaw() - t0info - intLT.getTOF(o2::track::PID::Pion) - o2::tof::Geo::LATENCYWINDOW_IN_BC * o2::tof::Geo::BC_TIME_INPS; // latency subtracted
+      mask = 1 << 8;                                                                                                                                                                  // only FT0 BC allowed (-> BC=0 since t0info already subtracted and assumed to be aligned to the true IntBC)
+    } else {
+      deltat = o2::tof::Utils::subtractInteractionBC(TOFClusWork[matchingPair.getTOFClIndex()].getTimeRaw() - t0info - intLT.getTOF(o2::track::PID::Pion), mask, true);
+    }
 
     const o2::track::TrackParCov& trc = TracksWork[trkType][itrk].first;
     float pt = trc.getPt(); // from outer parameters!

diff --git a/Detectors/TOF/base/src/Utils.cxx b/Detectors/TOF/base/src/Utils.cxx
@@ -272,14 +272,28 @@ int Utils::addMaskBC(int mask, int channel)
   int mask2 = (mask >> 16);
   int cmask = 1;
   int used = 0;
+  int weight = 1;
+  int candidates = 0;
+  for (int ibit = 0; ibit < 16; ibit++) { // counts candidates
+    if (mask & cmask) {
+      candidates++;
+    }
+    cmask *= 2;
+  }
+
+  if (candidates) {
+    weight = 16 / candidates;
+  }
+
+  cmask = 1;
   for (int ibit = 0; ibit < 16; ibit++) {
     if (mask & cmask) {
-      mMaskBCchan[channel][ibit]++;
-      mMaskBC[ibit]++;
+      mMaskBCchan[channel][ibit] += weight;
+      mMaskBC[ibit] += weight;
     }
     if (mask2 & cmask) {
-      mMaskBCchanUsed[channel][ibit]++;
-      mMaskBCUsed[ibit]++;
+      mMaskBCchanUsed[channel][ibit] += weight;
+      mMaskBCUsed[ibit] += weight;
       used = ibit - 8;
     }
     cmask *= 2;