From 649d26431677c95961567f0c483fcbe829c13678 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Wed, 11 Nov 2020 10:47:28 +0800
Subject: [PATCH] WIP: rename the K4FWCore to k4FWCore.

---
 CMakeLists.txt                                              | 2 +-
 Detector/GeomSvc/CMakeLists.txt                             | 2 +-
 Digitisers/DCHDigi/CMakeLists.txt                           | 4 ++--
 Digitisers/DCHDigi/src/DCHDigiAlg.h                         | 2 +-
 Digitisers/G2CDArbor/CMakeLists.txt                         | 6 +++---
 Digitisers/G2CDArbor/src/G2CDArborAlg.h                     | 2 +-
 Digitisers/SimpleDigi/CMakeLists.txt                        | 6 +++---
 Digitisers/SimpleDigi/src/PlanarDigiAlg.h                   | 2 +-
 Digitisers/SimpleDigi/src/TPCDigiAlg.h                      | 2 +-
 Examples/CMakeLists.txt                                     | 6 +++---
 Examples/src/DumpIDAlg/DumpIDAlg.h                          | 2 +-
 Examples/src/Edm4hepTest/Edm4hepReadAlg.h                   | 2 +-
 Examples/src/Edm4hepTest/Edm4hepWriteAlg.h                  | 2 +-
 Examples/src/PlcioTest/PlcioReadAlg.h                       | 2 +-
 Examples/src/PlcioTest/PlcioWriteAlg.h                      | 2 +-
 Generator/CMakeLists.txt                                    | 6 +++---
 Generator/src/GenAlgo.h                                     | 2 +-
 Reconstruction/Digi_Calo/CMakeLists.txt                     | 4 ++--
 Reconstruction/Digi_Calo/src/CaloDigiAlg.h                  | 2 +-
 Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt      | 4 ++--
 .../PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h         | 2 +-
 .../PFA/Pandora/GaudiPandora/include/PfoCreator.h           | 2 +-
 Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt     | 4 ++--
 .../PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h    | 2 +-
 .../PFA/Pandora/MatrixPandora/include/PfoCreator.h          | 2 +-
 Reconstruction/SiliconTracking/CMakeLists.txt               | 4 ++--
 Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h     | 2 +-
 Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h     | 2 +-
 Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h   | 2 +-
 Reconstruction/SiliconTracking/src/TrackSubsetAlg.h         | 2 +-
 Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h          | 2 +-
 Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp       | 2 +-
 .../Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h       | 2 +-
 Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h         | 2 +-
 Simulation/DetSimAna/src/ExampleAnaElemTool.h               | 2 +-
 Simulation/DetSimCore/CMakeLists.txt                        | 2 +-
 Simulation/DetSimCore/src/G4PrimaryCnvTool.h                | 2 +-
 Simulation/DetSimDedx/CMakeLists.txt                        | 2 +-
 Simulation/DetSimSD/CMakeLists.txt                          | 6 +++---
 Utilities/DataHelper/DataHelper/Navigation.h                | 2 --
 40 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5534af8..4e47f29f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,5 +15,5 @@ endif()
 
 gaudi_project(CEPCSW v0r1
               USE Gaudi v33r1 
-              USE K4FWCore v0r1
+              USE k4FWCore v0r1
 )
\ No newline at end of file
diff --git a/Detector/GeomSvc/CMakeLists.txt b/Detector/GeomSvc/CMakeLists.txt
index e9aefede..58c69f7e 100644
--- a/Detector/GeomSvc/CMakeLists.txt
+++ b/Detector/GeomSvc/CMakeLists.txt
@@ -7,7 +7,7 @@
 gaudi_subdir(GeomSvc v0r0)
 
 gaudi_depends_on_subdirs(
-    FWCore
+    k4FWCore
     Detector/DetInterface
 )
 
diff --git a/Digitisers/DCHDigi/CMakeLists.txt b/Digitisers/DCHDigi/CMakeLists.txt
index c777aa6f..fa9dc143 100644
--- a/Digitisers/DCHDigi/CMakeLists.txt
+++ b/Digitisers/DCHDigi/CMakeLists.txt
@@ -18,8 +18,8 @@ gaudi_depends_on_subdirs(
 )
 ## Modules
 gaudi_add_module(DCHDigi ${srcs}
-    INCLUDE_DIRS FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep ROOT 
-    LINK_LIBRARIES FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec ROOT DetSegmentation
+    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep ROOT 
+    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec ROOT DetSegmentation
     -Wl,--no-as-needed 
     EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.h b/Digitisers/DCHDigi/src/DCHDigiAlg.h
index 339f85ba..e7039982 100644
--- a/Digitisers/DCHDigi/src/DCHDigiAlg.h
+++ b/Digitisers/DCHDigi/src/DCHDigiAlg.h
@@ -1,7 +1,7 @@
 #ifndef DCH_DIGI_ALG_H
 #define DCH_DIGI_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiKernel/NTuple.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "edm4hep/SimTrackerHitCollection.h"
diff --git a/Digitisers/G2CDArbor/CMakeLists.txt b/Digitisers/G2CDArbor/CMakeLists.txt
index d1895d1c..cbc70cd8 100644
--- a/Digitisers/G2CDArbor/CMakeLists.txt
+++ b/Digitisers/G2CDArbor/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package(GEAR REQUIRED)
 find_package(GSL REQUIRED ) 
 find_package(LCIO REQUIRED ) 
 find_package(podio REQUIRED ) 
-find_package(K4FWCore REQUIRED)
+find_package(k4FWCore REQUIRED)
 
 message("EDM4HEP_INCLUDE_DIRS: ${EDM4HEP_INCLUDE_DIR}")
 message("EDM4HEP_LIB: ${EDM4HEP_LIBRARIES}")
@@ -22,7 +22,7 @@ set(G2CDArbor_srcs src/*.cpp)
 
 # Modules
 gaudi_add_module(G2CDArbor ${G2CDArbor_srcs}
-    INCLUDE_DIRS K4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES K4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES}
+    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES}
     EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
diff --git a/Digitisers/G2CDArbor/src/G2CDArborAlg.h b/Digitisers/G2CDArbor/src/G2CDArborAlg.h
index 35658c8b..28f436be 100644
--- a/Digitisers/G2CDArbor/src/G2CDArborAlg.h
+++ b/Digitisers/G2CDArbor/src/G2CDArborAlg.h
@@ -1,7 +1,7 @@
 #ifndef G2CDARBORALG_H
 #define G2CDARBORALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiKernel/Property.h"
 #include "edm4hep/EventHeader.h"
diff --git a/Digitisers/SimpleDigi/CMakeLists.txt b/Digitisers/SimpleDigi/CMakeLists.txt
index 39f60902..052a27df 100644
--- a/Digitisers/SimpleDigi/CMakeLists.txt
+++ b/Digitisers/SimpleDigi/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(GEAR REQUIRED)
 find_package(GSL REQUIRED ) 
 find_package(LCIO REQUIRED ) 
 find_package(podio REQUIRED ) 
-find_package(K4FWCore REQUIRED)
+find_package(k4FWCore REQUIRED)
 find_package(EDM4HEP REQUIRED)
 
 gaudi_depends_on_subdirs(
@@ -19,6 +19,6 @@ set(SimpleDigi_srcs src/*.cpp)
 
 # Modules
 gaudi_add_module(SimpleDigi ${SimpleDigi_srcs}
-    INCLUDE_DIRS K4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES K4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} EDM4HEP::edm4hep EDM4HEP::edm4hepDict DataHelperLib
+    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} EDM4HEP::edm4hep EDM4HEP::edm4hepDict DataHelperLib
 )
diff --git a/Digitisers/SimpleDigi/src/PlanarDigiAlg.h b/Digitisers/SimpleDigi/src/PlanarDigiAlg.h
index 30c2e091..668333f2 100644
--- a/Digitisers/SimpleDigi/src/PlanarDigiAlg.h
+++ b/Digitisers/SimpleDigi/src/PlanarDigiAlg.h
@@ -1,7 +1,7 @@
 #ifndef PLANAR_DIGI_ALG_H
 #define PLANAR_DIGI_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include <gsl/gsl_rng.h>
 #include "edm4hep/EventHeaderCollection.h"
diff --git a/Digitisers/SimpleDigi/src/TPCDigiAlg.h b/Digitisers/SimpleDigi/src/TPCDigiAlg.h
index a1dc6019..af0f6391 100644
--- a/Digitisers/SimpleDigi/src/TPCDigiAlg.h
+++ b/Digitisers/SimpleDigi/src/TPCDigiAlg.h
@@ -20,7 +20,7 @@ Steve Aplin 26 June 2009 (DESY)
 #define TPCDigiAlg_h 1
 
 #include "GaudiAlg/GaudiAlgorithm.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/SimTrackerHitCollection.h"
 #include "edm4hep/TrackerHitCollection.h"
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index 8a0ba749..e1145787 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(podio REQUIRED)
 #find_package(plcio REQUIRED)
 find_package(LCIO REQUIRED)
 find_package(EDM4HEP REQUIRED)
-find_package(K4FWCore REQUIRED)
+find_package(k4FWCore REQUIRED)
 find_package(DD4hep COMPONENTS DDRec DDParsers REQUIRED)
 
 gaudi_depends_on_subdirs(
@@ -27,8 +27,8 @@ gaudi_install_headers(Examples)
 
 # Modules
 gaudi_add_module(Examples ${Examples_srcs}
-    INCLUDE_DIRS K4FWCore GaudiAlgLib GaudiKernel ${podio_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES K4FWCore GaudiAlgLib GaudiKernel ${LCIO_LIBRARIES} 
+    INCLUDE_DIRS k4FWCore GaudiAlgLib GaudiKernel ${podio_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES k4FWCore GaudiAlgLib GaudiKernel ${LCIO_LIBRARIES} 
       DD4hep ${DD4hep_COMPONENT_LIBRARIES}
       # Force loading the libraries.
       -Wl,--no-as-needed EDM4HEP::edm4hep EDM4HEP::edm4hepDict ${podio_LIBRARIES} podio::podioRootIO -Wl,--as-needed
diff --git a/Examples/src/DumpIDAlg/DumpIDAlg.h b/Examples/src/DumpIDAlg/DumpIDAlg.h
index 9680d2b2..8fe376d8 100644
--- a/Examples/src/DumpIDAlg/DumpIDAlg.h
+++ b/Examples/src/DumpIDAlg/DumpIDAlg.h
@@ -1,7 +1,7 @@
 #ifndef DumpIDAlg_h
 #define DumpIDAlg_h
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiKernel/NTuple.h"
 
diff --git a/Examples/src/Edm4hepTest/Edm4hepReadAlg.h b/Examples/src/Edm4hepTest/Edm4hepReadAlg.h
index 8a194a64..bbf398b9 100644
--- a/Examples/src/Edm4hepTest/Edm4hepReadAlg.h
+++ b/Examples/src/Edm4hepTest/Edm4hepReadAlg.h
@@ -1,7 +1,7 @@
 #ifndef TEST_EDM4HEP_WRITE_ALG_H
 #define TEST_EDM4HEP_WRITE_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 namespace edm4hep {
diff --git a/Examples/src/Edm4hepTest/Edm4hepWriteAlg.h b/Examples/src/Edm4hepTest/Edm4hepWriteAlg.h
index 2d980885..db303fb3 100644
--- a/Examples/src/Edm4hepTest/Edm4hepWriteAlg.h
+++ b/Examples/src/Edm4hepTest/Edm4hepWriteAlg.h
@@ -1,7 +1,7 @@
 #ifndef TEST_EDM4HEP_WRITE_ALG_H
 #define TEST_EDM4HEP_WRITE_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 namespace edm4hep {
diff --git a/Examples/src/PlcioTest/PlcioReadAlg.h b/Examples/src/PlcioTest/PlcioReadAlg.h
index f5aba7dc..94de007f 100644
--- a/Examples/src/PlcioTest/PlcioReadAlg.h
+++ b/Examples/src/PlcioTest/PlcioReadAlg.h
@@ -1,7 +1,7 @@
 #ifndef TEST_PLCIO_WRITE_ALG_H
 #define TEST_PLCIO_WRITE_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 namespace plcio {
diff --git a/Examples/src/PlcioTest/PlcioWriteAlg.h b/Examples/src/PlcioTest/PlcioWriteAlg.h
index 377173d0..47132382 100644
--- a/Examples/src/PlcioTest/PlcioWriteAlg.h
+++ b/Examples/src/PlcioTest/PlcioWriteAlg.h
@@ -1,7 +1,7 @@
 #ifndef TEST_PLCIO_WRITE_ALG_H
 #define TEST_PLCIO_WRITE_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 namespace plcio {
diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt
index 435b84d9..7eb4c9ca 100644
--- a/Generator/CMakeLists.txt
+++ b/Generator/CMakeLists.txt
@@ -24,7 +24,7 @@ find_package(podio)
 find_package(EDM4HEP)
 find_package(HepMC)
 find_package(CLHEP REQUIRED;CONFIG)
-find_package(K4FWCore REQUIRED)
+find_package(k4FWCore REQUIRED)
 
 if(ROOT_FOUND)
     message("found ROOT: ${ROOT_INCLUDE_DIRS} ${ROOT_LIBRARIES}")
@@ -46,10 +46,10 @@ INCLUDE_DIRECTORIES(${GenAlgo_incs})
 
 gaudi_add_module(GenAlgo ${GenAlgo_srcs} 
   INCLUDE_DIRS 
-    K4FWCore
+    k4FWCore
   LINK_LIBRARIES 
     ROOT
-    K4FWCore 
+    k4FWCore 
     GaudiAlgLib GaudiKernel
     HepMC
     CLHEP
diff --git a/Generator/src/GenAlgo.h b/Generator/src/GenAlgo.h
index 47745aef..cd267453 100644
--- a/Generator/src/GenAlgo.h
+++ b/Generator/src/GenAlgo.h
@@ -7,7 +7,7 @@
 #include <GaudiKernel/ToolHandle.h>
 
 #include "GaudiAlg/GaudiAlgorithm.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 
 #include "GenEvent.h"
 
diff --git a/Reconstruction/Digi_Calo/CMakeLists.txt b/Reconstruction/Digi_Calo/CMakeLists.txt
index b61ef295..179346ca 100644
--- a/Reconstruction/Digi_Calo/CMakeLists.txt
+++ b/Reconstruction/Digi_Calo/CMakeLists.txt
@@ -19,8 +19,8 @@ gaudi_depends_on_subdirs(
 )
 ## Modules
 gaudi_add_module(Digi_Calo ${srcs}
-    INCLUDE_DIRS FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep 
-    LINK_LIBRARIES FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec
+    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep 
+    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec
     -Wl,--no-as-needed 
     EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
diff --git a/Reconstruction/Digi_Calo/src/CaloDigiAlg.h b/Reconstruction/Digi_Calo/src/CaloDigiAlg.h
index 2142018c..9bfd5e3b 100644
--- a/Reconstruction/Digi_Calo/src/CaloDigiAlg.h
+++ b/Reconstruction/Digi_Calo/src/CaloDigiAlg.h
@@ -1,7 +1,7 @@
 #ifndef Calo_DIGI_ALG_H
 #define Calo_DIGI_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "edm4hep/SimCalorimeterHitConst.h"
 #include "edm4hep/SimCalorimeterHit.h"
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
index c01c5ecf..7b07fd67 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
@@ -39,8 +39,8 @@ set(dir_srcs
 set(dir_include include)
 # Modules
 gaudi_add_module(GaudiPandora ${dir_srcs}
-    INCLUDE_DIRS ${dir_include} GaudiKernel FWCore CLHEP  ${LCIO_INCLUDE_DIRS} ROOT gear DD4hep 
-    LINK_LIBRARIES GaudiKernel FWCore CLHEP ROOT ${LCIO_LIBRARIES} ${GEAR_LIBRARIES} DataHelperLib DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec 
+    INCLUDE_DIRS ${dir_include} GaudiKernel k4FWCore CLHEP  ${LCIO_INCLUDE_DIRS} ROOT gear DD4hep 
+    LINK_LIBRARIES GaudiKernel k4FWCore CLHEP ROOT ${LCIO_LIBRARIES} ${GEAR_LIBRARIES} DataHelperLib DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec 
       -Wl,--no-as-needed 
       EDM4HEP::edm4hep EDM4HEP::edm4hepDict
       -Wl,--as-needed 
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h b/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h
index 3f029fe3..1e9c4075 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h
@@ -1,7 +1,7 @@
 #ifndef PandoraPFAlg_H
 #define PandoraPFAlg_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 //#include <gsl/gsl_rng.h>
 #include "edm4hep/ClusterCollection.h"
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h b/Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h
index 5b8942ce..ed69d778 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h
@@ -7,7 +7,7 @@
 #ifndef PFO_CREATOR_H
 #define PFO_CREATOR_H 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "edm4hep/Vector3f.h"
 #include "edm4hep/ClusterCollection.h"
 #include "edm4hep/Cluster.h"
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt b/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
index c8a76314..16cd82d2 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
@@ -37,8 +37,8 @@ set(dir_srcs
 set(dir_include include)
 # Modules
 gaudi_add_module(MatrixPandora ${dir_srcs}
-    INCLUDE_DIRS ${dir_include} GaudiKernel FWCore ${CLHEP_INCLUDE_DIR}  ${LCIO_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} gear DD4hep  
-    LINK_LIBRARIES GaudiKernel FWCore ${CLHEP_LIBRARIES} ROOT ${LCIO_LIBRARIES} ${GEAR_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec DataHelperLib
+    INCLUDE_DIRS ${dir_include} GaudiKernel k4FWCore ${CLHEP_INCLUDE_DIR}  ${LCIO_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} gear DD4hep  
+    LINK_LIBRARIES GaudiKernel k4FWCore ${CLHEP_LIBRARIES} ROOT ${LCIO_LIBRARIES} ${GEAR_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec DataHelperLib
       -Wl,--no-as-needed 
       EDM4HEP::edm4hep EDM4HEP::edm4hepDict
       -Wl,--as-needed 
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h b/Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h
index 41c0e809..1c1c9631 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h
@@ -1,7 +1,7 @@
 #ifndef PandoraMatrixAlg_H
 #define PandoraMatrixAlg_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include <gsl/gsl_rng.h>
 #include "edm4hep/ClusterCollection.h"
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h b/Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h
index 2cc8d632..7739c1e1 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h
@@ -8,7 +8,7 @@
 #ifndef PFO_CREATOR_H
 #define PFO_CREATOR_H 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "edm4hep/Vector3f.h"
 #include "edm4hep/ClusterCollection.h"
 #include "edm4hep/Cluster.h"
diff --git a/Reconstruction/SiliconTracking/CMakeLists.txt b/Reconstruction/SiliconTracking/CMakeLists.txt
index 025f3449..32864bf2 100644
--- a/Reconstruction/SiliconTracking/CMakeLists.txt
+++ b/Reconstruction/SiliconTracking/CMakeLists.txt
@@ -18,6 +18,6 @@ set(SiliconTracking_srcs src/*.cpp)
 
 # Modules
 gaudi_add_module(SiliconTracking ${SiliconTracking_srcs}
-    INCLUDE_DIRS GaudiKernel FWCore gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES TrackSystemSvcLib DataHelperLib KiTrackLib GaudiKernel FWCore ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} 
+    INCLUDE_DIRS GaudiKernel k4FWCore gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES TrackSystemSvcLib DataHelperLib KiTrackLib GaudiKernel k4FWCore ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} 
 )
diff --git a/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h b/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h
index 8e9e2229..2accf404 100644
--- a/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h
+++ b/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h
@@ -1,7 +1,7 @@
 #ifndef ForwardTracking_h
 #define ForwardTracking_h 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h
index 9f21225c..cbf2c24b 100644
--- a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h
+++ b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h
@@ -3,7 +3,7 @@
 
 //#include "marlin/Processor.h"
 //#include <marlin/Global.h>
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h b/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h
index 6f731e62..e455527c 100644
--- a/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h
+++ b/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h
@@ -1,7 +1,7 @@
 #ifndef SpacePointBuilder_h
 #define SpacePointBuilder_h 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 //#include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Reconstruction/SiliconTracking/src/TrackSubsetAlg.h b/Reconstruction/SiliconTracking/src/TrackSubsetAlg.h
index 5676d977..c6e59d81 100644
--- a/Reconstruction/SiliconTracking/src/TrackSubsetAlg.h
+++ b/Reconstruction/SiliconTracking/src/TrackSubsetAlg.h
@@ -1,7 +1,7 @@
 #ifndef TrackSubsetAlg_h
 #define TrackSubsetAlg_h 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 #include "edm4hep/TrackCollection.h"
diff --git a/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h b/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h
index 7cdbb0f4..fc680dc2 100644
--- a/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h
+++ b/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h
@@ -2,7 +2,7 @@
 #define ClupatraProcessor_h 1
 
 #include "assert.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GearSvc/IGearSvc.h"
 #include "TrackSystemSvc/ITrackSystemSvc.h"
 
diff --git a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
index 0751a4d0..d4d58ade 100644
--- a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
+++ b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
@@ -16,7 +16,7 @@
 #include "IMPL/TrackerHitImpl.h"
 #include "IMPL/TrackStateImpl.h"
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "GearSvc/IGearSvc.h"
 using namespace MarlinTrk ;
diff --git a/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h b/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h
index 1053e327..cf3e174a 100755
--- a/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h
+++ b/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h
@@ -1,7 +1,7 @@
 #ifndef FULLLDCTRACKING_H
 #define FULLLDCTRACKING_H 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "GearSvc/IGearSvc.h"
 #include "TrackSystemSvc/ITrackSystemSvc.h"
diff --git a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
index 17a9d518..746c2a4b 100644
--- a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
+++ b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
@@ -4,7 +4,7 @@
 #include <map>
 
 #include "GaudiKernel/AlgTool.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "DetSimInterface/IAnaElemTool.h"
 
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Simulation/DetSimAna/src/ExampleAnaElemTool.h b/Simulation/DetSimAna/src/ExampleAnaElemTool.h
index 6b885e3a..cdf5e2b2 100644
--- a/Simulation/DetSimAna/src/ExampleAnaElemTool.h
+++ b/Simulation/DetSimAna/src/ExampleAnaElemTool.h
@@ -2,7 +2,7 @@
 #define ExampleAnaElemTool_h
 
 #include "GaudiKernel/AlgTool.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "DetSimInterface/IAnaElemTool.h"
 
 #include "plcio/MCParticleCollection.h"
diff --git a/Simulation/DetSimCore/CMakeLists.txt b/Simulation/DetSimCore/CMakeLists.txt
index bf58dded..49ee4777 100644
--- a/Simulation/DetSimCore/CMakeLists.txt
+++ b/Simulation/DetSimCore/CMakeLists.txt
@@ -2,7 +2,7 @@
 gaudi_subdir(DetSimCore v0r0)
 
 gaudi_depends_on_subdirs(
-    FWCore
+    k4FWCore
     Simulation/DetSimInterface
 )
 
diff --git a/Simulation/DetSimCore/src/G4PrimaryCnvTool.h b/Simulation/DetSimCore/src/G4PrimaryCnvTool.h
index ed0fd4b5..09f724ee 100644
--- a/Simulation/DetSimCore/src/G4PrimaryCnvTool.h
+++ b/Simulation/DetSimCore/src/G4PrimaryCnvTool.h
@@ -3,7 +3,7 @@
 
 #include "GaudiKernel/AlgTool.h"
 #include "DetSimInterface/IG4PrimaryCnvTool.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Simulation/DetSimDedx/CMakeLists.txt b/Simulation/DetSimDedx/CMakeLists.txt
index 824c35b3..69e83034 100644
--- a/Simulation/DetSimDedx/CMakeLists.txt
+++ b/Simulation/DetSimDedx/CMakeLists.txt
@@ -1,7 +1,7 @@
 gaudi_subdir(DetSimDedx v0r0)
 
 gaudi_depends_on_subdirs(
-    FWCore
+    k4FWCore
     Simulation/DetSimInterface
 )
 
diff --git a/Simulation/DetSimSD/CMakeLists.txt b/Simulation/DetSimSD/CMakeLists.txt
index d917ecef..1828c1e1 100644
--- a/Simulation/DetSimSD/CMakeLists.txt
+++ b/Simulation/DetSimSD/CMakeLists.txt
@@ -2,7 +2,7 @@
 gaudi_subdir(DetSimSD v0r0)
 
 gaudi_depends_on_subdirs(
-    FWCore
+    k4FWCore
     Detector/DetInterface
     Simulation/DetSimInterface
 )
@@ -24,13 +24,13 @@ set(DetSimSD_srcs
 gaudi_add_module(DetSimSD ${DetSimSD_srcs}
     INCLUDE_DIRS
       # DetSimInterface
-      # FWCore
+      # k4FWCore
       # DD4hep
       # GaudiKernel
       # Geant4 
     LINK_LIBRARIES
       # DetSimInterface
-      # FWCore
+      # k4FWCore
       DD4hep
       ${DD4hep_COMPONENT_LIBRARIES} 
       GaudiKernel
diff --git a/Utilities/DataHelper/DataHelper/Navigation.h b/Utilities/DataHelper/DataHelper/Navigation.h
index a4870ba9..e3aadc88 100644
--- a/Utilities/DataHelper/DataHelper/Navigation.h
+++ b/Utilities/DataHelper/DataHelper/Navigation.h
@@ -1,8 +1,6 @@
 #ifndef Navigation_h
 #define Navigation_h
 
-//#include "FWCore/DataHandle.h"
-//#include "podio/CollectionBase.h"
 #include "edm4hep/MCRecoTrackerAssociationCollection.h"
 #include "edm4hep/TrackerHitCollection.h"
 #include <map>
-- 
GitLab