From 38e0d0a20957c347029327075832a952605efdaf Mon Sep 17 00:00:00 2001
From: "s.zharko@gsi.de" <s.zharko@gsi.de>
Date: Tue, 7 May 2024 06:08:04 +0200
Subject: [PATCH] Change of parameter repository hash to support MR
https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter/-/merge_requests/180/
---
algo/ca/core/pars/CaInitManager.h | 4 ++++
core/qa/report/CbmQaReportBeamerEngine.cxx | 2 +-
external/InstallParameter.cmake | 2 +-
macro/L1/check_ca_par.C | 17 +++++++++++++++++
macro/mcbm/mcbm_reco_event.C | 1 -
reco/L1/L1LinkDef.h | 5 ++---
6 files changed, 25 insertions(+), 6 deletions(-)
create mode 100644 macro/L1/check_ca_par.C
diff --git a/algo/ca/core/pars/CaInitManager.h b/algo/ca/core/pars/CaInitManager.h
index d44137a0b1..37004ef1f0 100644
--- a/algo/ca/core/pars/CaInitManager.h
+++ b/algo/ca/core/pars/CaInitManager.h
@@ -294,6 +294,10 @@ namespace cbm::algo::ca
/// \param false the Kalman filter is be used in track finder
void DevSetIsParSearchWUsed(bool value = true) { fParameters.fDevIsParSearchWUsed = value; }
+ /// \brief Prints parameters log to string
+ /// \param verbose Verbosity level
+ std::string PrintParameters(int verbose = 1) const { return fParameters.ToString(verbose); }
+
private:
/// \brief Checker for Iteration container initialization (sets EInitKey::kCAIterations)
/// \return true If all Iteration objects were initialized properly
diff --git a/core/qa/report/CbmQaReportBeamerEngine.cxx b/core/qa/report/CbmQaReportBeamerEngine.cxx
index c829e29a96..87e51240f8 100644
--- a/core/qa/report/CbmQaReportBeamerEngine.cxx
+++ b/core/qa/report/CbmQaReportBeamerEngine.cxx
@@ -211,7 +211,7 @@ std::string BeamerEngine::HeaderBody(const Header& header) const
out << " \\titlepage\n";
out << " \\begin{tabular}{r@{ }l}\n";
out << " author: & " << header.GetAuthor() << " \\\\\n";
- out << " setup: & " << header.GetSetup() << "\\\\\n";
+ out << " setup: & " << LatexFormat::Apply(header.GetSetup()) << "\\\\\n";
out << " tags: & " << boost::algorithm::join(header.GetTags(), ", ") << '\n';
out << " \\end{tabular}\n";
out << "\\end{frame}\n";
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index aa5167f644..95fbf42955 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION 1fb21955436a8ba4403373d5561fcdd70a105b2a) # 2024-05-06
+set(PARAMETER_VERSION c9b27d4274384c15593fea41056538ea24eae626) # 2024-05-07
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
diff --git a/macro/L1/check_ca_par.C b/macro/L1/check_ca_par.C
new file mode 100644
index 0000000000..e642cf93da
--- /dev/null
+++ b/macro/L1/check_ca_par.C
@@ -0,0 +1,17 @@
+/* Copyright (C) 2024 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Sergei Zharko [committer] */
+
+/// \file check_ca_par.C
+/// \brief Prints the contents of the CA tracking parameter file
+/// \since 07.05.2024
+/// \author Sergei Zharko <s.zharko@gsi.de>
+
+/// \brief Macro execution function
+/// \param name Path to the parameter file
+void check_ca_par(const std::string& name)
+{
+ cbm::algo::ca::InitManager im;
+ im.ReadParametersObject(name);
+ std::cout << im.PrintParameters() << '\n';
+}
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 48fb1aa039..015689c452 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -386,7 +386,6 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test",
// User configuration example for CA:
//l1->SetConfigUser(srcDir + "/macro/L1/configs/ca_params_user_example.yaml");
- l1->SetConfigUser("/u/szharko/frameworks/cbm/work/data_runner/mcbm2024/ca_mcbm2024_test_main.yaml");
run->AddTask(l1);
CbmL1GlobalTrackFinder* globalTrackFinder = new CbmL1GlobalTrackFinder();
diff --git a/reco/L1/L1LinkDef.h b/reco/L1/L1LinkDef.h
index 27191282ad..159d3d6888 100644
--- a/reco/L1/L1LinkDef.h
+++ b/reco/L1/L1LinkDef.h
@@ -14,6 +14,7 @@
#pragma link C++ enum class cbm::algo::ca::ECounter;
#pragma link C++ enum class cbm::algo::ca::EDetectorID;
#pragma link C++ class cbm::algo::ca::TrackingMonitor - ;
+//#pragma link C++ class cbm::algo::ca::InitManager - ;
#pragma link C++ class CbmTrackingDetectorInterfaceInit + ;
#pragma link C++ class CbmL1 + ;
#pragma link C++ class CbmL1StsTrackFinder + ;
@@ -23,12 +24,10 @@
//#pragma link C++ class CbmL1MuchFinderQa+;
#pragma link C++ class CbmL1GlobalTrackFinder + ;
#pragma link C++ class CbmL1GlobalFindTracksEvents + ;
-#pragma link C++ class CbmGenerateMaterialMaps.h + ;
+#pragma link C++ class CbmGenerateMaterialMaps + ;
//#pragma link C++ class CbmL1SttHit+;
//#pragma link C++ class CbmL1SttTrackFinder+;
//#pragma link C++ class CbmL1SttTrack+;
-#pragma link C++ class CbmTrackerInputQaTrd + ;
-#pragma link C++ class CbmTrackerInputQaTof + ;
#pragma link C++ class CbmCaInputQaMvd + ;
#pragma link C++ class CbmCaInputQaMuch + ;
#pragma link C++ class CbmCaInputQaSts + ;
--
GitLab