From 5cb1a80b3a5437169b4f59efc4fa31946aeede51 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Tue, 22 Dec 2020 23:42:38 +0800
Subject: [PATCH] WIP: migrate DetSimInterface.
---
CMakeLists.txt | 3 +++
Simulation/CMakeLists.txt | 8 ++++++++
Simulation/DetSimInterface/CMakeLists.txt | 10 ++++------
.../{ => include}/DetSimInterface/IAnaElemTool.h | 0
.../{ => include}/DetSimInterface/IDedxSimTool.h | 0
.../{ => include}/DetSimInterface/IDetElemTool.h | 0
.../{ => include}/DetSimInterface/IDetSimSvc.h | 0
.../{ => include}/DetSimInterface/IFastSimG4Tool.h | 0
.../{ => include}/DetSimInterface/IG4PrimaryCnvTool.h | 0
.../{ => include}/DetSimInterface/ISensDetTool.h | 0
10 files changed, 15 insertions(+), 6 deletions(-)
create mode 100644 Simulation/CMakeLists.txt
rename Simulation/DetSimInterface/{ => include}/DetSimInterface/IAnaElemTool.h (100%)
rename Simulation/DetSimInterface/{ => include}/DetSimInterface/IDedxSimTool.h (100%)
rename Simulation/DetSimInterface/{ => include}/DetSimInterface/IDetElemTool.h (100%)
rename Simulation/DetSimInterface/{ => include}/DetSimInterface/IDetSimSvc.h (100%)
rename Simulation/DetSimInterface/{ => include}/DetSimInterface/IFastSimG4Tool.h (100%)
rename Simulation/DetSimInterface/{ => include}/DetSimInterface/IG4PrimaryCnvTool.h (100%)
rename Simulation/DetSimInterface/{ => include}/DetSimInterface/ISensDetTool.h (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9b1e729..778bd330 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,9 @@ add_subdirectory(Detector)
# add_subdirectory(Digitisers)
# add_subdirectory(Examples)
add_subdirectory(Generator)
+# add_subdirectory(Reconstruction)
+add_subdirectory(Simulation)
+# add_subdirectory(Utilities)
##############################################################################
# INSTALL
diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt
new file mode 100644
index 00000000..6cb2318c
--- /dev/null
+++ b/Simulation/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+#add_subdirectory(DetSimAna)
+#add_subdirectory(DetSimCore)
+#add_subdirectory(DetSimDedx)
+#add_subdirectory(DetSimFastModel)
+#add_subdirectory(DetSimGeom)
+add_subdirectory(DetSimInterface)
+#add_subdirectory(DetSimSD)
diff --git a/Simulation/DetSimInterface/CMakeLists.txt b/Simulation/DetSimInterface/CMakeLists.txt
index 8950d300..ce48e904 100644
--- a/Simulation/DetSimInterface/CMakeLists.txt
+++ b/Simulation/DetSimInterface/CMakeLists.txt
@@ -1,15 +1,13 @@
-gaudi_subdir(DetSimInterface v0r0)
-
-gaudi_depends_on_subdirs(GaudiKernel)
# DetSimInterface (headers only)
set(DetSimInterface_srcs
src/IDetSimSvc.cpp
)
-gaudi_add_library(DetSimInterface ${DetSimInterface_srcs}
- PUBLIC_HEADERS DetSimInterface
- LINK_LIBRARIES GaudiKernel
+gaudi_add_library(DetSimInterface
+ SOURCES ${DetSimInterface_srcs}
+ LINK Gaudi::GaudiKernel
)
+
diff --git a/Simulation/DetSimInterface/DetSimInterface/IAnaElemTool.h b/Simulation/DetSimInterface/include/DetSimInterface/IAnaElemTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IAnaElemTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IAnaElemTool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IDedxSimTool.h b/Simulation/DetSimInterface/include/DetSimInterface/IDedxSimTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IDedxSimTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IDedxSimTool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IDetElemTool.h b/Simulation/DetSimInterface/include/DetSimInterface/IDetElemTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IDetElemTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IDetElemTool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IDetSimSvc.h b/Simulation/DetSimInterface/include/DetSimInterface/IDetSimSvc.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IDetSimSvc.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IDetSimSvc.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IFastSimG4Tool.h b/Simulation/DetSimInterface/include/DetSimInterface/IFastSimG4Tool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IFastSimG4Tool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IFastSimG4Tool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/IG4PrimaryCnvTool.h b/Simulation/DetSimInterface/include/DetSimInterface/IG4PrimaryCnvTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/IG4PrimaryCnvTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/IG4PrimaryCnvTool.h
diff --git a/Simulation/DetSimInterface/DetSimInterface/ISensDetTool.h b/Simulation/DetSimInterface/include/DetSimInterface/ISensDetTool.h
similarity index 100%
rename from Simulation/DetSimInterface/DetSimInterface/ISensDetTool.h
rename to Simulation/DetSimInterface/include/DetSimInterface/ISensDetTool.h
--
GitLab