From 9d852c425ef836e6905254eadad02b655bc2c20e Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Sat, 17 Jun 2017 03:23:09 +0200
Subject: [PATCH] Namespace re-organisation
---
DDAlign/src/plugins/AlignmentsPlugins.cpp | 2 +-
DDCond/include/DDCond/Type1/Manager_Type1.h | 6 ++---
DDCond/src/plugins/ConditionsPlugins.cpp | 26 ++++++++++-----------
DDCore/src/Plugins.cpp | 8 +++----
examples/AlignDet/CMakeLists.txt | 10 ++++----
examples/Conditions/CMakeLists.txt | 6 ++---
examples/DDDB/CMakeLists.txt | 24 +++++++++----------
7 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/DDAlign/src/plugins/AlignmentsPlugins.cpp b/DDAlign/src/plugins/AlignmentsPlugins.cpp
index 9741e908f..72cb3d011 100644
--- a/DDAlign/src/plugins/AlignmentsPlugins.cpp
+++ b/DDAlign/src/plugins/AlignmentsPlugins.cpp
@@ -44,7 +44,7 @@ long create_global_alignment_xml_file(Detector& description, int argc, char** ar
/// Help printout describing the basic command line interface
cout <<
"Usage: -plugin <name> -arg [-arg] \n"
- " name: factory namedd4hep_GlobalAlignmentWriter \n\n"
+ " name: factory nameDD4hep_GlobalAlignmentWriter \n\n"
" -output <string> Path to the output file generated. \n"
" -path <string> Path to the detector element for which \n"
" the alignment file should be written. \n"
diff --git a/DDCond/include/DDCond/Type1/Manager_Type1.h b/DDCond/include/DDCond/Type1/Manager_Type1.h
index 26029245b..695a7bb64 100644
--- a/DDCond/include/DDCond/Type1/Manager_Type1.h
+++ b/DDCond/include/DDCond/Type1/Manager_Type1.h
@@ -56,11 +56,11 @@ namespace dd4hep {
int m_maxIOVTypes;
/// Property: ConditionsPool constructor type (default: empty. MUST BE SET!)
std::string m_poolType;
- /// Property: UpdatePool constructor type (default: dd4hep_ConditionsLinearUpdatePool)
+ /// Property: UpdatePool constructor type (default: DD4hep_ConditionsLinearUpdatePool)
std::string m_updateType;
- /// Property: UserPool constructor type (default: dd4hep_ConditionsLinearUserPool)
+ /// Property: UserPool constructor type (default: DD4hep_ConditionsLinearUserPool)
std::string m_userType;
- /// Property: Conditions loader type (default: "multi" -> dd4hep_Conditions_multi_Loader)
+ /// Property: Conditions loader type (default: "multi" -> DD4hep_Conditions_multi_Loader)
std::string m_loaderType;
/// Collection of IOV types managed
diff --git a/DDCond/src/plugins/ConditionsPlugins.cpp b/DDCond/src/plugins/ConditionsPlugins.cpp
index 454cb2f72..09af03258 100644
--- a/DDCond/src/plugins/ConditionsPlugins.cpp
+++ b/DDCond/src/plugins/ConditionsPlugins.cpp
@@ -36,7 +36,7 @@ using namespace dd4hep::cond;
/// Plugin function: Install the alignment manager as an extension to the central Detector object
/**
- * Factory: dd4hep_ConditionsManagerInstaller
+ * Factory: DD4hep_ConditionsManagerInstaller
*
* \author M.Frank
* \version 1.0
@@ -60,7 +60,7 @@ static int ddcond_install_cond_mgr (Detector& description, int argc, char** argv
/// Help printout describing the basic command line interface
cout <<
"Usage: -plugin <name> -arg [-arg] \n"
- " name: factory name dd4hep_ConditionsManagerInstaller \n"
+ " name: factory name DD4hep_ConditionsManagerInstaller \n"
" -type <string> Manager type. \n"
" Default: ConditionsManagerObject_Type1_t \n"
" -handle <pointer> Pointer to Handle<NamedObject> to pass pointer \n"
@@ -132,7 +132,7 @@ static ConditionsSlice* ddcond_prepare(Detector& description, const string& iov_
// ======================================================================================
/// Plugin function: Dump of all Conditions pool with or without conditions
/**
- * Factory: dd4hep_ConditionsPoolProcessor
+ * Factory: DD4hep_ConditionsPoolProcessor
*
* \author M.Frank
* \version 1.0
@@ -183,8 +183,8 @@ DECLARE_APPLY(DD4hep_ConditionsPoolProcessor,ddcond_conditions_pool_process)
// ======================================================================================
/// Plugin function: Dump of all Conditions pool with or without conditions
/**
- * Factory: dd4hep_ConditionsPoolDump: Dump pools only
- * Factory: dd4hep_ConditionsDump: Dump pools and conditions
+ * Factory: DD4hep_ConditionsPoolDump: Dump pools only
+ * Factory: DD4hep_ConditionsDump: Dump pools and conditions
*
* \author M.Frank
* \version 1.0
@@ -331,7 +331,7 @@ DECLARE_APPLY(DD4hep_DetElementConditionsProcessor,ddcond_detelement_processor)
// ======================================================================================
/// Plugin entry point: Synchronize conditions according to new IOV value
/**
- * Factory: dd4hep_ConditionsSynchronize
+ * Factory: DD4hep_ConditionsSynchronize
*
* \author M.Frank
* \version 1.0
@@ -357,7 +357,7 @@ DECLARE_APPLY(DD4hep_ConditionsSynchronize,ddcond_synchronize_conditions)
// ======================================================================================
/// Plugin entry point: Clean conditions reposiory according to maximum age
/**
- * Factory: dd4hep_ConditionsClean
+ * Factory: DD4hep_ConditionsClean
*
* \author M.Frank
* \version 1.0
@@ -413,7 +413,7 @@ static void* create_printer(Detector& description, int argc,char** argv) {
/// Help printout describing the basic command line interface
cout <<
"Usage: -plugin <name> -arg [-arg] \n"
- " name: factory name(s) dd4hep_ConditionsPrinter, \n"
+ " name: factory name(s) DD4hep_ConditionsPrinter, \n"
" dd4hep_AlignmentsPrinter \n"
" dd4hep_AlignedVolumePrinter \n"
" -prefix <string> Printout prefix for user customized output. \n"
@@ -448,7 +448,7 @@ DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsPrinter,create_cond_printer)
// ======================================================================================
/// Plugin entry point: Create repository csv file from loaded conditions
/**
- * Factory: dd4hep_ConditionsCreateRepository
+ * Factory: DD4hep_ConditionsCreateRepository
*
* \author M.Frank
* \version 1.0
@@ -467,7 +467,7 @@ static long ddcond_create_repository(Detector& description, int argc, char** arg
/// Help printout describing the basic command line interface
cout <<
"Usage: -plugin <name> -arg [-arg] \n"
- " name: factory name dd4hep_ConditionsCreateRepository \n\n"
+ " name: factory name DD4hep_ConditionsCreateRepository \n\n"
" -output <string> Output file name. \n\n"
"\tArguments given: " << arguments(argc,argv) << endl << flush;
::exit(EINVAL);
@@ -483,7 +483,7 @@ DECLARE_APPLY(DD4hep_ConditionsCreateRepository,ddcond_create_repository)
// ======================================================================================
/// Plugin entry point: Dump conditions repository csv file
/**
- * Factory: dd4hep_ConditionsDumpRepository
+ * Factory: DD4hep_ConditionsDumpRepository
*
* \author M.Frank
* \version 1.0
@@ -504,7 +504,7 @@ static long ddcond_dump_repository(Detector& /* description */, int argc, char**
/// Help printout describing the basic command line interface
cout <<
"Usage: -plugin <name> -arg [-arg] \n"
- " name: factory name dd4hep_ConditionsDumpRepository \n\n"
+ " name: factory name DD4hep_ConditionsDumpRepository \n\n"
" -input <string> Input file name. \n\n"
"\tArguments given: " << arguments(argc,argv) << endl << flush;
::exit(EINVAL);
@@ -527,7 +527,7 @@ DECLARE_APPLY(DD4hep_ConditionsDumpRepository,ddcond_dump_repository)
// ======================================================================================
/// Plugin entry point: Load conditions repository csv file into conditions manager
/**
- * Factory: dd4hep_ConditionsDumpRepository
+ * Factory: DD4hep_ConditionsDumpRepository
*
TO BE DONE!!!
diff --git a/DDCore/src/Plugins.cpp b/DDCore/src/Plugins.cpp
index c56202d4e..f2b26de3a 100644
--- a/DDCore/src/Plugins.cpp
+++ b/DDCore/src/Plugins.cpp
@@ -123,14 +123,14 @@ namespace {
#else
handle = ::dlopen(plugin_name, RTLD_LAZY | RTLD_GLOBAL);
#endif
- getDebug = get_func< int (*) ()>(handle, plugin_name,"DD4hep_pluginmgr_getdebug");
- setDebug = get_func< int (*) (int)>(handle, plugin_name,"DD4hep_pluginmgr_getdebug");
+ getDebug = get_func< int (*) ()>(handle, plugin_name,"dd4hep_pluginmgr_getdebug");
+ setDebug = get_func< int (*) (int)>(handle, plugin_name,"dd4hep_pluginmgr_getdebug");
create = get_func< void* (*) (const char*,
- const char*)>(handle, plugin_name,"DD4hep_pluginmgr_create");
+ const char*)>(handle, plugin_name,"dd4hep_pluginmgr_create");
add = get_func< void (*) (const char* identifier,
void* creator_stub,
const char* signature,
- const char* return_type)>(handle, plugin_name,"DD4hep_pluginmgr_add_factory");
+ const char* return_type)>(handle, plugin_name,"dd4hep_pluginmgr_add_factory");
}
}
diff --git a/examples/AlignDet/CMakeLists.txt b/examples/AlignDet/CMakeLists.txt
index 6d0a25cbe..920df9e34 100644
--- a/examples/AlignDet/CMakeLists.txt
+++ b/examples/AlignDet/CMakeLists.txt
@@ -60,7 +60,7 @@ dd4hep_add_test_reg( AlignDet_Telescope_dump_xml
EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_AlignmentExample_read_xml
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
-delta file:${DD4hep_DIR}/examples/Conditions/data/repository.xml
- -plugin dd4hep_ConditionsXMLRepositoryWriter -iov_type run -iov_value 1500
+ -plugin DD4hep_ConditionsXMLRepositoryWriter -iov_type run -iov_value 1500
REGEX_PASS "Summary: Converted 33 conditions. 0 conditions without recipe"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
)
@@ -71,7 +71,7 @@ dd4hep_add_test_reg( AlignDet_Telescope_write_xml
EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_AlignmentExample_read_xml
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
-delta file:${DD4hep_DIR}/examples/Conditions/data/repository.xml
- -plugin dd4hep_ConditionsXMLRepositoryWriter -iov_type run -iov_value 1500 -manager -output new_cond.xml
+ -plugin DD4hep_ConditionsXMLRepositoryWriter -iov_type run -iov_value 1500 -manager -output new_cond.xml
REGEX_PASS "Successfully wrote 33 conditions \\(0 unconverted\\) to file: new_cond.xml"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
)
@@ -137,7 +137,7 @@ dd4hep_add_test_reg( AlignDet_AlephTPC_load
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
EXEC_ARGS geoPluginRun
-input file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC.xml
- -destroy -no-interpreter -plugin dd4hep_GlobalAlignmentInstall
+ -destroy -no-interpreter -plugin DD4hep_GlobalAlignmentInstall
REGEX_PASS "189 nodes/ 23 volume UID's in Detector Geometry"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
)
@@ -148,7 +148,7 @@ dd4hep_add_test_reg( AlignDet_AlephTPC_global_align
EXEC_ARGS geoPluginRun
-input file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC.xml
-destroy -no-interpreter
- -plugin dd4hep_GlobalAlignmentInstall
+ -plugin DD4hep_GlobalAlignmentInstall
-plugin DD4hepXMLLoader file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC_alignment.xml BUILD_DEFAULT
REGEX_PASS "Successfully parsed XML: AlephTPC_alignment.xml"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
@@ -160,7 +160,7 @@ dd4hep_add_test_reg( AlignDet_AlephTPC_global_reset
EXEC_ARGS geoPluginRun
-input file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC.xml
-destroy -no-interpreter
- -plugin dd4hep_GlobalAlignmentInstall
+ -plugin DD4hep_GlobalAlignmentInstall
-plugin DD4hepXMLLoader file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC_alignment.xml
-plugin DD4hepXMLLoader file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC_reset.xml
REGEX_PASS "Successfully parsed XML: AlephTPC_reset.xml"
diff --git a/examples/Conditions/CMakeLists.txt b/examples/Conditions/CMakeLists.txt
index 8e07b9e02..ff3a6624e 100644
--- a/examples/Conditions/CMakeLists.txt
+++ b/examples/Conditions/CMakeLists.txt
@@ -30,8 +30,8 @@ dd4hep_add_test_reg( Conditions_Telescope_cond_dump_by_pool
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
EXEC_ARGS geoPluginRun -volmgr -destroy
-compact file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
- -plugin dd4hep_ConditionsXMLRepositoryParser file:${DD4hep_DIR}/examples/Conditions/data/repository.xml
- -plugin dd4hep_ConditionsDump
+ -plugin DD4hep_ConditionsXMLRepositoryParser file:${DD4hep_DIR}/examples/Conditions/data/repository.xml
+ -plugin DD4hep_ConditionsDump
REGEX_PASS "Data\\(Translation-Rotation-Pivot\\): \\[\\( 0 , 0 , 1 \\), \\{phi\\(Z angle\\): 3.14159 theta\\(Y angle\\): 0 psi\\(X angle\\): 0\\}, \\( 0 , 0 , 0 \\)\\]"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
)
@@ -41,7 +41,7 @@ dd4hep_add_test_reg( Conditions_Telescope_cond_dump_by_detelement
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
EXEC_ARGS geoPluginRun -volmgr -destroy
-compact file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
- -plugin dd4hep_ConditionsXMLRepositoryParser file:${DD4hep_DIR}/examples/Conditions/data/repository.xml
+ -plugin DD4hep_ConditionsXMLRepositoryParser file:${DD4hep_DIR}/examples/Conditions/data/repository.xml
-plugin dd4hep_DetElementConditionsDump
REGEX_PASS "Path\\:/world/Telescope/module_9#alignment"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
diff --git a/examples/DDDB/CMakeLists.txt b/examples/DDDB/CMakeLists.txt
index 4cf6b768c..99879b78c 100644
--- a/examples/DDDB/CMakeLists.txt
+++ b/examples/DDDB/CMakeLists.txt
@@ -47,7 +47,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_load_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
REGEX_PASS "\\+ Converted 12852 placements"
REGEX_FAIL "EXCEPTION;Exception"
)
@@ -56,7 +56,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_conditions_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
REGEX_PASS "\\+ Converted 9353 conditions"
REGEX_FAIL "EXCEPTION;Exception"
)
@@ -65,7 +65,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_conditions_dump_simple_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
-exec DDDB_ConditionsSummary
REGEX_PASS "\\+ DDDB Total Number of parameters: 13650 "
REGEX_FAIL "EXCEPTION;Exception"
@@ -75,7 +75,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_det_elements_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller -end-plugin
+ -config DD4hep_ConditionsManagerInstaller -end-plugin
-plugin DDDB_DetectorDump -print DEBUG -end-plugin
REGEX_PASS "\\+ DDDB: Number of DetElements in the geometry: 6261"
REGEX_FAIL "EXCEPTION;Exception"
@@ -85,7 +85,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_det_volumes_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
-plugin DDDB_DetectorVolumeDump -print DEBUG
REGEX_PASS "\\+ DDDB: Number of DetElement placements: 6253"
REGEX_FAIL "EXCEPTION;Exception"
@@ -95,7 +95,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_det_conditions_keys_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
-plugin DDDB_DetectorConditionKeysDump -print DEBUG
REGEX_PASS "\\+ DDDB: Number of DetElement condition keys: 9043"
REGEX_FAIL "EXCEPTION;Exception"
@@ -105,7 +105,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_det_catalog_data_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
-plugin DDDB_DetectorConditionDump -print DEBUG
REGEX_PASS "\\+ DDDBConditions Total Number of parameters: 346312 "
REGEX_FAIL "EXCEPTION;Exception"
@@ -115,7 +115,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_det_catalog_align_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
-plugin DDDB_DetectorAlignmentDump -print DEBUG
REGEX_PASS "\\+ DDDB: Number of attached alignments: 5408"
REGEX_FAIL "EXCEPTION;Exception"
@@ -125,7 +125,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_detelement_conditions_dump_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
-plugin DDDB_DetElementConditionDump -print DEBUG
REGEX_PASS "\\+ DDDB: Total number of DetElement parameters: 13144"
)
@@ -134,7 +134,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_derived_conditions_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
-plugin DDDB_DerivedCondTest -print DEBUG
REGEX_PASS "\\+ DDDB: Total Number of callbacks: 16215"
REGEX_FAIL "EXCEPTION;Exception"
@@ -144,7 +144,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_alignment_derived_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
-plugin DDDB_DerivedAlignmentsTest -print DEBUG -turns 1 -access 3
REGEX_PASS "\\+ DDDB: AlignmentManager: 9352 conditions \\(S:0,L:9352,C:0,M:0\\) alignments: \\(A:6200,M:0\\) for IOV:epoch\\(0\\)"
REGEX_FAIL "EXCEPTION;Exception"
@@ -154,7 +154,7 @@ if (DD4HEP_USE_XERCESC)
dd4hep_add_test_reg( DDDB_alignment_access_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
- -config dd4hep_ConditionsManagerInstaller
+ -config DD4hep_ConditionsManagerInstaller
-plugin DDDB_AlignmentsAccessTest -print DEBUG
REGEX_PASS "\\+ DDDB: Accessed 5405 alignments from 5405 DetElement objects"
REGEX_FAIL "EXCEPTION;Exception"
--
GitLab