Ca: search for sorted data chunks in TOF hits

algo/ca/TrackingChain.cxx

@@ -116,12 +116,12 @@ void TrackingChain::ReadHits(PartitionedSpan<const ca::HitTypes_t::at<DetID>> hi
 
   ca::HitKeyIndex_t firstHitKey = fNofHitKeys;
   int64_t dataStreamDet         = static_cast<int64_t>(DetID) << 60;  // detector part of the data stream
-
-  for (size_t iPartition = 0; iPartition < hits.NPartitions(); ++iPartition) {
+  int64_t dataStream            = 0;
+  for (size_t iPartition = 0; iPartition < hits.NPartitions(); ++iPartition, ++dataStream) {
     const auto& [vHits, extHitAddress] = hits.Partition(iPartition);
     // ---- Define data stream and station index
-    int64_t dataStream = dataStreamDet | extHitAddress;
-    int iStLocal       = -1;
+    //int64_t dataStream = dataStreamDet | extHitAddress;
+    int iStLocal = -1;
     // FIXME: This definition of the station index works only for STS, and there is no any guaranty, that it will
     //        work for other mCBM setups.
     if constexpr (IsSts) { iStLocal = (extHitAddress >> 4) & 0xF; }
@@ -133,7 +133,7 @@ void TrackingChain::ReadHits(PartitionedSpan<const ca::HitTypes_t::at<DetID>> hi
     int iStActive  = (iStLocal != -1) ? fCaFramework.GetParameters().GetStationIndexActive(iStLocal, DetID) : -1;
     size_t iOffset = hits.Offsets()[iPartition];
     if (iStActive < 0) { continue; }
-
+    double lastTime = -1e9;
     for (size_t iPartHit = 0; iPartHit < vHits.size(); ++iPartHit) {
       const auto& hit = vHits[iPartHit];
       int iHitExt     = iOffset + iPartHit;
@@ -162,15 +162,12 @@ void TrackingChain::ReadHits(PartitionedSpan<const ca::HitTypes_t::at<DetID>> hi
       caHit.SetStation(iStActive);
       caHit.SetId(fCaDataManager.GetNofHits());
       if (caHit.Check()) {
-        //L_(info) << caHit.ToString();
-        if constexpr (IsSts) {
-          if (fNofHitKeys <= caHit.FrontKey()) { fNofHitKeys = caHit.FrontKey() + 1; }
-          if (fNofHitKeys <= caHit.BackKey()) { fNofHitKeys = caHit.BackKey() + 1; }
-        }
-        else {
-          if (fNofHitKeys <= caHit.FrontKey()) { fNofHitKeys = caHit.FrontKey() + 1; }
-        }
-        fCaDataManager.PushBackHit(caHit, dataStream);
+        if ((caHit.T() < lastTime - 1000.) && (dataStream < 100000)) { dataStream++; }
+        lastTime = caHit.T();
+        if (!IsTof) { dataStream = extHitAddress; }
+        fCaDataManager.PushBackHit(caHit, dataStreamDet | dataStream);
+        if (fNofHitKeys <= caHit.FrontKey()) { fNofHitKeys = caHit.FrontKey() + 1; }
+        if (fNofHitKeys <= caHit.BackKey()) { fNofHitKeys = caHit.BackKey() + 1; }
       }
       else {
         if constexpr (IsMvd) { fCaMonitorData.IncrementCounter(ca::ECounter::UndefinedMvdHit); }

algo/ca/core/tracking/CaTrackFinder.cxx

@@ -146,7 +146,6 @@ void TrackFinder::FindTracks()
     fscal minTimeAfterHit = std::numeric_limits<fscal>::max();
     // loop in the reverse order to fill CaHitTimeInfo::fMinTimeAfterHit fields
 
-    //LOG(warning) << "\n\n stream " << iStream << " hits " << nStreamHits << "\n\n";
     for (int ih = nStreamHits - 1; ih >= 0; --ih) {
       ca::HitIndex_t caHitId = frAlgo.fInputData.GetStreamStartIndex(iStream) + ih;
       const ca::Hit& h       = frAlgo.fInputData.GetHit(caHitId);
@@ -154,7 +153,26 @@ void TrackFinder::FindTracks()
       CaHitTimeInfo& info = frAlgo.fHitTimeInfo[caHitId];
       if (minTimeAfterHit > info.fEventTimeMin) { minTimeAfterHit = info.fEventTimeMin; }
       info.fMinTimeAfterHit = minTimeAfterHit;
-      //if (h.Station() > 1) { LOG(warning) << " hit time " << info.fEventTimeMin << " min time after hit " << info.fMinTimeAfterHit; }
+    }
+
+    if (0) {
+      LOG(warning) << "\n\n stream " << iStream << " hits " << nStreamHits << "\n\n";
+      for (int ih = 0; ih < nStreamHits; ++ih) {
+        ca::HitIndex_t caHitId = frAlgo.fInputData.GetStreamStartIndex(iStream) + ih;
+        const ca::Hit& h       = frAlgo.fInputData.GetHit(caHitId);
+        if (frAlgo.fvHitKeyFlags[h.FrontKey()] || frAlgo.fvHitKeyFlags[h.BackKey()]) {
+          continue;
+        }  // the hit is skipped
+        CaHitTimeInfo& info = frAlgo.fHitTimeInfo[caHitId];
+        if (h.Station() == 2) {
+          static int tmp = 0;
+          tmp++;
+          if (tmp < 10000) {
+            LOG(warning) << " hit sta " << h.Station() << " stream " << iStream << " time " << info.fEventTimeMin
+                         << " min time after hit " << info.fMinTimeAfterHit;
+          }
+        }
+      }
     }
   }
 

algo/params/mcbm_beam_2022_05_23_nickel.ca.par

-mcbm_beam_2022_05_23_nickel_STS_AND_TOF.ca.par
+mcbm_beam_2022_05_23_nickel_STS_TOF.ca.par
\ No newline at end of file