From 1676aa54ab2200867dcfe30d83656c3911c7a9bf Mon Sep 17 00:00:00 2001
From: "s.zharko@gsi.de" <s.zharko@gsi.de>
Date: Wed, 11 Oct 2023 16:57:48 +0200
Subject: [PATCH] CA: moving L1InputData and L1IODataManager: moving the files
---
algo/ca/core/CMakeLists.txt | 10 +++++++---
.../ca/core/data/CaDataManager.cxx | 2 +-
.../ca/core/data/CaDataManager.h | 2 +-
.../ca/core/data/CaInputData.cxx | 2 +-
.../L1InputData.h => algo/ca/core/data/CaInputData.h | 2 +-
reco/L1/CMakeLists.txt | 2 --
reco/L1/CbmCaMCModule.h | 1 -
reco/L1/CbmCaTimeSliceReader.cxx | 2 +-
reco/L1/CbmL1.h | 2 +-
reco/L1/L1Algo/L1Algo.h | 2 +-
10 files changed, 14 insertions(+), 13 deletions(-)
rename reco/L1/L1Algo/L1IODataManager.cxx => algo/ca/core/data/CaDataManager.cxx (99%)
rename reco/L1/L1Algo/L1IODataManager.h => algo/ca/core/data/CaDataManager.h (99%)
rename reco/L1/L1Algo/L1InputData.cxx => algo/ca/core/data/CaInputData.cxx (98%)
rename reco/L1/L1Algo/L1InputData.h => algo/ca/core/data/CaInputData.h (99%)
diff --git a/algo/ca/core/CMakeLists.txt b/algo/ca/core/CMakeLists.txt
index f11c8847c9..755fcaa222 100644
--- a/algo/ca/core/CMakeLists.txt
+++ b/algo/ca/core/CMakeLists.txt
@@ -6,6 +6,8 @@ set(INCLUDE_DIRECTORIES
)
set(SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/data/CaDataManager.cxx
+ ${CMAKE_CURRENT_SOURCE_DIR}/data/CaInputData.cxx
${CMAKE_CURRENT_SOURCE_DIR}/data/CaTrack.cxx
${CMAKE_CURRENT_SOURCE_DIR}/data/CaTrackParam.cxx
${CMAKE_CURRENT_SOURCE_DIR}/pars/CaConfigReader.cxx
@@ -45,11 +47,13 @@ install(DIRECTORY pars TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
install(
FILES
+ data/CaDataManager.h
+ data/CaGridEntry.h
+ data/CaHit.h
+ data/CaInputData.h
data/CaTrackParam.h
data/CaTrack.h
- data/CaHit.h
pars/CaConfigReader.h
- data/CaGridEntry.h
pars/CaConstants.h
pars/CaField.h
pars/CaInitManager.h
@@ -61,12 +65,12 @@ install(
pars/CaStationInitializer.h
utils/CaEnumArray.h
utils/CaMonitor.h
+ utils/CaObjectInitController.h
utils/CaSimd.h
utils/CaSimdVc.h
utils/CaSimdPseudo.h
utils/CaVector.h
utils/CaUtils.h
- utils/CaObjectInitController.h
DESTINATION
include/
)
diff --git a/reco/L1/L1Algo/L1IODataManager.cxx b/algo/ca/core/data/CaDataManager.cxx
similarity index 99%
rename from reco/L1/L1Algo/L1IODataManager.cxx
rename to algo/ca/core/data/CaDataManager.cxx
index 66bffd2d4f..0e9174594c 100644
--- a/reco/L1/L1Algo/L1IODataManager.cxx
+++ b/algo/ca/core/data/CaDataManager.cxx
@@ -7,7 +7,7 @@
/// \since 08.08.2022
/// \author S.Zharko <s.zharko@gsi.de>
-#include "L1IODataManager.h"
+#include "CaDataManager.h"
#include <boost/archive/binary_iarchive.hpp>
#include <boost/archive/binary_oarchive.hpp>
diff --git a/reco/L1/L1Algo/L1IODataManager.h b/algo/ca/core/data/CaDataManager.h
similarity index 99%
rename from reco/L1/L1Algo/L1IODataManager.h
rename to algo/ca/core/data/CaDataManager.h
index 2c80b3c86c..3cba54fde4 100644
--- a/reco/L1/L1Algo/L1IODataManager.h
+++ b/algo/ca/core/data/CaDataManager.h
@@ -11,7 +11,7 @@
#define L1IODataManager_h 1
#include "CaConstants.h"
-#include "L1InputData.h"
+#include "CaInputData.h"
using namespace cbm::algo::ca; //TODO: remove
diff --git a/reco/L1/L1Algo/L1InputData.cxx b/algo/ca/core/data/CaInputData.cxx
similarity index 98%
rename from reco/L1/L1Algo/L1InputData.cxx
rename to algo/ca/core/data/CaInputData.cxx
index d9087691f0..bafa1c1ba2 100644
--- a/reco/L1/L1Algo/L1InputData.cxx
+++ b/algo/ca/core/data/CaInputData.cxx
@@ -7,7 +7,7 @@
/// \since 08.08.2022
/// \author Sergei Zharko <s.zharko@gsi.de>
-#include "L1InputData.h"
+#include "CaInputData.h"
// ---------------------------------------------------------------------------------------------------------------------
diff --git a/reco/L1/L1Algo/L1InputData.h b/algo/ca/core/data/CaInputData.h
similarity index 99%
rename from reco/L1/L1Algo/L1InputData.h
rename to algo/ca/core/data/CaInputData.h
index 3badad4eb8..093e07816e 100644
--- a/reco/L1/L1Algo/L1InputData.h
+++ b/algo/ca/core/data/CaInputData.h
@@ -22,7 +22,7 @@ namespace
using cbm::algo::ca::Vector;
using namespace cbm::algo;
using namespace cbm::algo::ca;
-}
+} // namespace
/// Class L1InputData represents a block of the input data to the L1 tracking algorithm per event or time slice.
/// Filling of the L1InputData is carried out with L1IODataManager class
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 50e819eac6..75c05e0b1e 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -49,8 +49,6 @@ set(SRCS
L1Algo/L1MaterialMonitor.cxx
L1Algo/L1UMeasurementInfo.cxx
L1Algo/L1XYMeasurementInfo.cxx
- L1Algo/L1InputData.cxx
- L1Algo/L1IODataManager.cxx
L1Algo/L1CloneMerger.cxx
L1Algo/utils/L1AlgoDraw.cxx
L1Algo/utils/L1AlgoEfficiencyPerformance.cxx
diff --git a/reco/L1/CbmCaMCModule.h b/reco/L1/CbmCaMCModule.h
index 7885be82cf..8a289b8b75 100644
--- a/reco/L1/CbmCaMCModule.h
+++ b/reco/L1/CbmCaMCModule.h
@@ -44,7 +44,6 @@
#include "CaToolsMCData.h"
#include "CaToolsMCPoint.h"
#include "CaVector.h"
-#include "L1InputData.h"
class CbmEvent;
class CbmMCDataObject;
diff --git a/reco/L1/CbmCaTimeSliceReader.cxx b/reco/L1/CbmCaTimeSliceReader.cxx
index 1dc4b5cbde..ecdaf8af27 100644
--- a/reco/L1/CbmCaTimeSliceReader.cxx
+++ b/reco/L1/CbmCaTimeSliceReader.cxx
@@ -23,8 +23,8 @@
#include <numeric>
#include "CaConstants.h"
+#include "CaInputData.h"
#include "CaParameters.h"
-#include "L1InputData.h"
using cbm::ca::tools::HitRecord;
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index 447a8ebaf8..e4f861c73d 100644
--- a/reco/L1/CbmL1.h
+++ b/reco/L1/CbmL1.h
@@ -53,12 +53,12 @@
#include <utility>
#include "AlgoFairloggerCompat.h"
+#include "CaDataManager.h"
#include "CaInitManager.h"
#include "CaMonitor.h"
#include "CaVector.h"
#include "L1Algo/L1Algo.h"
#include "L1EventEfficiencies.h"
-#include "L1IODataManager.h"
#include "L1MaterialMonitor.h"
class L1Algo;
diff --git a/reco/L1/L1Algo/L1Algo.h b/reco/L1/L1Algo/L1Algo.h
index e239a822dd..8718507e86 100644
--- a/reco/L1/L1Algo/L1Algo.h
+++ b/reco/L1/L1Algo/L1Algo.h
@@ -32,6 +32,7 @@ class L1AlgoDraw;
#include "CaField.h"
#include "CaGridEntry.h"
#include "CaHit.h"
+#include "CaInputData.h"
#include "CaParameters.h"
#include "CaStation.h"
#include "CaTrack.h"
@@ -41,7 +42,6 @@ class L1AlgoDraw;
#include "L1CloneMerger.h"
#include "L1Fit.h"
#include "L1Grid.h"
-#include "L1InputData.h"
#include "L1Triplet.h"
#include "L1Utils.h" // ? DEPRECATED ?
--
GitLab