From 394b7e37ccff0a32a0165de18160c1aeb73511ea Mon Sep 17 00:00:00 2001
From: "s.zharko@gsi.de" <s.zharko@gsi.de>
Date: Wed, 12 Feb 2025 11:52:37 +0100
Subject: [PATCH] online: remove temporary debugging output
---
algo/CMakeLists.txt | 4 ++--
algo/detectors/tof/Clusterizer.cxx | 21 --------------------
algo/kfp/interface/CMakeLists.txt | 32 +++++++++++++-----------------
3 files changed, 16 insertions(+), 41 deletions(-)
diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index 3b03adb99..9e7f23db7 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -227,7 +227,7 @@ target_link_libraries(Algo
external::fles_monitoring
cppzmq
poolstl
- CbmKFParticleOnlineInterface
+ PRIVATE CbmKFParticleOnlineInterface
)
target_compile_definitions(Algo PUBLIC NO_ROOT)
xpu_attach(Algo ${DEVICE_SRCS})
@@ -301,7 +301,7 @@ if (NOT CBM_ONLINE_STANDALONE)
external::fles_monitoring
cppzmq
poolstl
- CbmKFParticleOfflineInterface
+ PRIVATE CbmKFParticleOnlineInterface
)
xpu_attach(AlgoOffline ${DEVICE_SRCS})
diff --git a/algo/detectors/tof/Clusterizer.cxx b/algo/detectors/tof/Clusterizer.cxx
index 1a182b625..fb36f7d47 100644
--- a/algo/detectors/tof/Clusterizer.cxx
+++ b/algo/detectors/tof/Clusterizer.cxx
@@ -12,9 +12,6 @@
#include <iomanip>
#include <iostream>
#include <map>
-#include <numeric>
-
-#include <fmt/format.h>
namespace cbm::algo::tof
{
@@ -52,8 +49,6 @@ namespace cbm::algo::tof
//Iterator-based version. Faster than index-based version.
Clusterizer::resultType Clusterizer::buildClusters(std::vector<inputType>& input)
{
- size_t nInputDigis{
- std::accumulate(input.begin(), input.end(), 0, [](size_t s, const auto& v) { return s + v.size(); })};
// Hit variables
Hit cluster;
@@ -77,10 +72,6 @@ namespace cbm::algo::tof
lastChanPos.push_back(input[chan].begin());
}
- size_t nInputDigisUsed{0};
- if (nInputDigis > 0) {
- //std::cout << "------------- call: buildClusters: number of digis: " << nInputDigis << '\n';
- }
for (int32_t chan = 0; (size_t) chan < numChan; chan++) {
// Set partition vectors
@@ -92,17 +83,9 @@ namespace cbm::algo::tof
chanSizes.back() = 0;
continue;
}
- nInputDigisUsed += input[chan].size();
inputType& storDigi = input[chan];
auto digiIt = storDigi.begin();
- if (std::distance(storDigi.begin(), storDigi.end())) {
- //std::cout << "DISTANCE: " << std::distance(storDigi.begin(), storDigi.end()) << '\n';
- for (const auto& digi : storDigi) {
- std::string sAddress = fmt::format("{:#08x}", digi.first->GetAddress());
- //std::cout << " " << digi.first->GetTime() << "ns, address: " << sAddress << '\n';
- }
- }
while (1 < std::distance(digiIt, storDigi.end())) {
while (digiIt->first->GetSide() == std::next(digiIt)->first->GetSide()) { // Not one Digi of each end!
digiIt++;
@@ -197,10 +180,6 @@ namespace cbm::algo::tof
storDigi.clear();
} // for( int32_t chan = 0; chan < iNbCh; chan++ )
- //if (nInputDigis> 0) {
- // std::cout << ">>>>>> " << nInputDigisUsed << "/" << nInputDigis << '\n';
- //}
-
// Now check if another hit/cluster is started
// and save it if it's the case.
if (0 < cluster.numChan()) {
diff --git a/algo/kfp/interface/CMakeLists.txt b/algo/kfp/interface/CMakeLists.txt
index c5c21f04a..c1eaadf76 100644
--- a/algo/kfp/interface/CMakeLists.txt
+++ b/algo/kfp/interface/CMakeLists.txt
@@ -1,10 +1,3 @@
-# The script creates two libraries:
-# 1) CbmKFParticleOnlineInterface -- a specific KFParticle library interface for the CBM online reconstruction;
-# 2) CbmKFParticleOfflineInterface -- a specific interface for the offline reconstruction in CBM.
-# The both libraries contain only the KFParticle core and do not include KFParticleTest or KFParticlePerformance.
-
-
-
if(NOT CBM_ONLINE_STANDALONE)
### CbmKFParticleOnlineInterface
add_library(CbmKFParticleOnlineInterface INTERFACE)
@@ -12,17 +5,19 @@ if(NOT CBM_ONLINE_STANDALONE)
target_compile_definitions(CbmKFParticleOnlineInterface
INTERFACE DO_TPCCATRACKER_EFF_PERFORMANCE NonhomogeneousField CBM USE_TIMERS)
target_link_libraries(CbmKFParticleOnlineInterface
- INTERFACE ROOT::Core ROOT::Hist ROOT::MathCore KFParticle)
+ INTERFACE KFParticle
+ ROOT::Core
+ ROOT::Hist
+ ROOT::MathCore
+ ROOT::Gpad
+ ROOT::Graf
+ ROOT::Physics
+ ROOT::EG
+ ROOT::RIO
+ ROOT::Tree
+ ROOT::MathCore
+ )
install(TARGETS CbmKFParticleOnlineInterface DESTINATION lib)
-
- ### CbmKFParticleOfflineInterface
- add_library(CbmKFParticleOfflineInterface INTERFACE)
- target_include_directories(CbmKFParticleOfflineInterface INTERFACE)
- target_compile_definitions(CbmKFParticleOfflineInterface
- INTERFACE DO_TPCCATRACKER_EFF_PERFORMANCE NonhomogeneousField CBM USE_TIMERS)
- target_link_libraries(CbmKFParticleOfflineInterface
- INTERFACE ROOT::Core ROOT::Hist ROOT::MathCore KFParticle)
- install(TARGETS CbmKFParticleOfflineInterface DESTINATION lib)
else()
# Creating a replacement of the CbmKFParticleOnlineInterface library for a standalone mode
set(KFP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/KFParticle/KFParticle)
@@ -48,6 +43,7 @@ else()
target_compile_definitions(CbmKFParticleOnlineInterface PUBLIC NonhomogeneousField CBM CBM_ONLINE)
target_link_libraries(CbmKFParticleOnlineInterface
PUBLIC Vc::Vc
- ROOT::Core)
+ ROOT::Core
+ )
install(TARGETS CbmKFParticleOnlineInterface DESTINATION lib)
endif()
--
GitLab