diff --git a/MQ/mcbm/CbmDeviceUnpack.cxx b/MQ/mcbm/CbmDeviceUnpack.cxx
index 7dde3a1d4bfa83737e8aeb49973e7c36d27b0147..473bac0069dd339472b04ceb131bc2fc86c79c62 100644
--- a/MQ/mcbm/CbmDeviceUnpack.cxx
+++ b/MQ/mcbm/CbmDeviceUnpack.cxx
@@ -413,7 +413,7 @@ Bool_t CbmDeviceUnpack::InitContainers()
richconfig->DoTotOffsetCorrection(); // correct ToT offset
richconfig->SetDebugState();
richconfig->SetDoWriteOutput();
- std::string parfilesbasepathRich = Form("%s/macro/beamtime/mcbm2021/", srcDir.Data());
+ std::string parfilesbasepathRich = Form("%s/macro/beamtime/mcbm2024/", srcDir.Data());
richconfig->SetParFilesBasePath(parfilesbasepathRich);
richconfig->SetSystemTimeOffset(256000 - 1200); // [ns] 1 MS and additional correction
if (1904 < fuRunId) richconfig->SetSystemTimeOffset(-1200);
diff --git a/algo/detectors/rich/ReadoutConfig.cxx b/algo/detectors/rich/ReadoutConfig.cxx
index 4f354a9e032308eb623692da6cc6260ee9067922..c1cc545bb1f082160b3db860c2a8af5a7fd6e6cc 100644
--- a/algo/detectors/rich/ReadoutConfig.cxx
+++ b/algo/detectors/rich/ReadoutConfig.cxx
@@ -1,6 +1,6 @@
-/* Copyright (C) 2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+/* Copyright (C) 2022-2024 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Volker Friese, Dominik Smith [committer] */
+ Authors: Volker Friese, Dominik Smith [committer], Martin Beyer */
#include "ReadoutConfig.h"
@@ -60,12 +60,12 @@ namespace cbm::algo::rich
// --- Initialise the mapping structure --------------------------------------------
void ReadoutConfig::Init()
{
- // This here refers to the mCBM 2021 setup.
- // Taken from CbmMcbm2018RichPar in combination with macro/beamtime/mcbm2021/mRich.par
+ // This here refers to the mCBM 2024 setup, it is backward compatible with the 2021 setup.
+ // Taken from CbmMcbm2018RichPar in combination with macro/beamtime/mcbm2024/mRichPar_70.par
// Constants
const uint16_t numComp = 1; // Number of components
- const uint16_t numElinksPerComp = 74; // Number of elinks per component
+ const uint16_t numElinksPerComp = 76; // Number of elinks per component (74 for mRICH, 2 for FSD/NCAL)
const uint16_t numChanPerElink = 33; // Number of channels per Elink
// Equipment IDs for each component
@@ -78,7 +78,8 @@ namespace cbm::algo::rich
0x7130, 0x7131, 0x7140, 0x7141, 0x7150, 0x7151, 0x7160, 0x7161, 0x7170, 0x7171, 0x7180, 0x7181, 0x7200,
0x7201, 0x7210, 0x7211, 0x7220, 0x7221, 0x7230, 0x7231, 0x7240, 0x7241, 0x7250, 0x7251, 0x7260, 0x7261,
0x7270, 0x7271, 0x7280, 0x7281, 0x7300, 0x7301, 0x7310, 0x7311, 0x7320, 0x7321, 0x7330, 0x7331, 0x7340,
- 0x7341, 0x7350, 0x7351, 0x7360, 0x7361, 0x7370, 0x7371, 0x7380, 0x7381};
+ 0x7341, 0x7350, 0x7351, 0x7360, 0x7361, 0x7370, 0x7371, 0x7380, 0x7381, 0x7901, 0x7902};
+ // TRBaddresses 0x7901 and 0x7902 are for FSD/NCAL
double ToTshifts[numElinksPerComp][numChanPerElink] = {
{0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
@@ -300,7 +301,13 @@ namespace cbm::algo::rich
6.55, 6.85, 7.05, 7.35, 8.55, 6.85, 5.55, 6.15, 4.65, 6.05, 7.75},
{0.00, 14.05, 12.75, 13.75, 11.35, 14.35, 11.85, 10.25, 13.35, 13.45, 11.25,
14.35, 16.05, 15.75, 14.65, 7.55, 8.35, 5.15, 2.95, 5.35, 7.55, 8.25,
- 6.55, 7.05, 7.35, 7.75, 8.65, 6.65, 5.05, 7.05, 4.55, 5.85, 7.75}};
+ 6.55, 7.05, 7.35, 7.75, 8.65, 6.65, 5.05, 7.05, 4.55, 5.85, 7.75},
+ {0.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00,
+ 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00,
+ 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00, 15.00},
+ {0.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00,
+ 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00,
+ 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00, 10.00}};
// Constructing the map (equipmentId, asic address, channel) -> (tot shift)
for (uint16_t comp = 0; comp < numComp; comp++) {
diff --git a/macro/beamtime/mcbm2022/mcbm_unp_event.C b/macro/beamtime/mcbm2022/mcbm_unp_event.C
index ff719385174da4e1a91b6beeef40f005bad27eaf..36c7d77e8a5e4d495378d6fa57c8110caab450f1 100644
--- a/macro/beamtime/mcbm2022/mcbm_unp_event.C
+++ b/macro/beamtime/mcbm2022/mcbm_unp_event.C
@@ -692,7 +692,7 @@ Bool_t mcbm_unp_event(std::string infile,
richconfig->DoTotOffsetCorrection(); // correct ToT offset
richconfig->SetDebugState();
richconfig->SetDoWriteOutput();
- std::string parfilesbasepathRich = Form("%s/macro/beamtime/mcbm2021/", srcDir.Data());
+ std::string parfilesbasepathRich = Form("%s/macro/beamtime/mcbm2024/", srcDir.Data());
richconfig->SetParFilesBasePath(parfilesbasepathRich);
richconfig->SetSystemTimeOffset(256000 - 1200); // [ns] 1 MS and additional correction
if (1904 < uRunId) richconfig->SetSystemTimeOffset(-1200);
diff --git a/macro/beamtime/mcbm2024/mRichPar_70.par b/macro/beamtime/mcbm2024/mRichPar_70.par
new file mode 100644
index 0000000000000000000000000000000000000000..99f83b84defb22d32f167c5f1fde722ff279458e
--- /dev/null
+++ b/macro/beamtime/mcbm2024/mRichPar_70.par
@@ -0,0 +1,160 @@
+[CbmMcbm2018RichPar]
+//----------------------------------------------------------------------------
+TRBaddresses: Int_t \
+ 0xc000 \
+ 0xc001 \
+ 0x7000 \
+ 0x7001 \
+ 0x7010 \
+ 0x7011 \
+ 0x7020 \
+ 0x7021 \
+ 0x7030 \
+ 0x7031 \
+ 0x7040 \
+ 0x7041 \
+ 0x7050 \
+ 0x7051 \
+ 0x7060 \
+ 0x7061 \
+ 0x7070 \
+ 0x7071 \
+ 0x7080 \
+ 0x7081 \
+ 0x7100 \
+ 0x7101 \
+ 0x7110 \
+ 0x7111 \
+ 0x7120 \
+ 0x7121 \
+ 0x7130 \
+ 0x7131 \
+ 0x7140 \
+ 0x7141 \
+ 0x7150 \
+ 0x7151 \
+ 0x7160 \
+ 0x7161 \
+ 0x7170 \
+ 0x7171 \
+ 0x7180 \
+ 0x7181 \
+ 0x7200 \
+ 0x7201 \
+ 0x7210 \
+ 0x7211 \
+ 0x7220 \
+ 0x7221 \
+ 0x7230 \
+ 0x7231 \
+ 0x7240 \
+ 0x7241 \
+ 0x7250 \
+ 0x7251 \
+ 0x7260 \
+ 0x7261 \
+ 0x7270 \
+ 0x7271 \
+ 0x7280 \
+ 0x7281 \
+ 0x7300 \
+ 0x7301 \
+ 0x7310 \
+ 0x7311 \
+ 0x7320 \
+ 0x7321 \
+ 0x7330 \
+ 0x7331 \
+ 0x7340 \
+ 0x7341 \
+ 0x7350 \
+ 0x7351 \
+ 0x7360 \
+ 0x7361 \
+ 0x7370 \
+ 0x7371 \
+ 0x7380 \
+ 0x7381 \
+ 0x7901 \
+ 0x7902
+
+ToTshifts: Double_t \
+ 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 \
+ 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 \
+ 0.00 17.25 16.25 16.85 14.75 17.35 14.45 14.05 16.15 16.55 14.25 17.25 18.55 19.05 17.25 10.25 11.45 7.55 5.85 7.75 9.85 11.25 8.85 9.15 9.75 10.45 11.25 9.05 7.85 8.55 6.75 8.75 10.45 \
+ 0.00 15.65 14.35 14.75 12.55 15.55 12.75 11.75 14.25 14.45 12.65 15.15 16.85 17.05 15.55 8.55 10.05 6.35 4.25 6.15 8.15 9.05 7.25 7.35 7.75 8.55 9.55 7.65 6.25 7.65 5.25 7.55 9.25 \
+ 0.00 14.35 13.75 13.65 11.75 15.35 12.35 11.35 14.05 13.75 11.85 14.45 16.25 16.25 14.55 7.95 9.15 5.95 0.00 6.15 7.65 0.00 6.85 7.05 7.25 7.85 9.15 6.75 5.85 6.85 5.05 6.25 7.85 \
+ 0.00 14.65 13.45 14.05 12.25 15.25 12.15 11.05 13.85 13.65 11.85 14.55 16.05 16.15 15.05 7.65 9.15 6.05 4.05 0.00 7.75 8.85 7.25 7.15 7.55 8.05 9.25 7.15 5.55 6.85 5.25 6.95 8.75 \
+ 0.00 16.35 15.05 15.35 13.25 16.75 13.15 11.75 15.05 15.05 13.15 16.05 17.55 17.25 16.15 9.15 9.05 0.00 4.75 6.75 8.95 9.75 7.65 8.25 8.55 9.15 10.25 8.25 6.65 8.05 5.75 7.15 10.25 \
+ 0.00 17.65 16.45 16.65 14.35 18.35 14.85 13.75 16.55 16.25 14.35 17.25 19.05 19.55 17.75 10.35 11.55 7.95 5.55 7.45 9.85 10.85 8.75 9.35 9.75 9.85 11.35 9.35 7.35 10.05 5.05 8.65 10.75 \
+ 0.00 17.05 16.25 16.85 14.65 17.65 14.75 13.65 16.25 15.85 14.15 17.25 18.75 18.75 17.25 10.15 11.15 7.25 5.05 7.55 9.55 10.05 8.15 8.85 9.35 9.55 10.35 8.75 6.75 7.85 6.35 8.25 10.05 \
+ 0.00 17.35 16.25 15.05 14.35 17.15 14.55 12.75 0.00 16.35 13.75 16.85 18.35 17.55 17.05 9.85 11.25 7.55 5.85 7.85 9.15 10.65 8.45 8.45 0.00 9.65 9.55 0.00 5.95 7.95 6.55 7.65 10.05 \
+ 0.00 16.55 15.55 15.85 13.35 17.35 13.75 12.65 15.25 15.55 13.55 16.65 17.85 18.35 16.85 9.35 10.75 7.35 4.55 6.95 8.85 9.85 8.25 8.35 8.75 9.35 10.05 8.45 6.85 7.75 6.35 8.05 9.85 \
+ 0.00 16.35 15.05 15.65 13.35 16.65 13.75 11.95 15.05 15.25 13.05 15.85 17.65 17.85 16.55 9.15 10.55 7.25 4.75 6.75 8.65 9.65 7.85 8.25 8.15 9.25 10.45 8.35 6.65 8.05 6.25 8.05 9.85 \
+ 0.00 15.55 14.55 14.75 12.75 16.15 12.85 11.65 14.35 14.35 12.75 15.45 17.15 17.35 15.95 8.85 9.75 6.65 4.35 6.55 8.55 9.35 7.65 7.85 8.35 8.85 10.05 7.95 6.35 7.55 5.25 7.05 9.05 \
+ 0.00 16.65 15.35 15.85 13.55 17.35 13.65 12.85 16.05 15.85 13.75 16.55 17.65 18.75 16.85 9.75 10.65 7.75 5.05 7.05 9.05 10.25 8.35 8.65 9.35 9.15 10.05 8.15 7.25 8.35 6.25 7.85 9.65 \
+ 0.00 16.55 15.55 15.75 13.75 17.25 13.85 12.85 15.65 15.55 13.65 16.35 18.05 18.35 17.25 9.55 10.95 7.15 4.85 7.15 9.15 10.35 8.05 8.55 9.15 9.25 10.45 8.55 6.75 8.25 6.25 7.95 9.85 \
+ 0.00 16.55 15.65 15.85 13.85 17.05 14.05 12.55 15.55 15.75 13.75 16.35 18.05 18.35 17.15 9.35 10.55 7.35 4.85 7.45 9.25 10.55 8.35 8.65 9.15 9.75 10.75 8.75 6.85 8.35 6.55 8.05 10.05 \
+ 0.00 15.35 13.95 13.85 12.15 15.85 12.55 11.35 14.15 14.15 12.25 15.15 16.45 17.05 15.05 8.35 9.55 6.15 3.25 5.85 7.75 8.75 7.15 7.05 7.75 8.25 9.15 7.35 6.05 6.85 5.05 7.55 8.55 \
+ 0.00 14.15 13.55 13.45 11.45 14.25 12.05 10.55 13.25 13.65 11.25 14.25 16.05 16.15 15.05 7.85 9.05 5.75 3.65 6.05 7.75 8.55 6.95 6.35 7.35 8.15 9.05 7.05 5.65 6.35 4.65 6.65 8.75 \
+ 0.00 13.35 12.85 13.25 10.85 14.55 11.75 10.05 13.15 12.55 10.85 13.75 15.55 15.35 14.55 7.45 8.45 5.25 3.05 5.35 6.75 8.15 6.55 6.75 6.95 7.65 8.35 6.45 4.85 5.95 4.35 5.65 7.65 \
+ 0.00 14.35 12.95 13.65 11.25 14.85 11.65 10.85 13.35 13.05 11.35 14.35 15.55 16.35 14.85 7.35 8.35 5.85 3.15 5.35 7.25 8.55 6.65 6.55 7.35 7.85 8.85 6.55 5.05 6.05 4.55 6.05 7.95 \
+ 0.00 14.65 13.85 13.95 12.35 15.25 12.25 11.05 13.85 14.05 12.15 14.75 16.55 16.85 15.85 8.15 9.35 5.75 3.65 5.85 8.15 9.05 7.25 7.25 7.95 8.05 9.65 7.05 6.05 6.85 5.45 6.85 8.65 \
+ 0.00 14.55 13.25 14.75 12.25 15.55 12.85 11.45 14.35 14.15 12.55 15.05 16.85 16.65 15.75 8.25 9.55 6.05 4.15 6.15 8.35 9.05 0.00 7.65 8.15 8.65 9.55 7.75 6.05 7.25 5.25 6.65 8.65 \
+ 0.00 16.65 15.05 16.35 14.15 16.85 13.55 12.85 15.65 15.55 13.25 16.15 17.65 18.05 17.05 9.05 11.05 7.35 4.55 7.35 9.05 10.15 8.55 8.85 9.15 9.75 10.55 8.85 7.25 8.35 6.35 8.65 10.05 \
+ 0.00 14.55 13.75 14.55 12.15 15.05 12.15 11.35 13.75 13.75 11.75 14.75 16.65 16.65 15.15 8.25 8.85 6.35 3.85 6.25 8.05 8.95 7.55 0.00 7.75 8.35 9.55 7.65 5.85 6.35 5.85 7.25 8.45 \
+ 0.00 14.75 13.35 14.35 12.65 15.65 12.75 11.75 14.25 14.35 12.05 14.75 16.05 16.65 15.55 8.65 9.35 6.15 4.15 6.15 7.85 9.15 0.00 7.55 7.95 8.15 9.35 7.05 5.85 6.75 5.25 6.75 8.85 \
+ 0.00 16.15 15.05 15.35 13.25 16.85 13.55 12.75 15.35 15.35 13.55 16.35 17.65 18.15 16.95 9.55 10.75 7.05 4.85 6.85 9.15 9.85 8.05 8.35 8.75 9.25 10.05 8.65 6.55 8.05 6.55 8.05 9.75 \
+ 0.00 16.85 15.55 16.15 13.75 17.25 14.25 13.15 15.75 16.05 14.05 16.75 18.35 18.85 17.15 9.85 10.85 7.55 5.35 7.35 9.65 10.55 8.65 8.85 9.35 9.55 10.85 9.05 7.15 8.35 6.65 8.25 10.45 \
+ 0.00 16.85 15.75 15.85 13.85 17.25 14.35 13.05 15.75 15.85 13.95 16.85 18.35 18.75 17.35 10.05 10.75 7.75 5.35 7.35 9.45 10.75 8.75 9.05 9.35 10.05 11.05 9.05 7.35 8.65 6.75 8.45 10.55 \
+ 0.00 15.35 13.75 14.35 12.55 15.75 12.65 11.55 14.35 14.55 12.75 15.05 16.55 17.05 16.05 8.55 9.55 6.15 3.75 6.15 8.15 8.95 7.35 7.55 8.15 8.25 9.55 7.45 5.65 7.05 5.45 6.85 8.75 \
+ 0.00 16.85 15.55 15.75 13.65 17.65 13.75 12.65 15.55 15.35 13.55 16.75 18.05 18.35 17.45 9.65 10.35 7.65 5.15 7.55 9.35 10.25 8.75 8.75 9.15 10.05 10.55 8.85 7.15 8.55 7.05 7.75 10.55 \
+ 0.00 15.45 14.45 14.85 12.55 16.05 12.95 11.35 14.45 14.65 12.85 15.55 17.25 17.65 16.05 8.55 9.65 6.65 4.05 6.55 8.35 9.25 7.65 7.65 8.35 8.65 9.95 7.85 6.05 7.55 5.95 7.25 8.85 \
+ 0.00 16.35 15.05 15.55 13.65 16.75 13.75 12.25 15.15 15.05 13.25 15.95 17.55 18.05 16.75 9.25 10.25 7.05 4.15 6.95 8.65 10.05 8.15 7.95 8.95 9.15 10.55 8.25 6.65 7.75 6.85 7.85 9.55 \
+ 0.00 15.05 13.85 14.15 12.35 15.35 12.35 11.35 14.05 14.35 12.25 14.85 16.25 16.95 15.65 8.75 9.35 6.55 4.15 6.05 7.75 8.65 6.75 7.55 8.15 8.35 9.05 7.25 5.75 7.05 5.05 6.85 8.75 \
+ 0.00 16.25 15.75 15.35 13.75 16.85 13.65 12.35 15.55 15.05 13.25 16.05 17.75 17.85 16.55 9.35 10.35 7.25 5.35 7.25 8.85 10.05 8.45 8.35 8.55 9.35 10.25 8.35 6.25 7.75 5.85 7.75 9.75 \
+ 0.00 14.15 13.05 13.35 11.25 14.55 11.55 10.35 12.85 12.85 10.45 13.35 14.75 15.55 13.85 6.85 8.05 5.35 3.65 5.45 7.55 8.05 6.15 6.35 6.95 7.25 8.15 6.35 4.15 5.55 4.05 5.65 7.35 \
+ 0.00 14.05 12.75 13.25 11.45 14.35 11.55 10.45 12.45 12.45 11.35 13.75 15.25 15.55 14.25 7.35 8.65 5.35 3.35 5.05 6.75 7.75 6.45 6.05 6.65 7.25 8.25 5.55 4.75 6.05 3.75 5.65 7.85 \
+ 0.00 16.65 15.45 15.75 13.15 16.85 13.75 12.15 15.05 15.05 12.85 16.55 18.05 18.25 16.35 9.55 10.35 7.15 5.05 6.45 8.55 10.05 7.75 7.75 8.25 8.85 10.15 8.05 6.65 7.55 5.75 7.55 9.85 \
+ 0.00 14.05 12.85 13.75 11.35 14.55 11.25 10.85 13.35 13.55 11.15 14.15 15.65 16.05 14.55 8.05 8.75 5.05 3.75 5.35 7.55 8.25 6.35 6.45 7.05 7.75 8.75 6.25 4.75 6.35 4.45 6.05 8.25 \
+ 0.00 17.45 15.85 16.35 14.55 17.85 14.75 13.55 15.85 16.25 14.45 16.25 18.75 19.05 17.35 9.75 10.95 7.15 5.35 7.55 9.25 10.55 8.75 9.05 9.05 9.85 11.15 8.55 7.55 9.05 6.55 7.85 10.05 \
+ 0.00 14.45 13.65 14.25 12.05 15.05 11.75 10.85 13.65 13.35 11.85 14.55 16.25 16.05 15.35 8.25 8.55 5.95 3.75 5.85 7.65 8.45 6.65 0.00 7.55 8.05 8.85 7.05 5.45 6.95 5.35 7.05 0.00 \
+ 0.00 16.55 15.55 15.85 13.55 17.25 13.85 12.55 15.65 15.35 13.05 15.75 18.05 17.85 16.55 9.55 10.85 7.55 5.15 7.55 9.35 10.25 8.05 8.35 9.05 9.35 10.65 8.35 6.95 8.35 6.85 0.00 10.25 \
+ 0.00 15.55 14.45 14.05 12.25 15.35 12.35 11.35 14.15 13.65 11.95 14.65 16.35 16.45 15.35 8.45 9.75 6.15 3.85 5.65 7.35 8.55 7.15 6.65 7.15 8.05 9.05 6.75 5.25 6.75 4.85 6.85 8.25 \
+ 0.00 15.05 13.65 14.45 12.05 15.75 12.25 11.25 14.25 14.05 12.05 14.65 16.35 16.35 15.55 8.35 9.65 0.00 4.15 5.95 8.05 8.75 7.05 7.25 7.75 8.45 9.35 7.65 5.95 7.25 6.05 7.15 9.15 \
+ 0.00 15.35 13.75 14.75 12.25 15.75 12.05 11.75 14.35 13.85 12.55 14.85 16.85 16.75 15.75 0.00 9.45 6.05 3.35 6.05 8.05 9.05 7.25 7.75 7.85 8.35 9.45 7.75 6.15 7.35 5.75 7.55 9.55 \
+ 0.00 16.05 14.75 15.35 13.05 16.85 13.55 12.45 15.05 15.25 13.05 16.15 17.55 17.75 16.35 9.05 10.05 7.05 4.75 6.85 9.15 10.05 8.05 8.25 8.85 8.95 10.05 8.25 6.55 7.85 6.05 7.85 9.55 \
+ 0.00 16.75 15.55 15.85 13.75 16.85 13.75 12.65 15.15 15.35 13.25 16.25 17.95 18.45 16.75 9.55 10.65 7.35 5.15 7.25 9.35 10.35 8.65 8.55 9.25 9.85 10.55 8.65 7.05 8.05 6.05 7.85 10.05 \
+ 0.00 15.05 13.65 14.25 12.25 15.85 12.55 11.45 14.35 14.25 12.05 14.75 16.25 16.65 15.25 8.45 9.35 6.25 4.05 6.25 8.15 9.15 7.55 7.85 8.05 8.35 9.35 7.55 5.85 6.75 5.35 6.75 8.45 \
+ 0.00 15.35 14.25 15.05 12.55 16.15 13.05 11.55 14.35 14.25 12.75 15.05 16.85 17.05 15.65 8.25 9.55 6.25 4.25 6.15 8.25 9.25 7.45 7.55 7.85 8.45 9.65 7.55 5.85 7.05 5.25 6.85 8.65 \
+ 0.00 16.55 15.25 15.65 13.55 17.05 13.85 12.65 15.25 15.25 13.75 16.35 17.85 18.15 16.75 9.25 10.35 7.05 4.75 6.85 8.85 10.05 8.05 8.25 8.65 9.35 0.00 8.25 6.85 7.85 6.25 7.55 10.05 \
+ 0.00 15.35 14.25 14.55 12.35 15.75 12.65 11.65 14.25 14.55 12.35 15.15 16.55 17.05 15.55 8.65 9.65 6.05 4.05 5.85 8.05 9.05 7.25 7.35 7.75 8.15 9.15 7.45 5.25 6.85 5.25 6.65 8.55 \
+ 0.00 16.55 15.55 15.85 13.75 17.05 13.75 12.65 16.05 15.45 14.15 16.35 18.05 18.35 17.05 9.55 10.55 7.75 5.25 7.35 9.75 10.65 8.45 9.15 9.05 10.05 10.35 8.65 7.25 7.85 6.25 7.85 9.55 \
+ 0.00 15.35 14.55 14.65 12.95 16.05 13.05 11.75 14.65 14.35 12.75 15.35 16.85 17.35 16.05 8.35 9.55 6.65 4.05 6.25 8.25 9.25 7.35 8.15 8.15 8.65 9.65 7.75 5.85 7.25 5.75 7.05 8.75 \
+ 0.00 15.05 13.45 13.75 11.85 15.25 12.25 10.55 13.55 13.55 12.15 14.45 15.85 15.65 15.05 8.15 9.35 5.85 3.75 5.75 7.35 8.55 7.05 6.65 7.55 7.85 8.65 6.85 5.55 6.75 5.05 6.85 8.55 \
+ 0.00 16.55 15.45 16.05 13.75 16.75 13.75 12.75 15.45 15.35 13.35 16.25 17.65 17.85 16.85 9.65 10.35 7.55 5.05 7.25 9.05 10.05 8.35 8.25 9.05 9.65 10.35 8.35 6.95 8.15 6.75 8.25 10.05 \
+ 0.00 13.75 12.85 13.15 11.15 14.25 11.55 10.35 12.95 12.65 10.85 13.85 15.05 16.05 14.35 7.15 8.55 5.35 3.15 5.65 7.15 8.05 6.35 6.35 6.85 7.35 8.15 6.45 4.55 6.55 5.35 6.65 7.95 \
+ 0.00 15.05 13.45 14.55 12.25 15.35 12.75 11.65 14.25 13.75 12.25 14.75 16.55 16.55 16.05 8.25 10.05 6.05 3.95 6.15 8.15 9.05 7.15 7.25 8.05 8.35 9.35 7.55 6.05 7.15 5.55 7.05 8.65 \
+ 0.00 17.05 15.55 16.55 14.25 17.85 14.65 13.55 16.55 16.65 14.55 17.35 18.85 19.35 18.05 10.35 11.05 7.25 5.35 7.55 10.05 10.75 9.05 9.35 9.85 10.05 11.25 9.45 7.85 9.15 7.45 9.35 11.25 \
+ 0.00 14.65 13.35 14.35 11.85 15.35 12.55 11.55 14.15 14.15 12.35 15.05 16.35 16.75 15.25 8.45 9.05 6.25 3.55 3.75 7.85 8.45 6.75 7.35 7.85 8.15 9.05 7.45 5.55 7.15 5.05 6.55 9.25 \
+ 0.00 15.65 14.65 15.25 12.75 16.35 12.85 12.35 14.65 14.75 12.65 15.35 16.85 17.35 16.35 8.75 10.05 6.55 0.35 6.45 8.55 9.15 7.25 7.55 8.05 8.85 10.05 7.55 5.35 7.35 5.75 7.05 9.05 \
+ 0.00 14.65 13.35 13.85 11.85 15.05 12.05 11.15 13.35 13.55 11.85 14.15 16.05 16.05 15.05 7.65 8.75 5.85 3.55 0.00 7.35 8.35 6.85 6.75 7.15 8.05 8.95 7.05 5.35 6.65 5.25 6.75 8.15 \
+ 0.00 12.35 15.05 15.35 13.15 16.45 13.15 12.15 14.75 15.05 13.25 15.65 17.25 17.25 16.25 8.75 9.65 7.15 4.55 6.85 8.75 9.85 7.75 0.00 8.65 9.15 10.05 8.05 6.55 8.15 6.45 7.75 9.85 \
+ 0.00 13.75 14.25 14.35 12.75 15.85 12.65 11.55 14.85 14.15 12.35 15.45 16.55 16.85 15.55 8.75 9.85 6.05 3.75 5.85 7.65 9.15 7.05 7.35 7.55 8.05 9.15 7.45 5.55 7.05 5.35 6.55 8.35 \
+ 0.00 15.05 13.65 14.55 12.65 15.55 12.55 11.55 14.15 14.35 12.35 14.65 16.25 17.05 15.35 8.25 9.25 6.55 4.05 6.25 8.25 8.85 7.35 7.55 8.05 8.65 9.65 7.75 6.25 6.75 5.85 6.55 8.55 \
+ 0.00 16.05 15.05 15.35 13.65 16.55 13.55 12.55 15.35 15.35 13.25 16.15 17.55 18.05 16.55 9.05 10.35 6.85 4.25 6.95 8.55 9.75 8.05 8.15 8.35 8.95 10.15 8.05 6.55 7.65 6.15 7.55 9.55 \
+ 0.00 15.75 14.35 15.05 12.55 16.05 13.05 12.25 14.75 14.85 12.75 15.75 17.25 17.35 16.05 8.85 9.85 6.45 4.55 6.55 8.55 9.35 7.55 7.85 8.05 8.75 10.05 8.05 6.05 7.35 5.65 7.15 8.85 \
+ 0.00 15.75 14.65 15.05 13.15 16.05 13.15 12.25 14.85 14.55 12.75 15.75 17.05 17.15 15.95 8.85 9.85 6.25 4.35 6.35 8.55 9.75 7.65 7.85 8.25 8.75 9.75 7.75 6.15 7.15 5.35 7.15 9.35 \
+ 0.00 16.65 15.15 15.55 13.55 17.15 13.85 12.85 15.65 15.55 13.65 16.55 18.15 18.25 16.75 9.85 10.85 6.95 4.65 6.65 8.85 10.05 8.05 8.25 8.75 9.55 10.35 8.35 6.35 7.85 6.05 7.85 9.85 \
+ 0.00 16.25 15.75 16.05 13.45 17.35 12.85 12.55 15.55 15.55 13.15 16.15 17.45 17.85 16.35 9.35 10.55 7.15 4.15 6.85 8.55 9.45 7.35 8.05 8.75 8.75 10.05 7.85 5.55 6.85 5.45 7.15 9.45 \
+ 0.00 15.65 14.75 14.85 13.05 16.65 13.75 12.05 14.55 14.85 13.15 16.15 17.55 17.75 16.55 9.35 10.35 6.75 4.65 6.85 8.75 9.65 8.05 7.85 8.25 8.55 10.05 8.15 6.35 7.55 5.85 7.55 9.35 \
+ 0.00 16.25 14.85 15.25 13.25 16.45 13.65 12.65 15.05 15.05 13.25 16.15 17.65 18.05 16.85 9.25 10.25 6.75 4.65 6.85 8.85 9.75 7.75 8.15 8.65 8.75 10.35 8.35 6.55 7.85 6.35 7.65 9.55 \
+ 0.00 14.05 12.85 13.05 11.55 14.35 11.55 10.85 13.05 13.15 11.25 14.05 14.75 15.35 14.15 7.35 8.65 5.55 3.55 5.45 7.55 8.15 6.65 7.15 7.15 7.75 8.85 6.75 5.35 6.55 5.05 6.65 8.05 \
+ 0.00 14.05 13.05 13.55 11.35 14.75 11.65 10.55 13.55 12.65 11.45 13.75 15.55 15.85 14.45 7.65 8.85 5.55 3.55 5.35 7.15 8.35 6.65 7.05 7.15 7.65 8.75 6.85 5.35 6.65 4.45 6.75 8.15 \
+ 0.00 14.55 13.55 14.05 12.05 15.25 11.75 10.35 13.35 13.55 11.35 14.05 15.85 16.35 15.35 7.65 8.65 5.25 3.35 5.75 7.55 8.25 6.55 6.85 7.05 7.35 8.55 6.85 5.55 6.15 4.65 6.05 7.75 \
+ 0.00 14.05 12.75 13.75 11.35 14.35 11.85 10.25 13.35 13.45 11.25 14.35 16.05 15.75 14.65 7.55 8.35 5.15 2.95 5.35 7.55 8.25 6.55 7.05 7.35 7.75 8.65 6.65 5.05 7.05 4.55 5.85 7.75 \
+ 0.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 15.00 \
+ 0.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00 10.00
+
+
+########################
diff --git a/macro/run/run_unpack_online.C b/macro/run/run_unpack_online.C
index 2acf1e6666ad9eaaf02a02fbdc44bfcc9669f723..7eb0a65d56c1e42c5060976eb7d4ce02e77b01f8 100644
--- a/macro/run/run_unpack_online.C
+++ b/macro/run/run_unpack_online.C
@@ -411,7 +411,7 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55
richconfig->DoTotOffsetCorrection(); // correct ToT offset
richconfig->SetDebugState();
richconfig->SetDoWriteOutput();
- std::string parfilesbasepathRich = Form("%s/macro/beamtime/mcbm2021/", srcDir.Data());
+ std::string parfilesbasepathRich = Form("%s/macro/beamtime/mcbm2024/", srcDir.Data());
richconfig->SetParFilesBasePath(parfilesbasepathRich);
richconfig->SetSystemTimeOffset(256000 - 1200); // [ns] 1 MS and additional correction
if (1904 < runid) richconfig->SetSystemTimeOffset(-1200);
diff --git a/macro/run/run_unpack_tsa.C b/macro/run/run_unpack_tsa.C
index 1b81888a8d24381090dad335162236c04b20c41d..55bcb30dc01d537995f532295f1332024aa07318 100644
--- a/macro/run/run_unpack_tsa.C
+++ b/macro/run/run_unpack_tsa.C
@@ -424,7 +424,7 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
richconfig->DoTotOffsetCorrection(); // correct ToT offset
richconfig->SetDebugState();
richconfig->SetDoWriteOutput();
- std::string parfilesbasepathRich = Form("%s/macro/beamtime/mcbm2021/", srcDir.Data());
+ std::string parfilesbasepathRich = Form("%s/macro/beamtime/mcbm2024/", srcDir.Data());
richconfig->SetParFilesBasePath(parfilesbasepathRich);
richconfig->SetSystemTimeOffset(256000 - 1200); // [ns] 1 MS and additional correction
if (1904 < runid) richconfig->SetSystemTimeOffset(-1200);
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
index 6052a79f45979a20efd14b6c5cbde87a231d3b9b..1a86ebd6222ca1a38d6b83bc5f1785bb56473e96 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
@@ -1,6 +1,6 @@
-/* Copyright (C) 2019-2020 UGiessen/JINR-LIT, Giessen/Dubna
+/* Copyright (C) 2019-2024 UGiessen/JINR-LIT, Giessen/Dubna
SPDX-License-Identifier: GPL-3.0-only
- Authors: Adrian Amatus Weber, Semen Lebedev [committer] */
+ Authors: Adrian Amatus Weber, Semen Lebedev [committer], Martin Beyer */
#include "CbmRichMCbmHitProducer.h"
@@ -152,6 +152,8 @@ void CbmRichMCbmHitProducer::ProcessDigi(CbmEvent* event, Int_t digiIndex)
const CbmRichDigi* digi = fDigiMan->Get<CbmRichDigi>(digiIndex);
if (digi == nullptr) return;
if (digi->GetAddress() < 0) return;
+ Int_t DiRICH_Add = (digi->GetAddress() >> 16) & 0xFFFF;
+ if (DiRICH_Add == 0x7901 || DiRICH_Add == 0x7902) return; // TRBaddresses 0x7901 and 0x7902 are for FSD/NCAL
if (isInToT(digi->GetToT())) {
TVector3 posPoint;
CbmRichPixelData* data = CbmRichDigiMapManager::GetInstance().GetPixelDataByAddress(digi->GetAddress());
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.cxx b/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.cxx
index b7ef4db910b9bbc21c8fafce06006cce30723c0b..38d24c60589145737f0e3ef5096323b511ab84ad 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.cxx
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.cxx
@@ -29,6 +29,8 @@ std::vector<std::pair<std::string, std::shared_ptr<FairParGenericSet>>>*
// // Get parameter container
temppath = basepath + "mRichPar_70.par";
+ LOG(info) << fName << "::GetParContainerRequest - get parameters from file: \n" << temppath;
+
fParContVec.emplace_back(std::make_pair(temppath, std::make_shared<CbmMcbm2018RichPar>()));
return &fParContVec;