diff --git a/macro/beamtime/mcbm2022/ini_tof_trks.C b/macro/beamtime/mcbm2022/ini_tof_trks.C
index 2ffe47506749a868138ee7ba1dc5f276d52168e1..3ffbda7ab5fce20a08c5533b05aceed0946a2c73 100644
--- a/macro/beamtime/mcbm2022/ini_tof_trks.C
+++ b/macro/beamtime/mcbm2022/ini_tof_trks.C
@@ -128,9 +128,9 @@ void ini_tof_trks(Int_t iSel = 22002, Int_t iTrackingSetup = 1, Int_t iGenCor =
       Double_t dTsig = dScalFac * 0.03;
       tofFindTracks->SetSIGT(dTsig);  // allow for variable deviations in ns
     }
-      iMinNofHits   = 4;
-      iNStations    = 39;
-      iNReqStations = 5;
+      iMinNofHits   = 3;
+      iNStations    = 37;
+      iNReqStations = 4;
       tofFindTracks->SetStation(0, 5, 0, 0);
       tofFindTracks->SetStation(1, 0, 2, 2);
       tofFindTracks->SetStation(2, 0, 1, 2);
@@ -168,55 +168,76 @@ void ini_tof_trks(Int_t iSel = 22002, Int_t iTrackingSetup = 1, Int_t iGenCor =
       tofFindTracks->SetStation(34, 2, 0, 2);
       tofFindTracks->SetStation(35, 2, 0, 3);
       tofFindTracks->SetStation(36, 2, 0, 4);
-      tofFindTracks->SetStation(37, 8, 0, 0);
-      tofFindTracks->SetStation(38, 8, 1, 0);
+      //tofFindTracks->SetStation(37, 8, 0, 0);
+      //tofFindTracks->SetStation(38, 8, 1, 0);
       break;
 
     case 10:  // for calibration mode of full setup
       iMinNofHits   = 3;
-      iNStations    = 39;
+      iNStations    = 37;
       iNReqStations = 4;
       tofFindTracks->SetStation(0, 0, 2, 2);
       tofFindTracks->SetStation(1, 0, 1, 2);
       tofFindTracks->SetStation(2, 0, 0, 2);
-      tofFindTracks->SetStation(3, 0, 2, 1);
+      tofFindTracks->SetStation(3, 2, 0, 2);
+      tofFindTracks->SetStation(4, 0, 2, 1);
+      tofFindTracks->SetStation(5, 0, 1, 1);
+      tofFindTracks->SetStation(6, 0, 0, 1);
+      tofFindTracks->SetStation(7, 2, 0, 1);
+      tofFindTracks->SetStation(8, 0, 2, 3);
+      tofFindTracks->SetStation(9, 0, 1, 3);
+      tofFindTracks->SetStation(10, 0, 0, 3);
+      tofFindTracks->SetStation(11, 2, 0, 3);
+      tofFindTracks->SetStation(12, 0, 2, 0);
+      tofFindTracks->SetStation(13, 0, 1, 0);
+      tofFindTracks->SetStation(14, 0, 0, 0);
+      tofFindTracks->SetStation(15, 2, 0, 0);
+      tofFindTracks->SetStation(16, 0, 2, 4);
+      tofFindTracks->SetStation(17, 0, 1, 4);
+      tofFindTracks->SetStation(18, 0, 0, 4);
+      tofFindTracks->SetStation(19, 2, 0, 4);
+      tofFindTracks->SetStation(20, 0, 4, 0);
+      tofFindTracks->SetStation(21, 0, 3, 0);
+      tofFindTracks->SetStation(22, 0, 4, 1);
+      tofFindTracks->SetStation(23, 0, 3, 1);
+      tofFindTracks->SetStation(24, 0, 4, 2);
+      tofFindTracks->SetStation(25, 0, 3, 2);
+      tofFindTracks->SetStation(26, 0, 4, 3);
+      tofFindTracks->SetStation(27, 0, 3, 3);
+      tofFindTracks->SetStation(28, 0, 4, 4);
+      tofFindTracks->SetStation(29, 0, 3, 4);
+      tofFindTracks->SetStation(30, 9, 0, 0);
+      tofFindTracks->SetStation(31, 7, 0, 0);
+      tofFindTracks->SetStation(32, 9, 0, 1);
+      tofFindTracks->SetStation(33, 7, 0, 1);
+      tofFindTracks->SetStation(34, 6, 0, 0);
+      tofFindTracks->SetStation(35, 6, 0, 1);
+      tofFindTracks->SetStation(36, 5, 0, 0);
+      //tofFindTracks->SetStation(37, 8, 0, 0);
+      //tofFindTracks->SetStation(38, 8, 1, 0);
+      break;
+    case 510:  // for debugging residual dependencies
+      iMinNofHits   = 5;
+      iNStations    = 5;
+      iNReqStations = 5;
+      tofFindTracks->SetStation(0, 0, 2, 1);
+      tofFindTracks->SetStation(1, 0, 0, 1);
+      tofFindTracks->SetStation(2, 2, 0, 1);
+      tofFindTracks->SetStation(3, 5, 0, 0);
       tofFindTracks->SetStation(4, 0, 1, 1);
-      tofFindTracks->SetStation(5, 0, 0, 1);
-      tofFindTracks->SetStation(6, 0, 2, 3);
-      tofFindTracks->SetStation(7, 0, 1, 3);
-      tofFindTracks->SetStation(8, 0, 0, 3);
-      tofFindTracks->SetStation(9, 0, 2, 0);
-      tofFindTracks->SetStation(10, 0, 1, 0);
-      tofFindTracks->SetStation(11, 0, 0, 0);
-      tofFindTracks->SetStation(12, 0, 2, 4);
-      tofFindTracks->SetStation(13, 0, 1, 4);
-      tofFindTracks->SetStation(14, 0, 0, 4);
-      tofFindTracks->SetStation(15, 0, 4, 0);
-      tofFindTracks->SetStation(16, 0, 3, 0);
-      tofFindTracks->SetStation(17, 0, 4, 1);
-      tofFindTracks->SetStation(18, 0, 3, 1);
-      tofFindTracks->SetStation(19, 0, 4, 2);
-      tofFindTracks->SetStation(20, 0, 3, 2);
-      tofFindTracks->SetStation(21, 0, 4, 3);
-      tofFindTracks->SetStation(22, 0, 3, 3);
-      tofFindTracks->SetStation(23, 0, 4, 4);
-      tofFindTracks->SetStation(24, 0, 3, 4);
-      tofFindTracks->SetStation(25, 9, 0, 0);
-      tofFindTracks->SetStation(26, 7, 0, 0);
-      tofFindTracks->SetStation(27, 9, 0, 1);
-      tofFindTracks->SetStation(28, 7, 0, 1);
-      tofFindTracks->SetStation(29, 6, 0, 0);
-      tofFindTracks->SetStation(30, 6, 0, 1);
-      tofFindTracks->SetStation(31, 2, 0, 0);
-      tofFindTracks->SetStation(32, 2, 0, 1);
-      tofFindTracks->SetStation(33, 2, 0, 2);
-      tofFindTracks->SetStation(34, 2, 0, 3);
-      tofFindTracks->SetStation(35, 2, 0, 4);
-      tofFindTracks->SetStation(36, 8, 0, 0);
-      tofFindTracks->SetStation(37, 8, 1, 0);
-      tofFindTracks->SetStation(38, 5, 0, 0);
       break;
-
+    case 511:  // for debugging residual dependencies
+      iMinNofHits   = 7;
+      iNStations    = 7;
+      iNReqStations = 7;
+      tofFindTracks->SetStation(0, 0, 4, 1);
+      tofFindTracks->SetStation(1, 0, 3, 1);
+      tofFindTracks->SetStation(2, 9, 0, 0);
+      tofFindTracks->SetStation(3, 7, 0, 0);
+      tofFindTracks->SetStation(4, 9, 0, 1);
+      tofFindTracks->SetStation(5, 5, 0, 0);
+      tofFindTracks->SetStation(6, 7, 0, 1);
+      break;
     case 11:  // for calibration mode of 2-stack & test counters
       iMinNofHits   = 3;
       iNStations    = 17;
@@ -323,7 +344,7 @@ void ini_tof_trks(Int_t iSel = 22002, Int_t iTrackingSetup = 1, Int_t iGenCor =
 
     case 2:
       iMinNofHits   = 3;
-      iNStations    = 38;
+      iNStations    = 36;
       iNReqStations = 4;
       tofFindTracks->SetStation(0, 0, 2, 2);
       tofFindTracks->SetStation(1, 0, 1, 2);
@@ -361,8 +382,53 @@ void ini_tof_trks(Int_t iSel = 22002, Int_t iTrackingSetup = 1, Int_t iGenCor =
       tofFindTracks->SetStation(33, 2, 0, 2);
       tofFindTracks->SetStation(34, 2, 0, 3);
       tofFindTracks->SetStation(35, 2, 0, 4);
-      tofFindTracks->SetStation(36, 8, 0, 0);
-      tofFindTracks->SetStation(37, 8, 1, 0);
+      //tofFindTracks->SetStation(36, 8, 0, 0);
+      //tofFindTracks->SetStation(37, 8, 1, 0);
+      break;
+
+    case 21:  // low angle stack only
+      iMinNofHits   = 3;
+      iNStations    = 17;
+      iNReqStations = 4;
+      tofFindTracks->SetStation(0, 5, 0, 0);
+      tofFindTracks->SetStation(1, 0, 4, 0);
+      tofFindTracks->SetStation(2, 0, 3, 0);
+      tofFindTracks->SetStation(3, 0, 4, 1);
+      tofFindTracks->SetStation(4, 0, 3, 1);
+      tofFindTracks->SetStation(5, 0, 4, 2);
+      tofFindTracks->SetStation(6, 0, 3, 2);
+      tofFindTracks->SetStation(7, 0, 4, 3);
+      tofFindTracks->SetStation(8, 0, 3, 3);
+      tofFindTracks->SetStation(9, 0, 4, 4);
+      tofFindTracks->SetStation(10, 0, 3, 4);
+      tofFindTracks->SetStation(11, 9, 0, 0);
+      tofFindTracks->SetStation(12, 7, 0, 0);
+      tofFindTracks->SetStation(13, 9, 0, 1);
+      tofFindTracks->SetStation(14, 7, 0, 1);
+      tofFindTracks->SetStation(15, 6, 0, 0);
+      tofFindTracks->SetStation(16, 6, 0, 1);
+      break;
+
+    case 22:  // low angle stack only
+      iMinNofHits   = 3;
+      iNStations    = 16;
+      iNReqStations = 4;
+      tofFindTracks->SetStation(0, 0, 4, 0);
+      tofFindTracks->SetStation(1, 0, 3, 0);
+      tofFindTracks->SetStation(2, 0, 4, 1);
+      tofFindTracks->SetStation(3, 0, 3, 1);
+      tofFindTracks->SetStation(4, 0, 4, 2);
+      tofFindTracks->SetStation(5, 0, 3, 2);
+      tofFindTracks->SetStation(6, 0, 4, 3);
+      tofFindTracks->SetStation(7, 0, 3, 3);
+      tofFindTracks->SetStation(8, 0, 4, 4);
+      tofFindTracks->SetStation(9, 0, 3, 4);
+      tofFindTracks->SetStation(10, 9, 0, 0);
+      tofFindTracks->SetStation(11, 7, 0, 0);
+      tofFindTracks->SetStation(12, 9, 0, 1);
+      tofFindTracks->SetStation(13, 7, 0, 1);
+      tofFindTracks->SetStation(14, 6, 0, 0);
+      tofFindTracks->SetStation(15, 6, 0, 1);
       break;
 
     case 3: