From 902dde17ee943a8a6b9e9705866e927c2b47796a Mon Sep 17 00:00:00 2001
From: Pascal Raisig <praisig@ikf.uni-frankfurt.de>
Date: Mon, 18 Jan 2021 13:11:21 +0100
Subject: [PATCH] Add trd timeshift calibration to common unpacking macros
Additionally the parameter git hash was updated, such that it matches the latest version.
---
external/InstallParameter.cmake | 2 +-
macro/beamtime/mcbm2020/unpack_tsa_mcbm.C | 6 ++++++
macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C | 6 ++++++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index 6cdddac7b6..4b4bfed9ca 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION 2c5fffe5eef95db9b40f11e1d569f4740ba40805)
+set(PARAMETER_VERSION 884ac67bbc782e6862fccdeb413f8b11b83124ba)
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
index 5e13480e30..52fed4a135 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
@@ -68,6 +68,12 @@ void unpack_tsa_mcbm(TString inFile = "",
parFileList->Add(
new TObjString(Form("%s.%s.par", paramFilesTrd.Data(), parIt.data())));
}
+ // Add timeshift calibration, currently only available for run 831 others to come
+ if (uRunId == 831)
+ parFileList->Add(new TObjString(Form(
+ "%s/parameters/trd/mcbm2020_special/CbmMcbm2020TrdTshiftPar_run%d.par",
+ srcDir.Data(),
+ uRunId)));
}
TString paramFileTof = paramDir + "mTofPar.par";
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
index f2cc51ac52..964fbfd048 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
@@ -96,6 +96,12 @@ void unpack_tsa_mcbm_kronos(UInt_t uRunIdx = 99999,
parFileList->Add(
new TObjString(Form("%s.%s.par", paramFilesTrd.Data(), parIt.data())));
}
+ // Add timeshift calibration, currently only available for run 831 others to come
+ if (uRunId == 831)
+ parFileList->Add(new TObjString(Form(
+ "%s/parameters/trd/mcbm2020_special/CbmMcbm2020TrdTshiftPar_run%d.par",
+ srcDir.Data(),
+ uRunId)));
}
TString paramFileTof = paramDir + "mTofPar.par";
--
GitLab