diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
index 5b26a5f5a45ac..0ea1374d7e778 100644
--- a/Configuration/Geometry/python/dict2021Geometry.py
+++ b/Configuration/Geometry/python/dict2021Geometry.py
@@ -146,7 +146,7 @@
     "O6" : {
         1 : [
             'Geometry/CMSCommonData/data/materials/2021/v3/materials.xml',
-            'Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml',
+            'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
             'Geometry/CMSCommonData/data/rotations.xml',
             'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml',
             'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
@@ -613,8 +613,8 @@
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml',
             'Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml',
             'Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml',
-            'Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v1/tibtidcommonmaterial.xml',
-            'Geometry/TrackerCommonData/data/tibmaterial/2021/v1/tibmaterial.xml',
+            'Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v2/tibtidcommonmaterial.xml',
+            'Geometry/TrackerCommonData/data/tibmaterial/2021/v2/tibmaterial.xml',
             'Geometry/TrackerCommonData/data/tibmodpar.xml',
             'Geometry/TrackerCommonData/data/tibmodule0.xml',
             'Geometry/TrackerCommonData/data/tibmodule0a.xml',
@@ -647,7 +647,7 @@
             'Geometry/TrackerCommonData/data/tiblayer2.xml',
             'Geometry/TrackerCommonData/data/tiblayer3.xml',
             'Geometry/TrackerCommonData/data/tib.xml',
-            'Geometry/TrackerCommonData/data/tidmaterial/2021/v1/tidmaterial.xml',
+            'Geometry/TrackerCommonData/data/tidmaterial/2021/v2/tidmaterial.xml',
             'Geometry/TrackerCommonData/data/tidmodpar.xml',
             'Geometry/TrackerCommonData/data/tidmodule0.xml',
             'Geometry/TrackerCommonData/data/tidmodule0r.xml',
@@ -670,7 +670,7 @@
             'Geometry/TrackerCommonData/data/tibtidservices.xml',
             'Geometry/TrackerCommonData/data/tibtidservicesf.xml',
             'Geometry/TrackerCommonData/data/tibtidservicesb.xml',
-            'Geometry/TrackerCommonData/data/tobmaterial/2021/v1/tobmaterial.xml',
+            'Geometry/TrackerCommonData/data/tobmaterial/2021/v2/tobmaterial.xml',
             'Geometry/TrackerCommonData/data/tobmodpar.xml',
             'Geometry/TrackerCommonData/data/tobmodule0.xml',
             'Geometry/TrackerCommonData/data/tobmodule2.xml',
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
index d450ab5c3b596..1812e975e7491 100644
--- a/Configuration/Geometry/python/dict2026Geometry.py
+++ b/Configuration/Geometry/python/dict2026Geometry.py
@@ -978,7 +978,7 @@
         1 : [
             'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
             'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
index e4f8afe1ef8e4..739123843dce2 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -5,7 +5,7 @@
 
   <IncludeSection>
     <Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v3/cmsextent.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
@@ -53,8 +53,8 @@
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v1/tibtidcommonmaterial.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/tibmaterial/2021/v1/tibmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v2/tibtidcommonmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibmaterial/2021/v2/tibmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibmodule0a.xml'/>
@@ -87,7 +87,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tiblayer2.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tiblayer3.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tib.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/tidmaterial/2021/v1/tidmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmaterial/2021/v2/tidmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tidmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tidmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tidmodule0r.xml'/>
@@ -110,7 +110,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tibtidservices.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibtidservicesf.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibtidservicesb.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/tobmaterial/2021/v1/tobmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobmaterial/2021/v2/tobmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobmodule2.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
index feda0018c382c..d014f9a63c8f8 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
@@ -44,7 +44,7 @@
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
index e5b7bdb572d2d..b9882cdacf1ea 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -6,7 +6,7 @@
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         'Geometry/CMSCommonData/data/materials/2021/v3/materials.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml',
         'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
@@ -54,8 +54,8 @@
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml',
         'Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml',
         'Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml',
-        'Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v1/tibtidcommonmaterial.xml',
-        'Geometry/TrackerCommonData/data/tibmaterial/2021/v1/tibmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v2/tibtidcommonmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmaterial/2021/v2/tibmaterial.xml',
         'Geometry/TrackerCommonData/data/tibmodpar.xml',
         'Geometry/TrackerCommonData/data/tibmodule0.xml',
         'Geometry/TrackerCommonData/data/tibmodule0a.xml',
@@ -88,7 +88,7 @@
         'Geometry/TrackerCommonData/data/tiblayer2.xml',
         'Geometry/TrackerCommonData/data/tiblayer3.xml',
         'Geometry/TrackerCommonData/data/tib.xml',
-        'Geometry/TrackerCommonData/data/tidmaterial/2021/v1/tidmaterial.xml',
+        'Geometry/TrackerCommonData/data/tidmaterial/2021/v2/tidmaterial.xml',
         'Geometry/TrackerCommonData/data/tidmodpar.xml',
         'Geometry/TrackerCommonData/data/tidmodule0.xml',
         'Geometry/TrackerCommonData/data/tidmodule0r.xml',
@@ -111,7 +111,7 @@
         'Geometry/TrackerCommonData/data/tibtidservices.xml',
         'Geometry/TrackerCommonData/data/tibtidservicesf.xml',
         'Geometry/TrackerCommonData/data/tibtidservicesb.xml',
-        'Geometry/TrackerCommonData/data/tobmaterial/2021/v1/tobmaterial.xml',
+        'Geometry/TrackerCommonData/data/tobmaterial/2021/v2/tobmaterial.xml',
         'Geometry/TrackerCommonData/data/tobmodpar.xml',
         'Geometry/TrackerCommonData/data/tobmodule0.xml',
         'Geometry/TrackerCommonData/data/tobmodule2.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
index aaed012b14ef0..965b77ff33df9 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
@@ -45,7 +45,7 @@
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
         'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
diff --git a/Geometry/TrackerCommonData/data/tecmaterial/2021/v2/tecmaterial.xml b/Geometry/TrackerCommonData/data/tecmaterial/2021/v2/tecmaterial.xml
deleted file mode 100644
index 72cda28a1df89..0000000000000
--- a/Geometry/TrackerCommonData/data/tecmaterial/2021/v2/tecmaterial.xml
+++ /dev/null
@@ -1,1093 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition>
-  <MaterialSection label="tecmaterial.xml">
-    <CompositeMaterial name="Tk_SO_FC_D" density="1.69*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.84491305">
-        <rMaterial name="materials:Carbon" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.042542086">
-        <rMaterial name="materials:Hydrogen" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.11254487">
-        <rMaterial name="materials:Oxygen" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="Tk_SO_FC_E" density="1.69*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.84491305">
-        <rMaterial name="materials:Carbon" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.042542086">
-        <rMaterial name="materials:Hydrogen" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.11254487">
-        <rMaterial name="materials:Oxygen" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_Nomex" density="29*mg/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.">
-        <rMaterial name="trackermaterial:T_Nomex" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_SideFrameSuppliesBox" density="1.42*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.4">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.6">
-        <rMaterial name="materials:Oxygen" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_Hybrid4APV" density="4.853*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.01244">
-        <rMaterial name="materials:Alumina" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03101">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01097">
-        <rMaterial name="materials:SMD_metal" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00116">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.58835">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04057">
-        <rMaterial name="materials:Silicon" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.2722">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04114">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00215">
-        <rMaterial name="materials:Carbon" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_Hybrid6APV" density="4.853*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.01293">
-        <rMaterial name="materials:Alumina" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03041">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01203">
-        <rMaterial name="materials:SMD_metal" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0017">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.57692">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.05642">
-        <rMaterial name="materials:Silicon" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.26691">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04034">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00234">
-        <rMaterial name="materials:Carbon" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_PitchAdapter" density="2.285*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.01964">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00405">
-        <rMaterial name="materials:Antimony" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02119">
-        <rMaterial name="materials:Titanium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.11635">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.2683">
-        <rMaterial name="materials:Silicon" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04916">
-        <rMaterial name="materials:Potassium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02169">
-        <rMaterial name="materials:Bor 11" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03975">
-        <rMaterial name="materials:Zinc" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03986">
-        <rMaterial name="materials:Sodium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.42001">
-        <rMaterial name="materials:Oxygen" />
-      </MaterialFraction>
-      <MaterialFraction fraction="1e-05">
-        <rMaterial name="materials:Chromium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_frame_top" density="1.931*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="materials:Carbon" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_frame_side_1_4" density="2.990*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.0001">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01928">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.16527">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.81353">
-        <rMaterial name="materials:Carbon" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00182">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_frame_side_5_7" density="1.835*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="9e-05">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.2644">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0219">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00139">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.71223">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_SideFrSupBox" density="1.420*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.00108">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.46347">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.16343">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01545">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.35657">
-        <rMaterial name="materials:Silver" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_SiReenforcment" density="3.731*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_petal" density="0.325*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.0047">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0889">
-        <rMaterial name="materials:Titanium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.06686">
-        <rMaterial name="tecmaterial:TEC_Nomex" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00444">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.1168">
-        <rMaterial name="trackermaterial:T_C6F14_F2_-30C" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00328">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03366">
-        <rMaterial name="trackermaterial:Optical_Fiber" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.68137">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_OptoH" density="4.200*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.00692">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00084">
-        <rMaterial name="materials:Air" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.24416">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.22453">
-        <rMaterial name="trackermaterial:T_G10" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.24707">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.11266">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.1401">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02371">
-        <rMaterial name="trackermaterial:T_Barium_Titanate" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_DOHM" density="2.969*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.40226">
-        <rMaterial name="tobmaterial:TOB_DOH" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01487">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.13519">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0768">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0183">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.31357">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03901">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_petalinsert" density="4.739*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.20957">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0385">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00797">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.74097">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00298">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC01LF" density="1.218*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.04545">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03276">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00011">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.06699">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.26301">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03844">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04788">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.23006">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.23995">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03322">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00214">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC2F" density="3.355*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.04734">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.026">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00012">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04602">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.2773">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03051">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04987">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.1657">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.3328">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02211">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00222">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC35F" density="3.200*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.01212">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00749">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="3e-05">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0182">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.26402">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00425">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00879">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01277">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.10676">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.55519">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00983">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00057">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC1SF" density="2.183*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.03717">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02297">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="9e-05">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0271">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.27509">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02695">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03916">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.09757">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.45429">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01787">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00175">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC0F" density="3.343*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.05789">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02385">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00014">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04343">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.25615">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02798">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.06098">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.19929">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.30564">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02194">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00272">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC46F" density="2.865*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.04776">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00874">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00012">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03324">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.2646">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01026">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.05032">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.14008">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.42377">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01886">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00224">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC1B" density="2.115*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.02528">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02524">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="8e-05">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03771">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.2752">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02962">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.16436">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.42028">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02079">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00144">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC35B" density="3.157*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.01025">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00704">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="3e-05">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01871">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.26067">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00428">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00826">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0108">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.11119">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.55824">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01005">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00048">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC0LB" density="2.916*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.04027">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03318">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0001">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04808">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.2504">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03892">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04242">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.17716">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.3454">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02218">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00189">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC2B" density="2.868*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.03474">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.02862">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="9e-05">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04148">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.23894">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03358">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03659">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.15283">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.41232">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01918">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00163">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ICC46B" density="3.096*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.04246">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01272">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0001">
-        <rMaterial name="materials:Gold" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03072">
-        <rMaterial name="materials:Ceramic" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.238">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01492">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04473">
-        <rMaterial name="materials:Peek" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.12221">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.47552">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01664">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.002">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_InnerManifold" density="3.698*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.16543">
-        <rMaterial name="trackermaterial:T_C6F14_F2_-30C" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.83457">
-        <rMaterial name="materials:Titanium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_CCUM" density="4.762*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.27951">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0881">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.55723">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.07516">
-        <rMaterial name="materials:BGA" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ServChan" density="3.182*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.01852">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.88755">
-        <rMaterial name="trackermaterial:Fibre_Ribbon" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.09393">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ServChanIns" density="0.943*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_AxGrounding" density="2.127*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.20529">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.79471">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_CoolPipe" density="9.274*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_AxCable" density="0.957*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.03995">
-        <rMaterial name="trackermaterial:MS_cntrl_cable" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.32482">
-        <rMaterial name="trackermaterial:CAB_Al48" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.34061">
-        <rMaterial name="trackermaterial:CAB_Al36" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.29462">
-        <rMaterial name="trackermaterial:CAB_Al60" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_GasPipe" density="2.937*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.04053">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.95947">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_PhiCableL" density="0.453*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.19421">
-        <rMaterial name="trackermaterial:CAB_Al48" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.06174">
-        <rMaterial name="trackermaterial:MS_cntrl_cable" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.20367">
-        <rMaterial name="trackermaterial:CAB_Al36" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.19221">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.06638">
-        <rMaterial name="materials:Tin" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.17603">
-        <rMaterial name="trackermaterial:CAB_Al60" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.10576">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_PhiCableU" density="0.755*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.1898">
-        <rMaterial name="trackermaterial:CAB_Al48" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.06692">
-        <rMaterial name="trackermaterial:MS_cntrl_cable" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.1852">
-        <rMaterial name="trackermaterial:CAB_Al36" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.20844">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.07162">
-        <rMaterial name="materials:Tin" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.20623">
-        <rMaterial name="trackermaterial:CAB_Al60" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.07178">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_GroundingRing" density="23.139*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.2285">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.7715">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_Skin" density="1.352*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.18681">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.81319">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_OptoCon" density="0.321*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.50304">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.48126">
-        <rMaterial name="trackermaterial:T_Ribbon12xMUConn" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00623">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00948">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_Rails" density="2.211*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_BackDiskCF" density="2.984*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_ThermalShield" density="0.166*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.00385">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0037">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.22782">
-        <rMaterial name="tecmaterial:TEC_Nomex" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01799">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.74664">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_CircPipe" density="0.763*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.13141">
-        <rMaterial name="trackermaterial:CAB_Al48" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.15522">
-        <rMaterial name="trackermaterial:MS_cntrl_cable" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.13783">
-        <rMaterial name="trackermaterial:CAB_Al36" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.41593">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.11923">
-        <rMaterial name="trackermaterial:CAB_Al60" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04038">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_BHDisk" density="1.556*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.00661">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00467">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01234">
-        <rMaterial name="trackermaterial:T_Nomex" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.03247">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.94391">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_BHCovers" density="1.834*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.05206">
-        <rMaterial name="trackermaterial:T_Kapton" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.11002">
-        <rMaterial name="materials:Nickel" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.83792">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial density="2.669*0.79*g/cm3" method="mixture by weight" name="TEC_PatchpanelBox" symbol=" ">
-      <MaterialFraction fraction="0.01151">
-        <rMaterial name="trackermaterial:CAB_Al48" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.19806">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01207">
-        <rMaterial name="trackermaterial:CAB_Al36" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.7577">
-        <rMaterial name="trackermaterial:MS_Cu60" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00372">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01044">
-        <rMaterial name="trackermaterial:CAB_Al60" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0065">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_Connectors" density="2.669*1.21*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.01151">
-        <rMaterial name="trackermaterial:CAB_Al48" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.19806">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01207">
-        <rMaterial name="trackermaterial:CAB_Al36" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.7577">
-        <rMaterial name="trackermaterial:MS_Cu60" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00372">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.01044">
-        <rMaterial name="trackermaterial:CAB_Al60" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0065">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_PatchCtrlBox" density="1.382*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.00445">
-        <rMaterial name="trackermaterial:MS_cntrl_cable" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.8749">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.12065">
-        <rMaterial name="trackermaterial:Fibre_Ribbon" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_AlignRing" density="0.534*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.16497">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0189">
-        <rMaterial name="materials:Titanium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00284">
-        <rMaterial name="materials:Silicon" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.04474">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00378">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.76478">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="Tk_SO_FC_C" density="0.178*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.13847">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00404">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.15144">
-        <rMaterial name="tecmaterial:TEC_Nomex" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.70605">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_wheel_Nomex" density="0.038*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_Nomex" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_wheel_CF" density="1.269*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_wheel6_Nomex" density="0.024*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_Nomex" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_wheel6_CF" density="1.627*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_wheelinsert" density="1.353*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_Fixframe" density="1.372*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_FixServ" density="3.050*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.14267">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.85733">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_AlignHolder" density="0.559*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_CraneBracket" density="2.021*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="1.0">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_Beamsplitter" density="1.207*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.04703">
-        <rMaterial name="materials:Silica" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.87717">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0758">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_RailsConnector" density="6.305*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.10736">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.89264">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_RailsSupport" density="2.843*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.00641">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.08031">
-        <rMaterial name="materials:Steel-008" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00221">
-        <rMaterial name="materials:Brass" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.91107">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-    </CompositeMaterial>
-    <CompositeMaterial name="TEC_Tiltmeter" density="0.659*g/cm3" method="mixture by weight" symbol=" ">
-      <MaterialFraction fraction="0.24222">
-        <rMaterial name="trackermaterial:T_Aluminium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00433">
-        <rMaterial name="materials:Titanium" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00433">
-        <rMaterial name="trackermaterial:T_Copper" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.61421">
-        <rMaterial name="materials:Epoxy" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.00433">
-        <rMaterial name="materials:Polyethylene" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.0519">
-        <rMaterial name="trackermaterial:T_FR4" />
-      </MaterialFraction>
-      <MaterialFraction fraction="0.07869">
-        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
-      </MaterialFraction>
-    </CompositeMaterial>
-  </MaterialSection>
-</DDDefinition>
diff --git a/Geometry/TrackerCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/TrackerCommonData/python/cmsExtendedGeometry2021XML_cfi.py
index 74e3b80025565..f036c8be47612 100644
--- a/Geometry/TrackerCommonData/python/cmsExtendedGeometry2021XML_cfi.py
+++ b/Geometry/TrackerCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -136,7 +136,7 @@
         'Geometry/TrackerCommonData/data/tobrod5h.xml',
         'Geometry/TrackerCommonData/data/tobrod5.xml',
         'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
-        'Geometry/TrackerCommonData/data/tecmaterial/2021/v2/tecmaterial.xml',
+        'Geometry/TrackerCommonData/data/tecmaterial/2021/v1/tecmaterial.xml',
         'Geometry/TrackerCommonData/data/tecmodpar.xml',
         'Geometry/TrackerCommonData/data/tecmodule0.xml',
         'Geometry/TrackerCommonData/data/tecmodule0r.xml',