diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake index 6cdddac7b66ab9e9b7ded5771eb967cefc3d48b7..4b4bfed9ca947b8b914c62f89391582b5ff0fb17 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 5e13480e30fc6fd5f597b1b1be58e9973fbe4d5c..52fed4a135dcead60c02f487b8a1cc8e6ebd0ce2 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 f2cc51ac528dff57f9b93e33791423beaf063145..964fbfd048c2bc2b044a704152fa2df2a47d840c 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";