From 955ca6d22d43ec7d8b120c29efef710989a110e1 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Tue, 25 Nov 2014 10:35:50 +0000
Subject: [PATCH] Add new client example with 2 silicon blocks to test
 radiation lengths

---
 DDCore/include/XML/XMLDetector.h              |    6 +-
 DDCore/src/XML/XMLDetector.cpp                |    6 +
 DDCore/src/plugins/Compact2Objects.cpp        |   13 +-
 DDG4/plugins/Geant4SDActions.cpp              |    4 +-
 DDG4/python/DDG4.py                           |   28 +
 examples/AlignDet/compact/AlephTPC.xml        |    6 +-
 examples/AlignDet/compact/compact.xml         |    5 +-
 examples/AlignDet/compact/elements.xml        |  884 ---------
 examples/AlignDet/compact/materials.xml       |  140 --
 examples/CLICSiD/compact/compact.xml          |    5 +-
 .../CLICSiD/compact/compact_polycones.xml     |    5 +-
 examples/CLICSiD/compact/elements.xml         |  884 ---------
 examples/CLICSiD/compact/materials.xml        |  143 --
 examples/ClientTests/compact/Assemblies.xml   |    4 +-
 examples/ClientTests/compact/BoxTrafos.xml    |    4 +-
 .../ClientTests/compact/FCC_HcalBarrel.xml    |    4 +-
 examples/ClientTests/compact/IronCylinder.xml |    4 +-
 examples/ClientTests/compact/MagnetFields.xml | 1615 +----------------
 .../compact/SectorBarrelCalorimeter.xml       |  356 +---
 examples/ClientTests/compact/SiliconBlock.xml |   70 +
 examples/ClientTests/compact/elements.xml     |  884 ---------
 examples/ClientTests/compact/materials.xml    |  140 --
 .../{compact => scripts}/Geant4Assemblies.py  |    0
 examples/ClientTests/scripts/SiliconBlock.py  |   85 +
 24 files changed, 373 insertions(+), 4922 deletions(-)
 delete mode 100644 examples/AlignDet/compact/elements.xml
 delete mode 100644 examples/AlignDet/compact/materials.xml
 delete mode 100644 examples/CLICSiD/compact/elements.xml
 delete mode 100644 examples/CLICSiD/compact/materials.xml
 create mode 100644 examples/ClientTests/compact/SiliconBlock.xml
 delete mode 100644 examples/ClientTests/compact/elements.xml
 delete mode 100644 examples/ClientTests/compact/materials.xml
 rename examples/ClientTests/{compact => scripts}/Geant4Assemblies.py (100%)
 create mode 100644 examples/ClientTests/scripts/SiliconBlock.py

diff --git a/DDCore/include/XML/XMLDetector.h b/DDCore/include/XML/XMLDetector.h
index f276dea6c..2d6057cda 100644
--- a/DDCore/include/XML/XMLDetector.h
+++ b/DDCore/include/XML/XMLDetector.h
@@ -39,10 +39,10 @@ namespace DD4hep {
       Component(const Element& e)
           : Dimension(e) {
       }
-      /// Check if component is sensitive
-      bool isSensitive() const;
       /// Access material attribute as STL string
       std::string materialStr() const;
+      /// Check if component is sensitive
+      bool isSensitive() const;
       /// Create a shape using the plugin mechanism from an XML element
       NamedObject* createShape() const;
     };
@@ -70,6 +70,8 @@ namespace DD4hep {
       int id() const;
       /// Access material attribute as STL string. If not present empty return empty string
       std::string materialStr() const;
+      /// Check if xml detector element is sensitive
+      bool isSensitive() const;
       /// Check if element describes a tracking detector
       bool isTracker() const;
       /// Check if element describes a calorimetric detector
diff --git a/DDCore/src/XML/XMLDetector.cpp b/DDCore/src/XML/XMLDetector.cpp
index 82b52014f..995e23e6c 100644
--- a/DDCore/src/XML/XMLDetector.cpp
+++ b/DDCore/src/XML/XMLDetector.cpp
@@ -46,6 +46,12 @@ int DetElement::id() const {
   return m_element.hasAttr(_U(id)) ? m_element.attr<int>(_U(id)) : -1;
 }
 
+bool DetElement::isSensitive() const {
+  char val = m_element.hasAttr(_U(sensitive)) ? m_element.attr < string > (_U(sensitive))[0] : 'f';
+  val = ::toupper(val);
+  return val == 'T' || val == 'Y';
+}
+
 string DetElement::materialStr() const {
   Handle_t h = m_element.child(_U(material));
   if (h && h.hasAttr(_U(name))) {
diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp
index 573d5cc8f..6f2acaaa2 100644
--- a/DDCore/src/plugins/Compact2Objects.cpp
+++ b/DDCore/src/plugins/Compact2Objects.cpp
@@ -150,7 +150,13 @@ static Ref_t create_DipoleField(lcdd_t& /* lcdd */, xml_h e) {
   if (c.hasAttr(_U(rmax)))
     ptr->rmax = _multiply<double>(c.attr < string > (_U(rmax)), lunit);
   for (xml_coll_t coll(c, _U(dipole_coeff)); coll; ++coll, mult /= lunit) {
-    val = _multiply<double>(coll.text(), mult);
+    xml_dim_t coeff = coll;
+    if ( coeff.hasAttr(_U(value)) )
+      val = coll.attr<double>(_U(value)) * mult;
+    else if ( coeff.hasAttr(_U(coefficient)) )
+      val = coeff.coefficient() * mult;
+    else
+      val = _multiply<double>(coll.text(), mult);
     ptr->coefficents.push_back(val);
   }
   obj.assign(ptr, c.nameStr(), c.typeStr());
@@ -191,7 +197,10 @@ static Ref_t create_MultipoleField(lcdd_t& lcdd, xml_h e) {
   ptr->transform = Transform3D(rot,pos).Inverse();
   for (xml_coll_t coll(c, _U(coefficient)); coll; ++coll, mult /= lunit) {
     xml_dim_t coeff = coll;
-    val = coeff.coefficient(0.0) * mult;
+    if ( coll.hasAttr(_U(value)) )
+      val = coll.attr<double>(_U(value)) * mult;
+    else
+      val = coeff.coefficient(0.0) * mult;
     ptr->coefficents.push_back(val);
     val = coeff.skew(0.0) * mult;
     ptr->skews.push_back(val);
diff --git a/DDG4/plugins/Geant4SDActions.cpp b/DDG4/plugins/Geant4SDActions.cpp
index a3333a8a7..7fed4852f 100644
--- a/DDG4/plugins/Geant4SDActions.cpp
+++ b/DDG4/plugins/Geant4SDActions.cpp
@@ -227,13 +227,13 @@ namespace DD4hep {
 	if ( current == -1 ) {
 	  return;
 	}
+	double deposit = pre.truth.deposit, time = pre.truth.time;
 	Position pos = 0.5 * (pre.position + post.position);
 	Momentum mom = 0.5 * (pre.momentum + post.momentum);
 	double path_len = (post.position - pre.position).R();
 	Geant4Tracker::Hit* hit = new Geant4Tracker::Hit(pre.truth.trackID,
 							 pre.truth.pdgID,
-							 pre.truth.deposit,
-							 pre.truth.time);
+							 deposit,time);
 	hit->position = pos;
 	hit->momentum = mom;
 	hit->length = path_len;
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
index 182aaf899..1099750fb 100644
--- a/DDG4/python/DDG4.py
+++ b/DDG4/python/DDG4.py
@@ -312,3 +312,31 @@ class Simple:
     evt_lcio.enableUI()
     self.kernel.eventAction().add(evt_lcio)
     return evt_lcio
+
+  def buildInputStage(self, generator_input_modules, output_level=None):
+    ga = self.kernel.generatorAction()
+    gen = GeneratorAction(self.kernel,"Geant4GeneratorActionInit/GenerationInit")
+    if output_level is not None:
+      gen.OutputLevel = output_level
+    ga.adopt(gen)
+
+    for gen in generator_input_modules:
+      gen.enableUI()
+      if output_level is not None:
+        gen.OutputLevel = output_level
+      ga.adopt(gen)
+
+    # Merge all existing interaction records
+    gen = GeneratorAction(self.kernel,"Geant4InteractionMerger/InteractionMerger")
+    gen.enableUI()
+    if output_level is not None:
+      gen.OutputLevel = output_level
+    ga.adopt(gen)
+
+    # Finally generate Geant4 primaries
+    gen = GeneratorAction(self.kernel,"Geant4PrimaryHandler/PrimaryHandler")
+    gen.enableUI()
+    if output_level is not None:
+      gen.OutputLevel = output_level
+    ga.adopt(gen)
+    return self
diff --git a/examples/AlignDet/compact/AlephTPC.xml b/examples/AlignDet/compact/AlephTPC.xml
index eafd9fccb..989ec9ac0 100644
--- a/examples/AlignDet/compact/AlephTPC.xml
+++ b/examples/AlignDet/compact/AlephTPC.xml
@@ -12,10 +12,8 @@
   </info>
   
   <includes>
-    <gdmlFile  ref="elements.xml"/>
-    <gdmlFile  ref="materials.xml"/>
-    <pyBuilder ref="../drivers"/>
-
+    <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
     <!--
     <xml       ref="file:../DD4hep.trunk/DDExamples/AlignDet/compact/AlephTPC_alignment.xml"/>
     -->
diff --git a/examples/AlignDet/compact/compact.xml b/examples/AlignDet/compact/compact.xml
index 44ff59cbe..baf4250f8 100644
--- a/examples/AlignDet/compact/compact.xml
+++ b/examples/AlignDet/compact/compact.xml
@@ -12,9 +12,8 @@
   </info>
   
   <includes>
-    <gdmlFile  ref="elements.xml"/>
-    <gdmlFile  ref="materials.xml"/>
-    <pyBuilder ref="../drivers"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
   </includes>
   
   <define>
diff --git a/examples/AlignDet/compact/elements.xml b/examples/AlignDet/compact/elements.xml
deleted file mode 100644
index e714c3a5c..000000000
--- a/examples/AlignDet/compact/elements.xml
+++ /dev/null
@@ -1,884 +0,0 @@
-<materials>
- <element Z="89" formula="Ac" name="Ac" >
-  <atom type="A" unit="g/mol" value="227.028" />
- </element>
- <material formula="Ac" name="Actinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.601558" />
-  <NIL type="lambda" unit="cm" value="21.2048" />
-  <D type="density" unit="g/cm3" value="10.07" />
-  <composite n="1" ref="Ac" />
- </material>
- <element Z="47" formula="Ag" name="Ag" >
-  <atom type="A" unit="g/mol" value="107.868" />
- </element>
- <material formula="Ag" name="Silver" state="solid" >
-  <RL type="X0" unit="cm" value="0.854292" />
-  <NIL type="lambda" unit="cm" value="15.8546" />
-  <D type="density" unit="g/cm3" value="10.5" />
-  <composite n="1" ref="Ag" />
- </material>
- <element Z="13" formula="Al" name="Al" >
-  <atom type="A" unit="g/mol" value="26.9815" />
- </element>
- <material formula="Al" name="Aluminum" state="solid" >
-  <RL type="X0" unit="cm" value="8.89632" />
-  <NIL type="lambda" unit="cm" value="38.8766" />
-  <D type="density" unit="g/cm3" value="2.699" />
-  <composite n="1" ref="Al" />
- </material>
- <element Z="95" formula="Am" name="Am" >
-  <atom type="A" unit="g/mol" value="243.061" />
- </element>
- <material formula="Am" name="Americium" state="solid" >
-  <RL type="X0" unit="cm" value="0.42431" />
-  <NIL type="lambda" unit="cm" value="15.9812" />
-  <D type="density" unit="g/cm3" value="13.67" />
-  <composite n="1" ref="Am" />
- </material>
- <element Z="18" formula="Ar" name="Ar" >
-  <atom type="A" unit="g/mol" value="39.9477" />
- </element>
- <material formula="Ar" name="Argon" state="gas" >
-  <RL type="X0" unit="cm" value="11762.1" />
-  <NIL type="lambda" unit="cm" value="71926" />
-  <D type="density" unit="g/cm3" value="0.00166201" />
-  <composite n="1" ref="Ar" />
- </material>
- <element Z="33" formula="As" name="As" >
-  <atom type="A" unit="g/mol" value="74.9216" />
- </element>
- <material formula="As" name="Arsenic" state="solid" >
-  <RL type="X0" unit="cm" value="2.0838" />
-  <NIL type="lambda" unit="cm" value="25.7324" />
-  <D type="density" unit="g/cm3" value="5.73" />
-  <composite n="1" ref="As" />
- </material>
- <element Z="85" formula="At" name="At" >
-  <atom type="A" unit="g/mol" value="209.987" />
- </element>
- <material formula="At" name="Astatine" state="solid" >
-  <RL type="X0" unit="cm" value="0.650799" />
-  <NIL type="lambda" unit="cm" value="22.3202" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="At" />
- </material>
- <element Z="79" formula="Au" name="Au" >
-  <atom type="A" unit="g/mol" value="196.967" />
- </element>
- <material formula="Au" name="Gold" state="solid" >
-  <RL type="X0" unit="cm" value="0.334436" />
-  <NIL type="lambda" unit="cm" value="10.5393" />
-  <D type="density" unit="g/cm3" value="19.32" />
-  <composite n="1" ref="Au" />
- </material>
- <element Z="5" formula="B" name="B" >
-  <atom type="A" unit="g/mol" value="10.811" />
- </element>
- <material formula="B" name="Boron" state="solid" >
-  <RL type="X0" unit="cm" value="22.2307" />
-  <NIL type="lambda" unit="cm" value="32.2793" />
-  <D type="density" unit="g/cm3" value="2.37" />
-  <composite n="1" ref="B" />
- </material>
- <element Z="56" formula="Ba" name="Ba" >
-  <atom type="A" unit="g/mol" value="137.327" />
- </element>
- <material formula="Ba" name="Barium" state="solid" >
-  <RL type="X0" unit="cm" value="2.37332" />
-  <NIL type="lambda" unit="cm" value="51.6743" />
-  <D type="density" unit="g/cm3" value="3.5" />
-  <composite n="1" ref="Ba" />
- </material>
- <element Z="4" formula="Be" name="Be" >
-  <atom type="A" unit="g/mol" value="9.01218" />
- </element>
- <material formula="Be" name="Beryllium" state="solid" >
-  <RL type="X0" unit="cm" value="35.276" />
-  <NIL type="lambda" unit="cm" value="39.4488" />
-  <D type="density" unit="g/cm3" value="1.848" />
-  <composite n="1" ref="Be" />
- </material>
- <element Z="83" formula="Bi" name="Bi" >
-  <atom type="A" unit="g/mol" value="208.98" />
- </element>
- <material formula="Bi" name="Bismuth" state="solid" >
-  <RL type="X0" unit="cm" value="0.645388" />
-  <NIL type="lambda" unit="cm" value="21.3078" />
-  <D type="density" unit="g/cm3" value="9.747" />
-  <composite n="1" ref="Bi" />
- </material>
- <element Z="97" formula="Bk" name="Bk" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Bk" name="Berkelium" state="solid" >
-  <RL type="X0" unit="cm" value="0.406479" />
-  <NIL type="lambda" unit="cm" value="15.6902" />
-  <D type="density" unit="g/cm3" value="14" />
-  <composite n="1" ref="Bk" />
- </material>
- <element Z="35" formula="Br" name="Br" >
-  <atom type="A" unit="g/mol" value="79.9035" />
- </element>
- <material formula="Br" name="Bromine" state="gas" >
-  <RL type="X0" unit="cm" value="1615.12" />
-  <NIL type="lambda" unit="cm" value="21299" />
-  <D type="density" unit="g/cm3" value="0.0070721" />
-  <composite n="1" ref="Br" />
- </material>
- <element Z="6" formula="C" name="C" >
-  <atom type="A" unit="g/mol" value="12.0107" />
- </element>
- <material formula="C" name="Carbon" state="solid" >
-  <RL type="X0" unit="cm" value="21.3485" />
-  <NIL type="lambda" unit="cm" value="40.1008" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="C" />
- </material>
- <element Z="20" formula="Ca" name="Ca" >
-  <atom type="A" unit="g/mol" value="40.078" />
- </element>
- <material formula="Ca" name="Calcium" state="solid" >
-  <RL type="X0" unit="cm" value="10.4151" />
-  <NIL type="lambda" unit="cm" value="77.3754" />
-  <D type="density" unit="g/cm3" value="1.55" />
-  <composite n="1" ref="Ca" />
- </material>
- <element Z="48" formula="Cd" name="Cd" >
-  <atom type="A" unit="g/mol" value="112.411" />
- </element>
- <material formula="Cd" name="Cadmium" state="solid" >
-  <RL type="X0" unit="cm" value="1.03994" />
-  <NIL type="lambda" unit="cm" value="19.46" />
-  <D type="density" unit="g/cm3" value="8.65" />
-  <composite n="1" ref="Cd" />
- </material>
- <element Z="58" formula="Ce" name="Ce" >
-  <atom type="A" unit="g/mol" value="140.115" />
- </element>
- <material formula="Ce" name="Cerium" state="solid" >
-  <RL type="X0" unit="cm" value="1.19506" />
-  <NIL type="lambda" unit="cm" value="27.3227" />
-  <D type="density" unit="g/cm3" value="6.657" />
-  <composite n="1" ref="Ce" />
- </material>
- <element Z="98" formula="Cf" name="Cf" >
-  <atom type="A" unit="g/mol" value="251.08" />
- </element>
- <material formula="Cf" name="Californium" state="solid" >
-  <RL type="X0" unit="cm" value="0.568328" />
-  <NIL type="lambda" unit="cm" value="22.085" />
-  <D type="density" unit="g/cm3" value="10" />
-  <composite n="1" ref="Cf" />
- </material>
- <element Z="17" formula="Cl" name="Cl" >
-  <atom type="A" unit="g/mol" value="35.4526" />
- </element>
- <material formula="Cl" name="Chlorine" state="gas" >
-  <RL type="X0" unit="cm" value="6437.34" />
-  <NIL type="lambda" unit="cm" value="38723.9" />
-  <D type="density" unit="g/cm3" value="0.00299473" />
-  <composite n="1" ref="Cl" />
- </material>
- <element Z="96" formula="Cm" name="Cm" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Cm" name="Curium" state="solid" >
-  <RL type="X0" unit="cm" value="0.428706" />
-  <NIL type="lambda" unit="cm" value="16.2593" />
-  <D type="density" unit="g/cm3" value="13.51" />
-  <composite n="1" ref="Cm" />
- </material>
- <element Z="27" formula="Co" name="Co" >
-  <atom type="A" unit="g/mol" value="58.9332" />
- </element>
- <material formula="Co" name="Cobalt" state="solid" >
-  <RL type="X0" unit="cm" value="1.53005" />
-  <NIL type="lambda" unit="cm" value="15.2922" />
-  <D type="density" unit="g/cm3" value="8.9" />
-  <composite n="1" ref="Co" />
- </material>
- <element Z="24" formula="Cr" name="Cr" >
-  <atom type="A" unit="g/mol" value="51.9961" />
- </element>
- <material formula="Cr" name="Chromium" state="solid" >
-  <RL type="X0" unit="cm" value="2.0814" />
-  <NIL type="lambda" unit="cm" value="18.1933" />
-  <D type="density" unit="g/cm3" value="7.18" />
-  <composite n="1" ref="Cr" />
- </material>
- <element Z="55" formula="Cs" name="Cs" >
-  <atom type="A" unit="g/mol" value="132.905" />
- </element>
- <material formula="Cs" name="Cesium" state="solid" >
-  <RL type="X0" unit="cm" value="4.4342" />
-  <NIL type="lambda" unit="cm" value="95.317" />
-  <D type="density" unit="g/cm3" value="1.873" />
-  <composite n="1" ref="Cs" />
- </material>
- <element Z="29" formula="Cu" name="Cu" >
-  <atom type="A" unit="g/mol" value="63.5456" />
- </element>
- <material formula="Cu" name="Copper" state="solid" >
-  <RL type="X0" unit="cm" value="1.43558" />
-  <NIL type="lambda" unit="cm" value="15.5141" />
-  <D type="density" unit="g/cm3" value="8.96" />
-  <composite n="1" ref="Cu" />
- </material>
- <element Z="66" formula="Dy" name="Dy" >
-  <atom type="A" unit="g/mol" value="162.497" />
- </element>
- <material formula="Dy" name="Dysprosium" state="solid" >
-  <RL type="X0" unit="cm" value="0.85614" />
-  <NIL type="lambda" unit="cm" value="22.2923" />
-  <D type="density" unit="g/cm3" value="8.55" />
-  <composite n="1" ref="Dy" />
- </material>
- <element Z="68" formula="Er" name="Er" >
-  <atom type="A" unit="g/mol" value="167.256" />
- </element>
- <material formula="Er" name="Erbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.788094" />
-  <NIL type="lambda" unit="cm" value="21.2923" />
-  <D type="density" unit="g/cm3" value="9.066" />
-  <composite n="1" ref="Er" />
- </material>
- <element Z="63" formula="Eu" name="Eu" >
-  <atom type="A" unit="g/mol" value="151.964" />
- </element>
- <material formula="Eu" name="Europium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41868" />
-  <NIL type="lambda" unit="cm" value="35.6178" />
-  <D type="density" unit="g/cm3" value="5.243" />
-  <composite n="1" ref="Eu" />
- </material>
- <element Z="9" formula="F" name="F" >
-  <atom type="A" unit="g/mol" value="18.9984" />
- </element>
- <material formula="F" name="Fluorine" state="gas" >
-  <RL type="X0" unit="cm" value="20838.2" />
-  <NIL type="lambda" unit="cm" value="59094.3" />
-  <D type="density" unit="g/cm3" value="0.00158029" />
-  <composite n="1" ref="F" />
- </material>
- <element Z="26" formula="Fe" name="Fe" >
-  <atom type="A" unit="g/mol" value="55.8451" />
- </element>
- <material formula="Fe" name="Iron" state="solid" >
-  <RL type="X0" unit="cm" value="1.75749" />
-  <NIL type="lambda" unit="cm" value="16.959" />
-  <D type="density" unit="g/cm3" value="7.874" />
-  <composite n="1" ref="Fe" />
- </material>
- <element Z="87" formula="Fr" name="Fr" >
-  <atom type="A" unit="g/mol" value="223.02" />
- </element>
- <material formula="Fr" name="Francium" state="solid" >
-  <RL type="X0" unit="cm" value="6.18826" />
-  <NIL type="lambda" unit="cm" value="212.263" />
-  <D type="density" unit="g/cm3" value="1" />
-  <composite n="1" ref="Fr" />
- </material>
- <element Z="31" formula="Ga" name="Ga" >
-  <atom type="A" unit="g/mol" value="69.7231" />
- </element>
- <material formula="Ga" name="Gallium" state="solid" >
-  <RL type="X0" unit="cm" value="2.1128" />
-  <NIL type="lambda" unit="cm" value="24.3351" />
-  <D type="density" unit="g/cm3" value="5.904" />
-  <composite n="1" ref="Ga" />
- </material>
- <element Z="64" formula="Gd" name="Gd" >
-  <atom type="A" unit="g/mol" value="157.252" />
- </element>
- <material formula="Gd" name="Gadolinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.947208" />
-  <NIL type="lambda" unit="cm" value="23.9377" />
-  <D type="density" unit="g/cm3" value="7.9004" />
-  <composite n="1" ref="Gd" />
- </material>
- <element Z="32" formula="Ge" name="Ge" >
-  <atom type="A" unit="g/mol" value="72.6128" />
- </element>
- <material formula="Ge" name="Germanium" state="solid" >
-  <RL type="X0" unit="cm" value="2.3013" />
-  <NIL type="lambda" unit="cm" value="27.3344" />
-  <D type="density" unit="g/cm3" value="5.323" />
-  <composite n="1" ref="Ge" />
- </material>
- <element Z="1" formula="H" name="H" >
-  <atom type="A" unit="g/mol" value="1.00794" />
- </element>
- <material formula="H" name="Hydrogen" state="gas" >
-  <RL type="X0" unit="cm" value="752776" />
-  <NIL type="lambda" unit="cm" value="421239" />
-  <D type="density" unit="g/cm3" value="8.3748e-05" />
-  <composite n="1" ref="H" />
- </material>
- <element Z="2" formula="He" name="He" >
-  <atom type="A" unit="g/mol" value="4.00264" />
- </element>
- <material formula="He" name="Helium" state="gas" >
-  <RL type="X0" unit="cm" value="567113" />
-  <NIL type="lambda" unit="cm" value="334266" />
-  <D type="density" unit="g/cm3" value="0.000166322" />
-  <composite n="1" ref="He" />
- </material>
- <element Z="72" formula="Hf" name="Hf" >
-  <atom type="A" unit="g/mol" value="178.485" />
- </element>
- <material formula="Hf" name="Hafnium" state="solid" >
-  <RL type="X0" unit="cm" value="0.517717" />
-  <NIL type="lambda" unit="cm" value="14.7771" />
-  <D type="density" unit="g/cm3" value="13.31" />
-  <composite n="1" ref="Hf" />
- </material>
- <element Z="80" formula="Hg" name="Hg" >
-  <atom type="A" unit="g/mol" value="200.599" />
- </element>
- <material formula="Hg" name="Mercury" state="solid" >
-  <RL type="X0" unit="cm" value="0.475241" />
-  <NIL type="lambda" unit="cm" value="15.105" />
-  <D type="density" unit="g/cm3" value="13.546" />
-  <composite n="1" ref="Hg" />
- </material>
- <element Z="67" formula="Ho" name="Ho" >
-  <atom type="A" unit="g/mol" value="164.93" />
- </element>
- <material formula="Ho" name="Holmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.822447" />
-  <NIL type="lambda" unit="cm" value="21.8177" />
-  <D type="density" unit="g/cm3" value="8.795" />
-  <composite n="1" ref="Ho" />
- </material>
- <element Z="53" formula="I" name="I" >
-  <atom type="A" unit="g/mol" value="126.904" />
- </element>
- <material formula="I" name="Iodine" state="solid" >
-  <RL type="X0" unit="cm" value="1.72016" />
-  <NIL type="lambda" unit="cm" value="35.6583" />
-  <D type="density" unit="g/cm3" value="4.93" />
-  <composite n="1" ref="I" />
- </material>
- <element Z="49" formula="In" name="In" >
-  <atom type="A" unit="g/mol" value="114.818" />
- </element>
- <material formula="In" name="Indium" state="solid" >
-  <RL type="X0" unit="cm" value="1.21055" />
-  <NIL type="lambda" unit="cm" value="23.2468" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="In" />
- </material>
- <element Z="77" formula="Ir" name="Ir" >
-  <atom type="A" unit="g/mol" value="192.216" />
- </element>
- <material formula="Ir" name="Iridium" state="solid" >
-  <RL type="X0" unit="cm" value="0.294142" />
-  <NIL type="lambda" unit="cm" value="9.01616" />
-  <D type="density" unit="g/cm3" value="22.42" />
-  <composite n="1" ref="Ir" />
- </material>
- <element Z="19" formula="K" name="K" >
-  <atom type="A" unit="g/mol" value="39.0983" />
- </element>
- <material formula="K" name="Potassium" state="solid" >
-  <RL type="X0" unit="cm" value="20.0871" />
-  <NIL type="lambda" unit="cm" value="138.041" />
-  <D type="density" unit="g/cm3" value="0.862" />
-  <composite n="1" ref="K" />
- </material>
- <element Z="36" formula="Kr" name="Kr" >
-  <atom type="A" unit="g/mol" value="83.7993" />
- </element>
- <material formula="Kr" name="Krypton" state="gas" >
-  <RL type="X0" unit="cm" value="3269.44" />
-  <NIL type="lambda" unit="cm" value="43962.9" />
-  <D type="density" unit="g/cm3" value="0.00347832" />
-  <composite n="1" ref="Kr" />
- </material>
- <element Z="57" formula="La" name="La" >
-  <atom type="A" unit="g/mol" value="138.905" />
- </element>
- <material formula="La" name="Lanthanum" state="solid" >
-  <RL type="X0" unit="cm" value="1.32238" />
-  <NIL type="lambda" unit="cm" value="29.441" />
-  <D type="density" unit="g/cm3" value="6.154" />
-  <composite n="1" ref="La" />
- </material>
- <element Z="3" formula="Li" name="Li" >
-  <atom type="A" unit="g/mol" value="6.94003" />
- </element>
- <material formula="Li" name="Lithium" state="solid" >
-  <RL type="X0" unit="cm" value="154.997" />
-  <NIL type="lambda" unit="cm" value="124.305" />
-  <D type="density" unit="g/cm3" value="0.534" />
-  <composite n="1" ref="Li" />
- </material>
- <element Z="71" formula="Lu" name="Lu" >
-  <atom type="A" unit="g/mol" value="174.967" />
- </element>
- <material formula="Lu" name="Lutetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.703651" />
-  <NIL type="lambda" unit="cm" value="19.8916" />
-  <D type="density" unit="g/cm3" value="9.84" />
-  <composite n="1" ref="Lu" />
- </material>
- <element Z="12" formula="Mg" name="Mg" >
-  <atom type="A" unit="g/mol" value="24.305" />
- </element>
- <material formula="Mg" name="Magnesium" state="solid" >
-  <RL type="X0" unit="cm" value="14.3859" />
-  <NIL type="lambda" unit="cm" value="58.7589" />
-  <D type="density" unit="g/cm3" value="1.74" />
-  <composite n="1" ref="Mg" />
- </material>
- <element Z="25" formula="Mn" name="Mn" >
-  <atom type="A" unit="g/mol" value="54.938" />
- </element>
- <material formula="Mn" name="Manganese" state="solid" >
-  <RL type="X0" unit="cm" value="1.96772" />
-  <NIL type="lambda" unit="cm" value="17.8701" />
-  <D type="density" unit="g/cm3" value="7.44" />
-  <composite n="1" ref="Mn" />
- </material>
- <element Z="42" formula="Mo" name="Mo" >
-  <atom type="A" unit="g/mol" value="95.9313" />
- </element>
- <material formula="Mo" name="Molybdenum" state="solid" >
-  <RL type="X0" unit="cm" value="0.959107" />
-  <NIL type="lambda" unit="cm" value="15.6698" />
-  <D type="density" unit="g/cm3" value="10.22" />
-  <composite n="1" ref="Mo" />
- </material>
- <element Z="7" formula="N" name="N" >
-  <atom type="A" unit="g/mol" value="14.0068" />
- </element>
- <material formula="N" name="Nitrogen" state="gas" >
-  <RL type="X0" unit="cm" value="32602.2" />
-  <NIL type="lambda" unit="cm" value="72430.3" />
-  <D type="density" unit="g/cm3" value="0.0011652" />
-  <composite n="1" ref="N" />
- </material>
- <element Z="11" formula="Na" name="Na" >
-  <atom type="A" unit="g/mol" value="22.9898" />
- </element>
- <material formula="Na" name="Sodium" state="solid" >
-  <RL type="X0" unit="cm" value="28.5646" />
-  <NIL type="lambda" unit="cm" value="102.463" />
-  <D type="density" unit="g/cm3" value="0.971" />
-  <composite n="1" ref="Na" />
- </material>
- <element Z="41" formula="Nb" name="Nb" >
-  <atom type="A" unit="g/mol" value="92.9064" />
- </element>
- <material formula="Nb" name="Niobium" state="solid" >
-  <RL type="X0" unit="cm" value="1.15783" />
-  <NIL type="lambda" unit="cm" value="18.4846" />
-  <D type="density" unit="g/cm3" value="8.57" />
-  <composite n="1" ref="Nb" />
- </material>
- <element Z="60" formula="Nd" name="Nd" >
-  <atom type="A" unit="g/mol" value="144.236" />
- </element>
- <material formula="Nd" name="Neodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.11667" />
-  <NIL type="lambda" unit="cm" value="26.6308" />
-  <D type="density" unit="g/cm3" value="6.9" />
-  <composite n="1" ref="Nd" />
- </material>
- <element Z="10" formula="Ne" name="Ne" >
-  <atom type="A" unit="g/mol" value="20.18" />
- </element>
- <material formula="Ne" name="Neon" state="gas" >
-  <RL type="X0" unit="cm" value="34504.8" />
-  <NIL type="lambda" unit="cm" value="114322" />
-  <D type="density" unit="g/cm3" value="0.000838505" />
-  <composite n="1" ref="Ne" />
- </material>
- <element Z="28" formula="Ni" name="Ni" >
-  <atom type="A" unit="g/mol" value="58.6933" />
- </element>
- <material formula="Ni" name="Nickel" state="solid" >
-  <RL type="X0" unit="cm" value="1.42422" />
-  <NIL type="lambda" unit="cm" value="15.2265" />
-  <D type="density" unit="g/cm3" value="8.902" />
-  <composite n="1" ref="Ni" />
- </material>
- <element Z="93" formula="Np" name="Np" >
-  <atom type="A" unit="g/mol" value="237.048" />
- </element>
- <material formula="Np" name="Neptunium" state="solid" >
-  <RL type="X0" unit="cm" value="0.289676" />
-  <NIL type="lambda" unit="cm" value="10.6983" />
-  <D type="density" unit="g/cm3" value="20.25" />
-  <composite n="1" ref="Np" />
- </material>
- <element Z="8" formula="O" name="O" >
-  <atom type="A" unit="g/mol" value="15.9994" />
- </element>
- <material formula="O" name="Oxygen" state="gas" >
-  <RL type="X0" unit="cm" value="25713.8" />
-  <NIL type="lambda" unit="cm" value="66233.9" />
-  <D type="density" unit="g/cm3" value="0.00133151" />
-  <composite n="1" ref="O" />
- </material>
- <element Z="76" formula="Os" name="Os" >
-  <atom type="A" unit="g/mol" value="190.225" />
- </element>
- <material formula="Os" name="Osmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.295861" />
-  <NIL type="lambda" unit="cm" value="8.92553" />
-  <D type="density" unit="g/cm3" value="22.57" />
-  <composite n="1" ref="Os" />
- </material>
- <element Z="15" formula="P" name="P" >
-  <atom type="A" unit="g/mol" value="30.9738" />
- </element>
- <material formula="P" name="Phosphorus" state="solid" >
-  <RL type="X0" unit="cm" value="9.63879" />
-  <NIL type="lambda" unit="cm" value="49.9343" />
-  <D type="density" unit="g/cm3" value="2.2" />
-  <composite n="1" ref="P" />
- </material>
- <element Z="91" formula="Pa" name="Pa" >
-  <atom type="A" unit="g/mol" value="231.036" />
- </element>
- <material formula="Pa" name="Protactinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.38607" />
-  <NIL type="lambda" unit="cm" value="13.9744" />
-  <D type="density" unit="g/cm3" value="15.37" />
-  <composite n="1" ref="Pa" />
- </material>
- <element Z="82" formula="Pb" name="Pb" >
-  <atom type="A" unit="g/mol" value="207.217" />
- </element>
- <material formula="Pb" name="Lead" state="solid" >
-  <RL type="X0" unit="cm" value="0.561253" />
-  <NIL type="lambda" unit="cm" value="18.2607" />
-  <D type="density" unit="g/cm3" value="11.35" />
-  <composite n="1" ref="Pb" />
- </material>
- <element Z="46" formula="Pd" name="Pd" >
-  <atom type="A" unit="g/mol" value="106.415" />
- </element>
- <material formula="Pd" name="Palladium" state="solid" >
-  <RL type="X0" unit="cm" value="0.765717" />
-  <NIL type="lambda" unit="cm" value="13.7482" />
-  <D type="density" unit="g/cm3" value="12.02" />
-  <composite n="1" ref="Pd" />
- </material>
- <element Z="61" formula="Pm" name="Pm" >
-  <atom type="A" unit="g/mol" value="144.913" />
- </element>
- <material formula="Pm" name="Promethium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04085" />
-  <NIL type="lambda" unit="cm" value="25.4523" />
-  <D type="density" unit="g/cm3" value="7.22" />
-  <composite n="1" ref="Pm" />
- </material>
- <element Z="84" formula="Po" name="Po" >
-  <atom type="A" unit="g/mol" value="208.982" />
- </element>
- <material formula="Po" name="Polonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.661092" />
-  <NIL type="lambda" unit="cm" value="22.2842" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="Po" />
- </material>
- <element Z="59" formula="Pr" name="Pr" >
-  <atom type="A" unit="g/mol" value="140.908" />
- </element>
- <material formula="Pr" name="Praseodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.1562" />
-  <NIL type="lambda" unit="cm" value="27.1312" />
-  <D type="density" unit="g/cm3" value="6.71" />
-  <composite n="1" ref="Pr" />
- </material>
- <element Z="78" formula="Pt" name="Pt" >
-  <atom type="A" unit="g/mol" value="195.078" />
- </element>
- <material formula="Pt" name="Platinum" state="solid" >
-  <RL type="X0" unit="cm" value="0.305053" />
-  <NIL type="lambda" unit="cm" value="9.46584" />
-  <D type="density" unit="g/cm3" value="21.45" />
-  <composite n="1" ref="Pt" />
- </material>
- <element Z="94" formula="Pu" name="Pu" >
-  <atom type="A" unit="g/mol" value="244.064" />
- </element>
- <material formula="Pu" name="Plutonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.298905" />
-  <NIL type="lambda" unit="cm" value="11.0265" />
-  <D type="density" unit="g/cm3" value="19.84" />
-  <composite n="1" ref="Pu" />
- </material>
- <element Z="88" formula="Ra" name="Ra" >
-  <atom type="A" unit="g/mol" value="226.025" />
- </element>
- <material formula="Ra" name="Radium" state="solid" >
-  <RL type="X0" unit="cm" value="1.22987" />
-  <NIL type="lambda" unit="cm" value="42.6431" />
-  <D type="density" unit="g/cm3" value="5" />
-  <composite n="1" ref="Ra" />
- </material>
- <element Z="37" formula="Rb" name="Rb" >
-  <atom type="A" unit="g/mol" value="85.4677" />
- </element>
- <material formula="Rb" name="Rubidium" state="solid" >
-  <RL type="X0" unit="cm" value="7.19774" />
-  <NIL type="lambda" unit="cm" value="100.218" />
-  <D type="density" unit="g/cm3" value="1.532" />
-  <composite n="1" ref="Rb" />
- </material>
- <element Z="75" formula="Re" name="Re" >
-  <atom type="A" unit="g/mol" value="186.207" />
- </element>
- <material formula="Re" name="Rhenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.318283" />
-  <NIL type="lambda" unit="cm" value="9.5153" />
-  <D type="density" unit="g/cm3" value="21.02" />
-  <composite n="1" ref="Re" />
- </material>
- <element Z="45" formula="Rh" name="Rh" >
-  <atom type="A" unit="g/mol" value="102.906" />
- </element>
- <material formula="Rh" name="Rhodium" state="solid" >
-  <RL type="X0" unit="cm" value="0.746619" />
-  <NIL type="lambda" unit="cm" value="13.2083" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Rh" />
- </material>
- <element Z="86" formula="Rn" name="Rn" >
-  <atom type="A" unit="g/mol" value="222.018" />
- </element>
- <material formula="Rn" name="Radon" state="gas" >
-  <RL type="X0" unit="cm" value="697.777" />
-  <NIL type="lambda" unit="cm" value="23532" />
-  <D type="density" unit="g/cm3" value="0.00900662" />
-  <composite n="1" ref="Rn" />
- </material>
- <element Z="44" formula="Ru" name="Ru" >
-  <atom type="A" unit="g/mol" value="101.065" />
- </element>
- <material formula="Ru" name="Ruthenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.764067" />
-  <NIL type="lambda" unit="cm" value="13.1426" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Ru" />
- </material>
- <element Z="16" formula="S" name="S" >
-  <atom type="A" unit="g/mol" value="32.0661" />
- </element>
- <material formula="S" name="Sulfur" state="solid" >
-  <RL type="X0" unit="cm" value="9.74829" />
-  <NIL type="lambda" unit="cm" value="55.6738" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="S" />
- </material>
- <element Z="51" formula="Sb" name="Sb" >
-  <atom type="A" unit="g/mol" value="121.76" />
- </element>
- <material formula="Sb" name="Antimony" state="solid" >
-  <RL type="X0" unit="cm" value="1.30401" />
-  <NIL type="lambda" unit="cm" value="25.8925" />
-  <D type="density" unit="g/cm3" value="6.691" />
-  <composite n="1" ref="Sb" />
- </material>
- <element Z="21" formula="Sc" name="Sc" >
-  <atom type="A" unit="g/mol" value="44.9559" />
- </element>
- <material formula="Sc" name="Scandium" state="solid" >
-  <RL type="X0" unit="cm" value="5.53545" />
-  <NIL type="lambda" unit="cm" value="41.609" />
-  <D type="density" unit="g/cm3" value="2.989" />
-  <composite n="1" ref="Sc" />
- </material>
- <element Z="34" formula="Se" name="Se" >
-  <atom type="A" unit="g/mol" value="78.9594" />
- </element>
- <material formula="Se" name="Selenium" state="solid" >
-  <RL type="X0" unit="cm" value="2.64625" />
-  <NIL type="lambda" unit="cm" value="33.356" />
-  <D type="density" unit="g/cm3" value="4.5" />
-  <composite n="1" ref="Se" />
- </material>
- <element Z="14" formula="Si" name="Si" >
-  <atom type="A" unit="g/mol" value="28.0854" />
- </element>
- <material formula="Si" name="Silicon" state="solid" >
-  <RL type="X0" unit="cm" value="9.36607" />
-  <NIL type="lambda" unit="cm" value="45.7531" />
-  <D type="density" unit="g/cm3" value="2.33" />
-  <composite n="1" ref="Si" />
- </material>
- <element Z="62" formula="Sm" name="Sm" >
-  <atom type="A" unit="g/mol" value="150.366" />
- </element>
- <material formula="Sm" name="Samarium" state="solid" >
-  <RL type="X0" unit="cm" value="1.01524" />
-  <NIL type="lambda" unit="cm" value="24.9892" />
-  <D type="density" unit="g/cm3" value="7.46" />
-  <composite n="1" ref="Sm" />
- </material>
- <element Z="50" formula="Sn" name="Sn" >
-  <atom type="A" unit="g/mol" value="118.71" />
- </element>
- <material formula="Sn" name="Tin" state="solid" >
-  <RL type="X0" unit="cm" value="1.20637" />
-  <NIL type="lambda" unit="cm" value="23.4931" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="Sn" />
- </material>
- <element Z="38" formula="Sr" name="Sr" >
-  <atom type="A" unit="g/mol" value="87.6166" />
- </element>
- <material formula="Sr" name="Strontium" state="solid" >
-  <RL type="X0" unit="cm" value="4.237" />
-  <NIL type="lambda" unit="cm" value="61.0238" />
-  <D type="density" unit="g/cm3" value="2.54" />
-  <composite n="1" ref="Sr" />
- </material>
- <element Z="73" formula="Ta" name="Ta" >
-  <atom type="A" unit="g/mol" value="180.948" />
- </element>
- <material formula="Ta" name="Tantalum" state="solid" >
-  <RL type="X0" unit="cm" value="0.409392" />
-  <NIL type="lambda" unit="cm" value="11.8846" />
-  <D type="density" unit="g/cm3" value="16.654" />
-  <composite n="1" ref="Ta" />
- </material>
- <element Z="65" formula="Tb" name="Tb" >
-  <atom type="A" unit="g/mol" value="158.925" />
- </element>
- <material formula="Tb" name="Terbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.893977" />
-  <NIL type="lambda" unit="cm" value="23.0311" />
-  <D type="density" unit="g/cm3" value="8.229" />
-  <composite n="1" ref="Tb" />
- </material>
- <element Z="43" formula="Tc" name="Tc" >
-  <atom type="A" unit="g/mol" value="97.9072" />
- </element>
- <material formula="Tc" name="Technetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.833149" />
-  <NIL type="lambda" unit="cm" value="14.0185" />
-  <D type="density" unit="g/cm3" value="11.5" />
-  <composite n="1" ref="Tc" />
- </material>
- <element Z="52" formula="Te" name="Te" >
-  <atom type="A" unit="g/mol" value="127.603" />
- </element>
- <material formula="Te" name="Tellurium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41457" />
-  <NIL type="lambda" unit="cm" value="28.1797" />
-  <D type="density" unit="g/cm3" value="6.24" />
-  <composite n="1" ref="Te" />
- </material>
- <element Z="90" formula="Th" name="Th" >
-  <atom type="A" unit="g/mol" value="232.038" />
- </element>
- <material formula="Th" name="Thorium" state="solid" >
-  <RL type="X0" unit="cm" value="0.51823" />
-  <NIL type="lambda" unit="cm" value="18.353" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Th" />
- </material>
- <element Z="22" formula="Ti" name="Ti" >
-  <atom type="A" unit="g/mol" value="47.8667" />
- </element>
- <material formula="Ti" name="Titanium" state="solid" >
-  <RL type="X0" unit="cm" value="3.5602" />
-  <NIL type="lambda" unit="cm" value="27.9395" />
-  <D type="density" unit="g/cm3" value="4.54" />
-  <composite n="1" ref="Ti" />
- </material>
- <element Z="81" formula="Tl" name="Tl" >
-  <atom type="A" unit="g/mol" value="204.383" />
- </element>
- <material formula="Tl" name="Thallium" state="solid" >
-  <RL type="X0" unit="cm" value="0.547665" />
-  <NIL type="lambda" unit="cm" value="17.6129" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Tl" />
- </material>
- <element Z="69" formula="Tm" name="Tm" >
-  <atom type="A" unit="g/mol" value="168.934" />
- </element>
- <material formula="Tm" name="Thulium" state="solid" >
-  <RL type="X0" unit="cm" value="0.754428" />
-  <NIL type="lambda" unit="cm" value="20.7522" />
-  <D type="density" unit="g/cm3" value="9.321" />
-  <composite n="1" ref="Tm" />
- </material>
- <element Z="92" formula="U" name="U" >
-  <atom type="A" unit="g/mol" value="238.029" />
- </element>
- <material formula="U" name="Uranium" state="solid" >
-  <RL type="X0" unit="cm" value="0.31663" />
-  <NIL type="lambda" unit="cm" value="11.4473" />
-  <D type="density" unit="g/cm3" value="18.95" />
-  <composite n="1" ref="U" />
- </material>
- <element Z="23" formula="V" name="V" >
-  <atom type="A" unit="g/mol" value="50.9415" />
- </element>
- <material formula="V" name="Vanadium" state="solid" >
-  <RL type="X0" unit="cm" value="2.59285" />
-  <NIL type="lambda" unit="cm" value="21.2187" />
-  <D type="density" unit="g/cm3" value="6.11" />
-  <composite n="1" ref="V" />
- </material>
- <element Z="74" formula="W" name="W" >
-  <atom type="A" unit="g/mol" value="183.842" />
- </element>
- <material formula="W" name="Tungsten" state="solid" >
-  <RL type="X0" unit="cm" value="0.350418" />
-  <NIL type="lambda" unit="cm" value="10.3057" />
-  <D type="density" unit="g/cm3" value="19.3" />
-  <composite n="1" ref="W" />
- </material>
- <element Z="54" formula="Xe" name="Xe" >
-  <atom type="A" unit="g/mol" value="131.292" />
- </element>
- <material formula="Xe" name="Xenon" state="gas" >
-  <RL type="X0" unit="cm" value="1546.2" />
-  <NIL type="lambda" unit="cm" value="32477.9" />
-  <D type="density" unit="g/cm3" value="0.00548536" />
-  <composite n="1" ref="Xe" />
- </material>
- <element Z="39" formula="Y" name="Y" >
-  <atom type="A" unit="g/mol" value="88.9058" />
- </element>
- <material formula="Y" name="Yttrium" state="solid" >
-  <RL type="X0" unit="cm" value="2.32943" />
-  <NIL type="lambda" unit="cm" value="34.9297" />
-  <D type="density" unit="g/cm3" value="4.469" />
-  <composite n="1" ref="Y" />
- </material>
- <element Z="70" formula="Yb" name="Yb" >
-  <atom type="A" unit="g/mol" value="173.038" />
- </element>
- <material formula="Yb" name="Ytterbium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04332" />
-  <NIL type="lambda" unit="cm" value="28.9843" />
-  <D type="density" unit="g/cm3" value="6.73" />
-  <composite n="1" ref="Yb" />
- </material>
- <element Z="30" formula="Zn" name="Zn" >
-  <atom type="A" unit="g/mol" value="65.3955" />
- </element>
- <material formula="Zn" name="Zinc" state="solid" >
-  <RL type="X0" unit="cm" value="1.74286" />
-  <NIL type="lambda" unit="cm" value="19.8488" />
-  <D type="density" unit="g/cm3" value="7.133" />
-  <composite n="1" ref="Zn" />
- </material>
- <element Z="40" formula="Zr" name="Zr" >
-  <atom type="A" unit="g/mol" value="91.2236" />
- </element>
- <material formula="Zr" name="Zirconium" state="solid" >
-  <RL type="X0" unit="cm" value="1.56707" />
-  <NIL type="lambda" unit="cm" value="24.2568" />
-  <D type="density" unit="g/cm3" value="6.506" />
-  <composite n="1" ref="Zr" />
- </material>
-</materials>
\ No newline at end of file
diff --git a/examples/AlignDet/compact/materials.xml b/examples/AlignDet/compact/materials.xml
deleted file mode 100644
index 12107bafc..000000000
--- a/examples/AlignDet/compact/materials.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<materials>
-
-  <!--
-       Air by weight from
-
-       http://www.engineeringtoolbox.com/air-composition-24_212.html
-  -->
-  <material name="Air">
-    <D type="density" unit="g/cm3" value="0.0012"/>
-    <fraction n="0.754" ref="N"/>
-    <fraction n="0.234" ref="O"/>
-    <fraction n="0.012" ref="Ar"/>
-  </material>
-  
-  <material name="Vacuum">
-    <D type="density" unit="g/cm3" value="0.00000001" />
-    <fraction n="1" ref="H" />
-  </material>
-
-  <material name="Epoxy">
-    <D type="density" value="1.3" unit="g/cm3"/>
-    <composite n="44" ref="H"/>
-    <composite n="15" ref="C"/>
-    <composite n="7" ref="O"/>
-  </material>
-
-  <material name="Quartz">
-    <D type="density" value="2.2" unit="g/cm3"/>
-    <composite n="1" ref="Si"/>
-    <composite n="2" ref="O"/>
-  </material>
-
-  <material name="G10">
-    <D type="density" value="1.7" unit="g/cm3"/>
-    <fraction n="0.08" ref="Cl"/>
-    <fraction n="0.773" ref="Quartz"/>
-    <fraction n="0.147" ref="Epoxy"/>
-  </material>
-
-  <material name="Polystyrene">
-    <D value="1.032" unit="g/cm3"/>
-    <composite n="19" ref="C"/>
-    <composite n="21" ref="H"/>
-  </material>
-
-  <material name="Steel235">
-    <D value="7.85" unit="g/cm3"/>
-    <fraction n="0.998" ref="Fe"/>
-    <fraction n=".002" ref="C"/>
-  </material>
-
-  <material name="SiliconOxide">
-    <D type="density" value="2.65" unit="g/cm3"/>
-    <composite n="1" ref="Si"/>
-    <composite n="2" ref="O"/>
-  </material>
-
-  <material name="BoronOxide">
-    <D type="density" value="2.46" unit="g/cm3"/>
-    <composite n="2" ref="B"/>
-    <composite n="3" ref="O"/>
-  </material>
-
-  <material name="SodiumOxide">
-    <D type="density" value="2.65" unit="g/cm3"/>
-    <composite n="2" ref="Na"/>
-    <composite n="1" ref="O"/>
-  </material>
-
-  <material name="AluminumOxide">
-    <D type="density" value="3.89" unit="g/cm3"/>
-    <composite n="2" ref="Al"/>
-    <composite n="3" ref="O"/>
-  </material>
-
-  <material name="PyrexGlass">
-    <D type="density" value="2.23" unit="g/cm3"/>
-    <fraction n="0.806" ref="SiliconOxide"/>
-    <fraction n="0.130" ref="BoronOxide"/>
-    <fraction n="0.040" ref="SodiumOxide"/>
-    <fraction n="0.023" ref="AluminumOxide"/>
-  </material>
-
-  <material name="CarbonFiber">
-    <D type="density" value="1.5" unit="g/cm3"/>
-    <fraction n="0.65" ref="C"/>
-    <fraction n="0.35" ref="Epoxy"/>
-  </material>
-  
-  <material name="CarbonFiber_50D">
-    <D type="density" value="0.75" unit="g/cm3"/>
-    <fraction n="0.65" ref="C"/>
-    <fraction n="0.35" ref="Epoxy"/>
-  </material>  
-
-  <material name="Rohacell31">
-    <D type="density" value="0.032" unit="g/cm3"/>
-    <composite n="9" ref="C"/>
-    <composite n="13" ref="H"/>
-    <composite n="2" ref="O"/>
-    <composite n="1" ref="N"/>
-  </material>
-  
-  <material name="Rohacell31_50D">
-    <D type="density" value="0.016" unit="g/cm3"/>
-    <composite n="9" ref="C"/>
-    <composite n="13" ref="H"/>
-    <composite n="2" ref="O"/>
-    <composite n="1" ref="N"/>
-  </material>  
-
-  <material name="RPCGasDefault" state="gas">
-    <D type="density" value="0.0037" unit="g/cm3"/>
-    <composite n="209" ref="C"/>
-    <composite n="239" ref="H"/>
-    <composite n="381" ref="F"/>
-  </material>
-
-  <material name="PolystyreneFoam">
-    <D type="density" value="0.0056" unit="g/cm3"/>
-    <fraction n="1.0" ref="Polystyrene"/>
-  </material>
-
-  <material name="Kapton">
-    <D value="1.43" unit="g/cm3" />
-    <composite n="22" ref="C"/>
-    <composite n="10" ref="H" />
-    <composite n="2" ref="N" />
-    <composite n="5" ref="O" />
-  </material>
-
-  <material name="PEEK">
-    <D value="1.37" unit="g/cm3" />
-    <composite n="19" ref="C"/>
-    <composite n="12" ref="H" />
-    <composite n="3" ref="O" />
-  </material>
-
-</materials>
diff --git a/examples/CLICSiD/compact/compact.xml b/examples/CLICSiD/compact/compact.xml
index e3faceb0f..d02b2bcd9 100644
--- a/examples/CLICSiD/compact/compact.xml
+++ b/examples/CLICSiD/compact/compact.xml
@@ -12,9 +12,8 @@
   </info>
 
   <includes>
-    <gdmlFile  ref="elements.xml"/>
-    <gdmlFile  ref="materials.xml"/>
-    <pyBuilder ref="../drivers"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
   </includes>
   
   <define>
diff --git a/examples/CLICSiD/compact/compact_polycones.xml b/examples/CLICSiD/compact/compact_polycones.xml
index 94aa2bde2..b2ad34bf7 100644
--- a/examples/CLICSiD/compact/compact_polycones.xml
+++ b/examples/CLICSiD/compact/compact_polycones.xml
@@ -12,9 +12,8 @@
     </info>
 
     <includes>
-        <gdmlFile  ref="elements.xml"/>
-        <gdmlFile  ref="materials.xml"/>
-        <pyBuilder ref="../drivers"/>
+        <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+        <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
     </includes>
     
     <define>
diff --git a/examples/CLICSiD/compact/elements.xml b/examples/CLICSiD/compact/elements.xml
deleted file mode 100644
index e714c3a5c..000000000
--- a/examples/CLICSiD/compact/elements.xml
+++ /dev/null
@@ -1,884 +0,0 @@
-<materials>
- <element Z="89" formula="Ac" name="Ac" >
-  <atom type="A" unit="g/mol" value="227.028" />
- </element>
- <material formula="Ac" name="Actinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.601558" />
-  <NIL type="lambda" unit="cm" value="21.2048" />
-  <D type="density" unit="g/cm3" value="10.07" />
-  <composite n="1" ref="Ac" />
- </material>
- <element Z="47" formula="Ag" name="Ag" >
-  <atom type="A" unit="g/mol" value="107.868" />
- </element>
- <material formula="Ag" name="Silver" state="solid" >
-  <RL type="X0" unit="cm" value="0.854292" />
-  <NIL type="lambda" unit="cm" value="15.8546" />
-  <D type="density" unit="g/cm3" value="10.5" />
-  <composite n="1" ref="Ag" />
- </material>
- <element Z="13" formula="Al" name="Al" >
-  <atom type="A" unit="g/mol" value="26.9815" />
- </element>
- <material formula="Al" name="Aluminum" state="solid" >
-  <RL type="X0" unit="cm" value="8.89632" />
-  <NIL type="lambda" unit="cm" value="38.8766" />
-  <D type="density" unit="g/cm3" value="2.699" />
-  <composite n="1" ref="Al" />
- </material>
- <element Z="95" formula="Am" name="Am" >
-  <atom type="A" unit="g/mol" value="243.061" />
- </element>
- <material formula="Am" name="Americium" state="solid" >
-  <RL type="X0" unit="cm" value="0.42431" />
-  <NIL type="lambda" unit="cm" value="15.9812" />
-  <D type="density" unit="g/cm3" value="13.67" />
-  <composite n="1" ref="Am" />
- </material>
- <element Z="18" formula="Ar" name="Ar" >
-  <atom type="A" unit="g/mol" value="39.9477" />
- </element>
- <material formula="Ar" name="Argon" state="gas" >
-  <RL type="X0" unit="cm" value="11762.1" />
-  <NIL type="lambda" unit="cm" value="71926" />
-  <D type="density" unit="g/cm3" value="0.00166201" />
-  <composite n="1" ref="Ar" />
- </material>
- <element Z="33" formula="As" name="As" >
-  <atom type="A" unit="g/mol" value="74.9216" />
- </element>
- <material formula="As" name="Arsenic" state="solid" >
-  <RL type="X0" unit="cm" value="2.0838" />
-  <NIL type="lambda" unit="cm" value="25.7324" />
-  <D type="density" unit="g/cm3" value="5.73" />
-  <composite n="1" ref="As" />
- </material>
- <element Z="85" formula="At" name="At" >
-  <atom type="A" unit="g/mol" value="209.987" />
- </element>
- <material formula="At" name="Astatine" state="solid" >
-  <RL type="X0" unit="cm" value="0.650799" />
-  <NIL type="lambda" unit="cm" value="22.3202" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="At" />
- </material>
- <element Z="79" formula="Au" name="Au" >
-  <atom type="A" unit="g/mol" value="196.967" />
- </element>
- <material formula="Au" name="Gold" state="solid" >
-  <RL type="X0" unit="cm" value="0.334436" />
-  <NIL type="lambda" unit="cm" value="10.5393" />
-  <D type="density" unit="g/cm3" value="19.32" />
-  <composite n="1" ref="Au" />
- </material>
- <element Z="5" formula="B" name="B" >
-  <atom type="A" unit="g/mol" value="10.811" />
- </element>
- <material formula="B" name="Boron" state="solid" >
-  <RL type="X0" unit="cm" value="22.2307" />
-  <NIL type="lambda" unit="cm" value="32.2793" />
-  <D type="density" unit="g/cm3" value="2.37" />
-  <composite n="1" ref="B" />
- </material>
- <element Z="56" formula="Ba" name="Ba" >
-  <atom type="A" unit="g/mol" value="137.327" />
- </element>
- <material formula="Ba" name="Barium" state="solid" >
-  <RL type="X0" unit="cm" value="2.37332" />
-  <NIL type="lambda" unit="cm" value="51.6743" />
-  <D type="density" unit="g/cm3" value="3.5" />
-  <composite n="1" ref="Ba" />
- </material>
- <element Z="4" formula="Be" name="Be" >
-  <atom type="A" unit="g/mol" value="9.01218" />
- </element>
- <material formula="Be" name="Beryllium" state="solid" >
-  <RL type="X0" unit="cm" value="35.276" />
-  <NIL type="lambda" unit="cm" value="39.4488" />
-  <D type="density" unit="g/cm3" value="1.848" />
-  <composite n="1" ref="Be" />
- </material>
- <element Z="83" formula="Bi" name="Bi" >
-  <atom type="A" unit="g/mol" value="208.98" />
- </element>
- <material formula="Bi" name="Bismuth" state="solid" >
-  <RL type="X0" unit="cm" value="0.645388" />
-  <NIL type="lambda" unit="cm" value="21.3078" />
-  <D type="density" unit="g/cm3" value="9.747" />
-  <composite n="1" ref="Bi" />
- </material>
- <element Z="97" formula="Bk" name="Bk" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Bk" name="Berkelium" state="solid" >
-  <RL type="X0" unit="cm" value="0.406479" />
-  <NIL type="lambda" unit="cm" value="15.6902" />
-  <D type="density" unit="g/cm3" value="14" />
-  <composite n="1" ref="Bk" />
- </material>
- <element Z="35" formula="Br" name="Br" >
-  <atom type="A" unit="g/mol" value="79.9035" />
- </element>
- <material formula="Br" name="Bromine" state="gas" >
-  <RL type="X0" unit="cm" value="1615.12" />
-  <NIL type="lambda" unit="cm" value="21299" />
-  <D type="density" unit="g/cm3" value="0.0070721" />
-  <composite n="1" ref="Br" />
- </material>
- <element Z="6" formula="C" name="C" >
-  <atom type="A" unit="g/mol" value="12.0107" />
- </element>
- <material formula="C" name="Carbon" state="solid" >
-  <RL type="X0" unit="cm" value="21.3485" />
-  <NIL type="lambda" unit="cm" value="40.1008" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="C" />
- </material>
- <element Z="20" formula="Ca" name="Ca" >
-  <atom type="A" unit="g/mol" value="40.078" />
- </element>
- <material formula="Ca" name="Calcium" state="solid" >
-  <RL type="X0" unit="cm" value="10.4151" />
-  <NIL type="lambda" unit="cm" value="77.3754" />
-  <D type="density" unit="g/cm3" value="1.55" />
-  <composite n="1" ref="Ca" />
- </material>
- <element Z="48" formula="Cd" name="Cd" >
-  <atom type="A" unit="g/mol" value="112.411" />
- </element>
- <material formula="Cd" name="Cadmium" state="solid" >
-  <RL type="X0" unit="cm" value="1.03994" />
-  <NIL type="lambda" unit="cm" value="19.46" />
-  <D type="density" unit="g/cm3" value="8.65" />
-  <composite n="1" ref="Cd" />
- </material>
- <element Z="58" formula="Ce" name="Ce" >
-  <atom type="A" unit="g/mol" value="140.115" />
- </element>
- <material formula="Ce" name="Cerium" state="solid" >
-  <RL type="X0" unit="cm" value="1.19506" />
-  <NIL type="lambda" unit="cm" value="27.3227" />
-  <D type="density" unit="g/cm3" value="6.657" />
-  <composite n="1" ref="Ce" />
- </material>
- <element Z="98" formula="Cf" name="Cf" >
-  <atom type="A" unit="g/mol" value="251.08" />
- </element>
- <material formula="Cf" name="Californium" state="solid" >
-  <RL type="X0" unit="cm" value="0.568328" />
-  <NIL type="lambda" unit="cm" value="22.085" />
-  <D type="density" unit="g/cm3" value="10" />
-  <composite n="1" ref="Cf" />
- </material>
- <element Z="17" formula="Cl" name="Cl" >
-  <atom type="A" unit="g/mol" value="35.4526" />
- </element>
- <material formula="Cl" name="Chlorine" state="gas" >
-  <RL type="X0" unit="cm" value="6437.34" />
-  <NIL type="lambda" unit="cm" value="38723.9" />
-  <D type="density" unit="g/cm3" value="0.00299473" />
-  <composite n="1" ref="Cl" />
- </material>
- <element Z="96" formula="Cm" name="Cm" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Cm" name="Curium" state="solid" >
-  <RL type="X0" unit="cm" value="0.428706" />
-  <NIL type="lambda" unit="cm" value="16.2593" />
-  <D type="density" unit="g/cm3" value="13.51" />
-  <composite n="1" ref="Cm" />
- </material>
- <element Z="27" formula="Co" name="Co" >
-  <atom type="A" unit="g/mol" value="58.9332" />
- </element>
- <material formula="Co" name="Cobalt" state="solid" >
-  <RL type="X0" unit="cm" value="1.53005" />
-  <NIL type="lambda" unit="cm" value="15.2922" />
-  <D type="density" unit="g/cm3" value="8.9" />
-  <composite n="1" ref="Co" />
- </material>
- <element Z="24" formula="Cr" name="Cr" >
-  <atom type="A" unit="g/mol" value="51.9961" />
- </element>
- <material formula="Cr" name="Chromium" state="solid" >
-  <RL type="X0" unit="cm" value="2.0814" />
-  <NIL type="lambda" unit="cm" value="18.1933" />
-  <D type="density" unit="g/cm3" value="7.18" />
-  <composite n="1" ref="Cr" />
- </material>
- <element Z="55" formula="Cs" name="Cs" >
-  <atom type="A" unit="g/mol" value="132.905" />
- </element>
- <material formula="Cs" name="Cesium" state="solid" >
-  <RL type="X0" unit="cm" value="4.4342" />
-  <NIL type="lambda" unit="cm" value="95.317" />
-  <D type="density" unit="g/cm3" value="1.873" />
-  <composite n="1" ref="Cs" />
- </material>
- <element Z="29" formula="Cu" name="Cu" >
-  <atom type="A" unit="g/mol" value="63.5456" />
- </element>
- <material formula="Cu" name="Copper" state="solid" >
-  <RL type="X0" unit="cm" value="1.43558" />
-  <NIL type="lambda" unit="cm" value="15.5141" />
-  <D type="density" unit="g/cm3" value="8.96" />
-  <composite n="1" ref="Cu" />
- </material>
- <element Z="66" formula="Dy" name="Dy" >
-  <atom type="A" unit="g/mol" value="162.497" />
- </element>
- <material formula="Dy" name="Dysprosium" state="solid" >
-  <RL type="X0" unit="cm" value="0.85614" />
-  <NIL type="lambda" unit="cm" value="22.2923" />
-  <D type="density" unit="g/cm3" value="8.55" />
-  <composite n="1" ref="Dy" />
- </material>
- <element Z="68" formula="Er" name="Er" >
-  <atom type="A" unit="g/mol" value="167.256" />
- </element>
- <material formula="Er" name="Erbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.788094" />
-  <NIL type="lambda" unit="cm" value="21.2923" />
-  <D type="density" unit="g/cm3" value="9.066" />
-  <composite n="1" ref="Er" />
- </material>
- <element Z="63" formula="Eu" name="Eu" >
-  <atom type="A" unit="g/mol" value="151.964" />
- </element>
- <material formula="Eu" name="Europium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41868" />
-  <NIL type="lambda" unit="cm" value="35.6178" />
-  <D type="density" unit="g/cm3" value="5.243" />
-  <composite n="1" ref="Eu" />
- </material>
- <element Z="9" formula="F" name="F" >
-  <atom type="A" unit="g/mol" value="18.9984" />
- </element>
- <material formula="F" name="Fluorine" state="gas" >
-  <RL type="X0" unit="cm" value="20838.2" />
-  <NIL type="lambda" unit="cm" value="59094.3" />
-  <D type="density" unit="g/cm3" value="0.00158029" />
-  <composite n="1" ref="F" />
- </material>
- <element Z="26" formula="Fe" name="Fe" >
-  <atom type="A" unit="g/mol" value="55.8451" />
- </element>
- <material formula="Fe" name="Iron" state="solid" >
-  <RL type="X0" unit="cm" value="1.75749" />
-  <NIL type="lambda" unit="cm" value="16.959" />
-  <D type="density" unit="g/cm3" value="7.874" />
-  <composite n="1" ref="Fe" />
- </material>
- <element Z="87" formula="Fr" name="Fr" >
-  <atom type="A" unit="g/mol" value="223.02" />
- </element>
- <material formula="Fr" name="Francium" state="solid" >
-  <RL type="X0" unit="cm" value="6.18826" />
-  <NIL type="lambda" unit="cm" value="212.263" />
-  <D type="density" unit="g/cm3" value="1" />
-  <composite n="1" ref="Fr" />
- </material>
- <element Z="31" formula="Ga" name="Ga" >
-  <atom type="A" unit="g/mol" value="69.7231" />
- </element>
- <material formula="Ga" name="Gallium" state="solid" >
-  <RL type="X0" unit="cm" value="2.1128" />
-  <NIL type="lambda" unit="cm" value="24.3351" />
-  <D type="density" unit="g/cm3" value="5.904" />
-  <composite n="1" ref="Ga" />
- </material>
- <element Z="64" formula="Gd" name="Gd" >
-  <atom type="A" unit="g/mol" value="157.252" />
- </element>
- <material formula="Gd" name="Gadolinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.947208" />
-  <NIL type="lambda" unit="cm" value="23.9377" />
-  <D type="density" unit="g/cm3" value="7.9004" />
-  <composite n="1" ref="Gd" />
- </material>
- <element Z="32" formula="Ge" name="Ge" >
-  <atom type="A" unit="g/mol" value="72.6128" />
- </element>
- <material formula="Ge" name="Germanium" state="solid" >
-  <RL type="X0" unit="cm" value="2.3013" />
-  <NIL type="lambda" unit="cm" value="27.3344" />
-  <D type="density" unit="g/cm3" value="5.323" />
-  <composite n="1" ref="Ge" />
- </material>
- <element Z="1" formula="H" name="H" >
-  <atom type="A" unit="g/mol" value="1.00794" />
- </element>
- <material formula="H" name="Hydrogen" state="gas" >
-  <RL type="X0" unit="cm" value="752776" />
-  <NIL type="lambda" unit="cm" value="421239" />
-  <D type="density" unit="g/cm3" value="8.3748e-05" />
-  <composite n="1" ref="H" />
- </material>
- <element Z="2" formula="He" name="He" >
-  <atom type="A" unit="g/mol" value="4.00264" />
- </element>
- <material formula="He" name="Helium" state="gas" >
-  <RL type="X0" unit="cm" value="567113" />
-  <NIL type="lambda" unit="cm" value="334266" />
-  <D type="density" unit="g/cm3" value="0.000166322" />
-  <composite n="1" ref="He" />
- </material>
- <element Z="72" formula="Hf" name="Hf" >
-  <atom type="A" unit="g/mol" value="178.485" />
- </element>
- <material formula="Hf" name="Hafnium" state="solid" >
-  <RL type="X0" unit="cm" value="0.517717" />
-  <NIL type="lambda" unit="cm" value="14.7771" />
-  <D type="density" unit="g/cm3" value="13.31" />
-  <composite n="1" ref="Hf" />
- </material>
- <element Z="80" formula="Hg" name="Hg" >
-  <atom type="A" unit="g/mol" value="200.599" />
- </element>
- <material formula="Hg" name="Mercury" state="solid" >
-  <RL type="X0" unit="cm" value="0.475241" />
-  <NIL type="lambda" unit="cm" value="15.105" />
-  <D type="density" unit="g/cm3" value="13.546" />
-  <composite n="1" ref="Hg" />
- </material>
- <element Z="67" formula="Ho" name="Ho" >
-  <atom type="A" unit="g/mol" value="164.93" />
- </element>
- <material formula="Ho" name="Holmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.822447" />
-  <NIL type="lambda" unit="cm" value="21.8177" />
-  <D type="density" unit="g/cm3" value="8.795" />
-  <composite n="1" ref="Ho" />
- </material>
- <element Z="53" formula="I" name="I" >
-  <atom type="A" unit="g/mol" value="126.904" />
- </element>
- <material formula="I" name="Iodine" state="solid" >
-  <RL type="X0" unit="cm" value="1.72016" />
-  <NIL type="lambda" unit="cm" value="35.6583" />
-  <D type="density" unit="g/cm3" value="4.93" />
-  <composite n="1" ref="I" />
- </material>
- <element Z="49" formula="In" name="In" >
-  <atom type="A" unit="g/mol" value="114.818" />
- </element>
- <material formula="In" name="Indium" state="solid" >
-  <RL type="X0" unit="cm" value="1.21055" />
-  <NIL type="lambda" unit="cm" value="23.2468" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="In" />
- </material>
- <element Z="77" formula="Ir" name="Ir" >
-  <atom type="A" unit="g/mol" value="192.216" />
- </element>
- <material formula="Ir" name="Iridium" state="solid" >
-  <RL type="X0" unit="cm" value="0.294142" />
-  <NIL type="lambda" unit="cm" value="9.01616" />
-  <D type="density" unit="g/cm3" value="22.42" />
-  <composite n="1" ref="Ir" />
- </material>
- <element Z="19" formula="K" name="K" >
-  <atom type="A" unit="g/mol" value="39.0983" />
- </element>
- <material formula="K" name="Potassium" state="solid" >
-  <RL type="X0" unit="cm" value="20.0871" />
-  <NIL type="lambda" unit="cm" value="138.041" />
-  <D type="density" unit="g/cm3" value="0.862" />
-  <composite n="1" ref="K" />
- </material>
- <element Z="36" formula="Kr" name="Kr" >
-  <atom type="A" unit="g/mol" value="83.7993" />
- </element>
- <material formula="Kr" name="Krypton" state="gas" >
-  <RL type="X0" unit="cm" value="3269.44" />
-  <NIL type="lambda" unit="cm" value="43962.9" />
-  <D type="density" unit="g/cm3" value="0.00347832" />
-  <composite n="1" ref="Kr" />
- </material>
- <element Z="57" formula="La" name="La" >
-  <atom type="A" unit="g/mol" value="138.905" />
- </element>
- <material formula="La" name="Lanthanum" state="solid" >
-  <RL type="X0" unit="cm" value="1.32238" />
-  <NIL type="lambda" unit="cm" value="29.441" />
-  <D type="density" unit="g/cm3" value="6.154" />
-  <composite n="1" ref="La" />
- </material>
- <element Z="3" formula="Li" name="Li" >
-  <atom type="A" unit="g/mol" value="6.94003" />
- </element>
- <material formula="Li" name="Lithium" state="solid" >
-  <RL type="X0" unit="cm" value="154.997" />
-  <NIL type="lambda" unit="cm" value="124.305" />
-  <D type="density" unit="g/cm3" value="0.534" />
-  <composite n="1" ref="Li" />
- </material>
- <element Z="71" formula="Lu" name="Lu" >
-  <atom type="A" unit="g/mol" value="174.967" />
- </element>
- <material formula="Lu" name="Lutetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.703651" />
-  <NIL type="lambda" unit="cm" value="19.8916" />
-  <D type="density" unit="g/cm3" value="9.84" />
-  <composite n="1" ref="Lu" />
- </material>
- <element Z="12" formula="Mg" name="Mg" >
-  <atom type="A" unit="g/mol" value="24.305" />
- </element>
- <material formula="Mg" name="Magnesium" state="solid" >
-  <RL type="X0" unit="cm" value="14.3859" />
-  <NIL type="lambda" unit="cm" value="58.7589" />
-  <D type="density" unit="g/cm3" value="1.74" />
-  <composite n="1" ref="Mg" />
- </material>
- <element Z="25" formula="Mn" name="Mn" >
-  <atom type="A" unit="g/mol" value="54.938" />
- </element>
- <material formula="Mn" name="Manganese" state="solid" >
-  <RL type="X0" unit="cm" value="1.96772" />
-  <NIL type="lambda" unit="cm" value="17.8701" />
-  <D type="density" unit="g/cm3" value="7.44" />
-  <composite n="1" ref="Mn" />
- </material>
- <element Z="42" formula="Mo" name="Mo" >
-  <atom type="A" unit="g/mol" value="95.9313" />
- </element>
- <material formula="Mo" name="Molybdenum" state="solid" >
-  <RL type="X0" unit="cm" value="0.959107" />
-  <NIL type="lambda" unit="cm" value="15.6698" />
-  <D type="density" unit="g/cm3" value="10.22" />
-  <composite n="1" ref="Mo" />
- </material>
- <element Z="7" formula="N" name="N" >
-  <atom type="A" unit="g/mol" value="14.0068" />
- </element>
- <material formula="N" name="Nitrogen" state="gas" >
-  <RL type="X0" unit="cm" value="32602.2" />
-  <NIL type="lambda" unit="cm" value="72430.3" />
-  <D type="density" unit="g/cm3" value="0.0011652" />
-  <composite n="1" ref="N" />
- </material>
- <element Z="11" formula="Na" name="Na" >
-  <atom type="A" unit="g/mol" value="22.9898" />
- </element>
- <material formula="Na" name="Sodium" state="solid" >
-  <RL type="X0" unit="cm" value="28.5646" />
-  <NIL type="lambda" unit="cm" value="102.463" />
-  <D type="density" unit="g/cm3" value="0.971" />
-  <composite n="1" ref="Na" />
- </material>
- <element Z="41" formula="Nb" name="Nb" >
-  <atom type="A" unit="g/mol" value="92.9064" />
- </element>
- <material formula="Nb" name="Niobium" state="solid" >
-  <RL type="X0" unit="cm" value="1.15783" />
-  <NIL type="lambda" unit="cm" value="18.4846" />
-  <D type="density" unit="g/cm3" value="8.57" />
-  <composite n="1" ref="Nb" />
- </material>
- <element Z="60" formula="Nd" name="Nd" >
-  <atom type="A" unit="g/mol" value="144.236" />
- </element>
- <material formula="Nd" name="Neodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.11667" />
-  <NIL type="lambda" unit="cm" value="26.6308" />
-  <D type="density" unit="g/cm3" value="6.9" />
-  <composite n="1" ref="Nd" />
- </material>
- <element Z="10" formula="Ne" name="Ne" >
-  <atom type="A" unit="g/mol" value="20.18" />
- </element>
- <material formula="Ne" name="Neon" state="gas" >
-  <RL type="X0" unit="cm" value="34504.8" />
-  <NIL type="lambda" unit="cm" value="114322" />
-  <D type="density" unit="g/cm3" value="0.000838505" />
-  <composite n="1" ref="Ne" />
- </material>
- <element Z="28" formula="Ni" name="Ni" >
-  <atom type="A" unit="g/mol" value="58.6933" />
- </element>
- <material formula="Ni" name="Nickel" state="solid" >
-  <RL type="X0" unit="cm" value="1.42422" />
-  <NIL type="lambda" unit="cm" value="15.2265" />
-  <D type="density" unit="g/cm3" value="8.902" />
-  <composite n="1" ref="Ni" />
- </material>
- <element Z="93" formula="Np" name="Np" >
-  <atom type="A" unit="g/mol" value="237.048" />
- </element>
- <material formula="Np" name="Neptunium" state="solid" >
-  <RL type="X0" unit="cm" value="0.289676" />
-  <NIL type="lambda" unit="cm" value="10.6983" />
-  <D type="density" unit="g/cm3" value="20.25" />
-  <composite n="1" ref="Np" />
- </material>
- <element Z="8" formula="O" name="O" >
-  <atom type="A" unit="g/mol" value="15.9994" />
- </element>
- <material formula="O" name="Oxygen" state="gas" >
-  <RL type="X0" unit="cm" value="25713.8" />
-  <NIL type="lambda" unit="cm" value="66233.9" />
-  <D type="density" unit="g/cm3" value="0.00133151" />
-  <composite n="1" ref="O" />
- </material>
- <element Z="76" formula="Os" name="Os" >
-  <atom type="A" unit="g/mol" value="190.225" />
- </element>
- <material formula="Os" name="Osmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.295861" />
-  <NIL type="lambda" unit="cm" value="8.92553" />
-  <D type="density" unit="g/cm3" value="22.57" />
-  <composite n="1" ref="Os" />
- </material>
- <element Z="15" formula="P" name="P" >
-  <atom type="A" unit="g/mol" value="30.9738" />
- </element>
- <material formula="P" name="Phosphorus" state="solid" >
-  <RL type="X0" unit="cm" value="9.63879" />
-  <NIL type="lambda" unit="cm" value="49.9343" />
-  <D type="density" unit="g/cm3" value="2.2" />
-  <composite n="1" ref="P" />
- </material>
- <element Z="91" formula="Pa" name="Pa" >
-  <atom type="A" unit="g/mol" value="231.036" />
- </element>
- <material formula="Pa" name="Protactinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.38607" />
-  <NIL type="lambda" unit="cm" value="13.9744" />
-  <D type="density" unit="g/cm3" value="15.37" />
-  <composite n="1" ref="Pa" />
- </material>
- <element Z="82" formula="Pb" name="Pb" >
-  <atom type="A" unit="g/mol" value="207.217" />
- </element>
- <material formula="Pb" name="Lead" state="solid" >
-  <RL type="X0" unit="cm" value="0.561253" />
-  <NIL type="lambda" unit="cm" value="18.2607" />
-  <D type="density" unit="g/cm3" value="11.35" />
-  <composite n="1" ref="Pb" />
- </material>
- <element Z="46" formula="Pd" name="Pd" >
-  <atom type="A" unit="g/mol" value="106.415" />
- </element>
- <material formula="Pd" name="Palladium" state="solid" >
-  <RL type="X0" unit="cm" value="0.765717" />
-  <NIL type="lambda" unit="cm" value="13.7482" />
-  <D type="density" unit="g/cm3" value="12.02" />
-  <composite n="1" ref="Pd" />
- </material>
- <element Z="61" formula="Pm" name="Pm" >
-  <atom type="A" unit="g/mol" value="144.913" />
- </element>
- <material formula="Pm" name="Promethium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04085" />
-  <NIL type="lambda" unit="cm" value="25.4523" />
-  <D type="density" unit="g/cm3" value="7.22" />
-  <composite n="1" ref="Pm" />
- </material>
- <element Z="84" formula="Po" name="Po" >
-  <atom type="A" unit="g/mol" value="208.982" />
- </element>
- <material formula="Po" name="Polonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.661092" />
-  <NIL type="lambda" unit="cm" value="22.2842" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="Po" />
- </material>
- <element Z="59" formula="Pr" name="Pr" >
-  <atom type="A" unit="g/mol" value="140.908" />
- </element>
- <material formula="Pr" name="Praseodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.1562" />
-  <NIL type="lambda" unit="cm" value="27.1312" />
-  <D type="density" unit="g/cm3" value="6.71" />
-  <composite n="1" ref="Pr" />
- </material>
- <element Z="78" formula="Pt" name="Pt" >
-  <atom type="A" unit="g/mol" value="195.078" />
- </element>
- <material formula="Pt" name="Platinum" state="solid" >
-  <RL type="X0" unit="cm" value="0.305053" />
-  <NIL type="lambda" unit="cm" value="9.46584" />
-  <D type="density" unit="g/cm3" value="21.45" />
-  <composite n="1" ref="Pt" />
- </material>
- <element Z="94" formula="Pu" name="Pu" >
-  <atom type="A" unit="g/mol" value="244.064" />
- </element>
- <material formula="Pu" name="Plutonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.298905" />
-  <NIL type="lambda" unit="cm" value="11.0265" />
-  <D type="density" unit="g/cm3" value="19.84" />
-  <composite n="1" ref="Pu" />
- </material>
- <element Z="88" formula="Ra" name="Ra" >
-  <atom type="A" unit="g/mol" value="226.025" />
- </element>
- <material formula="Ra" name="Radium" state="solid" >
-  <RL type="X0" unit="cm" value="1.22987" />
-  <NIL type="lambda" unit="cm" value="42.6431" />
-  <D type="density" unit="g/cm3" value="5" />
-  <composite n="1" ref="Ra" />
- </material>
- <element Z="37" formula="Rb" name="Rb" >
-  <atom type="A" unit="g/mol" value="85.4677" />
- </element>
- <material formula="Rb" name="Rubidium" state="solid" >
-  <RL type="X0" unit="cm" value="7.19774" />
-  <NIL type="lambda" unit="cm" value="100.218" />
-  <D type="density" unit="g/cm3" value="1.532" />
-  <composite n="1" ref="Rb" />
- </material>
- <element Z="75" formula="Re" name="Re" >
-  <atom type="A" unit="g/mol" value="186.207" />
- </element>
- <material formula="Re" name="Rhenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.318283" />
-  <NIL type="lambda" unit="cm" value="9.5153" />
-  <D type="density" unit="g/cm3" value="21.02" />
-  <composite n="1" ref="Re" />
- </material>
- <element Z="45" formula="Rh" name="Rh" >
-  <atom type="A" unit="g/mol" value="102.906" />
- </element>
- <material formula="Rh" name="Rhodium" state="solid" >
-  <RL type="X0" unit="cm" value="0.746619" />
-  <NIL type="lambda" unit="cm" value="13.2083" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Rh" />
- </material>
- <element Z="86" formula="Rn" name="Rn" >
-  <atom type="A" unit="g/mol" value="222.018" />
- </element>
- <material formula="Rn" name="Radon" state="gas" >
-  <RL type="X0" unit="cm" value="697.777" />
-  <NIL type="lambda" unit="cm" value="23532" />
-  <D type="density" unit="g/cm3" value="0.00900662" />
-  <composite n="1" ref="Rn" />
- </material>
- <element Z="44" formula="Ru" name="Ru" >
-  <atom type="A" unit="g/mol" value="101.065" />
- </element>
- <material formula="Ru" name="Ruthenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.764067" />
-  <NIL type="lambda" unit="cm" value="13.1426" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Ru" />
- </material>
- <element Z="16" formula="S" name="S" >
-  <atom type="A" unit="g/mol" value="32.0661" />
- </element>
- <material formula="S" name="Sulfur" state="solid" >
-  <RL type="X0" unit="cm" value="9.74829" />
-  <NIL type="lambda" unit="cm" value="55.6738" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="S" />
- </material>
- <element Z="51" formula="Sb" name="Sb" >
-  <atom type="A" unit="g/mol" value="121.76" />
- </element>
- <material formula="Sb" name="Antimony" state="solid" >
-  <RL type="X0" unit="cm" value="1.30401" />
-  <NIL type="lambda" unit="cm" value="25.8925" />
-  <D type="density" unit="g/cm3" value="6.691" />
-  <composite n="1" ref="Sb" />
- </material>
- <element Z="21" formula="Sc" name="Sc" >
-  <atom type="A" unit="g/mol" value="44.9559" />
- </element>
- <material formula="Sc" name="Scandium" state="solid" >
-  <RL type="X0" unit="cm" value="5.53545" />
-  <NIL type="lambda" unit="cm" value="41.609" />
-  <D type="density" unit="g/cm3" value="2.989" />
-  <composite n="1" ref="Sc" />
- </material>
- <element Z="34" formula="Se" name="Se" >
-  <atom type="A" unit="g/mol" value="78.9594" />
- </element>
- <material formula="Se" name="Selenium" state="solid" >
-  <RL type="X0" unit="cm" value="2.64625" />
-  <NIL type="lambda" unit="cm" value="33.356" />
-  <D type="density" unit="g/cm3" value="4.5" />
-  <composite n="1" ref="Se" />
- </material>
- <element Z="14" formula="Si" name="Si" >
-  <atom type="A" unit="g/mol" value="28.0854" />
- </element>
- <material formula="Si" name="Silicon" state="solid" >
-  <RL type="X0" unit="cm" value="9.36607" />
-  <NIL type="lambda" unit="cm" value="45.7531" />
-  <D type="density" unit="g/cm3" value="2.33" />
-  <composite n="1" ref="Si" />
- </material>
- <element Z="62" formula="Sm" name="Sm" >
-  <atom type="A" unit="g/mol" value="150.366" />
- </element>
- <material formula="Sm" name="Samarium" state="solid" >
-  <RL type="X0" unit="cm" value="1.01524" />
-  <NIL type="lambda" unit="cm" value="24.9892" />
-  <D type="density" unit="g/cm3" value="7.46" />
-  <composite n="1" ref="Sm" />
- </material>
- <element Z="50" formula="Sn" name="Sn" >
-  <atom type="A" unit="g/mol" value="118.71" />
- </element>
- <material formula="Sn" name="Tin" state="solid" >
-  <RL type="X0" unit="cm" value="1.20637" />
-  <NIL type="lambda" unit="cm" value="23.4931" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="Sn" />
- </material>
- <element Z="38" formula="Sr" name="Sr" >
-  <atom type="A" unit="g/mol" value="87.6166" />
- </element>
- <material formula="Sr" name="Strontium" state="solid" >
-  <RL type="X0" unit="cm" value="4.237" />
-  <NIL type="lambda" unit="cm" value="61.0238" />
-  <D type="density" unit="g/cm3" value="2.54" />
-  <composite n="1" ref="Sr" />
- </material>
- <element Z="73" formula="Ta" name="Ta" >
-  <atom type="A" unit="g/mol" value="180.948" />
- </element>
- <material formula="Ta" name="Tantalum" state="solid" >
-  <RL type="X0" unit="cm" value="0.409392" />
-  <NIL type="lambda" unit="cm" value="11.8846" />
-  <D type="density" unit="g/cm3" value="16.654" />
-  <composite n="1" ref="Ta" />
- </material>
- <element Z="65" formula="Tb" name="Tb" >
-  <atom type="A" unit="g/mol" value="158.925" />
- </element>
- <material formula="Tb" name="Terbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.893977" />
-  <NIL type="lambda" unit="cm" value="23.0311" />
-  <D type="density" unit="g/cm3" value="8.229" />
-  <composite n="1" ref="Tb" />
- </material>
- <element Z="43" formula="Tc" name="Tc" >
-  <atom type="A" unit="g/mol" value="97.9072" />
- </element>
- <material formula="Tc" name="Technetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.833149" />
-  <NIL type="lambda" unit="cm" value="14.0185" />
-  <D type="density" unit="g/cm3" value="11.5" />
-  <composite n="1" ref="Tc" />
- </material>
- <element Z="52" formula="Te" name="Te" >
-  <atom type="A" unit="g/mol" value="127.603" />
- </element>
- <material formula="Te" name="Tellurium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41457" />
-  <NIL type="lambda" unit="cm" value="28.1797" />
-  <D type="density" unit="g/cm3" value="6.24" />
-  <composite n="1" ref="Te" />
- </material>
- <element Z="90" formula="Th" name="Th" >
-  <atom type="A" unit="g/mol" value="232.038" />
- </element>
- <material formula="Th" name="Thorium" state="solid" >
-  <RL type="X0" unit="cm" value="0.51823" />
-  <NIL type="lambda" unit="cm" value="18.353" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Th" />
- </material>
- <element Z="22" formula="Ti" name="Ti" >
-  <atom type="A" unit="g/mol" value="47.8667" />
- </element>
- <material formula="Ti" name="Titanium" state="solid" >
-  <RL type="X0" unit="cm" value="3.5602" />
-  <NIL type="lambda" unit="cm" value="27.9395" />
-  <D type="density" unit="g/cm3" value="4.54" />
-  <composite n="1" ref="Ti" />
- </material>
- <element Z="81" formula="Tl" name="Tl" >
-  <atom type="A" unit="g/mol" value="204.383" />
- </element>
- <material formula="Tl" name="Thallium" state="solid" >
-  <RL type="X0" unit="cm" value="0.547665" />
-  <NIL type="lambda" unit="cm" value="17.6129" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Tl" />
- </material>
- <element Z="69" formula="Tm" name="Tm" >
-  <atom type="A" unit="g/mol" value="168.934" />
- </element>
- <material formula="Tm" name="Thulium" state="solid" >
-  <RL type="X0" unit="cm" value="0.754428" />
-  <NIL type="lambda" unit="cm" value="20.7522" />
-  <D type="density" unit="g/cm3" value="9.321" />
-  <composite n="1" ref="Tm" />
- </material>
- <element Z="92" formula="U" name="U" >
-  <atom type="A" unit="g/mol" value="238.029" />
- </element>
- <material formula="U" name="Uranium" state="solid" >
-  <RL type="X0" unit="cm" value="0.31663" />
-  <NIL type="lambda" unit="cm" value="11.4473" />
-  <D type="density" unit="g/cm3" value="18.95" />
-  <composite n="1" ref="U" />
- </material>
- <element Z="23" formula="V" name="V" >
-  <atom type="A" unit="g/mol" value="50.9415" />
- </element>
- <material formula="V" name="Vanadium" state="solid" >
-  <RL type="X0" unit="cm" value="2.59285" />
-  <NIL type="lambda" unit="cm" value="21.2187" />
-  <D type="density" unit="g/cm3" value="6.11" />
-  <composite n="1" ref="V" />
- </material>
- <element Z="74" formula="W" name="W" >
-  <atom type="A" unit="g/mol" value="183.842" />
- </element>
- <material formula="W" name="Tungsten" state="solid" >
-  <RL type="X0" unit="cm" value="0.350418" />
-  <NIL type="lambda" unit="cm" value="10.3057" />
-  <D type="density" unit="g/cm3" value="19.3" />
-  <composite n="1" ref="W" />
- </material>
- <element Z="54" formula="Xe" name="Xe" >
-  <atom type="A" unit="g/mol" value="131.292" />
- </element>
- <material formula="Xe" name="Xenon" state="gas" >
-  <RL type="X0" unit="cm" value="1546.2" />
-  <NIL type="lambda" unit="cm" value="32477.9" />
-  <D type="density" unit="g/cm3" value="0.00548536" />
-  <composite n="1" ref="Xe" />
- </material>
- <element Z="39" formula="Y" name="Y" >
-  <atom type="A" unit="g/mol" value="88.9058" />
- </element>
- <material formula="Y" name="Yttrium" state="solid" >
-  <RL type="X0" unit="cm" value="2.32943" />
-  <NIL type="lambda" unit="cm" value="34.9297" />
-  <D type="density" unit="g/cm3" value="4.469" />
-  <composite n="1" ref="Y" />
- </material>
- <element Z="70" formula="Yb" name="Yb" >
-  <atom type="A" unit="g/mol" value="173.038" />
- </element>
- <material formula="Yb" name="Ytterbium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04332" />
-  <NIL type="lambda" unit="cm" value="28.9843" />
-  <D type="density" unit="g/cm3" value="6.73" />
-  <composite n="1" ref="Yb" />
- </material>
- <element Z="30" formula="Zn" name="Zn" >
-  <atom type="A" unit="g/mol" value="65.3955" />
- </element>
- <material formula="Zn" name="Zinc" state="solid" >
-  <RL type="X0" unit="cm" value="1.74286" />
-  <NIL type="lambda" unit="cm" value="19.8488" />
-  <D type="density" unit="g/cm3" value="7.133" />
-  <composite n="1" ref="Zn" />
- </material>
- <element Z="40" formula="Zr" name="Zr" >
-  <atom type="A" unit="g/mol" value="91.2236" />
- </element>
- <material formula="Zr" name="Zirconium" state="solid" >
-  <RL type="X0" unit="cm" value="1.56707" />
-  <NIL type="lambda" unit="cm" value="24.2568" />
-  <D type="density" unit="g/cm3" value="6.506" />
-  <composite n="1" ref="Zr" />
- </material>
-</materials>
\ No newline at end of file
diff --git a/examples/CLICSiD/compact/materials.xml b/examples/CLICSiD/compact/materials.xml
deleted file mode 100644
index cb555a186..000000000
--- a/examples/CLICSiD/compact/materials.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<materials>
-
-  <!--
-       Air by weight from
-
-       http://www.engineeringtoolbox.com/air-composition-24_212.html
-  -->
-  <material name="Air">
-    <D type="density" unit="g/cm3" value="0.0012"/>
-    <fraction n="0.754" ref="N"/>
-    <fraction n="0.234" ref="O"/>
-    <fraction n="0.012" ref="Ar"/>
-  </material>
-  
-  <!-- We model vakuum just as very thin air -->
-  <material name="Vacuum">  
-    <D type="density" unit="g/cm3" value="0.0000000001" />
-    <fraction n="0.754" ref="N"/>
-    <fraction n="0.234" ref="O"/>
-    <fraction n="0.012" ref="Ar"/>
-  </material>
-
-  <material name="Epoxy">
-    <D type="density" value="1.3" unit="g/cm3"/>
-    <composite n="44" ref="H"/>
-    <composite n="15" ref="C"/>
-    <composite n="7" ref="O"/>
-  </material>
-
-  <material name="Quartz">
-    <D type="density" value="2.2" unit="g/cm3"/>
-    <composite n="1" ref="Si"/>
-    <composite n="2" ref="O"/>
-  </material>
-
-  <material name="G10">
-    <D type="density" value="1.7" unit="g/cm3"/>
-    <fraction n="0.08" ref="Cl"/>
-    <fraction n="0.773" ref="Quartz"/>
-    <fraction n="0.147" ref="Epoxy"/>
-  </material>
-
-  <material name="Polystyrene">
-    <D value="1.032" unit="g/cm3"/>
-    <composite n="19" ref="C"/>
-    <composite n="21" ref="H"/>
-  </material>
-
-  <material name="Steel235">
-    <D value="7.85" unit="g/cm3"/>
-    <fraction n="0.998" ref="Fe"/>
-    <fraction n=".002" ref="C"/>
-  </material>
-
-  <material name="SiliconOxide">
-    <D type="density" value="2.65" unit="g/cm3"/>
-    <composite n="1" ref="Si"/>
-    <composite n="2" ref="O"/>
-  </material>
-
-  <material name="BoronOxide">
-    <D type="density" value="2.46" unit="g/cm3"/>
-    <composite n="2" ref="B"/>
-    <composite n="3" ref="O"/>
-  </material>
-
-  <material name="SodiumOxide">
-    <D type="density" value="2.65" unit="g/cm3"/>
-    <composite n="2" ref="Na"/>
-    <composite n="1" ref="O"/>
-  </material>
-
-  <material name="AluminumOxide">
-    <D type="density" value="3.89" unit="g/cm3"/>
-    <composite n="2" ref="Al"/>
-    <composite n="3" ref="O"/>
-  </material>
-
-  <material name="PyrexGlass">
-    <D type="density" value="2.23" unit="g/cm3"/>
-    <fraction n="0.806" ref="SiliconOxide"/>
-    <fraction n="0.130" ref="BoronOxide"/>
-    <fraction n="0.040" ref="SodiumOxide"/>
-    <fraction n="0.023" ref="AluminumOxide"/>
-  </material>
-
-  <material name="CarbonFiber">
-    <D type="density" value="1.5" unit="g/cm3"/>
-    <fraction n="0.65" ref="C"/>
-    <fraction n="0.35" ref="Epoxy"/>
-  </material>
-  
-  <material name="CarbonFiber_50D">
-    <D type="density" value="0.75" unit="g/cm3"/>
-    <fraction n="0.65" ref="C"/>
-    <fraction n="0.35" ref="Epoxy"/>
-  </material>  
-
-  <material name="Rohacell31">
-    <D type="density" value="0.032" unit="g/cm3"/>
-    <composite n="9" ref="C"/>
-    <composite n="13" ref="H"/>
-    <composite n="2" ref="O"/>
-    <composite n="1" ref="N"/>
-  </material>
-  
-  <material name="Rohacell31_50D">
-    <D type="density" value="0.016" unit="g/cm3"/>
-    <composite n="9" ref="C"/>
-    <composite n="13" ref="H"/>
-    <composite n="2" ref="O"/>
-    <composite n="1" ref="N"/>
-  </material>  
-
-  <material name="RPCGasDefault" state="gas">
-    <D type="density" value="0.0037" unit="g/cm3"/>
-    <composite n="209" ref="C"/>
-    <composite n="239" ref="H"/>
-    <composite n="381" ref="F"/>
-  </material>
-
-  <material name="PolystyreneFoam">
-    <D type="density" value="0.0056" unit="g/cm3"/>
-    <fraction n="1.0" ref="Polystyrene"/>
-  </material>
-
-  <material name="Kapton">
-    <D value="1.43" unit="g/cm3" />
-    <composite n="22" ref="C"/>
-    <composite n="10" ref="H" />
-    <composite n="2" ref="N" />
-    <composite n="5" ref="O" />
-  </material>
-
-  <material name="PEEK">
-    <D value="1.37" unit="g/cm3" />
-    <composite n="19" ref="C"/>
-    <composite n="12" ref="H" />
-    <composite n="3" ref="O" />
-  </material>
-
-</materials>
diff --git a/examples/ClientTests/compact/Assemblies.xml b/examples/ClientTests/compact/Assemblies.xml
index f55de5bfd..05162d2c3 100644
--- a/examples/ClientTests/compact/Assemblies.xml
+++ b/examples/ClientTests/compact/Assemblies.xml
@@ -12,8 +12,8 @@
   </info>
   
   <includes>
-    <gdmlFile  ref="elements.xml"/>
-    <gdmlFile  ref="materials.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
   </includes>
   
   <define>
diff --git a/examples/ClientTests/compact/BoxTrafos.xml b/examples/ClientTests/compact/BoxTrafos.xml
index 58d41b104..1131b7115 100644
--- a/examples/ClientTests/compact/BoxTrafos.xml
+++ b/examples/ClientTests/compact/BoxTrafos.xml
@@ -12,8 +12,8 @@
   </info>
   
   <includes>
-    <gdmlFile  ref="elements.xml"/>
-    <gdmlFile  ref="materials.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
   </includes>
   
   <define>
diff --git a/examples/ClientTests/compact/FCC_HcalBarrel.xml b/examples/ClientTests/compact/FCC_HcalBarrel.xml
index 5d52bb835..24b3d883a 100644
--- a/examples/ClientTests/compact/FCC_HcalBarrel.xml
+++ b/examples/ClientTests/compact/FCC_HcalBarrel.xml
@@ -4,8 +4,8 @@
     xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
 
     <includes>
-        <gdmlFile  ref="elements.xml"/>
-        <gdmlFile  ref="materials.xml"/>
+        <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+        <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
     </includes>
 
     <define>
diff --git a/examples/ClientTests/compact/IronCylinder.xml b/examples/ClientTests/compact/IronCylinder.xml
index 1a601f1d6..1659db583 100644
--- a/examples/ClientTests/compact/IronCylinder.xml
+++ b/examples/ClientTests/compact/IronCylinder.xml
@@ -4,8 +4,8 @@
        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
 
   <includes>
-    <gdmlFile  ref="elements.xml"/>
-    <gdmlFile  ref="materials.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
   </includes>
 
   <define>
diff --git a/examples/ClientTests/compact/MagnetFields.xml b/examples/ClientTests/compact/MagnetFields.xml
index 9960e9d20..05997b2c2 100644
--- a/examples/ClientTests/compact/MagnetFields.xml
+++ b/examples/ClientTests/compact/MagnetFields.xml
@@ -1,1567 +1,64 @@
 <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">
+       xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
 
-    <info name="clic_sid_cdr"
+  <info name="clic_sid_cdr"
         title="CLIC Silicon Detector CDR"
         author="Christian Grefe"
         url="https://twiki.cern.ch/twiki/bin/view/CLIC/ClicSidCdr"
         status="development"
         version="$Id: compact.xml 1368 2014-11-03 20:15:27Z markus.frank@cern.ch $">
-        <comment>The compact format for the CLIC Silicon Detector used for the conceptual design report</comment>        
-    </info>
-
-    <includes>
-        <gdmlFile  ref="elements.xml"/>
-        <gdmlFile  ref="materials.xml"/>
-        <pyBuilder ref="../drivers"/>
-    </includes>
-    
-    <define>
-        <constant name="world_side" value="30000*mm"/>
-        <constant name="world_x" value="world_side"/>
-        <constant name="world_y" value="world_side"/>
-        <constant name="world_z" value="world_side"/>
-        
-        <constant name="CrossingAngle" value="0.020*rad"/>
-        
-        <constant name="CaloSides" value="12"/>
-        <constant name="MuonSides" value="8"/>
-        
-        <constant name="EcalBarrel_rmin" value="126.50*cm + world_side - world_side"/>
-        <constant name="EcalBarrel_rmin" value="126.50*cm"/>
-        <constant name="EcalBarrel_zmax" value="176.50*cm"/>
-        <constant name="EcalEndcap_rmin" value="21.0*cm"/>
-	<!-- Correction from going from inner circle to outer circle -->
-        <constant name="EcalEndcap_rmax" value="(EcalBarrel_rmin - 1.5*cm) / (cos(pi/CaloSides))"/> 
-        <constant name="EcalEndcap_zmin" value="165.70*cm"/>
-        
-        <constant name="HcalBarrel_rmin" value="141.90*cm"/>
-        <constant name="HcalBarrel_layers" value="(int) 75"/>
-        <constant name="HcalBarrel_layer_thickness" value="1.0*cm + 0.65*cm"/>
-        <constant name="HcalEndcap_zmin" value="EcalBarrel_zmax + 4.0*cm"/> <!-- Gap for cables -->
-        <constant name="HcalEndcap_rmin" value="50.0*cm"/>
-	<!-- Correction from going from inner circle to outer circle -->
-        <constant name="HcalEndcap_rmax" value="(HcalBarrel_rmin + HcalBarrel_layers * HcalBarrel_layer_thickness) / (cos(pi/CaloSides))"/>
-        <constant name="HcalEndcap_layers" value="60"/>
-        <constant name="HcalEndcap_layer_thickness" value="2.0*cm + 0.65*cm"/>
-        <constant name="HcalEndcap_zmax" value="HcalEndcap_zmin + HcalEndcap_layers * HcalEndcap_layer_thickness"/>
-        
-        <constant name="tracking_region_radius" value="EcalBarrel_rmin - 1.0*mm"/>
-        <constant name="tracking_region_zmax" value="EcalEndcap_zmin - 1.0*mm"/>
-        <constant name="VXD_CF_sensor" value="0.026*cm"/>
-        <constant name="VXD_CF_support" value="0.05*cm"/>
-        
-        <constant name="SolenoidBarrelInnerRadius" value="HcalEndcap_rmax + 2.0*cm"/>
-        <constant name="SolenoidCoilOuterZ" value="HcalEndcap_zmax"/> <!-- Aligned with HCAL endcap -->
-        <constant name="SolenoidBarrelInnerCryostatThickness" value="3.0*cm"/>
-        <constant name="SolenoidBarrelInnerAirgapThickness" value="11.0*cm"/>
-        <constant name="SolenoidBarrelAlConductorThickness" value="38.4*cm"/>
-        <constant name="SolenoidBarrelQuenchbackThickness" value="5.0*cm"/>
-        <constant name="SolenoidBarrelOuterAirgapThickness" value="18.7*cm"/>
-        <constant name="SolenoidBarrelOuterCryostatThickness" value="4.0*cm"/>
-        <constant name="SolenoidEndcapCryostatThickness" value="6.0*cm"/>
-        <constant name="SolenoidEndcapAirgapThickness" value="12.0*cm"/>
-        <constant name="SolenoidBarrelOuterZ" value="SolenoidCoilOuterZ+SolenoidEndcapAirgapThickness"/>
-        <constant name="SolenoidBarrelConductorInnerRadius" value="SolenoidBarrelInnerRadius + SolenoidBarrelInnerCryostatThickness + SolenoidBarrelInnerAirgapThickness"/>
-        <constant name="SolenoidBarrelOuterCryostatInnerRadius" value="SolenoidBarrelConductorInnerRadius + SolenoidBarrelAlConductorThickness + SolenoidBarrelQuenchbackThickness"/>
-        <constant name="SolenoidBarrelOuterRadius" value="SolenoidBarrelOuterCryostatInnerRadius + SolenoidBarrelOuterAirgapThickness + SolenoidBarrelOuterCryostatThickness"/>
-        <constant name="SolenoidalFieldRadius" value="(SolenoidBarrelConductorInnerRadius + SolenoidBarrelAlConductorThickness / 2.0)"/>
-        
-        <constant name="MuonBarrel_rmin" value="SolenoidBarrelOuterRadius + 1.0*cm"/>
-        <constant name="MuonBarrel_zmax" value="SolenoidBarrelOuterZ + SolenoidEndcapCryostatThickness"/>
-        <constant name="MuonBarrel_layers" value="15"/>
-        <constant name="MuonBarrel_layer_thickness" value="10.0*cm + 4.0*cm"/>
-        <constant name="MuonEndcap_zmin" value="MuonBarrel_zmax + 10.0*cm"/> <!-- Space for cables etc. -->
-        <constant name="MuonEndcap_rmin" value="69.0*cm"/> <!-- Space for QD0 and anti-solenoid-->
-	<!-- Correction from going from inner circle to outer circle -->
-        <constant name="MuonEndcap_rmax" value="(MuonBarrel_rmin + 57.0*cm + MuonBarrel_layers * MuonBarrel_layer_thickness) / (cos(pi/MuonSides))"/> 
-        <constant name="MuonEndcap_layers" value="18"/>
-        <constant name="MuonEndcap_layer_thickness" value="10.0*cm + 4.0*cm"/>
-        <constant name="MuonEndcap_zmax" value="MuonEndcap_zmin + MuonEndcap_layers * MuonEndcap_layer_thickness"/>
-        
-        <constant name="LumiCal_rmin" value="6.4*cm"/>
-        <constant name="LumiCal_rmax" value="EcalEndcap_rmin + 3.0*cm"/>
-        <constant name="LumiCal_zmin" value="HcalEndcap_zmin"/>
-        <constant name="LumiCal_thickness" value="20*0.371*cm + 15*0.643*cm"/>
-        <constant name="LumiCal_zmax" value="LumiCal_zmin + LumiCal_thickness"/>
-        <constant name="LumiCalElectronics_rmax" value="LumiCal_rmax+5.0*cm"/>
-        
-        <constant name="SupportTube_thickness" value="1.0*cm"/>
-        <constant name="ForwardVacuumValve_thickness" value="36.0*cm"/>
-        <constant name="ForwardShielding_thickness" value="5.0*cm"/>
-        <constant name="ForwardMask_thickness" value="10.0*cm"/>
-        <constant name="ForwardMask_zmin" value="LumiCal_zmax + ForwardShielding_thickness + ForwardVacuumValve_thickness"/>
-        <constant name="BeamCal_rmax" value="13.0*cm"/>
-        <constant name="BeamCal_zmin" value="ForwardMask_zmin + ForwardMask_thickness"/>
-        
-        <constant name="VertexSupport_r1" value="16.87*cm"/>
-        <constant name="VertexSupport_r2" value="18.42*cm"/>
-        <constant name="VertexSupport_zmax" value="89.48*cm"/>
-        
-        <constant name="VertexBarrel_zmax" value="10.0*cm"/>
-        <constant name="VertexBarrel_r1" value="2.7*cm"/>
-        <constant name="VertexBarrel_r2" value="3.8*cm"/>
-        <constant name="VertexBarrel_r3" value="5.1*cm"/>
-        <constant name="VertexBarrel_r4" value="6.4*cm"/>
-        <constant name="VertexBarrel_r5" value="7.7*cm"/>
-        
-        <constant name="CentralBeamPipe_zmax" value="23.0*cm"/>
-        <constant name="CentralBeamPipe_rmax" value="VertexBarrel_r1 - 0.2*cm"/>
-        <constant name="CentralBeamPipe_thickness" value="CentralBeamPipe_rmax * 0.02"/> <!-- 1% of the diameter -->
-        <constant name="CentralBeamPipe_rmin" value="CentralBeamPipe_rmax - CentralBeamPipe_thickness"/>
-        <constant name="BeamPipe_thickness" value="0.4*cm"/>
-        <constant name="BeamPipe_endThickness" value="0.1*cm"/>
-        <constant name="BeamPipe_zmax" value="LumiCal_zmin - 0.5*cm"/>
-        <constant name="BeamPipe_rmax" value="19.0*cm"/>
-        <constant name="BeamPipe_rmin" value="BeamPipe_rmax - BeamPipe_thickness"/>
-        <constant name="bp_cone_slope" value="(BeamPipe_rmax-CentralBeamPipe_rmax)/(tracking_region_zmax-CentralBeamPipe_zmax)"/>
-        <constant name="BeamPipe_zmin" value="CentralBeamPipe_zmax + (BeamPipe_thickness - CentralBeamPipe_thickness)/bp_cone_slope"/>
-        <constant name="BeamPipeLiner_thickness" value="0.0*cm"/>
-        
-        <constant name="VertexEndcap_rmax" value="11.5*cm"/>
-        <constant name="VertexEndcap_z1" value="12.0*cm"/>
-        <constant name="VertexEndcap_z2" value="16.0*cm"/>
-        <constant name="VertexEndcap_z3" value="20.0*cm"/>
-        <constant name="VertexEndcap_z4" value="24.0*cm"/>
-        <constant name="VertexEndcap_offset" value="0.2*cm"/>
-        <constant name="VertexEndcapModules" value="16"/>
-        <constant name="VertexEndcap_rmin1" value="CentralBeamPipe_rmax + VertexEndcap_offset"/>
-        <constant name="VertexEndcap_rmin2" value="CentralBeamPipe_rmax + VertexEndcap_offset"/>
-        <constant name="VertexEndcap_rmin3" value="CentralBeamPipe_rmax + VertexEndcap_offset"/>
-        <constant name="VertexEndcap_rmin4" value="(VertexEndcap_z4 - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexEndcap_offset"/>
-        
-        <constant name="ForwardTracker_rmax" value="16.87*cm"/>
-        <constant name="ForwardTracker_z1" value="28.0*cm"/>
-        <constant name="ForwardTracker_z2" value="50.0*cm"/>
-        <constant name="ForwardTracker_z3" value="83.0*cm"/>
-        <constant name="ForwardTracker_offset" value="0.2*cm"/>
-        <constant name="ForwardTrackerModules" value="16"/>
-        <constant name="ForwardTracker_rmin1" value="(ForwardTracker_z1 - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + ForwardTracker_offset"/>
-        <constant name="ForwardTracker_rmin2" value="(ForwardTracker_z2 - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + ForwardTracker_offset"/>
-        <constant name="ForwardTracker_rmin3" value="(ForwardTracker_z3 - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + ForwardTracker_offset"/>
-        
-        <constant name="VertexService_zmin" value="ForwardTracker_z1 + 1.0*cm"/>
-        <constant name="VertexService_zmax" value="VertexService_zmin + 2.0*cm"/>
-        <constant name="VertexServiceThickness" value="0.3*cm"/>
-        <constant name="VertexCableThickness" value="0.005*cm"/>
-        
-        <constant name="IncomingBP_radius" value="0.25*cm"/>
-        <constant name="IncomingBP_thickness" value="0.05*cm"/>
-        <constant name="OutgoingBP_radius" value="tan(CrossingAngle/2/rad)*BeamCal_zmin"/>
-        <constant name="OutgoingBP_thickness" value="0.1*cm"/>
-        
-    </define>
-    <materials>
-        <material name="TungstenDens23">
-            <D value="17.7" unit="g/cm3"/>
-            <fraction n="0.925" ref="W"/>
-            <fraction n="0.066" ref="Ni"/>
-            <fraction n="0.009" ref="Fe"/>
-        </material>
-        <material name="TungstenDens24">
-            <D value="17.8" unit="g/cm3"/>
-            <fraction n="0.93" ref="W"/>
-            <fraction n="0.061" ref="Ni"/>
-            <fraction n="0.009" ref="Fe"/>
-        </material>
-        <material name="TungstenDens25">
-            <D value="18.2" unit="g/cm3"/>
-            <fraction n="0.950" ref="W"/>
-            <fraction n="0.044" ref="Ni"/>
-            <fraction n="0.006" ref="Fe"/>
-        </material>
-        <material name="CarbonFiber_25percent">
-            <D type="density" value="0.375" unit="g/cm3"/>
-            <fraction n="1.0" ref="CarbonFiber"/>
-        </material>
-        <material name="CarbonFiber_15percent">
-            <D type="density" value="0.225" unit="g/cm3"/>
-            <fraction n="1.0" ref="CarbonFiber"/>
-        </material>
-        <material name="Rohacell31_50percent">
-            <D type="density" value="0.016" unit="g/cm3"/>
-            <fraction n="1.0" ref="Rohacell31"/>
-        </material>
-        <material name="Rohacell31_15percent">
-            <D type="density" value="0.0048" unit="g/cm3"/>
-            <fraction n="1.0" ref="Rohacell31"/>
-        </material>
-        <material name="BoratedPolyethylene5">
-            <D value="0.93" unit="g/cm3"/>
-            <fraction n="0.612" ref="C"/>
-            <fraction n="0.222" ref="O"/>
-            <fraction n="0.116" ref="H"/>
-            <fraction n="0.050" ref="B"/>
-        </material>
-        <material name="SiliconCarbide">
-            <D value="3.1" unit="g/cm3"/>
-            <composite n="1" ref="Si"/>
-            <composite n="1" ref="C"/>
-        </material> 
-        <material name="SiliconCarbide_6percent">
-            <D value="0.186" unit="g/cm3"/>
-            <fraction n="1.0" ref="SiliconCarbide"/>
-        </material>
-        <material name="Graphite">
-        	<D value="1.7" unit="g/cm3"/>
-        	<composite n="1" ref="C"/>
-        </material>      
-    </materials>
-    <limits>
-        <limitset name="cal_limits">
-            <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
-        </limitset>
-    </limits>
-
-    <display>
-        <vis name="InvisibleNoDaughters"      showDaughters="false" visible="false"/>
-        <vis name="InvisibleWithDaughters"    showDaughters="true" visible="false"/>
-        <vis name="SiVertexBarrelModuleVis" alpha="1.0" r="1" g="1" b="0.6" drawingStyle="wireframe" showDaughters="true" visible="true"/>
-        <vis name="SiVertexSensitiveVis" alpha="1.0" r="1" g="0.2" b="0.2" drawingStyle="solid" showDaughters="true" visible="true"/>
-        <vis name="SiVertexPassiveVis"   alpha="1.0" r="0" g="0.2" b="1" drawingStyle="solid" showDaughters="true" visible="true"/>
-        <vis name="SiVertexBarrelLayerVis" alpha="1.0" r="1" g="1" b="0.6" showDaughters="true" visible="false"/>
-        
-        <vis name="SiVertexEndcapLayerVis" alpha="1.0" r="1" g="0.75" b="0" showDaughters="false" visible="true"/>
-
-        <vis name="SiTrackerBarrelModuleVis" alpha="1.0" r="0" g="1" b="0.6" drawingStyle="wireframe" showDaughters="false" visible="true"/>
-        <vis name="SiTrackerBarrelLayerVis" alpha="1.0" r="1" g="1" b="0.6" showDaughters="true" visible="true"/>
-        
-        <vis name="SiTrackerEndcapModuleVis" alpha="0.1" r="0.8" g="1.0" b="0.1" drawingStyle="wireframe" showDaughters="false" visible="true"/>        
-            
-        <vis name="SiTrackerForwardVis" alpha="1.0" r="0.8" g="0.1" b="0.1" showDaughters="false" visible="true"/>
-            
-        <vis name="EcalBarrelVis" alpha="1.0" r="0" g="0" b="0.3" showDaughters="true" visible="true"/>
-        <vis name="EcalBarrelStaveVis" alpha="1.0" r="1" g="0.9" b="0.5" showDaughters="false" visible="true"/>
-
-        <vis name="EcalEndcapVis"       alpha="1" r="0.77" g="0.74" b="0.86" showDaughters="false" visible="true"/>
-
-        <vis name="HcalBarrelVis"          alpha="1" r="1"    g="1"    b="0.1" showDaughters="true" visible="true"/>
-        <vis name="HcalBarrelStavesVis"    alpha="1" r="1"    g="0"    b="0.3" showDaughters="true" visible="true"/>
-        <vis name="HcalBarrelLayerVis"     alpha="1" r="1"    g="0"    b="0.5" showDaughters="true" visible="true"/>
-        <vis name="HcalBarrelSensorVis"    alpha="1" r="1"    g="1"    b="0.7" showDaughters="true" visible="true"/>
-
-        <vis name="HcalEndcapVis"          alpha="1" r="1"    g="1"    b="0.1" showDaughters="false" visible="true"/>
-        <vis name="HcalEndcapLayerVis"     alpha="1" r="1"    g="0"    b="0.5" showDaughters="false" visible="true"/>
-        
-        <vis name="SolenoidBarrelLayerVis" alpha="1" r="0"    g="0.3"  b="0.3" showDaughters="false" visible="true"/>
-        <vis name="SolenoidCoilEndsVis"    alpha="1" r="0"    g="0.9"  b="0.9" showDaughters="false" visible="true"/>
-        <vis name="AntiSolenoidVis"        alpha="1" r="0.3"  g="1"    b="1"   showDaughters="false" visible="true"/>
-
-        <vis name="MuonBarrelVis"          alpha="1" r="1"    g="0.4"  b="0.62" showDaughters="true" visible="true"/>
-        <vis name="MuonBarrelStavesVis"    alpha="1" r="0"    g="0.7"  b="0.3" showDaughters="true" visible="true"/>
-        <vis name="MuonBarrelLayerVis"     alpha="1" r="0"    g="1"    b="0.3" showDaughters="true" visible="true"/>
-        <vis name="MuonBarrelSensorVis"    alpha="1" r="0.54" g="0.4"  b="0.41" visible="true"/>
-        <vis name="MuonBarrelAbsorberVis"  alpha="1" r="0.28" g="0.4"  b="0.62" visible="true"/>        
-
-        <vis name="MuonEndcapVis"          alpha="1" r="1"    g="0.4"  b="0.62" showDaughters="true" visible="true"/>
-        <vis name="MuonEndcapLayerVis"     alpha="1" r="0"    g="1"    b="0.3"  showDaughters="true" visible="true"/>
-        <vis name="MuonEndcapSensorVis"    alpha="1" r="0.54" g="0.4"  b="0.41" visible="true"/>
-        <vis name="MuonEndcapAbsorberVis"  alpha="1" r="0.28" g="0.4"  b="0.62" visible="true"/>        
-                       
-        
-        <vis name="BeamPipeVis" r="0.0" g="0.99" b="0.0" showDaughters="false" visible="true"/>
-        <vis name="CableVis" showDaughters="false" visible="true"/>
-        
-        <vis name="SupportTubeVis" r="0.1" g="0.1" b="0.99" showDaughters="false" visible="true"/>
-        <vis name="TungstenShieldingVis" r="0.99" g="0.1" b="0.2" showDaughters="false" visible="true"/>
-        
-        <vis name="SupportVis" r="0.8" g="0.8" b="0" showDaughters="false" visible="true"/>
-        <vis name="LumiCalVis" showDaughters="false" visible="true"/>
-        <vis name="GreenVis" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true"/>
-        <vis name="RedVis" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
-        <vis name="BlueVis" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
-    </display>
-
-
-
-    <detectors>
-
-        <comment>Trackers</comment> 
-	<include ref="VertexBarrel.xml"/>
-
-        <comment>Vertex Detector Endcaps</comment>
-        <detector id="2" name="SiVertexEndcap" type="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"/>
-                <module_component thickness="0.013*cm"   material="Carbon" vis="SiVertexPassiveVis" />
-            </module>
-            <module name="SiVertexEndcapModule2">
-                <trd x1="VertexEndcap_rmin2 * tan(pi/(VertexEndcapModules-0.1))" x2="VertexEndcap_rmax * sin(pi/(VertexEndcapModules-0.1*cm))" z="(VertexEndcap_rmax - VertexEndcap_rmin2) / 2" />
-                <module_component thickness="0.005*cm" material="Silicon" sensitive="true"  vis="SiVertexSensitiveVis"/>
-                <module_component thickness="0.013*cm"   material="Carbon" vis="SiVertexPassiveVis" />
-            </module>
-            <module name="SiVertexEndcapModule3">
-                <trd x1="VertexEndcap_rmin3 * tan(pi/(VertexEndcapModules-0.1))" x2="VertexEndcap_rmax * sin(pi/(VertexEndcapModules-0.1*cm))" z="(VertexEndcap_rmax - VertexEndcap_rmin3) / 2" />
-                <module_component thickness="0.005*cm" material="Silicon" sensitive="true"  vis="SiVertexSensitiveVis"/>
-                <module_component thickness="0.013*cm"   material="Carbon" vis="SiVertexPassiveVis" />
-            </module>
-            <module name="SiVertexEndcapModule4">
-                <trd x1="VertexEndcap_rmin4 * tan(pi/(VertexEndcapModules-0.1))" x2="VertexEndcap_rmax * sin(pi/(VertexEndcapModules-0.1*cm))" z="(VertexEndcap_rmax - VertexEndcap_rmin4) / 2" />
-                <module_component thickness="0.005*cm" material="Silicon" sensitive="true"  vis="SiVertexSensitiveVis"/>
-                <module_component thickness="0.013*cm"   material="Carbon"  vis="SiVertexPassiveVis"/>
-            </module>
-            <layer id="1"  vis="SiVertexEndcapLayerVis">
-                <ring r="(VertexEndcap_rmax + VertexEndcap_rmin1) / 2" zstart="VertexEndcap_z1" nmodules="(int) VertexEndcapModules" dz="0.011*cm" module="SiVertexEndcapModule1"/>
-            </layer>
-            <layer id="2"  vis="SiVertexEndcapLayerVis">
-                <ring r="(VertexEndcap_rmax + VertexEndcap_rmin2) / 2" zstart="VertexEndcap_z2" nmodules="(int) VertexEndcapModules" dz="0.011*cm" module="SiVertexEndcapModule2"/>
-            </layer>
-            <layer id="3"  vis="SiVertexEndcapLayerVis">
-                <ring r="(VertexEndcap_rmax + VertexEndcap_rmin3) / 2" zstart="VertexEndcap_z3" nmodules="(int) VertexEndcapModules" dz="0.011*cm" module="SiVertexEndcapModule3"/>
-            </layer>
-            <layer id="4"  vis="SiVertexEndcapLayerVis">
-                <ring r="(VertexEndcap_rmax + VertexEndcap_rmin4) / 2" zstart="VertexEndcap_z4" nmodules="(int) VertexEndcapModules" dz="0.011*cm" module="SiVertexEndcapModule4"/>
-            </layer>
-        </detector> 
-
-        <detector id="3" name="SiTrackerBarrel" type="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"/>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031*mm" length="92.031*mm" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0038*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00038*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <module name="SiTrackerModule_Layer2" vis="SiTrackerBarrelModuleVis">                
-                <module_envelope width="97.79*mm" length="97.79*mm" thickness="0.3*cm"/>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031*mm" length="92.031*mm" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0051*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00052*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <module name="SiTrackerModule_Layer3" vis="SiTrackerBarrelModuleVis">                
-                <module_envelope width="97.79*mm" length="97.79*mm" thickness="0.3*cm"/>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031*mm" length="92.031*mm" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0064*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00065*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <module name="SiTrackerModule_Layer4" vis="SiTrackerBarrelModuleVis">                
-                <module_envelope width="97.79*mm" length="97.79*mm" thickness="0.3*cm"/>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>               
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031*mm" length="92.031*mm" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0078*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00079*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <module name="SiTrackerModule_Layer5" vis="SiTrackerBarrelModuleVis">                
-                <module_envelope width="97.79*mm" length="97.79*mm" thickness="0.3*cm"/>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.02*cm" material="PEEK" sensitive="false">
-                    <position z="-0.14*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="-0.122*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.18*cm" material="Rohacell31_50D" sensitive="false">
-                    <position z="-0.024*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0175*cm" material="Epoxy" sensitive="false">
-                    <position z="0.07475*cm" />
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.016*cm" material="CarbonFiber_50D" sensitive="false">
-                    <position z="0.0915*cm" />
-                </module_component>                
-                <module_component width="92.031*mm" length="92.031*mm" thickness="0.03*cm" material="Silicon" sensitive="true">
-                    <position z="0.1145*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00048*cm" material="Silicon" sensitive="false">
-                    <position z="0.12974*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.0091*cm" material="Kapton" sensitive="false">
-                    <position z="0.1375*cm"/>
-                </module_component>                
-                <module_component width="97.79*mm" length="97.79*mm" thickness="0.00093*cm" material="Copper" sensitive="false">
-                    <position z="0.146*cm"/>
-                </module_component>                
-            </module>
-            <layer module="SiTrackerModule_Layer1" id="1" vis="SiTrackerBarrelLayerVis">
-                <barrel_envelope inner_r="215.075*mm" outer_r="245.0*mm" z_length="578 * 2*mm"/>
-                <rphi_layout phi_tilt="0.17506*rad" nphi="20" phi0="0." rc="(216.355 + 5.0)*mm" dr="0.0"/>
-                <z_layout dr="4.0*mm" z0="512.128*mm" nz="13"/>
-            </layer>                
-            <layer module="SiTrackerModule_Layer2" id="2" vis="SiTrackerBarrelLayerVis">
-                <barrel_envelope inner_r="465.075*mm" outer_r="501.0*mm" z_length="749.8 * 2*mm"/>
-                <rphi_layout phi_tilt="0.12217*rad" nphi="38" phi0="0.087*rad" rc="(466.355 + 5.0)*mm" dr="0.0"/>
-                <z_layout dr="4.0*mm" z0="690.605*mm" nz="17"/>
-            </layer>
-            <layer module="SiTrackerModule_Layer3" id="3" vis="SiTrackerBarrelLayerVis">
-                <barrel_envelope inner_r="715.075*mm" outer_r="756.0*mm" z_length="1013.9 * 2*mm"/>
-                <rphi_layout phi_tilt="0.11493*rad" nphi="58" phi0="0.058*rad" rc="(716.355 + 5.0)*mm" dr="0.0"/>
-                <z_layout dr="4.0*mm" z0="954.625*mm" nz="23"/>
-            </layer>            
-            <layer module="SiTrackerModule_Layer4" id="4" vis="SiTrackerBarrelLayerVis">
-                <barrel_envelope inner_r="965.075*mm" outer_r="1012.0*mm" z_length="1272.3 * 2*mm"/>
-                <rphi_layout phi_tilt="0.11502*rad" nphi="80" phi0="0.0436*rad" rc="(966.355 + 5.0)*mm" dr="0.0"/>
-                <z_layout dr="4.0*mm" z0="1213.073*mm" nz="29"/>
-            </layer>                        
-            <layer module="SiTrackerModule_Layer5" id="5" vis="SiTrackerBarrelLayerVis">
-                <barrel_envelope inner_r="1215.075*mm" outer_r="1263.0*mm" z_length="1535.7 * 2*mm"/>
-                <rphi_layout phi_tilt="0.11467*rad" nphi="102" phi0="0.01745*rad" rc="(1216.355 + 5.0)*mm" dr="0.0"/>
-                <z_layout dr="4.0*mm" z0="1476.497*mm" nz="35"/>
-            </layer>
-        </detector>
-
-        <detector id="4" name="SiTrackerEndcap" type="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" />
-                <module_component thickness="0.00052*cm"   material="Copper" />
-                <module_component thickness="0.0051*cm"   material="Kapton" />
-                <module_component thickness="0.00048*cm" material="Silicon" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.18*cm" material="Rohacell31_50D" />
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.0175*cm" material="Epoxy" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />
-                <module_component thickness="0.00048*cm" material="Silicon" />
-                <module_component thickness="0.0051*cm"   material="Kapton" />
-                <module_component thickness="0.00052*cm"   material="Copper" />
-            </module> 
-            <module name="Module2" vis="SiTrackerEndcapModuleVis">
-                <trd x1="45.245*mm" x2="54.680*mm" z="89.773/2*mm" />
-                <module_component thickness="0.00079*cm"   material="Copper" />
-                <module_component thickness="0.0078*cm"   material="Kapton" />
-                <module_component thickness="0.00048*cm" material="Silicon" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.18*cm" material="Rohacell31_50D" />
-                <module_component thickness="0.016*cm" material="CarbonFiber_50D" />
-                <module_component thickness="0.0175*cm" material="Epoxy" />
-                <module_component thickness="0.03*cm"   material="Silicon" sensitive="true" />
-                <module_component thickness="0.00048*cm" material="Silicon" />
-                <module_component thickness="0.0078*cm"   material="Kapton" />
-                <module_component thickness="0.00079*cm"   material="Copper" />
-            </module>
-            <layer id="1">
-                <ring r="256.716*mm" zstart="(787.105+1.75)*mm" nmodules="24" dz="1.75*mm" module="Module1"/>
-                <ring r="353.991*mm" zstart="(778.776+1.75)*mm" nmodules="32" dz="1.75*mm" module="Module1"/>
-                <ring r="449.180*mm" zstart="(770.544+1.75)*mm" nmodules="40" dz="1.75*mm" module="Module1"/>
-            </layer>
-            <layer id="2">
-                <ring r="256.716*mm" zstart="(1073.293+1.75)*mm" nmodules="24" dz="1.75*mm" module="Module1"/>
-                <ring r="353.991*mm" zstart="(1064.966+1.75)*mm" nmodules="32" dz="1.75*mm" module="Module1"/>
-                <ring r="449.180*mm" zstart="(1056.734+1.75)*mm" nmodules="40" dz="1.75*mm" module="Module1"/>
-                <ring r="538.520*mm" zstart="(1048.466+1.75)*mm" nmodules="40" dz="1.75*mm" module="Module2"/>
-                <ring r="625.654*mm" zstart="(1041.067+1.75)*mm" nmodules="48" dz="1.75*mm" module="Module2"/>
-                <ring r="703.666*mm" zstart="(1033.725+1.75)*mm" nmodules="54" dz="1.75*mm" module="Module2" phi0="pi/54"/>
-            </layer>
-            <layer id="3">
-                <ring r="256.716*mm" zstart="(1353.786+1.75)*mm" nmodules="24" dz="1.75*mm" module="Module1"/>
-                <ring r="353.991*mm" zstart="(1345.457+1.75)*mm" nmodules="32" dz="1.75*mm" module="Module1"/>
-                <ring r="449.180*mm" zstart="(1337.225+1.75)*mm" nmodules="40" dz="1.75*mm" module="Module1"/>
-                <ring r="538.520*mm" zstart="(1328.957+1.75)*mm" nmodules="40" dz="1.75*mm" module="Module2"/>
-                <ring r="625.654*mm" zstart="(1321.558+1.75)*mm" nmodules="48" dz="1.75*mm" module="Module2"/>
-                <ring r="703.666*mm" zstart="(1314.217+1.75)*mm" nmodules="54" dz="1.75*mm" module="Module2" phi0="pi/54"/>
-                <ring r="793.448*mm" zstart="(1306.828+1.75)*mm" nmodules="58" dz="1.75*mm" module="Module2" phi0="pi/58"/>
-                <ring r="874.239*mm" zstart="(1299.486+1.75)*mm" nmodules="64" dz="1.75*mm" module="Module2"/>
-                <ring r="958.364*mm" zstart="(1292.189+1.75)*mm" nmodules="68" dz="1.75*mm" module="Module2"/>
-            </layer>
-            <layer id="4">
-                <ring r="256.716*mm" zstart="(1639.164+1.75)*mm" nmodules="24" dz="1.75*mm" module="Module1"/>
-                <ring r="353.991*mm" zstart="(1630.835+1.75)*mm" nmodules="32" dz="1.75*mm" module="Module1"/>
-                <ring r="449.180*mm" zstart="(1622.603+1.75)*mm" nmodules="40" dz="1.75*mm" module="Module1"/>
-                <ring r="538.520*mm" zstart="(1614.335+1.75)*mm" nmodules="40" dz="1.75*mm" module="Module2"/>
-                <ring r="625.654*mm" zstart="(1606.936+1.75)*mm" nmodules="48" dz="1.75*mm" module="Module2"/>
-                <ring r="703.666*mm" zstart="(1599.595+1.75)*mm" nmodules="54" dz="1.75*mm" module="Module2" phi0="pi/54"/>
-                <ring r="793.448*mm" zstart="(1592.206+1.75)*mm" nmodules="58" dz="1.75*mm" module="Module2" phi0="pi/58"/>
-                <ring r="874.239*mm" zstart="(1584.864+1.75)*mm" nmodules="64" dz="1.75*mm" module="Module2"/>
-                <ring r="958.364*mm" zstart="(1577.567+1.75)*mm" nmodules="68" dz="1.75*mm" module="Module2"/>
-                <ring r="1040.970*mm" zstart="(1570.222+1.75)*mm" nmodules="72" dz="1.75*mm" module="Module2"/>
-                <ring r="1124.167*mm" zstart="(1562.916+1.75)*mm" nmodules="78" dz="1.75*mm" module="Module2" phi0="pi/78"/>
-                <ring r="1206.937*mm" zstart="(1555.647+1.75)*mm" nmodules="84" dz="1.75*mm" module="Module2"/>
-            </layer>
-        </detector>
-        
-        <detector id="5" name="SiTrackerForward" type="SiTrackerEndcap2" readout="SiTrackerForwardHits" reflect="true">    
-            <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" />
-                <module_component thickness="0.005*cm" material="Silicon" sensitive="true" />
-                <module_component thickness="0.013*cm"   material="Carbon" />
-            </module>
-            <module name="SiTrackerForwardModule2">
-                <trd x1="ForwardTracker_rmin2 * tan(pi/(ForwardTrackerModules-0.1))" x2="ForwardTracker_rmax * sin(pi/(ForwardTrackerModules-0.1))" z="(ForwardTracker_rmax - ForwardTracker_rmin2) / 2" />
-                <module_component thickness="0.005*cm" material="Silicon" sensitive="true" />
-                <module_component thickness="0.013*cm"   material="Carbon" />
-            </module>
-            <module name="SiTrackerForwardModule3">
-                <trd x1="ForwardTracker_rmin3 * tan(pi/(ForwardTrackerModules-0.1))" x2="ForwardTracker_rmax * sin(pi/(ForwardTrackerModules-0.1))" z="(ForwardTracker_rmax - ForwardTracker_rmin3) / 2" />
-                <module_component thickness="0.005*cm" material="Silicon" sensitive="true" />
-                <module_component thickness="0.013*cm"   material="Carbon" />
-            </module>
-            <layer id="1">
-                <ring r="(ForwardTracker_rmax + ForwardTracker_rmin1) / 2" zstart="ForwardTracker_z1" nmodules="(int) ForwardTrackerModules" dz="0.011*mm" module="SiTrackerForwardModule1"/>
-            </layer>
-            <layer id="2">
-                <ring r="(ForwardTracker_rmax + ForwardTracker_rmin2) / 2" zstart="ForwardTracker_z2" nmodules="(int) ForwardTrackerModules" dz="0.011*mm" module="SiTrackerForwardModule2"/>
-            </layer>
-            <layer id="3">
-                <ring r="(ForwardTracker_rmax + ForwardTracker_rmin3) / 2" zstart="ForwardTracker_z3" nmodules="(int) ForwardTrackerModules" dz="0.011*mm" module="SiTrackerForwardModule3"/>
-            </layer>
-        </detector>
-
-        <comment>Calorimeters</comment>
-        <detector id="6" name="EcalBarrel" type="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"/>
-            <layer repeat="1">
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>      
-            <layer repeat="20">
-                <slice material = "TungstenDens24" thickness = "0.25*cm" />
-                <slice material = "Air"     thickness = "0.025*cm" />
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>
-            <layer repeat="10">
-                <slice material = "TungstenDens24" thickness = "0.5*cm" />
-                <slice material = "Air"     thickness = "0.025*cm" />
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>
-        </detector>
-
-        <detector id="7" name="EcalEndcap" type="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">
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>       
-            <layer repeat="20">
-                <slice material = "TungstenDens24" thickness = "0.25*cm" />
-                <slice material = "Air"     thickness = "0.025*cm" />
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>
-            <layer repeat="10">
-                <slice material = "TungstenDens24" thickness = "0.5*cm" />
-                <slice material = "Air"     thickness = "0.025*cm" />
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>
-        </detector>
-
-        <detector id="8" name="HcalBarrel" type="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"/>
-            <layer repeat="(int) HcalBarrel_layers">
-                <slice material = "TungstenDens24" thickness = "1.00*cm" />
-                <slice material = "Polystyrene" thickness = "0.50*cm" sensitive = "yes" limits="cal_limits" vis="HcalBarrelSensorVis"/>       
-                <slice material = "Air" thickness = "0.15*cm" />
-            </layer>
-        </detector>
-
-
-        <detector id="9" name="HcalEndcap" type="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">
-                <slice material = "Steel235" thickness = "2.0*cm" />
-                <slice material = "Polystyrene" thickness = "0.50*cm" sensitive = "yes" limits="cal_limits" />        
-                <slice material = "Air" thickness = "0.15*cm" />
-            </layer>
-        </detector>
-
-        <detector id="10" name="HcalPlug" type="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">
-                <slice material="Iron" thickness="15.0*cm"  vis="MuonEndcapAbsorberVis"/>
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes"  vis="MuonEndcapSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes"  vis="MuonEndcapSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="1.0*cm" />
-                <slice material="Iron" thickness="9.0*cm"  vis="MuonEndcapAbsorberVis"/>
-            </layer>
-        </detector>
-
-
-        <detector id="11" name="MuonBarrel" type="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"/>
-
-            <layer repeat="1" vis="MuonBarrelLayerVis">
-            	<slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes" vis="MuonBarrelSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes" vis="MuonBarrelSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="1.0*cm" />
-                <slice material="Iron" thickness="5.0*cm" vis="MuonBarrelAbsorberVis"/>
-           </layer>
-           <layer repeat="1" vis="MuonBarrelLayerVis">
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes" vis="MuonBarrelSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes" vis="MuonBarrelSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="1.0*cm" />
-                <slice material="Iron" thickness="20.0*cm" vis="MuonBarrelAbsorberVis"/>
-            </layer>
-            <layer repeat="(int) MuonBarrel_layers" vis="MuonBarrelLayerVis">
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes" vis="MuonBarrelSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes" vis="MuonBarrelSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="1.0*cm" />
-                <slice material="Iron" thickness="10.0*cm" vis="MuonBarrelAbsorberVis"/>
-            </layer>
-
-            <layer repeat="1" vis="MuonBarrelLayerVis">
-            	<slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes" vis="MuonBarrelSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes" vis="MuonBarrelSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="1.0*cm" />
-            	<slice material="Iron" thickness="20.0*cm" vis="MuonBarrelAbsorberVis"/>
-            </layer>
-        </detector>
-
-        <detector id="12" name="MuonEndcap" type="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">
-                <slice material="Iron" thickness="10.0*cm"  vis="MuonEndcapAbsorberVis"/>
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes"  vis="MuonEndcapSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="RPCGasDefault" thickness="0.2*cm" sensitive="yes"  vis="MuonEndcapSensorVis"/>
-                <slice material="PyrexGlass" thickness="0.2*cm" />
-                <slice material="Air" thickness="0.35*cm" />
-                <slice material="Aluminum" thickness="0.1*cm" />
-                <slice material="Air" thickness="1.0*cm" />
-            </layer>
-        </detector>
-
-        <detector id="13" name="LumiCal" reflect="true" type="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" >
-                <slice material = "TungstenDens24" thickness = "0.271*cm" />
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>
-            <layer repeat="15" >
-                <slice material = "TungstenDens24" thickness = "0.543*cm" />
-                <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
-                <slice material = "Copper"  thickness = "0.005*cm" />
-                <slice material = "Kapton"  thickness = "0.030*cm" />
-                <slice material = "Air"     thickness = "0.033*cm" />
-            </layer>
-        </detector>
-
-        <detector name="LumiReadout_Forward" type="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="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="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" />
-            <layer repeat="50">
-                <slice material="TungstenDens24" thickness="0.271*cm" />
-                <slice material="Silicon" thickness="0.032*cm" sensitive="yes" />
-                <slice material="Copper" thickness="0.005*cm" />
-                <slice material="Kapton" thickness="0.030*cm" />
-                <slice material="Air" thickness="0.033*cm" />
-            </layer>
-        </detector>
-
-        <comment>Dead material and supports</comment>
-        <comment>Beampipe</comment> 
-        <detector name="Beampipe" type="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="PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
-      		<material name="Iron"/>            
-      		<zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
-            		rmax="BeamPipe_rmax"
-            		z="-tracking_region_zmax" /> 
-      		<zplane rmin="CentralBeamPipe_rmin"
-            		rmax="(BeamPipe_zmin - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
-            		z="-BeamPipe_zmin" />
-           	<zplane rmin="CentralBeamPipe_rmin"
-           			rmax="CentralBeamPipe_rmax"
-           			z="-CentralBeamPipe_zmax"/>
-    	</detector>
-    	<detector name="SteelConeZbackward2" type="PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
-      		<material name="Iron"/>            
-            <zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
-            		rmax="BeamPipe_rmax"
-            		z="-(tracking_region_zmax + 0.01*cm)" /> 
-            <zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
-            		rmax="BeamPipe_rmax"
-            		z="- BeamPipe_zmax" />
-            <zplane rmin="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		rmax="BeamPipe_rmax"
-            		z="- (LumiCal_zmin - 2*BeamPipe_endThickness)" />
-            <zplane rmin="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		rmax="LumiCal_rmin - BeamPipe_endThickness"
-            		z="- (LumiCal_zmin - BeamPipe_endThickness)" />
-			<zplane rmin="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		rmax="LumiCal_rmin - BeamPipe_endThickness"
-            		z="- (ForwardMask_zmin - BeamPipe_endThickness)" />
-    	</detector>
-		<detector name="SteelConeZforward" type="PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
-      		<material name="Iron"/>
-      		<zplane rmin="CentralBeamPipe_rmin"
-           			rmax="CentralBeamPipe_rmax"
-           			z="CentralBeamPipe_zmax"/>            
-      		<zplane rmin="CentralBeamPipe_rmin"
-            		rmax="(BeamPipe_zmin - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
-            		z="BeamPipe_zmin" /> 
-      		<zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
-            		rmax="BeamPipe_rmax"
-            		z="tracking_region_zmax" />
-    	</detector>
-    	<detector name="SteelConeZforward2" type="PolyconeSupport" insideTrackingVolume="false" vis="BeamPipeVis">
-      		<material name="Iron"/>            
-            <zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
-            		rmax="BeamPipe_rmax"
-            		z="tracking_region_zmax + 0.01*cm" /> 
-            <zplane rmin="BeamPipe_rmax - BeamPipe_thickness"
-            		rmax="BeamPipe_rmax"
-            		z="BeamPipe_zmax" />
-            <zplane rmin="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		rmax="BeamPipe_rmax"
-            		z="LumiCal_zmin - 2*BeamPipe_endThickness" />
-            <zplane rmin="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		rmax="LumiCal_rmin - BeamPipe_endThickness"
-            		z="LumiCal_zmin - BeamPipe_endThickness" />
-			<zplane rmin="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		rmax="LumiCal_rmin - BeamPipe_endThickness"
-            		z="ForwardMask_zmin - BeamPipe_endThickness" />
-    	</detector>
-
-        <detector name="NorthIncomingBeampipe" type="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="SouthIncomingBeampipe" type="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="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="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>
-
-        <!-- Beam pipe liner is not needed, use thicker conical steel pipe instead
-        <detector name="BeamPipeLiner" type="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" />
-            <zplane rmin="CentralBeamPipe_rmax - BeamPipe_thickness - BeamPipeLiner_thickness" rmax="CentralBeamPipe_rmax - BeamPipe_thickness"  z="-(CentralBeamPipe_zmax + 0.01*cm)"/>
-            <zplane rmin="CentralBeamPipe_rmin - BeamPipeLiner_thickness" rmax="CentralBeamPipe_rmin" z="-CentralBeamPipe_zmax"  />
-            <zplane rmin="CentralBeamPipe_rmin - BeamPipeLiner_thickness" rmax="CentralBeamPipe_rmin" z="CentralBeamPipe_zmax" />
-            <zplane rmin="CentralBeamPipe_rmax - BeamPipe_thickness - BeamPipeLiner_thickness" rmax="CentralBeamPipe_rmax - BeamPipe_thickness" z="CentralBeamPipe_zmax + 0.01*cm" />
-            <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" />
-        </detector>
-        -->
-
-        <detector name="BeamPipeVacuum" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
-            <comment>Vacuum inside beampipe</comment>
-            <material name="Vacuum"/>
-            <zplane rmin="0.*cm"
-            		rmax="BeamPipe_rmax - BeamPipe_thickness - BeamPipeLiner_thickness"
-            		z="-tracking_region_zmax" />
-            <zplane rmin="0.*cm"
-            		rmax="CentralBeamPipe_rmin - BeamPipeLiner_thickness"
-            		z="-BeamPipe_zmin"  />
-            <zplane rmin="0.*cm"
-            		rmax="CentralBeamPipe_rmin - BeamPipeLiner_thickness"
-            		z="BeamPipe_zmin" />
-            <zplane rmin="0.*cm"
-            		rmax="BeamPipe_rmax - BeamPipe_thickness - BeamPipeLiner_thickness"
-            		z="tracking_region_zmax" />
-        </detector>
-        <detector name="ForwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
-            <material name="Vacuum"/>
-            <zplane rmin="0.*cm"
-            		rmax="BeamPipe_rmax - BeamPipe_thickness"
-            		z="tracking_region_zmax + 0.01*cm" /> 
-            <zplane rmin="0.*cm"
-            		rmax="BeamPipe_rmax - BeamPipe_thickness"
-            		z="BeamPipe_zmax" />
-            <zplane rmin="0.*cm"
-            		rmax="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		z="LumiCal_zmin - 2*BeamPipe_endThickness" />
-            <zplane rmin="0.*cm"
-            		rmax="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		z="LumiCal_zmin - BeamPipe_endThickness" />
-	    <zplane rmin="0.*cm"
-            		rmax="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		z="ForwardMask_zmin - BeamPipe_endThickness" />
-        </detector> 
-        <detector name="BackwardVacuum" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
-            <material name="Vacuum"/>
-            <zplane rmin="0.*cm"
-            		rmax="BeamPipe_rmax - BeamPipe_thickness"
-            		z="- (tracking_region_zmax + 0.01*cm)" /> 
-            <zplane rmin="0.*cm"
-            		rmax="BeamPipe_rmax - BeamPipe_thickness"
-            		z="- BeamPipe_zmax" />
-            <zplane rmin="0.*cm"
-            		rmax="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		z="- (LumiCal_zmin - 2*BeamPipe_endThickness)" />
-            <zplane rmin="0.*cm"
-            		rmax="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		z="- (LumiCal_zmin - BeamPipe_endThickness)" />
-			<zplane rmin="0.*cm"
-            		rmax="LumiCal_rmin - 2*BeamPipe_endThickness"
-            		z="- (ForwardMask_zmin - BeamPipe_endThickness)" />
-        </detector>
-        <comment>Vertex Detector Supports and Readout</comment>
-        <detector name="VertexBarrelSupports" type="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"/>
-            </layer>
-            <layer id="7" inner_r = "18.42*cm" outer_z = "89.48*cm">
-                <slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
-            </layer>
-        </detector>
-        <detector name="VertexEndSupports" type="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>
-            <layer id="8" inner_r = "(89.43*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexEndcap_offset" inner_z = "89.43*cm" outer_r = "16.87*cm">
-                <slice material = "CarbonFiber" thickness = "VXD_CF_support" />
-            </layer>
-        </detector>
-        <detector name="VertexReadout" type="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"/>
-            </layer>
-            <layer id="2" inner_r = "VertexBarrel_r2" outer_r="VertexBarrel_r2 + 0.02*cm" inner_z="VertexBarrel_zmax + 0.1*cm" vis = "BlueVis">
-                <slice material = "G10" thickness ="0.5*cm"/>
-            </layer>
-            <layer id="3" inner_r = "VertexBarrel_r3" outer_r="VertexBarrel_r3 + 0.02*cm"  inner_z="VertexBarrel_zmax + 0.1*cm" vis="RedVis">
-                <slice material = "G10" thickness ="0.5*cm"/>
-            </layer>
-            <layer id="4" inner_r = "VertexBarrel_r4" outer_r = "VertexBarrel_r4 + 0.02*cm"  inner_z= "VertexBarrel_zmax + 0.1*cm">
-                <slice material = "G10" thickness ="0.5*cm"/>
-            </layer>
-            <layer id="5" inner_r = "VertexBarrel_r5" outer_r = "VertexBarrel_r5 + 0.02*cm"  inner_z= "VertexBarrel_zmax + 0.1*cm">
-                <slice material = "G10" thickness ="0.5*cm"/>
-            </layer>
-            <layer id="6" inner_r = "VertexBarrel_r1 - 0.1*cm" outer_r = "VertexBarrel_r2"  inner_z= "VertexBarrel_zmax + 0.6*cm">
-                <slice material = "Copper" thickness ="0.0057*cm"/>
-            </layer>
-            <layer id="7" inner_r = "VertexBarrel_r2 - 0.01*cm" outer_r = "VertexBarrel_r3"  inner_z= "VertexBarrel_zmax + 0.6*cm">
-                <slice material = "Copper" thickness ="0.0031*cm"/>
-            </layer>
-            <layer id="8" inner_r = "VertexBarrel_r3 - 0.01*cm" outer_r = "VertexBarrel_r4"  inner_z= "VertexBarrel_zmax + 0.6*cm">
-                <slice material = "Copper" thickness ="0.0016*cm"/>
-            </layer>
-            <layer id="9" inner_r = "VertexBarrel_r4 - 0.01*cm" outer_r = "VertexBarrel_r5"  inner_z= "VertexBarrel_zmax + 0.6*cm">
-                <slice material = "Copper" thickness ="0.0007*cm"/>
-            </layer>
-            <layer id="10" inner_r = "VertexEndcap_rmin1 - 0.1*cm"  outer_r = "VertexEndcap_rmin1 - 0.01*cm" inner_z = "VertexEndcap_z1 - 0.1*cm">
-                <slice material = "G10" thickness = "0.02*cm" />
-            </layer>
-            <layer id="11" inner_r = "VertexEndcap_rmin2 - 0.1*cm"  outer_r = "VertexEndcap_rmin2 - 0.01*cm" inner_z = "VertexEndcap_z2 - 0.1*cm">
-                <slice material = "G10" thickness = "0.02*cm" />
-            </layer>
-            <layer id="12" inner_r = "VertexEndcap_rmin3 - 0.1*cm"  outer_r = "VertexEndcap_rmin3 - 0.01*cm" inner_z = "VertexEndcap_z3 - 0.1*cm">
-                <slice material = "G10" thickness = "0.02*cm" />
-            </layer>
-            <layer id="13" inner_r = "VertexEndcap_rmin4 - 0.1*cm"  outer_r = "VertexEndcap_rmin4 - 0.01*cm" inner_z = "VertexEndcap_z4 - 0.1*cm">
-                <slice material = "G10" thickness = "0.02*cm" />
-            </layer>
-            <layer id="14" inner_r = "VertexEndcap_rmax + 0.01*cm"  outer_r = "VertexEndcap_rmax + 0.5*cm" inner_z = "VertexEndcap_z1 - 0.1*cm">
-                <slice material = "G10" thickness = "0.02*cm" />
-            </layer>
-            <layer id="15" inner_r = "VertexEndcap_rmax + 0.01*cm"  outer_r = "VertexEndcap_rmax + 0.5*cm" inner_z = "VertexEndcap_z2 - 0.1*cm">
-                <slice material = "G10" thickness = "0.02*cm" />
-            </layer>
-            <layer id="16" inner_r = "VertexEndcap_rmax + 0.01*cm"  outer_r = "VertexEndcap_rmax + 0.5*cm" inner_z = "VertexEndcap_z3 - 0.1*cm">
-                <slice material = "G10" thickness = "0.02*cm" />
-            </layer>
-            <layer id="17" inner_r = "VertexEndcap_rmax + 0.01*cm"  outer_r = "VertexEndcap_rmax + 0.5*cm" inner_z = "VertexEndcap_z4 - 0.1*cm">
-                <slice material = "G10" thickness = "0.02*cm" />
-            </layer>
-        </detector>
-        <detector name="VXDcableZforwardBarrel" type="PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
-        	<material name="Copper"/>
-        	<zplane rmin = "(CentralBeamPipe_rmax)"
-        			rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
-        			z="VertexBarrel_zmax + 0.61*cm"/>
-        	<zplane rmin = "(CentralBeamPipe_rmax)"
-        			rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
-        			z="CentralBeamPipe_zmax"/>
-        </detector>
-        <detector name="VXDcableZbackwardBarrel" type="PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
-        	<material name="Copper"/>
-        	<zplane rmin = "(CentralBeamPipe_rmax)"
-        			rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
-        			z="-(VertexBarrel_zmax + 0.61*cm)"/>
-        	<zplane rmin = "(CentralBeamPipe_rmax)"
-        			rmax = "(CentralBeamPipe_rmax + VertexCableThickness)"
-        			z="-CentralBeamPipe_zmax"/>
-        </detector> 
-        <detector name="VXDcableZbackwardOuter" type="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)" 
-            		z="-tracking_region_zmax" />
-            <zplane rmin="(VertexService_zmax + 0.01*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
-            		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="PolyconeSupport" insideTrackingVolume="true" vis="CableVis">
-            <material name="Copper"/>
-            <zplane rmin="CentralBeamPipe_rmax"
-            		rmax="CentralBeamPipe_rmax + VertexCableThickness"
-            		z="-(CentralBeamPipe_zmax)"/>
-            <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"
-            		z="-(VertexService_zmin - 0.01*cm)"/>
-        </detector>
-        <detector name="VXDcableZforwardOuter" type="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)" 
-            		z="tracking_region_zmax" />
-            <zplane rmin="(VertexService_zmax + 0.01*cm - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
-            		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="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"
-            		z="VertexService_zmin - 0.01*cm"/>
-            <zplane rmin="CentralBeamPipe_rmax"
-            		rmax="CentralBeamPipe_rmax + VertexCableThickness"
-            		z="CentralBeamPipe_zmax"/>
-        </detector>
-        <detector name="VXDserviceZbackward" type="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"
-            		z="-VertexService_zmax"/>
-            <zplane rmin = "(VertexService_zmin - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
-            		rmax="(VertexService_zmin - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexServiceThickness"
-            		z="-VertexService_zmin"/>
-        </detector>
-        <detector name="VXDserviceZforward" type="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"
-           			z="VertexService_zmin"/>
-            <zplane rmin = "(VertexService_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax"
-            		rmax="(VertexService_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexServiceThickness"
-            		z="VertexService_zmax"/>
-        </detector>
-
-        <comment>Outer Tracker Supports and Readout</comment>
-        <detector name="TrackerBarrelSupports" type="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" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="2" inner_r="456.0*mm" outer_z="749.781*mm">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="3" inner_r="706.0*mm" outer_z="1013.802*mm">
-                <slice material= "CarbonFiber" thickness = "0.05*cm" />
-                <slice material= "Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material= "CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="4" inner_r="956.0*mm" outer_z="1272.251*mm">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-            <layer id="5" inner_r="1206.0*mm" outer_z="1535.676*mm">
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-                <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
-                <slice material="CarbonFiber" thickness="0.05*cm" />
-            </layer>
-        </detector>
-
-        <comment>Dished endcap disks</comment>
-        <detector name="SiTrackerEndcapSupport1" type="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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" />
-                <slice material="Copper" thickness="0.0038*cm" />
-            </layer>
-            <layer id="2" inner_r="51.0*cm" inner_z="762.854*mm" outer_r="70.6*cm">
-                <slice material = "G10" thickness="0.102*cm" />
-                <slice material = "Copper" thickness="0.0068*cm" />
-            </layer>
-            <layer id="3" inner_r="76.3*cm" inner_z="1026.874*mm" outer_r="95.6*cm">
-                <slice material="G10" thickness="0.108*cm" />
-                <slice material="Copper" thickness="0.0072*cm" />
-            </layer>
-            <layer id="4" inner_r="101.3*cm" inner_z="1285.322*mm" outer_r="120.6*cm">
-                <slice material="G10" thickness="0.186*cm" />
-                <slice material="Copper" thickness="0.0124*cm" />
-            </layer>
-            <layer id="5" inner_r= "101.3*cm" inner_z="1610.0*mm" outer_r="120.6*cm">
-                <slice material="G10" thickness="0.246*cm" />
-                <slice material="Copper" thickness="0.0164*cm" />
-            </layer>
-        </detector>
-        <comment>Masks and Shielding</comment>
-        <detector name="LumiShielding_Forward" type="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="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="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="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="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"
-        			z="HcalEndcap_zmin + ForwardShielding_thickness"/>
-        	<zplane rmin="HcalEndcap_rmin - SupportTube_thickness - ForwardShielding_thickness - 1.0*cm"
-        			rmax="HcalEndcap_rmin - SupportTube_thickness - 1.0*cm"
-        			z="HcalEndcap_zmax"/>
-		</detector>
-		<detector name="ShieldingTube_Backward" type="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"
-        			z="-(HcalEndcap_zmin + ForwardShielding_thickness)"/>
-        	<zplane rmin="HcalEndcap_rmin - SupportTube_thickness - ForwardShielding_thickness - 1.0*cm"
-        			rmax="HcalEndcap_rmin - SupportTube_thickness - 1.0*cm"
-        			z="-HcalEndcap_zmax"/>
-		</detector>
-		<detector name="SupportTube_Forward" type="PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
-        	<material name="Steel235" />
-        	<zplane rmin="HcalEndcap_rmin - 2*SupportTube_thickness"
-        			rmax="HcalEndcap_rmin - SupportTube_thickness"
-        			z="HcalEndcap_zmin"/>
-        	<zplane rmin="HcalEndcap_rmin - 2*SupportTube_thickness"
-        			rmax="HcalEndcap_rmin - SupportTube_thickness"
-        			z="MuonEndcap_zmax"/>
-		</detector>
-		<detector name="SupportTube_Backward" type="PolyconeSupport" insideTrackingVolume="false" vis="SupportTubeVis">
-        	<material name="Steel235" />
-        	<zplane rmin="HcalEndcap_rmin - 2*SupportTube_thickness"
-        			rmax="HcalEndcap_rmin - SupportTube_thickness"
-        			z="-HcalEndcap_zmin"/>
-        	<zplane rmin="HcalEndcap_rmin - 2*SupportTube_thickness"
-        			rmax="HcalEndcap_rmin - SupportTube_thickness"
-        			z="-MuonEndcap_zmax"/>
-		</detector>
-		<detector name="AntiSolenoid_Forward" type="PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
-			<material name="Steel235" />
-        	<zplane rmin="HcalEndcap_rmin + 1.0*cm"
-        			rmax="MuonEndcap_rmin - 1.0*cm"
-        			z="HcalEndcap_zmax + 1.0*cm"/>
-        	<zplane rmin="HcalEndcap_rmin + 1.0*cm"
-        			rmax="MuonEndcap_rmin - 1.0*cm"
-        			z="MuonEndcap_zmax"/>
-        </detector>
-        <detector name="AntiSolenoid_Backward" type="PolyconeSupport" insideTrackingVolume="false" vis="AntiSolenoidVis">
-			<material name="Steel235" />
-        	<zplane rmin="HcalEndcap_rmin + 1.0*cm"
-        			rmax="MuonEndcap_rmin - 1.0*cm"
-        			z="-(HcalEndcap_zmax + 1.0*cm)"/>
-        	<zplane rmin="HcalEndcap_rmin + 1.0*cm"
-        			rmax="MuonEndcap_rmin - 1.0*cm"
-        			z="-MuonEndcap_zmax"/>
-        </detector>
-
-        <detector name="ForwardLowZ" type="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">
-                <slice material = "Graphite" thickness = "ForwardMask_thickness" sensitive = "no" />
-            </layer>
-        </detector>
-  
-        <comment>Solenoid</comment>
-        <detector name="SolenoidCoilBarrel" type="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" />
-            </layer>
-            <layer id="2" inner_r="SolenoidBarrelConductorInnerRadius" outer_z="SolenoidCoilOuterZ" vis="SolenoidBarrelLayerVis">
-                <slice material="Aluminum" thickness="SolenoidBarrelAlConductorThickness" />
-                <slice material="Aluminum" thickness="SolenoidBarrelQuenchbackThickness" />
-            </layer>
-            <layer id="3" inner_r="SolenoidBarrelOuterCryostatInnerRadius" outer_z="SolenoidBarrelOuterZ" vis="SolenoidBarrelLayerVis">
-                <slice material="Vacuum"   thickness="SolenoidBarrelOuterAirgapThickness" />
-                <slice material="Steel235" thickness="SolenoidBarrelOuterCryostatThickness" />
-            </layer>
-        </detector>
-
-        <detector name="SolenoidCoilEnds" type="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>
-
-    </detectors>
-
-    <readouts>
-        <readout name="SiTrackerEndcapHits">
-            <id>system:8,barrel:3,layer:4,module:14,sensor:2,side:32:-2,strip:20</id>
-        </readout>        
-        <readout name="SiTrackerBarrelHits">
-            <id>system:8,barrel:3,layer:4,module:14,sensor:2,side:32:-2,strip:20</id>
-        </readout>
-        <readout name="SiVertexBarrelHits">
-            <id>system:8,barrel:3,layer:4,module:14,sensor:2,side:32:-2,strip:24</id>
-        </readout>
-        <readout name="SiVertexEndcapHits">
-            <id>system:8,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:26</id>
-        </readout>
-        <readout name="EcalBarrelHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.5" grid_size_y="3.5" />
-            <id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
-        </readout>        
-        <readout name="EcalEndcapHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.5" grid_size_y="3.5" />
-            <id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="HcalBarrelHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:6,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="HcalEndcapHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="HcalPlugHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="MuonBarrelHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="MuonEndcapHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="SiTrackerForwardHits">
-            <id>system:8,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:28</id>
-        </readout>
-        <readout name="LumiCalHits">
-            <segmentation type="CartesianGridXY" grid_size_x="0.35*cm" grid_size_y="0.35*cm" />
-            <id>system:8,barrel:3,layer:8,slice:8,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="BeamCalHits">
-            <segmentation type="CartesianGridXY" grid_size_x="0.35*cm" grid_size_y="0.35*cm" />
-            <id>system:8,layer:8,barrel:3,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-    </readouts>
-
-    <fields>
-        <field name="GlobalSolenoid" type="solenoid" 
-          inner_field="5.0*tesla"
-          outer_field="-1.5*tesla" 
-          zmax="SolenoidCoilOuterZ"
-          outer_radius="SolenoidalFieldRadius">
-        </field>
-        <field name="GlobalDipole" type="DipoleMagnet" 
-          rmax="50*cm"
-          zmin="0*cm"
-          zmax="50*cm">
-	  <dipole_coeff>1.0*tesla</dipole_coeff>
-	  <dipole_coeff>0.1*tesla/pow(cm,1)</dipole_coeff>
-	  <dipole_coeff>0.01*tesla/pow(cm,2)</dipole_coeff>
-        </field>
-        <field name="GlobalMultipole" type="MultipoleMagnet" Z="50*cm">
-	  <position x="30*cm" y="20*cm" z="40*cm"/>
-	  <rotation x="1" y="0" z="0"/>
-	  <coefficient coefficient="1.0*tesla" skew="0.1*tesla"/>
-	  <coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/>
-	  <coefficient coefficient="3.0*tesla/cm" skew="0.3*tesla/cm/cm"/>
-	  <coefficient coefficient="4.0*tesla/cm" skew="0.4*tesla/cm/cm/cm"/>
-	  <shape type="Box" dx="5*cm" dy="10*cm" dz="20*cm"/>
-        </field>
-    </fields>
+    <comment>The compact format for the CLIC Silicon Detector used for the conceptual design report</comment>        
+  </info>
+
+  <includes>
+    <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
+  </includes>
+
+  <define>
+    <constant name="world_side"             value="10*m"/>
+    <constant name="world_x"                value="world_side/2"/>
+    <constant name="world_y"                value="world_side/2"/>
+    <constant name="world_z"                value="world_side/2"/>        
+    <constant name="CrossingAngle"          value="0.014*rad"/>
+  </define>
+
+  <detectors>
+    <include ref="../../../DDDetectors/compact/SiD.xml"/>
+  </detectors>
+
+  <fields>
+
+    <field name="MagnetFields_Constant" type="ConstantField" field="magnetic">
+      <strength x="0" y="0" z="5.0*tesla"/>
+    </field>
+
+    <field name="MagnetFields_Solenoid" type="solenoid" 
+	   inner_field="5.0*tesla"
+	   outer_field="-1.5*tesla" 
+	   zmax="SolenoidCoilOuterZ"
+	   outer_radius="SolenoidalFieldRadius">
+    </field>
+
+    <field name="MagnetFields_GlobalDipole" type="DipoleMagnet" 
+	   rmax="50*cm"
+	   zmin="0*cm"
+	   zmax="50*cm">
+      <dipole_coeff>1.0*tesla</dipole_coeff>
+      <dipole_coeff>0.1*tesla/pow(cm,1)</dipole_coeff>
+      <dipole_coeff>0.01*tesla/pow(cm,2)</dipole_coeff>
+    </field>
+
+
+    <field name="MagnetFields_GlobalMultipole" type="MultipoleMagnet" Z="50*cm">
+      <position x="30*cm" y="20*cm" z="40*cm"/>
+      <rotation x="1" y="0" z="0"/>
+      <coefficient coefficient="1.0*tesla" skew="0.1*tesla"/>
+      <coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/>
+      <coefficient coefficient="3.0*tesla/cm" skew="0.3*tesla/cm/cm"/>
+      <coefficient coefficient="4.0*tesla/cm" skew="0.4*tesla/cm/cm/cm"/>
+      <shape type="Box" dx="5*cm" dy="10*cm" dz="20*cm"/>
+    </field>
+  </fields>
 </lccdd>
diff --git a/examples/ClientTests/compact/SectorBarrelCalorimeter.xml b/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
index 173632574..4e454adef 100644
--- a/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
+++ b/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
@@ -1,277 +1,111 @@
 <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">
+       xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
 
-    <info name="clic_sid_cdr"
+  <info name="clic_sid_cdr"
         title="CLIC Silicon Detector CDR"
         author="Christian Grefe"
         url="https://twiki.cern.ch/twiki/bin/view/CLIC/ClicSidCdr"
         status="development"
         version="$Id: compact.xml 988 2014-01-30 13:52:22Z markus.frank@cern.ch $">
-        <comment>The compact format for the CLIC Silicon Detector used for the conceptual design report</comment>        
-    </info>
+    <comment>The compact format for the CLIC Silicon Detector used for the conceptual design report</comment>        
+  </info>
 
-    <includes>
-        <gdmlFile  ref="elements.xml"/>
-        <gdmlFile  ref="materials.xml"/>
-        <pyBuilder ref="../drivers"/>
-    </includes>
+  <includes>
+    <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
+  </includes>
+
+  <materials>
+    <material name="TungstenDens24">
+      <D value="17.8" unit="g/cm3"/>
+      <fraction n="0.93" ref="W"/>
+      <fraction n="0.061" ref="Ni"/>
+      <fraction n="0.009" ref="Fe"/>
+    </material>
+  </materials>
+  
+  <define>
+    <constant name="world_side" value="30000*mm"/>
+    <constant name="world_x" value="world_side"/>
+    <constant name="world_y" value="world_side"/>
+    <constant name="world_z" value="world_side"/>
     
-    <define>
-        <constant name="world_side" value="30000*mm"/>
-        <constant name="world_x" value="world_side"/>
-        <constant name="world_y" value="world_side"/>
-        <constant name="world_z" value="world_side"/>
-        
-        <constant name="CrossingAngle" value="0.020*rad"/>
-        
-        <constant name="CaloSides" value="8"/>
-        <constant name="MuonSides" value="8"/>
-        
-        <constant name="EcalBarrel_rmin" value="126.50*cm"/>
-        <constant name="EcalBarrel_zmax" value="176.50*cm"/>
-        <constant name="EcalEndcap_rmin" value="21.0*cm"/>
-        <constant name="EcalEndcap_rmax" value="(EcalBarrel_rmin - 1.5*cm) / (cos(pi/CaloSides))"/> <!-- Correction from going from inner circle to outer circle -->
-        <constant name="EcalEndcap_zmin" value="165.70*cm"/>
-        
-        <constant name="HcalBarrel_rmin" value="141.90*cm"/>
-        <constant name="HcalBarrel_layers" value="(int) 75"/>
-        <constant name="HcalBarrel_layer_thickness" value="1.0*cm + 0.65*cm"/>
-        <constant name="HcalEndcap_zmin" value="EcalBarrel_zmax + 4.0*cm"/> <!-- Gap for cables -->
-        <constant name="HcalEndcap_rmin" value="50.0*cm"/>
-        <constant name="HcalEndcap_rmax" value="(HcalBarrel_rmin + HcalBarrel_layers * HcalBarrel_layer_thickness) / (cos(pi/CaloSides))"/> <!-- Correction from going from inner circle to outer circle -->
-        <constant name="HcalEndcap_layers" value="60"/>
-        <constant name="HcalEndcap_layer_thickness" value="2.0*cm + 0.65*cm"/>
-        <constant name="HcalEndcap_zmax" value="HcalEndcap_zmin + HcalEndcap_layers * HcalEndcap_layer_thickness"/>
-        
-        <constant name="tracking_region_radius" value="EcalBarrel_rmin - 1.0*mm"/>
-        <constant name="tracking_region_zmax" value="EcalEndcap_zmin - 1.0*mm"/>
-        <constant name="VXD_CF_sensor" value="0.026*cm"/>
-        <constant name="VXD_CF_support" value="0.05*cm"/>
-        
-        <constant name="SolenoidBarrelInnerRadius" value="HcalEndcap_rmax + 2.0*cm"/>
-        <constant name="SolenoidCoilOuterZ" value="HcalEndcap_zmax"/> <!-- Aligned with HCAL endcap -->
-        <constant name="SolenoidBarrelInnerCryostatThickness" value="3.0*cm"/>
-        <constant name="SolenoidBarrelInnerAirgapThickness" value="11.0*cm"/>
-        <constant name="SolenoidBarrelAlConductorThickness" value="38.4*cm"/>
-        <constant name="SolenoidBarrelQuenchbackThickness" value="5.0*cm"/>
-        <constant name="SolenoidBarrelOuterAirgapThickness" value="18.7*cm"/>
-        <constant name="SolenoidBarrelOuterCryostatThickness" value="4.0*cm"/>
-        <constant name="SolenoidEndcapCryostatThickness" value="6.0*cm"/>
-        <constant name="SolenoidEndcapAirgapThickness" value="12.0*cm"/>
-        <constant name="SolenoidBarrelOuterZ" value="SolenoidCoilOuterZ+SolenoidEndcapAirgapThickness"/>
-        <constant name="SolenoidBarrelConductorInnerRadius" value="SolenoidBarrelInnerRadius + SolenoidBarrelInnerCryostatThickness + SolenoidBarrelInnerAirgapThickness"/>
-        <constant name="SolenoidBarrelOuterCryostatInnerRadius" value="SolenoidBarrelConductorInnerRadius + SolenoidBarrelAlConductorThickness + SolenoidBarrelQuenchbackThickness"/>
-        <constant name="SolenoidBarrelOuterRadius" value="SolenoidBarrelOuterCryostatInnerRadius + SolenoidBarrelOuterAirgapThickness + SolenoidBarrelOuterCryostatThickness"/>
-        <constant name="SolenoidalFieldRadius" value="(SolenoidBarrelConductorInnerRadius + SolenoidBarrelAlConductorThickness / 2.0)"/>
-        
-        <constant name="MuonBarrel_rmin" value="SolenoidBarrelOuterRadius + 1.0*cm"/>
-        <constant name="MuonBarrel_zmax" value="SolenoidBarrelOuterZ + SolenoidEndcapCryostatThickness"/>
-        <constant name="MuonBarrel_layers" value="15"/>
-        <constant name="MuonBarrel_layer_thickness" value="10.0*cm + 4.0*cm"/>
-        <constant name="MuonEndcap_zmin" value="MuonBarrel_zmax + 10.0*cm"/> <!-- Space for cables etc. -->
-        <constant name="MuonEndcap_rmin" value="69.0*cm"/> <!-- Space for QD0 and anti-solenoid-->
-        <constant name="MuonEndcap_rmax" value="(MuonBarrel_rmin + 57.0*cm + MuonBarrel_layers * MuonBarrel_layer_thickness) / (cos(pi/MuonSides))"/> <!-- Correction from going from inner circle to outer circle -->
-        <constant name="MuonEndcap_layers" value="18"/>
-        <constant name="MuonEndcap_layer_thickness" value="10.0*cm + 4.0*cm"/>
-        <constant name="MuonEndcap_zmax" value="MuonEndcap_zmin + MuonEndcap_layers * MuonEndcap_layer_thickness"/>
-        
-        <constant name="LumiCal_rmin" value="6.4*cm"/>
-        <constant name="LumiCal_rmax" value="EcalEndcap_rmin + 3.0*cm"/>
-        <constant name="LumiCal_zmin" value="HcalEndcap_zmin"/>
-        <constant name="LumiCal_thickness" value="20*0.371*cm + 15*0.643*cm"/>
-        <constant name="LumiCal_zmax" value="LumiCal_zmin + LumiCal_thickness"/>
-        <constant name="LumiCalElectronics_rmax" value="LumiCal_rmax+5.0*cm"/>
-        
-        <constant name="SupportTube_thickness" value="1.0*cm"/>
-        <constant name="ForwardVacuumValve_thickness" value="36.0*cm"/>
-        <constant name="ForwardShielding_thickness" value="5.0*cm"/>
-        <constant name="ForwardMask_thickness" value="10.0*cm"/>
-        <constant name="ForwardMask_zmin" value="LumiCal_zmax + ForwardShielding_thickness + ForwardVacuumValve_thickness"/>
-        <constant name="BeamCal_rmax" value="13.0*cm"/>
-        <constant name="BeamCal_zmin" value="ForwardMask_zmin + ForwardMask_thickness"/>
-        
-        <constant name="VertexSupport_r1" value="16.87*cm"/>
-        <constant name="VertexSupport_r2" value="18.42*cm"/>
-        <constant name="VertexSupport_zmax" value="89.48*cm"/>
-        
-        <constant name="VertexBarrel_zmax" value="10.0*cm"/>
-        <constant name="VertexBarrel_r1" value="2.7*cm"/>
-        <constant name="VertexBarrel_r2" value="3.8*cm"/>
-        <constant name="VertexBarrel_r3" value="5.1*cm"/>
-        <constant name="VertexBarrel_r4" value="6.4*cm"/>
-        <constant name="VertexBarrel_r5" value="7.7*cm"/>
-        
-        <constant name="CentralBeamPipe_zmax" value="23.0*cm"/>
-        <constant name="CentralBeamPipe_rmax" value="VertexBarrel_r1 - 0.2*cm"/>
-        <constant name="CentralBeamPipe_thickness" value="CentralBeamPipe_rmax * 0.02"/> <!-- 1% of the diameter -->
-        <constant name="CentralBeamPipe_rmin" value="CentralBeamPipe_rmax - CentralBeamPipe_thickness"/>
-        <constant name="BeamPipe_thickness" value="0.4*cm"/>
-        <constant name="BeamPipe_endThickness" value="0.1*cm"/>
-        <constant name="BeamPipe_zmax" value="LumiCal_zmin - 0.5*cm"/>
-        <constant name="BeamPipe_rmax" value="19.0*cm"/>
-        <constant name="BeamPipe_rmin" value="BeamPipe_rmax - BeamPipe_thickness"/>
-        <constant name="bp_cone_slope" value="(BeamPipe_rmax-CentralBeamPipe_rmax)/(tracking_region_zmax-CentralBeamPipe_zmax)"/>
-        <constant name="BeamPipe_zmin" value="CentralBeamPipe_zmax + (BeamPipe_thickness - CentralBeamPipe_thickness)/bp_cone_slope"/>
-        <constant name="BeamPipeLiner_thickness" value="0.0*cm"/>
-         
-    </define>
-    <materials>
-        <material name="TungstenDens23">
-            <D value="17.7" unit="g/cm3"/>
-            <fraction n="0.925" ref="W"/>
-            <fraction n="0.066" ref="Ni"/>
-            <fraction n="0.009" ref="Fe"/>
-        </material>
-        <material name="TungstenDens24">
-            <D value="17.8" unit="g/cm3"/>
-            <fraction n="0.93" ref="W"/>
-            <fraction n="0.061" ref="Ni"/>
-            <fraction n="0.009" ref="Fe"/>
-        </material>
-        <material name="TungstenDens25">
-            <D value="18.2" unit="g/cm3"/>
-            <fraction n="0.950" ref="W"/>
-            <fraction n="0.044" ref="Ni"/>
-            <fraction n="0.006" ref="Fe"/>
-        </material>
-        <material name="CarbonFiber_25percent">
-            <D type="density" value="0.375" unit="g/cm3"/>
-            <fraction n="1.0" ref="CarbonFiber"/>
-        </material>
-        <material name="CarbonFiber_15percent">
-            <D type="density" value="0.225" unit="g/cm3"/>
-            <fraction n="1.0" ref="CarbonFiber"/>
-        </material>
-        <material name="Rohacell31_50percent">
-            <D type="density" value="0.016" unit="g/cm3"/>
-            <fraction n="1.0" ref="Rohacell31"/>
-        </material>
-        <material name="Rohacell31_15percent">
-            <D type="density" value="0.0048" unit="g/cm3"/>
-            <fraction n="1.0" ref="Rohacell31"/>
-        </material>
-        <material name="BoratedPolyethylene5">
-            <D value="0.93" unit="g/cm3"/>
-            <fraction n="0.612" ref="C"/>
-            <fraction n="0.222" ref="O"/>
-            <fraction n="0.116" ref="H"/>
-            <fraction n="0.050" ref="B"/>
-        </material>
-        <material name="SiliconCarbide">
-            <D value="3.1" unit="g/cm3"/>
-            <composite n="1" ref="Si"/>
-            <composite n="1" ref="C"/>
-        </material> 
-        <material name="SiliconCarbide_6percent">
-            <D value="0.186" unit="g/cm3"/>
-            <fraction n="1.0" ref="SiliconCarbide"/>
-        </material>
-        <material name="Graphite">
-        	<D value="1.7" unit="g/cm3"/>
-        	<composite n="1" ref="C"/>
-        </material>      
-    </materials>
-    <limits>
-        <limitset name="cal_limits">
-            <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
-        </limitset>
-    </limits>
+    <constant name="CaloSides" value="8"/>
+    <constant name="EcalBarrel_zmax" value="176.50*cm"/>
+
+    <constant name="HcalBarrel_rmin" value="141.90*cm"/>
+    <constant name="HcalBarrel_layers" value="(int) 75"/>
+    <constant name="HcalBarrel_layer_thickness" value="1.0*cm + 0.65*cm"/>
 
-    <display>
-        <vis name="InvisibleNoDaughters"      showDaughters="false" visible="false"/>
-        <vis name="InvisibleWithDaughters"    showDaughters="true" visible="false"/>
-        <vis name="HcalBarrelVis"          alpha="1" r="1"    g="1"    b="0.1" showDaughters="true" visible="true"/>
-        <vis name="HcalBarrelStavesVis"    alpha="1" r="1"    g="0"    b="0.3" showDaughters="true" visible="true"/>
-        <vis name="HcalBarrelLayerVis"     alpha="1" r="1"    g="0"    b="0.5" showDaughters="true" visible="true"/>
-        <vis name="HcalBarrelSensorVis"    alpha="1" r="1"    g="1"    b="0.7" showDaughters="true" visible="true"/>
+    <constant name="HcalEndcap_zmin" value="EcalBarrel_zmax + 4.0*cm"/> <!-- Gap for cables -->
+    <constant name="HcalEndcap_rmin" value="50.0*cm"/>
+    <constant name="HcalEndcap_rmax" value="(HcalBarrel_rmin + HcalBarrel_layers * HcalBarrel_layer_thickness) / (cos(pi/CaloSides))"/> 
+    <!-- Correction from going from inner circle to outer circle -->
+    <constant name="HcalEndcap_layers" value="60"/>
+    <constant name="HcalEndcap_layer_thickness" value="2.0*cm + 0.65*cm"/>
+    <constant name="HcalEndcap_zmax" value="HcalEndcap_zmin + HcalEndcap_layers * HcalEndcap_layer_thickness"/>
 
-        <vis name="HcalEndcapVis"          alpha="1" r="1"    g="1"    b="0.1" showDaughters="false" visible="true"/>
-        <vis name="HcalEndcapLayerVis"     alpha="1" r="1"    g="0"    b="0.5" showDaughters="false" visible="true"/>
-        <vis name="SupportTubeVis" r="0.1" g="0.1" b="0.99" showDaughters="false" visible="true"/>
-        <vis name="TungstenShieldingVis" r="0.99" g="0.1" b="0.2" showDaughters="false" visible="true"/>
-        
-        <vis name="SupportVis" r="0.8" g="0.8" b="0" showDaughters="false" visible="true"/>
-        <vis name="LumiCalVis" showDaughters="false" visible="true"/>
-        <vis name="GreenVis" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true"/>
-        <vis name="RedVis" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
-        <vis name="BlueVis" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
-    </display>
+    <constant name="SolenoidCoilOuterZ" value="HcalEndcap_zmax"/> <!-- Aligned with HCAL endcap -->
+    <constant name="SolenoidBarrelAlConductorThickness" value="38.4*cm"/>
+    <constant name="SolenoidBarrelInnerRadius" value="HcalEndcap_rmax + 2.0*cm"/>
+    <constant name="SolenoidBarrelInnerCryostatThickness" value="3.0*cm"/>
+    <constant name="SolenoidBarrelInnerAirgapThickness" value="11.0*cm"/>
+    <constant name="SolenoidBarrelConductorInnerRadius" value="SolenoidBarrelInnerRadius + SolenoidBarrelInnerCryostatThickness + SolenoidBarrelInnerAirgapThickness"/>
+    <constant name="SolenoidalFieldRadius" value="(SolenoidBarrelConductorInnerRadius + SolenoidBarrelAlConductorThickness / 2.0)"/>
 
+  </define>
+  <limits>
+    <limitset name="cal_limits">
+      <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
+    </limitset>
+  </limits>
 
+  <display>
+    <vis name="InvisibleNoDaughters"      showDaughters="false" visible="false"/>
+    <vis name="InvisibleWithDaughters"    showDaughters="true" visible="false"/>
+    <vis name="HcalBarrelVis"          alpha="1" r="1"    g="1"    b="0.1" showDaughters="true" visible="true"/>
+    <vis name="HcalBarrelStavesVis"    alpha="1" r="1"    g="0"    b="0.3" showDaughters="true" visible="true"/>
+    <vis name="HcalBarrelLayerVis"     alpha="1" r="1"    g="0"    b="0.5" showDaughters="true" visible="true"/>
+    <vis name="HcalBarrelSensorVis"    alpha="1" r="1"    g="1"    b="0.7" showDaughters="true" visible="true"/>
+
+    <vis name="HcalEndcapVis"          alpha="1" r="1"    g="1"    b="0.1" showDaughters="false" visible="true"/>
+    <vis name="HcalEndcapLayerVis"     alpha="1" r="1"    g="0"    b="0.5" showDaughters="false" visible="true"/>
+    <vis name="SupportTubeVis" r="0.1" g="0.1" b="0.99" showDaughters="false" visible="true"/>
+    <vis name="TungstenShieldingVis" r="0.99" g="0.1" b="0.2" showDaughters="false" visible="true"/>
+    
+    <vis name="SupportVis" r="0.8" g="0.8" b="0" showDaughters="false" visible="true"/>
+    <vis name="LumiCalVis" showDaughters="false" visible="true"/>
+    <vis name="GreenVis" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true"/>
+    <vis name="RedVis" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
+    <vis name="BlueVis" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
+  </display>
 
-    <detectors>
-        <detector id="8" name="HcalBarrel" type="SectorBarrelCalorimeter" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="0.*cm" material="Steel235">
-            <comment>Hadron Calorimeter Barrel</comment>
-            <dimensions numsides="(int) CaloSides" rmin="HcalBarrel_rmin" rmax="HcalEndcap_rmax" z="EcalBarrel_zmax*2"/>
-            <staves vis="HcalBarrelStavesVis"/>
-            <layer repeat="(int) HcalBarrel_layers">
-                <slice material = "TungstenDens24" thickness = "1.00*cm" />
-                <slice material = "Polystyrene" thickness = "0.50*cm" sensitive = "yes" limits="cal_limits" vis="HcalBarrelSensorVis"/>       
-                <slice material = "Air" thickness = "0.15*cm" />
-            </layer>
-        </detector>
-    </detectors>
+  <detectors>
+    <detector id="8" name="HcalBarrel" type="SectorBarrelCalorimeter" readout="HcalBarrelHits" vis="HcalBarrelVis" calorimeterType="HAD_BARREL" gap="0.*cm" material="Steel235">
+      <comment>Hadron Calorimeter Barrel</comment>
+      <dimensions numsides="(int) CaloSides" rmin="HcalBarrel_rmin" rmax="HcalEndcap_rmax" z="EcalBarrel_zmax*2"/>
+      <staves vis="HcalBarrelStavesVis"/>
+      <layer repeat="(int) HcalBarrel_layers">
+	<slice material = "TungstenDens24" thickness = "1.00*cm" />
+	<slice material = "Polystyrene" thickness = "0.50*cm" sensitive = "yes" limits="cal_limits" vis="HcalBarrelSensorVis"/>       
+	<slice material = "Air" thickness = "0.15*cm" />
+      </layer>
+    </detector>
+  </detectors>
 
-    <readouts>
-        <readout name="SiTrackerEndcapHits">
-            <id>system:8,barrel:3,layer:4,module:14,sensor:2,side:32:-2,strip:20</id>
-        </readout>        
-        <readout name="SiTrackerBarrelHits">
-            <id>system:8,barrel:3,layer:4,module:14,sensor:2,side:32:-2,strip:20</id>
-        </readout>
-        <readout name="SiVertexBarrelHits">
-            <id>system:8,barrel:3,layer:4,module:14,sensor:2,side:32:-2,strip:24</id>
-        </readout>
-        <readout name="SiVertexEndcapHits">
-            <id>system:8,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:26</id>
-        </readout>
-        <readout name="EcalBarrelHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.5" grid_size_y="3.5" />
-            <id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
-        </readout>        
-        <readout name="EcalEndcapHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.5" grid_size_y="3.5" />
-            <id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="HcalBarrelHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:6,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="HcalEndcapHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="HcalPlugHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="MuonBarrelHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="MuonEndcapHits">
-            <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
-            <id>system:8,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="SiTrackerForwardHits">
-            <id>system:8,barrel:3,layer:4,wedge:6,module:6,sensor:1,side:32:-2,strip:28</id>
-        </readout>
-        <readout name="LumiCalHits">
-            <segmentation type="CartesianGridXY" grid_size_x="0.35*cm" grid_size_y="0.35*cm" />
-            <id>system:8,layer:8,barrel:3,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-        <readout name="BeamCalHits">
-            <segmentation type="CartesianGridXY" grid_size_x="0.35*cm" grid_size_y="0.35*cm" />
-            <id>system:8,layer:8,barrel:3,layer:8,slice:5,x:32:-16,y:-16</id>
-        </readout>
-    </readouts>
-    <fields>
-        <field name="GlobalSolenoid" type="solenoid" 
-          inner_field="5.0*tesla"
-          outer_field="-1.5*tesla" 
-          zmax="SolenoidCoilOuterZ"
-          outer_radius="SolenoidalFieldRadius">
-        </field>
-    </fields>
+  <readouts>
+    <readout name="HcalBarrelHits">
+      <segmentation type="CartesianGridXY" grid_size_x="3.0*cm" grid_size_y="3.0*cm" />
+      <id>system:8,barrel:3,module:6,layer:8,slice:5,x:32:-16,y:-16</id>
+    </readout>
+  </readouts>
+  <fields>
+    <field name="GlobalSolenoid" type="solenoid" 
+	   inner_field="5.0*tesla"
+	   outer_field="-1.5*tesla" 
+	   zmax="SolenoidCoilOuterZ"
+	   outer_radius="SolenoidalFieldRadius">
+    </field>
+  </fields>
 </lccdd>
diff --git a/examples/ClientTests/compact/SiliconBlock.xml b/examples/ClientTests/compact/SiliconBlock.xml
new file mode 100644
index 000000000..994d6c050
--- /dev/null
+++ b/examples/ClientTests/compact/SiliconBlock.xml
@@ -0,0 +1,70 @@
+<?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">
+ 
+  <info name="SiliconBlock"
+	title="Test with 2 simple silicon boxes"
+	author="Markus Frank"
+	url="http://www.cern.ch/lhcb"
+	status="development"
+	version="$Id: compact.xml 513 2013-04-05 14:31:53Z gaede $">
+    <comment>Alignment test with 2 simple boxes</comment>        
+  </info>
+
+  <includes>
+    <gdmlFile  ref="../../../DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../../../DDDetectors/compact/materials.xml"/>
+  </includes>
+
+  <define>
+    <constant name="world_size" value="30*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+  </define>
+
+  <display>
+    <vis name="Invisible" showDaughters="false" visible="false"/>
+    <vis name="InvisibleWithChildren" showDaughters="true" visible="false"/>
+    <vis name="VisibleRed"  r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
+    <vis name="VisibleBlue" r="0.0" g="0.0" b="1.0" showDaughters="false" visible="true"/>
+    <vis name="VisibleGreen" alpha="1.0" r="0.0" g="1.0" b="0.0" drawingStyle="solid" lineStyle="solid" showDaughters="true" visible="true"/>
+  </display>
+
+  <detectors>
+    <detector id="1" name="SiliconBlockUpper" type="DD4hep_BoxSegment" readout="SiliconUpperHits" vis="VisibleGreen" sensitive="true">
+      <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">
+      <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>
+  </detectors>
+  
+  <readouts>
+    <readout name="SiliconUpperHits">
+      <id>system:8</id>
+    </readout>
+    <readout name="SiliconDownHits">
+      <id>system:8</id>
+    </readout>
+  </readouts>
+
+  <fields>
+    <field name="GlobalSolenoid" type="solenoid" 
+	   inner_field="5.0*tesla"
+	   outer_field="-1.5*tesla" 
+	   zmax="2*m"
+	   outer_radius="3*m">
+    </field>
+  </fields>
+
+</lccdd>
diff --git a/examples/ClientTests/compact/elements.xml b/examples/ClientTests/compact/elements.xml
deleted file mode 100644
index e714c3a5c..000000000
--- a/examples/ClientTests/compact/elements.xml
+++ /dev/null
@@ -1,884 +0,0 @@
-<materials>
- <element Z="89" formula="Ac" name="Ac" >
-  <atom type="A" unit="g/mol" value="227.028" />
- </element>
- <material formula="Ac" name="Actinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.601558" />
-  <NIL type="lambda" unit="cm" value="21.2048" />
-  <D type="density" unit="g/cm3" value="10.07" />
-  <composite n="1" ref="Ac" />
- </material>
- <element Z="47" formula="Ag" name="Ag" >
-  <atom type="A" unit="g/mol" value="107.868" />
- </element>
- <material formula="Ag" name="Silver" state="solid" >
-  <RL type="X0" unit="cm" value="0.854292" />
-  <NIL type="lambda" unit="cm" value="15.8546" />
-  <D type="density" unit="g/cm3" value="10.5" />
-  <composite n="1" ref="Ag" />
- </material>
- <element Z="13" formula="Al" name="Al" >
-  <atom type="A" unit="g/mol" value="26.9815" />
- </element>
- <material formula="Al" name="Aluminum" state="solid" >
-  <RL type="X0" unit="cm" value="8.89632" />
-  <NIL type="lambda" unit="cm" value="38.8766" />
-  <D type="density" unit="g/cm3" value="2.699" />
-  <composite n="1" ref="Al" />
- </material>
- <element Z="95" formula="Am" name="Am" >
-  <atom type="A" unit="g/mol" value="243.061" />
- </element>
- <material formula="Am" name="Americium" state="solid" >
-  <RL type="X0" unit="cm" value="0.42431" />
-  <NIL type="lambda" unit="cm" value="15.9812" />
-  <D type="density" unit="g/cm3" value="13.67" />
-  <composite n="1" ref="Am" />
- </material>
- <element Z="18" formula="Ar" name="Ar" >
-  <atom type="A" unit="g/mol" value="39.9477" />
- </element>
- <material formula="Ar" name="Argon" state="gas" >
-  <RL type="X0" unit="cm" value="11762.1" />
-  <NIL type="lambda" unit="cm" value="71926" />
-  <D type="density" unit="g/cm3" value="0.00166201" />
-  <composite n="1" ref="Ar" />
- </material>
- <element Z="33" formula="As" name="As" >
-  <atom type="A" unit="g/mol" value="74.9216" />
- </element>
- <material formula="As" name="Arsenic" state="solid" >
-  <RL type="X0" unit="cm" value="2.0838" />
-  <NIL type="lambda" unit="cm" value="25.7324" />
-  <D type="density" unit="g/cm3" value="5.73" />
-  <composite n="1" ref="As" />
- </material>
- <element Z="85" formula="At" name="At" >
-  <atom type="A" unit="g/mol" value="209.987" />
- </element>
- <material formula="At" name="Astatine" state="solid" >
-  <RL type="X0" unit="cm" value="0.650799" />
-  <NIL type="lambda" unit="cm" value="22.3202" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="At" />
- </material>
- <element Z="79" formula="Au" name="Au" >
-  <atom type="A" unit="g/mol" value="196.967" />
- </element>
- <material formula="Au" name="Gold" state="solid" >
-  <RL type="X0" unit="cm" value="0.334436" />
-  <NIL type="lambda" unit="cm" value="10.5393" />
-  <D type="density" unit="g/cm3" value="19.32" />
-  <composite n="1" ref="Au" />
- </material>
- <element Z="5" formula="B" name="B" >
-  <atom type="A" unit="g/mol" value="10.811" />
- </element>
- <material formula="B" name="Boron" state="solid" >
-  <RL type="X0" unit="cm" value="22.2307" />
-  <NIL type="lambda" unit="cm" value="32.2793" />
-  <D type="density" unit="g/cm3" value="2.37" />
-  <composite n="1" ref="B" />
- </material>
- <element Z="56" formula="Ba" name="Ba" >
-  <atom type="A" unit="g/mol" value="137.327" />
- </element>
- <material formula="Ba" name="Barium" state="solid" >
-  <RL type="X0" unit="cm" value="2.37332" />
-  <NIL type="lambda" unit="cm" value="51.6743" />
-  <D type="density" unit="g/cm3" value="3.5" />
-  <composite n="1" ref="Ba" />
- </material>
- <element Z="4" formula="Be" name="Be" >
-  <atom type="A" unit="g/mol" value="9.01218" />
- </element>
- <material formula="Be" name="Beryllium" state="solid" >
-  <RL type="X0" unit="cm" value="35.276" />
-  <NIL type="lambda" unit="cm" value="39.4488" />
-  <D type="density" unit="g/cm3" value="1.848" />
-  <composite n="1" ref="Be" />
- </material>
- <element Z="83" formula="Bi" name="Bi" >
-  <atom type="A" unit="g/mol" value="208.98" />
- </element>
- <material formula="Bi" name="Bismuth" state="solid" >
-  <RL type="X0" unit="cm" value="0.645388" />
-  <NIL type="lambda" unit="cm" value="21.3078" />
-  <D type="density" unit="g/cm3" value="9.747" />
-  <composite n="1" ref="Bi" />
- </material>
- <element Z="97" formula="Bk" name="Bk" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Bk" name="Berkelium" state="solid" >
-  <RL type="X0" unit="cm" value="0.406479" />
-  <NIL type="lambda" unit="cm" value="15.6902" />
-  <D type="density" unit="g/cm3" value="14" />
-  <composite n="1" ref="Bk" />
- </material>
- <element Z="35" formula="Br" name="Br" >
-  <atom type="A" unit="g/mol" value="79.9035" />
- </element>
- <material formula="Br" name="Bromine" state="gas" >
-  <RL type="X0" unit="cm" value="1615.12" />
-  <NIL type="lambda" unit="cm" value="21299" />
-  <D type="density" unit="g/cm3" value="0.0070721" />
-  <composite n="1" ref="Br" />
- </material>
- <element Z="6" formula="C" name="C" >
-  <atom type="A" unit="g/mol" value="12.0107" />
- </element>
- <material formula="C" name="Carbon" state="solid" >
-  <RL type="X0" unit="cm" value="21.3485" />
-  <NIL type="lambda" unit="cm" value="40.1008" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="C" />
- </material>
- <element Z="20" formula="Ca" name="Ca" >
-  <atom type="A" unit="g/mol" value="40.078" />
- </element>
- <material formula="Ca" name="Calcium" state="solid" >
-  <RL type="X0" unit="cm" value="10.4151" />
-  <NIL type="lambda" unit="cm" value="77.3754" />
-  <D type="density" unit="g/cm3" value="1.55" />
-  <composite n="1" ref="Ca" />
- </material>
- <element Z="48" formula="Cd" name="Cd" >
-  <atom type="A" unit="g/mol" value="112.411" />
- </element>
- <material formula="Cd" name="Cadmium" state="solid" >
-  <RL type="X0" unit="cm" value="1.03994" />
-  <NIL type="lambda" unit="cm" value="19.46" />
-  <D type="density" unit="g/cm3" value="8.65" />
-  <composite n="1" ref="Cd" />
- </material>
- <element Z="58" formula="Ce" name="Ce" >
-  <atom type="A" unit="g/mol" value="140.115" />
- </element>
- <material formula="Ce" name="Cerium" state="solid" >
-  <RL type="X0" unit="cm" value="1.19506" />
-  <NIL type="lambda" unit="cm" value="27.3227" />
-  <D type="density" unit="g/cm3" value="6.657" />
-  <composite n="1" ref="Ce" />
- </material>
- <element Z="98" formula="Cf" name="Cf" >
-  <atom type="A" unit="g/mol" value="251.08" />
- </element>
- <material formula="Cf" name="Californium" state="solid" >
-  <RL type="X0" unit="cm" value="0.568328" />
-  <NIL type="lambda" unit="cm" value="22.085" />
-  <D type="density" unit="g/cm3" value="10" />
-  <composite n="1" ref="Cf" />
- </material>
- <element Z="17" formula="Cl" name="Cl" >
-  <atom type="A" unit="g/mol" value="35.4526" />
- </element>
- <material formula="Cl" name="Chlorine" state="gas" >
-  <RL type="X0" unit="cm" value="6437.34" />
-  <NIL type="lambda" unit="cm" value="38723.9" />
-  <D type="density" unit="g/cm3" value="0.00299473" />
-  <composite n="1" ref="Cl" />
- </material>
- <element Z="96" formula="Cm" name="Cm" >
-  <atom type="A" unit="g/mol" value="247.07" />
- </element>
- <material formula="Cm" name="Curium" state="solid" >
-  <RL type="X0" unit="cm" value="0.428706" />
-  <NIL type="lambda" unit="cm" value="16.2593" />
-  <D type="density" unit="g/cm3" value="13.51" />
-  <composite n="1" ref="Cm" />
- </material>
- <element Z="27" formula="Co" name="Co" >
-  <atom type="A" unit="g/mol" value="58.9332" />
- </element>
- <material formula="Co" name="Cobalt" state="solid" >
-  <RL type="X0" unit="cm" value="1.53005" />
-  <NIL type="lambda" unit="cm" value="15.2922" />
-  <D type="density" unit="g/cm3" value="8.9" />
-  <composite n="1" ref="Co" />
- </material>
- <element Z="24" formula="Cr" name="Cr" >
-  <atom type="A" unit="g/mol" value="51.9961" />
- </element>
- <material formula="Cr" name="Chromium" state="solid" >
-  <RL type="X0" unit="cm" value="2.0814" />
-  <NIL type="lambda" unit="cm" value="18.1933" />
-  <D type="density" unit="g/cm3" value="7.18" />
-  <composite n="1" ref="Cr" />
- </material>
- <element Z="55" formula="Cs" name="Cs" >
-  <atom type="A" unit="g/mol" value="132.905" />
- </element>
- <material formula="Cs" name="Cesium" state="solid" >
-  <RL type="X0" unit="cm" value="4.4342" />
-  <NIL type="lambda" unit="cm" value="95.317" />
-  <D type="density" unit="g/cm3" value="1.873" />
-  <composite n="1" ref="Cs" />
- </material>
- <element Z="29" formula="Cu" name="Cu" >
-  <atom type="A" unit="g/mol" value="63.5456" />
- </element>
- <material formula="Cu" name="Copper" state="solid" >
-  <RL type="X0" unit="cm" value="1.43558" />
-  <NIL type="lambda" unit="cm" value="15.5141" />
-  <D type="density" unit="g/cm3" value="8.96" />
-  <composite n="1" ref="Cu" />
- </material>
- <element Z="66" formula="Dy" name="Dy" >
-  <atom type="A" unit="g/mol" value="162.497" />
- </element>
- <material formula="Dy" name="Dysprosium" state="solid" >
-  <RL type="X0" unit="cm" value="0.85614" />
-  <NIL type="lambda" unit="cm" value="22.2923" />
-  <D type="density" unit="g/cm3" value="8.55" />
-  <composite n="1" ref="Dy" />
- </material>
- <element Z="68" formula="Er" name="Er" >
-  <atom type="A" unit="g/mol" value="167.256" />
- </element>
- <material formula="Er" name="Erbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.788094" />
-  <NIL type="lambda" unit="cm" value="21.2923" />
-  <D type="density" unit="g/cm3" value="9.066" />
-  <composite n="1" ref="Er" />
- </material>
- <element Z="63" formula="Eu" name="Eu" >
-  <atom type="A" unit="g/mol" value="151.964" />
- </element>
- <material formula="Eu" name="Europium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41868" />
-  <NIL type="lambda" unit="cm" value="35.6178" />
-  <D type="density" unit="g/cm3" value="5.243" />
-  <composite n="1" ref="Eu" />
- </material>
- <element Z="9" formula="F" name="F" >
-  <atom type="A" unit="g/mol" value="18.9984" />
- </element>
- <material formula="F" name="Fluorine" state="gas" >
-  <RL type="X0" unit="cm" value="20838.2" />
-  <NIL type="lambda" unit="cm" value="59094.3" />
-  <D type="density" unit="g/cm3" value="0.00158029" />
-  <composite n="1" ref="F" />
- </material>
- <element Z="26" formula="Fe" name="Fe" >
-  <atom type="A" unit="g/mol" value="55.8451" />
- </element>
- <material formula="Fe" name="Iron" state="solid" >
-  <RL type="X0" unit="cm" value="1.75749" />
-  <NIL type="lambda" unit="cm" value="16.959" />
-  <D type="density" unit="g/cm3" value="7.874" />
-  <composite n="1" ref="Fe" />
- </material>
- <element Z="87" formula="Fr" name="Fr" >
-  <atom type="A" unit="g/mol" value="223.02" />
- </element>
- <material formula="Fr" name="Francium" state="solid" >
-  <RL type="X0" unit="cm" value="6.18826" />
-  <NIL type="lambda" unit="cm" value="212.263" />
-  <D type="density" unit="g/cm3" value="1" />
-  <composite n="1" ref="Fr" />
- </material>
- <element Z="31" formula="Ga" name="Ga" >
-  <atom type="A" unit="g/mol" value="69.7231" />
- </element>
- <material formula="Ga" name="Gallium" state="solid" >
-  <RL type="X0" unit="cm" value="2.1128" />
-  <NIL type="lambda" unit="cm" value="24.3351" />
-  <D type="density" unit="g/cm3" value="5.904" />
-  <composite n="1" ref="Ga" />
- </material>
- <element Z="64" formula="Gd" name="Gd" >
-  <atom type="A" unit="g/mol" value="157.252" />
- </element>
- <material formula="Gd" name="Gadolinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.947208" />
-  <NIL type="lambda" unit="cm" value="23.9377" />
-  <D type="density" unit="g/cm3" value="7.9004" />
-  <composite n="1" ref="Gd" />
- </material>
- <element Z="32" formula="Ge" name="Ge" >
-  <atom type="A" unit="g/mol" value="72.6128" />
- </element>
- <material formula="Ge" name="Germanium" state="solid" >
-  <RL type="X0" unit="cm" value="2.3013" />
-  <NIL type="lambda" unit="cm" value="27.3344" />
-  <D type="density" unit="g/cm3" value="5.323" />
-  <composite n="1" ref="Ge" />
- </material>
- <element Z="1" formula="H" name="H" >
-  <atom type="A" unit="g/mol" value="1.00794" />
- </element>
- <material formula="H" name="Hydrogen" state="gas" >
-  <RL type="X0" unit="cm" value="752776" />
-  <NIL type="lambda" unit="cm" value="421239" />
-  <D type="density" unit="g/cm3" value="8.3748e-05" />
-  <composite n="1" ref="H" />
- </material>
- <element Z="2" formula="He" name="He" >
-  <atom type="A" unit="g/mol" value="4.00264" />
- </element>
- <material formula="He" name="Helium" state="gas" >
-  <RL type="X0" unit="cm" value="567113" />
-  <NIL type="lambda" unit="cm" value="334266" />
-  <D type="density" unit="g/cm3" value="0.000166322" />
-  <composite n="1" ref="He" />
- </material>
- <element Z="72" formula="Hf" name="Hf" >
-  <atom type="A" unit="g/mol" value="178.485" />
- </element>
- <material formula="Hf" name="Hafnium" state="solid" >
-  <RL type="X0" unit="cm" value="0.517717" />
-  <NIL type="lambda" unit="cm" value="14.7771" />
-  <D type="density" unit="g/cm3" value="13.31" />
-  <composite n="1" ref="Hf" />
- </material>
- <element Z="80" formula="Hg" name="Hg" >
-  <atom type="A" unit="g/mol" value="200.599" />
- </element>
- <material formula="Hg" name="Mercury" state="solid" >
-  <RL type="X0" unit="cm" value="0.475241" />
-  <NIL type="lambda" unit="cm" value="15.105" />
-  <D type="density" unit="g/cm3" value="13.546" />
-  <composite n="1" ref="Hg" />
- </material>
- <element Z="67" formula="Ho" name="Ho" >
-  <atom type="A" unit="g/mol" value="164.93" />
- </element>
- <material formula="Ho" name="Holmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.822447" />
-  <NIL type="lambda" unit="cm" value="21.8177" />
-  <D type="density" unit="g/cm3" value="8.795" />
-  <composite n="1" ref="Ho" />
- </material>
- <element Z="53" formula="I" name="I" >
-  <atom type="A" unit="g/mol" value="126.904" />
- </element>
- <material formula="I" name="Iodine" state="solid" >
-  <RL type="X0" unit="cm" value="1.72016" />
-  <NIL type="lambda" unit="cm" value="35.6583" />
-  <D type="density" unit="g/cm3" value="4.93" />
-  <composite n="1" ref="I" />
- </material>
- <element Z="49" formula="In" name="In" >
-  <atom type="A" unit="g/mol" value="114.818" />
- </element>
- <material formula="In" name="Indium" state="solid" >
-  <RL type="X0" unit="cm" value="1.21055" />
-  <NIL type="lambda" unit="cm" value="23.2468" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="In" />
- </material>
- <element Z="77" formula="Ir" name="Ir" >
-  <atom type="A" unit="g/mol" value="192.216" />
- </element>
- <material formula="Ir" name="Iridium" state="solid" >
-  <RL type="X0" unit="cm" value="0.294142" />
-  <NIL type="lambda" unit="cm" value="9.01616" />
-  <D type="density" unit="g/cm3" value="22.42" />
-  <composite n="1" ref="Ir" />
- </material>
- <element Z="19" formula="K" name="K" >
-  <atom type="A" unit="g/mol" value="39.0983" />
- </element>
- <material formula="K" name="Potassium" state="solid" >
-  <RL type="X0" unit="cm" value="20.0871" />
-  <NIL type="lambda" unit="cm" value="138.041" />
-  <D type="density" unit="g/cm3" value="0.862" />
-  <composite n="1" ref="K" />
- </material>
- <element Z="36" formula="Kr" name="Kr" >
-  <atom type="A" unit="g/mol" value="83.7993" />
- </element>
- <material formula="Kr" name="Krypton" state="gas" >
-  <RL type="X0" unit="cm" value="3269.44" />
-  <NIL type="lambda" unit="cm" value="43962.9" />
-  <D type="density" unit="g/cm3" value="0.00347832" />
-  <composite n="1" ref="Kr" />
- </material>
- <element Z="57" formula="La" name="La" >
-  <atom type="A" unit="g/mol" value="138.905" />
- </element>
- <material formula="La" name="Lanthanum" state="solid" >
-  <RL type="X0" unit="cm" value="1.32238" />
-  <NIL type="lambda" unit="cm" value="29.441" />
-  <D type="density" unit="g/cm3" value="6.154" />
-  <composite n="1" ref="La" />
- </material>
- <element Z="3" formula="Li" name="Li" >
-  <atom type="A" unit="g/mol" value="6.94003" />
- </element>
- <material formula="Li" name="Lithium" state="solid" >
-  <RL type="X0" unit="cm" value="154.997" />
-  <NIL type="lambda" unit="cm" value="124.305" />
-  <D type="density" unit="g/cm3" value="0.534" />
-  <composite n="1" ref="Li" />
- </material>
- <element Z="71" formula="Lu" name="Lu" >
-  <atom type="A" unit="g/mol" value="174.967" />
- </element>
- <material formula="Lu" name="Lutetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.703651" />
-  <NIL type="lambda" unit="cm" value="19.8916" />
-  <D type="density" unit="g/cm3" value="9.84" />
-  <composite n="1" ref="Lu" />
- </material>
- <element Z="12" formula="Mg" name="Mg" >
-  <atom type="A" unit="g/mol" value="24.305" />
- </element>
- <material formula="Mg" name="Magnesium" state="solid" >
-  <RL type="X0" unit="cm" value="14.3859" />
-  <NIL type="lambda" unit="cm" value="58.7589" />
-  <D type="density" unit="g/cm3" value="1.74" />
-  <composite n="1" ref="Mg" />
- </material>
- <element Z="25" formula="Mn" name="Mn" >
-  <atom type="A" unit="g/mol" value="54.938" />
- </element>
- <material formula="Mn" name="Manganese" state="solid" >
-  <RL type="X0" unit="cm" value="1.96772" />
-  <NIL type="lambda" unit="cm" value="17.8701" />
-  <D type="density" unit="g/cm3" value="7.44" />
-  <composite n="1" ref="Mn" />
- </material>
- <element Z="42" formula="Mo" name="Mo" >
-  <atom type="A" unit="g/mol" value="95.9313" />
- </element>
- <material formula="Mo" name="Molybdenum" state="solid" >
-  <RL type="X0" unit="cm" value="0.959107" />
-  <NIL type="lambda" unit="cm" value="15.6698" />
-  <D type="density" unit="g/cm3" value="10.22" />
-  <composite n="1" ref="Mo" />
- </material>
- <element Z="7" formula="N" name="N" >
-  <atom type="A" unit="g/mol" value="14.0068" />
- </element>
- <material formula="N" name="Nitrogen" state="gas" >
-  <RL type="X0" unit="cm" value="32602.2" />
-  <NIL type="lambda" unit="cm" value="72430.3" />
-  <D type="density" unit="g/cm3" value="0.0011652" />
-  <composite n="1" ref="N" />
- </material>
- <element Z="11" formula="Na" name="Na" >
-  <atom type="A" unit="g/mol" value="22.9898" />
- </element>
- <material formula="Na" name="Sodium" state="solid" >
-  <RL type="X0" unit="cm" value="28.5646" />
-  <NIL type="lambda" unit="cm" value="102.463" />
-  <D type="density" unit="g/cm3" value="0.971" />
-  <composite n="1" ref="Na" />
- </material>
- <element Z="41" formula="Nb" name="Nb" >
-  <atom type="A" unit="g/mol" value="92.9064" />
- </element>
- <material formula="Nb" name="Niobium" state="solid" >
-  <RL type="X0" unit="cm" value="1.15783" />
-  <NIL type="lambda" unit="cm" value="18.4846" />
-  <D type="density" unit="g/cm3" value="8.57" />
-  <composite n="1" ref="Nb" />
- </material>
- <element Z="60" formula="Nd" name="Nd" >
-  <atom type="A" unit="g/mol" value="144.236" />
- </element>
- <material formula="Nd" name="Neodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.11667" />
-  <NIL type="lambda" unit="cm" value="26.6308" />
-  <D type="density" unit="g/cm3" value="6.9" />
-  <composite n="1" ref="Nd" />
- </material>
- <element Z="10" formula="Ne" name="Ne" >
-  <atom type="A" unit="g/mol" value="20.18" />
- </element>
- <material formula="Ne" name="Neon" state="gas" >
-  <RL type="X0" unit="cm" value="34504.8" />
-  <NIL type="lambda" unit="cm" value="114322" />
-  <D type="density" unit="g/cm3" value="0.000838505" />
-  <composite n="1" ref="Ne" />
- </material>
- <element Z="28" formula="Ni" name="Ni" >
-  <atom type="A" unit="g/mol" value="58.6933" />
- </element>
- <material formula="Ni" name="Nickel" state="solid" >
-  <RL type="X0" unit="cm" value="1.42422" />
-  <NIL type="lambda" unit="cm" value="15.2265" />
-  <D type="density" unit="g/cm3" value="8.902" />
-  <composite n="1" ref="Ni" />
- </material>
- <element Z="93" formula="Np" name="Np" >
-  <atom type="A" unit="g/mol" value="237.048" />
- </element>
- <material formula="Np" name="Neptunium" state="solid" >
-  <RL type="X0" unit="cm" value="0.289676" />
-  <NIL type="lambda" unit="cm" value="10.6983" />
-  <D type="density" unit="g/cm3" value="20.25" />
-  <composite n="1" ref="Np" />
- </material>
- <element Z="8" formula="O" name="O" >
-  <atom type="A" unit="g/mol" value="15.9994" />
- </element>
- <material formula="O" name="Oxygen" state="gas" >
-  <RL type="X0" unit="cm" value="25713.8" />
-  <NIL type="lambda" unit="cm" value="66233.9" />
-  <D type="density" unit="g/cm3" value="0.00133151" />
-  <composite n="1" ref="O" />
- </material>
- <element Z="76" formula="Os" name="Os" >
-  <atom type="A" unit="g/mol" value="190.225" />
- </element>
- <material formula="Os" name="Osmium" state="solid" >
-  <RL type="X0" unit="cm" value="0.295861" />
-  <NIL type="lambda" unit="cm" value="8.92553" />
-  <D type="density" unit="g/cm3" value="22.57" />
-  <composite n="1" ref="Os" />
- </material>
- <element Z="15" formula="P" name="P" >
-  <atom type="A" unit="g/mol" value="30.9738" />
- </element>
- <material formula="P" name="Phosphorus" state="solid" >
-  <RL type="X0" unit="cm" value="9.63879" />
-  <NIL type="lambda" unit="cm" value="49.9343" />
-  <D type="density" unit="g/cm3" value="2.2" />
-  <composite n="1" ref="P" />
- </material>
- <element Z="91" formula="Pa" name="Pa" >
-  <atom type="A" unit="g/mol" value="231.036" />
- </element>
- <material formula="Pa" name="Protactinium" state="solid" >
-  <RL type="X0" unit="cm" value="0.38607" />
-  <NIL type="lambda" unit="cm" value="13.9744" />
-  <D type="density" unit="g/cm3" value="15.37" />
-  <composite n="1" ref="Pa" />
- </material>
- <element Z="82" formula="Pb" name="Pb" >
-  <atom type="A" unit="g/mol" value="207.217" />
- </element>
- <material formula="Pb" name="Lead" state="solid" >
-  <RL type="X0" unit="cm" value="0.561253" />
-  <NIL type="lambda" unit="cm" value="18.2607" />
-  <D type="density" unit="g/cm3" value="11.35" />
-  <composite n="1" ref="Pb" />
- </material>
- <element Z="46" formula="Pd" name="Pd" >
-  <atom type="A" unit="g/mol" value="106.415" />
- </element>
- <material formula="Pd" name="Palladium" state="solid" >
-  <RL type="X0" unit="cm" value="0.765717" />
-  <NIL type="lambda" unit="cm" value="13.7482" />
-  <D type="density" unit="g/cm3" value="12.02" />
-  <composite n="1" ref="Pd" />
- </material>
- <element Z="61" formula="Pm" name="Pm" >
-  <atom type="A" unit="g/mol" value="144.913" />
- </element>
- <material formula="Pm" name="Promethium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04085" />
-  <NIL type="lambda" unit="cm" value="25.4523" />
-  <D type="density" unit="g/cm3" value="7.22" />
-  <composite n="1" ref="Pm" />
- </material>
- <element Z="84" formula="Po" name="Po" >
-  <atom type="A" unit="g/mol" value="208.982" />
- </element>
- <material formula="Po" name="Polonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.661092" />
-  <NIL type="lambda" unit="cm" value="22.2842" />
-  <D type="density" unit="g/cm3" value="9.32" />
-  <composite n="1" ref="Po" />
- </material>
- <element Z="59" formula="Pr" name="Pr" >
-  <atom type="A" unit="g/mol" value="140.908" />
- </element>
- <material formula="Pr" name="Praseodymium" state="solid" >
-  <RL type="X0" unit="cm" value="1.1562" />
-  <NIL type="lambda" unit="cm" value="27.1312" />
-  <D type="density" unit="g/cm3" value="6.71" />
-  <composite n="1" ref="Pr" />
- </material>
- <element Z="78" formula="Pt" name="Pt" >
-  <atom type="A" unit="g/mol" value="195.078" />
- </element>
- <material formula="Pt" name="Platinum" state="solid" >
-  <RL type="X0" unit="cm" value="0.305053" />
-  <NIL type="lambda" unit="cm" value="9.46584" />
-  <D type="density" unit="g/cm3" value="21.45" />
-  <composite n="1" ref="Pt" />
- </material>
- <element Z="94" formula="Pu" name="Pu" >
-  <atom type="A" unit="g/mol" value="244.064" />
- </element>
- <material formula="Pu" name="Plutonium" state="solid" >
-  <RL type="X0" unit="cm" value="0.298905" />
-  <NIL type="lambda" unit="cm" value="11.0265" />
-  <D type="density" unit="g/cm3" value="19.84" />
-  <composite n="1" ref="Pu" />
- </material>
- <element Z="88" formula="Ra" name="Ra" >
-  <atom type="A" unit="g/mol" value="226.025" />
- </element>
- <material formula="Ra" name="Radium" state="solid" >
-  <RL type="X0" unit="cm" value="1.22987" />
-  <NIL type="lambda" unit="cm" value="42.6431" />
-  <D type="density" unit="g/cm3" value="5" />
-  <composite n="1" ref="Ra" />
- </material>
- <element Z="37" formula="Rb" name="Rb" >
-  <atom type="A" unit="g/mol" value="85.4677" />
- </element>
- <material formula="Rb" name="Rubidium" state="solid" >
-  <RL type="X0" unit="cm" value="7.19774" />
-  <NIL type="lambda" unit="cm" value="100.218" />
-  <D type="density" unit="g/cm3" value="1.532" />
-  <composite n="1" ref="Rb" />
- </material>
- <element Z="75" formula="Re" name="Re" >
-  <atom type="A" unit="g/mol" value="186.207" />
- </element>
- <material formula="Re" name="Rhenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.318283" />
-  <NIL type="lambda" unit="cm" value="9.5153" />
-  <D type="density" unit="g/cm3" value="21.02" />
-  <composite n="1" ref="Re" />
- </material>
- <element Z="45" formula="Rh" name="Rh" >
-  <atom type="A" unit="g/mol" value="102.906" />
- </element>
- <material formula="Rh" name="Rhodium" state="solid" >
-  <RL type="X0" unit="cm" value="0.746619" />
-  <NIL type="lambda" unit="cm" value="13.2083" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Rh" />
- </material>
- <element Z="86" formula="Rn" name="Rn" >
-  <atom type="A" unit="g/mol" value="222.018" />
- </element>
- <material formula="Rn" name="Radon" state="gas" >
-  <RL type="X0" unit="cm" value="697.777" />
-  <NIL type="lambda" unit="cm" value="23532" />
-  <D type="density" unit="g/cm3" value="0.00900662" />
-  <composite n="1" ref="Rn" />
- </material>
- <element Z="44" formula="Ru" name="Ru" >
-  <atom type="A" unit="g/mol" value="101.065" />
- </element>
- <material formula="Ru" name="Ruthenium" state="solid" >
-  <RL type="X0" unit="cm" value="0.764067" />
-  <NIL type="lambda" unit="cm" value="13.1426" />
-  <D type="density" unit="g/cm3" value="12.41" />
-  <composite n="1" ref="Ru" />
- </material>
- <element Z="16" formula="S" name="S" >
-  <atom type="A" unit="g/mol" value="32.0661" />
- </element>
- <material formula="S" name="Sulfur" state="solid" >
-  <RL type="X0" unit="cm" value="9.74829" />
-  <NIL type="lambda" unit="cm" value="55.6738" />
-  <D type="density" unit="g/cm3" value="2" />
-  <composite n="1" ref="S" />
- </material>
- <element Z="51" formula="Sb" name="Sb" >
-  <atom type="A" unit="g/mol" value="121.76" />
- </element>
- <material formula="Sb" name="Antimony" state="solid" >
-  <RL type="X0" unit="cm" value="1.30401" />
-  <NIL type="lambda" unit="cm" value="25.8925" />
-  <D type="density" unit="g/cm3" value="6.691" />
-  <composite n="1" ref="Sb" />
- </material>
- <element Z="21" formula="Sc" name="Sc" >
-  <atom type="A" unit="g/mol" value="44.9559" />
- </element>
- <material formula="Sc" name="Scandium" state="solid" >
-  <RL type="X0" unit="cm" value="5.53545" />
-  <NIL type="lambda" unit="cm" value="41.609" />
-  <D type="density" unit="g/cm3" value="2.989" />
-  <composite n="1" ref="Sc" />
- </material>
- <element Z="34" formula="Se" name="Se" >
-  <atom type="A" unit="g/mol" value="78.9594" />
- </element>
- <material formula="Se" name="Selenium" state="solid" >
-  <RL type="X0" unit="cm" value="2.64625" />
-  <NIL type="lambda" unit="cm" value="33.356" />
-  <D type="density" unit="g/cm3" value="4.5" />
-  <composite n="1" ref="Se" />
- </material>
- <element Z="14" formula="Si" name="Si" >
-  <atom type="A" unit="g/mol" value="28.0854" />
- </element>
- <material formula="Si" name="Silicon" state="solid" >
-  <RL type="X0" unit="cm" value="9.36607" />
-  <NIL type="lambda" unit="cm" value="45.7531" />
-  <D type="density" unit="g/cm3" value="2.33" />
-  <composite n="1" ref="Si" />
- </material>
- <element Z="62" formula="Sm" name="Sm" >
-  <atom type="A" unit="g/mol" value="150.366" />
- </element>
- <material formula="Sm" name="Samarium" state="solid" >
-  <RL type="X0" unit="cm" value="1.01524" />
-  <NIL type="lambda" unit="cm" value="24.9892" />
-  <D type="density" unit="g/cm3" value="7.46" />
-  <composite n="1" ref="Sm" />
- </material>
- <element Z="50" formula="Sn" name="Sn" >
-  <atom type="A" unit="g/mol" value="118.71" />
- </element>
- <material formula="Sn" name="Tin" state="solid" >
-  <RL type="X0" unit="cm" value="1.20637" />
-  <NIL type="lambda" unit="cm" value="23.4931" />
-  <D type="density" unit="g/cm3" value="7.31" />
-  <composite n="1" ref="Sn" />
- </material>
- <element Z="38" formula="Sr" name="Sr" >
-  <atom type="A" unit="g/mol" value="87.6166" />
- </element>
- <material formula="Sr" name="Strontium" state="solid" >
-  <RL type="X0" unit="cm" value="4.237" />
-  <NIL type="lambda" unit="cm" value="61.0238" />
-  <D type="density" unit="g/cm3" value="2.54" />
-  <composite n="1" ref="Sr" />
- </material>
- <element Z="73" formula="Ta" name="Ta" >
-  <atom type="A" unit="g/mol" value="180.948" />
- </element>
- <material formula="Ta" name="Tantalum" state="solid" >
-  <RL type="X0" unit="cm" value="0.409392" />
-  <NIL type="lambda" unit="cm" value="11.8846" />
-  <D type="density" unit="g/cm3" value="16.654" />
-  <composite n="1" ref="Ta" />
- </material>
- <element Z="65" formula="Tb" name="Tb" >
-  <atom type="A" unit="g/mol" value="158.925" />
- </element>
- <material formula="Tb" name="Terbium" state="solid" >
-  <RL type="X0" unit="cm" value="0.893977" />
-  <NIL type="lambda" unit="cm" value="23.0311" />
-  <D type="density" unit="g/cm3" value="8.229" />
-  <composite n="1" ref="Tb" />
- </material>
- <element Z="43" formula="Tc" name="Tc" >
-  <atom type="A" unit="g/mol" value="97.9072" />
- </element>
- <material formula="Tc" name="Technetium" state="solid" >
-  <RL type="X0" unit="cm" value="0.833149" />
-  <NIL type="lambda" unit="cm" value="14.0185" />
-  <D type="density" unit="g/cm3" value="11.5" />
-  <composite n="1" ref="Tc" />
- </material>
- <element Z="52" formula="Te" name="Te" >
-  <atom type="A" unit="g/mol" value="127.603" />
- </element>
- <material formula="Te" name="Tellurium" state="solid" >
-  <RL type="X0" unit="cm" value="1.41457" />
-  <NIL type="lambda" unit="cm" value="28.1797" />
-  <D type="density" unit="g/cm3" value="6.24" />
-  <composite n="1" ref="Te" />
- </material>
- <element Z="90" formula="Th" name="Th" >
-  <atom type="A" unit="g/mol" value="232.038" />
- </element>
- <material formula="Th" name="Thorium" state="solid" >
-  <RL type="X0" unit="cm" value="0.51823" />
-  <NIL type="lambda" unit="cm" value="18.353" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Th" />
- </material>
- <element Z="22" formula="Ti" name="Ti" >
-  <atom type="A" unit="g/mol" value="47.8667" />
- </element>
- <material formula="Ti" name="Titanium" state="solid" >
-  <RL type="X0" unit="cm" value="3.5602" />
-  <NIL type="lambda" unit="cm" value="27.9395" />
-  <D type="density" unit="g/cm3" value="4.54" />
-  <composite n="1" ref="Ti" />
- </material>
- <element Z="81" formula="Tl" name="Tl" >
-  <atom type="A" unit="g/mol" value="204.383" />
- </element>
- <material formula="Tl" name="Thallium" state="solid" >
-  <RL type="X0" unit="cm" value="0.547665" />
-  <NIL type="lambda" unit="cm" value="17.6129" />
-  <D type="density" unit="g/cm3" value="11.72" />
-  <composite n="1" ref="Tl" />
- </material>
- <element Z="69" formula="Tm" name="Tm" >
-  <atom type="A" unit="g/mol" value="168.934" />
- </element>
- <material formula="Tm" name="Thulium" state="solid" >
-  <RL type="X0" unit="cm" value="0.754428" />
-  <NIL type="lambda" unit="cm" value="20.7522" />
-  <D type="density" unit="g/cm3" value="9.321" />
-  <composite n="1" ref="Tm" />
- </material>
- <element Z="92" formula="U" name="U" >
-  <atom type="A" unit="g/mol" value="238.029" />
- </element>
- <material formula="U" name="Uranium" state="solid" >
-  <RL type="X0" unit="cm" value="0.31663" />
-  <NIL type="lambda" unit="cm" value="11.4473" />
-  <D type="density" unit="g/cm3" value="18.95" />
-  <composite n="1" ref="U" />
- </material>
- <element Z="23" formula="V" name="V" >
-  <atom type="A" unit="g/mol" value="50.9415" />
- </element>
- <material formula="V" name="Vanadium" state="solid" >
-  <RL type="X0" unit="cm" value="2.59285" />
-  <NIL type="lambda" unit="cm" value="21.2187" />
-  <D type="density" unit="g/cm3" value="6.11" />
-  <composite n="1" ref="V" />
- </material>
- <element Z="74" formula="W" name="W" >
-  <atom type="A" unit="g/mol" value="183.842" />
- </element>
- <material formula="W" name="Tungsten" state="solid" >
-  <RL type="X0" unit="cm" value="0.350418" />
-  <NIL type="lambda" unit="cm" value="10.3057" />
-  <D type="density" unit="g/cm3" value="19.3" />
-  <composite n="1" ref="W" />
- </material>
- <element Z="54" formula="Xe" name="Xe" >
-  <atom type="A" unit="g/mol" value="131.292" />
- </element>
- <material formula="Xe" name="Xenon" state="gas" >
-  <RL type="X0" unit="cm" value="1546.2" />
-  <NIL type="lambda" unit="cm" value="32477.9" />
-  <D type="density" unit="g/cm3" value="0.00548536" />
-  <composite n="1" ref="Xe" />
- </material>
- <element Z="39" formula="Y" name="Y" >
-  <atom type="A" unit="g/mol" value="88.9058" />
- </element>
- <material formula="Y" name="Yttrium" state="solid" >
-  <RL type="X0" unit="cm" value="2.32943" />
-  <NIL type="lambda" unit="cm" value="34.9297" />
-  <D type="density" unit="g/cm3" value="4.469" />
-  <composite n="1" ref="Y" />
- </material>
- <element Z="70" formula="Yb" name="Yb" >
-  <atom type="A" unit="g/mol" value="173.038" />
- </element>
- <material formula="Yb" name="Ytterbium" state="solid" >
-  <RL type="X0" unit="cm" value="1.04332" />
-  <NIL type="lambda" unit="cm" value="28.9843" />
-  <D type="density" unit="g/cm3" value="6.73" />
-  <composite n="1" ref="Yb" />
- </material>
- <element Z="30" formula="Zn" name="Zn" >
-  <atom type="A" unit="g/mol" value="65.3955" />
- </element>
- <material formula="Zn" name="Zinc" state="solid" >
-  <RL type="X0" unit="cm" value="1.74286" />
-  <NIL type="lambda" unit="cm" value="19.8488" />
-  <D type="density" unit="g/cm3" value="7.133" />
-  <composite n="1" ref="Zn" />
- </material>
- <element Z="40" formula="Zr" name="Zr" >
-  <atom type="A" unit="g/mol" value="91.2236" />
- </element>
- <material formula="Zr" name="Zirconium" state="solid" >
-  <RL type="X0" unit="cm" value="1.56707" />
-  <NIL type="lambda" unit="cm" value="24.2568" />
-  <D type="density" unit="g/cm3" value="6.506" />
-  <composite n="1" ref="Zr" />
- </material>
-</materials>
\ No newline at end of file
diff --git a/examples/ClientTests/compact/materials.xml b/examples/ClientTests/compact/materials.xml
deleted file mode 100644
index 12107bafc..000000000
--- a/examples/ClientTests/compact/materials.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<materials>
-
-  <!--
-       Air by weight from
-
-       http://www.engineeringtoolbox.com/air-composition-24_212.html
-  -->
-  <material name="Air">
-    <D type="density" unit="g/cm3" value="0.0012"/>
-    <fraction n="0.754" ref="N"/>
-    <fraction n="0.234" ref="O"/>
-    <fraction n="0.012" ref="Ar"/>
-  </material>
-  
-  <material name="Vacuum">
-    <D type="density" unit="g/cm3" value="0.00000001" />
-    <fraction n="1" ref="H" />
-  </material>
-
-  <material name="Epoxy">
-    <D type="density" value="1.3" unit="g/cm3"/>
-    <composite n="44" ref="H"/>
-    <composite n="15" ref="C"/>
-    <composite n="7" ref="O"/>
-  </material>
-
-  <material name="Quartz">
-    <D type="density" value="2.2" unit="g/cm3"/>
-    <composite n="1" ref="Si"/>
-    <composite n="2" ref="O"/>
-  </material>
-
-  <material name="G10">
-    <D type="density" value="1.7" unit="g/cm3"/>
-    <fraction n="0.08" ref="Cl"/>
-    <fraction n="0.773" ref="Quartz"/>
-    <fraction n="0.147" ref="Epoxy"/>
-  </material>
-
-  <material name="Polystyrene">
-    <D value="1.032" unit="g/cm3"/>
-    <composite n="19" ref="C"/>
-    <composite n="21" ref="H"/>
-  </material>
-
-  <material name="Steel235">
-    <D value="7.85" unit="g/cm3"/>
-    <fraction n="0.998" ref="Fe"/>
-    <fraction n=".002" ref="C"/>
-  </material>
-
-  <material name="SiliconOxide">
-    <D type="density" value="2.65" unit="g/cm3"/>
-    <composite n="1" ref="Si"/>
-    <composite n="2" ref="O"/>
-  </material>
-
-  <material name="BoronOxide">
-    <D type="density" value="2.46" unit="g/cm3"/>
-    <composite n="2" ref="B"/>
-    <composite n="3" ref="O"/>
-  </material>
-
-  <material name="SodiumOxide">
-    <D type="density" value="2.65" unit="g/cm3"/>
-    <composite n="2" ref="Na"/>
-    <composite n="1" ref="O"/>
-  </material>
-
-  <material name="AluminumOxide">
-    <D type="density" value="3.89" unit="g/cm3"/>
-    <composite n="2" ref="Al"/>
-    <composite n="3" ref="O"/>
-  </material>
-
-  <material name="PyrexGlass">
-    <D type="density" value="2.23" unit="g/cm3"/>
-    <fraction n="0.806" ref="SiliconOxide"/>
-    <fraction n="0.130" ref="BoronOxide"/>
-    <fraction n="0.040" ref="SodiumOxide"/>
-    <fraction n="0.023" ref="AluminumOxide"/>
-  </material>
-
-  <material name="CarbonFiber">
-    <D type="density" value="1.5" unit="g/cm3"/>
-    <fraction n="0.65" ref="C"/>
-    <fraction n="0.35" ref="Epoxy"/>
-  </material>
-  
-  <material name="CarbonFiber_50D">
-    <D type="density" value="0.75" unit="g/cm3"/>
-    <fraction n="0.65" ref="C"/>
-    <fraction n="0.35" ref="Epoxy"/>
-  </material>  
-
-  <material name="Rohacell31">
-    <D type="density" value="0.032" unit="g/cm3"/>
-    <composite n="9" ref="C"/>
-    <composite n="13" ref="H"/>
-    <composite n="2" ref="O"/>
-    <composite n="1" ref="N"/>
-  </material>
-  
-  <material name="Rohacell31_50D">
-    <D type="density" value="0.016" unit="g/cm3"/>
-    <composite n="9" ref="C"/>
-    <composite n="13" ref="H"/>
-    <composite n="2" ref="O"/>
-    <composite n="1" ref="N"/>
-  </material>  
-
-  <material name="RPCGasDefault" state="gas">
-    <D type="density" value="0.0037" unit="g/cm3"/>
-    <composite n="209" ref="C"/>
-    <composite n="239" ref="H"/>
-    <composite n="381" ref="F"/>
-  </material>
-
-  <material name="PolystyreneFoam">
-    <D type="density" value="0.0056" unit="g/cm3"/>
-    <fraction n="1.0" ref="Polystyrene"/>
-  </material>
-
-  <material name="Kapton">
-    <D value="1.43" unit="g/cm3" />
-    <composite n="22" ref="C"/>
-    <composite n="10" ref="H" />
-    <composite n="2" ref="N" />
-    <composite n="5" ref="O" />
-  </material>
-
-  <material name="PEEK">
-    <D value="1.37" unit="g/cm3" />
-    <composite n="19" ref="C"/>
-    <composite n="12" ref="H" />
-    <composite n="3" ref="O" />
-  </material>
-
-</materials>
diff --git a/examples/ClientTests/compact/Geant4Assemblies.py b/examples/ClientTests/scripts/Geant4Assemblies.py
similarity index 100%
rename from examples/ClientTests/compact/Geant4Assemblies.py
rename to examples/ClientTests/scripts/Geant4Assemblies.py
diff --git a/examples/ClientTests/scripts/SiliconBlock.py b/examples/ClientTests/scripts/SiliconBlock.py
new file mode 100644
index 000000000..1f5e7d8ca
--- /dev/null
+++ b/examples/ClientTests/scripts/SiliconBlock.py
@@ -0,0 +1,85 @@
+#
+#
+import os, time, DDG4
+from DDG4 import OutputLevel as Output
+from SystemOfUnits import *
+#
+#
+"""
+
+   DD4hep simulation example setup using the python configuration
+
+   @author  M.Frank
+   @version 1.0
+
+"""
+def run():
+  kernel = DDG4.Kernel()
+  lcdd = kernel.lcdd()
+  install_dir = os.environ['DD4hepINSTALL']
+  example_dir = install_dir+'/examples/DDG4/examples';
+  kernel.loadGeometry("file:"+install_dir+"/examples/ClientTests/compact/SiliconBlock.xml")
+  kernel.loadXML("file:"+example_dir+"/DDG4_field.xml")
+  DDG4.importConstants(lcdd,debug=False)
+  simple = DDG4.Simple(kernel,tracker='Geant4TrackerCombineAction')
+  simple.printDetectors()
+  # Configure UI
+  simple.setupCshUI()
+
+  # Configure Event actions
+  prt = DDG4.EventAction(kernel,'Geant4ParticlePrint/ParticlePrint')
+  prt.OutputLevel = Output.DEBUG
+  prt.OutputType  = 3 # Print both: table and tree
+  kernel.eventAction().adopt(prt)
+
+  generator_output_level = Output.INFO
+
+  # Configure I/O
+  ##evt_lcio = simple.setupLCIOOutput('LcioOutput','SiliconBlock_'+time.strftime('%Y-%m-%d_%H-%M'))
+  ##evt_lcio.OutputLevel = generator_output_level
+  evt_root = simple.setupROOTOutput('RootOutput','SiliconBlock_'+time.strftime('%Y-%m-%d_%H-%M'))
+
+  """
+  Generation of primary particles from LCIO input files: particle file reader
+  """
+  gen = DDG4.GeneratorAction(kernel,"LCIOInputAction/LCIO1");
+  gen.Input = "LCIOFileReader|/afs/cern.ch/user/n/nikiforo/public/Markus/muons.slcio"
+  gen.MomentumScale = 1.0
+  gen.Mask = 1
+
+  simple.buildInputStage([gen],output_level=generator_output_level)
+
+  # And handle the simulation particles.
+  part = DDG4.GeneratorAction(kernel,"Geant4ParticleHandler/ParticleHandler")
+  kernel.generatorAction().adopt(part)
+  part.SaveProcesses = ['Decay']
+  part.MinimalKineticEnergy = 100*MeV
+  part.OutputLevel = Output.INFO #generator_output_level
+  part.enableUI()
+  user = DDG4.Action(kernel,"Geant4TCUserParticleHandler/UserParticleHandler")
+  user.TrackingVolume_Zmax = 3.0*m
+  user.TrackingVolume_Rmax = 3.0*m
+  user.enableUI()
+  part.adopt(user)
+
+  simple.setupTracker('SiliconBlockUpper')
+  simple.setupTracker('SiliconBlockDown')
+
+  # Now build the physics list:
+  phys = simple.setupPhysics('QGSP_BERT')
+  ph = DDG4.PhysicsList(kernel,'Geant4PhysicsList/Myphysics')
+  ph.addParticleConstructor('G4Geantino')
+  ph.addParticleConstructor('G4BosonConstructor')
+  ph.enableUI()
+  phys.adopt(ph)
+  phys.dump()
+
+  kernel.configure()
+  kernel.initialize()
+
+  #DDG4.setPrintLevel(Output.DEBUG)
+  kernel.run()
+  kernel.terminate()
+
+if __name__ == "__main__":
+  run()
-- 
GitLab