diff --git a/DDAlign/src/plugins/GlobalAlignmentParser.cpp b/DDAlign/src/plugins/GlobalAlignmentParser.cpp
index 60d27316945b306c099a1441d0fc14dfe087f676..69455fbe44207bba9273a5be15c919dddcfb4bbf 100644
--- a/DDAlign/src/plugins/GlobalAlignmentParser.cpp
+++ b/DDAlign/src/plugins/GlobalAlignmentParser.cpp
@@ -58,6 +58,8 @@ using namespace std;
using namespace dd4hep;
using namespace dd4hep::align;
+static long setup_Alignment(Detector& description, const xml_h& e);
+
/** Convert to enable/disable debugging.
*
* @author M.Frank
@@ -196,6 +198,8 @@ template <> void Converter<include_file>::operator()(xml_h element) const {
string tag = node.tag();
if ( tag == "alignment" )
Converter<alignment>(description,param,optional)(node);
+ else if ( tag == "global_alignment" )
+ setup_Alignment(description, node);
else if ( tag == "detelement" )
Converter<detelement>(description,param,optional)(node);
else if ( tag == "subdetectors" || tag == "detelements" )
diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp
index 51060e6c2c25d7402cd04da84bc27a27390adab9..4cc038079264a7319832c8cb412da1bdb84a9e7d 100644
--- a/DDCore/src/plugins/Compact2Objects.cpp
+++ b/DDCore/src/plugins/Compact2Objects.cpp
@@ -480,8 +480,8 @@ template <> void Converter<Material>::operator()(xml_h e) const {
mat->SetTemperature(temp_val);
mat->SetPressure(pressure_val);
printout(s_debug.materials ? ALWAYS : DEBUG, "Compact",
- "++ Converting material %-16s Density: %9.7g Temperature:%9.7g Pressure:%9.7g.",
- matname, dens_val, temp_val, pressure_val);
+ "++ Converting material %-16s Density: %9.7g Temperature:%9.7g [K] Pressure:%9.7g [hPa].",
+ matname, dens_val, temp_val/dd4hep::kelvin, pressure_val/dd4hep::pascal/100.0);
mix->SetRadLen(0e0);
#if ROOT_VERSION_CODE >= ROOT_VERSION(6,12,0)
diff --git a/DDCore/src/plugins/StandardPlugins.cpp b/DDCore/src/plugins/StandardPlugins.cpp
index 62e135789574d540be2f25b03e19b8c377b29c5b..7e760629f70442d0fbb450a6297470787e0e759a 100644
--- a/DDCore/src/plugins/StandardPlugins.cpp
+++ b/DDCore/src/plugins/StandardPlugins.cpp
@@ -512,8 +512,8 @@ static long root_materials(Detector& description, int argc, char** argv) {
::printf(" Aeff=%7.3f Zeff=%7.4f rho=%8.3f [g/mole] radlen=%8.3g [cm] intlen=%8.3g [cm] index=%3d\n",
mat->GetA(), mat->GetZ(), mat->GetDensity(),
mat->GetRadLen(), mat->GetIntLen(), mat->GetIndex());
- ::printf(" Temp=%.3g [Kelvin] Pressure=%.5g [pascal] state=%s\n",
- mat->GetTemperature(), mat->GetPressure(), st);
+ ::printf(" Temp=%.3g [Kelvin] Pressure=%.5g [hPa] state=%s\n",
+ mat->GetTemperature(), mat->GetPressure()/dd4hep::pascal/100.0, st);
return elt_h(0);
}
virtual void print(elt_h, TGeoElement* elt, double frac) {
diff --git a/examples/AlignDet/compact/AlephTPC.xml b/examples/AlignDet/compact/AlephTPC.xml
index a1eca27c2f49ec6b41878d0485957f5884a10125..06f0038554aa5c29208f628c74f4923d1c7912ee 100644
--- a/examples/AlignDet/compact/AlephTPC.xml
+++ b/examples/AlignDet/compact/AlephTPC.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Alignment_aleph_tpc"
title="Alignment test detector with ALPEH TPC like sectors"
diff --git a/examples/AlignDet/compact/Telescope.xml b/examples/AlignDet/compact/Telescope.xml
index f9940f03a5e613d6f01961d4c8bc788691ae831c..9cfc06104060505c515a29de5dde515fca29e195 100644
--- a/examples/AlignDet/compact/Telescope.xml
+++ b/examples/AlignDet/compact/Telescope.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="TelescopeSensor"
title="Simple emulation of the EU Telescope"
diff --git a/examples/AlignDet/compact/compact.xml b/examples/AlignDet/compact/compact.xml
index 60009b3a36ca7921be3a1f0024ab109b9a56b3c6..8d3ab2c69f3acac930a5de84c4d02a43a45a2348 100644
--- a/examples/AlignDet/compact/compact.xml
+++ b/examples/AlignDet/compact/compact.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="alignment_boxes"
title="Alignment test with 2 simple boxes"
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index 98348f4c7978c61e1fd418b198c6b32328e03ed3..ad85a0ce43bfb15799cbc78e68bdb2d6dad91ffc 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -214,7 +214,25 @@ dd4hep_add_test_reg( ClientTests_Check_Temp_Pressure_Air
EXEC_ARGS geoPluginRun
-destroy -input file:${ClientTestsEx_INSTALL}/compact/Check_Air.xml
-plugin DD4hep_MaterialTable -name Vacuum
- REGEX_PASS "Temp=111 \\[Kelvin\\] Pressure=6.2415e-07 \\[pascal\\] state=Undefined"
+ REGEX_PASS "Temp=111 \\[Kelvin\\] Pressure=1e-12 \\[hPa\\] state=Undefined"
+ REGEX_FAIL "Exception;EXCEPTION;ERROR;Error;FATAL" )
+#
+# Test Setting temperature and pressure to material
+dd4hep_add_test_reg( ClientTests_Check_Temp_Pressure_Air_NTP
+ COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
+ EXEC_ARGS geoPluginRun
+ -destroy -input file:${ClientTestsEx_INSTALL}/compact/Check_Air_NTP.xml
+ -plugin DD4hep_MaterialTable -name Vacuum
+ REGEX_PASS "Temp=293 \\[Kelvin\\] Pressure=1013.2 \\[hPa\\] state=Undefined"
+ REGEX_FAIL "Exception;EXCEPTION;ERROR;Error;FATAL" )
+#
+# Test Setting temperature and pressure to material
+dd4hep_add_test_reg( ClientTests_Check_Temp_Pressure_Air_STP
+ COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
+ EXEC_ARGS geoPluginRun
+ -destroy -input file:${ClientTestsEx_INSTALL}/compact/Check_Air_STP.xml
+ -plugin DD4hep_MaterialTable -name Vacuum
+ REGEX_PASS "Temp=273 \\[Kelvin\\] Pressure=1000 \\[hPa\\] state=Undefined"
REGEX_FAIL "Exception;EXCEPTION;ERROR;Error;FATAL" )
#
# only if root version > 6.19: MaterialTester
diff --git a/examples/ClientTests/compact/Assemblies.xml b/examples/ClientTests/compact/Assemblies.xml
index 1299e81056091798ff8907896424f99521b160ad..322901dcd86bc91f7a958f0b1ebbb6bc99de7b31 100644
--- a/examples/ClientTests/compact/Assemblies.xml
+++ b/examples/ClientTests/compact/Assemblies.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<!-- #==========================================================================
# AIDA Detector description implementation
#==========================================================================
diff --git a/examples/ClientTests/compact/Bitfield_SidesTest.xml b/examples/ClientTests/compact/Bitfield_SidesTest.xml
index 8b4ab35a4a05eb64116a03aedf4f6a97e939f47f..d9a0881b07b7eaa2254a485e3542f072068966c4 100644
--- a/examples/ClientTests/compact/Bitfield_SidesTest.xml
+++ b/examples/ClientTests/compact/Bitfield_SidesTest.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<!-- #==========================================================================
# AIDA Detector description implementation
diff --git a/examples/ClientTests/compact/Bitfield_SidesTest2.xml b/examples/ClientTests/compact/Bitfield_SidesTest2.xml
index 596350421f6cfd2745555bd1d6a1416065b8a346..083c6af287acedd6e0822a59b135691c6c654af6 100644
--- a/examples/ClientTests/compact/Bitfield_SidesTest2.xml
+++ b/examples/ClientTests/compact/Bitfield_SidesTest2.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<!-- #==========================================================================
# AIDA Detector description implementation
diff --git a/examples/ClientTests/compact/BoxTrafos.xml b/examples/ClientTests/compact/BoxTrafos.xml
index 2f49744a6547f59d22c9ca1e21f7f56d39f52fdd..b74063966ec2ca0770ea4476b1b827d83c3d3b6c 100644
--- a/examples/ClientTests/compact/BoxTrafos.xml
+++ b/examples/ClientTests/compact/BoxTrafos.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<!-- #==========================================================================
# AIDA Detector description implementation
diff --git a/examples/ClientTests/compact/CaloEndcapReflection.xml b/examples/ClientTests/compact/CaloEndcapReflection.xml
index 547f2d53d84c3278907ffed0a11cd0091d504541..a0be06938411ef6d7563cd32b8e240e976356cf3 100644
--- a/examples/ClientTests/compact/CaloEndcapReflection.xml
+++ b/examples/ClientTests/compact/CaloEndcapReflection.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="clic_sid_cdr"
title="CLIC Silicon Detector CDR"
diff --git a/examples/ClientTests/compact/CheckShape.xml b/examples/ClientTests/compact/CheckShape.xml
index 89176c114912b909a1a69f4586bfef8ff2a10551..c15280102b350ad5c8ebc605cb87e5e8c122367f 100644
--- a/examples/ClientTests/compact/CheckShape.xml
+++ b/examples/ClientTests/compact/CheckShape.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name= "ShapeCheck"
title= "Checking individual shapes in D4hep by comparing the mesh vertices"
@@ -10,7 +8,7 @@
version="1.0">
<comment>Shape tester</comment>
</info>
- <steer open="false" close="false"/>
+ <geometry open="false" close="false"/>
<includes>
<gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
diff --git a/examples/ClientTests/compact/Check_Air.xml b/examples/ClientTests/compact/Check_Air.xml
index 9da3504f17e9be00d11b2fef23db06cda7b15b83..1a32e3fe4460a96f015fea7bf09c632ff5c9e602 100644
--- a/examples/ClientTests/compact/Check_Air.xml
+++ b/examples/ClientTests/compact/Check_Air.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name= "ShapeCheck"
title= "Checking individual shapes in D4hep by comparing the mesh vertices"
@@ -10,7 +8,6 @@
version="1.0">
<comment>Shape tester</comment>
</info>
- <steer open="false" close="false"/>
<debug>
<type name="materials" value="1"/>
diff --git a/examples/ClientTests/compact/Check_Air_NTP.xml b/examples/ClientTests/compact/Check_Air_NTP.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3c324f0fd177935baaa666e57d339f176413466e
--- /dev/null
+++ b/examples/ClientTests/compact/Check_Air_NTP.xml
@@ -0,0 +1,58 @@
+<lccdd>
+
+ <info name= "ShapeCheck"
+ title= "Checking individual shapes in D4hep by comparing the mesh vertices"
+ author= "Markus Frank"
+ url= "http://www.cern.ch/lhcb"
+ status= "development"
+ version="1.0">
+ <comment>Shape tester</comment>
+ </info>
+
+ <debug>
+ <type name="materials" value="1"/>
+ </debug>
+
+ <includes>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ </includes>
+
+ <define>
+ <constant name="world_side" value="300*cm"/>
+ <constant name="world_x" value="world_side"/>
+ <constant name="world_y" value="world_side"/>
+ <constant name="world_z" value="world_side"/>
+ </define>
+
+ <std_conditions type="NTP"/>
+
+ <display>
+ <vis name="Box_vis" alpha="1.0" r="1" g="0" b="0" showDaughters="true" visible="true"/>
+ </display>
+
+ <materials>
+ <material name="Air">
+ <D type="density" unit="g/cm3" value="0.001214"/>
+ <fraction n="0.7494" ref="N"/>
+ <fraction n="0.2369" ref="O"/>
+ <fraction n="0.0129" ref="Ar"/>
+ <fraction n="0.0008" ref="H"/>
+ </material>
+
+ <!-- We model vakuum just as very thin air -->
+ <material name="Vacuum">
+ <D type="density" unit="g/cm3" value="0.0000000001" />
+ <composite n="1" ref="Air"/>
+ </material>
+ </materials>
+
+ <detectors>
+ <detector id="3" name="B1" type="DD4hep_BoxSegment" vis="Box_vis">
+ <comment>Vertical box</comment>
+ <material name="Vacuum"/>
+ <box x="10" y="20" z="30"/>
+ <position x="-10" y="30" z="10"/>
+ <rotation x="0" y="0" z="0"/>
+ </detector>
+ </detectors>
+</lccdd>
diff --git a/examples/ClientTests/compact/Check_Air_STP.xml b/examples/ClientTests/compact/Check_Air_STP.xml
new file mode 100644
index 0000000000000000000000000000000000000000..df04fd9880626f293266ede6743c4f8dceaf601b
--- /dev/null
+++ b/examples/ClientTests/compact/Check_Air_STP.xml
@@ -0,0 +1,58 @@
+<lccdd>
+
+ <info name= "ShapeCheck"
+ title= "Checking individual shapes in D4hep by comparing the mesh vertices"
+ author= "Markus Frank"
+ url= "http://www.cern.ch/lhcb"
+ status= "development"
+ version="1.0">
+ <comment>Shape tester</comment>
+ </info>
+
+ <debug>
+ <type name="materials" value="1"/>
+ </debug>
+
+ <includes>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ </includes>
+
+ <define>
+ <constant name="world_side" value="300*cm"/>
+ <constant name="world_x" value="world_side"/>
+ <constant name="world_y" value="world_side"/>
+ <constant name="world_z" value="world_side"/>
+ </define>
+
+ <std_conditions type="STP"/>
+
+ <display>
+ <vis name="Box_vis" alpha="1.0" r="1" g="0" b="0" showDaughters="true" visible="true"/>
+ </display>
+
+ <materials>
+ <material name="Air">
+ <D type="density" unit="g/cm3" value="0.001214"/>
+ <fraction n="0.7494" ref="N"/>
+ <fraction n="0.2369" ref="O"/>
+ <fraction n="0.0129" ref="Ar"/>
+ <fraction n="0.0008" ref="H"/>
+ </material>
+
+ <!-- We model vakuum just as very thin air -->
+ <material name="Vacuum">
+ <D type="density" unit="g/cm3" value="0.0000000001" />
+ <composite n="1" ref="Air"/>
+ </material>
+ </materials>
+
+ <detectors>
+ <detector id="3" name="B1" type="DD4hep_BoxSegment" vis="Box_vis">
+ <comment>Vertical box</comment>
+ <material name="Vacuum"/>
+ <box x="10" y="20" z="30"/>
+ <position x="-10" y="30" z="10"/>
+ <rotation x="0" y="0" z="0"/>
+ </detector>
+ </detectors>
+</lccdd>
diff --git a/examples/ClientTests/compact/Check_Handles.xml b/examples/ClientTests/compact/Check_Handles.xml
index 9330e47ce45c6819db5b1d6778fa8e49e7f8a38a..10f03b8d2ecd5cabd39b647d6dc9333bd7a74b47 100644
--- a/examples/ClientTests/compact/Check_Handles.xml
+++ b/examples/ClientTests/compact/Check_Handles.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<!-- #==========================================================================
# AIDA Detector description implementation
diff --git a/examples/ClientTests/compact/DuplicateSysID.xml b/examples/ClientTests/compact/DuplicateSysID.xml
index f8cf0d599639f355d2d139aed7a850c4200c9943..3874f949622ee6fb30cb642c4a96a8bc46d162c4 100644
--- a/examples/ClientTests/compact/DuplicateSysID.xml
+++ b/examples/ClientTests/compact/DuplicateSysID.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="alignment_boxes"
title="Alignment test with 2 simple boxes"
diff --git a/examples/ClientTests/compact/FCC_HcalBarrel.xml b/examples/ClientTests/compact/FCC_HcalBarrel.xml
index 4ba1d43141505b15c698523be7018a3b79385b1a..b49ff65575f5bab9bf9df61af9d9713a1065f7a4 100644
--- a/examples/ClientTests/compact/FCC_HcalBarrel.xml
+++ b/examples/ClientTests/compact/FCC_HcalBarrel.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<includes>
<gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
diff --git a/examples/ClientTests/compact/InhibitConstants.xml b/examples/ClientTests/compact/InhibitConstants.xml
index 2db33f3c28e68935e32d3a4caaf40d9fd509873d..4f7b88b5ded27d2ae942885e2c1576e1d5b284ff 100644
--- a/examples/ClientTests/compact/InhibitConstants.xml
+++ b/examples/ClientTests/compact/InhibitConstants.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<define>
<constant name="Detector_InhibitConstants" value="1"/>;
diff --git a/examples/ClientTests/compact/IronCylinder.xml b/examples/ClientTests/compact/IronCylinder.xml
index 5d87b2c79485e1ee2d05cb2001583ad3f974b40a..66040629373dfb22d07ff899c1013ba3b671d43f 100644
--- a/examples/ClientTests/compact/IronCylinder.xml
+++ b/examples/ClientTests/compact/IronCylinder.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<includes>
<gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
diff --git a/examples/ClientTests/compact/LheD_tracker.xml b/examples/ClientTests/compact/LheD_tracker.xml
index 29377080a83da57d426160604bdde4199c7f0108..fcd399041c7d0dfbe5dfaeb8d188de72419d42e2 100644
--- a/examples/ClientTests/compact/LheD_tracker.xml
+++ b/examples/ClientTests/compact/LheD_tracker.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="LHeD_cdr"
title="LHe Detector - based on CLIC Silicon Detector CDR"
diff --git a/examples/ClientTests/compact/MagnetFields.xml b/examples/ClientTests/compact/MagnetFields.xml
index 6392c50ffaf4850a393c87e9ca01506e370f8816..db55719d60f74411efae81408af5f805af3176f3 100644
--- a/examples/ClientTests/compact/MagnetFields.xml
+++ b/examples/ClientTests/compact/MagnetFields.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="clic_sid_cdr"
title="CLIC Silicon Detector CDR"
diff --git a/examples/ClientTests/compact/MaterialTester.xml b/examples/ClientTests/compact/MaterialTester.xml
index 936ecb9341419e140251ab24bf3013af59d18f45..4f04ea559289093ede605546527aac91e87909b5 100644
--- a/examples/ClientTests/compact/MaterialTester.xml
+++ b/examples/ClientTests/compact/MaterialTester.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<define>
<constant name="world_size" value="30*m"/>
diff --git a/examples/ClientTests/compact/MiniTel.xml b/examples/ClientTests/compact/MiniTel.xml
index f51073fd5154b5a8b55100e4d35d03e7b3561acb..f97ab7668dfef3d43793d72431f33189a43d7167 100644
--- a/examples/ClientTests/compact/MiniTel.xml
+++ b/examples/ClientTests/compact/MiniTel.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Sensor"
title="Sensor for New experiment"
diff --git a/examples/ClientTests/compact/MiniTel_json.xml b/examples/ClientTests/compact/MiniTel_json.xml
index bcf4602bd7066d50e6b131af19f9af9b2a4cb8fb..a599063502e6263b51e7d7335aeff1ca779024d2 100644
--- a/examples/ClientTests/compact/MiniTel_json.xml
+++ b/examples/ClientTests/compact/MiniTel_json.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Sensor"
title="Sensor for New experiment"
diff --git a/examples/ClientTests/compact/MultiCollections.xml b/examples/ClientTests/compact/MultiCollections.xml
index 1b18f5cb5ada3b7f4ca29b16ccddff3c83f934cb..4ca447f56ad81aa6438d268131ee7c9ce3248746 100644
--- a/examples/ClientTests/compact/MultiCollections.xml
+++ b/examples/ClientTests/compact/MultiCollections.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Nested_Detectors_test"
title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/MultiSegmentCollections.xml b/examples/ClientTests/compact/MultiSegmentCollections.xml
index 599c8c598edfd613a211765d0c7edf51132989e0..af78497781f3bdf4c8fdd93e818ba86d98d9f30b 100644
--- a/examples/ClientTests/compact/MultiSegmentCollections.xml
+++ b/examples/ClientTests/compact/MultiSegmentCollections.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Nested_Detectors_test"
title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/MultiSegmentations.xml b/examples/ClientTests/compact/MultiSegmentations.xml
index 2e086697f49af6c64471c792be1527d643ad86fa..d6e11bdde19e98d16077ce758cf9645a96bdac86 100644
--- a/examples/ClientTests/compact/MultiSegmentations.xml
+++ b/examples/ClientTests/compact/MultiSegmentations.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Nested_Detectors_test"
title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/NamespaceConstants.xml b/examples/ClientTests/compact/NamespaceConstants.xml
index 61a87f033842f1f9f5b1e6051e36d780a65f0b0a..9a05242e018c8caff88f4e7f1014a26602d90dfd 100644
--- a/examples/ClientTests/compact/NamespaceConstants.xml
+++ b/examples/ClientTests/compact/NamespaceConstants.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<define>
<constant name="world_side" value="2*m"/>
diff --git a/examples/ClientTests/compact/NestedDetectors.xml b/examples/ClientTests/compact/NestedDetectors.xml
index 745335a1079622db9b9aafc6abb730cb92ea3daf..8c1a03d1f8a855f47f5bc85377f18687140f9b2b 100644
--- a/examples/ClientTests/compact/NestedDetectors.xml
+++ b/examples/ClientTests/compact/NestedDetectors.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Nested_Detectors_test"
title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/NestedSimple.xml b/examples/ClientTests/compact/NestedSimple.xml
index e0d86bfe7207d29d042fa1ad6c647aad4ca13673..8f56ca742f6facd59dfa7adf8e190b85bc0da728 100644
--- a/examples/ClientTests/compact/NestedSimple.xml
+++ b/examples/ClientTests/compact/NestedSimple.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Nested_Detectors_test"
title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/SectorBarrelCalorimeter.xml b/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
index ab226ec84db69b8a9eb21614daf60f2ff824f9d0..a39e530b23f7e4a4225d57b8d3b51ad744df0923 100644
--- a/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
+++ b/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="clic_sid_cdr"
title="CLIC Silicon Detector CDR"
diff --git a/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml b/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml
index 03e38ae3d4595c61590275c850f75ea541347c2a..781035c6fa889e0d36b28739cb83963d7d4aff61 100644
--- a/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml
+++ b/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Nested_Detectors_test"
title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml b/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml
index d4f9af458109d0ec41a377cfda33f1108268b03c..645ec5e0e6040c4d495d92d4274ddd843e8d3404 100644
--- a/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml
+++ b/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="Nested_Detectors_test"
title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/SiliconBlock.xml b/examples/ClientTests/compact/SiliconBlock.xml
index 0d42d9140fc1e08cacf72a9166153bdc91c4b6ab..b6635d021e3c9331e31e287f8a8f88e5dc31f66d 100644
--- a/examples/ClientTests/compact/SiliconBlock.xml
+++ b/examples/ClientTests/compact/SiliconBlock.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="SiliconBlock"
title="Test with 2 simple silicon boxes"
diff --git a/examples/ClientTests/compact/TrackingRegion.xml b/examples/ClientTests/compact/TrackingRegion.xml
index 19b7c297cde51c93e5b29cb87c81519cf210984c..e6bb54ce0649b75cc23bb6940aec7f8c1938105e 100644
--- a/examples/ClientTests/compact/TrackingRegion.xml
+++ b/examples/ClientTests/compact/TrackingRegion.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="SiliconBlock"
title="Test with 2 simple silicon boxes"
diff --git a/examples/ClientTests/compact/WorldVolume.xml b/examples/ClientTests/compact/WorldVolume.xml
index 0899b54e559d13a79626cb9a7b39d4f951738e24..698b0e2da6dbb2ad43d615c4642d7a60ccad6602 100644
--- a/examples/ClientTests/compact/WorldVolume.xml
+++ b/examples/ClientTests/compact/WorldVolume.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="SiliconBlock"
title="Test with 2 simple silicon boxes"
diff --git a/examples/Conditions/src/ConditionExampleObjects.cpp b/examples/Conditions/src/ConditionExampleObjects.cpp
index 6043d6231af5c69ee1084171c25cc49ec2484375..8c8eaf2351b7999ed78f60797db51d9e4586a0ee 100644
--- a/examples/Conditions/src/ConditionExampleObjects.cpp
+++ b/examples/Conditions/src/ConditionExampleObjects.cpp
@@ -51,8 +51,8 @@ Condition ConditionUpdate1::operator()(const ConditionKey& key, ConditionUpdateC
void ConditionUpdate1::resolve(Condition target, ConditionUpdateContext& context) {
vector<int>& data = target.get<vector<int> >();
Condition cond0 = context.condition(context.key(0));
- data.push_back(cond0.get<int>());
- data.push_back(cond0.get<int>()*2);
+ data.emplace_back(cond0.get<int>());
+ data.emplace_back(cond0.get<int>()*2);
}
/// Interface to client Callback in order to update the condition
diff --git a/examples/OpticalSurfaces/compact/OpNovice.xml b/examples/OpticalSurfaces/compact/OpNovice.xml
index 9e84df55ae731d525535d01cce69c82d5c558449..a69d133015bc02913b8824c6ce1bc2576b1b92c0 100644
--- a/examples/OpticalSurfaces/compact/OpNovice.xml
+++ b/examples/OpticalSurfaces/compact/OpNovice.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="TestMaterialProperties"
title="Test reading of TGeo's Material Properties"
diff --git a/examples/OpticalSurfaces/compact/OpNovice_gdml.xml b/examples/OpticalSurfaces/compact/OpNovice_gdml.xml
index 9ed6dc80fbe81488732ca4e63e7ff15d822de2ff..3d4540cfc5344a655f8685bbf03a39fea048f176 100644
--- a/examples/OpticalSurfaces/compact/OpNovice_gdml.xml
+++ b/examples/OpticalSurfaces/compact/OpNovice_gdml.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="gdml_import_test"
title="GDML import test"
diff --git a/examples/OpticalSurfaces/compact/ReadGDMLMatrices.xml b/examples/OpticalSurfaces/compact/ReadGDMLMatrices.xml
index 21d51841309c427dfe9cd59a165fedaf7933e848..0f655971bfdf543ae80877bd363d69b83d725829 100644
--- a/examples/OpticalSurfaces/compact/ReadGDMLMatrices.xml
+++ b/examples/OpticalSurfaces/compact/ReadGDMLMatrices.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="TestGDMLMatrices"
title="Test reading of TGeo's GDML matrices"
diff --git a/examples/OpticalSurfaces/compact/ReadMaterialProperties.xml b/examples/OpticalSurfaces/compact/ReadMaterialProperties.xml
index 27a958969fa6119d9977ff8b7c3a13c61a314aee..b6f5f3b71b30d743d475655c5cd4b646c0ffbe65 100644
--- a/examples/OpticalSurfaces/compact/ReadMaterialProperties.xml
+++ b/examples/OpticalSurfaces/compact/ReadMaterialProperties.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="TestMaterialProperties"
title="Test reading of TGeo's Material Properties"
diff --git a/examples/OpticalSurfaces/compact/ReadOpticalSurfaces.xml b/examples/OpticalSurfaces/compact/ReadOpticalSurfaces.xml
index 12b9304197d41f605f8b82b29fcf619deab88235..f6863da19fdedc94e6702239bd8c03b2da4ab76c 100644
--- a/examples/OpticalSurfaces/compact/ReadOpticalSurfaces.xml
+++ b/examples/OpticalSurfaces/compact/ReadOpticalSurfaces.xml
@@ -1,6 +1,4 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+<lccdd>
<info name="TestOpticalSurfaces"
title="Test reading of TGeo's Optical Surfaces"