From cbc6deb5b74214486fccb13079af613f451b1ebd Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Wed, 14 Feb 2024 16:50:03 +0100
Subject: [PATCH] Rename GeoModelFuncSnippets to GeoModelHelpers
---
FullSimLight/CMakeLists.txt | 2 +-
FullSimLight/src/FSLDetectorConstruction.cc | 2 +-
GeoModelCore/CMakeLists.txt | 2 +-
GeoModelCore/GeoModelFuncSnippets/.DS_Store | Bin 6148 -> 0 bytes
.../CMakeLists.txt | 22 +++++++++---------
.../GeoModelHelpers}/FileUtils.h | 4 ++--
.../GeoModelHelpers}/GeoDeDuplicator.h | 12 +++++-----
.../GeoModelHelpers}/GeoLogVolSorter.h | 4 ++--
.../GeoModelHelpers}/GeoPhysVolSorter.h | 4 ++--
.../GeoModelHelpers}/GeoShapeSorter.h | 4 ++--
.../GeoModelHelpers}/GeoShapeUtils.h | 0
.../GeoModelHelpers}/MaterialManager.h | 0
.../GeoModelHelpers}/StringUtils.h | 6 ++---
.../GeoModelHelpers}/StringUtils.icc | 4 ++--
.../GeoModelHelpers}/TransformSorter.h | 4 ++--
.../TransformToStringConverter.h | 4 ++--
.../GeoModelHelpers}/defineWorld.h | 0
.../GeoModelHelpers}/getChildNodesWithTrf.h | 0
.../GeoModelHelpers}/throwExcept.h | 4 ++--
.../src/FileUtils.cxx | 4 ++--
.../src/GeoDeDuplicator.cxx | 2 +-
.../src/GeoLogVolSorter.cxx | 6 ++---
.../src/GeoPhysVolSorter.cxx | 8 +++----
.../src/GeoShapeSorter.cxx | 10 ++++----
.../src/GeoShapeUtils.cxx | 6 ++---
.../src/MaterialManager.cxx | 6 ++---
.../src/StringUtils.cxx | 4 ++--
.../src/TransformSorter.cxx | 4 ++--
.../src/TransformToStringConverter.cxx | 2 +-
.../src/defineWorld.cxx | 2 +-
.../src/getChildNodesWithTrf.cxx | 6 ++---
.../tests/testGeoShapeSet.cxx | 4 ++--
.../tests/testStringUtils.cxx | 4 ++--
.../tests/testTransformSorter.cxx | 4 ++--
GeoModelTools/GMCAT/CMakeLists.txt | 2 +-
GeoModelTools/GMCAT/src/gmcat.cxx | 2 +-
GeoModelTools/GMSTATISTICS/CMakeLists.txt | 2 +-
.../GMSTATISTICS/src/gmstatistics.cxx | 2 +-
.../GeoModelXML/GeoModelXml/CMakeLists.txt | 2 +-
.../GeoModelXml/GeoModelXml/Element2GeoItem.h | 2 +-
.../GeoModelXml/ElementProcessor.h | 2 +-
.../GeoModelXml/GeoModelXml/GmxUtil.h | 2 +-
.../GeoModelXml/src/Element2GeoItem.cxx | 2 +-
.../GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx | 2 +-
44 files changed, 85 insertions(+), 85 deletions(-)
delete mode 100644 GeoModelCore/GeoModelFuncSnippets/.DS_Store
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/CMakeLists.txt (67%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/FileUtils.h (89%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/GeoDeDuplicator.h (91%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/GeoLogVolSorter.h (93%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/GeoPhysVolSorter.h (91%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/GeoShapeSorter.h (94%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/GeoShapeUtils.h (100%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/MaterialManager.h (100%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/StringUtils.h (94%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/StringUtils.icc (90%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/TransformSorter.h (96%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/TransformToStringConverter.h (88%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/defineWorld.h (100%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/getChildNodesWithTrf.h (100%)
rename GeoModelCore/{GeoModelFuncSnippets/GeoModelFuncSnippets => GeoModelHelpers/GeoModelHelpers}/throwExcept.h (84%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/FileUtils.cxx (96%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/GeoDeDuplicator.cxx (94%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/GeoLogVolSorter.cxx (80%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/GeoPhysVolSorter.cxx (90%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/GeoShapeSorter.cxx (97%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/GeoShapeUtils.cxx (98%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/MaterialManager.cxx (98%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/StringUtils.cxx (98%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/TransformSorter.cxx (94%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/TransformToStringConverter.cxx (97%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/defineWorld.cxx (99%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/src/getChildNodesWithTrf.cxx (93%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/tests/testGeoShapeSet.cxx (97%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/tests/testStringUtils.cxx (90%)
rename GeoModelCore/{GeoModelFuncSnippets => GeoModelHelpers}/tests/testTransformSorter.cxx (96%)
diff --git a/FullSimLight/CMakeLists.txt b/FullSimLight/CMakeLists.txt
index a75827819..49fb3b6d2 100644
--- a/FullSimLight/CMakeLists.txt
+++ b/FullSimLight/CMakeLists.txt
@@ -100,7 +100,7 @@ target_link_libraries(FullSimLight_obj
nlohmann_json::nlohmann_json
GeoModel2G4
GeoModelCore::GeoModelKernel
- GeoModelCore::GeoModelFuncSnippets
+ GeoModelCore::GeoModelHelpers
GeoModelIO::GeoModelRead
GeoModelIO::GeoModelWrite
${HEPMC3_LIB}
diff --git a/FullSimLight/src/FSLDetectorConstruction.cc b/FullSimLight/src/FSLDetectorConstruction.cc
index a253ab31a..a0341fd7b 100644
--- a/FullSimLight/src/FSLDetectorConstruction.cc
+++ b/FullSimLight/src/FSLDetectorConstruction.cc
@@ -73,7 +73,7 @@
#include "GeoModelKernel/GeoGeometryPluginLoader.h"
#include "GeoModelKernel/GeoVolumeCursor.h"
#include "GeoModelKernel/GeoAlignableTransform.h"
-#include "GeoModelFuncSnippets/defineWorld.h"
+#include "GeoModelHelpers/defineWorld.h"
// For Sensitive Detector plugins:
#include "FullSimLight/FSLSensitiveDetectorPlugin.h"
diff --git a/GeoModelCore/CMakeLists.txt b/GeoModelCore/CMakeLists.txt
index 814e20f8d..4a8c37c04 100644
--- a/GeoModelCore/CMakeLists.txt
+++ b/GeoModelCore/CMakeLists.txt
@@ -8,7 +8,7 @@ project( "GeoModelCore" VERSION ${GeoModel_VERSION} LANGUAGES CXX )
# Set up the build of the two libraries of the (sub-)project.
add_subdirectory( GeoGenericFunctions )
add_subdirectory( GeoModelKernel )
-add_subdirectory( GeoModelFuncSnippets )
+add_subdirectory( GeoModelHelpers )
# Create and install the version description of the project.
include( WriteBasicConfigVersionFile )
diff --git a/GeoModelCore/GeoModelFuncSnippets/.DS_Store b/GeoModelCore/GeoModelFuncSnippets/.DS_Store
deleted file mode 100644
index ae5c8ecde22999e8b2b13eb4d697826d2742b328..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6148
zcmeHKy-vem3_Q~gl~_73Fn+JV8+@t?OiX<NMA88%Y7lAnY`iw-A0SoA%7E<3zI+!u
zR&I!E0J1r?cfcCJimr$c4Rh1`>NC3vMp5h;JzDJ1;Q^;v_GLnAZ}7;f9#8b2`U4v5
zaKJ0x_}k-%p&gp;rSCg7!vX`|(M+k!9g<B2Qh`(;6-WhAfvEyIMro^S$Bd~!Dv%0%
zE1=(pLRYMTqoaK~7;FU~E=im5+I9(IQG!?lM@KR=@lv9fN~{>-<>X7`)xgow%OTd8
z&xy_w8;V$W^2O32)iGl#kP4hDu<+wr=l?zZm;L{|C{L+CD)6rqkmYu_-SCxSw$5Ho
wXKkTB)4z<lmd;?Km}sMz2OY(?lf0tWyk7%HM=K|9<;46Wpt_``0)L^vCtZjgBLDyZ
diff --git a/GeoModelCore/GeoModelFuncSnippets/CMakeLists.txt b/GeoModelCore/GeoModelHelpers/CMakeLists.txt
similarity index 67%
rename from GeoModelCore/GeoModelFuncSnippets/CMakeLists.txt
rename to GeoModelCore/GeoModelHelpers/CMakeLists.txt
index e30ae17d9..39b9d50e3 100644
--- a/GeoModelCore/GeoModelFuncSnippets/CMakeLists.txt
+++ b/GeoModelCore/GeoModelHelpers/CMakeLists.txt
@@ -2,29 +2,29 @@
# Find the header and source files.
file( GLOB SOURCES src/*.cxx )
-file( GLOB HEADERS GeoModelFuncSnippets/*.h GeoModelFuncSnippets/*.icc )
+file( GLOB HEADERS GeoModelHelpers/*.h GeoModelHelpers/*.icc )
# Create the library.
-add_library( GeoModelFuncSnippets SHARED ${HEADERS} ${SOURCES} )
+add_library( GeoModelHelpers SHARED ${HEADERS} ${SOURCES} )
-target_link_libraries( GeoModelFuncSnippets PRIVATE GeoModelCore::GeoModelKernel )
+target_link_libraries( GeoModelHelpers PRIVATE GeoModelCore::GeoModelKernel )
-target_include_directories( GeoModelFuncSnippets PUBLIC
+target_include_directories( GeoModelHelpers PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
-source_group( "GeoModelFuncSnippets" FILES ${HEADERS} )
+source_group( "GeoModelHelpers" FILES ${HEADERS} )
source_group( "src" FILES ${SOURCES} )
-set_target_properties( GeoModelFuncSnippets PROPERTIES
+set_target_properties( GeoModelHelpers PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR} )
# Set up an alias with the same name that you would get by "finding" a pre-built
# version of the library.
-add_library( GeoModelCore::GeoModelFuncSnippets ALIAS GeoModelFuncSnippets )
+add_library( GeoModelCore::GeoModelHelpers ALIAS GeoModelHelpers )
# Install the library.
-install(TARGETS GeoModelFuncSnippets
+install(TARGETS GeoModelHelpers
EXPORT ${PROJECT_NAME}-export
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT Runtime
@@ -33,13 +33,13 @@ install(TARGETS GeoModelFuncSnippets
NAMELINK_COMPONENT Development # Requires CMake 3.12
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT Development
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelFuncSnippets
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelHelpers
COMPONENT Development
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
install( FILES ${HEADERS}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelFuncSnippets
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelHelpers
COMPONENT Development )
file(GLOB_RECURSE files "tests/*.cxx")
@@ -52,7 +52,7 @@ foreach(_exeFile ${files})
endif()
add_executable(${_theExec} ${_exeFile})
- target_link_libraries( ${_theExec} GeoModelCore::GeoModelFuncSnippets GeoModelCore::GeoModelKernel)
+ target_link_libraries( ${_theExec} GeoModelCore::GeoModelHelpers GeoModelCore::GeoModelKernel)
add_test(NAME ${_theExec}
COMMAND ${_theExec})
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/FileUtils.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/FileUtils.h
similarity index 89%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/FileUtils.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/FileUtils.h
index 89381e64e..4e62f0d60 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/FileUtils.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/FileUtils.h
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_FILEUTILS_H
-#define GEOMODELFUNCSNIPPETS_FILEUTILS_H
+#ifndef GeoModelHelpers_FILEUTILS_H
+#define GeoModelHelpers_FILEUTILS_H
#include <string>
#include <string_view>
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoDeDuplicator.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoDeDuplicator.h
similarity index 91%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoDeDuplicator.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoDeDuplicator.h
index b11634c8c..614bc6606 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoDeDuplicator.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoDeDuplicator.h
@@ -1,17 +1,17 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_GEODEDUPLICATOR_H
-#define GEOMODELFUNCSNIPPETS_GEODEDUPLICATOR_H
+#ifndef GeoModelHelpers_GEODEDUPLICATOR_H
+#define GeoModelHelpers_GEODEDUPLICATOR_H
#include "GeoModelKernel/GeoPhysVol.h"
#include "GeoModelKernel/GeoShape.h"
#include "GeoModelKernel/GeoTransform.h"
-#include "GeoModelFuncSnippets/GeoLogVolSorter.h"
-#include "GeoModelFuncSnippets/GeoPhysVolSorter.h"
-#include "GeoModelFuncSnippets/GeoShapeSorter.h"
-#include "GeoModelFuncSnippets/TransformSorter.h"
+#include "GeoModelHelpers/GeoLogVolSorter.h"
+#include "GeoModelHelpers/GeoPhysVolSorter.h"
+#include "GeoModelHelpers/GeoShapeSorter.h"
+#include "GeoModelHelpers/TransformSorter.h"
#include <set>
/***
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoLogVolSorter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoLogVolSorter.h
similarity index 93%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoLogVolSorter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoLogVolSorter.h
index 7dca5c700..7e682f2ed 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoLogVolSorter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoLogVolSorter.h
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_GEOLOGVOLSORTER_H
-#define GEOMODELFUNCSNIPPETS_GEOLOGVOLSORTER_H
+#ifndef GeoModelHelpers_GEOLOGVOLSORTER_H
+#define GeoModelHelpers_GEOLOGVOLSORTER_H
#include "GeoModelKernel/GeoLogVol.h"
#include "GeoModelKernel/GeoIntrusivePtr.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoPhysVolSorter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoPhysVolSorter.h
similarity index 91%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoPhysVolSorter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoPhysVolSorter.h
index 0612a7dcb..12a9cc090 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoPhysVolSorter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoPhysVolSorter.h
@@ -2,8 +2,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_GEOPHYSVOLSORTER_H
-#define GEOMODELFUNCSNIPPETS_GEOPHYSVOLSORTER_H
+#ifndef GeoModelHelpers_GEOPHYSVOLSORTER_H
+#define GeoModelHelpers_GEOPHYSVOLSORTER_H
#include "GeoModelKernel/GeoVPhysVol.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeSorter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeSorter.h
similarity index 94%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeSorter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeSorter.h
index 6c04c0ba4..a18006c36 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeSorter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeSorter.h
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_GeoShapeSorter_H
-#define GEOMODELFUNCSNIPPETS_GeoShapeSorter_H
+#ifndef GeoModelHelpers_GeoShapeSorter_H
+#define GeoModelHelpers_GeoShapeSorter_H
#include "GeoModelKernel/GeoShape.h"
#include "GeoModelKernel/GeoIntrusivePtr.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeUtils.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeUtils.h
similarity index 100%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/GeoShapeUtils.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/GeoShapeUtils.h
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/MaterialManager.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/MaterialManager.h
similarity index 100%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/MaterialManager.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/MaterialManager.h
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.h
similarity index 94%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.h
index da93675a5..6a7a3d2f2 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.h
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_STRINGUTILS_H
-#define GEOMODELFUNCSNIPPETS_STRINGUTILS_H
+#ifndef GeoModelHelpers_STRINGUTILS_H
+#define GeoModelHelpers_STRINGUTILS_H
#include <string>
#include <string_view>
@@ -62,5 +62,5 @@ namespace GeoStrUtils{
const std::string_view glue =";");
}
-#include "GeoModelFuncSnippets/StringUtils.icc"
+#include "GeoModelHelpers/StringUtils.icc"
#endif
\ No newline at end of file
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.icc b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.icc
similarity index 90%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.icc
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.icc
index aaae11770..04c7d2e17 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/StringUtils.icc
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/StringUtils.icc
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_STRINGUTILS_ICC
-#define GEOMODELFUNCSNIPPETS_STRINGUTILS_ICC
+#ifndef GeoModelHelpers_STRINGUTILS_ICC
+#define GeoModelHelpers_STRINGUTILS_ICC
#include <sstream>
namespace GeoStrUtils {
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformSorter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformSorter.h
similarity index 96%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformSorter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformSorter.h
index 17693e891..4f42720d0 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformSorter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformSorter.h
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_TRANSFORMSORTER_H
-#define GEOMODELFUNCSNIPPETS_TRANSFORMSORTER_H
+#ifndef GeoModelHelpers_TRANSFORMSORTER_H
+#define GeoModelHelpers_TRANSFORMSORTER_H
#include "GeoModelKernel/GeoDefinitions.h"
#include "GeoModelKernel/GeoTransform.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformToStringConverter.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformToStringConverter.h
similarity index 88%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformToStringConverter.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformToStringConverter.h
index 62dfe421c..5e15a85a0 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/TransformToStringConverter.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/TransformToStringConverter.h
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_TRANSFORMTOSTRINGCONVERTER_H
-#define GEOMODELFUNCSNIPPETS_TRANSFORMTOSTRINGCONVERTER_H
+#ifndef GeoModelHelpers_TRANSFORMTOSTRINGCONVERTER_H
+#define GeoModelHelpers_TRANSFORMTOSTRINGCONVERTER_H
#include "GeoModelKernel/GeoDefinitions.h"
#include <string>
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/defineWorld.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/defineWorld.h
similarity index 100%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/defineWorld.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/defineWorld.h
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/getChildNodesWithTrf.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/getChildNodesWithTrf.h
similarity index 100%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/getChildNodesWithTrf.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/getChildNodesWithTrf.h
diff --git a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/throwExcept.h b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/throwExcept.h
similarity index 84%
rename from GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/throwExcept.h
rename to GeoModelCore/GeoModelHelpers/GeoModelHelpers/throwExcept.h
index 7be2db179..82d3ae0ae 100644
--- a/GeoModelCore/GeoModelFuncSnippets/GeoModelFuncSnippets/throwExcept.h
+++ b/GeoModelCore/GeoModelHelpers/GeoModelHelpers/throwExcept.h
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef GEOMODELFUNCSNIPPETS_THROWEXCEPT_H
-#define GEOMODELFUNCSNIPPETS_THROWEXCEPT_H
+#ifndef GeoModelHelpers_THROWEXCEPT_H
+#define GeoModelHelpers_THROWEXCEPT_H
#include <exception>
#include <sstream>
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/FileUtils.cxx b/GeoModelCore/GeoModelHelpers/src/FileUtils.cxx
similarity index 96%
rename from GeoModelCore/GeoModelFuncSnippets/src/FileUtils.cxx
rename to GeoModelCore/GeoModelHelpers/src/FileUtils.cxx
index 08b2c2fc3..58afa8e04 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/FileUtils.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/FileUtils.cxx
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/FileUtils.h"
-#include "GeoModelFuncSnippets/StringUtils.h"
+#include "GeoModelHelpers/FileUtils.h"
+#include "GeoModelHelpers/StringUtils.h"
#include <filesystem>
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoDeDuplicator.cxx b/GeoModelCore/GeoModelHelpers/src/GeoDeDuplicator.cxx
similarity index 94%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoDeDuplicator.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoDeDuplicator.cxx
index 0d48d05db..8ba6eab4a 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoDeDuplicator.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoDeDuplicator.cxx
@@ -3,7 +3,7 @@
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/GeoDeDuplicator.h"
+#include "GeoModelHelpers/GeoDeDuplicator.h"
GeoDeDuplicator::TrfSet GeoDeDuplicator::s_trfStore{};
GeoDeDuplicator::ShapeSet GeoDeDuplicator::s_shapeStore{};
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoLogVolSorter.cxx b/GeoModelCore/GeoModelHelpers/src/GeoLogVolSorter.cxx
similarity index 80%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoLogVolSorter.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoLogVolSorter.cxx
index 592349222..381c9896f 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoLogVolSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoLogVolSorter.cxx
@@ -1,9 +1,9 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/GeoLogVolSorter.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
-#include "GeoModelFuncSnippets/GeoShapeSorter.h"
+#include "GeoModelHelpers/GeoLogVolSorter.h"
+#include "GeoModelHelpers/throwExcept.h"
+#include "GeoModelHelpers/GeoShapeSorter.h"
bool GeoLogVolSorter::operator()(const GeoLogVol* a, const GeoLogVol* b) const{
return compare(a, b) < 0;
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoPhysVolSorter.cxx b/GeoModelCore/GeoModelHelpers/src/GeoPhysVolSorter.cxx
similarity index 90%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoPhysVolSorter.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoPhysVolSorter.cxx
index 4ed755123..d5f72bd28 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoPhysVolSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoPhysVolSorter.cxx
@@ -1,13 +1,13 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/GeoPhysVolSorter.h"
+#include "GeoModelHelpers/GeoPhysVolSorter.h"
#include "GeoModelKernel/GeoFullPhysVol.h"
-#include "GeoModelFuncSnippets/TransformSorter.h"
-#include "GeoModelFuncSnippets/GeoLogVolSorter.h"
+#include "GeoModelHelpers/TransformSorter.h"
+#include "GeoModelHelpers/GeoLogVolSorter.h"
#include "GeoModelKernel/GeoVolumeCursor.h"
-#include "GeoModelFuncSnippets/getChildNodesWithTrf.h"
+#include "GeoModelHelpers/getChildNodesWithTrf.h"
int GeoPhysVolSorter::compare(const GeoVPhysVol* a, const GeoVPhysVol* b) const {
/// If one of the given volumes is a full physical volume, let's assume that they've been
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoShapeSorter.cxx b/GeoModelCore/GeoModelHelpers/src/GeoShapeSorter.cxx
similarity index 97%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoShapeSorter.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoShapeSorter.cxx
index 1bd89c0d5..5d1aee762 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoShapeSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoShapeSorter.cxx
@@ -1,11 +1,11 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/GeoShapeSorter.h"
-#include "GeoModelFuncSnippets/TransformSorter.h"
-#include "GeoModelFuncSnippets/TransformToStringConverter.h"
-#include "GeoModelFuncSnippets/GeoShapeUtils.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/GeoShapeSorter.h"
+#include "GeoModelHelpers/TransformSorter.h"
+#include "GeoModelHelpers/TransformToStringConverter.h"
+#include "GeoModelHelpers/GeoShapeUtils.h"
+#include "GeoModelHelpers/throwExcept.h"
#include "GeoModelKernel/Units.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/GeoShapeUtils.cxx b/GeoModelCore/GeoModelHelpers/src/GeoShapeUtils.cxx
similarity index 98%
rename from GeoModelCore/GeoModelFuncSnippets/src/GeoShapeUtils.cxx
rename to GeoModelCore/GeoModelHelpers/src/GeoShapeUtils.cxx
index 10ba0d3b2..2117315dd 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/GeoShapeUtils.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/GeoShapeUtils.cxx
@@ -1,9 +1,9 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/GeoShapeUtils.h"
-#include "GeoModelFuncSnippets/TransformToStringConverter.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/GeoShapeUtils.h"
+#include "GeoModelHelpers/TransformToStringConverter.h"
+#include "GeoModelHelpers/throwExcept.h"
/// Boolean volume shapes
#include "GeoModelKernel/GeoShapeUnion.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/MaterialManager.cxx b/GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx
similarity index 98%
rename from GeoModelCore/GeoModelFuncSnippets/src/MaterialManager.cxx
rename to GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx
index e3179074e..02eeb3c43 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/MaterialManager.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/MaterialManager.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/MaterialManager.h"
+#include "GeoModelHelpers/MaterialManager.h"
#include "GeoModelKernel/GeoIntrusivePtr.h"
@@ -10,8 +10,8 @@
#include "GeoModelKernel/GeoMaterial.h"
#include "GeoModelKernel/Units.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
-#include "GeoModelFuncSnippets/StringUtils.h"
+#include "GeoModelHelpers/throwExcept.h"
+#include "GeoModelHelpers/StringUtils.h"
#include <cstdlib>
#include <iomanip>
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/StringUtils.cxx b/GeoModelCore/GeoModelHelpers/src/StringUtils.cxx
similarity index 98%
rename from GeoModelCore/GeoModelFuncSnippets/src/StringUtils.cxx
rename to GeoModelCore/GeoModelHelpers/src/StringUtils.cxx
index c17fb500c..557a33534 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/StringUtils.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/StringUtils.cxx
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/StringUtils.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/StringUtils.h"
+#include "GeoModelHelpers/throwExcept.h"
#include <limits>
#include <array>
#include <functional>
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/TransformSorter.cxx b/GeoModelCore/GeoModelHelpers/src/TransformSorter.cxx
similarity index 94%
rename from GeoModelCore/GeoModelFuncSnippets/src/TransformSorter.cxx
rename to GeoModelCore/GeoModelHelpers/src/TransformSorter.cxx
index 8ad2d05cf..59567fc3c 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/TransformSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/TransformSorter.cxx
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/TransformSorter.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/TransformSorter.h"
+#include "GeoModelHelpers/throwExcept.h"
namespace GeoTrf {
bool TransformSorter::operator()(const std::unique_ptr<Transform3D>& a,
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/TransformToStringConverter.cxx b/GeoModelCore/GeoModelHelpers/src/TransformToStringConverter.cxx
similarity index 97%
rename from GeoModelCore/GeoModelFuncSnippets/src/TransformToStringConverter.cxx
rename to GeoModelCore/GeoModelHelpers/src/TransformToStringConverter.cxx
index cbf1150b7..13f5c885b 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/TransformToStringConverter.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/TransformToStringConverter.cxx
@@ -1,7 +1,7 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/TransformToStringConverter.h"
+#include "GeoModelHelpers/TransformToStringConverter.h"
#include "GeoModelKernel/Units.h"
namespace{
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/defineWorld.cxx b/GeoModelCore/GeoModelHelpers/src/defineWorld.cxx
similarity index 99%
rename from GeoModelCore/GeoModelFuncSnippets/src/defineWorld.cxx
rename to GeoModelCore/GeoModelHelpers/src/defineWorld.cxx
index e5185656f..b28b918a7 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/defineWorld.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/defineWorld.cxx
@@ -1,7 +1,7 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/defineWorld.h"
+#include "GeoModelHelpers/defineWorld.h"
#include "GeoModelKernel/GeoElement.h"
#include "GeoModelKernel/GeoMaterial.h"
#include "GeoModelKernel/GeoBox.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/src/getChildNodesWithTrf.cxx b/GeoModelCore/GeoModelHelpers/src/getChildNodesWithTrf.cxx
similarity index 93%
rename from GeoModelCore/GeoModelFuncSnippets/src/getChildNodesWithTrf.cxx
rename to GeoModelCore/GeoModelHelpers/src/getChildNodesWithTrf.cxx
index 462ac8b68..cc16ee76a 100644
--- a/GeoModelCore/GeoModelFuncSnippets/src/getChildNodesWithTrf.cxx
+++ b/GeoModelCore/GeoModelHelpers/src/getChildNodesWithTrf.cxx
@@ -1,10 +1,10 @@
/*
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/getChildNodesWithTrf.h"
+#include "GeoModelHelpers/getChildNodesWithTrf.h"
-#include "GeoModelFuncSnippets/GeoPhysVolSorter.h"
-#include "GeoModelFuncSnippets/TransformSorter.h"
+#include "GeoModelHelpers/GeoPhysVolSorter.h"
+#include "GeoModelHelpers/TransformSorter.h"
#include "GeoModelKernel/GeoVolumeCursor.h"
#include "GeoModelKernel/GeoFullPhysVol.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/tests/testGeoShapeSet.cxx b/GeoModelCore/GeoModelHelpers/tests/testGeoShapeSet.cxx
similarity index 97%
rename from GeoModelCore/GeoModelFuncSnippets/tests/testGeoShapeSet.cxx
rename to GeoModelCore/GeoModelHelpers/tests/testGeoShapeSet.cxx
index b992be284..108c93c69 100644
--- a/GeoModelCore/GeoModelFuncSnippets/tests/testGeoShapeSet.cxx
+++ b/GeoModelCore/GeoModelHelpers/tests/testGeoShapeSet.cxx
@@ -3,8 +3,8 @@
*/
#include "GeoModelKernel/Units.h"
#include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelFuncSnippets/GeoShapeSorter.h"
-#include "GeoModelFuncSnippets/GeoShapeUtils.h"
+#include "GeoModelHelpers/GeoShapeSorter.h"
+#include "GeoModelHelpers/GeoShapeUtils.h"
#include "GeoModelKernel/GeoBox.h"
#include "GeoModelKernel/GeoTube.h"
diff --git a/GeoModelCore/GeoModelFuncSnippets/tests/testStringUtils.cxx b/GeoModelCore/GeoModelHelpers/tests/testStringUtils.cxx
similarity index 90%
rename from GeoModelCore/GeoModelFuncSnippets/tests/testStringUtils.cxx
rename to GeoModelCore/GeoModelHelpers/tests/testStringUtils.cxx
index c21262be7..1fa425cc7 100644
--- a/GeoModelCore/GeoModelFuncSnippets/tests/testStringUtils.cxx
+++ b/GeoModelCore/GeoModelHelpers/tests/testStringUtils.cxx
@@ -2,8 +2,8 @@
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/StringUtils.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/StringUtils.h"
+#include "GeoModelHelpers/throwExcept.h"
#include <iostream>
#include <stdlib.h>
using namespace GeoStrUtils;
diff --git a/GeoModelCore/GeoModelFuncSnippets/tests/testTransformSorter.cxx b/GeoModelCore/GeoModelHelpers/tests/testTransformSorter.cxx
similarity index 96%
rename from GeoModelCore/GeoModelFuncSnippets/tests/testTransformSorter.cxx
rename to GeoModelCore/GeoModelHelpers/tests/testTransformSorter.cxx
index 9889827c8..d82df41a7 100644
--- a/GeoModelCore/GeoModelFuncSnippets/tests/testTransformSorter.cxx
+++ b/GeoModelCore/GeoModelHelpers/tests/testTransformSorter.cxx
@@ -2,8 +2,8 @@
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-#include "GeoModelFuncSnippets/TransformSorter.h"
-#include "GeoModelFuncSnippets/TransformToStringConverter.h"
+#include "GeoModelHelpers/TransformSorter.h"
+#include "GeoModelHelpers/TransformToStringConverter.h"
#include "GeoModelKernel/Units.h"
#include <stdlib.h>
#include <iostream>
diff --git a/GeoModelTools/GMCAT/CMakeLists.txt b/GeoModelTools/GMCAT/CMakeLists.txt
index b3a2ab02c..2347c8588 100644
--- a/GeoModelTools/GMCAT/CMakeLists.txt
+++ b/GeoModelTools/GMCAT/CMakeLists.txt
@@ -3,7 +3,7 @@
# Declare the package's executable.
add_executable( gmcat src/gmcat.cxx src/publishMetaData.cpp)
target_link_libraries( gmcat PRIVATE GeoModelCore::GeoModelKernel
- GeoModelCore::GeoModelFuncSnippets
+ GeoModelCore::GeoModelHelpers
GeoModelIO::GeoModelRead
GeoModelIO::GeoModelWrite
GeoModelIO::GeoModelDBManager )
diff --git a/GeoModelTools/GMCAT/src/gmcat.cxx b/GeoModelTools/GMCAT/src/gmcat.cxx
index 467895fa2..839140c39 100644
--- a/GeoModelTools/GMCAT/src/gmcat.cxx
+++ b/GeoModelTools/GMCAT/src/gmcat.cxx
@@ -6,7 +6,7 @@
#include "GeoModelDBManager/GMDBManager.h"
#include "GeoModelRead/ReadGeoModel.h"
#include "GeoModelWrite/WriteGeoModel.h"
-#include "GeoModelFuncSnippets/defineWorld.h"
+#include "GeoModelHelpers/defineWorld.h"
#include "GeoModelKernel/GeoGeometryPluginLoader.h"
#include "GeoModelKernel/GeoVolumeCursor.h"
diff --git a/GeoModelTools/GMSTATISTICS/CMakeLists.txt b/GeoModelTools/GMSTATISTICS/CMakeLists.txt
index 854b50f3a..f371c62d1 100644
--- a/GeoModelTools/GMSTATISTICS/CMakeLists.txt
+++ b/GeoModelTools/GMSTATISTICS/CMakeLists.txt
@@ -6,7 +6,7 @@ target_link_libraries( gmstatistics PRIVATE GeoModelCore::GeoModelKernel
GeoModelIO::GeoModelRead
GeoModelIO::GeoModelWrite
GeoModelIO::GeoModelDBManager
- GeoModelCore::GeoModelFuncSnippets )
+ GeoModelCore::GeoModelHelpers )
# Tweak how debug information should be attached to the executable, in Debug
# builds.
diff --git a/GeoModelTools/GMSTATISTICS/src/gmstatistics.cxx b/GeoModelTools/GMSTATISTICS/src/gmstatistics.cxx
index deb8b8327..1dac430b4 100644
--- a/GeoModelTools/GMSTATISTICS/src/gmstatistics.cxx
+++ b/GeoModelTools/GMSTATISTICS/src/gmstatistics.cxx
@@ -11,7 +11,7 @@
#include "GeoModelKernel/GeoCountVolAction.h"
#include "GeoModelKernel/GeoAccessVolumeAction.h"
#include "GeoModelKernel/GeoNameTag.h"
-#include "GeoModelFuncSnippets/defineWorld.h"
+#include "GeoModelHelpers/defineWorld.h"
#include "GeoInventoryGraphAction.h"
#include <fstream>
#include <iostream>
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
index 67c34087f..8e9375ae0 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package( ZLIB REQUIRED )
# Create the library.
add_library( GeoModelXml SHARED ${HEADERS} ${SOURCES} )
# link libraries
-target_link_libraries( GeoModelXml PUBLIC GeoModelCore::GeoModelKernel GeoModelCore::GeoModelFuncSnippets GeoModelTools::ExpressionEvaluator XercesC::XercesC PRIVATE ZLIB::ZLIB )
+target_link_libraries( GeoModelXml PUBLIC GeoModelCore::GeoModelKernel GeoModelCore::GeoModelHelpers GeoModelTools::ExpressionEvaluator XercesC::XercesC PRIVATE ZLIB::ZLIB )
target_include_directories( GeoModelXml PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include> )
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Element2GeoItem.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Element2GeoItem.h
index 86cd6ed8f..9ae11193d 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Element2GeoItem.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Element2GeoItem.h
@@ -11,7 +11,7 @@
#define GEO_MODEL_XML_ELEMENT2GEO_ITEM_H
#include <xercesc/util/XercesDefs.hpp>
-#include "GeoModelFuncSnippets/GeoDeDuplicator.h"
+#include "GeoModelHelpers/GeoDeDuplicator.h"
#include "GeoModelKernel/RCBase.h"
#include "GeoModelKernel/GeoIntrusivePtr.h"
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/ElementProcessor.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/ElementProcessor.h
index 5b3a71c7e..231236a92 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/ElementProcessor.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/ElementProcessor.h
@@ -12,7 +12,7 @@
#include <xercesc/util/XercesDefs.hpp>
#include "GeoModelXml/GeoNodeList.h"
-#include "GeoModelFuncSnippets/GeoDeDuplicator.h"
+#include "GeoModelHelpers/GeoDeDuplicator.h"
XERCES_CPP_NAMESPACE_BEGIN
class DOMElement;
XERCES_CPP_NAMESPACE_END
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/GmxUtil.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/GmxUtil.h
index ff5327592..0a1912e85 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/GmxUtil.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/GmxUtil.h
@@ -10,7 +10,7 @@
//
#include <string>
#include "ExpressionEvaluator/Evaluator.h"
-#include "GeoModelFuncSnippets/MaterialManager.h"
+#include "GeoModelHelpers/MaterialManager.h"
#include "GeoModelXml/ProcessorRegistry.h"
#include "GeoModelXml/Element2GeoItemRegistry.h"
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/Element2GeoItem.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/Element2GeoItem.cxx
index d37668328..580b20989 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/Element2GeoItem.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/Element2GeoItem.cxx
@@ -12,7 +12,7 @@
#include "GeoModelXml/GmxUtil.h"
#include "GeoModelKernel/RCBase.h"
-#include "GeoModelFuncSnippets/throwExcept.h"
+#include "GeoModelHelpers/throwExcept.h"
using namespace std;
using namespace xercesc;
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
index 31fd4ebd8..86f3e8811 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
@@ -28,7 +28,7 @@
#include "GeoModelXml/GmxUtil.h"
#include "GeoModelXml/GmxInterface.h"
#include "GeoModelXml/createdomdocument.h"
-#include "GeoModelFuncSnippets/MaterialManager.h"
+#include "GeoModelHelpers/MaterialManager.h"
using namespace std;
using namespace xercesc;
--
GitLab