diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index c704904a9c7ed98045ea52e33e9855fe08f4f8a2..67f3fae56624c33dce195a12c791c017fc860af9 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -49,7 +49,6 @@ set(SRCS
global/Reco.cxx
qa/DigiEventQa.cxx
qa/Histo1D.cxx
- ca/TrackingChain.cxx
)
set(BUILD_INFO_CXX ${CMAKE_CURRENT_BINARY_DIR}/base/BuildInfo.cxx)
@@ -81,10 +80,6 @@ target_include_directories(Algo
${CMAKE_CURRENT_SOURCE_DIR}/unpack
${CMAKE_CURRENT_SOURCE_DIR}/detectors
${CMAKE_CURRENT_SOURCE_DIR}/qa
- ${CMAKE_CURRENT_SOURCE_DIR}/ca
- ${CMAKE_CURRENT_SOURCE_DIR}/ca/core
- ${CMAKE_CURRENT_SOURCE_DIR}/ca/core/data
- ${CMAKE_CURRENT_SOURCE_DIR}/ca/core/simd
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/core/data/global
)
@@ -134,7 +129,6 @@ install(DIRECTORY detectors/sts TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY detectors/tof TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY detectors/trd TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY detectors/trd2d TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY ca TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
#install(DIRECTORY ca/data TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
@@ -145,11 +139,6 @@ install(
base/Options.h
base/RecoParams.h
base/SubChain.h
- ca/TrackingChain.h
- #ca/simd/CaSimd.h
- #ca/simd/CaSimdVc.h
- #ca/simd/CaSimdPseudo.h
- #ca/data/CaTrack.h
global/Reco.h
DESTINATION
include/
diff --git a/algo/ca/TrackingChain.cxx b/algo/ca/TrackingChain.cxx
deleted file mode 100644
index cff605438b052c8b724650f7f33128b28a7405bc..0000000000000000000000000000000000000000
--- a/algo/ca/TrackingChain.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2023 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
- SPDX-License-Identifier: GPL-3.0-only
- Authors: Sergei Zharko [committer] */
-
-/// @file TrackingChain.cxx
-/// @date 14.09.2023
-/// @brief A chain class to execute CA tracking algorithm in online reconstruction (implementation)
-/// @author S.Zharko <s.zharko@gsi.de>
-
-#include "TrackingChain.h"
-
-using cbm::algo::TrackingChain;
-using cbm::algo::ca::Track;
-
-// ---------------------------------------------------------------------------------------------------------------------
-//
-void TrackingChain::Init() { fTracking.Init(); }
-
-// ---------------------------------------------------------------------------------------------------------------------
-//
-std::vector<Track> TrackingChain::Run(const RecoResults& recoResults)
-{
- std::vector<Track> vRecoTracks;
- return vRecoTracks;
-}
-
-// ---------------------------------------------------------------------------------------------------------------------
-//
-void TrackingChain::Finalize() {}
diff --git a/algo/ca/TrackingChain.h b/algo/ca/TrackingChain.h
deleted file mode 100644
index bb91baa15d880f25bafd5262ec856a1ffced7cee..0000000000000000000000000000000000000000
--- a/algo/ca/TrackingChain.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 2023 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
- SPDX-License-Identifier: GPL-3.0-only
- Authors: Sergei Zharko [committer] */
-
-/// @file TrackingChain.h
-/// @date 13.09.2023
-/// @brief A chain class to execute CA tracking algorithm in online reconstruction (header)
-/// @author S.Zharko <s.zharko@gsi.de>
-
-#ifndef CBM_ALGO_CA_TRACKING_CHAIN
-#define CBM_ALGO_CA_TRACKING_CHAIN 1
-
-#include <vector>
-
-#include "CaTrack.h"
-#include "CaTrackingDemo.h"
-#include "RecoResults.h"
-#include "SubChain.h"
-
-namespace cbm::algo
-{
- /// @class cbm::algo::TrackingChain
- /// @brief A chain for tracking algorithm
- ///
- /// The class executes a tracking algorithm in the online data reconstruction chain.
- class TrackingChain : public SubChain {
- public:
- /// @brief Provides action in the initialization of the run
- void Init();
-
- /// @brief Provides action for a given time-slice
- /// @return A vector of cbm::algo::ca::Track
- std::vector<ca::Track> Run(const RecoResults& recoResults);
-
- /// @brief Provides action in the end of the run
- void Finalize();
-
- private:
- ca::TrackingDemo fTracking; ///< Tracking algorithm
- };
-} // namespace cbm::algo
-
-#endif // CBM_ALGO_CA_TRACKING_CHAIN
diff --git a/algo/ca/core/CMakeLists.txt b/algo/ca/core/CMakeLists.txt
index fcf22148e0f03d8a9b36976ee640a7020c2b2004..9d71e4f047cda3ed42baa968e2e581398ec50ff9 100644
--- a/algo/ca/core/CMakeLists.txt
+++ b/algo/ca/core/CMakeLists.txt
@@ -1,11 +1,12 @@
set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/simd
+ ${CMAKE_CURRENT_SOURCE_DIR}/pars
${CMAKE_CURRENT_SOURCE_DIR}/data
)
set(SRCS
- ${CMAKE_CURRENT_SOURCE_DIR}/CaTrackingDemo.cxx
+ ${CMAKE_CURRENT_SOURCE_DIR}/data/CaTrack.cxx
)
add_library(CaCore SHARED ${SRCS})
@@ -13,6 +14,7 @@ add_library(CaCore SHARED ${SRCS})
target_include_directories(CaCore
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/data
${CMAKE_CURRENT_SOURCE_DIR}/simd
+ ${CMAKE_CURRENT_SOURCE_DIR}/pars
${CMAKE_CURRENT_SOURCE_DIR}
)
@@ -29,10 +31,10 @@ target_link_libraries(CaCore
install(TARGETS CaCore DESTINATION lib)
install(DIRECTORY simd TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(DIRECTORY data TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY pars TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(
FILES
- CaTrackingDemo.h
data/CaTrack.h
simd/CaSimd.h
simd/CaSimdVc.h
diff --git a/algo/ca/core/CaTrackingDemo.cxx b/algo/ca/core/CaTrackingDemo.cxx
deleted file mode 100644
index b1fd5dac4ac39b05422942a76083b336ef238e01..0000000000000000000000000000000000000000
--- a/algo/ca/core/CaTrackingDemo.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 2023 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
- SPDX-License-Identifier: GPL-3.0-only
- Authors: Sergei Zharko [committer] */
-
-/// @file CaTrackingDemo.h
-/// @date 14.09.2023
-/// @brief A demonstration dummy class for tracking algorithm (implementation)
-/// @author S.Zharko <s.zharko@gsi.de>
-
-#include "CaTrackingDemo.h"
-
-#include "log.hpp"
-
-using cbm::algo::ca::TrackingDemo;
-using cbm::algo::ca::TrackingMonitorData;
-
-// ---------------------------------------------------------------------------------------------------------------------
-//
-void TrackingDemo::Init() { L_(info) << "TrackingDemo::Init is called"; }
-
-// ---------------------------------------------------------------------------------------------------------------------
-//
-void TrackingDemo::Execute() {}
-
-// ---------------------------------------------------------------------------------------------------------------------
-//
-void TrackingDemo::Finilize() {}
diff --git a/algo/ca/core/CaTrackingDemo.h b/algo/ca/core/CaTrackingDemo.h
deleted file mode 100644
index ba84ee6313db6f1cbdafa7a5eef7c942fb4d4a66..0000000000000000000000000000000000000000
--- a/algo/ca/core/CaTrackingDemo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 2023 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
- SPDX-License-Identifier: GPL-3.0-only
- Authors: Sergei Zharko [committer] */
-
-/// @file CaTrackingDemo.h
-/// @date 13.09.2023
-/// @brief A demonstration dummy class for tracking algorithm (header)
-/// @author S.Zharko <s.zharko@gsi.de>
-
-#ifndef CBM_ALGO_CA_TRACKING_DEMO
-#define CBM_ALGO_CA_TRACKING_DEMO 1
-
-#include <sstream>
-#include <utility>
-
-namespace cbm::algo::ca
-{
- /// @struct cbm::algo::ca::TrackingMonitorData
- /// @brief Monitor class for tracking
- struct TrackingMonitorData {
- int fNumHits = 0;
- int fNumTracks = 0;
- std::string print() const
- {
- std::stringstream msg;
- msg << "Tracking statistics: \n";
- msg << "\t- number of hits: " << fNumHits << '\n';
- msg << "\t- number of tracks: " << fNumTracks;
- return msg.str();
- }
- };
-
- /// @class cbm::algo::ca::TrackingDemo
- /// @brief Dummy tracking class to address all the needs for the CA tracking execution [to be replaced later]
- class TrackingDemo {
- public:
- void Init();
- void Execute();
- void Finilize();
- };
-} // namespace cbm::algo::ca
-
-#endif // CBM_ALGO_CA_TRACKING_DEMO
diff --git a/algo/ca/core/data/CaTrack.cxx b/algo/ca/core/data/CaTrack.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..b8dca2126c63dbbfc6795faa5a09d0c0022eade1
--- /dev/null
+++ b/algo/ca/core/data/CaTrack.cxx
@@ -0,0 +1,5 @@
+/* Copyright (C) 2023 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Sergei Zharko [committer] */
+
+#include "CaTrack.h"
diff --git a/algo/global/RecoResults.h b/algo/global/RecoResults.h
index 86de0d0ebe08452d07aa94a48aac69d98f9a0b2e..95e6c0677218ccf8f55ec0dba2f7e20e666bd3ed 100644
--- a/algo/global/RecoResults.h
+++ b/algo/global/RecoResults.h
@@ -8,7 +8,6 @@
#include <vector>
-#include "CaTrack.h"
#include "RecoResultsDescriptor.h"
class CbmStsDigi;
@@ -30,13 +29,10 @@ namespace cbm::algo
const RecoResultsDescriptor& Descriptor() const { return fDescriptor; }
const std::vector<CbmDigiEvent>& Events() const { return fEvents; }
std::vector<CbmDigiEvent>& Events() { return fEvents; }
- const std::vector<ca::Track>& Tracks() const { return fTracks; }
- std::vector<ca::Track>& Tracks() { return fTracks; }
private:
RecoResultsDescriptor fDescriptor;
std::vector<CbmDigiEvent> fEvents;
- std::vector<ca::Track> fTracks;
friend class boost::serialization::access;
@@ -46,7 +42,6 @@ namespace cbm::algo
void serialize(Archive& ar, const unsigned int /*version*/)
{
ar& fEvents;
- ar& fTracks;
}
};
} // namespace cbm::algo