From 9a19966414099ae15297f127a0e4ef60668f2b36 Mon Sep 17 00:00:00 2001
From: "s.zharko@gsi.de" <s.zharko@gsi.de>
Date: Mon, 6 May 2024 11:56:54 +0200
Subject: [PATCH] CA steer:
The tracking parameter file extention is changed from "L1Parameters.dat" to "ca.par" in the
offline data reconstruction in order to keep a consistency with the naming rule, used
in the online tracking chain.
---
macro/alignment/run_BbaAlignment_mcbm.C | 2 +-
macro/mcbm/mcbm_qa.C | 2 +-
macro/mcbm/mcbm_reco_event.C | 1 +
macro/qa/run_recoQa.C | 2 +-
macro/run/run_qa.C | 2 +-
reco/L1/CbmL1.h | 4 ++--
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/macro/alignment/run_BbaAlignment_mcbm.C b/macro/alignment/run_BbaAlignment_mcbm.C
index dedcce7ae5..2607632273 100644
--- a/macro/alignment/run_BbaAlignment_mcbm.C
+++ b/macro/alignment/run_BbaAlignment_mcbm.C
@@ -130,7 +130,7 @@ void run_BbaAlignment_mcbm(Int_t nEvents = -1, TString dataset = "data/mcbm_beam
// TODO: read tracking parameters from the file like CaOutputQa does
//TODO: instead of initializing the tracker
//TString caParFile = recFile;
- //caParFile.ReplaceAll(".root", ".L1Parameters.dat");
+ //caParFile.ReplaceAll(".root", ".ca.par");
//auto* pCaOutputQa = new cbm::ca::OutputQa(verbose, bUseMC);
//pCaOutputQa->ReadParameters(caParFile.Data());
diff --git a/macro/mcbm/mcbm_qa.C b/macro/mcbm/mcbm_qa.C
index a971627d91..d914202eb4 100644
--- a/macro/mcbm/mcbm_qa.C
+++ b/macro/mcbm/mcbm_qa.C
@@ -288,7 +288,7 @@ void mcbm_qa(Int_t nEvents = 0,
// Tracking parameters file is required
TString caParFile = recFile;
- caParFile.ReplaceAll(".root", ".L1Parameters.dat");
+ caParFile.ReplaceAll(".root", ".ca.par");
auto* pCaInputQaSetup = new cbm::ca::InputQaSetup(verbose, bUseMC);
pCaInputQaSetup->SetDetectorFlag(cbm::algo::ca::EDetectorID::kSts, bUseSts);
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 015689c452..48fb1aa039 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -386,6 +386,7 @@ 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/macro/qa/run_recoQa.C b/macro/qa/run_recoQa.C
index 709753cc81..5243739d37 100644
--- a/macro/qa/run_recoQa.C
+++ b/macro/qa/run_recoQa.C
@@ -128,7 +128,7 @@ void run_recoQa(Int_t nEvents = -1, TString dataset = "2391_node8_0_0000",
// TODO: read tracking parameters from the file like CaOutputQa does
//TODO: instead of initializing the tracker
//TString caParFile = recFile;
- //caParFile.ReplaceAll(".root", ".L1Parameters.dat");
+ //caParFile.ReplaceAll(".root", ".ca.par");
//auto* pCaOutputQa = new cbm::ca::OutputQa(verbose, bUseMC);
//pCaOutputQa->ReadParameters(caParFile.Data());
diff --git a/macro/run/run_qa.C b/macro/run/run_qa.C
index 2f85dd7700..d1d613abf2 100644
--- a/macro/run/run_qa.C
+++ b/macro/run/run_qa.C
@@ -301,7 +301,7 @@ void run_qa(TString dataTraColl,
qaManager->AddTask(new CbmKF()); // TODO: Needed?
TString caParFile = recFile;
- caParFile.ReplaceAll(".root", ".L1Parameters.dat");
+ caParFile.ReplaceAll(".root", ".ca.par");
auto* pCaOutputQa = new cbm::ca::OutputQa(verbose, bUseMC);
pCaOutputQa->SetProcessFullTs(!bEventBasedReco);
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index 67a7be9285..f488fddca8 100644
--- a/reco/L1/CbmL1.h
+++ b/reco/L1/CbmL1.h
@@ -370,7 +370,7 @@ class CbmL1 : public FairTask {
/// /path/to/[pref].reco.root, the data files will be:
/// [dir]/input_hits/[pref].job[No].ca.input.dat - hits input files, containing serialized ca::InputData objects,
/// stored for each job (each call of CbmL1::ReadEvent function)
- /// [dir]/[pref].L1Parameters.dat - parameters input files, containing serialized L1Parameters object
+ /// [dir]/[pref].ca.par - parameters input files, containing serialized L1Parameters object
void DefineSTAPNames(const char* dirName);
/// Writes initialized L1Parameters object to file ""
@@ -460,7 +460,7 @@ class CbmL1 : public FairTask {
TString fSTAPDataPrefix = "test"; ///< Name of input/output file prefix. The prefix is defined by output TTree file
/// Extension for IO of the L1Parameters object
- static constexpr std::string_view kSTAPParamSuffix = "L1Parameters.dat";
+ static constexpr std::string_view kSTAPParamSuffix = "ca.par";
/// Extension for IO of the ca::InputData object
/// \note IO of the ca::InputData object is called inside every launch of CbmL1::ReadEvent function. Inside the function
--
GitLab