From 6aba3cbcaf25bbb2818b3905264efd60334fb9b2 Mon Sep 17 00:00:00 2001 From: "s.zharko@gsi.de" <s.zharko@gsi.de> Date: Fri, 5 Apr 2024 18:32:39 +0200 Subject: [PATCH] Hash update for cbmroot_parameters merge request 166 --- algo/ca/TrackingChainConfig.h | 3 ++- algo/ca/core/pars/CaConfigReader.cxx | 1 - algo/ca/core/pars/CaInitManager.h | 2 +- external/InstallParameter.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/algo/ca/TrackingChainConfig.h b/algo/ca/TrackingChainConfig.h index b8417e60eb..47f937441b 100644 --- a/algo/ca/TrackingChainConfig.h +++ b/algo/ca/TrackingChainConfig.h @@ -19,7 +19,8 @@ namespace cbm::algo /// \struct TrackingChainConfig /// \brief Configuration reader for the TrackingChain class struct TrackingChainConfig { - std::string fsGeomConfig; ///< Tracking geometry file name (TMP: includes all other settings, but the settings are rewritten) + std::string + fsGeomConfig; ///< Tracking geometry file name (TMP: includes all other settings, but the settings are rewritten) std::string fsMainConfig; ///< Main configuration file (rel path in online parameters directory) std::string fsUserConfig; ///< User configuration file (full path) std::string fsMoniOutName; ///< Monitor output file name diff --git a/algo/ca/core/pars/CaConfigReader.cxx b/algo/ca/core/pars/CaConfigReader.cxx index 7c55ea839a..46e2723469 100644 --- a/algo/ca/core/pars/CaConfigReader.cxx +++ b/algo/ca/core/pars/CaConfigReader.cxx @@ -109,7 +109,6 @@ void ConfigReader::Read() } - // Init parameters, independnent from the tracking iteration if (fVerbose >= 1) { diff --git a/algo/ca/core/pars/CaInitManager.h b/algo/ca/core/pars/CaInitManager.h index 323abdd46e..d44137a0b1 100644 --- a/algo/ca/core/pars/CaInitManager.h +++ b/algo/ca/core/pars/CaInitManager.h @@ -332,6 +332,6 @@ namespace cbm::algo::ca std::string fConfigOutputName = ""; ///< name for the output configuration file bool fbConfigIsRead = false; ///< Flag, if configuration file was read - bool fbGeometryConfigLock = false; ///< Lock geometry initialization + bool fbGeometryConfigLock = false; ///< Lock geometry initialization }; } // namespace cbm::algo::ca diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake index 55a6849bcf..83126f0665 100644 --- a/external/InstallParameter.cmake +++ b/external/InstallParameter.cmake @@ -1,4 +1,4 @@ -set(PARAMETER_VERSION 6dabcea417090e1b7702b55f91fd2e2527801a37) # 2024-03-27 +set(PARAMETER_VERSION 58d91d255316c9fadf88aeccf8d74e7f8656c0f1) # 2024-04-05 set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git") -- GitLab