diff --git a/online/EventbuildConfig.yaml b/online/EventbuildConfig.yaml
deleted file mode 100644
index 2d2c2bc3268a3b0f1c800c41d3d244550be3cc39..0000000000000000000000000000000000000000
--- a/online/EventbuildConfig.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-trigger:
-  detector: TOF
-  window: 80
-  threshold: 8
-  deadtime: 50
-eventbuilder:
-  BMON:    [-65, 65]
-  STS:   [-75, 75]
-  MUCH:  [-50, 500]
-  TRD :  [-100, 300]
-  TRd2D: [-100, 350]
-  TOF:   [-10, 70]
-  RICH:  [-20, 120]
-  FSD:   [-50, 150]
-selector:
-  minDigis:
-    BMON: 1
-  minLayers:
-    STS: 0
-    TOF: 0
-
diff --git a/online/EventbuildConfig.yaml b/online/EventbuildConfig.yaml
new file mode 120000
index 0000000000000000000000000000000000000000..1dfea96b45ba39bc110c437bec87c8f7ece0bb73
--- /dev/null
+++ b/online/EventbuildConfig.yaml
@@ -0,0 +1 @@
+mcbm2025_02/EventbuildConfig_v0trigger.yaml
\ No newline at end of file
diff --git a/online/EventbuildConfig_till_2025.yaml b/online/EventbuildConfig_till_2025.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2d2c2bc3268a3b0f1c800c41d3d244550be3cc39
--- /dev/null
+++ b/online/EventbuildConfig_till_2025.yaml
@@ -0,0 +1,22 @@
+---
+trigger:
+  detector: TOF
+  window: 80
+  threshold: 8
+  deadtime: 50
+eventbuilder:
+  BMON:    [-65, 65]
+  STS:   [-75, 75]
+  MUCH:  [-50, 500]
+  TRD :  [-100, 300]
+  TRd2D: [-100, 350]
+  TOF:   [-10, 70]
+  RICH:  [-20, 120]
+  FSD:   [-50, 150]
+selector:
+  minDigis:
+    BMON: 1
+  minLayers:
+    STS: 0
+    TOF: 0
+
diff --git a/online/mcbm2025_02/BmonCalibratePar.yaml b/online/mcbm2025_02/BmonCalibratePar.yaml
index 0ecd71b1bd025bb946741943b458b0701e99498a..c8da04eb9496be445dc8a56f8477d129b0050d1f 120000
--- a/online/mcbm2025_02/BmonCalibratePar.yaml
+++ b/online/mcbm2025_02/BmonCalibratePar.yaml
@@ -1 +1 @@
-reco_030325_improved_tof/BmonCalibratePar.yaml
\ No newline at end of file
+BmonCalibratePar_two_diamonds.yaml
\ No newline at end of file
diff --git a/online/mcbm2025_02/BmonCalibratePar_two_diamonds.yaml b/online/mcbm2025_02/BmonCalibratePar_two_diamonds.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cbebff02a5a73d59d9f6e927249ac60162e0e060
--- /dev/null
+++ b/online/mcbm2025_02/BmonCalibratePar_two_diamonds.yaml
@@ -0,0 +1,96 @@
+---
+selectionMask: 0x000007f0  # Two diamonds are used, selection with supermodule id 
+diamonds:
+  - refAddress: 0x00002806  # An address of the diamond (in terms of CbmTofAddress::GetModFullId())
+    numClWalkBinX: 50
+    TOTMax: 20
+    TOTMin: 0
+    channelDeadtime: 50
+    chanPar:
+      - vCPTOff: 0.152597
+        vCPTotGain: 0.287141
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+      - vCPTOff: -0.229318
+        vCPTotGain: 0.269028
+        vCPTotOff: 0
+        vCPWalk: [0.045307, 0.045307, 0.0843314, -0.478544, -0.351857, 0.293057, -0.209599, 0.286172, -0.757223, 0.132952, 0.0131769, -0.256296, 0.121811, 0.553425, 0.288503, 0.55138, -0.265319, 0.138079, -0.365645, -0.11097, -0.446951, -0.328247, -0.389489, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307, 0.045307]
+      - vCPTOff: -0.61167
+        vCPTotGain: 0.300091
+        vCPTotOff: 0
+        vCPWalk: [0.0979786, -0.0244567, -0.863507, -0.357075, 0.13297, -0.868836, -0.355178, -0.595317, -0.497819, -0.567571, -0.248148, -0.0239316, 0.42064, 0.361585, 0.340223, 0.0852085, 0.0581504, -0.0576885, -0.051829, -0.353056, 0.080267, -0.221775, -0.11935, -0.351922, -0.0981627, -0.184186, -0.105792, -0.205379, -0.181534, 0.215948, 0.0509949, 0.0979786, 0.039442, 0.0682664, 0.0979786, 0.0979786, 0.0475721, 0.0979786, 0.0979786, 0.0979786, 0.0979786, 0.0979786, 0.0979786, 0.0979786, 0.0979786, 0.0979786, 0.0979786, 0.0979786, 0.0979786, 0.0979786]
+      - vCPTOff: -0.961561
+        vCPTotGain: 0.333043
+        vCPTotOff: 0
+        vCPWalk: [-0.318177, -0.0316989, -0.320458, -0.00991901, -0.31968, -0.410238, -0.594002, -0.268447, -0.231704, -0.479767, -0.306848, -0.156658, 0.166793, 0.206172, 0.308122, 0.383675, 0.39911, 0.174229, 0.297459, 0.194519, 0.0817048, -0.0489573, -0.0593862, -0.202843, -0.221973, -0.251229, -0.222535, -0.634565, 0.0971378, -0.174798, -0.454298, -0.303784, -0.398746, 0.227711, 0.168603, 0.162777, 0.00986824, -0.0570539, 0.0965676, 0.0361835, -0.183322, 0.111968, 0.311829, 0.121468, 0.0658061, 0.121468, 0.121468, 0.121468, 0.121468, 0.136103]
+      - vCPTOff: 0.798615
+        vCPTotGain: 0.325279
+        vCPTotOff: 0
+        vCPWalk: [-0.00232805, -0.946299, -0.670009, -1.06034, -0.680484, -0.792945, -0.854541, -0.707001, -0.754065, -0.665065, -0.117036, 0.262327, 0.562485, 0.589071, 0.482069, 0.370954, 0.21414, 0.069257, -0.0989096, -0.134032, -0.263683, -0.315162, -0.307935, -0.41804, -0.477956, -0.41049, -0.456505, -0.524302, -0.656233, -0.177472, -0.321284, -0.437195, -0.572956, -0.310969, 0.230127, -0.432397, 0.144416, 0.125514, -0.0118802, -0.00531288, 0.0944302, 0.0774253, 0.106128, 0.204355, -0.0566244, 0.0911249, 0.0325257, 0.0222554, 0.0911249, 0.0911249]
+      - vCPTOff: 0.139676
+        vCPTotGain: 0.453035
+        vCPTotOff: 0
+        vCPWalk: [-0.633935, 0.182752, -0.327871, -0.483714, -0.38339, -0.478159, -0.47575, -0.449965, 0.132516, -0.363502, -0.26752, -0.137399, -0.0337974, 0.166309, 0.314854, 0.410736, 0.2622, 0.247988, 0.318033, 0.260819, 0.228408, 0.127175, 0.157061, 0.147755, 0.147866, -0.157401, 0.0400387, -0.0845747, -0.187888, -0.128629, 0.0855218, -0.289517, -0.34646, 0.0498833, 0.0195518, -0.263664, -0.0182089, -0.422513, -0.551136, -0.00547831, 0.208407, 0.194875, 0.629049, 0.0564349, 0.0790947, 0.18333, 0.0892916, 0.197319, 0.107167, -0.0439312]
+      - vCPTOff: -0.461964
+        vCPTotGain: 0.450738
+        vCPTotOff: 0
+        vCPWalk: [-0.456314, -1.24414, -1.02145, -0.881684, -0.878936, -0.879581, -0.738147, -0.838024, -0.0334302, -0.582678, -0.458776, -0.365534, -0.130886, 0.206455, 0.524905, 0.610128, 0.704967, -0.0334302, 0.56814, 0.394192, 0.221658, 0.12821, 0.0276691, 0.067544, -0.1459, -0.105544, -0.200433, -0.177161, -0.0797067, -0.3138, -0.368564, -0.391322, -0.41367, -0.713376, -0.057676, -0.212713, 0.0637545, -0.0262918, 0.0891722, -0.266027, -0.371036, -0.228525, -0.0971911, -0.0389107, -0.0334302, -0.268225, -0.224262, 0.105594, 0.0690959, -0.0101389]
+      - vCPTOff: -0.591005
+        vCPTotGain: 0.53193
+        vCPTotOff: 0
+        vCPWalk: [-0.414442, 0.0659513, -0.497693, -0.21788, -0.208032, -0.631921, -0.601976, -0.152361, -0.323839, -0.368863, -0.196351, -0.0149263, -0.0647751, 0.0507959, 0.229766, 0.174867, 0.282706, 0.440503, 0.404366, 0.145154, 0.225245, 0.282691, 0.178467, 0.0757461, -0.0228072, 0.0858906, 0.0706968, 0.00607055, -0.0475506, 0.0533614, 0.00575763, -0.0350582, 0.105096, 0.0335088, -0.193189, -0.0650891, -0.24327, -0.186991, -0.293777, -0.102492, -0.422373, -0.045495, -0.309766, -0.102866, -0.358931, -0.0536269, -0.111662, 0.0535383, 0.00758631, 0.0856281]
+      - vCPTOff: 0.909767
+        vCPTotGain: 0.416562
+        vCPTotOff: 0
+        vCPWalk: [-0.0278966, 0.35033, -0.807914, -0.20472, -0.0509377, -0.128798, -0.350842, -0.291095, -0.188696, -0.0237623, -0.0538742, 0.00318282, -0.081829, -0.0435771, 0.142764, -0.0180338, 0.162388, 0.0998167, 0.25599, 0.17612, 0.256099, 0.135667, 0.161751, 0.203978, 0.356156, 0.180936, 0.134425, -0.00386253, -0.194313, -0.118883, -0.120285, 0.200825, -0.358681, 0.00468302, -0.379328, 0.102943, 0.0285946, 0.0204374, 0.0235556, 0.36256, 0.0170939, 0.198766, 0.275421, 0.275421, 0.275421, 0.275421, 0.275421, 0.275421, 0.275421, 0.275421]
+      - vCPTOff: 0.0451488
+        vCPTotGain: 0.284477
+        vCPTotOff: 0
+        vCPWalk: [-0.00637189, -0.00637189, -0.0353875, -0.587649, -0.761969, -1.1333, -0.792276, -0.579581, 0.272312, -0.379613, 0.466664, -0.25878, 0.107817, 0.295176, 0.1554, 0.370943, 0.122395, -0.0759204, 0.212341, -0.0157936, -0.626234, -0.38717, -0.472628, -0.42417, -0.604301, -0.278625, -0.00637189, -0.411156, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189, -0.00637189]
+      - vCPTOff: -0.0981145
+        vCPTotGain: 1
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+      - vCPTOff: -0.338936
+        vCPTotGain: 0.378603
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+      - vCPTOff: 0.841309
+        vCPTotGain: 0.53343
+        vCPTotOff: 0
+        vCPWalk: [0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325, 0.420325]
+      - vCPTOff: 0.130772
+        vCPTotGain: 0.401166
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+      - vCPTOff: -0.171388
+        vCPTotGain: 0.631536
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+      - vCPTOff: -0.565699
+        vCPTotGain: 0.413772
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+  - refAddress: 0x00002816  # An address of the diamond (in terms of CbmTofAddress::GetModFullId())
+    numClWalkBinX: 50
+    TOTMax: 20
+    TOTMin: 0
+    channelDeadtime: 50
+    chanPar:
+      - vCPTOff: 0
+        vCPTotGain: 1
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+      - vCPTOff: 0
+        vCPTotGain: 1
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+      - vCPTOff: 0
+        vCPTotGain: 1
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+      - vCPTOff: 0
+        vCPTotGain: 1
+        vCPTotOff: 0
+        vCPWalk: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+...
diff --git a/online/mcbm2025_02/BmonHitfinderPar.yaml b/online/mcbm2025_02/BmonHitfinderPar.yaml
index 21b5b9266755fec184c7d0986874dca0e3e59f9c..40c3e12c31a4ceefacd5a0840d30696d646016a4 120000
--- a/online/mcbm2025_02/BmonHitfinderPar.yaml
+++ b/online/mcbm2025_02/BmonHitfinderPar.yaml
@@ -1 +1 @@
-reco_030325_improved_tof/BmonHitfinderPar.yaml
\ No newline at end of file
+BmonHitfinderPar_two_diamonds.yaml
\ No newline at end of file
diff --git a/online/mcbm2025_02/BmonHitfinderPar_two_diamonds.yaml b/online/mcbm2025_02/BmonHitfinderPar_two_diamonds.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e355532a4b22a623e522cfdafab0ac6484428692
--- /dev/null
+++ b/online/mcbm2025_02/BmonHitfinderPar_two_diamonds.yaml
@@ -0,0 +1,12 @@
+---
+selectionMask: 0x000007f0  # 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  # !!! 
+    maxTimeDist: 1
+    timeRes: 0.08
+  - refAddress: 0x00002816  # An address of the diamond (in terms of CbmTofAddress::GetModFullId())
+    deadStrips: 0  # !!! 
+    maxTimeDist: 1
+    timeRes: 0.08
+...
diff --git a/online/mcbm2025_02/EventbuildConfig.yaml b/online/mcbm2025_02/EventbuildConfig.yaml
deleted file mode 120000
index 00750fa7a3d2b37271ac5d95fd026edbcfa42ac0..0000000000000000000000000000000000000000
--- a/online/mcbm2025_02/EventbuildConfig.yaml
+++ /dev/null
@@ -1 +0,0 @@
-EventbuildConfig_default.yaml
\ No newline at end of file