From f04142442a33851f0926444cb91f59d8fd946d80 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Sat, 17 Jun 2017 02:06:31 +0200
Subject: [PATCH] Namespace re-organisation
---
DDAlign/src/plugins/AlignmentsPlugins.cpp | 2 +-
DDAlign/src/plugins/GlobalAlignmentParser.cpp | 2 +-
DDCond/src/Type1/Manager_Type1.cpp | 2 +-
DDCond/src/plugins/ConditionsLinearPool.cpp | 12 +++---
DDCond/src/plugins/ConditionsMappedPool.cpp | 8 ++--
DDCond/src/plugins/ConditionsMultiLoader.cpp | 2 +-
DDCond/src/plugins/ConditionsPlugins.cpp | 30 +++++++-------
.../plugins/ConditionsRepositoryParser.cpp | 4 +-
.../plugins/ConditionsRepositoryWriter.cpp | 4 +-
DDCond/src/plugins/ConditionsUserPool.cpp | 4 +-
DDCond/src/plugins/ConditionsXmlLoader.cpp | 2 +-
DDCore/src/plugins/JsonProcessor.cpp | 2 +-
DDCore/src/plugins/LCDDConverter.cpp | 8 ++--
DDCore/src/plugins/PandoraConverter.cpp | 2 +-
DDCore/src/plugins/StandardPlugins.cpp | 40 +++++++++----------
DDCore/src/plugins/VolumeMgrTest.cpp | 2 +-
DDDB/src/plugins/DDDBPlugins.cpp | 2 +-
DDDetectors/src/Beampipe_o1_v01_geo.cpp | 2 +-
DDDetectors/src/BoxSegment_geo.cpp | 2 +-
DDDetectors/src/CylinderShell_geo.cpp | 2 +-
.../src/CylindricalBarrelCalorimeter_geo.cpp | 2 +-
.../src/CylindricalEndcapCalorimeter_geo.cpp | 2 +-
DDDetectors/src/DiskTracker_geo.cpp | 2 +-
DDDetectors/src/EcalBarrel_geo.cpp | 2 +-
DDDetectors/src/ForwardDetector_geo.cpp | 2 +-
DDDetectors/src/Mask_o1_v01_geo.cpp | 2 +-
DDDetectors/src/MultiLayerTracker_geo.cpp | 2 +-
DDDetectors/src/PolyconeSupport_geo.cpp | 2 +-
.../src/PolyhedraBarrelCalorimeter2_geo.cpp | 2 +-
.../src/PolyhedraEndcapCalorimeter2_geo.cpp | 2 +-
DDDetectors/src/SiTrackerBarrel_geo.cpp | 2 +-
DDDetectors/src/SiTrackerEndcap2_geo.cpp | 2 +-
DDDetectors/src/Solenoid_o1_v01_gep.cpp | 2 +-
DDDetectors/src/SubdetectorAssembly_geo.cpp | 2 +-
DDDetectors/src/TubeSegment_geo.cpp | 2 +-
UtilityApps/src/teve_display.cpp | 2 +-
.../AlignDet/src/Alignment_to_Condition.cpp | 2 +-
examples/AlignDet/src/Telescope_geo.cpp | 2 +-
.../SiBarrelMultiSensitiveDetector_geo.cpp | 2 +-
examples/ClientTests/src_boost/JsonDumper.cpp | 2 +-
examples/Conditions/src/ConditionsExample.cpp | 8 ++--
41 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/DDAlign/src/plugins/AlignmentsPlugins.cpp b/DDAlign/src/plugins/AlignmentsPlugins.cpp
index af7026c63..9741e908f 100644
--- a/DDAlign/src/plugins/AlignmentsPlugins.cpp
+++ b/DDAlign/src/plugins/AlignmentsPlugins.cpp
@@ -64,4 +64,4 @@ long create_global_alignment_xml_file(Detector& description, int argc, char** ar
except("AlignmentXmlWriter","++ Invalid top level detector element name: %s",path.c_str());
return 1;
}
-DECLARE_APPLY(dd4hep_GlobalAlignmentXmlWriter, create_global_alignment_xml_file)
+DECLARE_APPLY(DD4hep_GlobalAlignmentXmlWriter, create_global_alignment_xml_file)
diff --git a/DDAlign/src/plugins/GlobalAlignmentParser.cpp b/DDAlign/src/plugins/GlobalAlignmentParser.cpp
index af315fb89..6de513582 100644
--- a/DDAlign/src/plugins/GlobalAlignmentParser.cpp
+++ b/DDAlign/src/plugins/GlobalAlignmentParser.cpp
@@ -277,4 +277,4 @@ static long install_Alignment(Detector& description, int, char**) {
GlobalAlignmentCache::install(description);
return 1;
}
-DECLARE_APPLY(dd4hep_GlobalAlignmentInstall,install_Alignment)
+DECLARE_APPLY(DD4hep_GlobalAlignmentInstall,install_Alignment)
diff --git a/DDCond/src/Type1/Manager_Type1.cpp b/DDCond/src/Type1/Manager_Type1.cpp
index 5659452b7..9ff5f4605 100644
--- a/DDCond/src/Type1/Manager_Type1.cpp
+++ b/DDCond/src/Type1/Manager_Type1.cpp
@@ -45,7 +45,7 @@ DD4HEP_INSTANTIATE_HANDLE_NAMED(Manager_Type1);
static void* ddcond_create_manager_instance(Detector& description, int, char**) {
return (ConditionsManagerObject*)new Manager_Type1(description);
}
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsManager_Type1,ddcond_create_manager_instance)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsManager_Type1,ddcond_create_manager_instance)
#define NO_AGE 0
diff --git a/DDCond/src/plugins/ConditionsLinearPool.cpp b/DDCond/src/plugins/ConditionsLinearPool.cpp
index 3562ece26..1496d9fff 100644
--- a/DDCond/src/plugins/ConditionsLinearPool.cpp
+++ b/DDCond/src/plugins/ConditionsLinearPool.cpp
@@ -239,10 +239,10 @@ namespace {
_CR(create_list_update_pool,std::list,ConditionsLinearUpdatePool,UpdatePool)
}
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsLinearPool, create_vector_pool)
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsLinearVectorPool, create_vector_pool)
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsLinearUpdatePool, create_vector_update_pool)
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsLinearVectorUpdatePool,create_vector_update_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsLinearPool, create_vector_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsLinearVectorPool, create_vector_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsLinearUpdatePool, create_vector_update_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsLinearVectorUpdatePool,create_vector_update_pool)
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsLinearListPool, create_list_pool)
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsLinearListUpdatePool, create_list_update_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsLinearListPool, create_list_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsLinearListUpdatePool, create_list_update_pool)
diff --git a/DDCond/src/plugins/ConditionsMappedPool.cpp b/DDCond/src/plugins/ConditionsMappedPool.cpp
index 4335cd594..ec5322e69 100644
--- a/DDCond/src/plugins/ConditionsMappedPool.cpp
+++ b/DDCond/src/plugins/ConditionsMappedPool.cpp
@@ -241,7 +241,7 @@ namespace {
/// Create a conditions update pool based on STL hash-maps (unordered_map)
_CR(create_unordered_map_update_pool,std::unordered_map,ConditionsMappedUpdatePool,UpdatePool)
}
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsMappedPool, create_map_pool)
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsHashedPool, create_unordered_map_pool)
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsMappedUpdatePool, create_map_update_pool)
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsHashedUpdatePool, create_unordered_map_update_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsMappedPool, create_map_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsHashedPool, create_unordered_map_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsMappedUpdatePool, create_map_update_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsHashedUpdatePool, create_unordered_map_update_pool)
diff --git a/DDCond/src/plugins/ConditionsMultiLoader.cpp b/DDCond/src/plugins/ConditionsMultiLoader.cpp
index 43f4eb5ac..d81e68cde 100644
--- a/DDCond/src/plugins/ConditionsMultiLoader.cpp
+++ b/DDCond/src/plugins/ConditionsMultiLoader.cpp
@@ -101,7 +101,7 @@ namespace {
return new ConditionsMultiLoader(description,ConditionsManager(mgr),name);
}
}
-DECLARE_Detector_CONSTRUCTOR(dd4hep_Conditions_multi_Loader,create_loader)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_Conditions_multi_Loader,create_loader)
/// Standard constructor, initializes variables
ConditionsMultiLoader::ConditionsMultiLoader(Detector& description, ConditionsManager mgr, const string& nam)
diff --git a/DDCond/src/plugins/ConditionsPlugins.cpp b/DDCond/src/plugins/ConditionsPlugins.cpp
index c075eb8fb..50eee2dd2 100644
--- a/DDCond/src/plugins/ConditionsPlugins.cpp
+++ b/DDCond/src/plugins/ConditionsPlugins.cpp
@@ -90,7 +90,7 @@ static int ddcond_install_cond_mgr (Detector& description, int argc, char** argv
if ( h ) *h = mgr;
return 1;
}
-DECLARE_APPLY(dd4hep_ConditionsManagerInstaller,ddcond_install_cond_mgr)
+DECLARE_APPLY(DD4hep_ConditionsManagerInstaller,ddcond_install_cond_mgr)
/**
* Prepare the conditions manager for execution
@@ -178,7 +178,7 @@ static int ddcond_conditions_pool_processor(Detector& description, bool process_
static int ddcond_conditions_pool_process(Detector& description, int argc, char** argv) {
return ddcond_conditions_pool_processor(description, false, true, argc, argv);
}
-DECLARE_APPLY(dd4hep_ConditionsPoolProcessor,ddcond_conditions_pool_process)
+DECLARE_APPLY(DD4hep_ConditionsPoolProcessor,ddcond_conditions_pool_process)
// ======================================================================================
/// Plugin function: Dump of all Conditions pool with or without conditions
@@ -214,8 +214,8 @@ static int ddcond_dump_pools(Detector& description, int argc, char** argv) {
static int ddcond_dump_conditions(Detector& description, int argc, char** argv) {
return ddcond_conditions_pool_print(description, true, argc, argv);
}
-DECLARE_APPLY(dd4hep_ConditionsPoolDump,ddcond_dump_pools)
-DECLARE_APPLY(dd4hep_ConditionsDump,ddcond_dump_conditions)
+DECLARE_APPLY(DD4hep_ConditionsPoolDump,ddcond_dump_pools)
+DECLARE_APPLY(DD4hep_ConditionsDump,ddcond_dump_conditions)
// ======================================================================================
/// Plugin function: Dump of all Conditions associated to the detector elements
@@ -264,7 +264,7 @@ static int ddcond_detelement_dump(Detector& description, int argc, char** argv)
slice->manager.clean(pool->validity().iovType, 20);
return ret;
}
-DECLARE_APPLY(dd4hep_DetElementConditionsDump,ddcond_detelement_dump)
+DECLARE_APPLY(DD4hep_DetElementConditionsDump,ddcond_detelement_dump)
// ======================================================================================
/// Plugin function: Dump of all Conditions associated to the detector elements
@@ -280,7 +280,7 @@ static void* ddcond_prepare_plugin(Detector& description, int argc, char** argv)
UserPool* p = slice->pool.get();
return p && p->size() > 0 ? slice.release() : 0;
}
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsPrepare,ddcond_prepare_plugin)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsPrepare,ddcond_prepare_plugin)
#if 0
// ======================================================================================
/// Plugin function: Dump of all Conditions associated to the detector elements
@@ -326,7 +326,7 @@ static int ddcond_detelement_processor(Detector& description, int argc, char** a
slice->manager.clean(pool->validity().iovType, 20);
return ret;
}
-DECLARE_APPLY(dd4hep_DetElementConditionsProcessor,ddcond_detelement_processor)
+DECLARE_APPLY(DD4hep_DetElementConditionsProcessor,ddcond_detelement_processor)
#endif
// ======================================================================================
/// Plugin entry point: Synchronize conditions according to new IOV value
@@ -352,7 +352,7 @@ static long ddcond_synchronize_conditions(Detector& description, int argc, char*
arguments(argc,argv).c_str());
return 0;
}
-DECLARE_APPLY(dd4hep_ConditionsSynchronize,ddcond_synchronize_conditions)
+DECLARE_APPLY(DD4hep_ConditionsSynchronize,ddcond_synchronize_conditions)
// ======================================================================================
/// Plugin entry point: Clean conditions reposiory according to maximum age
@@ -378,7 +378,7 @@ static long ddcond_clean_conditions(Detector& description, int argc, char** argv
except("Conditions","+++ Failed cleaning conditions. Insufficient arguments!");
return 0;
}
-DECLARE_APPLY(dd4hep_ConditionsClean,ddcond_clean_conditions)
+DECLARE_APPLY(DD4hep_ConditionsClean,ddcond_clean_conditions)
// ======================================================================================
/// Basic entry point to instantiate the basic dd4hep conditions/alignmants printer
@@ -441,9 +441,9 @@ static void* create_printer(Detector& description, int argc,char** argv) {
static void* create_cond_printer(Detector& description, int argc,char** argv)
{ return create_printer<Condition::Processor,ConditionsPrinter>(description,argc,argv); }
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsPrinter,create_cond_printer)
-//DECLARE_Detector_CONSTRUCTOR(dd4hep_AlignmentsPrinter,create_printer<AlignmentsPrinter>)
-//DECLARE_Detector_CONSTRUCTOR(dd4hep_AlignedVolumePrinter,create_printer<AlignedVolumePrinter>)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsPrinter,create_cond_printer)
+//DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_AlignmentsPrinter,create_printer<AlignmentsPrinter>)
+//DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_AlignedVolumePrinter,create_printer<AlignedVolumePrinter>)
// ======================================================================================
/// Plugin entry point: Create repository csv file from loaded conditions
@@ -478,7 +478,7 @@ static long ddcond_create_repository(Detector& description, int argc, char** arg
ConditionsRepository().save(manager,output);
return 1;
}
-DECLARE_APPLY(dd4hep_ConditionsCreateRepository,ddcond_create_repository)
+DECLARE_APPLY(DD4hep_ConditionsCreateRepository,ddcond_create_repository)
// ======================================================================================
/// Plugin entry point: Dump conditions repository csv file
@@ -522,7 +522,7 @@ static long ddcond_dump_repository(Detector& /* description */, int argc, char**
}
return 1;
}
-DECLARE_APPLY(dd4hep_ConditionsDumpRepository,ddcond_dump_repository)
+DECLARE_APPLY(DD4hep_ConditionsDumpRepository,ddcond_dump_repository)
// ======================================================================================
/// Plugin entry point: Load conditions repository csv file into conditions manager
@@ -547,5 +547,5 @@ static long ddcond_load_repository(Detector& /* description */, int argc, char**
except("Conditions","+++ Failed loading conditions repository. Insufficient arguments!");
return 0;
}
-DECLARE_APPLY(dd4hep_ConditionsLoadRepository,ddcond_load_repository)
+DECLARE_APPLY(DD4hep_ConditionsLoadRepository,ddcond_load_repository)
// ======================================================================================
diff --git a/DDCond/src/plugins/ConditionsRepositoryParser.cpp b/DDCond/src/plugins/ConditionsRepositoryParser.cpp
index b8866b041..0a0d2a1c5 100644
--- a/DDCond/src/plugins/ConditionsRepositoryParser.cpp
+++ b/DDCond/src/plugins/ConditionsRepositoryParser.cpp
@@ -437,7 +437,7 @@ static long setup_repository_loglevel(Detector& /* description */, int argc, cha
arguments(argc,argv).c_str());
return 0;
}
-DECLARE_APPLY(dd4hep_ConditionsXMLRepositoryPrintLevel,setup_repository_loglevel)
+DECLARE_APPLY(DD4hep_ConditionsXMLRepositoryPrintLevel,setup_repository_loglevel)
#include "DD4hep/DD4hepUI.h"
@@ -460,4 +460,4 @@ static long setup_repository_Conditions(Detector& description, int argc, char**
except("XML_DOC_READER","Invalid number of arguments to interprete conditions: %d != %d.",argc,1);
return 0;
}
-DECLARE_APPLY(dd4hep_ConditionsXMLRepositoryParser,setup_repository_Conditions)
+DECLARE_APPLY(DD4hep_ConditionsXMLRepositoryParser,setup_repository_Conditions)
diff --git a/DDCond/src/plugins/ConditionsRepositoryWriter.cpp b/DDCond/src/plugins/ConditionsRepositoryWriter.cpp
index 0ac294056..b045b2993 100644
--- a/DDCond/src/plugins/ConditionsRepositoryWriter.cpp
+++ b/DDCond/src/plugins/ConditionsRepositoryWriter.cpp
@@ -490,7 +490,7 @@ static long write_repository_conditions(Detector& description, int argc, char**
writer.write(doc, output);
return 1;
}
-DECLARE_APPLY(dd4hep_ConditionsXMLRepositoryWriter,write_repository_conditions)
+DECLARE_APPLY(DD4hep_ConditionsXMLRepositoryWriter,write_repository_conditions)
// ======================================================================================
@@ -518,5 +518,5 @@ static long write_repository_manager(Detector& description, int argc, char** arg
writer.write(doc, output);
return 1;
}
-DECLARE_APPLY(dd4hep_ConditionsXMLManagerWriter,write_repository_manager)
+DECLARE_APPLY(DD4hep_ConditionsXMLManagerWriter,write_repository_manager)
// ======================================================================================
diff --git a/DDCond/src/plugins/ConditionsUserPool.cpp b/DDCond/src/plugins/ConditionsUserPool.cpp
index 770be4519..f0ad23607 100644
--- a/DDCond/src/plugins/ConditionsUserPool.cpp
+++ b/DDCond/src/plugins/ConditionsUserPool.cpp
@@ -765,9 +765,9 @@ namespace {
// Factory for the user pool using a binary tree map
void* create_map_user_pool(Detector& description, int argc, char** argv)
{ return create_pool<map<Condition::key_type,Condition::Object*> >(description, argc, argv); }
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsMapUserPool, create_map_user_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsMapUserPool, create_map_user_pool)
// Factory for the user pool using a binary tree map
void* create_unordered_map_user_pool(Detector& description, int argc, char** argv)
{ return create_pool<unordered_map<Condition::key_type,Condition::Object*> >(description, argc, argv); }
-DECLARE_Detector_CONSTRUCTOR(dd4hep_ConditionsUnorderedMapUserPool, create_map_user_pool)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_ConditionsUnorderedMapUserPool, create_map_user_pool)
diff --git a/DDCond/src/plugins/ConditionsXmlLoader.cpp b/DDCond/src/plugins/ConditionsXmlLoader.cpp
index 1fb2daebb..3fe0c8c7d 100644
--- a/DDCond/src/plugins/ConditionsXmlLoader.cpp
+++ b/DDCond/src/plugins/ConditionsXmlLoader.cpp
@@ -90,7 +90,7 @@ namespace {
return new ConditionsXmlLoader(description,ConditionsManager(mgr),name);
}
}
-DECLARE_Detector_CONSTRUCTOR(dd4hep_Conditions_xml_Loader,create_loader)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_Conditions_xml_Loader,create_loader)
/// Standard constructor, initializes variables
ConditionsXmlLoader::ConditionsXmlLoader(Detector& description, ConditionsManager mgr, const std::string& nam)
diff --git a/DDCore/src/plugins/JsonProcessor.cpp b/DDCore/src/plugins/JsonProcessor.cpp
index e6d18fae9..b52a56e37 100644
--- a/DDCore/src/plugins/JsonProcessor.cpp
+++ b/DDCore/src/plugins/JsonProcessor.cpp
@@ -156,7 +156,7 @@ static long handle_json(Detector& description, int argc, char** argv) {
printout(INFO,"JsonProcessor","++ ... Successfully processed JSON input: %s",file.c_str());
return 1;
}
-DECLARE_APPLY(dd4hep_JsonProcessor,handle_json)
+DECLARE_APPLY(DD4hep_JsonProcessor,handle_json)
#endif // DD4HEP_USE_BOOST
diff --git a/DDCore/src/plugins/LCDDConverter.cpp b/DDCore/src/plugins/LCDDConverter.cpp
index 011bff975..79ff884e4 100644
--- a/DDCore/src/plugins/LCDDConverter.cpp
+++ b/DDCore/src/plugins/LCDDConverter.cpp
@@ -1316,7 +1316,7 @@ static long create_visASCII(Detector& description, int /* argc */, char** argv)
return 1;
}
-DECLARE_APPLY(dd4hepGeometry2VIS, create_vis)
-DECLARE_APPLY(dd4hepGeometry2VISASCII, create_visASCII)
-DECLARE_APPLY(dd4hepGeometry2GDML, create_gdml)
-DECLARE_APPLY(dd4hepGeometry2Detector, create_description)
+DECLARE_APPLY(DD4hepGeometry2VIS, create_vis)
+DECLARE_APPLY(DD4hepGeometry2VISASCII, create_visASCII)
+DECLARE_APPLY(DD4hepGeometry2GDML, create_gdml)
+DECLARE_APPLY(DD4hepGeometry2Detector, create_description)
diff --git a/DDCore/src/plugins/PandoraConverter.cpp b/DDCore/src/plugins/PandoraConverter.cpp
index 42977ed89..81ea02a5e 100644
--- a/DDCore/src/plugins/PandoraConverter.cpp
+++ b/DDCore/src/plugins/PandoraConverter.cpp
@@ -897,4 +897,4 @@ static long create_description(Detector& /* description */, int /* argc */, char
}
#endif
}
-DECLARE_APPLY(dd4hepGeometry2PANDORA,create_description)
+DECLARE_APPLY(DD4hepGeometry2PANDORA,create_description)
diff --git a/DDCore/src/plugins/StandardPlugins.cpp b/DDCore/src/plugins/StandardPlugins.cpp
index 303e00e76..30d013929 100644
--- a/DDCore/src/plugins/StandardPlugins.cpp
+++ b/DDCore/src/plugins/StandardPlugins.cpp
@@ -81,7 +81,7 @@ static long display(Detector& description, int argc, char** argv) {
}
return 0;
}
-DECLARE_APPLY(dd4hepGeometryDisplay,display)
+DECLARE_APPLY(DD4hepGeometryDisplay,display)
/// Basic entry point to start the ROOT interpreter.
/**
@@ -97,7 +97,7 @@ static long run_interpreter(Detector& /* description */, int argc, char** argv)
app.Run();
return 1;
}
-DECLARE_APPLY(dd4hepRint,run_interpreter)
+DECLARE_APPLY(DD4hepRint,run_interpreter)
/// Basic entry point to start the ROOT interpreter.
/**
@@ -121,7 +121,7 @@ static long root_ui(Detector& description, int /* argc */, char** /* argv */) {
"to interact with the detector description.");
return 1;
}
-DECLARE_APPLY(dd4hepInteractiveUI,root_ui)
+DECLARE_APPLY(DD4hepInteractiveUI,root_ui)
/// Basic entry point to dump the ROOT TGeoElementTable object
/**
@@ -226,7 +226,7 @@ static long root_elements(Detector& description, int argc, char** argv) {
}
return 1;
}
-DECLARE_APPLY(dd4hepElementTable,root_elements)
+DECLARE_APPLY(DD4hepElementTable,root_elements)
/// Basic entry point to dump the ROOT TGeoElementTable object
/**
@@ -341,7 +341,7 @@ static long root_materials(Detector& description, int argc, char** argv) {
}
return 1;
}
-DECLARE_APPLY(dd4hepMaterialTable,root_materials)
+DECLARE_APPLY(DD4hepMaterialTable,root_materials)
/// Basic entry point to interprete an XML document
/**
@@ -373,7 +373,7 @@ static long load_compact(Detector& description, int argc, char** argv) {
}
return 0;
}
-DECLARE_APPLY(dd4hepCompactLoader,load_compact)
+DECLARE_APPLY(DD4hepCompactLoader,load_compact)
/// Basic entry point to process any XML document.
/**
@@ -407,7 +407,7 @@ static long load_xml(Detector& description, int argc, char** argv) {
}
return 0;
}
-DECLARE_APPLY(dd4hepXMLLoader,load_xml)
+DECLARE_APPLY(DD4hepXMLLoader,load_xml)
/// Basic entry point to process any pre-parsed XML document.
/**
@@ -446,7 +446,7 @@ static long process_xml_doc(Detector& description, int argc, char** argv) {
}
return 0;
}
-DECLARE_APPLY(dd4hepXMLProcessor,process_xml_doc)
+DECLARE_APPLY(DD4hepXMLProcessor,process_xml_doc)
/// Basic entry point to load the volume manager object
/**
@@ -475,7 +475,7 @@ static long load_volmgr(Detector& description, int, char**) {
}
return 0;
}
-DECLARE_APPLY(dd4hepVolumeManager,load_volmgr)
+DECLARE_APPLY(DD4hepVolumeManager,load_volmgr)
/// Basic entry point to dump a dd4hep geometry to a ROOT file
/**
@@ -497,7 +497,7 @@ static long dump_geometry2root(Detector& description, int argc, char** argv) {
printout(ERROR,"Geometry2ROOT","+++ No output file name given.");
return 0;
}
-DECLARE_APPLY(dd4hepGeometry2ROOT,dump_geometry2root)
+DECLARE_APPLY(DD4hepGeometry2ROOT,dump_geometry2root)
/// Basic entry point to load a dd4hep geometry directly from the ROOT file
/**
@@ -518,7 +518,7 @@ static long load_geometryFromroot(Detector& description, int argc, char** argv)
printout(ERROR,"dd4hepRootLoader","+++ No input file name given.");
return 0;
}
-DECLARE_APPLY(dd4hepRootLoader,load_geometryFromroot)
+DECLARE_APPLY(DD4hepRootLoader,load_geometryFromroot)
/// Basic entry point to print out the volume hierarchy
/**
@@ -645,7 +645,7 @@ static long dump_volume_tree(Detector& description, int argc, char** argv) {
Actor actor(argc,argv);
return actor.dump(description.world().placement().ptr(),pv.ptr(),0,PlacedVolume::VolIDs());
}
-DECLARE_APPLY(dd4hepVolumeDump,dump_volume_tree)
+DECLARE_APPLY(DD4hepVolumeDump,dump_volume_tree)
// ======================================================================================
/// Plugin function: Apply arbitrary functor callback on the tree of detector elements
@@ -671,7 +671,7 @@ static int detelement_processor(Detector& description, int argc, char** argv)
}
return DetectorScanner().scan(*proc,det);
}
-DECLARE_APPLY(dd4hep_DetElementProcessor,detelement_processor)
+DECLARE_APPLY(DD4hep_DetElementProcessor,detelement_processor)
/// Basic entry point to print out the detector element hierarchy
/**
@@ -729,8 +729,8 @@ template <int flag> long dump_detelement_tree(Detector& description, int argc, c
}
return Actor::dump(description.world(),0,sensitive_only);
}
-DECLARE_APPLY(dd4hepDetectorDump,dump_detelement_tree<0>)
-DECLARE_APPLY(dd4hepDetectorVolumeDump,dump_detelement_tree<1>)
+DECLARE_APPLY(DD4hepDetectorDump,dump_detelement_tree<0>)
+DECLARE_APPLY(DD4hepDetectorVolumeDump,dump_detelement_tree<1>)
/// Basic entry point to print out the volume hierarchy
/**
@@ -754,7 +754,7 @@ static long detelement_cache(Detector& description, int , char** ) {
};
return Actor::cache(description.world());
}
-DECLARE_APPLY(dd4hepDetElementCache,detelement_cache)
+DECLARE_APPLY(DD4hepDetElementCache,detelement_cache)
/// Basic entry point to dump the geometry tree of the description instance
/**
@@ -770,7 +770,7 @@ static long exec_GeometryTreeDump(Detector& description, int, char** ) {
dmp.create(description.world());
return 1;
}
-DECLARE_APPLY(dd4hepGeometryTreeDump,exec_GeometryTreeDump)
+DECLARE_APPLY(DD4hepGeometryTreeDump,exec_GeometryTreeDump)
/// Basic entry point to dump the geometry in GDML format
/**
@@ -794,7 +794,7 @@ static long exec_SimpleGDMLWriter(Detector& description, int argc, char** argv)
}
return 1;
}
-DECLARE_APPLY(dd4hepSimpleGDMLWriter,exec_SimpleGDMLWriter)
+DECLARE_APPLY(DD4hepSimpleGDMLWriter,exec_SimpleGDMLWriter)
/// Basic entry point to print out detector type map
/**
@@ -815,7 +815,7 @@ static long detectortype_cache(Detector& description, int , char** ) {
}
return 1;
}
-DECLARE_APPLY(dd4hepDetectorTypes,detectortype_cache)
+DECLARE_APPLY(DD4hepDetectorTypes,detectortype_cache)
#include "DD4hep/SurfaceInstaller.h"
typedef SurfaceInstaller TestSurfacesPlugin;
@@ -831,5 +831,5 @@ static long install_plugin_tester(Detector& description, int , char** ) {
}
return 1;
}
-DECLARE_APPLY(dd4hepPluginTester,install_plugin_tester)
+DECLARE_APPLY(DD4hepPluginTester,install_plugin_tester)
diff --git a/DDCore/src/plugins/VolumeMgrTest.cpp b/DDCore/src/plugins/VolumeMgrTest.cpp
index 34085eb34..1ba05678e 100644
--- a/DDCore/src/plugins/VolumeMgrTest.cpp
+++ b/DDCore/src/plugins/VolumeMgrTest.cpp
@@ -296,4 +296,4 @@ long VolIDTest::run(Detector& description,int argc,char** argv) {
return 1;
}
-DECLARE_APPLY(dd4hepVolumeMgrTest,VolIDTest::run)
+DECLARE_APPLY(DD4hepVolumeMgrTest,VolIDTest::run)
diff --git a/DDDB/src/plugins/DDDBPlugins.cpp b/DDDB/src/plugins/DDDBPlugins.cpp
index f80f16f02..ab4b7fec4 100644
--- a/DDDB/src/plugins/DDDBPlugins.cpp
+++ b/DDDB/src/plugins/DDDBPlugins.cpp
@@ -65,4 +65,4 @@ static void* create_dddb_loader(Detector& description, int argc, char** argv)
cond::ConditionsManagerObject* m = (cond::ConditionsManagerObject*)(argc>0 ? argv[1] : 0);
return new DDDB::DDDBConditionsLoader(description,m,name);
}
-DECLARE_Detector_CONSTRUCTOR(dd4hep_Conditions_dddb_Loader,create_dddb_loader)
+DECLARE_DD4HEP_CONSTRUCTOR(DD4hep_Conditions_dddb_Loader,create_dddb_loader)
diff --git a/DDDetectors/src/Beampipe_o1_v01_geo.cpp b/DDDetectors/src/Beampipe_o1_v01_geo.cpp
index 97f006b6c..676070f84 100644
--- a/DDDetectors/src/Beampipe_o1_v01_geo.cpp
+++ b/DDDetectors/src/Beampipe_o1_v01_geo.cpp
@@ -619,4 +619,4 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& description,
return tube;
}
-DECLARE_DETELEMENT(dd4hep_Beampipe_o1_v01,create_element)
+DECLARE_DETELEMENT(DD4hep_Beampipe_o1_v01,create_element)
diff --git a/DDDetectors/src/BoxSegment_geo.cpp b/DDDetectors/src/BoxSegment_geo.cpp
index c0d01af23..2762c115d 100644
--- a/DDDetectors/src/BoxSegment_geo.cpp
+++ b/DDDetectors/src/BoxSegment_geo.cpp
@@ -51,5 +51,5 @@ static Ref_t create_element(Detector& description, xml_h e, Ref_t sens) {
}
// first argument is the type from the xml file
-DECLARE_DETELEMENT(dd4hep_BoxSegment,create_element)
+DECLARE_DETELEMENT(DD4hep_BoxSegment,create_element)
DECLARE_DEPRECATED_DETELEMENT(BoxSegment,create_element)
diff --git a/DDDetectors/src/CylinderShell_geo.cpp b/DDDetectors/src/CylinderShell_geo.cpp
index d71ac525d..453f4c8ae 100644
--- a/DDDetectors/src/CylinderShell_geo.cpp
+++ b/DDDetectors/src/CylinderShell_geo.cpp
@@ -83,4 +83,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_CylinderShell,create_detector)
+DECLARE_DETELEMENT(DD4hep_CylinderShell,create_detector)
diff --git a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
index 2e5bf742f..6256d2ff5 100644
--- a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
@@ -77,5 +77,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_CylindricalBarrelCalorimeter,create_detector)
+DECLARE_DETELEMENT(DD4hep_CylindricalBarrelCalorimeter,create_detector)
DECLARE_DEPRECATED_DETELEMENT(CylindricalBarrelCalorimeter,create_detector)
diff --git a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
index abaa8b112..4530d1836 100644
--- a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
@@ -101,5 +101,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_CylindricalEndcapCalorimeter,create_detector)
+DECLARE_DETELEMENT(DD4hep_CylindricalEndcapCalorimeter,create_detector)
DECLARE_DEPRECATED_DETELEMENT(CylindricalEndcapCalorimeter,create_detector)
diff --git a/DDDetectors/src/DiskTracker_geo.cpp b/DDDetectors/src/DiskTracker_geo.cpp
index 8d3ca4b5b..67f6f0ec3 100644
--- a/DDDetectors/src/DiskTracker_geo.cpp
+++ b/DDDetectors/src/DiskTracker_geo.cpp
@@ -85,5 +85,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_DiskTracker,create_detector)
+DECLARE_DETELEMENT(DD4hep_DiskTracker,create_detector)
DECLARE_DEPRECATED_DETELEMENT(DiskTracker,create_detector)
diff --git a/DDDetectors/src/EcalBarrel_geo.cpp b/DDDetectors/src/EcalBarrel_geo.cpp
index 8a608d96c..ef453d561 100644
--- a/DDDetectors/src/EcalBarrel_geo.cpp
+++ b/DDDetectors/src/EcalBarrel_geo.cpp
@@ -164,5 +164,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_EcalBarrel,create_detector)
+DECLARE_DETELEMENT(DD4hep_EcalBarrel,create_detector)
DECLARE_DEPRECATED_DETELEMENT(EcalBarrel,create_detector)
diff --git a/DDDetectors/src/ForwardDetector_geo.cpp b/DDDetectors/src/ForwardDetector_geo.cpp
index c0c8e3d8e..40a4e0331 100644
--- a/DDDetectors/src/ForwardDetector_geo.cpp
+++ b/DDDetectors/src/ForwardDetector_geo.cpp
@@ -195,5 +195,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_ForwardDetector,create_detector)
+DECLARE_DETELEMENT(DD4hep_ForwardDetector,create_detector)
DECLARE_DEPRECATED_DETELEMENT(ForwardDetector,create_detector)
diff --git a/DDDetectors/src/Mask_o1_v01_geo.cpp b/DDDetectors/src/Mask_o1_v01_geo.cpp
index 183d402e7..bb136c2d0 100644
--- a/DDDetectors/src/Mask_o1_v01_geo.cpp
+++ b/DDDetectors/src/Mask_o1_v01_geo.cpp
@@ -230,4 +230,4 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& description,
return tube;
}
-DECLARE_DETELEMENT(dd4hep_Mask_o1_v01,create_element)
+DECLARE_DETELEMENT(DD4hep_Mask_o1_v01,create_element)
diff --git a/DDDetectors/src/MultiLayerTracker_geo.cpp b/DDDetectors/src/MultiLayerTracker_geo.cpp
index ead77cdd8..114dd3706 100644
--- a/DDDetectors/src/MultiLayerTracker_geo.cpp
+++ b/DDDetectors/src/MultiLayerTracker_geo.cpp
@@ -77,5 +77,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_MultiLayerTracker,create_detector)
+DECLARE_DETELEMENT(DD4hep_MultiLayerTracker,create_detector)
DECLARE_DEPRECATED_DETELEMENT(MultiLayerTracker,create_detector)
diff --git a/DDDetectors/src/PolyconeSupport_geo.cpp b/DDDetectors/src/PolyconeSupport_geo.cpp
index 528858987..097d2bda6 100644
--- a/DDDetectors/src/PolyconeSupport_geo.cpp
+++ b/DDDetectors/src/PolyconeSupport_geo.cpp
@@ -59,5 +59,5 @@ static Ref_t create_detector(Detector& description, xml_h e, Ref_t sens) {
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_PolyconeSupport,create_detector)
+DECLARE_DETELEMENT(DD4hep_PolyconeSupport,create_detector)
DECLARE_DEPRECATED_DETELEMENT(PolyconeSupport,create_detector)
diff --git a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
index 8b382fe20..c9f044282 100644
--- a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
@@ -184,5 +184,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_PolyhedraBarrelCalorimeter2, create_detector)
+DECLARE_DETELEMENT(DD4hep_PolyhedraBarrelCalorimeter2, create_detector)
DECLARE_DEPRECATED_DETELEMENT(PolyhedraBarrelCalorimeter2,create_detector)
diff --git a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
index 9aa4ee684..c5b6eb821 100644
--- a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
@@ -130,5 +130,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return endcap;
}
-DECLARE_DETELEMENT(dd4hep_PolyhedraEndcapCalorimeter2,create_detector)
+DECLARE_DETELEMENT(DD4hep_PolyhedraEndcapCalorimeter2,create_detector)
DECLARE_DEPRECATED_DETELEMENT(PolyhedraEndcapCalorimeter2,create_detector)
diff --git a/DDDetectors/src/SiTrackerBarrel_geo.cpp b/DDDetectors/src/SiTrackerBarrel_geo.cpp
index 2bcde0c3e..b6970a911 100644
--- a/DDDetectors/src/SiTrackerBarrel_geo.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_geo.cpp
@@ -167,5 +167,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_SiTrackerBarrel,create_detector)
+DECLARE_DETELEMENT(DD4hep_SiTrackerBarrel,create_detector)
DECLARE_DEPRECATED_DETELEMENT(SiTrackerBarrel,create_detector)
diff --git a/DDDetectors/src/SiTrackerEndcap2_geo.cpp b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
index b422ce6cc..275946b02 100644
--- a/DDDetectors/src/SiTrackerEndcap2_geo.cpp
+++ b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
@@ -133,5 +133,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_SiTrackerEndcap2,create_detector)
+DECLARE_DETELEMENT(DD4hep_SiTrackerEndcap2,create_detector)
DECLARE_DEPRECATED_DETELEMENT(SiTrackerEndcap2,create_detector)
diff --git a/DDDetectors/src/Solenoid_o1_v01_gep.cpp b/DDDetectors/src/Solenoid_o1_v01_gep.cpp
index bbfe18b0e..00f17a2cd 100644
--- a/DDDetectors/src/Solenoid_o1_v01_gep.cpp
+++ b/DDDetectors/src/Solenoid_o1_v01_gep.cpp
@@ -133,4 +133,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
}
-DECLARE_DETELEMENT(dd4hep_Solenoid_o1_v01,create_detector)
+DECLARE_DETELEMENT(DD4hep_Solenoid_o1_v01,create_detector)
diff --git a/DDDetectors/src/SubdetectorAssembly_geo.cpp b/DDDetectors/src/SubdetectorAssembly_geo.cpp
index 113f6b775..ec408bb7e 100644
--- a/DDDetectors/src/SubdetectorAssembly_geo.cpp
+++ b/DDDetectors/src/SubdetectorAssembly_geo.cpp
@@ -81,4 +81,4 @@ static Ref_t create_element(Detector& description, xml_h e, Ref_t) {
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_SubdetectorAssembly,create_element)
+DECLARE_DETELEMENT(DD4hep_SubdetectorAssembly,create_element)
diff --git a/DDDetectors/src/TubeSegment_geo.cpp b/DDDetectors/src/TubeSegment_geo.cpp
index 927c07b48..940a5be1a 100644
--- a/DDDetectors/src/TubeSegment_geo.cpp
+++ b/DDDetectors/src/TubeSegment_geo.cpp
@@ -51,5 +51,5 @@ static Ref_t create_element(Detector& description, xml_h e, Ref_t sens) {
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_TubeSegment,create_element)
+DECLARE_DETELEMENT(DD4hep_TubeSegment,create_element)
DECLARE_DEPRECATED_DETELEMENT(TubeSegment,create_element)
diff --git a/UtilityApps/src/teve_display.cpp b/UtilityApps/src/teve_display.cpp
index 1b1261aba..ddbeca979 100644
--- a/UtilityApps/src/teve_display.cpp
+++ b/UtilityApps/src/teve_display.cpp
@@ -149,7 +149,7 @@ static long teve_display(Detector& description, int /* argc */, char** /* argv *
return 1;
}
-DECLARE_APPLY(dd4hepTEveDisplay,teve_display)
+DECLARE_APPLY(DD4hepTEveDisplay,teve_display)
//=====================================================================================================================
diff --git a/examples/AlignDet/src/Alignment_to_Condition.cpp b/examples/AlignDet/src/Alignment_to_Condition.cpp
index b9e6f974f..471032a48 100644
--- a/examples/AlignDet/src/Alignment_to_Condition.cpp
+++ b/examples/AlignDet/src/Alignment_to_Condition.cpp
@@ -76,4 +76,4 @@ static int Alignment_to_Condition (Detector& , int argc, char** argv) {
return 1;
}
-DECLARE_APPLY(dd4hep_Alignment2Condition,Alignment_to_Condition)
+DECLARE_APPLY(DD4hep_Alignment2Condition,Alignment_to_Condition)
diff --git a/examples/AlignDet/src/Telescope_geo.cpp b/examples/AlignDet/src/Telescope_geo.cpp
index 62d74e7aa..6ef3999f5 100644
--- a/examples/AlignDet/src/Telescope_geo.cpp
+++ b/examples/AlignDet/src/Telescope_geo.cpp
@@ -79,4 +79,4 @@ static Ref_t create_element(Detector& description, xml_h e, SensitiveDetector sd
}
// first argument is the type from the xml file
-DECLARE_DETELEMENT(dd4hep_Example_Telescope,create_element)
+DECLARE_DETELEMENT(DD4hep_Example_Telescope,create_element)
diff --git a/examples/ClientTests/src/SiBarrelMultiSensitiveDetector_geo.cpp b/examples/ClientTests/src/SiBarrelMultiSensitiveDetector_geo.cpp
index 45d31d37d..da4b2aaa2 100644
--- a/examples/ClientTests/src/SiBarrelMultiSensitiveDetector_geo.cpp
+++ b/examples/ClientTests/src/SiBarrelMultiSensitiveDetector_geo.cpp
@@ -179,4 +179,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(dd4hep_SiBarrelMultiSensitiveDetector,create_detector)
+DECLARE_DETELEMENT(DD4hep_SiBarrelMultiSensitiveDetector,create_detector)
diff --git a/examples/ClientTests/src_boost/JsonDumper.cpp b/examples/ClientTests/src_boost/JsonDumper.cpp
index 81bddcbcf..d13e3ce6a 100644
--- a/examples/ClientTests/src_boost/JsonDumper.cpp
+++ b/examples/ClientTests/src_boost/JsonDumper.cpp
@@ -31,6 +31,6 @@ static long json_dump(Detector& /* description */, int argc, char** argv) {
printout(INFO,"JsonDumper","+++ Successfully dumped json input: %s.",fname.c_str());
return 1;
}
-DECLARE_APPLY(dd4hep_JsonDumper,json_dump)
+DECLARE_APPLY(DD4hep_JsonDumper,json_dump)
#endif
diff --git a/examples/Conditions/src/ConditionsExample.cpp b/examples/Conditions/src/ConditionsExample.cpp
index 987e8d08b..2d32781b8 100644
--- a/examples/Conditions/src/ConditionsExample.cpp
+++ b/examples/Conditions/src/ConditionsExample.cpp
@@ -204,8 +204,8 @@ namespace {
}
-DECLARE_APPLY(dd4hep_Test_ConditionsAccess,example1)
-DECLARE_APPLY(dd4hep_Test_ConditionsExample3,example3)
-DECLARE_APPLY(dd4hep_Test_ConditionsTreeDump,example2)
-DECLARE_APPLY(dd4hep_Test_CallbackInstall,dd4hep_CallbackInstallTest)
+DECLARE_APPLY(DD4hep_Test_ConditionsAccess,example1)
+DECLARE_APPLY(DD4hep_Test_ConditionsExample3,example3)
+DECLARE_APPLY(DD4hep_Test_ConditionsTreeDump,example2)
+DECLARE_APPLY(DD4hep_Test_CallbackInstall,dd4hep_CallbackInstallTest)
#endif
--
GitLab