From 17a9aa962d8df16b89ec49acf3a0706528d9fd08 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Wed, 23 Dec 2020 10:23:20 +0800
Subject: [PATCH] migrate KalTest and KalDet.

---
 Utilities/CMakeLists.txt                      |  2 +-
 Utilities/KalDet/CMakeLists.txt               | 32 ++++++++++++-------
 .../KalDet/{ => include}/kaldet/EXEventGen.h  |  0
 .../KalDet/{ => include}/kaldet/EXTPCHit.h    |  0
 .../{ => include}/kaldet/EXTPCKalDetector.h   |  0
 .../{ => include}/kaldet/EXTPCMeasLayer.h     |  0
 .../{ => include}/kaldet/EXVKalDetector.h     |  0
 .../{ => include}/kaldet/EXVMeasLayer.h       |  0
 .../{ => include}/kaldet/GearTPCCylinderHit.h |  0
 .../kaldet/GearTPCCylinderMeasLayer.h         |  0
 .../KalDet/{ => include}/kaldet/GearTPCHit.h  |  0
 .../{ => include}/kaldet/GearTPCKalDetector.h |  0
 .../{ => include}/kaldet/GearTPCMeasLayer.h   |  0
 .../{ => include}/kaldet/ILDConeMeasLayer.h   |  0
 .../{ => include}/kaldet/ILDCylinderHit.h     |  0
 .../kaldet/ILDCylinderMeasLayer.h             |  0
 .../{ => include}/kaldet/ILDDiscMeasLayer.h   |  0
 .../kaldet/ILDFTDDiscBasedKalDetector.h       |  0
 .../{ => include}/kaldet/ILDFTDKalDetector.h  |  0
 .../kaldet/ILDMeasurementSurfaceStoreFiller.h |  0
 .../kaldet/ILDParallelPlanarMeasLayer.h       |  0
 .../kaldet/ILDParallelPlanarStripMeasLayer.h  |  0
 .../{ => include}/kaldet/ILDPlanarHit.h       |  0
 .../{ => include}/kaldet/ILDPlanarMeasLayer.h |  0
 .../{ => include}/kaldet/ILDPlanarStripHit.h  |  0
 .../kaldet/ILDPolygonBarrelMeasLayer.h        |  0
 .../kaldet/ILDRotatedTrapMeaslayer.h          |  0
 .../{ => include}/kaldet/ILDSETKalDetector.h  |  0
 .../kaldet/ILDSITCylinderKalDetector.h        |  0
 .../{ => include}/kaldet/ILDSITKalDetector.h  |  0
 .../kaldet/ILDSegmentedDiscMeasLayer.h        |  0
 .../kaldet/ILDSegmentedDiscStripMeasLayer.h   |  0
 .../kaldet/ILDSupportKalDetector.h            |  0
 .../{ => include}/kaldet/ILDTPCKalDetector.h  |  0
 .../{ => include}/kaldet/ILDVMeasLayer.h      |  0
 .../{ => include}/kaldet/ILDVTrackHit.h       |  0
 .../{ => include}/kaldet/ILDVXDKalDetector.h  |  0
 .../{ => include}/kaldet/LCTPCKalDetector.h   |  0
 .../{ => include}/kaldet/MaterialDataBase.h   |  0
 Utilities/KalTest/CMakeLists.txt              |  5 +++
 .../{ => include}/kaltest/KalTrackDim.h       |  0
 .../{ => include}/kaltest/TAttDrawable.h      |  0
 .../{ => include}/kaltest/TAttElement.h       |  0
 .../{ => include}/kaltest/TAttLockable.h      |  0
 .../KalTest/{ => include}/kaltest/TCircle.h   |  0
 .../KalTest/{ => include}/kaltest/TCutCone.h  |  0
 .../KalTest/{ => include}/kaltest/TCylinder.h |  0
 .../{ => include}/kaltest/THelicalTrack.h     |  0
 .../KalTest/{ => include}/kaltest/THype.h     |  0
 .../{ => include}/kaltest/TKalDetCradle.h     |  0
 .../{ => include}/kaltest/TKalFilterCond.h    |  0
 .../{ => include}/kaltest/TKalMatrix.h        |  0
 .../KalTest/{ => include}/kaltest/TKalTrack.h |  0
 .../{ => include}/kaltest/TKalTrackSite.h     |  0
 .../{ => include}/kaltest/TKalTrackState.h    |  0
 .../KalTest/{ => include}/kaltest/TPlane.h    |  0
 .../{ => include}/kaltest/TStraightTrack.h    |  0
 .../KalTest/{ => include}/kaltest/TTube.h     |  0
 .../KalTest/{ => include}/kaltest/TVCurve.h   |  0
 .../{ => include}/kaltest/TVKalDetector.h     |  0
 .../KalTest/{ => include}/kaltest/TVKalSite.h |  0
 .../{ => include}/kaltest/TVKalState.h        |  0
 .../{ => include}/kaltest/TVKalSystem.h       |  0
 .../{ => include}/kaltest/TVMeasLayer.h       |  0
 .../KalTest/{ => include}/kaltest/TVSolid.h   |  0
 .../KalTest/{ => include}/kaltest/TVSurface.h |  0
 .../KalTest/{ => include}/kaltest/TVTrack.h   |  0
 .../{ => include}/kaltest/TVTrackHit.h        |  0
 68 files changed, 26 insertions(+), 13 deletions(-)
 rename Utilities/KalDet/{ => include}/kaldet/EXEventGen.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/EXTPCHit.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/EXTPCKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/EXTPCMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/EXVKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/EXVMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/GearTPCCylinderHit.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/GearTPCCylinderMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/GearTPCHit.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/GearTPCKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/GearTPCMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDConeMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDCylinderHit.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDCylinderMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDDiscMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDFTDDiscBasedKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDFTDKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDMeasurementSurfaceStoreFiller.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDParallelPlanarMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDParallelPlanarStripMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDPlanarHit.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDPlanarMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDPlanarStripHit.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDPolygonBarrelMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDRotatedTrapMeaslayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDSETKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDSITCylinderKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDSITKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDSegmentedDiscMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDSegmentedDiscStripMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDSupportKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDTPCKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDVMeasLayer.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDVTrackHit.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/ILDVXDKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/LCTPCKalDetector.h (100%)
 rename Utilities/KalDet/{ => include}/kaldet/MaterialDataBase.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/KalTrackDim.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TAttDrawable.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TAttElement.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TAttLockable.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TCircle.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TCutCone.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TCylinder.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/THelicalTrack.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/THype.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TKalDetCradle.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TKalFilterCond.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TKalMatrix.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TKalTrack.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TKalTrackSite.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TKalTrackState.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TPlane.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TStraightTrack.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TTube.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVCurve.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVKalDetector.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVKalSite.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVKalState.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVKalSystem.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVMeasLayer.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVSolid.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVSurface.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVTrack.h (100%)
 rename Utilities/KalTest/{ => include}/kaltest/TVTrackHit.h (100%)

diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 0fbf58c2..14cc4bc9 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(DataHelper)
-# add_subdirectory(KalDet)
 add_subdirectory(KalTest)
+add_subdirectory(KalDet)
 # add_subdirectory(KiTrack)
 
diff --git a/Utilities/KalDet/CMakeLists.txt b/Utilities/KalDet/CMakeLists.txt
index f7843bd2..e85a9ccd 100644
--- a/Utilities/KalDet/CMakeLists.txt
+++ b/Utilities/KalDet/CMakeLists.txt
@@ -3,8 +3,6 @@
 #    Desc: import from ILCSoft
 ##############################################################################
 
-gaudi_subdir(KalDet v0r0)
-
 find_package(CLHEP REQUIRED;CONFIG)
 find_package(LCIO)
 find_package(GEAR)
@@ -12,21 +10,16 @@ find_package(ROOT COMPONENTS MathCore)
 find_package(EDM4HEP REQUIRED)
 find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
 
-gaudi_depends_on_subdirs(
-  Detector/DetInterface
-  Utilities/KalTest
-)
-
 get_target_property(to_incl KalTestLib SOURCE_DIR)
 if (to_incl)
-  LIST( APPEND DICT_INCLUDE_DIRS ${to_incl})
+  LIST( APPEND DICT_INCLUDE_DIRS ${to_incl}/include)
 else()
   message(FATAL_ERROR "Failed to get the source dir for package KalTestLib")
 endif()
 
 set( DICT_CINT_DEFINITIONS "HANDLE_DICT_EXCEPTIONS=IGNORED_FOR_CINT" )
 set( DICT_INPUT_DIRS gen kern lctpc/gearTPC )
-set( DICT_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rootdict )
+set( DICT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/rootdict )
 
 foreach( DICT_DIR ${DICT_INPUT_DIRS} )
   list( APPEND DICT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/${DICT_DIR} )
@@ -75,7 +68,22 @@ include_directories( ${DICT_INCLUDE_DIRS} )
 
 set( KalDetLib_srcs ${LIB_SOURCES} ${COMMON_SOURCES} )
 
-gaudi_add_library(KalDetLib ${KalDetLib_srcs}
-		 PUBLIC_HEADERS kaldet
-                 LINK_LIBRARIES GaudiKernel ROOT ${CLHEP_LIBRARIES} LCIO ${GEAR_LIBRARIES} KalTestLib EDM4HEP::edm4hep EDM4HEP::edm4hepDict ${DD4hep_COMPONENT_LIBRARIES}
+gaudi_add_library(KalDetLib
+                  SOURCES ${KalDetLib_srcs}
+                  LINK DetInterface
+                       KalTestLib
+                       Gaudi::GaudiKernel
+                       ${ROOT_LIBRARIES}
+                       ${CLHEP_LIBRARIES} 
+                       ${LCIO_LIBRARIES} 
+                       ${GEAR_LIBRARIES} 
+                       EDM4HEP::edm4hep EDM4HEP::edm4hepDict
+                       ${DD4hep_COMPONENT_LIBRARIES}
 )
+
+install(TARGETS KalDetLib
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)
+
diff --git a/Utilities/KalDet/kaldet/EXEventGen.h b/Utilities/KalDet/include/kaldet/EXEventGen.h
similarity index 100%
rename from Utilities/KalDet/kaldet/EXEventGen.h
rename to Utilities/KalDet/include/kaldet/EXEventGen.h
diff --git a/Utilities/KalDet/kaldet/EXTPCHit.h b/Utilities/KalDet/include/kaldet/EXTPCHit.h
similarity index 100%
rename from Utilities/KalDet/kaldet/EXTPCHit.h
rename to Utilities/KalDet/include/kaldet/EXTPCHit.h
diff --git a/Utilities/KalDet/kaldet/EXTPCKalDetector.h b/Utilities/KalDet/include/kaldet/EXTPCKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/EXTPCKalDetector.h
rename to Utilities/KalDet/include/kaldet/EXTPCKalDetector.h
diff --git a/Utilities/KalDet/kaldet/EXTPCMeasLayer.h b/Utilities/KalDet/include/kaldet/EXTPCMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/EXTPCMeasLayer.h
rename to Utilities/KalDet/include/kaldet/EXTPCMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/EXVKalDetector.h b/Utilities/KalDet/include/kaldet/EXVKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/EXVKalDetector.h
rename to Utilities/KalDet/include/kaldet/EXVKalDetector.h
diff --git a/Utilities/KalDet/kaldet/EXVMeasLayer.h b/Utilities/KalDet/include/kaldet/EXVMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/EXVMeasLayer.h
rename to Utilities/KalDet/include/kaldet/EXVMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/GearTPCCylinderHit.h b/Utilities/KalDet/include/kaldet/GearTPCCylinderHit.h
similarity index 100%
rename from Utilities/KalDet/kaldet/GearTPCCylinderHit.h
rename to Utilities/KalDet/include/kaldet/GearTPCCylinderHit.h
diff --git a/Utilities/KalDet/kaldet/GearTPCCylinderMeasLayer.h b/Utilities/KalDet/include/kaldet/GearTPCCylinderMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/GearTPCCylinderMeasLayer.h
rename to Utilities/KalDet/include/kaldet/GearTPCCylinderMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/GearTPCHit.h b/Utilities/KalDet/include/kaldet/GearTPCHit.h
similarity index 100%
rename from Utilities/KalDet/kaldet/GearTPCHit.h
rename to Utilities/KalDet/include/kaldet/GearTPCHit.h
diff --git a/Utilities/KalDet/kaldet/GearTPCKalDetector.h b/Utilities/KalDet/include/kaldet/GearTPCKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/GearTPCKalDetector.h
rename to Utilities/KalDet/include/kaldet/GearTPCKalDetector.h
diff --git a/Utilities/KalDet/kaldet/GearTPCMeasLayer.h b/Utilities/KalDet/include/kaldet/GearTPCMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/GearTPCMeasLayer.h
rename to Utilities/KalDet/include/kaldet/GearTPCMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDConeMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDConeMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDConeMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDConeMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDCylinderHit.h b/Utilities/KalDet/include/kaldet/ILDCylinderHit.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDCylinderHit.h
rename to Utilities/KalDet/include/kaldet/ILDCylinderHit.h
diff --git a/Utilities/KalDet/kaldet/ILDCylinderMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDCylinderMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDCylinderMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDCylinderMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDDiscMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDDiscMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDDiscMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDDiscMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDFTDDiscBasedKalDetector.h b/Utilities/KalDet/include/kaldet/ILDFTDDiscBasedKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDFTDDiscBasedKalDetector.h
rename to Utilities/KalDet/include/kaldet/ILDFTDDiscBasedKalDetector.h
diff --git a/Utilities/KalDet/kaldet/ILDFTDKalDetector.h b/Utilities/KalDet/include/kaldet/ILDFTDKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDFTDKalDetector.h
rename to Utilities/KalDet/include/kaldet/ILDFTDKalDetector.h
diff --git a/Utilities/KalDet/kaldet/ILDMeasurementSurfaceStoreFiller.h b/Utilities/KalDet/include/kaldet/ILDMeasurementSurfaceStoreFiller.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDMeasurementSurfaceStoreFiller.h
rename to Utilities/KalDet/include/kaldet/ILDMeasurementSurfaceStoreFiller.h
diff --git a/Utilities/KalDet/kaldet/ILDParallelPlanarMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDParallelPlanarMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDParallelPlanarMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDParallelPlanarMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDParallelPlanarStripMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDParallelPlanarStripMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDParallelPlanarStripMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDParallelPlanarStripMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDPlanarHit.h b/Utilities/KalDet/include/kaldet/ILDPlanarHit.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDPlanarHit.h
rename to Utilities/KalDet/include/kaldet/ILDPlanarHit.h
diff --git a/Utilities/KalDet/kaldet/ILDPlanarMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDPlanarMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDPlanarMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDPlanarMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDPlanarStripHit.h b/Utilities/KalDet/include/kaldet/ILDPlanarStripHit.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDPlanarStripHit.h
rename to Utilities/KalDet/include/kaldet/ILDPlanarStripHit.h
diff --git a/Utilities/KalDet/kaldet/ILDPolygonBarrelMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDPolygonBarrelMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDPolygonBarrelMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDPolygonBarrelMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDRotatedTrapMeaslayer.h b/Utilities/KalDet/include/kaldet/ILDRotatedTrapMeaslayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDRotatedTrapMeaslayer.h
rename to Utilities/KalDet/include/kaldet/ILDRotatedTrapMeaslayer.h
diff --git a/Utilities/KalDet/kaldet/ILDSETKalDetector.h b/Utilities/KalDet/include/kaldet/ILDSETKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDSETKalDetector.h
rename to Utilities/KalDet/include/kaldet/ILDSETKalDetector.h
diff --git a/Utilities/KalDet/kaldet/ILDSITCylinderKalDetector.h b/Utilities/KalDet/include/kaldet/ILDSITCylinderKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDSITCylinderKalDetector.h
rename to Utilities/KalDet/include/kaldet/ILDSITCylinderKalDetector.h
diff --git a/Utilities/KalDet/kaldet/ILDSITKalDetector.h b/Utilities/KalDet/include/kaldet/ILDSITKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDSITKalDetector.h
rename to Utilities/KalDet/include/kaldet/ILDSITKalDetector.h
diff --git a/Utilities/KalDet/kaldet/ILDSegmentedDiscMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDSegmentedDiscMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDSegmentedDiscMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDSegmentedDiscMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDSegmentedDiscStripMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDSegmentedDiscStripMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDSegmentedDiscStripMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDSegmentedDiscStripMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDSupportKalDetector.h b/Utilities/KalDet/include/kaldet/ILDSupportKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDSupportKalDetector.h
rename to Utilities/KalDet/include/kaldet/ILDSupportKalDetector.h
diff --git a/Utilities/KalDet/kaldet/ILDTPCKalDetector.h b/Utilities/KalDet/include/kaldet/ILDTPCKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDTPCKalDetector.h
rename to Utilities/KalDet/include/kaldet/ILDTPCKalDetector.h
diff --git a/Utilities/KalDet/kaldet/ILDVMeasLayer.h b/Utilities/KalDet/include/kaldet/ILDVMeasLayer.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDVMeasLayer.h
rename to Utilities/KalDet/include/kaldet/ILDVMeasLayer.h
diff --git a/Utilities/KalDet/kaldet/ILDVTrackHit.h b/Utilities/KalDet/include/kaldet/ILDVTrackHit.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDVTrackHit.h
rename to Utilities/KalDet/include/kaldet/ILDVTrackHit.h
diff --git a/Utilities/KalDet/kaldet/ILDVXDKalDetector.h b/Utilities/KalDet/include/kaldet/ILDVXDKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/ILDVXDKalDetector.h
rename to Utilities/KalDet/include/kaldet/ILDVXDKalDetector.h
diff --git a/Utilities/KalDet/kaldet/LCTPCKalDetector.h b/Utilities/KalDet/include/kaldet/LCTPCKalDetector.h
similarity index 100%
rename from Utilities/KalDet/kaldet/LCTPCKalDetector.h
rename to Utilities/KalDet/include/kaldet/LCTPCKalDetector.h
diff --git a/Utilities/KalDet/kaldet/MaterialDataBase.h b/Utilities/KalDet/include/kaldet/MaterialDataBase.h
similarity index 100%
rename from Utilities/KalDet/kaldet/MaterialDataBase.h
rename to Utilities/KalDet/include/kaldet/MaterialDataBase.h
diff --git a/Utilities/KalTest/CMakeLists.txt b/Utilities/KalTest/CMakeLists.txt
index 9adae9dc..907e9877 100644
--- a/Utilities/KalTest/CMakeLists.txt
+++ b/Utilities/KalTest/CMakeLists.txt
@@ -55,6 +55,11 @@ gaudi_add_library(KalTestLib
 		  LINK Gaudi::GaudiKernel
                        ${ROOT_LIBRARIES}
 )
+
+target_include_directories(KalTestLib PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/include
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
 install(TARGETS KalTestLib
   EXPORT CEPCSWTargets
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
diff --git a/Utilities/KalTest/kaltest/KalTrackDim.h b/Utilities/KalTest/include/kaltest/KalTrackDim.h
similarity index 100%
rename from Utilities/KalTest/kaltest/KalTrackDim.h
rename to Utilities/KalTest/include/kaltest/KalTrackDim.h
diff --git a/Utilities/KalTest/kaltest/TAttDrawable.h b/Utilities/KalTest/include/kaltest/TAttDrawable.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TAttDrawable.h
rename to Utilities/KalTest/include/kaltest/TAttDrawable.h
diff --git a/Utilities/KalTest/kaltest/TAttElement.h b/Utilities/KalTest/include/kaltest/TAttElement.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TAttElement.h
rename to Utilities/KalTest/include/kaltest/TAttElement.h
diff --git a/Utilities/KalTest/kaltest/TAttLockable.h b/Utilities/KalTest/include/kaltest/TAttLockable.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TAttLockable.h
rename to Utilities/KalTest/include/kaltest/TAttLockable.h
diff --git a/Utilities/KalTest/kaltest/TCircle.h b/Utilities/KalTest/include/kaltest/TCircle.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TCircle.h
rename to Utilities/KalTest/include/kaltest/TCircle.h
diff --git a/Utilities/KalTest/kaltest/TCutCone.h b/Utilities/KalTest/include/kaltest/TCutCone.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TCutCone.h
rename to Utilities/KalTest/include/kaltest/TCutCone.h
diff --git a/Utilities/KalTest/kaltest/TCylinder.h b/Utilities/KalTest/include/kaltest/TCylinder.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TCylinder.h
rename to Utilities/KalTest/include/kaltest/TCylinder.h
diff --git a/Utilities/KalTest/kaltest/THelicalTrack.h b/Utilities/KalTest/include/kaltest/THelicalTrack.h
similarity index 100%
rename from Utilities/KalTest/kaltest/THelicalTrack.h
rename to Utilities/KalTest/include/kaltest/THelicalTrack.h
diff --git a/Utilities/KalTest/kaltest/THype.h b/Utilities/KalTest/include/kaltest/THype.h
similarity index 100%
rename from Utilities/KalTest/kaltest/THype.h
rename to Utilities/KalTest/include/kaltest/THype.h
diff --git a/Utilities/KalTest/kaltest/TKalDetCradle.h b/Utilities/KalTest/include/kaltest/TKalDetCradle.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TKalDetCradle.h
rename to Utilities/KalTest/include/kaltest/TKalDetCradle.h
diff --git a/Utilities/KalTest/kaltest/TKalFilterCond.h b/Utilities/KalTest/include/kaltest/TKalFilterCond.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TKalFilterCond.h
rename to Utilities/KalTest/include/kaltest/TKalFilterCond.h
diff --git a/Utilities/KalTest/kaltest/TKalMatrix.h b/Utilities/KalTest/include/kaltest/TKalMatrix.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TKalMatrix.h
rename to Utilities/KalTest/include/kaltest/TKalMatrix.h
diff --git a/Utilities/KalTest/kaltest/TKalTrack.h b/Utilities/KalTest/include/kaltest/TKalTrack.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TKalTrack.h
rename to Utilities/KalTest/include/kaltest/TKalTrack.h
diff --git a/Utilities/KalTest/kaltest/TKalTrackSite.h b/Utilities/KalTest/include/kaltest/TKalTrackSite.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TKalTrackSite.h
rename to Utilities/KalTest/include/kaltest/TKalTrackSite.h
diff --git a/Utilities/KalTest/kaltest/TKalTrackState.h b/Utilities/KalTest/include/kaltest/TKalTrackState.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TKalTrackState.h
rename to Utilities/KalTest/include/kaltest/TKalTrackState.h
diff --git a/Utilities/KalTest/kaltest/TPlane.h b/Utilities/KalTest/include/kaltest/TPlane.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TPlane.h
rename to Utilities/KalTest/include/kaltest/TPlane.h
diff --git a/Utilities/KalTest/kaltest/TStraightTrack.h b/Utilities/KalTest/include/kaltest/TStraightTrack.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TStraightTrack.h
rename to Utilities/KalTest/include/kaltest/TStraightTrack.h
diff --git a/Utilities/KalTest/kaltest/TTube.h b/Utilities/KalTest/include/kaltest/TTube.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TTube.h
rename to Utilities/KalTest/include/kaltest/TTube.h
diff --git a/Utilities/KalTest/kaltest/TVCurve.h b/Utilities/KalTest/include/kaltest/TVCurve.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVCurve.h
rename to Utilities/KalTest/include/kaltest/TVCurve.h
diff --git a/Utilities/KalTest/kaltest/TVKalDetector.h b/Utilities/KalTest/include/kaltest/TVKalDetector.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVKalDetector.h
rename to Utilities/KalTest/include/kaltest/TVKalDetector.h
diff --git a/Utilities/KalTest/kaltest/TVKalSite.h b/Utilities/KalTest/include/kaltest/TVKalSite.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVKalSite.h
rename to Utilities/KalTest/include/kaltest/TVKalSite.h
diff --git a/Utilities/KalTest/kaltest/TVKalState.h b/Utilities/KalTest/include/kaltest/TVKalState.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVKalState.h
rename to Utilities/KalTest/include/kaltest/TVKalState.h
diff --git a/Utilities/KalTest/kaltest/TVKalSystem.h b/Utilities/KalTest/include/kaltest/TVKalSystem.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVKalSystem.h
rename to Utilities/KalTest/include/kaltest/TVKalSystem.h
diff --git a/Utilities/KalTest/kaltest/TVMeasLayer.h b/Utilities/KalTest/include/kaltest/TVMeasLayer.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVMeasLayer.h
rename to Utilities/KalTest/include/kaltest/TVMeasLayer.h
diff --git a/Utilities/KalTest/kaltest/TVSolid.h b/Utilities/KalTest/include/kaltest/TVSolid.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVSolid.h
rename to Utilities/KalTest/include/kaltest/TVSolid.h
diff --git a/Utilities/KalTest/kaltest/TVSurface.h b/Utilities/KalTest/include/kaltest/TVSurface.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVSurface.h
rename to Utilities/KalTest/include/kaltest/TVSurface.h
diff --git a/Utilities/KalTest/kaltest/TVTrack.h b/Utilities/KalTest/include/kaltest/TVTrack.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVTrack.h
rename to Utilities/KalTest/include/kaltest/TVTrack.h
diff --git a/Utilities/KalTest/kaltest/TVTrackHit.h b/Utilities/KalTest/include/kaltest/TVTrackHit.h
similarity index 100%
rename from Utilities/KalTest/kaltest/TVTrackHit.h
rename to Utilities/KalTest/include/kaltest/TVTrackHit.h
-- 
GitLab