diff --git a/online/BmonHitfinderPar_mcbm2022.yaml b/online/BmonHitfinderPar_mcbm2022.yaml
index 842b1215acbd6e009bf58f6684467c94eeb89550..658f702e8dd37e6b80347e447140e3f8a7f90caf 100644
--- a/online/BmonHitfinderPar_mcbm2022.yaml
+++ b/online/BmonHitfinderPar_mcbm2022.yaml
@@ -1,39 +1,16 @@
 ---
-SmType: 5
-NbSm: 1
-NbRpc: 1
-rpcs:
-  - deadStrips: 0
+selectionMask: 0x00000000  # Only one diamond is used, so no selection is needed 
+diamonds:
+  - refAddress: 0x00002806  # An address of the diamond (in terms of CbmTofAddress::GetModFullId())
+    deadStrips: 0
+    nChannels: 16
     posYMaxScal: 0.75
     maxTimeDist: 1
     maxSpaceDist: 9
     sigVel: 18
     timeRes: 0.080000000000000002
-    cell:
-      sizeX: 0.02500000037252903
-      sizeY: 0.20000000298023224
-      translation: [53.862499986775219, 0, -0.1999969482421875]
-      rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-    trackingStationId: 0
     CPTOffYBinWidth: 0
     CPTOffYRange: 0
     CPTOffY:
       []
-    chanPar:
-      - address: 0x2806
-      - address: 0x402806
-      - address: 0x802806
-      - address: 0xc02806
-      - address: 0x1002806
-      - address: 0x1402806
-      - address: 0x1802806
-      - address: 0x1c02806
-      - address: 0x2002806
-      - address: 0x2402806
-      - address: 0x2802806
-      - address: 0x2c02806
-      - address: 0x3002806
-      - address: 0x3402806
-      - address: 0x3802806
-      - address: 0x3c02806
 ...
diff --git a/online/BmonHitfinderPar_mcbm2024.yaml b/online/BmonHitfinderPar_mcbm2024.yaml
index 35451a5a02f7adf60ba55d6f4e0afca07fdf9a8b..5e1e8e59de9ea5677331314702781d908c1700e1 100644
--- a/online/BmonHitfinderPar_mcbm2024.yaml
+++ b/online/BmonHitfinderPar_mcbm2024.yaml
@@ -1,39 +1,16 @@
 ---
-SmType: 5
-NbSm: 1
-NbRpc: 1
-rpcs:
-  - deadStrips: 0
+selectionMask: 0x00000000  # Only one diamond is used, so no selection is needed 
+diamonds:
+  - refAddress: 0x00002806  # An address of the diamond (in terms of CbmTofAddress::GetModFullId())
+    deadStrips: 0
+    nChannels: 16
     posYMaxScal: 0.75
     maxTimeDist: 1
     maxSpaceDist: 9
     sigVel: 18
     timeRes: 0.08
-    cell:
-      sizeX: 0.0125
-      sizeY: 0.2
-      translation: [3.35625, 0, -0.5]
-      rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-    trackingStationId: -1
     CPTOffYBinWidth: 0
     CPTOffYRange: 0
     CPTOffY:
       []
-    chanPar:
-      - address: 0x2806
-      - address: 0x402806
-      - address: 0x802806
-      - address: 0xc02806
-      - address: 0x1002806
-      - address: 0x1402806
-      - address: 0x1802806
-      - address: 0x1c02806
-      - address: 0x2002806
-      - address: 0x2402806
-      - address: 0x2802806
-      - address: 0x2c02806
-      - address: 0x3002806
-      - address: 0x3402806
-      - address: 0x3802806
-      - address: 0x3c02806
 ...
diff --git a/online/mcbm2024_05/BmonHitfinderPar.yaml b/online/mcbm2024_05/BmonHitfinderPar.yaml
index 39e4f294e2d5d959de8fc3a87d655de23d2ce647..fce1aaa551285c00ec8bcf37b3c40d64ee8bab2f 100644
--- a/online/mcbm2024_05/BmonHitfinderPar.yaml
+++ b/online/mcbm2024_05/BmonHitfinderPar.yaml
@@ -1,80 +1,28 @@
 ---
-SmType: 5
-NbSm: 2
-NbRpc: 1
-rpcs:  # Sm * NpRpc + Rpc
-  - deadStrips: 0
+selectionMask: 0x00200000  # The two diamonds are distinguished by the channel side 
+diamonds:
+  - refAddress: 0x00002806
+    deadStrips: 0
+    nChannels: 20
     posYMaxScal: 0.75
     maxTimeDist: 1
     maxSpaceDist: 9
     sigVel: 18
     timeRes: 0.08
-    cell:
-      sizeX: 0.01
-      sizeY: 0.2
-      translation: [-3.295, 1.1, -5.5]
-      rotation: [1, 0, 0, 0, 1, 0, 0, 0, 1]
-    trackingStationId: 0
     CPTOffYBinWidth: 0
     CPTOffYRange: 0
     CPTOffY:
       []
-    chanPar:
-      - address: 0x00002806  # channel 0
-      - address: 0x00402806  # channel 1
-      - address: 0x00802806  # channel 2
-      - address: 0x00c02806  # channel 3
-      - address: 0x01002806  # channel 4
-      - address: 0x01402806  # channel 5
-      - address: 0x01802806  # channel 6
-      - address: 0x01c02806  # channel 7
-      - address: 0x02002806  # channel 8
-      - address: 0x02402806  # channel 9
-      - address: 0x02802806  # channel 10
-      - address: 0x02c02806  # channel 11
-      - address: 0x03002806  # channel 12
-      - address: 0x03402806  # channel 13
-      - address: 0x03802806  # channel 14
-      - address: 0x03c02806  # channel 15
-      - address: 0x04002806  # channel 16
-      - address: 0x04402806  # channel 17
-      - address: 0x04802806  # channel 18
-      - address: 0x04c02806  # channel 19
-  - deadStrips: 0
+  - refAddress: 0x00202806
+    deadStrips: 0
+    nChannels: 20
     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: 0x00002816  # channel 0
-      - address: 0x00402816  # channel 1
-      - address: 0x00802816  # channel 2
-      - address: 0x00c02816  # channel 3
-      - address: 0x01002816  # channel 4
-      - address: 0x01402816  # channel 5
-      - address: 0x01802816  # channel 6
-      - address: 0x01c02816  # channel 7
-      - address: 0x02002816  # channel 8
-      - address: 0x02402816  # channel 9
-      - address: 0x02802816  # channel 10
-      - address: 0x02c02816  # channel 11
-      - address: 0x03002816  # channel 12
-      - address: 0x03402816  # channel 13
-      - address: 0x03802816  # channel 14
-      - address: 0x03c02816  # channel 15
-      - address: 0x04002816  # channel 16
-      - address: 0x04402816  # channel 17
-      - address: 0x04802816  # channel 18
-      - address: 0x04c02816  # channel 19
 ...