diff --git a/online/mcbm2024_05/StsHitfinder.yaml b/online/mcbm2024_05/StsHitfinder.yaml
index b5e992fdbff668c10b89451e4c343637d150d289..54fc7a92baed6c33cc5d878da27bde25db08c1d5 100644
--- a/online/mcbm2024_05/StsHitfinder.yaml
+++ b/online/mcbm2024_05/StsHitfinder.yaml
@@ -18,7 +18,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [-1, 0, 1.225e-16, 0, 1, 0, -1.225e-16, 0, -1]
-      translation: [1.041e-17, 0, 17.23]
+      translation: [0.05749, -0.3752, 17.43]
   - address: 0x10008012
     dY: 5.969
     pitch: 0.0058
@@ -28,7 +28,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [-1, -1.225e-16, 0, 1.225e-16, -1, 0, 0, 0, 1]
-      translation: [-2.98, 2.87, 30.24]
+      translation: [-2.927, 2.646, 30.03]
   - address: 0x10018012
     dY: 5.969
     pitch: 0.0058
@@ -38,7 +38,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [-1, -1.225e-16, 0, 1.225e-16, -1, 0, 0, 0, 1]
-      translation: [-2.98, -2.87, 30.43]
+      translation: [-2.939, -3.078, 30.24]
   - address: 0x10008412
     dY: 5.969
     pitch: 0.0058
@@ -48,7 +48,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [1, 1.225e-16, 1.225e-16, 1.225e-16, -1, 0, 1.225e-16, 1.5e-32, -1]
-      translation: [2.98, 2.87, 31.86]
+      translation: [3.017, 2.68, 31.72]
   - address: 0x10018412
     dY: 5.969
     pitch: 0.0058
@@ -58,7 +58,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [1, 1.225e-16, 1.225e-16, 1.225e-16, -1, 0, 1.225e-16, 1.5e-32, -1]
-      translation: [2.98, -2.87, 31.67]
+      translation: [3.012, -3.076, 31.51]
   - address: 0x10008022
     dY: 5.969
     pitch: 0.0058
@@ -68,7 +68,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [1, 1.225e-16, 1.225e-16, 1.225e-16, -1, 0, 1.225e-16, 1.5e-32, -1]
-      translation: [-5.959, 5.75, 45.56]
+      translation: [-5.949, 5.705, 45.31]
   - address: 0x10018022
     dY: 12.17
     pitch: 0.0058
@@ -78,7 +78,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [1, 1.225e-16, 1.225e-16, 1.225e-16, -1, 0, 1.225e-16, 1.5e-32, -1]
-      translation: [-5.959, -2.65, 45.37]
+      translation: [-5.975, -2.7, 45.06]
   - address: 0x10008422
     dY: 5.969
     pitch: 0.0058
@@ -88,7 +88,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [-1, -1.225e-16, 0, 1.225e-16, -1, 0, 0, 0, 1]
-      translation: [2.601e-16, 5.75, 43.53]
+      translation: [0.01397, 5.603, 43.53]
   - address: 0x10018422
     dY: 12.17
     pitch: 0.0058
@@ -98,7 +98,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [-1, -1.225e-16, 0, 1.225e-16, -1, 0, 0, 0, 1]
-      translation: [-8.225e-16, -3.09, 43.74]
+      translation: [0.004921, -3.195, 43.74]
   - address: 0x10008822
     dY: 5.969
     pitch: 0.0058
@@ -108,7 +108,7 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [1, 1.225e-16, 1.225e-16, 1.225e-16, -1, 0, 1.225e-16, 1.5e-32, -1]
-      translation: [5.959, 5.74, 45.56]
+      translation: [5.985, 5.688, 45.56]
   - address: 0x10018822
     dY: 5.969
     pitch: 0.0058
@@ -128,5 +128,5 @@ modules:
     lorentzB: 0
     localToGlobal:
       rotation: [1, 1.225e-16, 1.225e-16, 1.225e-16, -1, 0, 1.225e-16, 1.5e-32, -1]
-      translation: [5.959, -5.74, 45.17]
+      translation: [5.951, -5.851, 45.17]
 ...
diff --git a/online/mcbm2024_05/TofHitfinderPar.yaml b/online/mcbm2024_05/TofHitfinderPar.yaml
index 1c303a7d60338a34cd5b2b85ac1920909761a7de..c29ef096aaebde07cf31614a5a98efb3be763168 100644
--- a/online/mcbm2024_05/TofHitfinderPar.yaml
+++ b/online/mcbm2024_05/TofHitfinderPar.yaml
@@ -5,7 +5,7 @@ NbSm:
   - 2
   - 0
   - 0
-  - 1
+  - 2
   - 1
   - 0
   - 0
@@ -32,7 +32,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-59.55, 50, 230.95]
+        translation: [-63.65, 50.2, 235.45]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -81,7 +81,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-29.55, 50, 235.45]
+        translation: [-33.65, 50.2, 230.95]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -130,7 +130,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [0.45, 50, 230.95]
+        translation: [-3.65, 50.2, 235.45]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -179,7 +179,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [30.45, 50, 235.45]
+        translation: [26.35, 50.2, 230.95]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -228,7 +228,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [60.45, 50, 230.95]
+        translation: [56.35, 50.2, 235.45]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -277,7 +277,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-59.55, 0, 230.95]
+        translation: [-63.6, 1.23, 235.45]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -326,7 +326,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-29.55, 0, 235.45]
+        translation: [-33.6, 1.23, 230.95]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -375,7 +375,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [0.45, 0, 230.95]
+        translation: [-3.6, 1.23, 235.45]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -424,7 +424,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [30.45, 0, 235.45]
+        translation: [26.4, 1.23, 230.95]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -473,7 +473,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [60.45, 0, 230.95]
+        translation: [56.4, 1.23, 235.45]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
@@ -522,8 +522,8 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-59.55, -50, 230.95]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
+        translation: [-63.5007, -48.5545, 235.45]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
@@ -571,8 +571,8 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-29.55, -50, 235.45]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
+        translation: [-33.5007, -48.5021, 230.95]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
@@ -620,8 +620,8 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [0.45, -50, 230.95]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
+        translation: [-3.50079, -48.4497, 235.45]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
@@ -669,8 +669,8 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [30.45, -50, 235.45]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
+        translation: [26.4992, -48.3974, 230.95]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
@@ -718,8 +718,8 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [60.45, -50, 230.95]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
+        translation: [56.4991, -48.345, 235.45]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
       trackingStationId: 0
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
@@ -767,9 +767,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-59.55, 27, 250.95]
+        translation: [-63.56, 28, 255.45]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -816,9 +816,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-29.55, 27, 255.45]
+        translation: [-33.56, 28, 250.95]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -865,9 +865,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [0.45, 27, 250.95]
+        translation: [-3.56, 28.2, 255.45]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -914,9 +914,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [30.45, 27, 255.45]
+        translation: [26.44, 28, 250.95]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -963,9 +963,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [60.45, 27, 250.95]
+        translation: [56.44, 28, 255.45]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1012,9 +1012,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-59.55, -27, 250.95]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+        translation: [-63.6009, -25.4446, 255.45]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1061,9 +1061,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-29.55, -27, 255.45]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+        translation: [-33.6004, -25.6923, 250.95]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1110,9 +1110,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [0.45, -27, 250.95]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+        translation: [-3.60045, -25.6399, 255.45]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1159,9 +1159,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [30.45, -27, 255.45]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+        translation: [26.3995, -25.5876, 250.95]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1208,9 +1208,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [60.45, -27, 250.95]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 0
+        translation: [56.3995, -25.5352, 255.45]
+        rotation: [0.999998, -0.00174533, 0, 0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1252,14 +1252,14 @@ rpcs:
       posYMaxScal: 0.75
       maxTimeDist: 1
       maxSpaceDist: 9
-      sigVel: 16.26
+      sigVel: 16.91
       timeRes: 0.08
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-59.55, 0, 322.95]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 5
+        translation: [-63.728, 2.30486, 327.45]
+        rotation: [0.999998, 0.00174533, 0, -0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 3
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1301,14 +1301,14 @@ rpcs:
       posYMaxScal: 0.75
       maxTimeDist: 1
       maxSpaceDist: 9
-      sigVel: 16.5
+      sigVel: 17.23
       timeRes: 0.08
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-29.55, 0, 327.45]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 5
+        translation: [-33.128, 2.25145, 322.95]
+        rotation: [0.999998, 0.00174533, 0, -0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 3
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1350,14 +1350,14 @@ rpcs:
       posYMaxScal: 0.75
       maxTimeDist: 1
       maxSpaceDist: 9
-      sigVel: 16.17
+      sigVel: 16.93
       timeRes: 0.08
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [0.45, 0, 322.95]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 5
+        translation: [-3.72808, 2.20014, 327.45]
+        rotation: [0.999998, 0.00174533, 0, -0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 3
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1399,14 +1399,14 @@ rpcs:
       posYMaxScal: 0.75
       maxTimeDist: 1
       maxSpaceDist: 9
-      sigVel: 16.21
+      sigVel: 16.9
       timeRes: 0.08
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [30.45, 0, 327.45]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 5
+        translation: [26.8719, 2.14673, 322.95]
+        rotation: [0.999998, 0.00174533, 0, -0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 3
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1448,14 +1448,14 @@ rpcs:
       posYMaxScal: 0.75
       maxTimeDist: 1
       maxSpaceDist: 9
-      sigVel: 16.04
+      sigVel: 16.88
       timeRes: 0.08
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [60.45, 0, 322.95]
-        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: 5
+        translation: [56.2718, 2.09542, 327.45]
+        rotation: [0.999998, 0.00174533, 0, -0.00174533, 0.999998, 0, 0, 0, 1]
+      trackingStationId: 3
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1505,9 +1505,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [-60.65, 37.5, 305.2]
-        rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+        translation: [-64.5299, 38.4937, 304.9]
+        rotation: [0.984806, -0.00174533, -0.173648, 0.00171881, 0.999998, -0.000303073, 0.173648, 0, 0.984808]
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1554,9 +1554,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [-30.2, 37.5, 305.2]
-        rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+        translation: [-34.03, 38.547, 304.9]
+        rotation: [0.984806, -0.00174533, -0.173648, 0.00171881, 0.999998, -0.000303073, 0.173648, 0, 0.984808]
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1603,9 +1603,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [0.250003, 37.5, 305.2]
-        rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+        translation: [-3.53, 38.6002, 304.9]
+        rotation: [0.984806, -0.00174533, -0.173648, 0.00171881, 0.999998, -0.000303073, 0.173648, 0, 0.984808]
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1652,9 +1652,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [30.7, 37.5, 305.2]
-        rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+        translation: [26.97, 38.6534, 304.9]
+        rotation: [0.984806, -0.00174533, -0.173648, 0.00171881, 0.999998, -0.000303073, 0.173648, 0, 0.984808]
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1701,9 +1701,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [61.15, 37.5, 305.2]
-        rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+        translation: [57.4699, 38.7067, 304.9]
+        rotation: [0.984806, -0.00174533, -0.173648, 0.00171881, 0.999998, -0.000303073, 0.173648, 0, 0.984808]
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1750,9 +1750,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [-60.65, -37.5, 305.2]
+        translation: [-64.53, -35.3, 304.9]
         rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1799,9 +1799,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [-30.2, -37.5, 305.2]
+        translation: [-34.03, -35.3, 304.9]
         rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1843,14 +1843,14 @@ rpcs:
       posYMaxScal: 0.75
       maxTimeDist: 1
       maxSpaceDist: 9
-      sigVel: 18
+      sigVel: 17.9
       timeRes: 0.08
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [0.250003, -37.5, 305.2]
+        translation: [-3.53, -35.3, 304.9]
         rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1892,14 +1892,14 @@ rpcs:
       posYMaxScal: 0.75
       maxTimeDist: 1
       maxSpaceDist: 9
-      sigVel: 18.03
+      sigVel: 17.88
       timeRes: 0.08
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [30.7, -37.5, 305.2]
+        translation: [26.97, -35.3, 304.9]
         rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1941,14 +1941,14 @@ rpcs:
       posYMaxScal: 0.75
       maxTimeDist: 1
       maxSpaceDist: 9
-      sigVel: 18.02
+      sigVel: 17.92
       timeRes: 0.08
       cell:
         sizeX: 1
         sizeY: 53
-        translation: [61.15, -37.5, 305.2]
+        translation: [57.47, -35.3, 304.9]
         rotation: [0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808]
-      trackingStationId: 5
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -1998,11 +1998,11 @@ rpcs:
       sigVel: 18
       timeRes: 0.08
       cell:
-        sizeX: 0.0125
+        sizeX: 0.01
         sizeY: 0.2
-        translation: [0.35625, 0, -0.5]
+        translation: [-3.295, 1.1, -5.5]
         rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-      trackingStationId: -1
+      trackingStationId: 0
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -2024,6 +2024,47 @@ rpcs:
         - address: 0x3402806
         - address: 0x3802806
         - address: 0x3c02806
+        - address: 0x4002806
+        - address: 0x4402806
+        - address: 0x4802806
+        - address: 0x4c02806
+    - deadStrips: 0
+      posYMaxScal: 0.75
+      maxTimeDist: 1
+      maxSpaceDist: 9
+      sigVel: 18
+      timeRes: 0.08
+      cell:
+        sizeX: 0.01
+        sizeY: 0.2
+        translation: [-3.295, 1.1, -10.5]
+        rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
+      trackingStationId: 0
+      CPTOffYBinWidth: 0
+      CPTOffYRange: 0
+      CPTOffY:
+        []
+      chanPar:
+        - address: 0x2816
+        - address: 0x402816
+        - address: 0x802816
+        - address: 0xc02816
+        - address: 0x1002816
+        - address: 0x1402816
+        - address: 0x1802816
+        - address: 0x1c02816
+        - address: 0x2002816
+        - address: 0x2402816
+        - address: 0x2802816
+        - address: 0x2c02816
+        - address: 0x3002816
+        - address: 0x3402816
+        - address: 0x3802816
+        - address: 0x3c02816
+        - address: 0x4002816
+        - address: 0x4402816
+        - address: 0x4802816
+        - address: 0x4c02816
   -
     - deadStrips: 0
       posYMaxScal: 0.75
@@ -2034,7 +2075,7 @@ rpcs:
       cell:
         sizeX: 0.9
         sizeY: 6
-        translation: [31.55, 33.5, 266.05]
+        translation: [27.9, 34.6, 266.05]
         rotation: [-1, -1.22465e-16, 0, 1.22465e-16, -1, 0, 0, 0, 1]
       trackingStationId: 1
       CPTOffYBinWidth: 0
@@ -2083,9 +2124,9 @@ rpcs:
       cell:
         sizeX: 0.9
         sizeY: 6
-        translation: [31.55, 33.5, 269.85]
+        translation: [26.8, 33.5, 269.85]
         rotation: [-1, -1.22465e-16, 0, 1.22465e-16, -1, 0, 0, 0, 1]
-      trackingStationId: 2
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -2137,7 +2178,7 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-15, -0.85, 267]
+        translation: [-15.65, 1.25, 267]
         rotation: [6.12323e-17, -1, 0, 1, 6.12323e-17, 0, 0, 0, 1]
       trackingStationId: 1
       CPTOffYBinWidth: 0
@@ -2186,9 +2227,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-15, -0.85, 271.3]
+        translation: [-15.65, 1.25, 271.3]
         rotation: [6.12323e-17, -1, 0, 1, 6.12323e-17, 0, 0, 0, 1]
-      trackingStationId: 2
+      trackingStationId: 1
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -2235,9 +2276,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-15, -0.85, 283]
+        translation: [-15.65, 1.25, 283]
         rotation: [6.12323e-17, -1, 0, 1, 6.12323e-17, 0, 0, 0, 1]
-      trackingStationId: 3
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
@@ -2284,9 +2325,9 @@ rpcs:
       cell:
         sizeX: 1
         sizeY: 27
-        translation: [-15, -0.85, 287.3]
+        translation: [-15.65, 1.25, 287.3]
         rotation: [6.12323e-17, -1, 0, 1, 6.12323e-17, 0, 0, 0, 1]
-      trackingStationId: 4
+      trackingStationId: 2
       CPTOffYBinWidth: 0
       CPTOffYRange: 0
       CPTOffY:
diff --git a/online/mcbm2024_05/TrdHitfinder2DPar.yaml b/online/mcbm2024_05/TrdHitfinder2DPar.yaml
index 135b490fa2715d86ee9b68d6692b1702ea72a61c..29cb98d54ed10c06e3c0ad49428b7635f6ce35fa 100644
--- a/online/mcbm2024_05/TrdHitfinder2DPar.yaml
+++ b/online/mcbm2024_05/TrdHitfinder2DPar.yaml
@@ -3,7 +3,7 @@ modules:
   - padSizeX: 0.75
     padSizeY: 2.79
     address: 5
-    translation: [0, 0, 120.17]
+    translation: [-1.9, -0.8, 120.17]
     rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
     rowPar:
       - padPar:
diff --git a/online/mcbm2024_05/TrdHitfinderPar.yaml b/online/mcbm2024_05/TrdHitfinderPar.yaml
index e1bd467ec84307c28dc2d632df498016b50ed8a5..bfbe1a08e4f058a93e25eb129e51ba136805c7f9 100644
--- a/online/mcbm2024_05/TrdHitfinderPar.yaml
+++ b/online/mcbm2024_05/TrdHitfinderPar.yaml
@@ -6,7 +6,7 @@ modules:
     padSizeErrY: 4
     address: 21
     orientation: 0
-    translation: [0, -6, 150.6]
+    translation: [-2.8, -5.24, 150.6]
     rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
     rowPar:
       - padPar:
@@ -6951,7 +6951,7 @@ modules:
     padSizeErrY: 4
     address: 37
     orientation: 1
-    translation: [-9, 0, 190.8]
+    translation: [-12.4, 0.6, 190.8]
     rotation: [6.12323e-17, -1, 0, 1, 6.12323e-17, 0, 0, 0, 1]
     rowPar:
       - padPar: