Remove TestEM3, add test for example1

apt-sim · Mar 14, 2024 · c5cce6e · c5cce6e
1 parent 57e3d5e
commit c5cce6e
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 1,642 deletions.
diff --git a/README.md b/README.md
@@ -127,19 +127,6 @@ target_link_libraries(example_target <SCOPE>
                       ${AdePT_LIBRARIES})
 ```
 
-### Targets dependent on vecgeomcuda
-
-When using AdePT_LIBRARIES we are linking against the library AdePT::AdePT_cuda, which in turn links to the static library VecGeom::vecgeomcuda_static. For most purposes this will be fine, however, in case the final executable uses some feature from vecgeomcuda and needs to link against it, this aproach will not work.
-
-In order to address this we provide AdePT::AdePT_cuda_standalone, which links with the shared VecGeom::vecgeomcuda. This allows the final executable to correctly link with VecGeom::vecgeomcuda_static. This library is provided as part of AdePT_LIBRARIES_EXTRA. 
-
-```
-target_link_libraries(example_target <SCOPE>
-                      <TARGET LINK LIBRARIES>
-                      VecGeom::vecgeomcuda_static
-                      ${AdePT_LIBRARIES_EXTRA})
-```
-
 ## Copyright
 
 AdePT code is Copyright (C) CERN, 2020, for the benefit of the AdePT project.

diff --git a/examples/Example1/CMakeLists.txt b/examples/Example1/CMakeLists.txt
@@ -63,7 +63,12 @@ target_link_libraries(example1
 )
 
 # Install macros and geometry file
+SET(GDML ${PROJECT_BINARY_DIR}/cms2018_sd.gdml)
 configure_file("macros/example1.mac.in" "${PROJECT_BINARY_DIR}/example1.mac")
 configure_file("macros/example1_ttbar.mac.in" "${PROJECT_BINARY_DIR}/example1_ttbar.mac")
 
 # Tests
+
+add_test(NAME example1
+  COMMAND $<TARGET_FILE:example1> -m ${PROJECT_BINARY_DIR}/example1.mac
+)
diff --git a/examples/Example1/macros/example1.mac.in b/examples/Example1/macros/example1.mac.in
@@ -16,9 +16,9 @@
 ##
 /adept/setSeed 1
 
-/detector/filename cms2018_sd.gdml
+/detector/filename @GDML@
 # Temporary workaround since we don't have a G4 to VecGeom converter
-/adept/setVecGeomGDML cms2018_sd.gdml
+/adept/setVecGeomGDML @GDML@
 /adept/setVerbosity 0
 ## Threshold for buffering tracks before sending to GPU
 /adept/setTransportBufferThreshold 2000

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -39,7 +39,6 @@ file(DOWNLOAD https://gitlab.cern.ch/VecGeom/VecGeom/raw/v1.2.0/persistency/gdml
 # Detailed tests
 #----------------------------------------------------------------------------#
 add_subdirectory(testField)
-# add_subdirectory(TestEm3)
 
 #----------------------------------------------------------------------------#
 # Link/RDC tests

diff --git a/test/TestEm3/CMakeLists.txt b/test/TestEm3/CMakeLists.txt
diff --git a/test/TestEm3/README.md b/test/TestEm3/README.md