better inheritance of G4GDMLWriters

rat-pac · Jan 8, 2025 · 3c8a7a7 · 3c8a7a7
1 parent 84c4c26
commit 3c8a7a7
Show file tree

Hide file tree

Showing 15 changed files with 127 additions and 3,014 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -26,9 +26,11 @@ add_subdirectory(ratbase)
 
 # RAT shared library
 add_library(RATPAC SHARED)
-target_link_libraries(RATPAC PUBLIC 
+target_link_libraries(RATPAC PUBLIC
   ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${CRY_LIBRARIES} ${TENSORFLOW_LIBRARIES}
   cmd core daq db ds fit gen geo io physics ratbase stlplus util RATDict)
+target_include_directories(RATPAC PUBLIC ${CLHEP_INCLUDE_DIRS})
+message("Including ${CLHEP_INCLUDE_DIRS}")
 
 
 ### Target: library for ROOT

diff --git a/src/geo/CMakeLists.txt b/src/geo/CMakeLists.txt
@@ -47,12 +47,7 @@ add_library(geo OBJECT
         src/WaterBoxConstruction.cc
         src/WLSPFactory.cc
         src/WLSPCoverFactory.cc
-        src/gdml/GDMLMessenger.cc
-        src/gdml/GDMLParser.cc
-        src/gdml/GDMLWriteParamvol.cc
-        src/gdml/GDMLWriteSolids.cc
-        src/gdml/GDMLWriteSetup.cc
-        src/gdml/GDMLWriteStructure.cc
+        src/GDMLWriteStructure.cc
         src/pmt/CubicPMTConstruction.cc
         src/pmt/LAPPDConstruction.cc
         src/pmt/PMTArrayFactory.cc

diff --git a/src/geo/include/RAT/GDMLParser.hh b/src/geo/include/RAT/GDMLParser.hh
diff --git a/src/geo/include/RAT/GDMLWriteParamvol.hh b/src/geo/include/RAT/GDMLWriteParamvol.hh
diff --git a/src/geo/include/RAT/GDMLWriteSetup.hh b/src/geo/include/RAT/GDMLWriteSetup.hh