Port DDCaloDigi to Gaudi

CMakeLists.txt

@@ -38,6 +38,7 @@ find_package(PandoraSDK)
 find_package(LCContent)
 find_package(Gaudi)
 find_package(DD4hep)
+find_package(CLHEP REQUIRED)
 
 #---------------------------------------------------------------
 
@@ -53,6 +54,37 @@ endif()
 
 include(CTest)
 
+
+#---RPATH options-------------------------------------------------------------------------------
+option(K4GAUDIPANDORA_SET_RPATH "Link libraries with built-in RPATH (run-time search path)" ON)
+
+#  When building, don't use the install RPATH already (but later on when installing)
+set(CMAKE_SKIP_BUILD_RPATH FALSE)           # don't skip the full RPATH for the build tree
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)   # use always the build RPATH for the build tree
+set(CMAKE_MACOSX_RPATH TRUE)                # use RPATH for MacOSX
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # point to directories outside the build tree to the install RPATH
+
+# Check whether to add RPATH to the installation (the build tree always has the RPATH enabled)
+if(APPLE)
+  set(CMAKE_INSTALL_NAME_DIR "@rpath")
+  set(CMAKE_INSTALL_RPATH "@loader_path/../lib")    # self relative LIBDIR
+  # the RPATH to be used when installing, but only if it's not a system directory
+  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+  if("${isSystemDir}" STREQUAL "-1")
+    set(CMAKE_INSTALL_RPATH "@loader_path/../lib")
+  endif("${isSystemDir}" STREQUAL "-1")
+elseif(K4GAUDIPANDORA_SET_RPATH)
+  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") # install LIBDIR
+  # the RPATH to be used when installing, but only if it's not a system directory
+  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+  if("${isSystemDir}" STREQUAL "-1")
+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  endif("${isSystemDir}" STREQUAL "-1")
+else()
+  set(CMAKE_SKIP_INSTALL_RPATH TRUE)           # skip the full RPATH for the install tree
+endif()
+
+
 add_subdirectory(k4GaudiPandora)
 
 include(cmake/CreateProjectConfig.cmake)

k4GaudiPandora/CMakeLists.txt

@@ -21,15 +21,15 @@ set(_plugin_sources ${CMAKE_CURRENT_LIST_DIR}/
 					# src/components/*.cpp
 					src/CalorimeterHitType.cc
 					# src/DDBFieldPlugin.cc
-					# src/DDCaloDigi.cc
+					src/DDCaloDigi.cc
 					# src/DDCaloHitCreator.cc
 					# src/DDExternalClusteringAlgorithm.cc
 					# src/DDGeometryCreator.cc
 					# src/DDMCParticleCreator.cc
 					# src/DDPandoraPFANewProcessor.cc
 					# src/DDPfoCreator.cc
-					# src/DDScintillatorPpdDigi.cc
-					src/DDSimpleMuonDigi.cc
+					src/DDScintillatorPpdDigi.cc
+					# src/DDSimpleMuonDigi.cc
 					# src/DDTrackCreatorBase.cc
 					# src/DDTrackCreatorCLIC.cc
 					# src/DDTrackCreatorILD.cc
@@ -42,6 +42,7 @@ gaudi_add_module(k4GaudiPandoraPlugins
                       EDM4HEP::edm4hep
                       DD4hep::DDRec
                       DD4hep::DDCore
+                      CLHEP::CLHEP
                       )
 target_include_directories(k4GaudiPandoraPlugins PRIVATE include)
 install(TARGETS k4GaudiPandoraPlugins