From 4cabf002820ea79034c527ac7dc728355ff6ff1c Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Fri, 9 Sep 2022 22:58:52 +0000
Subject: [PATCH] remove unnecessary dependency on Algo library
---
algo/CMakeLists.txt | 2 +-
algo/ca/simd/CaSimd.h | 4 +-
analysis/PWGCHA/jpsi/CMakeLists.txt | 4 +-
.../dielectron/conversion/CMakeLists.txt | 4 +-
.../PWGDIL/dielectron/lmvm/CMakeLists.txt | 4 +-
.../dielectron/papaframework/CMakeLists.txt | 198 +++++++++---------
.../PWGDIL/dielectron/pi0eta/CMakeLists.txt | 6 +-
.../CbmKresConversionCorrectedPhotons.cxx | 2 -
.../pi0eta/CbmKresConversionManual.cxx | 3 +-
.../pi0eta/CbmKresConversionPhotons.cxx | 2 -
.../PWGDIL/dielectron/pi0eta/CbmKresEta.cxx | 2 -
.../analysis_tree_converter/CMakeLists.txt | 3 -
reco/KF/KF.cmake | 8 +-
reco/KF/KFParticleInterface.cmake | 4 +-
reco/KF/KFQA.cmake | 5 +-
reco/L1/CMakeLists.txt | 4 +-
reco/L1/L1Algo/L1NaN.h | 2 +-
reco/L1/L1Algo/L1SimdSerializer.h | 2 +-
.../CbmL1RichENNRingFinderParallel.h | 2 +-
reco/eventbuilder/CMakeLists.txt | 127 +++++------
reco/littrack/CMakeLists.txt | 5 +-
reco/littrack/parallel/CMakeLists.txt | 6 +-
reco/littrack/parallel/LitTypes.h | 2 +-
23 files changed, 174 insertions(+), 227 deletions(-)
diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index 64e9ffc5c8..5281075fb2 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -40,5 +40,5 @@ install(TARGETS Algo DESTINATION lib)
install(FILES ca/simd/CaSimd.h
ca/simd/CaSimdVc.h
ca/simd/CaSimdPseudo.h
- DESTINATION include/ca/simd
+ DESTINATION include/
)
diff --git a/algo/ca/simd/CaSimd.h b/algo/ca/simd/CaSimd.h
index 5c42832e7b..28ce54fd13 100644
--- a/algo/ca/simd/CaSimd.h
+++ b/algo/ca/simd/CaSimd.h
@@ -5,7 +5,7 @@
#ifndef Ca_CaSimd_H
#define Ca_CaSimd_H
-#include "ca/simd/CaSimdVc.h"
-//#include "ca/simd/CaSimdPseudo.h"
+#include "CaSimdVc.h"
+//#include "CaSimdPseudo.h"
#endif
diff --git a/analysis/PWGCHA/jpsi/CMakeLists.txt b/analysis/PWGCHA/jpsi/CMakeLists.txt
index f7b087c1f7..a28170e6ca 100644
--- a/analysis/PWGCHA/jpsi/CMakeLists.txt
+++ b/analysis/PWGCHA/jpsi/CMakeLists.txt
@@ -13,8 +13,6 @@ ${CBMDATA_DIR}/rich
${CBMDATA_DIR}/trd
${CBMDATA_DIR}/tof
-${CBMROOT_SOURCE_DIR}/algo
-
${CBMROOT_SOURCE_DIR}/reco/KF
${CBMROOT_SOURCE_DIR}/reco/KF/Interface
@@ -69,7 +67,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D
Set(LINKDEF CbmJPsiAnalysisLinkDef.h)
Set(LIBRARY_NAME CbmJPsiAnalysis)
-Set(DEPENDENCIES Algo KF L1 CbmRichReco CbmRichBase CbmBase CbmData Littrack)
+Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmBase CbmData Littrack)
Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
GENERATE_LIBRARY()
diff --git a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
index 0f66ea8f70..80d744978f 100644
--- a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
@@ -13,8 +13,6 @@ ${CBMDATA_DIR}/rich
${CBMROOT_SOURCE_DIR}/core/detectors/rich/utils
${CBMROOT_SOURCE_DIR}/core/detectors/rich
-${CBMROOT_SOURCE_DIR}/algo
-
${CBMROOT_SOURCE_DIR}/reco/base
${CBMROOT_SOURCE_DIR}/reco/KF
@@ -75,7 +73,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D
Set(LINKDEF CbmConversionAnalysisLinkDef.h)
Set(LIBRARY_NAME CbmConversionAnalysis)
-Set(DEPENDENCIES Algo KF L1 CbmRichReco CbmRichBase CbmRecoBase CbmData Littrack)
+Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmRecoBase CbmData Littrack)
Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
GENERATE_LIBRARY()
diff --git a/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt b/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt
index 5a4f7094d6..a3e5502bcd 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt
@@ -16,8 +16,6 @@ ${CBMDATA_DIR}/rich
${CBMDATA_DIR}/trd
${CBMDATA_DIR}/tof
-${CBMROOT_SOURCE_DIR}/algo
-
${CBMROOT_SOURCE_DIR}/reco/KF
${CBMROOT_SOURCE_DIR}/reco/KF/Interface
@@ -72,7 +70,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D
Set(LINKDEF LmvmLinkDef.h)
Set(LIBRARY_NAME CbmLmvm)
Set(DEPENDENCIES
- Littrack LittrackQA Algo KF L1 CbmRichBase CbmRichReco CbmRecoBase CbmBase CbmData)
+ Littrack LittrackQA KF L1 CbmRichBase CbmRichReco CbmRecoBase CbmBase CbmData)
Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
GENERATE_LIBRARY()
diff --git a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
index 2dd93270a1..c021e1aa4c 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
@@ -1,123 +1,118 @@
Set(INCLUDE_DIRECTORIES
-${CMAKE_CURRENT_SOURCE_DIR}
-
-${CBMBASE_DIR}
-${CBMBASE_DIR}/draw
-${CBMBASE_DIR}/report
-${CBMBASE_DIR}/utils
-
-${CBMDATA_DIR}
-${CBMDATA_DIR}/sts
-${CBMDATA_DIR}/much
-${CBMDATA_DIR}/mvd
-${CBMDATA_DIR}/global
-${CBMDATA_DIR}/rich
-${CBMDATA_DIR}/trd
-${CBMDATA_DIR}/tof
-${CBMDATA_DIR}/psd
-
-${CBMROOT_SOURCE_DIR}/mvd
-${CBMROOT_SOURCE_DIR}/core/detectors/rich
-
-${CBMROOT_SOURCE_DIR}/sim/transport/generators/unigen
-
-${CBMROOT_SOURCE_DIR}/algo
-
-${CBMROOT_SOURCE_DIR}/reco/KF
-${CBMROOT_SOURCE_DIR}/reco/KF/Interface
-${KFParticle_INCLUDE_DIR}
-
-${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
-
-${CBMROOT_SOURCE_DIR}/reco/littrack
-${CBMROOT_SOURCE_DIR}/reco/littrack/cbm
-${CBMROOT_SOURCE_DIR}/reco/littrack/cbm/base
-${CBMROOT_SOURCE_DIR}/reco/littrack/cbm/utils
-${CBMROOT_SOURCE_DIR}/reco/littrack/std
-${CBMROOT_SOURCE_DIR}/reco/littrack/std/data
-${CBMROOT_SOURCE_DIR}/reco/littrack/std/base
-
+ ${CMAKE_CURRENT_SOURCE_DIR}
+
+ ${CBMBASE_DIR}
+ ${CBMBASE_DIR}/draw
+ ${CBMBASE_DIR}/report
+ ${CBMBASE_DIR}/utils
+
+ ${CBMDATA_DIR}
+ ${CBMDATA_DIR}/sts
+ ${CBMDATA_DIR}/much
+ ${CBMDATA_DIR}/mvd
+ ${CBMDATA_DIR}/global
+ ${CBMDATA_DIR}/rich
+ ${CBMDATA_DIR}/trd
+ ${CBMDATA_DIR}/tof
+ ${CBMDATA_DIR}/psd
+
+ ${CBMROOT_SOURCE_DIR}/mvd
+ ${CBMROOT_SOURCE_DIR}/core/detectors/rich
+
+ ${CBMROOT_SOURCE_DIR}/sim/transport/generators/unigen
+
+ ${CBMROOT_SOURCE_DIR}/reco/KF
+ ${CBMROOT_SOURCE_DIR}/reco/KF/Interface
+ ${KFParticle_INCLUDE_DIR}
+
+ ${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
+
+ ${CBMROOT_SOURCE_DIR}/reco/littrack
+ ${CBMROOT_SOURCE_DIR}/reco/littrack/cbm
+ ${CBMROOT_SOURCE_DIR}/reco/littrack/cbm/base
+ ${CBMROOT_SOURCE_DIR}/reco/littrack/cbm/utils
+ ${CBMROOT_SOURCE_DIR}/reco/littrack/std
+ ${CBMROOT_SOURCE_DIR}/reco/littrack/std/data
+ ${CBMROOT_SOURCE_DIR}/reco/littrack/std/base
)
-Include_Directories( ${INCLUDE_DIRECTORIES})
+Include_Directories(${INCLUDE_DIRECTORIES})
Set(SYSTEM_INCLUDE_DIRECTORIES
- ${BASE_INCLUDE_DIRECTORIES}
+ ${BASE_INCLUDE_DIRECTORIES}
${Boost_INCLUDE_DIR}
)
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
-${KFParticle_LIB_DIR}
-${FAIRROOT_LIBRARY_DIR}
-${ROOT_LIBRARY_DIR}
-${Boost_LIBRARY_DIRS}
+ ${KFParticle_LIB_DIR}
+ ${FAIRROOT_LIBRARY_DIR}
+ ${ROOT_LIBRARY_DIR}
+ ${Boost_LIBRARY_DIRS}
)
-#Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wshadow -Weffc++ -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-ignored-qualifiers -Wno-overloaded-virtual")
-
-link_directories( ${LINK_DIRECTORIES})
+# Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wshadow -Weffc++ -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-ignored-qualifiers -Wno-overloaded-virtual")
+link_directories(${LINK_DIRECTORIES})
set(SRCS
-AnalysisCuts.cxx
-AnalysisFilter.cxx
-PairAnalysisTrack.cxx
-PairAnalysisEvent.cxx
-PairAnalysisPair.cxx
-PairAnalysisPairKF.cxx
-PairAnalysisPairLV.cxx
-PairAnalysisHelper.cxx
-PairAnalysisStyler.cxx
-
-PairAnalysisCutQa.cxx
-PairAnalysisVarCuts.cxx
-PairAnalysisObjectCuts.cxx
-PairAnalysisPairLegCuts.cxx
-PairAnalysisCutCombi.cxx
-PairAnalysisCutGroup.cxx
-
-PairAnalysisVarManager.cxx
-PairAnalysisMetaData.cxx
-
-AnalysisTaskMultiPairAnalysis.cxx
-PairAnalysis.cxx
-#PairAnalysisDebugTree.cxx
-#PairAnalysisMixedEvent.cxx
-PairAnalysisHF.cxx
-###PairAnalysisHFhelper.cxx
-PairAnalysisHistos.cxx
-PairAnalysisMC.cxx
-
-PairAnalysisSignalMC.cxx
-PairAnalysisTrackRotator.cxx
-PairAnalysisMixedEvent.cxx
-PairAnalysisMixingHandler.cxx
-
-#PairAnalysisHistosHelper.cxx
-PairAnalysisFunction.cxx
-PairAnalysisSignalExt.cxx
-#PairAnalysisSignalFit.cxx
-PairAnalysisSpectrum.cxx
-
+ AnalysisCuts.cxx
+ AnalysisFilter.cxx
+ PairAnalysisTrack.cxx
+ PairAnalysisEvent.cxx
+ PairAnalysisPair.cxx
+ PairAnalysisPairKF.cxx
+ PairAnalysisPairLV.cxx
+ PairAnalysisHelper.cxx
+ PairAnalysisStyler.cxx
+
+ PairAnalysisCutQa.cxx
+ PairAnalysisVarCuts.cxx
+ PairAnalysisObjectCuts.cxx
+ PairAnalysisPairLegCuts.cxx
+ PairAnalysisCutCombi.cxx
+ PairAnalysisCutGroup.cxx
+
+ PairAnalysisVarManager.cxx
+ PairAnalysisMetaData.cxx
+
+ AnalysisTaskMultiPairAnalysis.cxx
+ PairAnalysis.cxx
+
+ # PairAnalysisDebugTree.cxx
+ # PairAnalysisMixedEvent.cxx
+ PairAnalysisHF.cxx
+
+ # ##PairAnalysisHFhelper.cxx
+ PairAnalysisHistos.cxx
+ PairAnalysisMC.cxx
+
+ PairAnalysisSignalMC.cxx
+ PairAnalysisTrackRotator.cxx
+ PairAnalysisMixedEvent.cxx
+ PairAnalysisMixingHandler.cxx
+
+ # PairAnalysisHistosHelper.cxx
+ PairAnalysisFunction.cxx
+ PairAnalysisSignalExt.cxx
+
+ # PairAnalysisSignalFit.cxx
+ PairAnalysisSpectrum.cxx
)
+Set(HEADERS)
-Set(HEADERS )
-
-IF (SSE_FOUND)
+IF(SSE_FOUND)
Message(STATUS "Papa will be compiled with SSE support")
ADD_DEFINITIONS(-DHAVE_SSE)
- SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
- "-msse -O3")
-ELSE (SSE_FOUND)
+ SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
+ "-msse -O3")
+ELSE(SSE_FOUND)
MESSAGE(STATUS "Papa will be compiled without SSE support")
- SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
- "-O3")
-ENDIF (SSE_FOUND)
-
-
+ SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
+ "-O3")
+ENDIF(SSE_FOUND)
If(CMAKE_SYSTEM_NAME MATCHES Darwin)
If(${MAC_OS_VERSION} LESS 10.9)
@@ -136,11 +131,10 @@ EndIf()
Set(LINKDEF CbmPapaLinkDef.h)
Set(LIBRARY_NAME CbmPapa)
Set(DEPENDENCIES
- Algo L1 KF Littrack CbmRichReco CbmRichBase CbmBase CbmData CbmSimGenerators Base)
+ L1 KF Littrack CbmRichReco CbmRichBase CbmBase CbmData CbmSimGenerators Base)
GENERATE_LIBRARY()
-
Install(FILES configs/Config_trd_PidLI.C
- DESTINATION share/cbmroot/macro/papa
- )
+ DESTINATION share/cbmroot/macro/papa
+)
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
index 0698d24517..a85eb086b3 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
@@ -10,15 +10,11 @@ ${CBMDATA_DIR}/sts
${CBMDATA_DIR}/global
${CBMDATA_DIR}/rich
-${CBMROOT_SOURCE_DIR}/algo
-
${CBMROOT_SOURCE_DIR}/reco/base
${CBMROOT_SOURCE_DIR}/reco/KF
${CBMROOT_SOURCE_DIR}/reco/KF/Interface
-${CBMROOT_SOURCE_DIR}/reco/L1
-${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
#${CBMROOT_SOURCE_DIR}/littrack/cbm/elid
@@ -90,7 +86,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D
Set(LINKDEF CbmConversion2AnalysisLinkDef.h)
Set(LIBRARY_NAME CbmConversion2Analysis)
-Set(DEPENDENCIES Algo KF L1 CbmRichBase CbmRichReco CbmRecoBase CbmData)
+Set(DEPENDENCIES KF L1 CbmRichBase CbmRichReco CbmRecoBase CbmData)
Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
GENERATE_LIBRARY()
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx
index 0a1e77fea2..d30f8ca8ae 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx
@@ -24,7 +24,6 @@
#include "CbmKFParticleInterface.h"
#include "CbmKresConversionBG.h"
#include "CbmKresFunctions.h"
-#include "CbmL1PFFitter.h"
#include "CbmMCTrack.h"
#include "CbmMvdHit.h"
#include "CbmRichHit.h"
@@ -40,7 +39,6 @@
#include <iostream>
#include "KFParticle.h"
-#include "L1Field.h"
using namespace std;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx
index 4217f26a67..e2c5714394 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx
@@ -40,7 +40,6 @@
#include <iostream>
#include "KFParticle.h"
-#include "L1Field.h"
using namespace std;
@@ -1346,7 +1345,7 @@ void CbmKresConversionManual::Exec(int fEventNumMan, double OpeningAngleCut, dou
vector<CbmStsTrack> stsTracks_electron;
stsTracks_electron.resize(1);
stsTracks_electron[0] = *stsTrack;
- vector<L1FieldRegion> vField_electron;
+ vector<CbmL1PFFitter::PFFieldRegion> vField_electron;
vector<float> chiPrim_electron;
vector<int> pidHypo_electron;
pidHypo_electron.push_back(11);
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx
index 1744114531..383142610a 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx
@@ -23,7 +23,6 @@
#include "CbmKFParticleInterface.h"
#include "CbmKresConversionBG.h"
#include "CbmKresFunctions.h"
-#include "CbmL1PFFitter.h"
#include "CbmMCTrack.h"
#include "CbmMvdHit.h"
#include "CbmRichHit.h"
@@ -39,7 +38,6 @@
#include <iostream>
#include "KFParticle.h"
-#include "L1Field.h"
using namespace std;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx
index 615816c436..c0093c38b7 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx
@@ -23,7 +23,6 @@
#include "CbmGlobalTrack.h"
#include "CbmKFParticleInterface.h"
#include "CbmKresFunctions.h"
-#include "CbmL1PFFitter.h"
#include "CbmMCTrack.h"
#include "CbmMvdHit.h"
#include "CbmRichHit.h"
@@ -42,7 +41,6 @@
#include <iostream>
#include "KFParticle.h"
-#include "L1Field.h"
using namespace std;
diff --git a/analysis/common/analysis_tree_converter/CMakeLists.txt b/analysis/common/analysis_tree_converter/CMakeLists.txt
index 30e59d5bea..1ea8cf8146 100644
--- a/analysis/common/analysis_tree_converter/CMakeLists.txt
+++ b/analysis/common/analysis_tree_converter/CMakeLists.txt
@@ -17,8 +17,6 @@ set(SRCS
Set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
- ${CBMROOT_SOURCE_DIR}/algo
-
${CBMROOT_SOURCE_DIR}/core/base
${CBMROOT_SOURCE_DIR}/core/data
${CBMROOT_SOURCE_DIR}/core/data/base
@@ -75,7 +73,6 @@ Set(_AnalysisTree_LIB AnalysisTreeBase AnalysisTreeInfra)
Set(DEPENDENCIES
${_AnalysisTree_LIB}
- Algo
CbmData
CbmBase
KFParticleInterface
diff --git a/reco/KF/KF.cmake b/reco/KF/KF.cmake
index eba984a86d..ec8a44b35d 100644
--- a/reco/KF/KF.cmake
+++ b/reco/KF/KF.cmake
@@ -5,7 +5,6 @@
Set(INCLUDE_DIRECTORIES
${CBMBASE_DIR}
-${CBMROOT_SOURCE_DIR}/algo
${CBMROOT_SOURCE_DIR}/reco/base
${CBMDATA_DIR}
@@ -24,10 +23,6 @@ ${CBMROOT_SOURCE_DIR}/reco/KF/KFQA
${CBMDETECTORBASE_DIR}/sts
-#${CBMROOT_SOURCE_DIR}/reco/L1
-#${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
-#${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
-
${CBMROOT_SOURCE_DIR}/mvd
${CBMDETECTORBASE_DIR}/much # TMP for tracker interface
@@ -46,7 +41,6 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
-${Algo_LIB_DIR}
${FAIRROOT_LIBRARY_DIR}
${ROOT_LIBRARY_DIR}
${Boost_LIBRARY_DIRS}
@@ -175,7 +169,7 @@ ENDIF (SSE_FOUND)
set(LINKDEF KFLinkDef.h)
Set(LIBRARY_NAME KF)
Set(DEPENDENCIES
- Algo CbmRecoBase CbmSimSteer CbmStsBase CbmMvd CbmMuchBase CbmTrdBase CbmTofBase CbmBase CbmData Base Minuit2
+ CbmRecoBase CbmSimSteer CbmStsBase CbmMvd CbmMuchBase CbmTrdBase CbmTofBase CbmBase CbmData Base Minuit2
)
Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
diff --git a/reco/KF/KFParticleInterface.cmake b/reco/KF/KFParticleInterface.cmake
index 60fd28d759..1fd7a5dea2 100644
--- a/reco/KF/KFParticleInterface.cmake
+++ b/reco/KF/KFParticleInterface.cmake
@@ -5,7 +5,6 @@
Set(INCLUDE_DIRECTORIES
${CBMBASE_DIR}
- ${CBMROOT_SOURCE_DIR}/algo
${CBMROOT_SOURCE_DIR}/reco/base
${CBMDATA_DIR}
@@ -41,7 +40,6 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
- ${Algo_LIB_DIR}
# ${KFParticle_LIB_DIR}
${FAIRROOT_LIBRARY_DIR}
${ROOT_LIBRARY_DIR}
@@ -109,7 +107,7 @@ ENDIF(SSE_FOUND)
set(LINKDEF KFParticleInterfaceLinkDef.h)
Set(LIBRARY_NAME KFParticleInterface)
Set(DEPENDENCIES
- Algo KF KFQA KFParticle L1
+ KF KFQA KFParticle L1
)
Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
diff --git a/reco/KF/KFQA.cmake b/reco/KF/KFQA.cmake
index cde5bf857e..a291599ef1 100644
--- a/reco/KF/KFQA.cmake
+++ b/reco/KF/KFQA.cmake
@@ -17,8 +17,6 @@ ${CBMDATA_DIR}/rich
${CBMDATA_DIR}/tof
${CBMDATA_DIR}/global
-${CBMROOT_SOURCE_DIR}/algo
-
${CBMROOT_SOURCE_DIR}/reco/KF
${CBMROOT_SOURCE_DIR}/reco/KF/Interface
${CBMROOT_SOURCE_DIR}/reco/KF/KFQA
@@ -42,7 +40,6 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
-${Algo_LIB_DIR}
${KFParticle_LIB_DIR}
${FAIRROOT_LIBRARY_DIR}
${ROOT_LIBRARY_DIR}
@@ -104,7 +101,7 @@ ENDIF (SSE_FOUND)
set(LINKDEF KFQALinkDef.h)
Set(LIBRARY_NAME KFQA)
Set(DEPENDENCIES
- Algo KF L1 KFParticle
+ KF L1 KFParticle
)
Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index e4a2eb298a..d8c4d4ab48 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -17,7 +17,8 @@ ENDIF(SSE_FOUND)
Set(INCLUDE_DIRECTORIES
- ${CBMROOT_SOURCE_DIR}/algo
+ ${CBMROOT_SOURCE_DIR}/algo/ca
+ ${CBMROOT_SOURCE_DIR}/algo/ca/simd
${CBMROOT_SOURCE_DIR}/reco/base
${CBMROOT_SOURCE_DIR}/reco/detectors/sts
${CBMROOT_SOURCE_DIR}/reco/detectors/rich
@@ -81,7 +82,6 @@ endif()
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
- ${Algo_LIB_DIR}
${KFParticle_LIB_DIR}
${FAIRROOT_LIBRARY_DIR}
${ROOT_LIBRARY_DIR}
diff --git a/reco/L1/L1Algo/L1NaN.h b/reco/L1/L1Algo/L1NaN.h
index ec51646303..81b25073ad 100644
--- a/reco/L1/L1Algo/L1NaN.h
+++ b/reco/L1/L1Algo/L1NaN.h
@@ -17,8 +17,8 @@
#include <cmath>
+#include "CaSimd.h"
#include "L1Def.h"
-#include "ca/simd/CaSimd.h"
using namespace cbm::algo::ca; // TODO: remove "using" from headers
/// Namespace L1NaN defines functions to set variables to NaN and check wether they are NaN or not
diff --git a/reco/L1/L1Algo/L1SimdSerializer.h b/reco/L1/L1Algo/L1SimdSerializer.h
index 4b7a4dd4cb..a78dbf9c72 100644
--- a/reco/L1/L1Algo/L1SimdSerializer.h
+++ b/reco/L1/L1Algo/L1SimdSerializer.h
@@ -13,7 +13,7 @@
#include <boost/serialization/access.hpp>
#include <boost/serialization/split_free.hpp>
-#include "ca/simd/CaSimd.h"
+#include "CaSimd.h"
/// This header defines functionality for saving and loading SIMDized vectors. At the moment, only the first element of
/// the vector can be saved, and the loaded vector will be horizontally equal.
///
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h
index bed36ac9f5..2bc1e80bcc 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h
@@ -24,7 +24,7 @@
#include "CbmRichRingFinder.h"
-#include "ca/simd/CaSimd.h"
+#include "CaSimd.h"
using namespace cbm::algo::ca; // TODO: remove "using" from headers
#include "TStopwatch.h"
diff --git a/reco/eventbuilder/CMakeLists.txt b/reco/eventbuilder/CMakeLists.txt
index b63dca16d7..4af6d25b7b 100644
--- a/reco/eventbuilder/CMakeLists.txt
+++ b/reco/eventbuilder/CMakeLists.txt
@@ -1,96 +1,83 @@
-## Create a library called "libRun" which includes the source files given in
+# # Create a library called "libRun" which includes the source files given in
# the array .
# The extension is already found. Any number of sources could be listed here.
Set(INCLUDE_DIRECTORIES
-${CMAKE_CURRENT_SOURCE_DIR}
-${CMAKE_CURRENT_SOURCE_DIR}/digis
-${CMAKE_CURRENT_SOURCE_DIR}/tracks
-
-${CBMBASE_DIR}
-${CBMROOT_SOURCE_DIR}/run
-
-${CBMDATA_DIR}
-${CBMDATA_DIR}/base
-${CBMDATA_DIR}/mvd
-${CBMDATA_DIR}/sts
-${CBMDATA_DIR}/sts
-${CBMDATA_DIR}/rich
-${CBMDATA_DIR}/much
-${CBMDATA_DIR}/trd
-${CBMDATA_DIR}/tof
-${CBMDATA_DIR}/psd
-${CBMDATA_DIR}/global
-
-${CBMROOT_SOURCE_DIR}/algo
-${CBMROOT_SOURCE_DIR}/reco/L1
-${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
-
-${CBMROOT_SOURCE_DIR}/mvd
-${CBMDETECTORBASE_DIR}/sts
-
-${CBMROOT_SOURCE_DIR}/rich
-${CBMROOT_SOURCE_DIR}/tof/TofMC
-${CBMROOT_SOURCE_DIR}/psd
-${CBMROOT_SOURCE_DIR}/field
-${CBMROOT_SOURCE_DIR}/core/data/raw
-${CBMROOT_SOURCE_DIR}/core/qa
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/digis
+ ${CMAKE_CURRENT_SOURCE_DIR}/tracks
+
+ ${CBMBASE_DIR}
+ ${CBMROOT_SOURCE_DIR}/run
+
+ ${CBMDATA_DIR}
+ ${CBMDATA_DIR}/base
+ ${CBMDATA_DIR}/mvd
+ ${CBMDATA_DIR}/sts
+ ${CBMDATA_DIR}/sts
+ ${CBMDATA_DIR}/rich
+ ${CBMDATA_DIR}/much
+ ${CBMDATA_DIR}/trd
+ ${CBMDATA_DIR}/tof
+ ${CBMDATA_DIR}/psd
+ ${CBMDATA_DIR}/global
+
+ # ${CBMROOT_SOURCE_DIR}/algo
+ ${CBMROOT_SOURCE_DIR}/reco/L1
+ ${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
+
+ ${CBMROOT_SOURCE_DIR}/mvd
+ ${CBMDETECTORBASE_DIR}/sts
+
+ ${CBMROOT_SOURCE_DIR}/rich
+ ${CBMROOT_SOURCE_DIR}/tof/TofMC
+ ${CBMROOT_SOURCE_DIR}/psd
+ ${CBMROOT_SOURCE_DIR}/field
+ ${CBMROOT_SOURCE_DIR}/core/data/raw
+ ${CBMROOT_SOURCE_DIR}/core/qa
)
-Include_Directories( ${INCLUDE_DIRECTORIES})
+Include_Directories(${INCLUDE_DIRECTORIES})
set(SYSTEM_INCLUDE_DIRECTORIES
${KFParticle_INCLUDE_DIR}
- ${BASE_INCLUDE_DIRECTORIES}
+ ${BASE_INCLUDE_DIRECTORIES}
)
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
-
set(LINK_DIRECTORIES
-${KFParticle_LIB_DIR}
-${FAIRROOT_LIBRARY_DIR}
-${ROOT_LIBRARY_DIR}
-${Boost_LIBRARY_DIRS}
+ ${KFParticle_LIB_DIR}
+ ${FAIRROOT_LIBRARY_DIR}
+ ${ROOT_LIBRARY_DIR}
+ ${Boost_LIBRARY_DIRS}
)
-
-link_directories( ${LINK_DIRECTORIES})
+
+link_directories(${LINK_DIRECTORIES})
set(SRCS
-digis/CbmEvbuildRawAlgo.cxx
-digis/CbmEvbuildRawTask.cxx
-digis/CbmAlgoBuildRawEvents.cxx
-digis/CbmTaskBuildRawEvents.cxx
-digis/CbmBuildEventsIdeal.cxx
-digis/CbmBuildEventsIdealNew.cxx
-digis/CbmBuildEventsQa.cxx
-digis/CbmBuildEventsSimple.cxx
-digis/CbmSeedFinderSlidingWindow.cxx
-digis/CbmSeedFinderQa.cxx
-#digis/CbmEvBuildSource.cxx
-
-tracks/CbmBuildEventsFromTracksIdeal.cxx
-tracks/CbmBuildEventsFromTracksReal.cxx
-tracks/CbmEventBuilderQa.cxx
+ digis/CbmEvbuildRawAlgo.cxx
+ digis/CbmEvbuildRawTask.cxx
+ digis/CbmAlgoBuildRawEvents.cxx
+ digis/CbmTaskBuildRawEvents.cxx
+ digis/CbmBuildEventsIdeal.cxx
+ digis/CbmBuildEventsIdealNew.cxx
+ digis/CbmBuildEventsQa.cxx
+ digis/CbmBuildEventsSimple.cxx
+ digis/CbmSeedFinderSlidingWindow.cxx
+ digis/CbmSeedFinderQa.cxx
+
+ # digis/CbmEvBuildSource.cxx
+ tracks/CbmBuildEventsFromTracksIdeal.cxx
+ tracks/CbmBuildEventsFromTracksReal.cxx
+ tracks/CbmEventBuilderQa.cxx
)
-
-IF (SSE_FOUND)
- ADD_DEFINITIONS(-DHAVE_SSE)
- SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
- "-msse -O3")
- Message(STATUS "eventbuilder will be compiled with SSE support")
-ELSE (SSE_FOUND)
- Message(STATUS "eventbuilder will be compiled without SSE support")
- SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
- "-O3")
-ENDIF (SSE_FOUND)
-
set(LINKDEF CbmEventBuilderLinkDef.h)
Set(LIBRARY_NAME CbmEventBuilder)
Set(DEPENDENCIES
- Algo CbmData CbmBase CbmField CbmStsBase CbmMvd Base CbmQaBase
+ CbmData CbmBase CbmField CbmStsBase CbmMvd Base CbmQaBase
)
GENERATE_LIBRARY()
diff --git a/reco/littrack/CMakeLists.txt b/reco/littrack/CMakeLists.txt
index f50d7d29ed..b34398f060 100644
--- a/reco/littrack/CMakeLists.txt
+++ b/reco/littrack/CMakeLists.txt
@@ -22,7 +22,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/cbm/qa/fieldapr
${CMAKE_CURRENT_SOURCE_DIR}/cbm/qa/radlength
${CMAKE_CURRENT_SOURCE_DIR}/cbm/qa/tof
-${CBMROOT_SOURCE_DIR}/algo
+${CBMROOT_SOURCE_DIR}/algo/ca/simd
${CBMROOT_SOURCE_DIR}/reco/base
# needed only for the LitrackQA library
@@ -65,7 +65,6 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
-${Algo_LIB_DIR}
${KFParticle_LIB_DIR}
${FAIRROOT_LIBRARY_DIR}
${ROOT_LIBRARY_DIR}
@@ -183,7 +182,7 @@ EndIf (Boost_FOUND)
set(LINKDEF LittrackLinkDef.h)
Set(LIBRARY_NAME Littrack)
Set(DEPENDENCIES
- Algo Littrackparallel KF KFParticleInterface CbmMuchBase CbmStsBase CbmRichBase CbmRecoBase CbmBase CbmData
+ Littrackparallel KF KFParticleInterface CbmMuchBase CbmStsBase CbmRichBase CbmRecoBase CbmBase CbmData
CbmTofBase Base
)
GENERATE_LIBRARY()
diff --git a/reco/littrack/parallel/CMakeLists.txt b/reco/littrack/parallel/CMakeLists.txt
index 73edc0172e..c32d341193 100644
--- a/reco/littrack/parallel/CMakeLists.txt
+++ b/reco/littrack/parallel/CMakeLists.txt
@@ -1,14 +1,12 @@
# Create a library called "libLittrackparallel".
set(INCLUDE_DIRECTORIES
- ${CBMROOT_SOURCE_DIR}/algo
+ ${CBMROOT_SOURCE_DIR}/algo/ca/simd
)
include_directories(${INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
- ${Vc_LIB_DIR}
- ${Algo_LIB_DIR}
)
link_directories(${LINK_DIRECTORIES})
@@ -36,7 +34,7 @@ ENDIF(SSE_FOUND)
add_library(Littrackparallel SHARED ${LITTRACKPARALLEL_SRCS})
set_target_properties(Littrackparallel PROPERTIES ${FAIRROOT_LIBRARY_PROPERTIES})
-target_link_libraries(Littrackparallel Algo Vc.a)
+target_link_libraries(Littrackparallel Vc.a)
# install(TARGETS Littrackparallel DESTINATION ${CMAKE_BINARY_DIR}/lib)
install(TARGETS Littrackparallel DESTINATION lib)
diff --git a/reco/littrack/parallel/LitTypes.h b/reco/littrack/parallel/LitTypes.h
index b3bbff2476..b9dee3e6b6 100644
--- a/reco/littrack/parallel/LitTypes.h
+++ b/reco/littrack/parallel/LitTypes.h
@@ -12,7 +12,7 @@
#ifndef LITTYPES_H_
#define LITTYPES_H_
-#include "ca/simd/CaSimd.h"
+#include "CaSimd.h"
using cbm::algo::ca::fscal;
using cbm::algo::ca::fvec;
--
GitLab