From 96f252cdcc4cab1c17d37cc03f69959fddc3174e Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Mon, 15 Jan 2024 23:52:18 +0000
Subject: [PATCH] Ca: update of mcbm settings
---
macro/L1/configs/ca_params_mcbm.yaml | 2 +-
macro/beamtime/mcbm2022/mcbm_digievent_display.C | 11 ++++-------
reco/L1/CbmL1.cxx | 11 ++++++++---
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/macro/L1/configs/ca_params_mcbm.yaml b/macro/L1/configs/ca_params_mcbm.yaml
index 9bcc8ca343..e3f9b2b693 100644
--- a/macro/L1/configs/ca_params_mcbm.yaml
+++ b/macro/L1/configs/ca_params_mcbm.yaml
@@ -81,7 +81,7 @@ ca:
min_n_hits: 3
min_n_hits_station_0: 3
first_station_index: 0
- is_extend_tracks: true
+ is_extend_tracks: false
is_primary: false
is_electron: false
max_station_gap: 2
diff --git a/macro/beamtime/mcbm2022/mcbm_digievent_display.C b/macro/beamtime/mcbm2022/mcbm_digievent_display.C
index 381502c1af..128f1ae0f9 100644
--- a/macro/beamtime/mcbm2022/mcbm_digievent_display.C
+++ b/macro/beamtime/mcbm2022/mcbm_digievent_display.C
@@ -16,7 +16,6 @@
** 3) Copy from nh lustre folder the ini_Clusterizer.C and ini_trks.C macros in the current macro folder
** 4) Copy from nh lustre folder mcbm_beam_2022_05_23_nickel.geo.root into "macro/mcbm/data"
** 5) Copy from nh lustre folder AlignmentMatrices_mcbm_beam_2022_05_23_nickel.root into the data subfolder
- ** 6) Change the log level at l.259 of reco/L1/CbmL1.cxx from "fatal" to "warn" and recompile
**/
#include <math.h>
@@ -490,9 +489,7 @@ Bool_t mcbm_digievent_display(UInt_t uRunId = 2391,
if (kTRUE) {
run->AddTask(new CbmTrackingDetectorInterfaceInit());
- CbmKF* kalman = new CbmKF();
- run->AddTask(kalman);
- CbmL1* l1 = new CbmL1();
+ CbmL1* l1 = new CbmL1("Ca", 3);
l1->SetMcbmMode();
if (!geoSetup->IsActive(ECbmModuleId::kMuch)) {
@@ -501,9 +498,9 @@ Bool_t mcbm_digievent_display(UInt_t uRunId = 2391,
l1->DisableTrackingStation(cbm::algo::ca::EDetectorID::kMuch, 1);
l1->DisableTrackingStation(cbm::algo::ca::EDetectorID::kMuch, 2);
}
- // l1->SetMisalignmentSts(.2, .2, 10.);
- // l1->SetMisalignmentTrd(2., 2., 10.);
- // l1->SetMisalignmentTof(.2, .2, 10.);
+ l1->SetMisalignmentSts(.2, .2, 100.);
+ l1->SetMisalignmentTrd(.2, .2, 100.);
+ l1->SetMisalignmentTof(.2, .2, 100.);
run->AddTask(l1);
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index f87d4b332b..85dfd68fb6 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -645,13 +645,18 @@ void CbmL1::Reconstruct(CbmEvent* event)
// FieldIntegralCheck();
fpAlgo->SetMonitorData(monitorData);
- LOG_IF(info, fVerbose > 1) << "Ca Track finder...";
+ if (nullptr != event) {
+ LOG_IF(info, fVerbose > 0) << "\n======= Ca Track finder: process event " << event->GetNumber() << " ...";
+ }
+ else {
+ LOG_IF(info, fVerbose > 0) << "\n======= Ca Track finder: process timeslice ...";
+ }
+
fpAlgo->fTrackFinder.FindTracks();
// IdealTrackFinder();
fTrackingTime = fpAlgo->fCaRecoTime; // TODO: remove (not used)
- LOG_IF(info, fVerbose > 1) << "Ca Track Finder ok";
- LOG_IF(info, fVerbose > 0) << "Ca Track Finder found " << fpAlgo->fRecoTracks.size() << " tracks";
+ LOG_IF(info, fVerbose > 0) << "Ca Track Finder finished, found " << fpAlgo->fRecoTracks.size() << " tracks";
// Update monitor data after the actual tracking
monitorData = fpAlgo->GetMonitorData();
--
GitLab