diff --git a/GeoModelExamples/HelloToy/CMakeLists.txt b/GeoModelExamples/HelloToy/CMakeLists.txt index 8bb74b077828195f11c22af3b5770dc9dfa4b88f..c27e24baa2495c585209672aceb776481612493d 100644 --- a/GeoModelExamples/HelloToy/CMakeLists.txt +++ b/GeoModelExamples/HelloToy/CMakeLists.txt @@ -32,5 +32,5 @@ add_executable( helloToy_step1_write ${SRCS} ) add_executable( helloToy_step2_read ${SRCS_READ} ) # Link all needed libraries -target_link_libraries( helloToy_step1_write GeoModelCore::GeoModelKernel GeoModelIO::GeoModelWrite GeoModelHelpers ) +target_link_libraries( helloToy_step1_write GeoModelCore::GeoModelKernel GeoModelIO::GeoModelWrite GeoModelCore::GeoModelHelpers ) target_link_libraries( helloToy_step2_read GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead ) diff --git a/GeoModelExamples/HelloToy/step1_create_store_geo_and_publish_nodes.cpp b/GeoModelExamples/HelloToy/step1_create_store_geo_and_publish_nodes.cpp index 87234079564b6367b7a0067f26ba56c9d6b975b3..210f1f499370b24fac141b24c4fd40092e8b8df9 100644 --- a/GeoModelExamples/HelloToy/step1_create_store_geo_and_publish_nodes.cpp +++ b/GeoModelExamples/HelloToy/step1_create_store_geo_and_publish_nodes.cpp @@ -15,6 +15,7 @@ #include "GeoModelKernel/GeoDefinitions.h" #include "GeoModelKernel/GeoMaterial.h" #include "GeoModelKernel/GeoBox.h" +#include "GeoModelKernel/GeoEllipticalTube.h" #include "GeoModelKernel/GeoTube.h" #include "GeoModelKernel/GeoCons.h" #include "GeoModelKernel/GeoPara.h" @@ -234,6 +235,14 @@ int main(int argc, char *argv[]) toyPhys->add(nBox); toyPhys->add(pBox); + // Add a test GeoEllipticalTube shape + GeoEllipticalTube *sEllipticalTube = new GeoEllipticalTube(5.0 * SYSTEM_OF_UNITS::cm, 30 * SYSTEM_OF_UNITS::cm, 30 * SYSTEM_OF_UNITS::cm); + GeoLogVol *lEllipticalTube = new GeoLogVol("ellipticaltube", sEllipticalTube, steel); + GeoPhysVol *pEllipticalTube = new GeoPhysVol(lEllipticalTube); + GeoNameTag *nEllipticalTube = new GeoNameTag("Shape-EllipticalTube"); + toyPhys->add(nEllipticalTube); + toyPhys->add(pEllipticalTube); + // Add a test GeoTube shape GeoTube *sTube = new GeoTube(5.0 * SYSTEM_OF_UNITS::cm, 10 * SYSTEM_OF_UNITS::cm, 30 * SYSTEM_OF_UNITS::cm); GeoLogVol *lTube = new GeoLogVol("tube", sTube, steel);