From b2f921c61a0f078140288c5278eba56e5e487bbb Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Wed, 23 Dec 2020 12:45:36 +0800
Subject: [PATCH] WIP: migrate KiTrack.
---
Utilities/CMakeLists.txt | 2 +-
Utilities/KiTrack/CMakeLists.txt | 10 ++++++++++
Utilities/KiTrack/{ => include}/Criteria/Criteria.h | 0
Utilities/KiTrack/{ => include}/Criteria/ICriterion.h | 0
Utilities/KiTrack/{ => include}/ILDImpl/FTDHit01.h | 0
Utilities/KiTrack/{ => include}/ILDImpl/FTDHitSimple.h | 0
.../{ => include}/ILDImpl/FTDNeighborPetalSecCon.h | 0
.../KiTrack/{ => include}/ILDImpl/FTDSectorConnector.h | 0
Utilities/KiTrack/{ => include}/ILDImpl/FTDTrack.h | 0
Utilities/KiTrack/{ => include}/ILDImpl/IFTDHit.h | 0
.../KiTrack/{ => include}/ILDImpl/SectorSystemFTD.h | 0
.../KiTrack/{ => include}/ILDImpl/SectorSystemVXD.h | 0
Utilities/KiTrack/{ => include}/ILDImpl/VXDHitSimple.h | 0
Utilities/KiTrack/{ => include}/KiTrack/Automaton.h | 0
.../KiTrack/{ => include}/KiTrack/HopfieldNeuralNet.h | 0
Utilities/KiTrack/{ => include}/KiTrack/IHit.h | 0
.../KiTrack/{ => include}/KiTrack/ISectorConnector.h | 0
.../KiTrack/{ => include}/KiTrack/ISectorSystem.h | 0
Utilities/KiTrack/{ => include}/KiTrack/ITrack.h | 0
.../KiTrack/{ => include}/KiTrack/KiTrackExceptions.h | 0
Utilities/KiTrack/{ => include}/KiTrack/Segment.h | 0
.../KiTrack/{ => include}/KiTrack/SegmentBuilder.h | 0
Utilities/KiTrack/{ => include}/KiTrack/Subset.h | 0
.../KiTrack/{ => include}/KiTrack/SubsetHopfieldNN.h | 0
Utilities/KiTrack/{ => include}/KiTrack/SubsetSimple.h | 0
Utilities/KiTrack/{ => include}/Tools/FTDHelixFitter.h | 0
Utilities/KiTrack/{ => include}/Tools/Fitter.h | 0
.../KiTrack/{ => include}/Tools/KiTrackMarlinTools.h | 0
28 files changed, 11 insertions(+), 1 deletion(-)
rename Utilities/KiTrack/{ => include}/Criteria/Criteria.h (100%)
rename Utilities/KiTrack/{ => include}/Criteria/ICriterion.h (100%)
rename Utilities/KiTrack/{ => include}/ILDImpl/FTDHit01.h (100%)
rename Utilities/KiTrack/{ => include}/ILDImpl/FTDHitSimple.h (100%)
rename Utilities/KiTrack/{ => include}/ILDImpl/FTDNeighborPetalSecCon.h (100%)
rename Utilities/KiTrack/{ => include}/ILDImpl/FTDSectorConnector.h (100%)
rename Utilities/KiTrack/{ => include}/ILDImpl/FTDTrack.h (100%)
rename Utilities/KiTrack/{ => include}/ILDImpl/IFTDHit.h (100%)
rename Utilities/KiTrack/{ => include}/ILDImpl/SectorSystemFTD.h (100%)
rename Utilities/KiTrack/{ => include}/ILDImpl/SectorSystemVXD.h (100%)
rename Utilities/KiTrack/{ => include}/ILDImpl/VXDHitSimple.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/Automaton.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/HopfieldNeuralNet.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/IHit.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/ISectorConnector.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/ISectorSystem.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/ITrack.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/KiTrackExceptions.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/Segment.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/SegmentBuilder.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/Subset.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/SubsetHopfieldNN.h (100%)
rename Utilities/KiTrack/{ => include}/KiTrack/SubsetSimple.h (100%)
rename Utilities/KiTrack/{ => include}/Tools/FTDHelixFitter.h (100%)
rename Utilities/KiTrack/{ => include}/Tools/Fitter.h (100%)
rename Utilities/KiTrack/{ => include}/Tools/KiTrackMarlinTools.h (100%)
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 14cc4bc9..7558d9c2 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -1,5 +1,5 @@
add_subdirectory(DataHelper)
add_subdirectory(KalTest)
add_subdirectory(KalDet)
-# add_subdirectory(KiTrack)
+add_subdirectory(KiTrack)
diff --git a/Utilities/KiTrack/CMakeLists.txt b/Utilities/KiTrack/CMakeLists.txt
index 4be93398..bf3a35e3 100644
--- a/Utilities/KiTrack/CMakeLists.txt
+++ b/Utilities/KiTrack/CMakeLists.txt
@@ -76,3 +76,13 @@ gaudi_add_library(KiTrackLib
EDM4HEP::edm4hep
${LCIO_LIBRARIES}
)
+
+target_include_directories(KiTrackLib PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+install(TARGETS KiTrackLib
+ EXPORT CEPCSWTargets
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+ COMPONENT dev)
diff --git a/Utilities/KiTrack/Criteria/Criteria.h b/Utilities/KiTrack/include/Criteria/Criteria.h
similarity index 100%
rename from Utilities/KiTrack/Criteria/Criteria.h
rename to Utilities/KiTrack/include/Criteria/Criteria.h
diff --git a/Utilities/KiTrack/Criteria/ICriterion.h b/Utilities/KiTrack/include/Criteria/ICriterion.h
similarity index 100%
rename from Utilities/KiTrack/Criteria/ICriterion.h
rename to Utilities/KiTrack/include/Criteria/ICriterion.h
diff --git a/Utilities/KiTrack/ILDImpl/FTDHit01.h b/Utilities/KiTrack/include/ILDImpl/FTDHit01.h
similarity index 100%
rename from Utilities/KiTrack/ILDImpl/FTDHit01.h
rename to Utilities/KiTrack/include/ILDImpl/FTDHit01.h
diff --git a/Utilities/KiTrack/ILDImpl/FTDHitSimple.h b/Utilities/KiTrack/include/ILDImpl/FTDHitSimple.h
similarity index 100%
rename from Utilities/KiTrack/ILDImpl/FTDHitSimple.h
rename to Utilities/KiTrack/include/ILDImpl/FTDHitSimple.h
diff --git a/Utilities/KiTrack/ILDImpl/FTDNeighborPetalSecCon.h b/Utilities/KiTrack/include/ILDImpl/FTDNeighborPetalSecCon.h
similarity index 100%
rename from Utilities/KiTrack/ILDImpl/FTDNeighborPetalSecCon.h
rename to Utilities/KiTrack/include/ILDImpl/FTDNeighborPetalSecCon.h
diff --git a/Utilities/KiTrack/ILDImpl/FTDSectorConnector.h b/Utilities/KiTrack/include/ILDImpl/FTDSectorConnector.h
similarity index 100%
rename from Utilities/KiTrack/ILDImpl/FTDSectorConnector.h
rename to Utilities/KiTrack/include/ILDImpl/FTDSectorConnector.h
diff --git a/Utilities/KiTrack/ILDImpl/FTDTrack.h b/Utilities/KiTrack/include/ILDImpl/FTDTrack.h
similarity index 100%
rename from Utilities/KiTrack/ILDImpl/FTDTrack.h
rename to Utilities/KiTrack/include/ILDImpl/FTDTrack.h
diff --git a/Utilities/KiTrack/ILDImpl/IFTDHit.h b/Utilities/KiTrack/include/ILDImpl/IFTDHit.h
similarity index 100%
rename from Utilities/KiTrack/ILDImpl/IFTDHit.h
rename to Utilities/KiTrack/include/ILDImpl/IFTDHit.h
diff --git a/Utilities/KiTrack/ILDImpl/SectorSystemFTD.h b/Utilities/KiTrack/include/ILDImpl/SectorSystemFTD.h
similarity index 100%
rename from Utilities/KiTrack/ILDImpl/SectorSystemFTD.h
rename to Utilities/KiTrack/include/ILDImpl/SectorSystemFTD.h
diff --git a/Utilities/KiTrack/ILDImpl/SectorSystemVXD.h b/Utilities/KiTrack/include/ILDImpl/SectorSystemVXD.h
similarity index 100%
rename from Utilities/KiTrack/ILDImpl/SectorSystemVXD.h
rename to Utilities/KiTrack/include/ILDImpl/SectorSystemVXD.h
diff --git a/Utilities/KiTrack/ILDImpl/VXDHitSimple.h b/Utilities/KiTrack/include/ILDImpl/VXDHitSimple.h
similarity index 100%
rename from Utilities/KiTrack/ILDImpl/VXDHitSimple.h
rename to Utilities/KiTrack/include/ILDImpl/VXDHitSimple.h
diff --git a/Utilities/KiTrack/KiTrack/Automaton.h b/Utilities/KiTrack/include/KiTrack/Automaton.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/Automaton.h
rename to Utilities/KiTrack/include/KiTrack/Automaton.h
diff --git a/Utilities/KiTrack/KiTrack/HopfieldNeuralNet.h b/Utilities/KiTrack/include/KiTrack/HopfieldNeuralNet.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/HopfieldNeuralNet.h
rename to Utilities/KiTrack/include/KiTrack/HopfieldNeuralNet.h
diff --git a/Utilities/KiTrack/KiTrack/IHit.h b/Utilities/KiTrack/include/KiTrack/IHit.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/IHit.h
rename to Utilities/KiTrack/include/KiTrack/IHit.h
diff --git a/Utilities/KiTrack/KiTrack/ISectorConnector.h b/Utilities/KiTrack/include/KiTrack/ISectorConnector.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/ISectorConnector.h
rename to Utilities/KiTrack/include/KiTrack/ISectorConnector.h
diff --git a/Utilities/KiTrack/KiTrack/ISectorSystem.h b/Utilities/KiTrack/include/KiTrack/ISectorSystem.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/ISectorSystem.h
rename to Utilities/KiTrack/include/KiTrack/ISectorSystem.h
diff --git a/Utilities/KiTrack/KiTrack/ITrack.h b/Utilities/KiTrack/include/KiTrack/ITrack.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/ITrack.h
rename to Utilities/KiTrack/include/KiTrack/ITrack.h
diff --git a/Utilities/KiTrack/KiTrack/KiTrackExceptions.h b/Utilities/KiTrack/include/KiTrack/KiTrackExceptions.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/KiTrackExceptions.h
rename to Utilities/KiTrack/include/KiTrack/KiTrackExceptions.h
diff --git a/Utilities/KiTrack/KiTrack/Segment.h b/Utilities/KiTrack/include/KiTrack/Segment.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/Segment.h
rename to Utilities/KiTrack/include/KiTrack/Segment.h
diff --git a/Utilities/KiTrack/KiTrack/SegmentBuilder.h b/Utilities/KiTrack/include/KiTrack/SegmentBuilder.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/SegmentBuilder.h
rename to Utilities/KiTrack/include/KiTrack/SegmentBuilder.h
diff --git a/Utilities/KiTrack/KiTrack/Subset.h b/Utilities/KiTrack/include/KiTrack/Subset.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/Subset.h
rename to Utilities/KiTrack/include/KiTrack/Subset.h
diff --git a/Utilities/KiTrack/KiTrack/SubsetHopfieldNN.h b/Utilities/KiTrack/include/KiTrack/SubsetHopfieldNN.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/SubsetHopfieldNN.h
rename to Utilities/KiTrack/include/KiTrack/SubsetHopfieldNN.h
diff --git a/Utilities/KiTrack/KiTrack/SubsetSimple.h b/Utilities/KiTrack/include/KiTrack/SubsetSimple.h
similarity index 100%
rename from Utilities/KiTrack/KiTrack/SubsetSimple.h
rename to Utilities/KiTrack/include/KiTrack/SubsetSimple.h
diff --git a/Utilities/KiTrack/Tools/FTDHelixFitter.h b/Utilities/KiTrack/include/Tools/FTDHelixFitter.h
similarity index 100%
rename from Utilities/KiTrack/Tools/FTDHelixFitter.h
rename to Utilities/KiTrack/include/Tools/FTDHelixFitter.h
diff --git a/Utilities/KiTrack/Tools/Fitter.h b/Utilities/KiTrack/include/Tools/Fitter.h
similarity index 100%
rename from Utilities/KiTrack/Tools/Fitter.h
rename to Utilities/KiTrack/include/Tools/Fitter.h
diff --git a/Utilities/KiTrack/Tools/KiTrackMarlinTools.h b/Utilities/KiTrack/include/Tools/KiTrackMarlinTools.h
similarity index 100%
rename from Utilities/KiTrack/Tools/KiTrackMarlinTools.h
rename to Utilities/KiTrack/include/Tools/KiTrackMarlinTools.h
--
GitLab