From 0081d3cd7ce51bf22023dfae64baad8397babe67 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Sat, 17 Jun 2017 02:50:39 +0200
Subject: [PATCH] Namespace re-organisation
---
DDCond/src/Type1/Manager_Type1.cpp | 6 +-
DDCond/src/plugins/ConditionsMultiLoader.cpp | 2 +-
DDCond/src/plugins/ConditionsPlugins.cpp | 8 +-
DDCore/include/DD4hep/VolumeManager.h | 2 +-
DDCore/src/DD4hepUI.cpp | 10 +-
DDCore/src/Handle.cpp | 2 +-
DDCore/src/Plugins.cpp | 8 +-
DDCore/src/VolumeManager.cpp | 2 +-
DDCore/src/plugins/Compact2Objects.cpp | 2 +-
DDCore/src/plugins/JsonProcessor.cpp | 2 +-
DDCore/src/plugins/StandardPlugins.cpp | 40 ++---
DDCore/src/plugins/VolumeMgrTest.cpp | 6 +-
DDDB/src/plugins/DDDB2Objects.cpp | 6 +-
DDDB/src/plugins/DDDBExecutor.cpp | 4 +-
DDDB/src/plugins/DDDBPlugins.cpp | 8 +-
DDDetectors/compact/SiD/SiD_Beamcal.xml | 2 +-
DDDetectors/compact/SiD/SiD_Beampipe.xml | 26 +--
DDDetectors/compact/SiD/SiD_EcalBarrel.xml | 2 +-
DDDetectors/compact/SiD/SiD_EcalEndcap.xml | 2 +-
DDDetectors/compact/SiD/SiD_HcalBarrel.xml | 2 +-
DDDetectors/compact/SiD/SiD_HcalEndcap.xml | 2 +-
DDDetectors/compact/SiD/SiD_HcalPlug.xml | 2 +-
DDDetectors/compact/SiD/SiD_Lumical.xml | 6 +-
DDDetectors/compact/SiD/SiD_MuonBarrel.xml | 2 +-
DDDetectors/compact/SiD/SiD_MuonEndcap.xml | 2 +-
DDDetectors/compact/SiD/SiD_Shields.xml | 18 +-
DDDetectors/compact/SiD/SiD_Solenoid.xml | 8 +-
DDDetectors/compact/SiD/SiD_TrackerBarrel.xml | 2 +-
DDDetectors/compact/SiD/SiD_TrackerEndcap.xml | 2 +-
.../compact/SiD/SiD_TrackerForward.xml | 2 +-
.../compact/SiD/SiD_TrackerSupport.xml | 52 +++---
DDDetectors/compact/SiD/SiD_VertexBarrel.xml | 2 +-
DDDetectors/compact/SiD/SiD_VertexEndcap.xml | 2 +-
DDDetectors/compact/SiD/SiD_VertexSupport.xml | 22 +--
DDDetectors/compact/SiD_Markus.xml | 4 +-
DDDetectors/doc/README.ExtensionPlugins | 4 +-
DDDetectors/src/Beampipe_o1_v01_geo.cpp | 4 +-
DDDetectors/src/CaloFaceBarrel_surfaces.cpp | 6 +-
DDDetectors/src/CaloFaceEndcap_surfaces.cpp | 6 +-
DDDetectors/src/GenericSurfaceInstaller.cpp | 8 +-
DDDetectors/src/Mask_o1_v01_geo.cpp | 4 +-
DDDetectors/src/SiTrackerBarrel_surfaces.cpp | 2 +-
DDEve/src/MultiView.cpp | 8 +-
DDEve/src/ViewMenu.cpp | 16 +-
DDG4/examples/TEve.C | 2 +-
DDG4/src/Geant4Kernel.cpp | 4 +-
UtilityApps/src/converter.cpp | 14 +-
UtilityApps/src/display.cpp | 2 +-
UtilityApps/src/plugin_runner.cpp | 2 +-
UtilityApps/src/run_plugin.h | 6 +-
UtilityApps/src/teve_display.cpp | 2 +-
cmake/DD4hepBuild.cmake | 16 +-
cmake/thisdd4hep.sh | 2 +-
doc/LaTex/DD4hepManual.tex | 2 +-
doc/ReleaseNotes.md | 4 +-
examples/AlignDet/CMakeLists.txt | 8 +-
examples/AlignDet/compact/Telescope.xml | 2 +-
.../AlignDet/src/AlignmentExampleObjects.cpp | 8 +-
.../src/AlignmentExample_align_telescope.cpp | 2 +-
.../src/AlignmentExample_read_xml.cpp | 2 +-
examples/CLICSiD/compact/compact.xml | 158 +++++++++---------
examples/ClientTests/CMakeLists.txt | 20 +--
.../compact/Bitfield_SidesTest.xml | 2 +-
.../compact/Bitfield_SidesTest2.xml | 2 +-
.../ClientTests/compact/DuplicateSysID.xml | 4 +-
examples/ClientTests/compact/IronCylinder.xml | 2 +-
.../ClientTests/compact/MultiCollections.xml | 2 +-
.../compact/MultiSegmentCollections.xml | 2 +-
.../compact/MultiSegmentations.xml | 2 +-
.../ClientTests/compact/NestedDetectors.xml | 2 +-
examples/ClientTests/compact/NestedSimple.xml | 2 +-
.../ClientTests/compact/NestedSolenoid.xml | 2 +-
.../SiBarrelMultiSensitiveDetector.xml | 2 +-
.../SiBarrelMultiSensitiveLongVolID.xml | 2 +-
examples/ClientTests/compact/SiliconBlock.xml | 4 +-
examples/ClientTests/scripts/BoxTrafos.C | 4 +-
examples/ClientTests/src_boost/JsonDumper.cpp | 2 +-
examples/Conditions/data/manager.xml | 6 +-
.../src/ConditionExampleObjects.cpp | 8 +-
examples/Conditions/src/ConditionsExample.cpp | 2 +-
examples/Conditions/src/ConditionsTest.cpp | 6 +-
examples/Conditions/xml/Sequence_1.xml | 16 +-
examples/Conditions/xml/Sequence_2.xml | 10 +-
examples/Conditions/xml/plugins.xml | 18 +-
.../examples/run_sitracking_SimpleCLIC.xml | 4 +-
85 files changed, 345 insertions(+), 345 deletions(-)
diff --git a/DDCond/src/Type1/Manager_Type1.cpp b/DDCond/src/Type1/Manager_Type1.cpp
index 9ff5f4605..ff252ec7f 100644
--- a/DDCond/src/Type1/Manager_Type1.cpp
+++ b/DDCond/src/Type1/Manager_Type1.cpp
@@ -140,8 +140,8 @@ Manager_Type1::Manager_Type1(Detector& description_instance)
InstanceCount::increment(this);
declareProperty("MaxIOVTypes", m_maxIOVTypes=32);
declareProperty("PoolType", m_poolType = "");
- declareProperty("UpdatePoolType", m_updateType = "dd4hep_ConditionsLinearUpdatePool");
- declareProperty("UserPoolType", m_userType = "dd4hep_ConditionsMapUserPool");
+ declareProperty("UpdatePoolType", m_updateType = "DD4hep_ConditionsLinearUpdatePool");
+ declareProperty("UserPoolType", m_userType = "DD4hep_ConditionsMapUserPool");
declareProperty("LoaderType", m_loaderType = "multi");
m_iovTypes.resize(m_maxIOVTypes,IOVType());
m_rawPool.resize(m_maxIOVTypes,0);
@@ -155,7 +155,7 @@ Manager_Type1::~Manager_Type1() {
void Manager_Type1::initialize() {
if ( !m_updatePool.get() ) {
- string typ = "dd4hep_Conditions_"+m_loaderType+"_Loader";
+ string typ = "DD4hep_Conditions_"+m_loaderType+"_Loader";
const void* argv_loader[] = {"ConditionsDataLoader", this, 0};
const void* argv_pool[] = {this, 0};
m_loader.reset(createPlugin<ConditionsDataLoader>(typ,m_detDesc,2,argv_loader));
diff --git a/DDCond/src/plugins/ConditionsMultiLoader.cpp b/DDCond/src/plugins/ConditionsMultiLoader.cpp
index d81e68cde..9df7320c5 100644
--- a/DDCond/src/plugins/ConditionsMultiLoader.cpp
+++ b/DDCond/src/plugins/ConditionsMultiLoader.cpp
@@ -127,7 +127,7 @@ ConditionsMultiLoader::load_source(const std::string& nam,
Loaders::iterator ild = m_loaders.find(ident);
ConditionsDataLoader* loader = 0;
if ( ild == m_loaders.end() ) {
- string typ = "dd4hep_Conditions_"+ident+"_Loader";
+ string typ = "DD4hep_Conditions_"+ident+"_Loader";
string fac = ident+"_ConditionsDataLoader";
const void* argv[] = {fac.c_str(), m_mgr.ptr(), 0};
loader = createPlugin<ConditionsDataLoader>(typ,m_detDesc,2,argv);
diff --git a/DDCond/src/plugins/ConditionsPlugins.cpp b/DDCond/src/plugins/ConditionsPlugins.cpp
index 8b1feecec..454cb2f72 100644
--- a/DDCond/src/plugins/ConditionsPlugins.cpp
+++ b/DDCond/src/plugins/ConditionsPlugins.cpp
@@ -47,7 +47,7 @@ static int ddcond_install_cond_mgr (Detector& description, int argc, char** argv
Handle<ConditionsManagerObject> mgr(description.extension<ConditionsManagerObject>(false));
if ( !mgr.isValid() ) {
bool arg_error = false;
- string factory = "dd4hep_ConditionsManager_Type1";
+ string factory = "DD4hep_ConditionsManager_Type1";
for(int i = 0; i < argc && argv[i]; ++i) {
if ( 0 == ::strncmp("-type",argv[i],4) )
factory = argv[++i];
@@ -204,7 +204,7 @@ static int ddcond_conditions_pool_print(Detector& description, bool print_condit
printout(WARNING,"DDCondProcessor","++ Found arguments in plugin call, "
"but could not make any sense of them....");
}
- const void* args[] = { "-processor", "dd4hep_ConditionsPrinter", 0};
+ const void* args[] = { "-processor", "DD4hep_ConditionsPrinter", 0};
return ddcond_conditions_pool_processor(description,true,print_conditions,2,(char**)args);
}
@@ -314,7 +314,7 @@ static int ddcond_detelement_processor(Detector& description, int argc, char** a
processor = createProcessor<ConditionsProcessor>(description, argc, argv);
}
else {
- const void* args[] = { "-processor", "dd4hepConditionsPrinter", 0};
+ const void* args[] = { "-processor", "DD4hep_ConditionsPrinter", 0};
processor = createProcessor<ConditionsProcessor>(description, 2, (char**)args);
}
dd4hep_ptr<ConditionsSlice> slice(ddcond_prepare(description,"run",1500,argc,argv));
@@ -383,7 +383,7 @@ DECLARE_APPLY(DD4hep_ConditionsClean,ddcond_clean_conditions)
// ======================================================================================
/// Basic entry point to instantiate the basic dd4hep conditions/alignmants printer
/**
- * Factory: dd4hepConditionsPrinter, dd4hepAlignmentsPrinter
+ * Factory: DD4hep_ConditionsPrinter, dd4hepAlignmentsPrinter
*
* \author M.Frank
* \version 1.0
diff --git a/DDCore/include/DD4hep/VolumeManager.h b/DDCore/include/DD4hep/VolumeManager.h
index 4025b4416..bd48f5c95 100644
--- a/DDCore/include/DD4hep/VolumeManager.h
+++ b/DDCore/include/DD4hep/VolumeManager.h
@@ -153,7 +153,7 @@ namespace dd4hep {
/// Initializing constructor for subdetector volume managers.
VolumeManager(DetElement subdetector, Readout ro);
- /// static accessor calling dd4hepVolumeManagerPlugin if necessary
+ /// static accessor calling DD4hepVolumeManagerPlugin if necessary
static VolumeManager getVolumeManager(Detector& description);
/// Assignment operator
diff --git a/DDCore/src/DD4hepUI.cpp b/DDCore/src/DD4hepUI.cpp
index 6c2dc79d3..23e815793 100644
--- a/DDCore/src/DD4hepUI.cpp
+++ b/DDCore/src/DD4hepUI.cpp
@@ -41,7 +41,7 @@ Detector* DD4hepUI::detectorDescription() const {
Handle<NamedObject> DD4hepUI::conditionsMgr() const {
if ( !m_condMgr.isValid() ) {
const void* argv[] = {"-handle",&m_condMgr,0};
- if ( 1 != apply("dd4hep_ConditionsManagerInstaller",2,(char**)argv) ) {
+ if ( 1 != apply("DD4hep_ConditionsManagerInstaller",2,(char**)argv) ) {
except("DD4hepUI","Failed to install the conditions manager object.");
}
if ( !m_condMgr.isValid() ) {
@@ -65,7 +65,7 @@ long DD4hepUI::loadConditions(const std::string& fname) const {
Handle<NamedObject> DD4hepUI::alignmentMgr() const {
if ( !m_alignMgr.isValid() ) {
const void* argv[] = {"-handle",&m_alignMgr,0};
- if ( 1 != apply("dd4hep_AlignmentsManagerInstaller",2,(char**)argv) ) {
+ if ( 1 != apply("DD4hep_AlignmentsManagerInstaller",2,(char**)argv) ) {
except("DD4hepUI","Failed to install the alignment manager object.");
}
if ( !m_alignMgr.isValid() ) {
@@ -94,12 +94,12 @@ void DD4hepUI::redraw() const {
long DD4hepUI::dumpVols(int argc, char** argv) const {
if ( argc==0 ) {
const void* av[] = {"-positions","-pointers",0};
- return m_detDesc.apply("dd4hepVolumeDump",2,(char**)av);
+ return m_detDesc.apply("DD4hepVolumeDump",2,(char**)av);
}
- return m_detDesc.apply("dd4hepVolumeDump",argc,argv);
+ return m_detDesc.apply("DD4hepVolumeDump",argc,argv);
}
/// Dump the DetElement tree
long DD4hepUI::dumpDet() const {
- return m_detDesc.apply("dd4hepDetectorVolumeDump",0,0);
+ return m_detDesc.apply("DD4hepDetectorVolumeDump",0,0);
}
diff --git a/DDCore/src/Handle.cpp b/DDCore/src/Handle.cpp
index 05b2a1371..8615454eb 100644
--- a/DDCore/src/Handle.cpp
+++ b/DDCore/src/Handle.cpp
@@ -248,7 +248,7 @@ namespace dd4hep {
cerr << edge << edge << edge << endl;
cerr << "++ The usage of the factory: \"" << name << "\" is DEPRECATED due to naming conventions."
<< setw(53-len) << right << "++" << endl;
- cerr << "++ Please use \"dd4hep_" << name << "\" instead." << setw(93-len) << right << "++" << endl;
+ cerr << "++ Please use \"DD4hep_" << name << "\" instead." << setw(93-len) << right << "++" << endl;
cerr << edge << edge << edge << endl;
}
}
diff --git a/DDCore/src/Plugins.cpp b/DDCore/src/Plugins.cpp
index f2b26de3a..c56202d4e 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/DDCore/src/VolumeManager.cpp b/DDCore/src/VolumeManager.cpp
index 0fe547a4a..c7f531e32 100644
--- a/DDCore/src/VolumeManager.cpp
+++ b/DDCore/src/VolumeManager.cpp
@@ -351,7 +351,7 @@ VolumeManager::VolumeManager(DetElement sub_detector, Readout ro) {
VolumeManager VolumeManager::getVolumeManager(Detector& description) {
if( not description.volumeManager().isValid() ) {
- description.apply("dd4hepVolumeManager", 0, 0);
+ description.apply("DD4hepVolumeManager", 0, 0);
}
return description.volumeManager();
}
diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp
index b0b1212f9..6a0fb02a2 100644
--- a/DDCore/src/plugins/Compact2Objects.cpp
+++ b/DDCore/src/plugins/Compact2Objects.cpp
@@ -1039,7 +1039,7 @@ template <> void Converter<JsonFile>::operator()(xml_h element) const {
string base = xml::DocumentHandler::system_directory(element);
string file = element.attr<string>(_U(ref));
vector<char*> argv{&file[0],&base[0]};
- description.apply("dd4hep_JsonProcessor",int(argv.size()), &argv[0]);
+ description.apply("DD4hep_JsonProcessor",int(argv.size()), &argv[0]);
}
/// Read alignment entries from a seperate file in one of the include sections of the geometry
diff --git a/DDCore/src/plugins/JsonProcessor.cpp b/DDCore/src/plugins/JsonProcessor.cpp
index b52a56e37..56b6807ec 100644
--- a/DDCore/src/plugins/JsonProcessor.cpp
+++ b/DDCore/src/plugins/JsonProcessor.cpp
@@ -138,7 +138,7 @@ template <> void Converter<detector>::operator()(json_h element) const {
static long handle_json(Detector& description, int argc, char** argv) {
if ( argc < 1 || (argc<2 && argv[0][0] != '/') ) {
- ::printf("dd4hep_JsonProcessor <file> <directory> \n"
+ ::printf("DD4hep_JsonProcessor <file> <directory> \n"
" If file is an absolute path (does NOT start with '/')\n"
" the directory path is mandatory. \n"
" The file name is then assumed to be relative. \n"
diff --git a/DDCore/src/plugins/StandardPlugins.cpp b/DDCore/src/plugins/StandardPlugins.cpp
index 30d013929..b3131cf9c 100644
--- a/DDCore/src/plugins/StandardPlugins.cpp
+++ b/DDCore/src/plugins/StandardPlugins.cpp
@@ -60,7 +60,7 @@ DECLARE_CONSTRUCTOR(Detector_constructor,create_description_instance)
/// Basic entry point to display the currently loaded geometry using the ROOT OpenGL viewer
/**
- * Factory: dd4hepGeometryDisplay
+ * Factory: DD4hepGeometryDisplay
*
* \author M.Frank
* \version 1.0
@@ -105,7 +105,7 @@ DECLARE_APPLY(DD4hepRint,run_interpreter)
* in the interpreter with the global variable
* dd4hep::DD4hepUI* gdd4hepUI;
*
- * Factory: dd4hepInteractiveUI
+ * Factory: DD4hepInteractiveUI
*
* \author M.Frank
* \version 1.0
@@ -127,7 +127,7 @@ DECLARE_APPLY(DD4hepInteractiveUI,root_ui)
/**
* Dump the elment table to stdout or file.
*
- * Factory: dd4hepElementTable -format xml/text(default) -output <file-name>
+ * Factory: DD4hepElementTable -format xml/text(default) -output <file-name>
*
* \author M.Frank
* \version 1.0
@@ -176,7 +176,7 @@ static long root_elements(Detector& description, int argc, char** argv) {
if ( c == 't' && i+1<argc ) type = argv[++i];
else if ( c == 'o' && i+1<argc ) output = argv[++i];
else {
- ::printf("dd4hepElementTable -opt [-opt] \n"
+ ::printf("DD4hepElementTable -opt [-opt] \n"
" -type <string> Output format: text or xml \n"
" -output <file-name> Output file specifier (xml only) \n"
"\n");
@@ -232,7 +232,7 @@ DECLARE_APPLY(DD4hepElementTable,root_elements)
/**
* Dump the elment table to stdout or file.
*
- * Factory: dd4hepElementTable -format xml/text(default) -output <file-name>
+ * Factory: DD4hepElementTable -format xml/text(default) -output <file-name>
*
* \author M.Frank
* \version 1.0
@@ -296,7 +296,7 @@ static long root_materials(Detector& description, int argc, char** argv) {
if ( c == 't' && i+1<argc ) type = argv[++i];
else if ( c == 'o' && i+1<argc ) output = argv[++i];
else {
- ::printf("dd4hepElementTable -opt [-opt] \n"
+ ::printf("DD4hepElementTable -opt [-opt] \n"
" -type <string> Output format: text or xml \n"
" -output <file-name> Output file specifier (xml only) \n"
"\n");
@@ -350,7 +350,7 @@ DECLARE_APPLY(DD4hepMaterialTable,root_materials)
* - The processing hint (build type) is passed as optional
* second argument.
*
- * Factory: dd4hepCompactLoader
+ * Factory: DD4hepCompactLoader
*
* \author M.Frank
* \version 1.0
@@ -384,7 +384,7 @@ DECLARE_APPLY(DD4hepCompactLoader,load_compact)
*
* The root tag defines the plugin to interprete it.
*
- * Factory: dd4hepXMLLoader
+ * Factory: DD4hepXMLLoader
*
* \author M.Frank
* \version 1.0
@@ -418,7 +418,7 @@ DECLARE_APPLY(DD4hepXMLLoader,load_xml)
*
* The root tag defines the plugin to interprete it.
*
- * Factory: dd4hepXMLProcessor
+ * Factory: DD4hepXMLProcessor
*
* \author M.Frank
* \version 1.0
@@ -440,7 +440,7 @@ static long process_xml_doc(Detector& description, int argc, char** argv) {
imp->processXMLElement(input, type);
return 1;
}
- except("dd4hepXMLProcessor",
+ except("DD4hepXMLProcessor",
"++ The passed reference to the parsed XML document is invalid.");
}
}
@@ -450,14 +450,14 @@ DECLARE_APPLY(DD4hepXMLProcessor,process_xml_doc)
/// Basic entry point to load the volume manager object
/**
- * Factory: dd4hepVolumeManager
+ * Factory: DD4hepVolumeManager
*
* \author M.Frank
* \version 1.0
* \date 01/04/2014
*/
static long load_volmgr(Detector& description, int, char**) {
- printout(INFO,"dd4hepVolumeManager","**** running plugin dd4hepVolumeManager ! " );
+ printout(INFO,"DD4hepVolumeManager","**** running plugin DD4hepVolumeManager ! " );
try {
DetectorImp* imp = dynamic_cast<DetectorImp*>(&description);
if ( imp ) {
@@ -479,7 +479,7 @@ DECLARE_APPLY(DD4hepVolumeManager,load_volmgr)
/// Basic entry point to dump a dd4hep geometry to a ROOT file
/**
- * Factory: dd4hepGeometry2ROOT
+ * Factory: DD4hepGeometry2ROOT
*
* \author M.Frank
* \version 1.0
@@ -501,7 +501,7 @@ DECLARE_APPLY(DD4hepGeometry2ROOT,dump_geometry2root)
/// Basic entry point to load a dd4hep geometry directly from the ROOT file
/**
- * Factory: dd4hepRootLoader
+ * Factory: DD4hepRootLoader
*
* \author M.Frank
* \version 1.0
@@ -510,19 +510,19 @@ DECLARE_APPLY(DD4hepGeometry2ROOT,dump_geometry2root)
static long load_geometryFromroot(Detector& description, int argc, char** argv) {
if ( argc > 0 ) {
string input = argv[0];
- printout(INFO,"dd4hepRootLoader","+++ Read geometry from root file:%s",input.c_str());
+ printout(INFO,"DD4hepRootLoader","+++ Read geometry from root file:%s",input.c_str());
if ( 1 == DD4hepRootPersistency::load(description,input.c_str(),"Geometry") ) {
return 1;
}
}
- printout(ERROR,"dd4hepRootLoader","+++ No input file name given.");
+ printout(ERROR,"DD4hepRootLoader","+++ No input file name given.");
return 0;
}
DECLARE_APPLY(DD4hepRootLoader,load_geometryFromroot)
/// Basic entry point to print out the volume hierarchy
/**
- * Factory: dd4hepVolumeDump
+ * Factory: DD4hepVolumeDump
*
* \author M.Frank
* \version 1.0
@@ -675,7 +675,7 @@ DECLARE_APPLY(DD4hep_DetElementProcessor,detelement_processor)
/// Basic entry point to print out the detector element hierarchy
/**
- * Factory: dd4hepDetectorDump, dd4hepDetectorVolumeDump
+ * Factory: DD4hepDetectorDump, DD4hepDetectorVolumeDump
*
* \author M.Frank
* \version 1.0
@@ -758,7 +758,7 @@ DECLARE_APPLY(DD4hepDetElementCache,detelement_cache)
/// Basic entry point to dump the geometry tree of the description instance
/**
- * Factory: dd4hepGeometryTreeDump
+ * Factory: DD4hepGeometryTreeDump
*
* \author M.Frank
* \version 1.0
@@ -798,7 +798,7 @@ DECLARE_APPLY(DD4hepSimpleGDMLWriter,exec_SimpleGDMLWriter)
/// Basic entry point to print out detector type map
/**
- * Factory: dd4hepDetectorTypes
+ * Factory: DD4hepDetectorTypes
*
* \author M.Frank
* \version 1.0
diff --git a/DDCore/src/plugins/VolumeMgrTest.cpp b/DDCore/src/plugins/VolumeMgrTest.cpp
index 1ba05678e..7e5ddd8b1 100644
--- a/DDCore/src/plugins/VolumeMgrTest.cpp
+++ b/DDCore/src/plugins/VolumeMgrTest.cpp
@@ -277,7 +277,7 @@ void VolIDTest::walk(DetElement detector, VolIDs ids, const Chain& chain, size_t
#endif
/// Action routine to execute the test
long VolIDTest::run(Detector& description,int argc,char** argv) {
- printout(ALWAYS,"dd4hepVolumeMgrTest","++ Processing plugin...");
+ printout(ALWAYS,"DD4hepVolumeMgrTest","++ Processing plugin...");
for(int iarg=0; iarg<argc;++iarg) {
if ( argv[iarg] == 0 ) break;
string name = argv[iarg];
@@ -285,12 +285,12 @@ long VolIDTest::run(Detector& description,int argc,char** argv) {
const DetElement::Children& children = description.world().children();
for (DetElement::Children::const_iterator i=children.begin(); i!=children.end(); ++i) {
DetElement sdet = (*i).second;
- printout(INFO,"dd4hepVolumeMgrTest","++ Processing subdetector: %s",sdet.name());
+ printout(INFO,"DD4hepVolumeMgrTest","++ Processing subdetector: %s",sdet.name());
VolIDTest test(description,sdet,99);
}
return 1;
}
- printout(INFO,"dd4hepVolumeMgrTest","++ Processing subdetector: %s",name.c_str());
+ printout(INFO,"DD4hepVolumeMgrTest","++ Processing subdetector: %s",name.c_str());
VolIDTest test(description,description.detector(name),99);
}
return 1;
diff --git a/DDDB/src/plugins/DDDB2Objects.cpp b/DDDB/src/plugins/DDDB2Objects.cpp
index c49b39710..3042a3943 100644
--- a/DDDB/src/plugins/DDDB2Objects.cpp
+++ b/DDDB/src/plugins/DDDB2Objects.cpp
@@ -1019,10 +1019,10 @@ namespace dd4hep {
/// Now configure the conditions manager
if ( !context->manager.isValid() ) {
ConditionsManager manager = ConditionsManager::from(description);
- manager["PoolType"] = "dd4hep_ConditionsLinearPool";
+ manager["PoolType"] = "DD4hep_ConditionsLinearPool";
manager["LoaderType"] = "dddb";
- manager["UserPoolType"] = "dd4hep_ConditionsMapUserPool";
- manager["UpdatePoolType"] = "dd4hep_ConditionsLinearUpdatePool";
+ manager["UserPoolType"] = "DD4hep_ConditionsMapUserPool";
+ manager["UpdatePoolType"] = "DD4hep_ConditionsLinearUpdatePool";
manager.initialize();
pair<bool,const IOVType*> e = manager.registerIOVType(0, "epoch");
context->manager = manager;
diff --git a/DDDB/src/plugins/DDDBExecutor.cpp b/DDDB/src/plugins/DDDBExecutor.cpp
index 5ab0cd89d..3ec660ee1 100644
--- a/DDDB/src/plugins/DDDBExecutor.cpp
+++ b/DDDB/src/plugins/DDDBExecutor.cpp
@@ -184,7 +184,7 @@ static long load_xml_dddb(Detector& description, int argc, char** argv) {
if ( !attr.empty() ) {
const void* args[] = {attr.c_str(), 0};
printout(INFO,"DDDBExecutor","+++ Processing visualization attributes: %s", attr.c_str());
- result = description.apply("dd4hepXMLLoader", 1, (char**)args);
+ result = description.apply("DD4hepXMLLoader", 1, (char**)args);
check_result(result);
}
@@ -208,7 +208,7 @@ static long load_xml_dddb(Detector& description, int argc, char** argv) {
if ( !xmlFiles.empty() ) {
for(size_t i=0; i<xmlFiles.size(); ++i) {
const void* args[] = {xmlFiles[i].c_str(), 0};
- description.apply("dd4hepXMLLoader", 1, (char**)args);
+ description.apply("DD4hepXMLLoader", 1, (char**)args);
}
}
diff --git a/DDDB/src/plugins/DDDBPlugins.cpp b/DDDB/src/plugins/DDDBPlugins.cpp
index ab4b7fec4..8c13dc423 100644
--- a/DDDB/src/plugins/DDDBPlugins.cpp
+++ b/DDDB/src/plugins/DDDBPlugins.cpp
@@ -35,12 +35,12 @@ static long dddb_dump_conditions(Detector& description, int argc, char** argv) {
printout(INFO,"DDDB","Setting conditions print level to %s",prt_level);
}
}
- const void* args[] = { "-processor", "dd4hep_ConditionsPrinter",
+ const void* args[] = { "-processor", "DD4hep_ConditionsPrinter",
"-name", "DDDB",
"-prefix", "DDDB",
"-print", prt_level,
"-end-processor", 0};
- description.apply("dd4hep_ConditionsDump", 9, (char**)args);
+ description.apply("DD4hep_ConditionsDump", 9, (char**)args);
return 1;
}
DECLARE_APPLY(DDDB_ConditionsDump,dddb_dump_conditions)
@@ -48,12 +48,12 @@ DECLARE_APPLY(DDDB_ConditionsDump,dddb_dump_conditions)
//==========================================================================
/// Plugin function
static long dddb_dump_conditions_summary(Detector& description, int , char** ) {
- const void* args[] = { "-processor", "dd4hep_ConditionsPrinter",
+ const void* args[] = { "-processor", "DD4hep_ConditionsPrinter",
"-name", "DDDB",
"-prefix", "DDDB",
"-print", "DEBUG",
"-end-processor", 0};
- description.apply("dd4hep_ConditionsDump", 9, (char**)args);
+ description.apply("DD4hep_ConditionsDump", 9, (char**)args);
return 1;
}
DECLARE_APPLY(DDDB_ConditionsSummary,dddb_dump_conditions_summary)
diff --git a/DDDetectors/compact/SiD/SiD_Beamcal.xml b/DDDetectors/compact/SiD/SiD_Beamcal.xml
index 6048f91b2..11e9ca212 100644
--- a/DDDetectors/compact/SiD/SiD_Beamcal.xml
+++ b/DDDetectors/compact/SiD/SiD_Beamcal.xml
@@ -37,7 +37,7 @@
<!-- Includes for sensitives and support -->
<detectors>
- <detector id="14" name="BeamCal" reflect="true" type="dd4hep_ForwardDetector" readout="BeamCalHits" vis="BeamCalVis" calorimeterType="BEAM">
+ <detector id="14" name="BeamCal" reflect="true" type="DD4hep_ForwardDetector" readout="BeamCalHits" vis="BeamCalVis" calorimeterType="BEAM">
<comment>Beam Calorimeter</comment>
diff --git a/DDDetectors/compact/SiD/SiD_Beampipe.xml b/DDDetectors/compact/SiD/SiD_Beampipe.xml
index dc6df5193..08cb8a97d 100644
--- a/DDDetectors/compact/SiD/SiD_Beampipe.xml
+++ b/DDDetectors/compact/SiD/SiD_Beampipe.xml
@@ -30,7 +30,7 @@
<detectors>
<comment>Beampipe</comment>
- <detector name="Beampipe" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
+ <detector name="Beampipe" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
<comment>Central Be Beampipe</comment>
@@ -39,7 +39,7 @@
<zplane rmin="CentralBeamPipe_rmin" rmax="CentralBeamPipe_rmax" z="CentralBeamPipe_zmax" />
</detector>
- <detector name="SteelConeZbackward" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
+ <detector name="SteelConeZbackward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
<material name="Iron"/>
<zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
rmax="BeamPipe_rmax"
@@ -52,7 +52,7 @@
z="-CentralBeamPipe_zmax"/>
</detector>
- <detector name="SteelConeZbackward2" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
+ <detector name="SteelConeZbackward2" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
<material name="Iron"/>
<zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
rmax="BeamPipe_rmax"
@@ -71,7 +71,7 @@
z="- (ForwardMask_zmin - BeamPipe_endThickness)" />
</detector>
- <detector name="SteelConeZforward" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
+ <detector name="SteelConeZforward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
<material name="Iron"/>
<zplane rmin="CentralBeamPipe_rmin"
rmax="CentralBeamPipe_rmax"
@@ -84,7 +84,7 @@
z="tracking_region_zmax" />
</detector>
- <detector name="SteelConeZforward2" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
+ <detector name="SteelConeZforward2" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
<material name="Iron"/>
<zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
rmax="BeamPipe_rmax"
@@ -103,7 +103,7 @@
z="ForwardMask_zmin - BeamPipe_endThickness" />
</detector>
- <detector name="NorthIncomingBeampipe" type="dd4hep_TubeSegment" vis="BeamPipeVis">
+ <detector name="NorthIncomingBeampipe" type="DD4hep_TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="IncomingBP_radius - IncomingBP_thickness" rmax="IncomingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
<position x="-((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="(ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
@@ -111,21 +111,21 @@
</detector>
- <detector name="SouthIncomingBeampipe" type="dd4hep_TubeSegment" vis="BeamPipeVis">
+ <detector name="SouthIncomingBeampipe" type="DD4hep_TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="IncomingBP_radius - IncomingBP_thickness" rmax="IncomingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
<position x="-((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="- (ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
<rotation x="0.0" y="-CrossingAngle/2.0/rad" z="0.0" />
</detector>
- <detector name="NorthOutgoingBeampipe" type="dd4hep_TubeSegment" vis="BeamPipeVis">
+ <detector name="NorthOutgoingBeampipe" type="DD4hep_TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="OutgoingBP_radius - OutgoingBP_thickness" rmax="OutgoingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
<position x="((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="(ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
<rotation x="0.0" y="-CrossingAngle/2.0/rad" z="0.0" />
</detector>
- <detector name="SouthOutgoingBeampipe" type="dd4hep_TubeSegment" vis="BeamPipeVis">
+ <detector name="SouthOutgoingBeampipe" type="DD4hep_TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="OutgoingBP_radius - OutgoingBP_thickness" rmax="OutgoingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
<position x="((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="- (ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
@@ -133,7 +133,7 @@
</detector>
<!-- Beam pipe liner is not needed, use thicker conical steel pipe instead
- <detector name="BeamPipeLiner" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="BeamPipeLiner" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<comment>BeamPipe Liner to shield bremsstrahlung photons</comment>
<material name="Titanium"/>
<zplane rmin="(tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax - BeamPipe_thickness - BeamPipeLiner_thickness" rmax="(tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax - BeamPipe_thickness" z="-tracking_region_zmax" />
@@ -145,7 +145,7 @@
</detector>
-->
- <detector name="BeamPipeVacuum" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="BeamPipeVacuum" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<comment>Vacuum inside beampipe</comment>
@@ -164,7 +164,7 @@
z="tracking_region_zmax" />
</detector>
- <detector name="ForwardVacuum" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="ForwardVacuum" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="Vacuum"/>
<zplane rmin="0.*cm"
rmax="BeamPipe_rmax - BeamPipe_thickness"
@@ -183,7 +183,7 @@
z="ForwardMask_zmin - BeamPipe_endThickness" />
</detector>
- <detector name="BackwardVacuum" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="BackwardVacuum" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="Vacuum"/>
<zplane rmin="0.*cm"
rmax="BeamPipe_rmax - BeamPipe_thickness"
diff --git a/DDDetectors/compact/SiD/SiD_EcalBarrel.xml b/DDDetectors/compact/SiD/SiD_EcalBarrel.xml
index 288d11de1..1b0c54865 100644
--- a/DDDetectors/compact/SiD/SiD_EcalBarrel.xml
+++ b/DDDetectors/compact/SiD/SiD_EcalBarrel.xml
@@ -6,7 +6,7 @@
<!-- ====================================================================== -->
<detectors>
- <detector id="EcalBarrel_ID" name="EcalBarrel" type="dd4hep_EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis" calorimeterType="EM_BARREL">
+ <detector id="EcalBarrel_ID" name="EcalBarrel" type="DD4hep_EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis" calorimeterType="EM_BARREL">
<comment>Electromagnetic Calorimeter Barrel</comment>
diff --git a/DDDetectors/compact/SiD/SiD_EcalEndcap.xml b/DDDetectors/compact/SiD/SiD_EcalEndcap.xml
index 235b3a73e..362cf46fd 100644
--- a/DDDetectors/compact/SiD/SiD_EcalEndcap.xml
+++ b/DDDetectors/compact/SiD/SiD_EcalEndcap.xml
@@ -6,7 +6,7 @@
<!-- ====================================================================== -->
<detectors>
- <detector id="EcalEndcap_ID" name="EcalEndcap" type="dd4hep_PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis" calorimeterType="EM_ENDCAP">
+ <detector id="EcalEndcap_ID" name="EcalEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis" calorimeterType="EM_ENDCAP">
<comment>Electromagnetic Calorimeter Endcaps</comment>
diff --git a/DDDetectors/compact/SiD/SiD_HcalBarrel.xml b/DDDetectors/compact/SiD/SiD_HcalBarrel.xml
index 4c0d55e1b..8dce6fc71 100644
--- a/DDDetectors/compact/SiD/SiD_HcalBarrel.xml
+++ b/DDDetectors/compact/SiD/SiD_HcalBarrel.xml
@@ -6,7 +6,7 @@
<!-- ====================================================================== -->
<detectors>
- <detector id="HcalBarrel_ID" name="HcalBarrel" type="dd4hep_PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="0.*cm" material="Steel235">
+ <detector id="HcalBarrel_ID" name="HcalBarrel" type="DD4hep_PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="0.*cm" material="Steel235">
<comment>Hadron Calorimeter Barrel</comment>
diff --git a/DDDetectors/compact/SiD/SiD_HcalEndcap.xml b/DDDetectors/compact/SiD/SiD_HcalEndcap.xml
index 7f8b89986..ec64195ee 100644
--- a/DDDetectors/compact/SiD/SiD_HcalEndcap.xml
+++ b/DDDetectors/compact/SiD/SiD_HcalEndcap.xml
@@ -6,7 +6,7 @@
<!-- ====================================================================== -->
<detectors>
- <detector id="9" name="HcalEndcap" type="dd4hep_PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits" vis="HcalEndcapVis" calorimeterType="HAD_ENDCAP">
+ <detector id="9" name="HcalEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits" vis="HcalEndcapVis" calorimeterType="HAD_ENDCAP">
<comment>Hadron Calorimeter Endcaps</comment>
diff --git a/DDDetectors/compact/SiD/SiD_HcalPlug.xml b/DDDetectors/compact/SiD/SiD_HcalPlug.xml
index 5808ceaa4..02378e4e0 100644
--- a/DDDetectors/compact/SiD/SiD_HcalPlug.xml
+++ b/DDDetectors/compact/SiD/SiD_HcalPlug.xml
@@ -6,7 +6,7 @@
<!-- ====================================================================== -->
<detectors>
- <detector id="HcalPlug_ID" name="HcalPlug" type="dd4hep_PolyhedraEndcapCalorimeter2" readout="HcalPlugHits" vis="MuonEndcapVis">
+ <detector id="HcalPlug_ID" name="HcalPlug" type="DD4hep_PolyhedraEndcapCalorimeter2" readout="HcalPlugHits" vis="MuonEndcapVis">
<comment>Hadron Calorimeter Plug</comment>
diff --git a/DDDetectors/compact/SiD/SiD_Lumical.xml b/DDDetectors/compact/SiD/SiD_Lumical.xml
index 89234839a..a295fd404 100644
--- a/DDDetectors/compact/SiD/SiD_Lumical.xml
+++ b/DDDetectors/compact/SiD/SiD_Lumical.xml
@@ -37,7 +37,7 @@
<!-- Includes for sensitives and support -->
<detectors>
- <detector id="13" name="LumiCal" reflect="true" type="dd4hep_CylindricalEndcapCalorimeter" readout="LumiCalHits" vis="LumiCalVis" calorimeterType="LUMI">
+ <detector id="13" name="LumiCal" reflect="true" type="DD4hep_CylindricalEndcapCalorimeter" readout="LumiCalHits" vis="LumiCalVis" calorimeterType="LUMI">
<comment>Luminosity Calorimeter</comment>
@@ -58,14 +58,14 @@
</layer>
</detector>
- <detector name="LumiReadout_Forward" type="dd4hep_PolyconeSupport" vis="LumiCalVis">
+ <detector name="LumiReadout_Forward" type="DD4hep_PolyconeSupport" vis="LumiCalVis">
<comment>Readout for Luminosity Calorimeter</comment>
<material name="G10"/>
<zplane rmin="LumiCal_rmax" rmax="LumiCalElectronics_rmax" z="LumiCal_zmin"/>
<zplane rmin="LumiCal_rmax" rmax="LumiCalElectronics_rmax" z="LumiCal_zmin+LumiCal_thickness"/>
</detector>
- <detector name="LumiReadout_Backward" type="dd4hep_PolyconeSupport" vis="LumiCalVis">
+ <detector name="LumiReadout_Backward" type="DD4hep_PolyconeSupport" vis="LumiCalVis">
<comment>Readout for Luminosity Calorimeter</comment>
<material name="G10"/>
<zplane rmin="LumiCal_rmax" rmax="LumiCalElectronics_rmax" z="-LumiCal_zmin"/>
diff --git a/DDDetectors/compact/SiD/SiD_MuonBarrel.xml b/DDDetectors/compact/SiD/SiD_MuonBarrel.xml
index b0c242bc7..76e683e25 100644
--- a/DDDetectors/compact/SiD/SiD_MuonBarrel.xml
+++ b/DDDetectors/compact/SiD/SiD_MuonBarrel.xml
@@ -6,7 +6,7 @@
<!-- ====================================================================== -->
<detectors>
- <detector id="MuonBarrel_ID" name="MuonBarrel" type="dd4hep_PolyhedraBarrelCalorimeter2" readout="MuonBarrelHits" vis="MuonBarrelVis" calorimeterType="MUON_BARREL" gap="0.*cm" material="Steel235">
+ <detector id="MuonBarrel_ID" name="MuonBarrel" type="DD4hep_PolyhedraBarrelCalorimeter2" readout="MuonBarrelHits" vis="MuonBarrelVis" calorimeterType="MUON_BARREL" gap="0.*cm" material="Steel235">
<comment>Muon Calorimeter Barrel</comment>
diff --git a/DDDetectors/compact/SiD/SiD_MuonEndcap.xml b/DDDetectors/compact/SiD/SiD_MuonEndcap.xml
index ec1f2b87c..73baced9c 100644
--- a/DDDetectors/compact/SiD/SiD_MuonEndcap.xml
+++ b/DDDetectors/compact/SiD/SiD_MuonEndcap.xml
@@ -6,7 +6,7 @@
<!-- ====================================================================== -->
<detectors>
- <detector id="MuonEndcap_ID" name="MuonEndcap" type="dd4hep_PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis" calorimeterType="MUON_ENDCAP">
+ <detector id="MuonEndcap_ID" name="MuonEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis" calorimeterType="MUON_ENDCAP">
<comment>Muon Calorimeter Endcaps</comment>
diff --git a/DDDetectors/compact/SiD/SiD_Shields.xml b/DDDetectors/compact/SiD/SiD_Shields.xml
index b4a201b90..c7a7c9fc0 100644
--- a/DDDetectors/compact/SiD/SiD_Shields.xml
+++ b/DDDetectors/compact/SiD/SiD_Shields.xml
@@ -32,28 +32,28 @@
<comment>Masks and Shielding</comment>
- <detector name="LumiShielding_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="LumiShielding_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="LumiCal_rmin" rmax="LumiCalElectronics_rmax" z="LumiCal_zmax"/>
<zplane rmin="LumiCal_rmin" rmax="LumiCalElectronics_rmax" z="LumiCal_zmax+ForwardShielding_thickness"/>
</detector>
- <detector name="LumiShielding_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="LumiShielding_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="LumiCal_rmin" rmax="LumiCalElectronics_rmax" z="-LumiCal_zmax"/>
<zplane rmin="LumiCal_rmin" rmax="LumiCalElectronics_rmax" z="-(LumiCal_zmax+ForwardShielding_thickness)"/>
</detector>
- <detector name="ECalShielding_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="ECalShielding_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="LumiCalElectronics_rmax" rmax="HcalEndcap_rmin-SupportTube_thickness-1.0*cm" z="HcalEndcap_zmin"/>
<zplane rmin="LumiCalElectronics_rmax" rmax="HcalEndcap_rmin-SupportTube_thickness-1.0*cm" z="HcalEndcap_zmin+ForwardShielding_thickness"/>
</detector>
- <detector name="ECalShielding_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="ECalShielding_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="LumiCalElectronics_rmax" rmax="HcalEndcap_rmin-SupportTube_thickness-1.0*cm" z="-HcalEndcap_zmin"/>
<zplane rmin="LumiCalElectronics_rmax" rmax="HcalEndcap_rmin-SupportTube_thickness-1.0*cm" z="-(HcalEndcap_zmin+ForwardShielding_thickness)"/>
</detector>
- <detector name="ShieldingTube_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="ShieldingTube_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="HcalEndcap_rmin - SupportTube_thickness - ForwardShielding_thickness - 1.0*cm"
rmax="HcalEndcap_rmin - SupportTube_thickness - 1.0*cm"
@@ -63,7 +63,7 @@
z="HcalEndcap_zmax"/>
</detector>
- <detector name="ShieldingTube_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="ShieldingTube_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="HcalEndcap_rmin - SupportTube_thickness - ForwardShielding_thickness - 1.0*cm"
rmax="HcalEndcap_rmin - SupportTube_thickness - 1.0*cm"
@@ -73,7 +73,7 @@
z="-HcalEndcap_zmax"/>
</detector>
- <detector name="SupportTube_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
+ <detector name="SupportTube_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
<material name="Steel235" />
<zplane rmin="HcalEndcap_rmin - 2*SupportTube_thickness"
rmax="HcalEndcap_rmin - SupportTube_thickness"
@@ -83,7 +83,7 @@
z="MuonEndcap_zmax"/>
</detector>
- <detector name="SupportTube_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
+ <detector name="SupportTube_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
<material name="Steel235" />
<zplane rmin="HcalEndcap_rmin - 2*SupportTube_thickness"
rmax="HcalEndcap_rmin - SupportTube_thickness"
@@ -93,7 +93,7 @@
z="-MuonEndcap_zmax"/>
</detector>
- <detector name="ForwardLowZ" type="dd4hep_ForwardDetector" vis="TungstenShieldingVis" reflect="true">
+ <detector name="ForwardLowZ" type="DD4hep_ForwardDetector" vis="TungstenShieldingVis" reflect="true">
<dimensions outer_r="BeamCal_rmax" inner_r="0.0*cm" inner_z="ForwardMask_zmin" />
<beampipe crossing_angle="CrossingAngle" outgoing_r="OutgoingBP_radius + 0.05*cm" incoming_r="IncomingBP_radius + 0.05*cm" />
<layer repeat="1">
diff --git a/DDDetectors/compact/SiD/SiD_Solenoid.xml b/DDDetectors/compact/SiD/SiD_Solenoid.xml
index 869ec5104..a83610865 100644
--- a/DDDetectors/compact/SiD/SiD_Solenoid.xml
+++ b/DDDetectors/compact/SiD/SiD_Solenoid.xml
@@ -31,7 +31,7 @@
<comment>Solenoid</comment>
- <detector name="SolenoidCoilBarrel" type="dd4hep_MultiLayerTracker" insideTrackingVolume="false" reflect="true">
+ <detector name="SolenoidCoilBarrel" type="DD4hep_MultiLayerTracker" insideTrackingVolume="false" reflect="true">
<layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ" vis="SolenoidBarrelLayerVis">
<slice material="Steel235" thickness="SolenoidBarrelInnerCryostatThickness" />
<slice material="Vacuum" thickness="SolenoidBarrelInnerAirgapThickness" />
@@ -46,13 +46,13 @@
</layer>
</detector>
- <detector name="SolenoidCoilEnds" type="dd4hep_DiskTracker" reflect="true" insideTrackingVolume="false">
+ <detector name="SolenoidCoilEnds" type="DD4hep_DiskTracker" reflect="true" insideTrackingVolume="false">
<layer id="1" inner_r="SolenoidBarrelInnerRadius" inner_z="SolenoidBarrelOuterZ" outer_r="SolenoidBarrelOuterRadius" vis="SolenoidCoilEndsVis">
<slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
</layer>
</detector>
- <detector name="AntiSolenoid_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
+ <detector name="AntiSolenoid_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
<material name="Steel235" />
<zplane rmin="HcalEndcap_rmin + 1.0*cm"
rmax="MuonEndcap_rmin - 1.0*cm"
@@ -61,7 +61,7 @@
rmax="MuonEndcap_rmin - 1.0*cm"
z="MuonEndcap_zmax"/>
</detector>
- <detector name="AntiSolenoid_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
+ <detector name="AntiSolenoid_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
<material name="Steel235" />
<zplane rmin="HcalEndcap_rmin + 1.0*cm"
rmax="MuonEndcap_rmin - 1.0*cm"
diff --git a/DDDetectors/compact/SiD/SiD_TrackerBarrel.xml b/DDDetectors/compact/SiD/SiD_TrackerBarrel.xml
index be87354b1..38d8e6883 100644
--- a/DDDetectors/compact/SiD/SiD_TrackerBarrel.xml
+++ b/DDDetectors/compact/SiD/SiD_TrackerBarrel.xml
@@ -6,7 +6,7 @@
<!-- ==================================================================== -->
<detectors>
- <detector id="SiTrackerBarrel_ID" name="SiTrackerBarrel" type="dd4hep_SiTrackerBarrel" readout="SiTrackerBarrelHits" region="SiTrackerBarrelRegion" limits="SiTrackerBarrelRegionLimitSet">
+ <detector id="SiTrackerBarrel_ID" name="SiTrackerBarrel" type="DD4hep_SiTrackerBarrel" readout="SiTrackerBarrelHits" region="SiTrackerBarrelRegion" limits="SiTrackerBarrelRegionLimitSet">
<comment>Silicon Outer Tracker Barrel</comment>
diff --git a/DDDetectors/compact/SiD/SiD_TrackerEndcap.xml b/DDDetectors/compact/SiD/SiD_TrackerEndcap.xml
index 48ad712dd..14a5138e5 100644
--- a/DDDetectors/compact/SiD/SiD_TrackerEndcap.xml
+++ b/DDDetectors/compact/SiD/SiD_TrackerEndcap.xml
@@ -6,7 +6,7 @@
<!-- ==================================================================== -->
<detectors>
- <detector id="SiTrackerEndcap_ID" name="SiTrackerEndcap" type="dd4hep_SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true">
+ <detector id="SiTrackerEndcap_ID" name="SiTrackerEndcap" type="DD4hep_SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true">
<comment>Silicon Outer Tracker Endcaps</comment>
diff --git a/DDDetectors/compact/SiD/SiD_TrackerForward.xml b/DDDetectors/compact/SiD/SiD_TrackerForward.xml
index b9c405fde..bed9d1d37 100644
--- a/DDDetectors/compact/SiD/SiD_TrackerForward.xml
+++ b/DDDetectors/compact/SiD/SiD_TrackerForward.xml
@@ -6,7 +6,7 @@
<!-- ==================================================================== -->
<detectors>
- <detector id="ForwardTracker_ID" name="SiTrackerForward" type="dd4hep_SiTrackerEndcap2" readout="SiTrackerForwardHits" reflect="true">
+ <detector id="ForwardTracker_ID" name="SiTrackerForward" type="DD4hep_SiTrackerEndcap2" readout="SiTrackerForwardHits" reflect="true">
<comment>Forward Tracker inside Vertex Support Barrel</comment>
diff --git a/DDDetectors/compact/SiD/SiD_TrackerSupport.xml b/DDDetectors/compact/SiD/SiD_TrackerSupport.xml
index ba8544517..61e921058 100644
--- a/DDDetectors/compact/SiD/SiD_TrackerSupport.xml
+++ b/DDDetectors/compact/SiD/SiD_TrackerSupport.xml
@@ -9,7 +9,7 @@
<comment>Outer Tracker Supports and Readout</comment>
- <detector name="TrackerBarrelSupports" type="dd4hep_MultiLayerTracker" reflect="true">
+ <detector name="TrackerBarrelSupports" type="DD4hep_MultiLayerTracker" reflect="true">
<comment>Barrels</comment>
@@ -42,168 +42,168 @@
<comment>Dished endcap disks</comment>
- <detector name="SiTrackerEndcapSupport1" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport1" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="(750.417-0.001)*mm" />
<zplane rmin="504.711*mm" rmax="510.448*mm" z="(750.919-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(777.034-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(777.535-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport2" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport2" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="750.919*mm" />
<zplane rmin="438.449*mm" rmax="510.448*mm" z="757.218*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="777.535*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="783.834*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport3" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport3" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="(757.218+0.001)*mm" />
<zplane rmin="504.711*mm" rmax="510.448*mm" z="(757.720+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(783.834+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(784.336+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport4" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport4" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="(1014.437-0.001)*mm" />
<zplane rmin="758.059*mm" rmax="763.796*mm" z="(1014.939-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1063.219-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1063.721-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport5" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport5" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="1014.939*mm" />
<zplane rmin="691.797*mm" rmax="763.796*mm" z="1021.238*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="1063.721*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="1070.020*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport6" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport6" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="(1021.238+0.001)*mm" />
<zplane rmin="758.059*mm" rmax="763.796*mm" z="(1021.740+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1070.020+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1070.522+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport7" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport7" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(1272.885-0.001)*mm" />
<zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(1273.387-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1343.711-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1344.213-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport8" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport8" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="1273.387*mm" />
<zplane rmin="943.753*mm" rmax="1015.748*mm" z="1279.686*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="1344.213*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="1350.512*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport9" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport9" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(1279.686+0.001)*mm" />
<zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(1280.188+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1350.512+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1351.014+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport10" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport10" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="(1536.560-0.001)*mm" />
<zplane rmin="1258.071*mm" rmax="1263.808*mm" z="(1537.062-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1629.089-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1629.591-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport11" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport11" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="1537.062*mm" />
<zplane rmin="1191.810*mm" rmax="1263.808*mm" z="1543.361*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="1629.591*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="1635.890*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport12" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport12" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="(1543.361+0.001)*mm" />
<zplane rmin="1258.071*mm" rmax="1263.808*mm" z="(1543.863+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1635.890+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1636.392+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport1Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport1Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="(-750.417+0.001)*mm" />
<zplane rmin="504.711*mm" rmax="510.448*mm" z="(-750.919+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-777.034+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-777.535+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport2Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport2Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="-750.919*mm" />
<zplane rmin="438.449*mm" rmax="510.448*mm" z="-757.218*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="-777.535*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="-783.834*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport3Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport3Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="(-757.218-0.001)*mm" />
<zplane rmin="504.711*mm" rmax="510.448*mm" z="(-757.720-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-783.834-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-784.336-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport4Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport4Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="(-1014.437+0.001)*mm" />
<zplane rmin="758.059*mm" rmax="763.796*mm" z="(-1014.939+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1063.219+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1063.721+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport5Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport5Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="-1014.939*mm" />
<zplane rmin="691.797*mm" rmax="763.796*mm" z="-1021.238*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="-1063.721*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="-1070.020*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport6Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport6Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="(-1021.238-0.001)*mm" />
<zplane rmin="758.059*mm" rmax="763.796*mm" z="(-1021.740-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1070.020-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1070.522-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport7Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport7Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(-1272.885+0.001)*mm" />
<zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(-1273.387+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1343.711+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1344.213+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport8Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport8Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="-1273.387*mm" />
<zplane rmin="943.753*mm" rmax="1015.748*mm" z="-1279.686*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="-1344.213*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="-1350.512*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport9Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport9Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(-1279.686-0.001)*mm" />
<zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(-1280.188-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1350.512-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1351.014-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport10Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport10Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="(-1536.560+0.001)*mm" />
<zplane rmin="1258.071*mm" rmax="1263.808*mm" z="(-1537.062+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1629.089+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1629.591+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport11Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport11Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="-1537.062*mm" />
<zplane rmin="1191.810*mm" rmax="1263.808*mm" z="-1543.361*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="-1629.591*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="-1635.890*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport12Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport12Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="(-1543.361-0.001)*mm" />
<zplane rmin="1258.071*mm" rmax="1263.808*mm" z="(-1543.863-0.001)*mm" />
@@ -211,7 +211,7 @@
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1636.392-0.001)*mm" />
</detector>
- <detector name="TrackerReadout" type="dd4hep_DiskTracker" reflect="true" vis="GreenVis">
+ <detector name="TrackerReadout" type="DD4hep_DiskTracker" reflect="true" vis="GreenVis">
<comment>Readouts</comment>
diff --git a/DDDetectors/compact/SiD/SiD_VertexBarrel.xml b/DDDetectors/compact/SiD/SiD_VertexBarrel.xml
index fe12db1e2..eb04a92d2 100644
--- a/DDDetectors/compact/SiD/SiD_VertexBarrel.xml
+++ b/DDDetectors/compact/SiD/SiD_VertexBarrel.xml
@@ -30,7 +30,7 @@
<!-- ==================================================================== -->
<detectors>
- <detector id="VertexBarrel_ID" name="SiVertexBarrel" type="dd4hep_SiTrackerBarrel" readout="SiVertexBarrelHits" insideTrackingVolume="true">
+ <detector id="VertexBarrel_ID" name="SiVertexBarrel" type="DD4hep_SiTrackerBarrel" readout="SiVertexBarrelHits" insideTrackingVolume="true">
<comment>Vertex Detector Barrel</comment>
diff --git a/DDDetectors/compact/SiD/SiD_VertexEndcap.xml b/DDDetectors/compact/SiD/SiD_VertexEndcap.xml
index 33fa852d6..0b4bce075 100644
--- a/DDDetectors/compact/SiD/SiD_VertexEndcap.xml
+++ b/DDDetectors/compact/SiD/SiD_VertexEndcap.xml
@@ -38,7 +38,7 @@
<comment>Vertex Detector Endcaps</comment>
- <detector id="2" name="SiVertexEndcap" type="dd4hep_SiTrackerEndcap2" readout="SiVertexEndcapHits" reflect="true">
+ <detector id="2" name="SiVertexEndcap" type="DD4hep_SiTrackerEndcap2" readout="SiVertexEndcapHits" reflect="true">
<module name="SiVertexEndcapModule1">
<trd x1="VertexEndcap_rmin1 * tan(pi/(VertexEndcapModules-0.1))" x2="VertexEndcap_rmax * sin(pi/(VertexEndcapModules-0.1*cm))" z="(VertexEndcap_rmax - VertexEndcap_rmin1) / 2" />
<module_component thickness="0.005*cm" material="Silicon" sensitive="true" vis="SiVertexSensitiveVis"/>
diff --git a/DDDetectors/compact/SiD/SiD_VertexSupport.xml b/DDDetectors/compact/SiD/SiD_VertexSupport.xml
index 6fb05e0e7..512b2c492 100644
--- a/DDDetectors/compact/SiD/SiD_VertexSupport.xml
+++ b/DDDetectors/compact/SiD/SiD_VertexSupport.xml
@@ -9,7 +9,7 @@
<comment>Vertex Detector Supports and Readout</comment>
- <detector name="VertexBarrelSupports" type="dd4hep_MultiLayerTracker" vis="SupportVis" reflect="true">
+ <detector name="VertexBarrelSupports" type="DD4hep_MultiLayerTracker" vis="SupportVis" reflect="true">
<comment>Double-walled Carbon Fiber support tube</comment>
@@ -20,7 +20,7 @@
<slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
</layer>
</detector>
- <detector name="VertexEndSupports" type="dd4hep_DiskTracker" reflect="true" vis="SupportVis">
+ <detector name="VertexEndSupports" type="DD4hep_DiskTracker" reflect="true" vis="SupportVis">
<layer id="7" inner_r = "(86.88*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexEndcap_offset" inner_z = "86.88*cm" outer_r = "16.87*cm">
<slice material = "CarbonFiber" thickness = "VXD_CF_support" />
</layer>
@@ -29,7 +29,7 @@
</layer>
</detector>
- <detector name="VertexReadout" type="dd4hep_DiskTracker" reflect="true" vis="CableVis">
+ <detector name="VertexReadout" type="DD4hep_DiskTracker" reflect="true" vis="CableVis">
<comment>Readout and Cabling</comment>
@@ -86,7 +86,7 @@
</layer>
</detector>
- <detector name="VXDcableZforwardBarrel" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZforwardBarrel" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin = "(CentralBeamPipe_rmax)"
rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
@@ -96,7 +96,7 @@
z="CentralBeamPipe_zmax"/>
</detector>
- <detector name="VXDcableZbackwardBarrel" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZbackwardBarrel" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin = "(CentralBeamPipe_rmax)"
rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
@@ -106,7 +106,7 @@
z="-CentralBeamPipe_zmax"/>
</detector>
- <detector name="VXDcableZbackwardOuter" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZbackwardOuter" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin = "((tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax)"
rmax = "((tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + 0.004*cm)"
@@ -116,7 +116,7 @@
z="-(VertexService_zmax + 0.01*cm)"/>
</detector>
- <detector name="VXDcableZbackwardInner" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZbackwardInner" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin="CentralBeamPipe_rmax"
rmax="CentralBeamPipe_rmax + VertexCableThickness"
@@ -126,7 +126,7 @@
z="-(VertexService_zmin - 0.01*cm)"/>
</detector>
- <detector name="VXDcableZforwardOuter" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZforwardOuter" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin = "((tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax)"
rmax = "((tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + 0.004*cm)"
@@ -136,7 +136,7 @@
z="VertexService_zmax + 0.01*cm"/>
</detector>
- <detector name="VXDcableZforwardInner" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZforwardInner" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin="(VertexService_zmin - 0.01*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
rmax="(VertexService_zmin - 0.01*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexCableThickness"
@@ -146,7 +146,7 @@
z="CentralBeamPipe_zmax"/>
</detector>
- <detector name="VXDserviceZbackward" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDserviceZbackward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="G10"/>
<zplane rmin = "(VertexService_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
rmax="(VertexService_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexServiceThickness"
@@ -156,7 +156,7 @@
z="-VertexService_zmin"/>
</detector>
- <detector name="VXDserviceZforward" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDserviceZforward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="G10"/>
<zplane rmin = "(VertexService_zmin - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
rmax="(VertexService_zmin - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexServiceThickness"
diff --git a/DDDetectors/compact/SiD_Markus.xml b/DDDetectors/compact/SiD_Markus.xml
index 6ddb8d99a..b7185809d 100644
--- a/DDDetectors/compact/SiD_Markus.xml
+++ b/DDDetectors/compact/SiD_Markus.xml
@@ -241,13 +241,13 @@
</fields>
<plugins>
- <plugin name="dd4hep_SiTrackerEndcapSurfacePlugin">
+ <plugin name="DD4hep_SiTrackerEndcapSurfacePlugin">
<argument value="SiVertexEndcap"/>
<argument value="dimension=1"/>
</plugin>
</plugins>
<plugins>
- <plugin name="dd4hep_SiTrackerBarrelSurfacePlugin">
+ <plugin name="DD4hep_SiTrackerBarrelSurfacePlugin">
<argument value="SiVertexBarrel"/>
<argument value="dimension=1"/>
</plugin>
diff --git a/DDDetectors/doc/README.ExtensionPlugins b/DDDetectors/doc/README.ExtensionPlugins
index fcdbabd18..8b8eeed62 100644
--- a/DDDetectors/doc/README.ExtensionPlugins
+++ b/DDDetectors/doc/README.ExtensionPlugins
@@ -51,7 +51,7 @@ Available plugins
and the implementation type dd4hep::rec::LayeringExtensionImpl.
Please see documentation in DDRec for details.
--- "dd4hep_SiTrackerBarrelSurfacePlugin"
+-- "DD4hep_SiTrackerBarrelSurfacePlugin"
argument: subdetector name as registered to Detector
This plugin adds measurement surfaces of interface type DDSurfaces::ISurface
to each detector element which has a placement with a sensitive volume.
@@ -61,7 +61,7 @@ Available plugins
- SiTrackerBarrel
- EcalBarrel
--- "dd4hep_SiTrackerEndcapSurfacePlugin"
+-- "DD4hep_SiTrackerEndcapSurfacePlugin"
argument: subdetector name as registered to Detector
This plugin adds measurement surfaces of interface type DDSurfaces::ISurface
to each detector element which has a placement with a sensitive volume.
diff --git a/DDDetectors/src/Beampipe_o1_v01_geo.cpp b/DDDetectors/src/Beampipe_o1_v01_geo.cpp
index 676070f84..2ee451bdc 100644
--- a/DDDetectors/src/Beampipe_o1_v01_geo.cpp
+++ b/DDDetectors/src/Beampipe_o1_v01_geo.cpp
@@ -106,7 +106,7 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& description,
xml_h element,
dd4hep::SensitiveDetector /*sens*/) {
- printout(dd4hep::DEBUG,"dd4hep_Beampipe", "Creating Beampipe" ) ;
+ printout(dd4hep::DEBUG,"DD4hep_Beampipe", "Creating Beampipe" ) ;
//Access to the XML File
xml_det_t xmlBeampipe = element;
@@ -166,7 +166,7 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& description,
<< std::setw(35) << volName
<< std::setw(15) << sectionMat.name();
- printout(dd4hep::INFO, "dd4hep_Beampipe", pipeInfo.str() );
+ printout(dd4hep::INFO, "DD4hep_Beampipe", pipeInfo.str() );
if( crossType == ODH::kCenter ) { // store only the central sections !
dd4hep::rec::ConicalSupportData::Section section ;
diff --git a/DDDetectors/src/CaloFaceBarrel_surfaces.cpp b/DDDetectors/src/CaloFaceBarrel_surfaces.cpp
index ac9d851d9..4fa16e8ae 100644
--- a/DDDetectors/src/CaloFaceBarrel_surfaces.cpp
+++ b/DDDetectors/src/CaloFaceBarrel_surfaces.cpp
@@ -90,7 +90,7 @@ namespace{
std::string name( argv[i] , ptr ) ;
double value = dd4hep::_toDouble(++ptr);
- printout(dd4hep::DEBUG,"dd4hep_CaloFaceBarrelSurfacePlugin", "argument[%d] = %s = %f" , i, name.c_str() , value ) ;
+ printout(dd4hep::DEBUG,"DD4hep_CaloFaceBarrelSurfacePlugin", "argument[%d] = %s = %f" , i, name.c_str() , value ) ;
if( name=="length" ) data.length = value ;
else if( name=="radius" ) data.radius = value ;
@@ -99,7 +99,7 @@ namespace{
else if( name=="systemID") data.systemID = value ;
else if( name=="encoding") data.encoding = ptr ;
else {
- printout(dd4hep::WARNING,"dd4hep_CaloFaceBarrelSurfacePlugin", "unknown parameter: %s ", name.c_str() ) ;
+ printout(dd4hep::WARNING,"DD4hep_CaloFaceBarrelSurfacePlugin", "unknown parameter: %s ", name.c_str() ) ;
}
}
}
@@ -124,7 +124,7 @@ namespace{
double inner_thickness = 1e-6 ;
double outer_thickness = 1e-6 ;
- printout(dd4hep::INFO,"dd4hep_CaloFaceBarrelSurfacePlugin", "install tracking surfaces for : %s ", component.name() ) ;
+ printout(dd4hep::INFO,"DD4hep_CaloFaceBarrelSurfacePlugin", "install tracking surfaces for : %s ", component.name() ) ;
dd4hep::DDSegmentation::BitField64 bf( "system:5,side:-2,layer:9,module:8,sensor:8" ) ;
diff --git a/DDDetectors/src/CaloFaceEndcap_surfaces.cpp b/DDDetectors/src/CaloFaceEndcap_surfaces.cpp
index 038154e92..c4df7b5b2 100644
--- a/DDDetectors/src/CaloFaceEndcap_surfaces.cpp
+++ b/DDDetectors/src/CaloFaceEndcap_surfaces.cpp
@@ -95,7 +95,7 @@ namespace{
std::string name( argv[i] , ptr ) ;
double value = dd4hep::_toDouble(++ptr);
- printout(dd4hep::DEBUG,"dd4hep_CaloFaceEndcapSurfacePlugin", "argument[%d] = %s = %f" , i, name.c_str() , value ) ;
+ printout(dd4hep::DEBUG,"DD4hep_CaloFaceEndcapSurfacePlugin", "argument[%d] = %s = %f" , i, name.c_str() , value ) ;
if( name=="zpos" ) data.zpos = value ;
else if( name=="radius" ) data.radius = value ;
@@ -104,7 +104,7 @@ namespace{
else if( name=="systemID") data.systemID = value ;
else if( name=="encoding") data.encoding = ptr ;
else {
- printout(dd4hep::WARNING,"dd4hep_CaloFaceEndcapSurfacePlugin", "unknown parameter: %s ", name.c_str() ) ;
+ printout(dd4hep::WARNING,"DD4hep_CaloFaceEndcapSurfacePlugin", "unknown parameter: %s ", name.c_str() ) ;
}
}
}
@@ -128,7 +128,7 @@ namespace{
double inner_thickness = 1e-6 ;
double outer_thickness = 1e-6 ;
- printout(dd4hep::INFO,"dd4hep_CaloFaceEndcapSurfacePlugin", "install tracking surfaces for : %s ", component.name() ) ;
+ printout(dd4hep::INFO,"DD4hep_CaloFaceEndcapSurfacePlugin", "install tracking surfaces for : %s ", component.name() ) ;
dd4hep::DDSegmentation::BitField64 bf( "system:5,side:-2,layer:9,module:8,sensor:8" ) ;
diff --git a/DDDetectors/src/GenericSurfaceInstaller.cpp b/DDDetectors/src/GenericSurfaceInstaller.cpp
index bdce522f8..b517e6afc 100644
--- a/DDDetectors/src/GenericSurfaceInstaller.cpp
+++ b/DDDetectors/src/GenericSurfaceInstaller.cpp
@@ -34,7 +34,7 @@
* plugin for the VertexEndcap detector, put this snippet in the relevant compact file:
* \verbatim
<plugins>
- <plugin name="dd4hep_GenericSurfaceInstallerPlugin">
+ <plugin name="DD4hep_GenericSurfaceInstallerPlugin">
<argument value="VertexEndcap"/>
<argument value="dimension=2"/>
<argument value="u_x=-1."/>
@@ -97,7 +97,7 @@ namespace{
if ( ptr ) {
std::string name( argv[i] , ptr ) ;
value = dd4hep::_toDouble(++ptr);
- std::cout << "dd4hep_GenericSurfaceInstallerPlugin: argument[" << i << "] = " << name
+ std::cout << "DD4hep_GenericSurfaceInstallerPlugin: argument[" << i << "] = " << name
<< " = " << value << std::endl;
if( name=="dimension" ) data.dimension = value ;
if( name=="u_x" ) data.uvector[0]=value ;
@@ -115,7 +115,7 @@ namespace{
}
}
- std::cout <<"dd4hep_GenericSurfaceInstallerPlugin: vectors: ";
+ std::cout <<"DD4hep_GenericSurfaceInstallerPlugin: vectors: ";
std::cout <<"u( "<<data.uvector[0]<<" , "<<data.uvector[1]<<" , "<<data.uvector[2]<<") ";
std::cout <<"v( "<<data.vvector[0]<<" , "<<data.vvector[1]<<" , "<<data.vvector[2]<<") ";
std::cout <<"n( "<<data.nvector[0]<<" , "<<data.nvector[1]<<" , "<<data.nvector[2]<<") ";
@@ -133,7 +133,7 @@ namespace{
dd4hep::Box mod_shape(mod_vol.solid()), comp_shape(comp_vol.solid());
if ( !comp_shape.isValid() || !mod_shape.isValid() ) {
- invalidInstaller("dd4hep_GenericSurfaceInstallerPlugin: Components and/or modules are not boxes -- invalid shapes");
+ invalidInstaller("DD4hep_GenericSurfaceInstallerPlugin: Components and/or modules are not boxes -- invalid shapes");
}else if ( !handleUsingCache(component,comp_vol) ) {
const double* trans = placementTranslation(component);
diff --git a/DDDetectors/src/Mask_o1_v01_geo.cpp b/DDDetectors/src/Mask_o1_v01_geo.cpp
index bb136c2d0..4580ce475 100644
--- a/DDDetectors/src/Mask_o1_v01_geo.cpp
+++ b/DDDetectors/src/Mask_o1_v01_geo.cpp
@@ -35,7 +35,7 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& description,
xml_h xmlHandle,
dd4hep::SensitiveDetector /*sens*/) {
- printout(dd4hep::DEBUG,"dd4hep_Mask", "Creating Mask" ) ;
+ printout(dd4hep::DEBUG,"DD4hep_Mask", "Creating Mask" ) ;
//Access to the XML File
xml_det_t xmlMask = xmlHandle;
@@ -81,7 +81,7 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& description,
<< std::setw(35) << volName
<< std::setw(15) << sectionMat.name();
- printout(dd4hep::INFO, "dd4hep_Mask", pipeInfo.str() );
+ printout(dd4hep::INFO, "DD4hep_Mask", pipeInfo.str() );
// things which can be calculated immediately
const double zHalf = fabs(zEnd - zStart) * 0.5; // half z length of the cone
diff --git a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
index c20aa9400..22c64831a 100644
--- a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
@@ -34,7 +34,7 @@ namespace{
std::string name( argv[i] , ptr ) ;
double value = dd4hep::_toDouble(++ptr);
if( name=="dimension" ) data.dimension = value ;
- std::cout << "dd4hep_SiTrackerBarrelSurfacePlugin: argument[" << i << "] = " << name
+ std::cout << "DD4hep_SiTrackerBarrelSurfacePlugin: argument[" << i << "] = " << name
<< " = " << value << std::endl;
}
}
diff --git a/DDEve/src/MultiView.cpp b/DDEve/src/MultiView.cpp
index 6d1eb099d..d2e2d9f74 100644
--- a/DDEve/src/MultiView.cpp
+++ b/DDEve/src/MultiView.cpp
@@ -73,11 +73,11 @@ View& MultiView::Build(TEveWindow* slot) {
/// First panel
if ( panels.size()>0) {
const DisplayConfiguration::Config& cfg = panels[0];
- string typ = "dd4hep__"+cfg.use;
+ string typ = "DD4hep__"+cfg.use;
v = PluginService::Create<View*>(typ.c_str(),m_eve,cfg.name.c_str());
}
else {
- v = PluginService::Create<View*>("dd4hep_DDEve_RhoZProjection",m_eve,(m_name+" - RhoZ View").c_str());
+ v = PluginService::Create<View*>("DD4hep_DDEve_RhoZProjection",m_eve,(m_name+" - RhoZ View").c_str());
}
(new_slot = pack->NewSlot())->MakeCurrent();
_build(m_eve,v,new_slot);
@@ -85,11 +85,11 @@ View& MultiView::Build(TEveWindow* slot) {
/// Second panel
if ( panels.size()>1) {
const DisplayConfiguration::Config& cfg = panels[1];
- string typ = "dd4hep__"+cfg.use;
+ string typ = "DD4hep__"+cfg.use;
v = PluginService::Create<View*>(typ.c_str(),m_eve,cfg.name.c_str());
}
else {
- v = PluginService::Create<View*>("dd4hep_DDEve_RhoPhiProjection",m_eve,(m_name+" - RPhi View").c_str());
+ v = PluginService::Create<View*>("DD4hep_DDEve_RhoPhiProjection",m_eve,(m_name+" - RPhi View").c_str());
}
(new_slot = pack->NewSlot())->MakeCurrent();
_build(m_eve,v,new_slot);
diff --git a/DDEve/src/ViewMenu.cpp b/DDEve/src/ViewMenu.cpp
index 197c2f568..c49353695 100644
--- a/DDEve/src/ViewMenu.cpp
+++ b/DDEve/src/ViewMenu.cpp
@@ -55,13 +55,13 @@ ViewMenu::~ViewMenu() {
void ViewMenu::Build(TGMenuBar* bar, int hints) {
pair<string,string>* p = 0;
PopupMenu* view_menu = this;
- view_menu->AddEntry("3&D View", this, &ViewMenu::CreateView, p=new pair<string,string>("dd4hep_DDEve_View3D","3D"));
- view_menu->AddEntry("Rho-&Z Projection", this, &ViewMenu::CreateView, p=new pair<string,string>("dd4hep_DDEve_RhoZProjection","Rho-Z"));
- view_menu->AddEntry("Rho-&Phi Projection",this, &ViewMenu::CreateView, p=new pair<string,string>("dd4hep_DDEve_RhoPhiProjection","Rho-Phi"));
+ view_menu->AddEntry("3&D View", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep_DDEve_View3D","3D"));
+ view_menu->AddEntry("Rho-&Z Projection", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep_DDEve_RhoZProjection","Rho-Z"));
+ view_menu->AddEntry("Rho-&Phi Projection",this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep_DDEve_RhoPhiProjection","Rho-Phi"));
const Display::ViewConfigurations& vc = m_display->viewConfigurations();
for(Display::ViewConfigurations::const_iterator i=vc.begin(); i!=vc.end(); ++i) {
const Display::ViewConfig& v = (*i).second;
- view_menu->AddEntry(v.name.c_str(), this, &ViewMenu::CreateView,p=new pair<string,string>("dd4hep_DDEve_"+v.type,v.name));
+ view_menu->AddEntry(v.name.c_str(), this, &ViewMenu::CreateView,p=new pair<string,string>("DD4hep_DDEve_"+v.type,v.name));
}
bar->AddPopup(m_title.c_str(),*view_menu, new TGLayoutHints(hints, 0, 4, 0, 0));
}
@@ -73,7 +73,7 @@ void ViewMenu::CreateView(TGMenuEntry*, void* ud) {
}
View* ViewMenu::CreateView(const std::string& type, const std::string& title) {
- pair<string,string> args("dd4hep_DDEve_"+type,title);
+ pair<string,string> args("DD4hep_DDEve_"+type,title);
View* v = PluginService::Create<View*>(type.c_str(),m_display,title.c_str());
BuildView(v);
return v;
@@ -81,17 +81,17 @@ View* ViewMenu::CreateView(const std::string& type, const std::string& title)
/// Create a new 3D view
View* ViewMenu::CreateView3D(const std::string& title) {
- return CreateView("dd4hep_DDEve_View3D",title.c_str());
+ return CreateView("DD4hep_DDEve_View3D",title.c_str());
}
/// Create a new R-Z view
View* ViewMenu::CreateRhoZProjection(const std::string& title ) {
- return CreateView("dd4hep_DDEve_RhoZProjection",title.c_str());
+ return CreateView("DD4hep_DDEve_RhoZProjection",title.c_str());
}
/// Create a new R-Phi view
View* ViewMenu::CreateRhoPhiProjection(const std::string& title ) {
- return CreateView("dd4hep_DDEve_RhoPhiProjection",title.c_str());
+ return CreateView("DD4hep_DDEve_RhoPhiProjection",title.c_str());
}
/// Import Geometry data
diff --git a/DDG4/examples/TEve.C b/DDG4/examples/TEve.C
index a9e66c377..f1cc57796 100644
--- a/DDG4/examples/TEve.C
+++ b/DDG4/examples/TEve.C
@@ -31,7 +31,7 @@ using namespace dd4hep::detail;
void TEve() {
Detector& description = Detector::getInstance();
const char* fname = "file:../DD4hep.trunk/DDExamples/CLICSiD/compact/compact.xml";
- description.apply("dd4hepCompactLoader",1,(char**)&fname);
+ description.apply("DD4hepCompactLoader",1,(char**)&fname);
TEveManager::Create();
//TFile::SetCacheFileDir(".");
diff --git a/DDG4/src/Geant4Kernel.cpp b/DDG4/src/Geant4Kernel.cpp
index f2f326926..ecb846224 100644
--- a/DDG4/src/Geant4Kernel.cpp
+++ b/DDG4/src/Geant4Kernel.cpp
@@ -266,14 +266,14 @@ G4RunManager& Geant4Kernel::runManager() {
/// Construct detector geometry using description plugin
void Geant4Kernel::loadGeometry(const std::string& compact_file) {
char* arg = (char*) compact_file.c_str();
- m_detDesc->apply("dd4hepXMLLoader", 1, &arg);
+ m_detDesc->apply("DD4hepXMLLoader", 1, &arg);
//return *this;
}
// Utility function to load XML files
void Geant4Kernel::loadXML(const char* fname) {
const char* args[] = { fname, 0 };
- m_detDesc->apply("dd4hepXMLLoader", 1, (char**) args);
+ m_detDesc->apply("DD4hepXMLLoader", 1, (char**) args);
}
int Geant4Kernel::configure() {
diff --git a/UtilityApps/src/converter.cpp b/UtilityApps/src/converter.cpp
index 7651b8fc2..1296cc8ac 100644
--- a/UtilityApps/src/converter.cpp
+++ b/UtilityApps/src/converter.cpp
@@ -86,21 +86,21 @@ namespace {
// Load compact files
for(size_t i=0; i<geo_files.size(); ++i) {
const char* plugin_argv[] = {geo_files[i], 0};
- run_plugin(description,"dd4hepCompactLoader",1,(char**)plugin_argv);
+ run_plugin(description,"DD4hepCompactLoader",1,(char**)plugin_argv);
}
// Create volume manager and populate it required
- if ( volmgr ) run_plugin(description,"dd4hepVolumeManager",0,0);
+ if ( volmgr ) run_plugin(description,"DD4hepVolumeManager",0,0);
// Execute data converter.
if ( compact2description )
- run_plugin(description,"dd4hepGeometry2Detector",output,&argv[output]);
+ run_plugin(description,"DD4hepGeometry2Detector",output,&argv[output]);
else if ( compact2gdml )
- run_plugin(description,"dd4hepGeometry2GDML",output,&argv[output]);
+ run_plugin(description,"DD4hepGeometry2GDML",output,&argv[output]);
else if ( compact2pand )
- run_plugin(description,"dd4hepGeometry2PANDORA",output,&argv[output]);
+ run_plugin(description,"DD4hepGeometry2PANDORA",output,&argv[output]);
else if ( compact2vis && ascii )
- run_plugin(description,"dd4hepGeometry2VISASCII",output,&argv[output]);
+ run_plugin(description,"DD4hepGeometry2VISASCII",output,&argv[output]);
else if ( compact2vis )
- run_plugin(description,"dd4hepGeometry2VIS",output,&argv[output]);
+ run_plugin(description,"DD4hepGeometry2VIS",output,&argv[output]);
if ( destroy ) delete &description;
return 0;
}
diff --git a/UtilityApps/src/display.cpp b/UtilityApps/src/display.cpp
index 7b5a12a52..f4ab6513d 100644
--- a/UtilityApps/src/display.cpp
+++ b/UtilityApps/src/display.cpp
@@ -16,5 +16,5 @@
//______________________________________________________________________________
int main(int argc,char** argv) {
- return main_default("dd4hepGeometryDisplay",argc,argv);
+ return main_default("DD4hepGeometryDisplay",argc,argv);
}
diff --git a/UtilityApps/src/plugin_runner.cpp b/UtilityApps/src/plugin_runner.cpp
index 8e551476d..25ae98018 100644
--- a/UtilityApps/src/plugin_runner.cpp
+++ b/UtilityApps/src/plugin_runner.cpp
@@ -54,7 +54,7 @@ namespace {
cout << "geoPluginRun: No geometry input supplied. No geometry will be loaded." << endl;
}
// Create volume manager and populate it required
- if ( arguments.volmgr ) run_plugin(description,"dd4hepVolumeManager",0,0);
+ if ( arguments.volmgr ) run_plugin(description,"DD4hepVolumeManager",0,0);
// Execute plugin
for(size_t i=0; i<arguments.plugins.size(); ++i) {
std::vector<const char*>& plug = arguments.plugins[i];
diff --git a/UtilityApps/src/run_plugin.h b/UtilityApps/src/run_plugin.h
index d393428de..deeb1d110 100644
--- a/UtilityApps/src/run_plugin.h
+++ b/UtilityApps/src/run_plugin.h
@@ -241,7 +241,7 @@ namespace {
// Load all compact files
for(size_t i=0; i<args.geo_files.size(); ++i) {
const char* argv[] = {args.geo_files[i], args.build_types[i], 0};
- run_plugin(description,"dd4hepCompactLoader",2,(char**)argv);
+ run_plugin(description,"DD4hepCompactLoader",2,(char**)argv);
}
}
@@ -266,9 +266,9 @@ namespace {
Detector& description = dd4hep_instance();
// Load all compact files
load_compact(description, args);
- if ( args.ui ) run_plugin(description,"dd4hepInteractiveUI",0,0);
+ if ( args.ui ) run_plugin(description,"DD4hepInteractiveUI",0,0);
// Create volume manager and populate it required
- if ( args.volmgr ) run_plugin(description,"dd4hepVolumeManager",0,0);
+ if ( args.volmgr ) run_plugin(description,"DD4hepVolumeManager",0,0);
// Create an interactive ROOT application
if ( !args.dry_run ) {
diff --git a/UtilityApps/src/teve_display.cpp b/UtilityApps/src/teve_display.cpp
index ddbeca979..9f86f3e76 100644
--- a/UtilityApps/src/teve_display.cpp
+++ b/UtilityApps/src/teve_display.cpp
@@ -155,7 +155,7 @@ DECLARE_APPLY(DD4hepTEveDisplay,teve_display)
//=====================================================================================================================
int main(int argc,char** argv) {
- return main_default("dd4hepTEveDisplay",argc,argv);
+ return main_default("DD4hepTEveDisplay",argc,argv);
}
//=====================================================================================================================
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 9a5f86634..8f8122f81 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -323,16 +323,16 @@ macro ( dd4hep_configure_output )
set ( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin )
endif()
#------------- set the default installation directory to be the source directory
- dd4hep_debug( "dd4hep_configure_output: CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT}" )
+ dd4hep_debug( "DD4hep_configure_output: CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT}" )
if ( NOT "${ARG_INSTALL}" STREQUAL "" )
set ( CMAKE_INSTALL_PREFIX ${ARG_INSTALL} CACHE PATH "Set install prefix path." FORCE )
- dd4hep_print( "dd4hep_configure_output: set CMAKE_INSTALL_PREFIX to ${ARG_INSTALL}" )
+ dd4hep_print( "DD4hep_configure_output: set CMAKE_INSTALL_PREFIX to ${ARG_INSTALL}" )
elseif ( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
set( CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR} CACHE PATH
"install prefix path - overwrite with -D CMAKE_INSTALL_PREFIX = ..." FORCE )
- dd4hep_print ( "dd4hep_configure_output: CMAKE_INSTALL_PREFIX is ${CMAKE_INSTALL_PREFIX} - overwrite with -D CMAKE_INSTALL_PREFIX" )
+ dd4hep_print ( "DD4hep_configure_output: CMAKE_INSTALL_PREFIX is ${CMAKE_INSTALL_PREFIX} - overwrite with -D CMAKE_INSTALL_PREFIX" )
elseif ( CMAKE_INSTALL_PREFIX )
- dd4hep_print( "dd4hep_configure_output: set CMAKE_INSTALL_PREFIX to ${CMAKE_INSTALL_PREFIX}" )
+ dd4hep_print( "DD4hep_configure_output: set CMAKE_INSTALL_PREFIX to ${CMAKE_INSTALL_PREFIX}" )
set ( CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} )
endif()
dd4hep_debug("|++> Installation goes to: ${CMAKE_INSTALL_PREFIX} <${ARG_INSTALL}>" )
@@ -495,10 +495,10 @@ function ( dd4hep_find_package name found )
set ( ${found} "ON" PARENT_SCOPE )
else()
dd4hep_find_packageEx( ${name} ${ARGN} )
- dd4hep_debug("dd4hep_find_package: DD4HEP_USE_${name}: ${DD4HEP_USE_${NAME}} Exists: ${${NAME}_EXISTS} ARGS:${arguments}")
+ dd4hep_debug("DD4hep_find_package: DD4HEP_USE_${name}: ${DD4HEP_USE_${NAME}} Exists: ${${NAME}_EXISTS} ARGS:${arguments}")
if ( "${${NAME}_EXISTS}" STREQUAL "ON" )
- dd4hep_debug( "dd4hep_find_package ${NAME} Incs: ${incs}" )
- dd4hep_debug( "dd4hep_find_package ${NAME} Libs: ${libs}" )
+ dd4hep_debug( "DD4hep_find_package ${NAME} Incs: ${incs}" )
+ dd4hep_debug( "DD4hep_find_package ${NAME} Libs: ${libs}" )
set_property ( GLOBAL PROPERTY ${NAME}_COMPONENTS ${arguments} )
set_property ( GLOBAL PROPERTY ${NAME}_INCLUDE_DIRS ${${NAME}_INCLUDE_DIRS} )
set_property ( GLOBAL PROPERTY ${NAME}_LIBRARIES ${${NAME}_LIBRARIES} )
@@ -547,7 +547,7 @@ endfunction( dd4hep_install_dir )
#
#---------------------------------------------------------------------------------------------------
function ( dd4hep_install_includes package )
- dd4hep_print ( "dd4hep_install_includes[${package}]: ${ARGN}" )
+ dd4hep_print ( "DD4hep_install_includes[${package}]: ${ARGN}" )
dd4hep_install_dir( ${ARGN} DESTINATION include )
endfunction()
diff --git a/cmake/thisdd4hep.sh b/cmake/thisdd4hep.sh
index d9334db39..438b132e3 100644
--- a/cmake/thisdd4hep.sh
+++ b/cmake/thisdd4hep.sh
@@ -37,7 +37,7 @@ dd4hep_add_path() {
path_value=${path_prefix};
fi;
eval export ${path_name}=${path_value};
- ## echo "dd4hep_add_path: ${path_name}=${path_value}";
+ ## echo "DD4hep_add_path: ${path_name}=${path_value}";
}
#-----------------------------------------------------------------------------
dd4hep_add_library_path() {
diff --git a/doc/LaTex/DD4hepManual.tex b/doc/LaTex/DD4hepManual.tex
index 1b29ea2cb..b8ccd6bc6 100644
--- a/doc/LaTex/DD4hepManual.tex
+++ b/doc/LaTex/DD4hepManual.tex
@@ -1978,7 +1978,7 @@ The command to create the display is part of the dd4hep release:
\begin{code}
$> geoDisplay -compact <path to the XML file containing the detector description>
- dd4hepGeometryDisplay -opt [-opt]
+ DD4hepGeometryDisplay -opt [-opt]
-compact <file> Specify the compact geometry file
[REQUIRED] At least one compact geo file is required!
-build_type <number/string> Specify the build type
diff --git a/doc/ReleaseNotes.md b/doc/ReleaseNotes.md
index 8d4262a20..45e6b547f 100644
--- a/doc/ReleaseNotes.md
+++ b/doc/ReleaseNotes.md
@@ -856,7 +856,7 @@ F.Gaede
- Compounds (ie. nested detectors) are of type 'compound'
- Dump detector types using plugin:
- geoPluginRun -plugin dd4hepDetectorTypes -input <compact-file>
+ geoPluginRun -plugin DD4hepDetectorTypes -input <compact-file>
2015/03/12 Markus Frank
- Add support for ellipsoids in gdml/description and geant4 conversion.
@@ -967,7 +967,7 @@ F.Gaede
- example code: DDDetectors/src/SurfaceExamplePlugin.cpp
- compact:
```
- <plugin name="dd4hep_SurfaceExamplePlugin">
+ <plugin name="DD4hep_SurfaceExamplePlugin">
<argument value="SiTrackerBarrel"/>
<argument value="aa=1*mm"/>
<argument value="bb=2*cm"/>
diff --git a/examples/AlignDet/CMakeLists.txt b/examples/AlignDet/CMakeLists.txt
index 08d8caa4d..6d0a25cbe 100644
--- a/examples/AlignDet/CMakeLists.txt
+++ b/examples/AlignDet/CMakeLists.txt
@@ -30,7 +30,7 @@ dd4hep_add_test_reg( AlignDet_Telescope_dump_geometry
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
EXEC_ARGS geoPluginRun -volmgr -destroy
-compact file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
- -plugin dd4hepDetectorDump
+ -plugin DD4hepDetectorDump
REGEX_PASS "/world/Telescope/module_9 NumDau\\:1 VolID\\:00000903 Place"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
)
@@ -149,7 +149,7 @@ dd4hep_add_test_reg( AlignDet_AlephTPC_global_align
-input file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC.xml
-destroy -no-interpreter
-plugin dd4hep_GlobalAlignmentInstall
- -plugin dd4hepXMLLoader file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC_alignment.xml BUILD_DEFAULT
+ -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"
)
@@ -161,8 +161,8 @@ dd4hep_add_test_reg( AlignDet_AlephTPC_global_reset
-input file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC.xml
-destroy -no-interpreter
-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
+ -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"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
)
diff --git a/examples/AlignDet/compact/Telescope.xml b/examples/AlignDet/compact/Telescope.xml
index ceb6d9235..f9940f03a 100644
--- a/examples/AlignDet/compact/Telescope.xml
+++ b/examples/AlignDet/compact/Telescope.xml
@@ -42,7 +42,7 @@
<detectors>
<comment>No comment so far</comment>
- <detector name="Telescope" type="dd4hep_Example_Telescope" vis="DetVis" id ="3" readout="TelescopeHits">
+ <detector name="Telescope" type="DD4hep_Example_Telescope" vis="DetVis" id ="3" readout="TelescopeHits">
<!-- Front arm -->
<module z="0.0*cm" id="1" vis="ModVis">
<sensor thickness="3*mm" pitch="55*micron" NoOfPixY="256" NoOfPixX="256" vis="SensorVis"/>
diff --git a/examples/AlignDet/src/AlignmentExampleObjects.cpp b/examples/AlignDet/src/AlignmentExampleObjects.cpp
index fa7c785eb..5ef50d75a 100644
--- a/examples/AlignDet/src/AlignmentExampleObjects.cpp
+++ b/examples/AlignDet/src/AlignmentExampleObjects.cpp
@@ -24,11 +24,11 @@ using namespace dd4hep::AlignmentExamples;
/// Install the consitions and the alignment manager
ConditionsManager dd4hep::AlignmentExamples::installManager(Detector& description) {
// Now we instantiate the conditions manager
- description.apply("dd4hep_ConditionsManagerInstaller",0,(char**)0);
+ description.apply("DD4hep_ConditionsManagerInstaller",0,(char**)0);
ConditionsManager manager = ConditionsManager::from(description);
- manager["PoolType"] = "dd4hep_ConditionsLinearPool";
- manager["UserPoolType"] = "dd4hep_ConditionsMapUserPool";
- manager["UpdatePoolType"] = "dd4hep_ConditionsLinearUpdatePool";
+ manager["PoolType"] = "DD4hep_ConditionsLinearPool";
+ manager["UserPoolType"] = "DD4hep_ConditionsMapUserPool";
+ manager["UpdatePoolType"] = "DD4hep_ConditionsLinearUpdatePool";
manager.initialize();
return manager;
}
diff --git a/examples/AlignDet/src/AlignmentExample_align_telescope.cpp b/examples/AlignDet/src/AlignmentExample_align_telescope.cpp
index ec60a600c..349f72358 100644
--- a/examples/AlignDet/src/AlignmentExample_align_telescope.cpp
+++ b/examples/AlignDet/src/AlignmentExample_align_telescope.cpp
@@ -95,7 +95,7 @@ static int AlignmentExample_align_telescope (Detector& description, int argc, ch
ConditionsManager manager = installManager(description);
const void* setup_args[] = {setup.c_str(), 0}; // Better zero-terminate
- description.apply("dd4hep_ConditionsXMLRepositoryParser",1,(char**)setup_args);
+ description.apply("DD4hep_ConditionsXMLRepositoryParser",1,(char**)setup_args);
// Now the deltas are stored in the conditions manager in the proper IOV pools
const IOVType* iov_typ = manager.iovType("run");
if ( 0 == iov_typ ) {
diff --git a/examples/AlignDet/src/AlignmentExample_read_xml.cpp b/examples/AlignDet/src/AlignmentExample_read_xml.cpp
index 8c4f48934..3a653e774 100644
--- a/examples/AlignDet/src/AlignmentExample_read_xml.cpp
+++ b/examples/AlignDet/src/AlignmentExample_read_xml.cpp
@@ -66,7 +66,7 @@ static int alignment_example (Detector& description, int argc, char** argv) {
ConditionsManager manager = installManager(description);
const void* delta_args[] = {delta.c_str(), 0}; // Better zero-terminate
- description.apply("dd4hep_ConditionsXMLRepositoryParser",1,(char**)delta_args);
+ description.apply("DD4hep_ConditionsXMLRepositoryParser",1,(char**)delta_args);
// Now the deltas are stored in the conditions manager in the proper IOV pools
const IOVType* iov_typ = manager.iovType("run");
if ( 0 == iov_typ )
diff --git a/examples/CLICSiD/compact/compact.xml b/examples/CLICSiD/compact/compact.xml
index 6acc87294..9395db50d 100644
--- a/examples/CLICSiD/compact/compact.xml
+++ b/examples/CLICSiD/compact/compact.xml
@@ -273,7 +273,7 @@
<detectors>
<comment>Trackers</comment>
- <detector id="1" name="SiVertexBarrel" type="dd4hep_SiTrackerBarrel" readout="SiVertexBarrelHits" insideTrackingVolume="true">
+ <detector id="1" name="SiVertexBarrel" type="DD4hep_SiTrackerBarrel" readout="SiVertexBarrelHits" insideTrackingVolume="true">
<comment>Vertex Detector Barrel</comment>
<module name="VtxBarrelModuleInner" vis="SiVertexBarrelModuleVis">
<module_envelope width="10.0*mm" length="(VertexBarrel_zmax - 0.1*cm) * 2" thickness="0.6*mm"/>
@@ -321,7 +321,7 @@
</detector>
<comment>Vertex Detector Endcaps</comment>
- <detector id="2" name="SiVertexEndcap" type="dd4hep_SiTrackerEndcap2" readout="SiVertexEndcapHits" reflect="true">
+ <detector id="2" name="SiVertexEndcap" type="DD4hep_SiTrackerEndcap2" readout="SiVertexEndcapHits" reflect="true">
<module name="SiVertexEndcapModule1">
<trd x1="VertexEndcap_rmin1 * tan(pi/(VertexEndcapModules-0.1))" x2="VertexEndcap_rmax * sin(pi/(VertexEndcapModules-0.1*cm))" z="(VertexEndcap_rmax - VertexEndcap_rmin1) / 2" />
<module_component thickness="0.005*cm" material="Silicon" sensitive="true" vis="SiVertexSensitiveVis"/>
@@ -356,7 +356,7 @@
</layer>
</detector>
- <detector id="3" name="SiTrackerBarrel" type="dd4hep_SiTrackerBarrel" readout="SiTrackerBarrelHits">
+ <detector id="3" name="SiTrackerBarrel" type="DD4hep_SiTrackerBarrel" readout="SiTrackerBarrelHits">
<comment>Outer Tracker Barrel</comment>
<module name="SiTrackerModule_Layer1" vis="SiTrackerBarrelModuleVis">
<module_envelope width="97.79*mm" length="97.79*mm" thickness="0.3*cm"/>
@@ -535,7 +535,7 @@
</layer>
</detector>
- <detector id="4" name="SiTrackerEndcap" type="dd4hep_SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true">
+ <detector id="4" name="SiTrackerEndcap" type="DD4hep_SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true">
<comment>Outer Tracker Endcaps</comment>
<module name="Module1" vis="SiTrackerEndcapModuleVis">
<trd x1="36.112*mm" x2="46.635*mm" z="100.114/2*mm" />
@@ -607,7 +607,7 @@
</layer>
</detector>
- <detector id="5" name="SiTrackerForward" type="dd4hep_SiTrackerEndcap2" readout="SiTrackerForwardHits">
+ <detector id="5" name="SiTrackerForward" type="DD4hep_SiTrackerEndcap2" readout="SiTrackerForwardHits">
<comment>Forward Tracker inside Vertex Support Barrel</comment>
<module name="SiTrackerForwardModule1">
<trd x1="ForwardTracker_rmin1 * tan(pi/(ForwardTrackerModules-0.1))" x2="ForwardTracker_rmax * sin(pi/(ForwardTrackerModules-0.1))" z="(ForwardTracker_rmax - ForwardTracker_rmin1) / 2" />
@@ -636,7 +636,7 @@
</detector>
<comment>Calorimeters</comment>
- <detector id="6" name="EcalBarrel" type="dd4hep_EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis" calorimeterType="EM_BARREL">
+ <detector id="6" name="EcalBarrel" type="DD4hep_EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis" calorimeterType="EM_BARREL">
<comment>EM Calorimeter Barrel</comment>
<dimensions numsides="(int) CaloSides" rmin="EcalBarrel_rmin" z="EcalBarrel_zmax*2" />
<staves vis="EcalBarrelStaveVis"/>
@@ -664,7 +664,7 @@
</layer>
</detector>
- <detector id="7" name="EcalEndcap" type="dd4hep_PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis" calorimeterType="EM_ENDCAP">
+ <detector id="7" name="EcalEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis" calorimeterType="EM_ENDCAP">
<comment>EM Calorimeter Endcaps</comment>
<dimensions numsides="(int) CaloSides" zmin="EcalEndcap_zmin" rmin="EcalEndcap_rmin" rmax="EcalEndcap_rmax" />
<layer repeat="1">
@@ -691,7 +691,7 @@
</layer>
</detector>
- <detector id="8" name="HcalBarrel" type="dd4hep_PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="0.*cm" material="Steel235">
+ <detector id="8" name="HcalBarrel" type="DD4hep_PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="0.*cm" material="Steel235">
<comment>Hadron Calorimeter Barrel</comment>
<dimensions numsides="(int) CaloSides" rmin="HcalBarrel_rmin" z="EcalBarrel_zmax*2"/>
<staves vis="HcalBarrelStavesVis"/>
@@ -703,7 +703,7 @@
</detector>
- <detector id="9" name="HcalEndcap" type="dd4hep_PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits" vis="HcalEndcapVis" calorimeterType="HAD_ENDCAP">
+ <detector id="9" name="HcalEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits" vis="HcalEndcapVis" calorimeterType="HAD_ENDCAP">
<comment>Hadron Calorimeter Endcaps</comment>
<dimensions numsides="(int) CaloSides" zmin="HcalEndcap_zmin" rmin="HcalEndcap_rmin" rmax="HcalEndcap_rmax" />
<layer repeat="(int) HcalEndcap_layers">
@@ -713,7 +713,7 @@
</layer>
</detector>
- <detector id="10" name="HcalPlug" type="dd4hep_PolyhedraEndcapCalorimeter2" readout="HcalPlugHits" vis="MuonEndcapVis">
+ <detector id="10" name="HcalPlug" type="DD4hep_PolyhedraEndcapCalorimeter2" readout="HcalPlugHits" vis="MuonEndcapVis">
<comment>Hadron Calorimeter Plug</comment>
<dimensions numsides="(int) CaloSides" zmin="SolenoidCoilOuterZ" rmin="MuonEndcap_rmin" rmax="HcalEndcap_rmax" />
<layer repeat="1" vis="MuonEndcapLayerVis">
@@ -738,7 +738,7 @@
</detector>
- <detector id="11" name="MuonBarrel" type="dd4hep_PolyhedraBarrelCalorimeter2" readout="MuonBarrelHits" vis="MuonBarrelVis" calorimeterType="MUON_BARREL" gap="0.*cm" material="Steel235">
+ <detector id="11" name="MuonBarrel" type="DD4hep_PolyhedraBarrelCalorimeter2" readout="MuonBarrelHits" vis="MuonBarrelVis" calorimeterType="MUON_BARREL" gap="0.*cm" material="Steel235">
<comment>Muon Calorimeter Barrel</comment>
<dimensions numsides="(int) MuonSides" rmin="MuonBarrel_rmin" z="MuonBarrel_zmax * 2"/>
<staves vis="MuonBarrelStavesVis"/>
@@ -818,7 +818,7 @@
</layer>
</detector>
- <detector id="12" name="MuonEndcap" type="dd4hep_PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis" calorimeterType="MUON_ENDCAP">
+ <detector id="12" name="MuonEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis" calorimeterType="MUON_ENDCAP">
<comment>Muon Calorimeter Endcaps</comment>
<dimensions numsides="(int) MuonSides" zmin="MuonEndcap_zmin" rmin="MuonEndcap_rmin" rmax="MuonEndcap_rmax" />
<layer repeat="(int) MuonEndcap_layers" vis="MuonEndcapLayerVis">
@@ -841,7 +841,7 @@
</layer>
</detector>
- <detector id="13" name="LumiCal" reflect="true" type="dd4hep_CylindricalEndcapCalorimeter" readout="LumiCalHits" vis="LumiCalVis" calorimeterType="LUMI">
+ <detector id="13" name="LumiCal" reflect="true" type="DD4hep_CylindricalEndcapCalorimeter" readout="LumiCalHits" vis="LumiCalVis" calorimeterType="LUMI">
<comment>Luminosity Calorimeter</comment>
<dimensions inner_r = "LumiCal_rmin" inner_z = "LumiCal_zmin" outer_r = "LumiCal_rmax" />
<layer repeat="20" >
@@ -860,21 +860,21 @@
</layer>
</detector>
- <detector name="LumiReadout_Forward" type="dd4hep_PolyconeSupport" vis="LumiCalVis">
+ <detector name="LumiReadout_Forward" type="DD4hep_PolyconeSupport" vis="LumiCalVis">
<comment>Readout for Luminosity Calorimeter</comment>
<material name="G10"/>
<zplane rmin="LumiCal_rmax" rmax="LumiCalElectronics_rmax" z="LumiCal_zmin"/>
<zplane rmin="LumiCal_rmax" rmax="LumiCalElectronics_rmax" z="LumiCal_zmin+LumiCal_thickness"/>
</detector>
- <detector name="LumiReadout_Backward" type="dd4hep_PolyconeSupport" vis="LumiCalVis">
+ <detector name="LumiReadout_Backward" type="DD4hep_PolyconeSupport" vis="LumiCalVis">
<comment>Readout for Luminosity Calorimeter</comment>
<material name="G10"/>
<zplane rmin="LumiCal_rmax" rmax="LumiCalElectronics_rmax" z="-LumiCal_zmin"/>
<zplane rmin="LumiCal_rmax" rmax="LumiCalElectronics_rmax" z="-(LumiCal_zmin+LumiCal_thickness)"/>
</detector>
- <detector id="14" name="BeamCal" reflect="true" type="dd4hep_ForwardDetector" readout="BeamCalHits" vis="LumiCalVis" calorimeterType="BEAM">
+ <detector id="14" name="BeamCal" reflect="true" type="DD4hep_ForwardDetector" readout="BeamCalHits" vis="LumiCalVis" calorimeterType="BEAM">
<comment>Beam Calorimeter</comment>
<dimensions outer_r="BeamCal_rmax" inner_r="0.0*cm" inner_z="BeamCal_zmin" />
<beampipe crossing_angle="CrossingAngle" outgoing_r="OutgoingBP_radius + 0.05*cm" incoming_r="IncomingBP_radius + 0.05*cm" />
@@ -889,13 +889,13 @@
<comment>Dead material and supports</comment>
<comment>Beampipe</comment>
- <detector name="Beampipe" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
+ <detector name="Beampipe" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
<comment>Central Be Beampipe</comment>
<material name="Beryllium"/>
<zplane rmin="CentralBeamPipe_rmin" rmax="CentralBeamPipe_rmax" z="-CentralBeamPipe_zmax"/>
<zplane rmin="CentralBeamPipe_rmin" rmax="CentralBeamPipe_rmax" z="CentralBeamPipe_zmax" />
</detector>
- <detector name="SteelConeZbackward" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
+ <detector name="SteelConeZbackward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
<material name="Iron"/>
<zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
rmax="BeamPipe_rmax"
@@ -907,7 +907,7 @@
rmax="CentralBeamPipe_rmax"
z="-CentralBeamPipe_zmax"/>
</detector>
- <detector name="SteelConeZbackward2" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
+ <detector name="SteelConeZbackward2" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
<material name="Iron"/>
<zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
rmax="BeamPipe_rmax"
@@ -925,7 +925,7 @@
rmax="LumiCal_rmin - BeamPipe_endThickness"
z="- (ForwardMask_zmin - BeamPipe_endThickness)" />
</detector>
- <detector name="SteelConeZforward" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
+ <detector name="SteelConeZforward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
<material name="Iron"/>
<zplane rmin="CentralBeamPipe_rmin"
rmax="CentralBeamPipe_rmax"
@@ -937,7 +937,7 @@
rmax="BeamPipe_rmax"
z="tracking_region_zmax" />
</detector>
- <detector name="SteelConeZforward2" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
+ <detector name="SteelConeZforward2" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
<material name="Iron"/>
<zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
rmax="BeamPipe_rmax"
@@ -956,7 +956,7 @@
z="ForwardMask_zmin - BeamPipe_endThickness" />
</detector>
- <detector name="NorthIncomingBeampipe" type="dd4hep_TubeSegment" vis="BeamPipeVis">
+ <detector name="NorthIncomingBeampipe" type="DD4hep_TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="IncomingBP_radius - IncomingBP_thickness" rmax="IncomingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
<position x="-((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="(ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
@@ -964,21 +964,21 @@
</detector>
- <detector name="SouthIncomingBeampipe" type="dd4hep_TubeSegment" vis="BeamPipeVis">
+ <detector name="SouthIncomingBeampipe" type="DD4hep_TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="IncomingBP_radius - IncomingBP_thickness" rmax="IncomingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
<position x="-((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="- (ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
<rotation x="0.0" y="-CrossingAngle/2.0/rad" z="0.0" />
</detector>
- <detector name="NorthOutgoingBeampipe" type="dd4hep_TubeSegment" vis="BeamPipeVis">
+ <detector name="NorthOutgoingBeampipe" type="DD4hep_TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="OutgoingBP_radius - OutgoingBP_thickness" rmax="OutgoingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
<position x="((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="(ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
<rotation x="0.0" y="-CrossingAngle/2.0/rad" z="0.0" />
</detector>
- <detector name="SouthOutgoingBeampipe" type="dd4hep_TubeSegment" vis="BeamPipeVis">
+ <detector name="SouthOutgoingBeampipe" type="DD4hep_TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="OutgoingBP_radius - OutgoingBP_thickness" rmax="OutgoingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
<position x="((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="- (ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
@@ -986,7 +986,7 @@
</detector>
<!-- Beam pipe liner is not needed, use thicker conical steel pipe instead
- <detector name="BeamPipeLiner" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="BeamPipeLiner" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<comment>BeamPipe Liner to shield bremsstrahlung photons</comment>
<material name="Titanium"/>
<zplane rmin="(tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax - BeamPipe_thickness - BeamPipeLiner_thickness" rmax="(tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax - BeamPipe_thickness" z="-tracking_region_zmax" />
@@ -998,7 +998,7 @@
</detector>
-->
- <detector name="BeamPipeVacuum" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+ <detector name="BeamPipeVacuum" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<comment>Vacuum inside beampipe</comment>
<material name="Vacuum"/>
<zplane rmin="0.*cm"
@@ -1014,7 +1014,7 @@
rmax="BeamPipe_rmax - BeamPipe_thickness - BeamPipeLiner_thickness"
z="tracking_region_zmax" />
</detector>
- <detector name="ForwardVacuum" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="ForwardVacuum" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="Vacuum"/>
<zplane rmin="0.*cm"
rmax="BeamPipe_rmax - BeamPipe_thickness"
@@ -1032,7 +1032,7 @@
rmax="LumiCal_rmin - 2*BeamPipe_endThickness"
z="ForwardMask_zmin - BeamPipe_endThickness" />
</detector>
- <detector name="BackwardVacuum" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
+ <detector name="BackwardVacuum" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
<material name="Vacuum"/>
<zplane rmin="0.*cm"
rmax="BeamPipe_rmax - BeamPipe_thickness"
@@ -1051,7 +1051,7 @@
z="- (ForwardMask_zmin - BeamPipe_endThickness)" />
</detector>
<comment>Vertex Detector Supports and Readout</comment>
- <detector name="VertexBarrelSupports" type="dd4hep_MultiLayerTracker" vis="SupportVis" reflect="true">
+ <detector name="VertexBarrelSupports" type="DD4hep_MultiLayerTracker" vis="SupportVis" reflect="true">
<comment>Double-walled Carbon Fiber support tube</comment>
<layer id="6" inner_r = "16.87*cm" outer_z = "89.48*cm">
<slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
@@ -1060,7 +1060,7 @@
<slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
</layer>
</detector>
- <detector name="VertexEndSupports" type="dd4hep_DiskTracker" reflect="true" vis="SupportVis">
+ <detector name="VertexEndSupports" type="DD4hep_DiskTracker" reflect="true" vis="SupportVis">
<layer id="7" inner_r = "(86.88*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexEndcap_offset" inner_z = "86.88*cm" outer_r = "16.87*cm">
<slice material = "CarbonFiber" thickness = "VXD_CF_support" />
</layer>
@@ -1068,7 +1068,7 @@
<slice material = "CarbonFiber" thickness = "VXD_CF_support" />
</layer>
</detector>
- <detector name="VertexReadout" type="dd4hep_DiskTracker" reflect="true" vis="CableVis">
+ <detector name="VertexReadout" type="DD4hep_DiskTracker" reflect="true" vis="CableVis">
<comment>Readout and Cabling</comment>
<layer id="1" inner_r = "VertexBarrel_r1" outer_r="VertexBarrel_r1 + 0.02*cm" inner_z= "VertexBarrel_zmax + 0.1*cm" vis="GreenVis">
<slice material = "G10" thickness ="0.5*cm"/>
@@ -1122,7 +1122,7 @@
<slice material = "G10" thickness = "0.02*cm" />
</layer>
</detector>
- <detector name="VXDcableZforwardBarrel" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZforwardBarrel" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin = "(CentralBeamPipe_rmax)"
rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
@@ -1131,7 +1131,7 @@
rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
z="CentralBeamPipe_zmax"/>
</detector>
- <detector name="VXDcableZbackwardBarrel" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZbackwardBarrel" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin = "(CentralBeamPipe_rmax)"
rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
@@ -1140,7 +1140,7 @@
rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
z="-CentralBeamPipe_zmax"/>
</detector>
- <detector name="VXDcableZbackwardOuter" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZbackwardOuter" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin = "((tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax)"
rmax = "((tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + 0.004*cm)"
@@ -1149,7 +1149,7 @@
rmax="(VertexService_zmax + 0.01*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + 0.01*cm"
z="-(VertexService_zmax + 0.01*cm)"/>
</detector>
- <detector name="VXDcableZbackwardInner" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZbackwardInner" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin="CentralBeamPipe_rmax"
rmax="CentralBeamPipe_rmax + VertexCableThickness"
@@ -1158,7 +1158,7 @@
rmax="(VertexService_zmin - 0.01*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexCableThickness"
z="-(VertexService_zmin - 0.01*cm)"/>
</detector>
- <detector name="VXDcableZforwardOuter" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZforwardOuter" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin = "((tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax)"
rmax = "((tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + 0.004*cm)"
@@ -1167,7 +1167,7 @@
rmax="(VertexService_zmax + 0.01*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + 0.01*cm"
z="VertexService_zmax + 0.01*cm"/>
</detector>
- <detector name="VXDcableZforwardInner" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDcableZforwardInner" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="Copper"/>
<zplane rmin="(VertexService_zmin - 0.01*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
rmax="(VertexService_zmin - 0.01*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexCableThickness"
@@ -1176,7 +1176,7 @@
rmax="CentralBeamPipe_rmax + VertexCableThickness"
z="CentralBeamPipe_zmax"/>
</detector>
- <detector name="VXDserviceZbackward" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDserviceZbackward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="G10"/>
<zplane rmin = "(VertexService_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
rmax="(VertexService_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexServiceThickness"
@@ -1185,7 +1185,7 @@
rmax="(VertexService_zmin - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexServiceThickness"
z="-VertexService_zmin"/>
</detector>
- <detector name="VXDserviceZforward" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
+ <detector name="VXDserviceZforward" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
<material name="G10"/>
<zplane rmin = "(VertexService_zmin - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
rmax="(VertexService_zmin - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexServiceThickness"
@@ -1196,7 +1196,7 @@
</detector>
<comment>Outer Tracker Supports and Readout</comment>
- <detector name="TrackerBarrelSupports" type="dd4hep_MultiLayerTracker" reflect="true">
+ <detector name="TrackerBarrelSupports" type="DD4hep_MultiLayerTracker" reflect="true">
<comment>Barrels</comment>
<layer id="1" inner_r="206.0*mm" outer_z="577.328*mm">
<slice material="CarbonFiber" thickness="0.05*cm" />
@@ -1226,175 +1226,175 @@
</detector>
<comment>Dished endcap disks</comment>
- <detector name="SiTrackerEndcapSupport1" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport1" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="(750.417-0.001)*mm" />
<zplane rmin="504.711*mm" rmax="510.448*mm" z="(750.919-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(777.034-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(777.535-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport2" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport2" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="750.919*mm" />
<zplane rmin="438.449*mm" rmax="510.448*mm" z="757.218*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="777.535*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="783.834*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport3" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport3" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="(757.218+0.001)*mm" />
<zplane rmin="504.711*mm" rmax="510.448*mm" z="(757.720+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(783.834+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(784.336+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport4" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport4" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="(1014.437-0.001)*mm" />
<zplane rmin="758.059*mm" rmax="763.796*mm" z="(1014.939-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1063.219-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1063.721-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport5" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport5" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="1014.939*mm" />
<zplane rmin="691.797*mm" rmax="763.796*mm" z="1021.238*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="1063.721*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="1070.020*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport6" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport6" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="(1021.238+0.001)*mm" />
<zplane rmin="758.059*mm" rmax="763.796*mm" z="(1021.740+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1070.020+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1070.522+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport7" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport7" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(1272.885-0.001)*mm" />
<zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(1273.387-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1343.711-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1344.213-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport8" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport8" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="1273.387*mm" />
<zplane rmin="943.753*mm" rmax="1015.748*mm" z="1279.686*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="1344.213*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="1350.512*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport9" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport9" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(1279.686+0.001)*mm" />
<zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(1280.188+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1350.512+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1351.014+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport10" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport10" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="(1536.560-0.001)*mm" />
<zplane rmin="1258.071*mm" rmax="1263.808*mm" z="(1537.062-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1629.089-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1629.591-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport11" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport11" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="1537.062*mm" />
<zplane rmin="1191.810*mm" rmax="1263.808*mm" z="1543.361*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="1629.591*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="1635.890*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport12" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport12" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="(1543.361+0.001)*mm" />
<zplane rmin="1258.071*mm" rmax="1263.808*mm" z="(1543.863+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(1635.890+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(1636.392+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport1Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport1Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="(-750.417+0.001)*mm" />
<zplane rmin="504.711*mm" rmax="510.448*mm" z="(-750.919+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-777.034+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-777.535+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport2Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport2Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="-750.919*mm" />
<zplane rmin="438.449*mm" rmax="510.448*mm" z="-757.218*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="-777.535*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="-783.834*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport3Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport3Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="510.448*mm" rmax="510.448*mm" z="(-757.218-0.001)*mm" />
<zplane rmin="504.711*mm" rmax="510.448*mm" z="(-757.720-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-783.834-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-784.336-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport4Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport4Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="(-1014.437+0.001)*mm" />
<zplane rmin="758.059*mm" rmax="763.796*mm" z="(-1014.939+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1063.219+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1063.721+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport5Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport5Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="-1014.939*mm" />
<zplane rmin="691.797*mm" rmax="763.796*mm" z="-1021.238*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="-1063.721*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="-1070.020*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport6Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport6Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="763.796*mm" rmax="763.796*mm" z="(-1021.238-0.001)*mm" />
<zplane rmin="758.059*mm" rmax="763.796*mm" z="(-1021.740-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1070.020-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1070.522-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport7Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport7Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(-1272.885+0.001)*mm" />
<zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(-1273.387+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1343.711+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1344.213+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport8Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport8Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="-1273.387*mm" />
<zplane rmin="943.753*mm" rmax="1015.748*mm" z="-1279.686*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="-1344.213*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="-1350.512*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport9Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport9Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(-1279.686-0.001)*mm" />
<zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(-1280.188-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1350.512-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1351.014-0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport10Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport10Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="(-1536.560+0.001)*mm" />
<zplane rmin="1258.071*mm" rmax="1263.808*mm" z="(-1537.062+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1629.089+0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1629.591+0.001)*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport11Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport11Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="-1537.062*mm" />
<zplane rmin="1191.810*mm" rmax="1263.808*mm" z="-1543.361*mm" />
<zplane rmin="206.234*mm" rmax="278.187*mm" z="-1629.591*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="-1635.890*mm" />
</detector>
- <detector name="SiTrackerEndcapSupport12Reflect" type="dd4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
+ <detector name="SiTrackerEndcapSupport12Reflect" type="DD4hep_PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
<zplane rmin="1263.808*mm" rmax="1263.808*mm" z="(-1543.361-0.001)*mm" />
<zplane rmin="1258.071*mm" rmax="1263.808*mm" z="(-1543.863-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="211.970*mm" z="(-1635.890-0.001)*mm" />
<zplane rmin="206.234*mm" rmax="206.234*mm" z="(-1636.392-0.001)*mm" />
</detector>
- <detector name="TrackerReadout" type="dd4hep_DiskTracker" reflect="true" vis="GreenVis">
+ <detector name="TrackerReadout" type="DD4hep_DiskTracker" reflect="true" vis="GreenVis">
<comment>Readouts</comment>
<layer id="1" inner_r="25.7*cm" inner_z="590.402*mm" outer_r="45.6*cm">
<slice material="G10" thickness="0.057*cm" />
@@ -1418,27 +1418,27 @@
</layer>
</detector>
<comment>Masks and Shielding</comment>
- <detector name="LumiShielding_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="LumiShielding_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="LumiCal_rmin" rmax="LumiCalElectronics_rmax" z="LumiCal_zmax"/>
<zplane rmin="LumiCal_rmin" rmax="LumiCalElectronics_rmax" z="LumiCal_zmax+ForwardShielding_thickness"/>
</detector>
- <detector name="LumiShielding_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="LumiShielding_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="LumiCal_rmin" rmax="LumiCalElectronics_rmax" z="-LumiCal_zmax"/>
<zplane rmin="LumiCal_rmin" rmax="LumiCalElectronics_rmax" z="-(LumiCal_zmax+ForwardShielding_thickness)"/>
</detector>
- <detector name="ECalShielding_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="ECalShielding_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="LumiCalElectronics_rmax" rmax="HcalEndcap_rmin-SupportTube_thickness-1.0*cm" z="HcalEndcap_zmin"/>
<zplane rmin="LumiCalElectronics_rmax" rmax="HcalEndcap_rmin-SupportTube_thickness-1.0*cm" z="HcalEndcap_zmin+ForwardShielding_thickness"/>
</detector>
- <detector name="ECalShielding_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="ECalShielding_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="LumiCalElectronics_rmax" rmax="HcalEndcap_rmin-SupportTube_thickness-1.0*cm" z="-HcalEndcap_zmin"/>
<zplane rmin="LumiCalElectronics_rmax" rmax="HcalEndcap_rmin-SupportTube_thickness-1.0*cm" z="-(HcalEndcap_zmin+ForwardShielding_thickness)"/>
</detector>
- <detector name="ShieldingTube_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="ShieldingTube_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="HcalEndcap_rmin - SupportTube_thickness - ForwardShielding_thickness - 1.0*cm"
rmax="HcalEndcap_rmin - SupportTube_thickness - 1.0*cm"
@@ -1447,7 +1447,7 @@
rmax="HcalEndcap_rmin - SupportTube_thickness - 1.0*cm"
z="HcalEndcap_zmax"/>
</detector>
- <detector name="ShieldingTube_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
+ <detector name="ShieldingTube_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="TungstenShieldingVis">
<material name="TungstenDens24" />
<zplane rmin="HcalEndcap_rmin - SupportTube_thickness - ForwardShielding_thickness - 1.0*cm"
rmax="HcalEndcap_rmin - SupportTube_thickness - 1.0*cm"
@@ -1456,7 +1456,7 @@
rmax="HcalEndcap_rmin - SupportTube_thickness - 1.0*cm"
z="-HcalEndcap_zmax"/>
</detector>
- <detector name="SupportTube_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
+ <detector name="SupportTube_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
<material name="Steel235" />
<zplane rmin="HcalEndcap_rmin - 2*SupportTube_thickness"
rmax="HcalEndcap_rmin - SupportTube_thickness"
@@ -1465,7 +1465,7 @@
rmax="HcalEndcap_rmin - SupportTube_thickness"
z="MuonEndcap_zmax"/>
</detector>
- <detector name="SupportTube_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
+ <detector name="SupportTube_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
<material name="Steel235" />
<zplane rmin="HcalEndcap_rmin - 2*SupportTube_thickness"
rmax="HcalEndcap_rmin - SupportTube_thickness"
@@ -1474,7 +1474,7 @@
rmax="HcalEndcap_rmin - SupportTube_thickness"
z="-MuonEndcap_zmax"/>
</detector>
- <detector name="AntiSolenoid_Forward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
+ <detector name="AntiSolenoid_Forward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
<material name="Steel235" />
<zplane rmin="HcalEndcap_rmin + 1.0*cm"
rmax="MuonEndcap_rmin - 1.0*cm"
@@ -1483,7 +1483,7 @@
rmax="MuonEndcap_rmin - 1.0*cm"
z="MuonEndcap_zmax"/>
</detector>
- <detector name="AntiSolenoid_Backward" type="dd4hep_PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
+ <detector name="AntiSolenoid_Backward" type="DD4hep_PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
<material name="Steel235" />
<zplane rmin="HcalEndcap_rmin + 1.0*cm"
rmax="MuonEndcap_rmin - 1.0*cm"
@@ -1493,7 +1493,7 @@
z="-MuonEndcap_zmax"/>
</detector>
- <detector name="ForwardLowZ" type="dd4hep_ForwardDetector" vis="TungstenShieldingVis" reflect="true">
+ <detector name="ForwardLowZ" type="DD4hep_ForwardDetector" vis="TungstenShieldingVis" reflect="true">
<dimensions outer_r="BeamCal_rmax" inner_r="0.0*cm" inner_z="ForwardMask_zmin" />
<beampipe crossing_angle="CrossingAngle" outgoing_r="OutgoingBP_radius + 0.05*cm" incoming_r="IncomingBP_radius + 0.05*cm" />
<layer repeat="1">
@@ -1502,7 +1502,7 @@
</detector>
<comment>Solenoid</comment>
- <detector name="SolenoidCoilBarrel" type="dd4hep_MultiLayerTracker" insideTrackingVolume="false" reflect="true">
+ <detector name="SolenoidCoilBarrel" type="DD4hep_MultiLayerTracker" insideTrackingVolume="false" reflect="true">
<layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ" vis="SolenoidBarrelLayerVis">
<slice material="Steel235" thickness="SolenoidBarrelInnerCryostatThickness" />
<slice material="Vacuum" thickness="SolenoidBarrelInnerAirgapThickness" />
@@ -1517,7 +1517,7 @@
</layer>
</detector>
- <detector name="SolenoidCoilEnds" type="dd4hep_DiskTracker" reflect="true" insideTrackingVolume="false">
+ <detector name="SolenoidCoilEnds" type="DD4hep_DiskTracker" reflect="true" insideTrackingVolume="false">
<layer id="1" inner_r="SolenoidBarrelInnerRadius" inner_z="SolenoidBarrelOuterZ" outer_r="SolenoidBarrelOuterRadius" vis="SolenoidCoilEndsVis">
<slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
</layer>
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index 8780031fe..20390f871 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -43,7 +43,7 @@ dd4hep_add_test_reg( ClientTests_MiniTel_JSON_Dump
# Test JSON based detector construction
dd4hep_add_test_reg( ClientTests_MiniTel_JSON_Detector
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
- EXEC_ARGS geoPluginRun -volmgr -destroy -plugin dd4hepCompactLoader
+ EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hepCompactLoader
file:${CMAKE_CURRENT_SOURCE_DIR}/compact/MiniTel_json.xml
REGEX_PASS "Successfully processed JSON input"
REGEX_FAIL "Exception"
@@ -53,7 +53,7 @@ dd4hep_add_test_reg( ClientTests_MiniTel_JSON_Detector
# Test readout strings of the form: <id>system:8,barrel:-2</id>
dd4hep_add_test_reg( ClientTests_DumpElements
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
- EXEC_ARGS geoPluginRun -plugin dd4hepElementTable -type xml
+ EXEC_ARGS geoPluginRun -plugin DD4hepElementTable -type xml
REGEX_PASS "formula=\"UUB\" name=\"UUB\"" )
#
# Test long volume IDs Detector setups with placements of
@@ -62,7 +62,7 @@ dd4hep_add_test_reg( ClientTests_MultiPlace
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
EXEC_ARGS geoPluginRun
-input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/SiBarrelMultiSensitiveLongVolID.xml -volmgr -destroy
- -plugin dd4hepVolumeMgrTest SiTrackerBarrel
+ -plugin DD4hepVolumeMgrTest SiTrackerBarrel
REGEX_PASS "Volume:component1_1 IDDesc:OK \\[S\\] vid:00200668000000ff system:00ff barrel:0000 layer:0001 module:0033 sensor:0001"
REGEX_FAIL "FAILED: World transformation DIFFER"
@@ -73,7 +73,7 @@ dd4hep_add_test_reg( ClientTests_Bitfield64_LongVoldID
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
EXEC_ARGS geoPluginRun
-input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/SiBarrelMultiSensitiveLongVolID.xml -volmgr -destroy
- -plugin dd4hepVolumeMgrTest SiTrackerBarrel
+ -plugin DD4hepVolumeMgrTest SiTrackerBarrel
REGEX_PASS "Volume:component1_1 IDDesc:OK \\[S\\] vid:00200668000000ff system:00ff barrel:0000 layer:0001 module:0033 sensor:0001"
REGEX_FAIL "FAILED: World transformation DIFFER"
@@ -84,9 +84,9 @@ dd4hep_add_test_reg( ClientTests_Bitfield64_BarrelSides
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
EXEC_ARGS geoPluginRun
-input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/Bitfield_SidesTest.xml -volmgr -destroy
- -plugin dd4hepDetectorVolumeDump
- -plugin dd4hepVolumeDump volids
- -plugin dd4hepVolumeMgrTest all
+ -plugin DD4hepDetectorVolumeDump
+ -plugin DD4hepVolumeDump volids
+ -plugin DD4hepVolumeMgrTest all
REGEX_PASS "Volume:Shell_2 IDDesc:OK \\[S\\] vid:0000000000000102 system:0002 barrel:0001")
#
# Test readout strings of the form: <id>system:16,barrel:16:-5</id>
@@ -94,9 +94,9 @@ dd4hep_add_test_reg( ClientTests_Bitfield64_BarrelSides2
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
EXEC_ARGS geoPluginRun
-input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/Bitfield_SidesTest2.xml -volmgr -destroy
- -plugin dd4hepDetectorVolumeDump
- -plugin dd4hepVolumeDump volids
- -plugin dd4hepVolumeMgrTest all
+ -plugin DD4hepDetectorVolumeDump
+ -plugin DD4hepVolumeDump volids
+ -plugin DD4hepVolumeMgrTest all
REGEX_PASS "Volume:Shell_2 IDDesc:OK \\[S\\] vid:0000000000010002 system:0002 barrel:0001")
#
#
diff --git a/examples/ClientTests/compact/Bitfield_SidesTest.xml b/examples/ClientTests/compact/Bitfield_SidesTest.xml
index 10266eb73..9d8986875 100644
--- a/examples/ClientTests/compact/Bitfield_SidesTest.xml
+++ b/examples/ClientTests/compact/Bitfield_SidesTest.xml
@@ -26,7 +26,7 @@
</display>
<detectors>
- <detector id="2" name="Shell" type="dd4hep_CylinderShell" vis="VisibleGreen" readout="ShellHits" >
+ <detector id="2" name="Shell" type="DD4hep_CylinderShell" vis="VisibleGreen" readout="ShellHits" >
<comment>Containment shell to measure calorimeter escapes</comment>
<material name="Air"/>
<module name="Barrel" id="0" vis="VisibleBlue">
diff --git a/examples/ClientTests/compact/Bitfield_SidesTest2.xml b/examples/ClientTests/compact/Bitfield_SidesTest2.xml
index 02785d1b3..f22f4a758 100644
--- a/examples/ClientTests/compact/Bitfield_SidesTest2.xml
+++ b/examples/ClientTests/compact/Bitfield_SidesTest2.xml
@@ -26,7 +26,7 @@
</display>
<detectors>
- <detector id="2" name="Shell" type="dd4hep_CylinderShell" vis="VisibleGreen" readout="ShellHits" >
+ <detector id="2" name="Shell" type="DD4hep_CylinderShell" vis="VisibleGreen" readout="ShellHits" >
<comment>Containment shell to measure calorimeter escapes</comment>
<material name="Air"/>
<module name="Barrel" id="0" vis="VisibleBlue">
diff --git a/examples/ClientTests/compact/DuplicateSysID.xml b/examples/ClientTests/compact/DuplicateSysID.xml
index e5fdcca00..f8cf0d599 100644
--- a/examples/ClientTests/compact/DuplicateSysID.xml
+++ b/examples/ClientTests/compact/DuplicateSysID.xml
@@ -30,7 +30,7 @@
<detectors>
<comment>Boxes</comment>
- <detector id="3" name="B3" type="dd4hep_BoxSegment" readout="SiliconHits" sensitive="true">
+ <detector id="3" name="B3" type="DD4hep_BoxSegment" readout="SiliconHits" sensitive="true">
<comment>Vertical box</comment>
<material name="Steel235"/>
<sensitive type="calo"/>
@@ -38,7 +38,7 @@
<position x="-10" y="30" z="10"/>
<rotation x="0" y="0" z="0"/>
</detector>
- <detector id="3" name="B4" type="dd4hep_BoxSegment" readout="SiliconHits" sensitive="true">
+ <detector id="3" name="B4" type="DD4hep_BoxSegment" readout="SiliconHits" sensitive="true">
<comment>Vertical box</comment>
<material name="Steel235"/>
<sensitive type="calo"/>
diff --git a/examples/ClientTests/compact/IronCylinder.xml b/examples/ClientTests/compact/IronCylinder.xml
index 8396b3cf8..5d87b2c79 100644
--- a/examples/ClientTests/compact/IronCylinder.xml
+++ b/examples/ClientTests/compact/IronCylinder.xml
@@ -41,7 +41,7 @@
<dimensions rmin="HcalBarrel_rmin" rmax="HcalBarrel_rmax" z="HcalBarrel_zmax" phiBins="64" />
</detector>
- <detector id="2" name="ContainmentShell" type="dd4hep_CylinderShell" vis="VisibleRed" readout="ContainmentHits" >
+ <detector id="2" name="ContainmentShell" type="DD4hep_CylinderShell" vis="VisibleRed" readout="ContainmentHits" >
<comment>Containment shell to measure calorimeter escapes</comment>
<material name="Air"/>
<module name="Barrel" id="0" vis="VisibleRed">
diff --git a/examples/ClientTests/compact/MultiCollections.xml b/examples/ClientTests/compact/MultiCollections.xml
index 38e0cd0a4..1b18f5cb5 100644
--- a/examples/ClientTests/compact/MultiCollections.xml
+++ b/examples/ClientTests/compact/MultiCollections.xml
@@ -35,7 +35,7 @@
<!-- Simple calorimeter with a couple of layers -->
<!-- ================================================================== -->
<detectors>
- <detector id="13" name="TestCal" reflect="true" type="dd4hep_CylindricalEndcapCalorimeter" readout="TestCalHits" vis="BlueVis">
+ <detector id="13" name="TestCal" reflect="true" type="DD4hep_CylindricalEndcapCalorimeter" readout="TestCalHits" vis="BlueVis">
<comment>Test Calorimeter</comment>
<dimensions inner_r = "0.1*m" outer_r="2*m" inner_z = "2*m"/>
<layer repeat="15" >
diff --git a/examples/ClientTests/compact/MultiSegmentCollections.xml b/examples/ClientTests/compact/MultiSegmentCollections.xml
index 49b3a035a..599c8c598 100644
--- a/examples/ClientTests/compact/MultiSegmentCollections.xml
+++ b/examples/ClientTests/compact/MultiSegmentCollections.xml
@@ -35,7 +35,7 @@
<!-- Simple calorimeter with a couple of layers -->
<!-- ================================================================== -->
<detectors>
- <detector id="13" name="TestCal" reflect="true" type="dd4hep_CylindricalEndcapCalorimeter" readout="TestCalHits" vis="BlueVis">
+ <detector id="13" name="TestCal" reflect="true" type="DD4hep_CylindricalEndcapCalorimeter" readout="TestCalHits" vis="BlueVis">
<comment>Test Calorimeter</comment>
<dimensions inner_r = "0.1*m" outer_r="2*m" inner_z = "2*m"/>
<layer repeat="15" >
diff --git a/examples/ClientTests/compact/MultiSegmentations.xml b/examples/ClientTests/compact/MultiSegmentations.xml
index f3eaf32e9..2e086697f 100644
--- a/examples/ClientTests/compact/MultiSegmentations.xml
+++ b/examples/ClientTests/compact/MultiSegmentations.xml
@@ -35,7 +35,7 @@
<!-- Simple calorimeter with a couple of layers -->
<!-- ================================================================== -->
<detectors>
- <detector id="13" name="TestCal" reflect="true" type="dd4hep_CylindricalEndcapCalorimeter" readout="TestCalHits" vis="BlueVis">
+ <detector id="13" name="TestCal" reflect="true" type="DD4hep_CylindricalEndcapCalorimeter" readout="TestCalHits" vis="BlueVis">
<comment>Test Calorimeter</comment>
<dimensions inner_r = "0.1*m" outer_r="2*m" inner_z = "2*m"/>
<layer repeat="15" >
diff --git a/examples/ClientTests/compact/NestedDetectors.xml b/examples/ClientTests/compact/NestedDetectors.xml
index 00aee83c4..745335a10 100644
--- a/examples/ClientTests/compact/NestedDetectors.xml
+++ b/examples/ClientTests/compact/NestedDetectors.xml
@@ -52,7 +52,7 @@
<comment>Tracking detectors</comment>
<detectors>
- <detector id="99" name="SiTrackers" type="dd4hep_SubdetectorAssembly" vis="BlueVisTrans">
+ <detector id="99" name="SiTrackers" type="DD4hep_SubdetectorAssembly" vis="BlueVisTrans">
<shape name="SiTrackersEnv" type="Tube" rmin="0*mm" rmax="2500*mm" dz="2200*mm" material="Air">
</shape>
<comment>Silicon Tracker Assembly</comment>
diff --git a/examples/ClientTests/compact/NestedSimple.xml b/examples/ClientTests/compact/NestedSimple.xml
index 58ec56ff6..e0d86bfe7 100644
--- a/examples/ClientTests/compact/NestedSimple.xml
+++ b/examples/ClientTests/compact/NestedSimple.xml
@@ -52,7 +52,7 @@
<comment>Tracking detectors</comment>
<detectors>
- <detector id="99" name="SiTrackers" type="dd4hep_SubdetectorAssembly" vis="BlueVisTrans">
+ <detector id="99" name="SiTrackers" type="DD4hep_SubdetectorAssembly" vis="BlueVisTrans">
<shape name="SiTrackersEnv" type="Tube" rmin="0*mm" rmax="2500*mm" dz="2200*mm" material="Air">
</shape>
<comment>Silicon Tracker Assembly</comment>
diff --git a/examples/ClientTests/compact/NestedSolenoid.xml b/examples/ClientTests/compact/NestedSolenoid.xml
index f20167c23..d79333629 100644
--- a/examples/ClientTests/compact/NestedSolenoid.xml
+++ b/examples/ClientTests/compact/NestedSolenoid.xml
@@ -6,7 +6,7 @@
</display>
<detectors>
- <detector name="NestedSolenoid" type="dd4hep_MultiLayerTracker" insideTrackingVolume="false" reflect="true">
+ <detector name="NestedSolenoid" type="DD4hep_MultiLayerTracker" insideTrackingVolume="false" reflect="true">
<layer id="1" inner_r="1.8*m" outer_z="1.5*m" vis="VIS1">
<slice material="Iron" thickness="1*cm" />
<slice material="Iron" thickness="1*cm" />
diff --git a/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml b/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml
index 3b5ddc12d..03e38ae3d 100644
--- a/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml
+++ b/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml
@@ -53,7 +53,7 @@
</readouts>
<detectors>
- <detector id="SiTrackerBarrel_ID" name="SiTrackerBarrel" type="dd4hep_SiBarrelMultiSensitiveDetector" readout="SiTrackerBarrelHits" region="SiTrackerBarrelRegion" limits="SiTrackerBarrelRegionLimitSet">
+ <detector id="SiTrackerBarrel_ID" name="SiTrackerBarrel" type="DD4hep_SiBarrelMultiSensitiveDetector" readout="SiTrackerBarrelHits" region="SiTrackerBarrelRegion" limits="SiTrackerBarrelRegionLimitSet">
<comment>Silicon Outer Tracker Barrel</comment>
diff --git a/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml b/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml
index 5bd8ea7a3..d4f9af458 100644
--- a/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml
+++ b/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml
@@ -53,7 +53,7 @@
</readouts>
<detectors>
- <detector id="SiTrackerBarrel_ID" name="SiTrackerBarrel" type="dd4hep_SiBarrelMultiSensitiveDetector" readout="SiTrackerBarrelHits" region="SiTrackerBarrelRegion" limits="SiTrackerBarrelRegionLimitSet">
+ <detector id="SiTrackerBarrel_ID" name="SiTrackerBarrel" type="DD4hep_SiBarrelMultiSensitiveDetector" readout="SiTrackerBarrelHits" region="SiTrackerBarrelRegion" limits="SiTrackerBarrelRegionLimitSet">
<comment>Silicon Outer Tracker Barrel</comment>
diff --git a/examples/ClientTests/compact/SiliconBlock.xml b/examples/ClientTests/compact/SiliconBlock.xml
index 47ce1679f..0d42d9140 100644
--- a/examples/ClientTests/compact/SiliconBlock.xml
+++ b/examples/ClientTests/compact/SiliconBlock.xml
@@ -46,14 +46,14 @@
</regions>
<detectors>
- <detector id="1" name="SiliconBlockUpper" type="dd4hep_BoxSegment" readout="SiliconUpperHits" vis="VisibleGreen" sensitive="true" region="SiRegion" limits="SiRegionLimitSet">
+ <detector id="1" name="SiliconBlockUpper" type="DD4hep_BoxSegment" readout="SiliconUpperHits" vis="VisibleGreen" sensitive="true" region="SiRegion" limits="SiRegionLimitSet">
<material name="Silicon"/>
<sensitive type="tracker"/>
<box x="20*mm" y="20*cm" z="20*cm"/>
<position x="4*cm" y="0" z="0"/>
<rotation x="0" y="0" z="0"/>
</detector>
- <detector id="2" name="SiliconBlockDown" type="dd4hep_BoxSegment" readout="SiliconDownHits" vis="VisibleRed" sensitive="true" region="SiRegion" limits="SiRegionLimitSet">
+ <detector id="2" name="SiliconBlockDown" type="DD4hep_BoxSegment" readout="SiliconDownHits" vis="VisibleRed" sensitive="true" region="SiRegion" limits="SiRegionLimitSet">
<material name="Silicon"/>
<sensitive type="tracker"/>
<box x="20*mm" y="20*cm" z="20*cm"/>
diff --git a/examples/ClientTests/scripts/BoxTrafos.C b/examples/ClientTests/scripts/BoxTrafos.C
index 7ebad8a8d..36233034c 100644
--- a/examples/ClientTests/scripts/BoxTrafos.C
+++ b/examples/ClientTests/scripts/BoxTrafos.C
@@ -54,8 +54,8 @@ int BoxTrafos() {
gSystem->Load("libDDCore");
Detector& description = Detector::getInstance();
- description.apply("dd4hepCompactLoader",2,(char**)argv);
- description.apply("dd4hepGeometryDisplay",0,0);
+ description.apply("DD4hepCompactLoader",2,(char**)argv);
+ description.apply("DD4hepGeometryDisplay",0,0);
DetElement de = description.detector("B3");
diff --git a/examples/ClientTests/src_boost/JsonDumper.cpp b/examples/ClientTests/src_boost/JsonDumper.cpp
index d13e3ce6a..08f97e415 100644
--- a/examples/ClientTests/src_boost/JsonDumper.cpp
+++ b/examples/ClientTests/src_boost/JsonDumper.cpp
@@ -22,7 +22,7 @@ using namespace dd4hep;
static long json_dump(Detector& /* description */, int argc, char** argv) {
if ( argc < 1 ) {
- ::printf("dd4hep_JsonDumper <file> \n");
+ ::printf("DD4hep_JsonDumper <file> \n");
exit(EINVAL);
}
std::string fname = argv[0];
diff --git a/examples/Conditions/data/manager.xml b/examples/Conditions/data/manager.xml
index cb0be932c..d0ec45f60 100644
--- a/examples/Conditions/data/manager.xml
+++ b/examples/Conditions/data/manager.xml
@@ -4,10 +4,10 @@
<conditions>
<manager>
- <property name="PoolType" value="dd4hep_ConditionsLinearPool"/>
+ <property name="PoolType" value="DD4hep_ConditionsLinearPool"/>
<property name="LoaderType" value="xml"/>
- <property name="UserPoolType" value="dd4hep_ConditionsMapUserPool"/>
- <property name="UpdatePoolType" value="dd4hep_ConditionsLinearUpdatePool"/>
+ <property name="UserPoolType" value="DD4hep_ConditionsMapUserPool"/>
+ <property name="UpdatePoolType" value="DD4hep_ConditionsLinearUpdatePool"/>
</manager>
<iov_type name="epoch" id="0"/>
<iov_type name="run" id="1"/>
diff --git a/examples/Conditions/src/ConditionExampleObjects.cpp b/examples/Conditions/src/ConditionExampleObjects.cpp
index 6216cf51d..560f74e0b 100644
--- a/examples/Conditions/src/ConditionExampleObjects.cpp
+++ b/examples/Conditions/src/ConditionExampleObjects.cpp
@@ -25,11 +25,11 @@ using cond::ConditionsLoadInfo;
/// Install the consitions and the alignment manager
ConditionsManager dd4hep::ConditionExamples::installManager(Detector& description) {
// Now we instantiate the conditions manager
- description.apply("dd4hep_ConditionsManagerInstaller",0,(char**)0);
+ description.apply("DD4hep_ConditionsManagerInstaller",0,(char**)0);
ConditionsManager manager = ConditionsManager::from(description);
- manager["PoolType"] = "dd4hep_ConditionsLinearPool";
- manager["UserPoolType"] = "dd4hep_ConditionsMapUserPool";
- manager["UpdatePoolType"] = "dd4hep_ConditionsLinearUpdatePool";
+ manager["PoolType"] = "DD4hep_ConditionsLinearPool";
+ manager["UserPoolType"] = "DD4hep_ConditionsMapUserPool";
+ manager["UpdatePoolType"] = "DD4hep_ConditionsLinearUpdatePool";
manager.initialize();
return manager;
}
diff --git a/examples/Conditions/src/ConditionsExample.cpp b/examples/Conditions/src/ConditionsExample.cpp
index 2d32781b8..ee0434f5f 100644
--- a/examples/Conditions/src/ConditionsExample.cpp
+++ b/examples/Conditions/src/ConditionsExample.cpp
@@ -109,7 +109,7 @@ namespace {
env.add_xml_data_source("/examples/Conditions/xml/TPC_run_563543.xml","563543#run");
env.add_xml_data_source("/examples/Conditions/xml/TPC_run_234567.xml","234567#run");
print_tpc_discrete_conditions(env);
- description.apply("dd4hep_ConditionsDump",0,0);
+ description.apply("DD4hep_ConditionsDump",0,0);
print_tpc_range_conditions(env,234567,563543); // Should fail !
print_tpc_range_conditions(env,123456,563543); // Should fail !
diff --git a/examples/Conditions/src/ConditionsTest.cpp b/examples/Conditions/src/ConditionsTest.cpp
index 15f5068b8..5ddc22315 100644
--- a/examples/Conditions/src/ConditionsTest.cpp
+++ b/examples/Conditions/src/ConditionsTest.cpp
@@ -170,9 +170,9 @@ TestEnv::TestEnv(Detector& _description, const string& detector_name)
{
manager = ConditionsManager::from(description);
manager["LoaderType"] = "multi";
- manager["PoolType"] = "dd4hep_ConditionsLinearPool";
- manager["UpdatePoolType"] = "dd4hep_ConditionsLinearUpdatePool";
- manager["UserPoolType"] = "dd4hep_ConditionsLinearUserPool";
+ manager["PoolType"] = "DD4hep_ConditionsLinearPool";
+ manager["UpdatePoolType"] = "DD4hep_ConditionsLinearUpdatePool";
+ manager["UserPoolType"] = "DD4hep_ConditionsLinearUserPool";
manager.initialize();
detector = description.detector(detector_name);
if ( detector.isValid() ) {
diff --git a/examples/Conditions/xml/Sequence_1.xml b/examples/Conditions/xml/Sequence_1.xml
index 2c6001b6e..ac8ed09d8 100644
--- a/examples/Conditions/xml/Sequence_1.xml
+++ b/examples/Conditions/xml/Sequence_1.xml
@@ -1,20 +1,20 @@
<plugins>
- <plugin name="dd4hepXMLLoader">
+ <plugin name="DD4hepXMLLoader">
<arg value="file:../DD4hep.trunk/DDExamples/AlignDet/compact/AlephTPC.xml"/>
</plugin>
- <plugin name="dd4hepVolumeManager"/>
- <plugin name="dd4hepConditionsManagerInstaller"/>
+ <plugin name="DD4hepVolumeManager"/>
+ <plugin name="DD4hep_ConditionsManagerInstaller"/>
- <plugin name="dd4hepXMLLoader">
+ <plugin name="DD4hepXMLLoader">
<arg value="file:../DD4hep.trunk/DDExamples/AlignDet/compact/AlephTPC_alignment.xml"/>
</plugin>
- <plugin name="dd4hepXMLLoader">
+ <plugin name="DD4hepXMLLoader">
<arg value="file:../DD4hep.trunk/DDExamples/AlignDet/compact/AlephTPC_reset.xml"/>
</plugin>
- <plugin name="dd4hep_Test_CallbackInstall"/>
- <plugin name="dd4hep_Test_ConditionsAccess"/>
- <plugin name="dd4hep_Test_ConditionsTreeDump"/>
+ <plugin name="DD4hep_Test_CallbackInstall"/>
+ <plugin name="DD4hep_Test_ConditionsAccess"/>
+ <plugin name="DD4hep_Test_ConditionsTreeDump"/>
</plugins>
diff --git a/examples/Conditions/xml/Sequence_2.xml b/examples/Conditions/xml/Sequence_2.xml
index 7aa303078..7888e5111 100644
--- a/examples/Conditions/xml/Sequence_2.xml
+++ b/examples/Conditions/xml/Sequence_2.xml
@@ -1,12 +1,12 @@
<plugins>
- <plugin name="dd4hepXMLLoader">
+ <plugin name="DD4hepXMLLoader">
<arg value="file:../DD4hep.trunk/DDExamples/AlignDet/compact/AlephTPC.xml"/>
</plugin>
- <plugin name="dd4hepVolumeManager"/>
- <plugin name="dd4hepConditionsManagerInstaller"/>
- <plugin name="dd4hep_Test_CallbackInstall"/>
- <plugin name="dd4hep_Test_ConditionsExample3"/>
+ <plugin name="DD4hepVolumeManager"/>
+ <plugin name="DD4hep_ConditionsManagerInstaller"/>
+ <plugin name="DD4hep_Test_CallbackInstall"/>
+ <plugin name="DD4hep_Test_ConditionsExample3"/>
</plugins>
diff --git a/examples/Conditions/xml/plugins.xml b/examples/Conditions/xml/plugins.xml
index 4dfa67d4d..4e45726bd 100644
--- a/examples/Conditions/xml/plugins.xml
+++ b/examples/Conditions/xml/plugins.xml
@@ -1,25 +1,25 @@
<plugins>
- <plugin name="dd4hepXMLLoader">
+ <plugin name="DD4hepXMLLoader">
<arg value="file:../DD4hep.trunk/DDExamples/AlignDet/compact/AlephTPC.xml"/>
</plugin>
- <plugin name="dd4hepVolumeManager"/>
- <plugin name="dd4hepConditionsManagerInstaller"/>
+ <plugin name="DD4hepVolumeManager"/>
+ <plugin name="DD4hep_ConditionsManagerInstaller"/>
- <plugin name="dd4hepXMLLoader">
+ <plugin name="DD4hepXMLLoader">
<arg value="file:../DD4hep.trunk/DDExamples/AlignDet/compact/AlephTPC_alignment.xml"/>
</plugin>
- <plugin name="dd4hepXMLLoader">
+ <plugin name="DD4hepXMLLoader">
<arg value="file:../DD4hep.trunk/DDExamples/AlignDet/compact/AlephTPC_reset.xml"/>
</plugin>
- <plugin name="dd4hep_Test_CallbackInstallTest"/>
+ <plugin name="DD4hep_Test_CallbackInstallTest"/>
<!--
- <plugin name="dd4hep_Test_ConditionsAccess"/>
- <plugin name="dd4hep_Test_ConditionsTreeDump"/>
+ <plugin name="DD4hep_Test_ConditionsAccess"/>
+ <plugin name="DD4hep_Test_ConditionsTreeDump"/>
-->
- <plugin name="dd4hepExample3"/>
+ <plugin name="DD4hepConditionExample3"/>
</plugins>
diff --git a/examples/SimpleDetector/examples/run_sitracking_SimpleCLIC.xml b/examples/SimpleDetector/examples/run_sitracking_SimpleCLIC.xml
index 9907202af..569b94a40 100644
--- a/examples/SimpleDetector/examples/run_sitracking_SimpleCLIC.xml
+++ b/examples/SimpleDetector/examples/run_sitracking_SimpleCLIC.xml
@@ -35,7 +35,7 @@
<parameter name="SkipNEvents" value="0" />
<parameter name="SupressCheck" value="false" />
<parameter name="GearXMLFile" value="gear_Simple_CLIC.xml"/>
- <parameter name="dd4hepXMLFile" value="/Users/gaede/DD4hep/trunk/examples/SimpleDetector/compact/Simple_CLIC.xml"/>
+ <parameter name="DD4hepXMLFile" value="/Users/gaede/DD4hep/trunk/examples/SimpleDetector/compact/Simple_CLIC.xml"/>
<parameter name="Verbosity" options="DEBUG0-4,MESSAGE0-4,WARNING0-4,ERROR0-4,SILENT"> MESSAGE DEBUG0 </parameter>
<parameter name="RandomSeed" value="1234567890" />
@@ -47,7 +47,7 @@
<processor name="Initdd4hep" type="Initializedd4hep">
<!--Initializedd4hep reads a compact xml file and initializes the dd4hep::Detector object-->
<!--Name of the dd4hep compact xml file to load-->
- <parameter name="dd4hepXMLFile" type="string">Simple_ClIC.xml </parameter>
+ <parameter name="DD4hepXMLFile" type="string">Simple_ClIC.xml </parameter>
</processor>
<processor name="MyLCIOOutputProcessor" type="LCIOOutputProcessor">
--
GitLab