From d3668f788e80c0ef7fd308deb30494dcd7471f4e Mon Sep 17 00:00:00 2001
From: "P.-A. Loizeau" <p.-a.loizeau@gsi.de>
Date: Mon, 1 Aug 2022 11:38:49 +0200
Subject: [PATCH] [mCBM] explicit default par files for mMUCH and mTOF + TOF
default nh sync
---
macro/beamtime/mcbm2022/mTofCriPar.par | 12 ++++++------
macro/beamtime/mcbm2022/mcbm_unp_event.C | 11 +++++++++--
macro/run/run_unpack_online.C | 11 +++++++++--
macro/run/run_unpack_tsa.C | 12 ++++++++++--
4 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/macro/beamtime/mcbm2022/mTofCriPar.par b/macro/beamtime/mcbm2022/mTofCriPar.par
index 8d928103b2..9ca7e88344 100644
--- a/macro/beamtime/mcbm2022/mTofCriPar.par
+++ b/macro/beamtime/mcbm2022/mTofCriPar.par
@@ -7,16 +7,16 @@ GdpbIdArray: Int_t \
NrOfFeesPerGdpb: Int_t 10
NrOfGet4PerFee: Int_t 8
NrOfChannelsPerGet4: Int_t 4
-NrOfGbtx: Int_t 16
-NrOfModule: Int_t 0
+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
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
RpcType: Int_t \
- 0 0 0 0 2 2 0 0 0 0 0 0 9 9 6 9
+ 0 0 0 0 2 2 0 0 0 0 0 0 7 9 6 9
RpcSide: Int_t \
- 0 1 0 1 0 1 0 1 0 1 0 1 2 2 2 0
+ 1 0 1 0 1 0 1 0 1 0 1 0 0 0 7 0
ModuleId: Int_t \
- 0 0 1 1 0 0 2 2 3 3 4 4 0 -1 0 1
+ 0 0 1 1 0 0 2 2 3 3 4 4 0 -1 0 0
NbMsTot: Int_t 100
NbMsOverlap: Int_t 1
SizeMsInNs: Double_t 102400.0
diff --git a/macro/beamtime/mcbm2022/mcbm_unp_event.C b/macro/beamtime/mcbm2022/mcbm_unp_event.C
index a22719c1ba..d9ddfb4a36 100644
--- a/macro/beamtime/mcbm2022/mcbm_unp_event.C
+++ b/macro/beamtime/mcbm2022/mcbm_unp_event.C
@@ -530,6 +530,10 @@ Bool_t mcbm_unp_event(std::string infile,
/// Starting to use GEM 2 moved to CRI 0 on 24/05/2022
muchconfig->SetParFileName("mMuchParUpto26052022.par");
}
+ else {
+ /// Default file for all other runs (including 06/2022 Gold runs)
+ muchconfig->SetParFileName("mMuchPar.par");
+ }
/// Enable duplicates rejection, Ignores the ADC for duplicates check
muchconfig->SetDuplicatesRejection(true, true);
@@ -658,15 +662,18 @@ Bool_t mcbm_unp_event(std::string infile,
/// Uranium runs: 2176 - 2310
parFileNameTof = "mTofCriParUranium.par";
}
- else if (2335 <= uRunId) {
+ else if (2335 <= runid && runid <= 2497) {
/// Nickel runs: 2335 - 2397
- /// Gold runs: 2400 - xxxx
+ /// Gold runs: 2400 - 2497
parFileNameTof = "mTofCriParNickel.par";
if (bBmoninTof) {
/// Map the BMon components in the TOF par file
parFileNameTof = "mTofCriParNickel_withBmon.par";
}
}
+ else {
+ parFileNameTof = "mTofCriPar.par";
+ }
}
tofconfig->SetParFilesBasePath(parfilesbasepathTof);
tofconfig->SetParFileName(parFileNameTof);
diff --git a/macro/run/run_unpack_online.C b/macro/run/run_unpack_online.C
index ef6240797c..f34b29975f 100644
--- a/macro/run/run_unpack_online.C
+++ b/macro/run/run_unpack_online.C
@@ -238,6 +238,10 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55
/// Starting to use GEM 2 moved to CRI 0 on 24/05/2022
muchconfig->SetParFileName("mMuchParUpto26052022.par");
}
+ else {
+ /// Default file for all other runs (including 06/2022 Gold runs)
+ muchconfig->SetParFileName("mMuchPar.par");
+ }
/// Enable duplicates rejection, Ignores the ADC for duplicates check
muchconfig->SetDuplicatesRejection(true, true);
@@ -370,15 +374,18 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55
/// Uranium runs: 2176 - 2310
parFileNameTof = "mTofCriParUranium.par";
}
- else if (2335 <= runid) {
+ else if (2335 <= runid && runid <= 2497) {
/// Nickel runs: 2335 - 2397
- /// Gold runs: 2400 - xxxx
+ /// Gold runs: 2400 - 2497
parFileNameTof = "mTofCriParNickel.par";
if (bBmoninTof) {
/// Map the BMon components in the TOF par file
parFileNameTof = "mTofCriParNickel_withBmon.par";
}
}
+ else {
+ parFileNameTof = "mTofCriPar.par";
+ }
}
tofconfig->SetParFilesBasePath(parfilesbasepathTof);
tofconfig->SetParFileName(parFileNameTof);
diff --git a/macro/run/run_unpack_tsa.C b/macro/run/run_unpack_tsa.C
index e59c21a77b..abbaf51496 100644
--- a/macro/run/run_unpack_tsa.C
+++ b/macro/run/run_unpack_tsa.C
@@ -257,6 +257,11 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
/// Starting to use GEM 2 moved to CRI 0 on 24/05/2022
muchconfig->SetParFileName("mMuchParUpto26052022.par");
}
+ else {
+ /// Default file for all other runs (including 06/2022 Gold runs)
+ muchconfig->SetParFileName("mMuchPar.par");
+ }
+
/// Enable duplicates rejection, Ignores the ADC for duplicates check
muchconfig->SetDuplicatesRejection(true, true);
@@ -389,15 +394,18 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
/// Uranium runs: 2176 - 2310
parFileNameTof = "mTofCriParUranium.par";
}
- else if (2335 <= runid) {
+ else if (2335 <= runid && runid <= 2497) {
/// Nickel runs: 2335 - 2397
- /// Gold runs: 2400 - xxxx
+ /// Gold runs: 2400 - 2497
parFileNameTof = "mTofCriParNickel.par";
if (bBmoninTof) {
/// Map the BMon components in the TOF par file
parFileNameTof = "mTofCriParNickel_withBmon.par";
}
}
+ else {
+ parFileNameTof = "mTofCriPar.par";
+ }
}
tofconfig->SetParFilesBasePath(parfilesbasepathTof);
tofconfig->SetParFileName(parFileNameTof);
--
GitLab