ITS: fix rof lut to work properly with added errors

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

Detectors/ITSMFT/ITS/tracking/include/ITStracking/ROFLookupTables.h

@@ -342,8 +342,8 @@ class ROFOverlapTable : public LayerTimingBase<NLayers>
       int64_t fromStart = o2::gpu::CAMath::Max((int64_t)layerFrom.getROFStartInBC(iROF) - (int64_t)layerFrom.mROFAddTimeErr, int64_t(0));
       int64_t fromEnd = (int64_t)layerFrom.getROFEndInBC(iROF) + layerFrom.mROFAddTimeErr;
 
-      int32_t firstROFTo = o2::gpu::CAMath::Max(0, (int32_t)((fromStart - (int64_t)layerTo.mROFDelay - (int64_t)layerTo.mROFBias) / (int64_t)layerTo.mROFLength));
-      int32_t lastROFTo = (int32_t)((fromEnd - (int64_t)layerTo.mROFDelay - (int64_t)layerTo.mROFBias - 1) / (int64_t)layerTo.mROFLength);
+      int32_t firstROFTo = o2::gpu::CAMath::Max(0, (int32_t)((fromStart - (int64_t)layerTo.mROFAddTimeErr - (int64_t)layerTo.mROFDelay - (int64_t)layerTo.mROFBias) / (int64_t)layerTo.mROFLength));
+      int32_t lastROFTo = (int32_t)((fromEnd + (int64_t)layerTo.mROFAddTimeErr - (int64_t)layerTo.mROFDelay - (int64_t)layerTo.mROFBias - 1) / (int64_t)layerTo.mROFLength);
       firstROFTo = o2::gpu::CAMath::Max(0, firstROFTo);
       lastROFTo = o2::gpu::CAMath::Min((int32_t)layerTo.mNROFsTF - 1, lastROFTo);
 

Detectors/ITSMFT/ITS/tracking/test/testROFLookupTables.cxx

@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(rofoverlap_staggered_alllayers_delay_delta)
   }
   { // from 0 to 2 rof=0
     const auto& range = view.getOverlap(0, 2, 0);
-    BOOST_CHECK_EQUAL(range.getEntries(), 3);
+    BOOST_CHECK_EQUAL(range.getEntries(), 4);
     BOOST_CHECK_EQUAL(range.getFirstEntry(), 0);
   }
   { // from 0 to 1 rof=1
@@ -250,13 +250,13 @@ BOOST_AUTO_TEST_CASE(rofoverlap_staggered_alllayers_delay_delta)
   }
   { // from 0 to 2 rof=1
     const auto& range = view.getOverlap(0, 2, 1);
-    BOOST_CHECK_EQUAL(range.getEntries(), 3);
-    BOOST_CHECK_EQUAL(range.getFirstEntry(), 3);
+    BOOST_CHECK_EQUAL(range.getEntries(), 4);
+    BOOST_CHECK_EQUAL(range.getFirstEntry(), 2);
   }
   { // from 1 to 2 rof=0
     const auto& range = view.getOverlap(1, 2, 0);
-    BOOST_CHECK_EQUAL(range.getEntries(), 2);
-    BOOST_CHECK_EQUAL(range.getFirstEntry(), 1);
+    BOOST_CHECK_EQUAL(range.getEntries(), 4);
+    BOOST_CHECK_EQUAL(range.getFirstEntry(), 0);
   }
   { // from 1 to 0 rof=0
     const auto& range = view.getOverlap(1, 0, 0);
@@ -265,8 +265,8 @@ BOOST_AUTO_TEST_CASE(rofoverlap_staggered_alllayers_delay_delta)
   }
   { // from 1 to 2 rof=1
     const auto& range = view.getOverlap(1, 2, 1);
-    BOOST_CHECK_EQUAL(range.getEntries(), 2);
-    BOOST_CHECK_EQUAL(range.getFirstEntry(), 3);
+    BOOST_CHECK_EQUAL(range.getEntries(), 4);
+    BOOST_CHECK_EQUAL(range.getFirstEntry(), 2);
   }
   { // from 1 to 0 rof=1
     const auto& range = view.getOverlap(1, 0, 1);
@@ -275,8 +275,8 @@ BOOST_AUTO_TEST_CASE(rofoverlap_staggered_alllayers_delay_delta)
   }
   { // from 1 to 2 rof=2
     const auto& range = view.getOverlap(1, 2, 2);
-    BOOST_CHECK_EQUAL(range.getEntries(), 1);
-    BOOST_CHECK_EQUAL(range.getFirstEntry(), 5);
+    BOOST_CHECK_EQUAL(range.getEntries(), 2);
+    BOOST_CHECK_EQUAL(range.getFirstEntry(), 4);
   }
   { // from 1 to 0 rof=2
     const auto& range = view.getOverlap(1, 0, 2);
@@ -416,6 +416,7 @@ BOOST_AUTO_TEST_CASE(rofoverlap_timestamp_complex)
   table.defineLayer(3, 7, 50, 50, 0, 10);
   table.init();
   const auto& view = table.getView();
+  view.printMapping(0, 1);
 
   const auto t010 = view.getTimeStamp(0, 3, 1, 3);
   BOOST_CHECK_EQUAL(t010.getTimeStamp(), 350);