From 79a6a8a717544744fc3b6c75562388d22e2765b8 Mon Sep 17 00:00:00 2001 From: myliu <201916234@mail.sdu.edu.cn> Date: Wed, 10 Feb 2021 17:17:04 +0800 Subject: [PATCH] move the fast simulation model under CEPCSW/Simulation/DetSimFastModel --- Simulation/CMakeLists.txt | 1 - Simulation/DetSimFastEcal/CMakeLists.txt | 13 ------------- Simulation/DetSimFastModel/CMakeLists.txt | 2 ++ .../src/EcalFastSimG4Model.cpp | 0 .../src/EcalFastSimG4Model.h | 0 .../src/EcalFastSimG4Tool.cpp | 0 .../src/EcalFastSimG4Tool.h | 0 7 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 Simulation/DetSimFastEcal/CMakeLists.txt rename Simulation/{DetSimFastEcal => DetSimFastModel}/src/EcalFastSimG4Model.cpp (100%) rename Simulation/{DetSimFastEcal => DetSimFastModel}/src/EcalFastSimG4Model.h (100%) rename Simulation/{DetSimFastEcal => DetSimFastModel}/src/EcalFastSimG4Tool.cpp (100%) rename Simulation/{DetSimFastEcal => DetSimFastModel}/src/EcalFastSimG4Tool.h (100%) diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt index 11a935cb..3ce6540c 100644 --- a/Simulation/CMakeLists.txt +++ b/Simulation/CMakeLists.txt @@ -3,7 +3,6 @@ add_subdirectory(DetSimAna) add_subdirectory(DetSimCore) add_subdirectory(DetSimDedx) add_subdirectory(DetSimFastModel) -add_subdirectory(DetSimFastEcal) add_subdirectory(DetSimGeom) add_subdirectory(DetSimInterface) add_subdirectory(DetSimSD) diff --git a/Simulation/DetSimFastEcal/CMakeLists.txt b/Simulation/DetSimFastEcal/CMakeLists.txt deleted file mode 100644 index 5b16718e..00000000 --- a/Simulation/DetSimFastEcal/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ - -find_package(Geant4 REQUIRED ui_all vis_all) -include(${Geant4_USE_FILE}) - - -gaudi_add_module(DetSimFastEcal - SOURCES src/EcalFastSimG4Tool.cpp - src/EcalFastSimG4Model.cpp - LINK DetSimInterface - ${DD4hep_COMPONENT_LIBRARIES} - Gaudi::GaudiKernel -) - diff --git a/Simulation/DetSimFastModel/CMakeLists.txt b/Simulation/DetSimFastModel/CMakeLists.txt index 50ceb1e3..30dced2b 100644 --- a/Simulation/DetSimFastModel/CMakeLists.txt +++ b/Simulation/DetSimFastModel/CMakeLists.txt @@ -6,6 +6,8 @@ include(${Geant4_USE_FILE}) gaudi_add_module(DetSimFastModel SOURCES src/DummyFastSimG4Tool.cpp src/DummyFastSimG4Model.cpp + src/EcalFastSimG4Model.cpp + src/EcalFastSimG4Tool.cpp LINK DetSimInterface ${DD4hep_COMPONENT_LIBRARIES} Gaudi::GaudiKernel diff --git a/Simulation/DetSimFastEcal/src/EcalFastSimG4Model.cpp b/Simulation/DetSimFastModel/src/EcalFastSimG4Model.cpp similarity index 100% rename from Simulation/DetSimFastEcal/src/EcalFastSimG4Model.cpp rename to Simulation/DetSimFastModel/src/EcalFastSimG4Model.cpp diff --git a/Simulation/DetSimFastEcal/src/EcalFastSimG4Model.h b/Simulation/DetSimFastModel/src/EcalFastSimG4Model.h similarity index 100% rename from Simulation/DetSimFastEcal/src/EcalFastSimG4Model.h rename to Simulation/DetSimFastModel/src/EcalFastSimG4Model.h diff --git a/Simulation/DetSimFastEcal/src/EcalFastSimG4Tool.cpp b/Simulation/DetSimFastModel/src/EcalFastSimG4Tool.cpp similarity index 100% rename from Simulation/DetSimFastEcal/src/EcalFastSimG4Tool.cpp rename to Simulation/DetSimFastModel/src/EcalFastSimG4Tool.cpp diff --git a/Simulation/DetSimFastEcal/src/EcalFastSimG4Tool.h b/Simulation/DetSimFastModel/src/EcalFastSimG4Tool.h similarity index 100% rename from Simulation/DetSimFastEcal/src/EcalFastSimG4Tool.h rename to Simulation/DetSimFastModel/src/EcalFastSimG4Tool.h -- GitLab