From 3b849a44bec998cbaf7d0c28e2d1499ecd1abfc3 Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Tue, 19 Nov 2024 17:05:55 +0100
Subject: [PATCH] BBA: remove assertions in refit, prepare for the new BBA
version
---
reco/alignment/CMakeLists.txt | 2 +-
reco/alignment/CbmBbaAlignmentTask.cxx | 3 ++-
reco/kfnew/CbmKfTrackFitter.cxx | 6 +++++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/reco/alignment/CMakeLists.txt b/reco/alignment/CMakeLists.txt
index dcd35b5176..c82784439a 100644
--- a/reco/alignment/CMakeLists.txt
+++ b/reco/alignment/CMakeLists.txt
@@ -24,7 +24,7 @@ set(PRIVATE_DEPENDENCIES
CbmTofBase
L1
KF
- bba::library
+ bba_library
CbmStsBase
)
diff --git a/reco/alignment/CbmBbaAlignmentTask.cxx b/reco/alignment/CbmBbaAlignmentTask.cxx
index 17268f7b28..22a7a29f31 100644
--- a/reco/alignment/CbmBbaAlignmentTask.cxx
+++ b/reco/alignment/CbmBbaAlignmentTask.cxx
@@ -127,7 +127,8 @@ InitStatus CbmBbaAlignmentTask::Init()
const char* env = std::getenv("OMP_NUM_THREADS");
if (env) {
fNthreads = TString(env).Atoi();
- LOG(info) << " found environment variable OMP_NUM_THREADS = \"" << env << "\", read as integer: " << fNthreads;
+ LOG(info) << "BBA: found environment variable OMP_NUM_THREADS = \"" << env
+ << "\", read as integer: " << fNthreads;
}
}
diff --git a/reco/kfnew/CbmKfTrackFitter.cxx b/reco/kfnew/CbmKfTrackFitter.cxx
index 14a67f0dfb..4905e7b2d4 100644
--- a/reco/kfnew/CbmKfTrackFitter.cxx
+++ b/reco/kfnew/CbmKfTrackFitter.cxx
@@ -714,6 +714,10 @@ bool CbmKfTrackFitter::FitTrajectory(CbmKfTrackFitter::Trajectory& t)
printNode("fit upstream", iNode);
}
+ if (!ok) {
+ return false;
+ }
+
if (ok) {
int iNode = firstHitNode;
@@ -780,7 +784,7 @@ bool CbmKfTrackFitter::FitTrajectory(CbmKfTrackFitter::Trajectory& t)
LOG(error) << "CbmKfTrackFitter: " << fDebugInfo << ": chi2 mismatch: dn " << dnChi2 << " != up " << upChi2
<< " first node " << firstHitNode << " last node " << lastHitNode << " of " << nNodes;
//if (fVerbosityLevel > 0) {
- exit(1);
+ //exit(1);
//}
}
}
--
GitLab