diff --git a/MQ/mcbm/CbmDeviceUnpack.cxx b/MQ/mcbm/CbmDeviceUnpack.cxx
index 96db68cbcae743551fdc78565e96a1872c593f1f..120839ce79af1bfa2a581dca17c20642f75c3455 100644
--- a/MQ/mcbm/CbmDeviceUnpack.cxx
+++ b/MQ/mcbm/CbmDeviceUnpack.cxx
@@ -230,6 +230,10 @@ Bool_t CbmDeviceUnpack::InitContainers()
muchconfig->SetDoWriteOptOutA("MuchDigiPulser");
std::string parfilesbasepathMuch = Form("%s/macro/beamtime/mcbm2022/", srcDir.Data());
muchconfig->SetParFilesBasePath(parfilesbasepathMuch);
+ if (2060 <= fuRunId && fuRunId <= 2162) {
+ /// Starting to use CRI Based MUCH setup with 2GEM and 1 RPC since 09/03/2022 Carbon run
+ muchconfig->SetParFileName("mMuchParUpto26032022.par");
+ }
/// Enable duplicates rejection, Ignores the ADC for duplicates check
muchconfig->SetDuplicatesRejection(true, true);
/// Enable Monitor plots
@@ -303,11 +307,26 @@ Bool_t CbmDeviceUnpack::InitContainers()
tofconfig->SetDoWriteOutput();
// tofconfig->SetDoWriteOptOutA("CbmTofErrors");
std::string parfilesbasepathTof = Form("%s/macro/beamtime/mcbm2021/", srcDir.Data());
+ std::string parFileNameTof = "mTofCriPar.par";
if (2060 <= fuRunId) {
/// Additional modules added just before the 10/03/2022 Carbon run
parfilesbasepathTof = Form("%s/macro/beamtime/mcbm2022/", srcDir.Data());
+ /// Setup changed multiple times between the 2022 carbon and uranium runs
+ if (fuRunId <= 2065) {
+ /// Carbon runs: 2060 - 2065
+ parFileNameTof = "mTofCriParCarbon.par";
+ }
+ else if (2150 <= fuRunId && fuRunId <= 2160) {
+ /// Iron runs: 2150 - 2160
+ parFileNameTof = "mTofCriParIron.par";
+ }
+ else if (2176 <= fuRunId && fuRunId <= 2310) {
+ /// Uranium runs: 2176 - 2310
+ parFileNameTof = "mTofCriParUranium.par";
+ }
}
tofconfig->SetParFilesBasePath(parfilesbasepathTof);
+ tofconfig->SetParFileName(parFileNameTof);
tofconfig->SetSystemTimeOffset(-1220); // [ns] value to be updated
if (fuRunId <= 1659) {
/// Switch ON the -4 offset in epoch count (hack for Spring-Summer 2021)
diff --git a/macro/beamtime/mcbm2022/mTofCriParCarbon.par b/macro/beamtime/mcbm2022/mTofCriParCarbon.par
new file mode 100644
index 0000000000000000000000000000000000000000..8d928103b227e82d2a00cfde3890eca3a1754da2
--- /dev/null
+++ b/macro/beamtime/mcbm2022/mTofCriParCarbon.par
@@ -0,0 +1,34 @@
+####################################################################################################
+[CbmMcbm2018TofPar]
+//----------------------------------------------------------------------------
+NrOfGdpbs: Int_t 8
+GdpbIdArray: Int_t \
+0xabc0 0xabc1 0xabc2 0xabc3 0xabc4 0xabc5 0xabc6 0xabc7
+NrOfFeesPerGdpb: Int_t 10
+NrOfGet4PerFee: Int_t 8
+NrOfChannelsPerGet4: Int_t 4
+NrOfGbtx: Int_t 16
+NrOfModule: Int_t 0
+NrOfRpc: Int_t \
+ 5 5 5 5 5 5 5 5 5 5 5 5 2 2 2 2
+RpcType: Int_t \
+ 0 0 0 0 2 2 0 0 0 0 0 0 9 9 6 9
+RpcSide: Int_t \
+ 0 1 0 1 0 1 0 1 0 1 0 1 2 2 2 0
+ModuleId: Int_t \
+ 0 0 1 1 0 0 2 2 3 3 4 4 0 -1 0 1
+NbMsTot: Int_t 100
+NbMsOverlap: Int_t 1
+SizeMsInNs: Double_t 102400.0
+//SizeMsInNs: Double_t 1638400
+StarTriggerDeadtime: Double_t \
+ 1000.0 1000.0 1000.0 1000.0 1000.0
+StarTriggerDelay: Double_t \
+ 2000.0 2000.0 2000.0 2000.0 2000.0
+// 2000.0 2000.0 2000.0 2000.0 2000.0
+//-23000.0 -23000.0 -23000.0 -23000.0 -23000.0
+StarTriggerWinSize: Double_t \
+ 2000.0 2000.0 2000.0 2000.0 2000.0
+TsDeadtimePeriod: Double_t 62.5
+
+####################################################################################################
diff --git a/macro/beamtime/mcbm2022/mTofCriParIron.par b/macro/beamtime/mcbm2022/mTofCriParIron.par
new file mode 100644
index 0000000000000000000000000000000000000000..8d928103b227e82d2a00cfde3890eca3a1754da2
--- /dev/null
+++ b/macro/beamtime/mcbm2022/mTofCriParIron.par
@@ -0,0 +1,34 @@
+####################################################################################################
+[CbmMcbm2018TofPar]
+//----------------------------------------------------------------------------
+NrOfGdpbs: Int_t 8
+GdpbIdArray: Int_t \
+0xabc0 0xabc1 0xabc2 0xabc3 0xabc4 0xabc5 0xabc6 0xabc7
+NrOfFeesPerGdpb: Int_t 10
+NrOfGet4PerFee: Int_t 8
+NrOfChannelsPerGet4: Int_t 4
+NrOfGbtx: Int_t 16
+NrOfModule: Int_t 0
+NrOfRpc: Int_t \
+ 5 5 5 5 5 5 5 5 5 5 5 5 2 2 2 2
+RpcType: Int_t \
+ 0 0 0 0 2 2 0 0 0 0 0 0 9 9 6 9
+RpcSide: Int_t \
+ 0 1 0 1 0 1 0 1 0 1 0 1 2 2 2 0
+ModuleId: Int_t \
+ 0 0 1 1 0 0 2 2 3 3 4 4 0 -1 0 1
+NbMsTot: Int_t 100
+NbMsOverlap: Int_t 1
+SizeMsInNs: Double_t 102400.0
+//SizeMsInNs: Double_t 1638400
+StarTriggerDeadtime: Double_t \
+ 1000.0 1000.0 1000.0 1000.0 1000.0
+StarTriggerDelay: Double_t \
+ 2000.0 2000.0 2000.0 2000.0 2000.0
+// 2000.0 2000.0 2000.0 2000.0 2000.0
+//-23000.0 -23000.0 -23000.0 -23000.0 -23000.0
+StarTriggerWinSize: Double_t \
+ 2000.0 2000.0 2000.0 2000.0 2000.0
+TsDeadtimePeriod: Double_t 62.5
+
+####################################################################################################
diff --git a/macro/beamtime/mcbm2022/mTofCriParUranium.par b/macro/beamtime/mcbm2022/mTofCriParUranium.par
new file mode 100644
index 0000000000000000000000000000000000000000..8d928103b227e82d2a00cfde3890eca3a1754da2
--- /dev/null
+++ b/macro/beamtime/mcbm2022/mTofCriParUranium.par
@@ -0,0 +1,34 @@
+####################################################################################################
+[CbmMcbm2018TofPar]
+//----------------------------------------------------------------------------
+NrOfGdpbs: Int_t 8
+GdpbIdArray: Int_t \
+0xabc0 0xabc1 0xabc2 0xabc3 0xabc4 0xabc5 0xabc6 0xabc7
+NrOfFeesPerGdpb: Int_t 10
+NrOfGet4PerFee: Int_t 8
+NrOfChannelsPerGet4: Int_t 4
+NrOfGbtx: Int_t 16
+NrOfModule: Int_t 0
+NrOfRpc: Int_t \
+ 5 5 5 5 5 5 5 5 5 5 5 5 2 2 2 2
+RpcType: Int_t \
+ 0 0 0 0 2 2 0 0 0 0 0 0 9 9 6 9
+RpcSide: Int_t \
+ 0 1 0 1 0 1 0 1 0 1 0 1 2 2 2 0
+ModuleId: Int_t \
+ 0 0 1 1 0 0 2 2 3 3 4 4 0 -1 0 1
+NbMsTot: Int_t 100
+NbMsOverlap: Int_t 1
+SizeMsInNs: Double_t 102400.0
+//SizeMsInNs: Double_t 1638400
+StarTriggerDeadtime: Double_t \
+ 1000.0 1000.0 1000.0 1000.0 1000.0
+StarTriggerDelay: Double_t \
+ 2000.0 2000.0 2000.0 2000.0 2000.0
+// 2000.0 2000.0 2000.0 2000.0 2000.0
+//-23000.0 -23000.0 -23000.0 -23000.0 -23000.0
+StarTriggerWinSize: Double_t \
+ 2000.0 2000.0 2000.0 2000.0 2000.0
+TsDeadtimePeriod: Double_t 62.5
+
+####################################################################################################
diff --git a/macro/run/run_unpack_tsa.C b/macro/run/run_unpack_tsa.C
index ca7b503ea977ee80bc8ddedec6eef609b05dc41c..c64aead16f323000641c89f80af3d2d50025b949 100644
--- a/macro/run/run_unpack_tsa.C
+++ b/macro/run/run_unpack_tsa.C
@@ -295,11 +295,26 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
tofconfig->SetDoWriteOutput();
// tofconfig->SetDoWriteOptOutA("CbmTofErrors");
std::string parfilesbasepathTof = Form("%s/macro/beamtime/mcbm2021/", srcDir.Data());
+ std::string parFileNameTof = "mTofCriPar.par";
if (2060 <= runid) {
/// Additional modules added just before the 10/03/2022 Carbon run
parfilesbasepathTof = Form("%s/macro/beamtime/mcbm2022/", srcDir.Data());
+ /// Setup changed multiple times between the 2022 carbon and uranium runs
+ if (runid <= 2065) {
+ /// Carbon runs: 2060 - 2065
+ parFileNameTof = "mTofCriParCarbon.par";
+ }
+ else if (2150 <= runid && runid <= 2160) {
+ /// Iron runs: 2150 - 2160
+ parFileNameTof = "mTofCriParIron.par";
+ }
+ else if (2176 <= runid && runid <= 2310) {
+ /// Uranium runs: 2176 - 2310
+ parFileNameTof = "mTofCriParUranium.par";
+ }
}
tofconfig->SetParFilesBasePath(parfilesbasepathTof);
+ tofconfig->SetParFileName(parFileNameTof);
tofconfig->SetSystemTimeOffset(-1220); // [ns] value to be updated
if (2160 <= runid) {
tofconfig->SetSystemTimeOffset(0); // [ns] value to be updated