diff --git a/examples/CLICSiD/compact/SiD_Vertex.xml b/examples/CLICSiD/compact/SiD_Vertex.xml new file mode 100644 index 0000000000000000000000000000000000000000..329ed80926f10976715175ed4e8cde37c483142a --- /dev/null +++ b/examples/CLICSiD/compact/SiD_Vertex.xml @@ -0,0 +1,19 @@ +<lccdd> +<!-- #========================================================================== + # AIDA Detector description implementation + #========================================================================== + # Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) + # All rights reserved. + # + # For the licensing terms see $DD4hepINSTALL/LICENSE. + # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. + # + #========================================================================== + + <include ref="${DD4hepINSTALL}/DDDetectors/compact/SiD/SiD_Tracker.xml"/> + <include ref="${DD4hepINSTALL}/DDDetectors/compact/SiD/SiD_VertexEndcap.xml"/> +--> + <geometry open="false" close="true"/> + <include ref="${DD4hepINSTALL}/DDDetectors/compact/SiD/SiD_VertexConfig.xml"/> + <include ref="${DD4hepINSTALL}/DDDetectors/compact/SiD/SiD_VertexBarrel.xml"/> +</lccdd> diff --git a/examples/DDCAD/CMakeLists.txt b/examples/DDCAD/CMakeLists.txt index a2ac8217203d44e6ee52754a94ac5e77309f73ba..95d06847c026dff60351f42eb69fea9b2c51e33c 100644 --- a/examples/DDCAD/CMakeLists.txt +++ b/examples/DDCAD/CMakeLists.txt @@ -44,8 +44,9 @@ include(CTest) # # Test basic shapes by comparing mesh vertices with reference file set(DDCAD_Tests) +set(DDCADEx_INSTALL ${CMAKE_INSTALL_PREFIX}/examples/DDCAD) +set(CLICSiDEx_INSTALL ${CMAKE_INSTALL_PREFIX}/examples/CLICSiD) set(ClientTestsEx_INSTALL ${CMAKE_INSTALL_PREFIX}/examples/ClientTests) -set(DDCADTests_INSTALL ${CMAKE_INSTALL_PREFIX}/examples/DDCAD) # # Multi-shapes: BLEND_HUMAN COB_dwarf list(APPEND DDCAD_Tests BHV_Boxing_Toes Collada_duck PLY_Wuson ) @@ -72,7 +73,8 @@ dd4hep_add_test_reg( DDCAD_export_sid_vertex # Test CAD import from the exported simplyfied model dd4hep_add_test_reg( DDCAD_import_sid_vertex COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCAD.sh" - EXEC_ARGS geoDisplay -input ${DDCADTests_INSTALL}/compact/Import_SiD_Vertex.xml -load -destroy + EXEC_ARGS geoDisplay -input ${CLICSiDEx_INSTALL}/compact/SiD_multiple_inputs.xml + -input ${DDCADEx_INSTALL}/compact/Import_SiD_Vertex.xml -load -destroy DEPENDS Persist_Conditions_Save REGEX_PASS "Read 383 meshes" REGEX_FAIL "Exception" @@ -92,7 +94,7 @@ dd4hep_add_test_reg( DDCAD_export_cal_endcaps # Test CAD import from the exported simplyfied model dd4hep_add_test_reg( DDCAD_import_cal_endcaps COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCAD.sh" - EXEC_ARGS geoDisplay -input ${DDCADTests_INSTALL}/compact/Import_CaloEndcap.xml -load -destroy + EXEC_ARGS geoDisplay -input ${DDCADEx_INSTALL}/compact/Import_CaloEndcap.xml -load -destroy DEPENDS Persist_Conditions_Save REGEX_PASS "Read 96 meshes" REGEX_FAIL "Exception"