diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
index 6a43b1d5aab58..25f9a0e5082dd 100644
--- a/Configuration/Geometry/python/dict2021Geometry.py
+++ b/Configuration/Geometry/python/dict2021Geometry.py
@@ -313,7 +313,7 @@
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZminus.xml',
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZplus.xml',
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZminus.xml',
-            'Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/pixbarmaterial.xml', 
+            'Geometry/TrackerCommonData/data/zeroMaterial/2021/v2/pixbarmaterial.xml', 
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladder.xml', 
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull0.xml', 
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull1.xml', 
@@ -504,7 +504,7 @@
             'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
             'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/trackermaterial.xml',
             'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/pixfwdMaterials.xml',
-            'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/pixbarmaterial.xml',
+            'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v1/pixbarmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/tibtidcommonmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/tibmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/tidmaterial.xml',
@@ -708,7 +708,7 @@
             'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
             'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/trackermaterial.xml',
             'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/pixfwdMaterials.xml',
-            'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/pixbarmaterial.xml',
+            'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v1/pixbarmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/tibtidcommonmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/tibmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/tidmaterial.xml',
@@ -912,7 +912,7 @@
             'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
             'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/trackermaterial.xml',
             'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/pixfwdMaterials.xml',
-            'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/pixbarmaterial.xml',
+            'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v1/pixbarmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/tibtidcommonmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/tibmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/tidmaterial.xml',
@@ -1116,7 +1116,7 @@
             'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
             'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/trackermaterial.xml',
             'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/pixfwdMaterials.xml',
-            'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/pixbarmaterial.xml',
+            'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v1/pixbarmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/tibtidcommonmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/tibmaterial.xml',
             'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/tidmaterial.xml',
@@ -1507,7 +1507,7 @@
             'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
             'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
             'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
-            'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
+            'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
             'Geometry/VeryForwardData/data/RP_Transformations.xml',
             'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
             'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -1562,7 +1562,6 @@
             'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
             'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
             'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-            'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
             'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
             'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
             'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
index 57d0ba2299d62..c9ab5a6f110dc 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -287,7 +287,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -342,7 +342,6 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
index a295e10805eea..6122793dc7cd4 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
@@ -26,7 +26,7 @@
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/trackermaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/pixfwdMaterials.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/pixbarmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v1/pixbarmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/tibtidcommonmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/tibmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/tidmaterial.xml'/>
@@ -287,7 +287,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -342,7 +342,6 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
index 8d7ba94b1dc85..0287d5430d5a9 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
@@ -26,7 +26,7 @@
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/trackermaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/pixfwdMaterials.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/pixbarmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v1/pixbarmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/tibtidcommonmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/tibmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/tidmaterial.xml'/>
@@ -287,7 +287,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -342,7 +342,6 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
index 6a1d00958fc75..1dbf474b99dfb 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
@@ -26,7 +26,7 @@
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/trackermaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/pixfwdMaterials.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/pixbarmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v1/pixbarmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/tibtidcommonmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/tibmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/tidmaterial.xml'/>
@@ -287,7 +287,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -342,7 +342,6 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
index 55ea8f2ec60d2..c9908aa3bf6b7 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
@@ -26,7 +26,7 @@
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/trackermaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/pixfwdMaterials.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/pixbarmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v1/pixbarmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/tibtidcommonmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/tibmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/tidmaterial.xml'/>
@@ -287,7 +287,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -342,7 +342,6 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
index bdd32ecb4a858..90d3f30806745 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
@@ -39,7 +39,7 @@
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZminus.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZplus.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZminus.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/pixbarmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v2/pixbarmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladder.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull1.xml'/>
@@ -287,7 +287,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -342,7 +342,6 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
index 8abb62f66bc9b..d89971bddd431 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
@@ -27,7 +27,7 @@
         'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/trackermaterial.xml',
         'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/pixfwdMaterials.xml',
-        'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/pixbarmaterial.xml',
+        'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v1/pixbarmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/tibtidcommonmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/tibmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v2/tidmaterial.xml',
@@ -290,7 +290,7 @@
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -345,7 +345,6 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
index bf61575a0ec8b..b2bf4c03e339f 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
@@ -27,7 +27,7 @@
         'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/trackermaterial.xml',
         'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/pixfwdMaterials.xml',
-        'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/pixbarmaterial.xml',
+        'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v1/pixbarmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/tibtidcommonmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/tibmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v2/tidmaterial.xml',
@@ -290,7 +290,7 @@
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -345,7 +345,6 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
index 51a38ae1f2200..e7f366a250a8b 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
@@ -27,7 +27,7 @@
         'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/trackermaterial.xml',
         'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/pixfwdMaterials.xml',
-        'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/pixbarmaterial.xml',
+        'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v1/pixbarmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/tibtidcommonmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/tibmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v2/tidmaterial.xml',
@@ -290,7 +290,7 @@
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -345,7 +345,6 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
index 318a483eab00c..f57cf99712e52 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
@@ -27,7 +27,7 @@
         'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/trackermaterial.xml',
         'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/pixfwdMaterials.xml',
-        'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/pixbarmaterial.xml',
+        'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v1/pixbarmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/tibtidcommonmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/tibmaterial.xml',
         'Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v2/tidmaterial.xml',
@@ -290,7 +290,7 @@
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -345,7 +345,6 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
index 76a88e9751770..dfc942b730aac 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -290,7 +290,7 @@
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -345,7 +345,6 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
index 40359f9fe79af..3db629af4380a 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
@@ -40,7 +40,7 @@
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZminus.xml',
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZplus.xml',
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZminus.xml',
-        'Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/pixbarmaterial.xml',
+        'Geometry/TrackerCommonData/data/zeroMaterial/2021/v2/pixbarmaterial.xml',
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladder.xml',
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull0.xml',
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull1.xml',
@@ -290,7 +290,7 @@
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -345,7 +345,6 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
diff --git a/Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v1/pixbarmaterial.xml b/Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v1/pixbarmaterial.xml
new file mode 100644
index 0000000000000..a2aff62d98622
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/FlatMinus05Percent/2021/v1/pixbarmaterial.xml
@@ -0,0 +1,826 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<MaterialSection label="pixbarmaterial.xml">
+    <CompositeMaterial name="CFK" density="1.49625*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="Bpix_Pipe_Steel" density="7.619*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.0005">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.18">
+        <rMaterial name="materials:Chromium"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.1">
+        <rMaterial name="materials:Nickel"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.7195">
+        <rMaterial name="materials:Iron"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="Bpix_CO2_-20C" density="0.981065*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.27292145">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.72707855">
+        <rMaterial name="materials:Oxygen"/>
+      </MaterialFraction>
+    </CompositeMaterial>  
+
+<!--  Upgrade-->
+    <CompositeMaterial name="SupplyTubeConn3_Upgrade" density="0.46246*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.560">
+      <rMaterial name="trackermaterial:micro_twisted_boundle"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.440">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+<!-- New materials -->
+  <CompositeMaterial name="Polyurethane" density="0.04693*g/cm3" symbol=" " method="mixture by weight">   <!-- Airex -->
+     <MaterialFraction fraction="0.09">
+      <rMaterial name="materials:Nitrogen"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.6559">
+      <rMaterial name="materials:Carbon"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.0486">
+       <rMaterial name="materials:Hydrogen"/>
+     </MaterialFraction>
+    <MaterialFraction fraction="0.2056">
+       <rMaterial name="materials:Oxygen"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="SupplyTubeEpoxy" density="0.9975*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.5999">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0719">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.2283">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0999">
+      <rMaterial name="materials:Nitrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SupplyTubeConn3" density="0.33782*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="0.027795">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.015259">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.0944924">
+      <rMaterial name="Polyurethane"/>
+     </MaterialFraction>
+	 <MaterialFraction fraction="0.256154">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+	 <MaterialFraction fraction="0.113846">
+      <rMaterial name="SupplyTubeEpoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.335428">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.085225">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.071801">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+   </CompositeMaterial>
+   
+  <CompositeMaterial name="SupplyTubeConn3_3Disks" density="0.44137*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="SupplyTubeConn3_10Disks" density="0.75126*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="CoolPipesDaisyChain" density="5.70*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="0.6458">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.3542">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+   
+  <CompositeMaterial name="Flange1_Airex" density="0.0256215*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange2_Airex" density="0.0256215*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange3_Airex" density="0.025621597*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange4_InnerCFK" density="0.95*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:CFK"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="Flange1_CFK" density="0.817*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange2_CFK" density="0.817*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange3_CFK" density="0.817*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange4_CFK" density="1.49625*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Polyoxymethylene" density="1.33*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="0.4">
+      <rMaterial name="materials:Carbon"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.06667">
+       <rMaterial name="materials:Hydrogen"/>
+     </MaterialFraction>
+    <MaterialFraction fraction="0.5333">
+       <rMaterial name="materials:Oxygen"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="BPix_Silicone" density="1.235*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.3787448">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.21575329">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3239468">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.08155498">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+   <CompositeMaterial name="LCP_Glass_Enforced" density="1.90*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.08">
+          <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.52">
+          <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.39">
+          <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01">
+          <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+   <CompositeMaterial name="Silicon_Nitride" density="3.23*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.6006">
+          <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3994">
+          <rMaterial name="materials:Nitrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Full" density="3.48893*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75244">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15186">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04271">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05299">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Full_Upgrade" density="0.348893*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75244">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15186">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04271">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05299">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Half" density="3.02451*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.86861">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06085">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04931">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02123">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Hybrid_Full" density="4.41951*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.0063">
+      <rMaterial name="materials:Indium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.09358">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05034">
+      <rMaterial name="materials:Nickel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3217">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02405">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04379">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1596">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23875">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00379">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00741">
+      <rMaterial name="materials:Alumina"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0507">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Hybrid_Half" density="5.4213*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.00443">
+      <rMaterial name="materials:Indium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1322">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.03912">
+      <rMaterial name="materials:Nickel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.24865">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0185">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06187">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.22547">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00267">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.185">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01047">
+      <rMaterial name="materials:Alumina"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.07162">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Capacitor" density="2.11163*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="T_Pix_Bar_Cool" density="1.85675*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.61432">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.38568">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Bpix_CO2_-20C_Half" density="1.96213*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Bpix_Pipe_Steel_Half" density="15.238*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable" density="1.59248*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.43796">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02339">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19088">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.34777">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable_Upgrade" density="0.530822*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Pix_Bar_Cable"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+    <CompositeMaterial name="Pix_Bar_CableSignal_Upgrade" density="0.87875*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.249079">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.476682">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.274239">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+     <CompositeMaterial name="Pix_Bar_CablePower_Upgrade" density="0.87875*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.110505">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.751012">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.138483">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable_Layer1_Upgrade" density="5.434*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.46">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.54">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Pix_Bar_Cable_Layer234_Upgrade" density="4.0945*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.46">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.54">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer1" density="1.78951*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer2" density="1.65785*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer3" density="1.67879*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer4" density="1.84637*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Flange_with_Manifold_Layer1" density="4.75088*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.1636">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25809">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23898">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.12917">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19713">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01304">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Flange_with_Manifold_Upgrade" density="1.31989*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.1216">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1647">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.27897">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.35331">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02816">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05321">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Flange_with_Manifold_Layer2" density="5.07914*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.14778">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28678">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.20276">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15657">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.18269">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02342">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeInner_with_Manifold_Layer3" density="4.6607*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.10879">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.35422">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.36829">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.16871">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeOuter_Layer3" density="0.409849*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.11657">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.87067">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00339">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00938">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="T_CarbonFibreStrBox" density="1.67537*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeOuter_Layer3_Upgrade" density="0.136619*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="FlangeOuter_Layer3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+ <CompositeMaterial name="cable_endring_to_tube" density="1.84584*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.10301">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15922">
+      <rMaterial name="pixfwdMaterials:FPix_Silicone"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06696">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04431">
+      <rMaterial name="pixfwdMaterials:FPix_Cylind_Noryl"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02972">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.40314">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19365">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="cable_endring_to_tube_Upgrade" density="0.615277*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="cable_endring_to_tube"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer1_2_EndringPrints" density="1.10994*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.01765">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23843">
+      <rMaterial name="pixbarmaterial:LCP_Glass_Enforced"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3061">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00657">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01658">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.41468">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer1_2_EndringPrints_Upgrade" density="0.369978*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Layer1_2_EndringPrints"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer3_EndringPrints" density="1.03216*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.01766">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.238">
+      <rMaterial name="pixbarmaterial:LCP_Glass_Enforced"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.30544">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00789">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01706">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.41396">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer3_EndringPrints_Upgrade" density="0.344052*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Layer3_EndringPrints"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="silicone_pipes_plus_coolant" density="0.247285*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.53007">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.46993">
+      <rMaterial name="pixbarmaterial:BPix_Silicone"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+ <CompositeMaterial name="SectorA" density="0.399*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.329">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.333">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.320">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.018">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorA_3Disks" density="0.530214*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorA_10Disks" density="0.902509*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorB" density="0.712129*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.19011">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00494">
+      <rMaterial name="pixbarmaterial:Polyoxymethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1187">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14233">
+      <rMaterial name="materials:Acrylate"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0512">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.18915">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06486">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.17137">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05152">
+      <rMaterial name="materials:Polyvinylchloride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01581">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorC" density="0.75316*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.14778">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0139">
+      <rMaterial name="pixbarmaterial:Polyoxymethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.22693">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.11069">
+      <rMaterial name="materials:Acrylate"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.03989">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14938">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01005">
+      <rMaterial name="pixfwdMaterials:FPix_TinLeadSolder"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06396">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.20077">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02082">
+      <rMaterial name="pixfwdMaterials:FPix_Cylind_Polyester"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00319">
+      <rMaterial name="materials:Polyvinylchloride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01264">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorBC" density="1.07635*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.265">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.115">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.052">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.006">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.562">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorC_3Disks" density="1.16274*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorC_10Disks" density="2.07622*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorC_Upgrade" density="0.186694*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="PixelBarrelSupTubCables" density="0.61845*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.09162">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14907">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28441">
+      <rMaterial name="materials:Polyethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.4749">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+ <CompositeMaterial name="PixelBarrelSupTubCables2" density="0.39444*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.09162">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14907">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28441">
+      <rMaterial name="materials:Polyethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.4749">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="PixelBarrelSupTubCables2_3Disks" density="0.912152*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PixelBarrelSupTubCables2_10Disks" density="1.55264*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+</MaterialSection>
+
+</DDDefinition>
+
diff --git a/Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v1/pixbarmaterial.xml b/Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v1/pixbarmaterial.xml
new file mode 100644
index 0000000000000..e41d2116ad0a4
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/FlatMinus10Percent/2021/v1/pixbarmaterial.xml
@@ -0,0 +1,826 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<MaterialSection label="pixbarmaterial.xml">
+    <CompositeMaterial name="CFK" density="1.4175*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="Bpix_Pipe_Steel" density="7.218*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.0005">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.18">
+        <rMaterial name="materials:Chromium"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.1">
+        <rMaterial name="materials:Nickel"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.7195">
+        <rMaterial name="materials:Iron"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="Bpix_CO2_-20C" density="0.92943*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.27292145">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.72707855">
+        <rMaterial name="materials:Oxygen"/>
+      </MaterialFraction>
+    </CompositeMaterial>  
+
+<!--  Upgrade-->
+    <CompositeMaterial name="SupplyTubeConn3_Upgrade" density="0.43812*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.560">
+      <rMaterial name="trackermaterial:micro_twisted_boundle"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.440">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+<!-- New materials -->
+  <CompositeMaterial name="Polyurethane" density="0.04446*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="0.09">
+      <rMaterial name="materials:Nitrogen"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.6559">
+      <rMaterial name="materials:Carbon"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.0486">
+       <rMaterial name="materials:Hydrogen"/>
+     </MaterialFraction>
+    <MaterialFraction fraction="0.2056">
+       <rMaterial name="materials:Oxygen"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="SupplyTubeEpoxy" density="0.945*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.5999">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0719">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.2283">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0999">
+      <rMaterial name="materials:Nitrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SupplyTubeConn3" density="0.32004*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="0.027795">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.015259">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.0944924">
+      <rMaterial name="Polyurethane"/>
+     </MaterialFraction>
+	 <MaterialFraction fraction="0.256154">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+	 <MaterialFraction fraction="0.113846">
+      <rMaterial name="SupplyTubeEpoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.335428">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.085225">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.071801">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+   </CompositeMaterial>
+   
+  <CompositeMaterial name="SupplyTubeConn3_3Disks" density="0.41814*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="SupplyTubeConn3_10Disks" density="0.71172*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="CoolPipesDaisyChain" density="5.40*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="0.6458">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.3542">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+   
+  <CompositeMaterial name="Flange1_Airex" density="0.024273*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange2_Airex" density="0.024273*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange3_Airex" density="0.024273*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange4_InnerCFK" density="0.900*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:CFK"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="Flange1_CFK" density="0.774*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange2_CFK" density="0.774*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange3_CFK" density="0.774*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange4_CFK" density="1.4175*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Polyoxymethylene" density="1.26*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="0.4">
+      <rMaterial name="materials:Carbon"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.06667">
+       <rMaterial name="materials:Hydrogen"/>
+     </MaterialFraction>
+    <MaterialFraction fraction="0.5333">
+       <rMaterial name="materials:Oxygen"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="BPix_Silicone" density="1.17*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.3787448">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.21575329">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3239468">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.08155498">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+   <CompositeMaterial name="LCP_Glass_Enforced" density="1.80*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.08">
+          <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.52">
+          <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.39">
+          <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01">
+          <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+   <CompositeMaterial name="Silicon_Nitride" density="3.06*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.6006">
+          <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3994">
+          <rMaterial name="materials:Nitrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Full" density="3.3053*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75244">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15186">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04271">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05299">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Full_Upgrade" density="0.33053*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75244">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15186">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04271">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05299">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Half" density="2.86532*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.86861">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06085">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04931">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02123">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Hybrid_Full" density="3.97431*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.0063">
+      <rMaterial name="materials:Indium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.09358">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05034">
+      <rMaterial name="materials:Nickel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3217">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02405">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04379">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1596">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23875">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00379">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00741">
+      <rMaterial name="materials:Alumina"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0507">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Hybrid_Half" density="5.13597*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.00443">
+      <rMaterial name="materials:Indium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1322">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.03912">
+      <rMaterial name="materials:Nickel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.24865">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0185">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06187">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.22547">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00267">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.185">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01047">
+      <rMaterial name="materials:Alumina"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.07162">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Capacitor" density="2.00049*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="T_Pix_Bar_Cool" density="1.75902*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.61432">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.38568">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Bpix_CO2_-20C_Half" density="1.85886*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Bpix_Pipe_Steel_Half" density="14.436*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable" density="1.50886*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.43796">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02339">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19088">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.34777">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable_Upgrade" density="0.502884*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Pix_Bar_Cable"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+    <CompositeMaterial name="Pix_Bar_CableSignal_Upgrade" density="0.8325*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.249079">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.476682">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.274239">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+     <CompositeMaterial name="Pix_Bar_CablePower_Upgrade" density="0.8325*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.110505">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.751012">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.138483">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable_Layer1_Upgrade" density="5.148*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.46">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.54">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Pix_Bar_Cable_Layer234_Upgrade" density="3.879*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.46">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.54">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer1" density="1.69533*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer2" density="1.57059*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer3" density="1.59044*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer4" density="1.74919*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Flange_with_Manifold_Layer1" density="4.50084*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.1636">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25809">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23898">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.12917">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19713">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01304">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Flange_with_Manifold_Upgrade" density="1.25042*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.1216">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1647">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.27897">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.35331">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02816">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05321">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Flange_with_Manifold_Layer2" density="4.81181*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.14778">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28678">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.20276">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15657">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.18269">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02342">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeInner_with_Manifold_Layer3" density="4.4154*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.10879">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.35422">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.36829">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.16871">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeOuter_Layer3" density="0.388278*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.11657">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.87067">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00339">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00938">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="T_CarbonFibreStrBox" density="1.58719*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeOuter_Layer3_Upgrade" density="0.129429*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="FlangeOuter_Layer3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+ <CompositeMaterial name="cable_endring_to_tube" density="1.74869*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.10301">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15922">
+      <rMaterial name="pixfwdMaterials:FPix_Silicone"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06696">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04431">
+      <rMaterial name="pixfwdMaterials:FPix_Cylind_Noryl"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02972">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.40314">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19365">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="cable_endring_to_tube_Upgrade" density="0.582894*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="cable_endring_to_tube"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer1_2_EndringPrints" density="1.05152*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.01765">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23843">
+      <rMaterial name="pixbarmaterial:LCP_Glass_Enforced"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3061">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00657">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01658">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.41468">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer1_2_EndringPrints_Upgrade" density="0.350505*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Layer1_2_EndringPrints"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer3_EndringPrints" density="0.977832*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.01766">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.238">
+      <rMaterial name="pixbarmaterial:LCP_Glass_Enforced"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.30544">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00789">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01706">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.41396">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer3_EndringPrints_Upgrade" density="0.325944*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Layer3_EndringPrints"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="silicone_pipes_plus_coolant" density="0.23427*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.53007">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.46993">
+      <rMaterial name="pixbarmaterial:BPix_Silicone"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+ <CompositeMaterial name="SectorA" density="0.3780*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.329">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.333">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.320">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.018">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorA_3Disks" density="0.502308*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorA_10Disks" density="0.855009*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorB" density="0.674649*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.19011">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00494">
+      <rMaterial name="pixbarmaterial:Polyoxymethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1187">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14233">
+      <rMaterial name="materials:Acrylate"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0512">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.18915">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06486">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.17137">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05152">
+      <rMaterial name="materials:Polyvinylchloride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01581">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorC" density="0.71352*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.14778">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0139">
+      <rMaterial name="pixbarmaterial:Polyoxymethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.22693">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.11069">
+      <rMaterial name="materials:Acrylate"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.03989">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14938">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01005">
+      <rMaterial name="pixfwdMaterials:FPix_TinLeadSolder"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06396">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.20077">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02082">
+      <rMaterial name="pixfwdMaterials:FPix_Cylind_Polyester"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00319">
+      <rMaterial name="materials:Polyvinylchloride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01264">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorBC" density="1.0197*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.265">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.115">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.052">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.006">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.562">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorC_3Disks" density="1.10155*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorC_10Disks" density="1.96694*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorC_Upgrade" density="0.176868*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="PixelBarrelSupTubCables" density="0.5859*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.09162">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14907">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28441">
+      <rMaterial name="materials:Polyethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.4749">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+ <CompositeMaterial name="PixelBarrelSupTubCables2" density="0.37368*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.09162">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14907">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28441">
+      <rMaterial name="materials:Polyethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.4749">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="PixelBarrelSupTubCables2_3Disks" density="0.86414*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PixelBarrelSupTubCables2_10Disks" density="1.47092*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+</MaterialSection>
+
+</DDDefinition>
+
diff --git a/Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v1/pixbarmaterial.xml b/Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v1/pixbarmaterial.xml
new file mode 100644
index 0000000000000..e6d2e9809a4bd
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/FlatPlus05Percent/2021/v1/pixbarmaterial.xml
@@ -0,0 +1,826 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<MaterialSection label="pixbarmaterial.xml">
+    <CompositeMaterial name="CFK" density="1.65375*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="Bpix_Pipe_Steel" density="8.421*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.0005">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.18">
+        <rMaterial name="materials:Chromium"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.1">
+        <rMaterial name="materials:Nickel"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.7195">
+        <rMaterial name="materials:Iron"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="Bpix_CO2_-20C" density="1.08434*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.27292145">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.72707855">
+        <rMaterial name="materials:Oxygen"/>
+      </MaterialFraction>
+    </CompositeMaterial>  
+
+<!--  Upgrade-->
+    <CompositeMaterial name="SupplyTubeConn3_Upgrade" density="0.51114*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.560">
+      <rMaterial name="trackermaterial:micro_twisted_boundle"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.440">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+<!-- New materials -->
+  <CompositeMaterial name="Polyurethane" density="0.05187*g/cm3" symbol=" " method="mixture by weight">   <!-- Airex -->
+     <MaterialFraction fraction="0.09">
+      <rMaterial name="materials:Nitrogen"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.6559">
+      <rMaterial name="materials:Carbon"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.0486">
+       <rMaterial name="materials:Hydrogen"/>
+     </MaterialFraction>
+    <MaterialFraction fraction="0.2056">
+       <rMaterial name="materials:Oxygen"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="SupplyTubeEpoxy" density="1.1025*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.5999">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0719">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.2283">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0999">
+      <rMaterial name="materials:Nitrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SupplyTubeConn3" density="0.37338*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="0.027795">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.015259">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.0944924">
+      <rMaterial name="Polyurethane"/>
+     </MaterialFraction>
+	 <MaterialFraction fraction="0.256154">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+	 <MaterialFraction fraction="0.113846">
+      <rMaterial name="SupplyTubeEpoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.335428">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.085225">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.071801">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+   </CompositeMaterial>
+   
+  <CompositeMaterial name="SupplyTubeConn3_3Disks" density="0.48783*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="SupplyTubeConn3_10Disks" density="0.83034*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="CoolPipesDaisyChain" density="6.30*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="0.6458">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.3542">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+   
+  <CompositeMaterial name="Flange1_Airex" density="0.0283185*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange2_Airex" density="0.0283185*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange3_Airex" density="0.0283185*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange4_InnerCFK" density="1.050*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:CFK"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="Flange1_CFK" density="0.903*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange2_CFK" density="0.903*g/cm3" symbol=" " method="mixture by weight"> 
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange3_CFK" density="0.903*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange4_CFK" density="1.65375*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Polyoxymethylene" density="1.47*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="0.4">
+      <rMaterial name="materials:Carbon"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.06667">
+       <rMaterial name="materials:Hydrogen"/>
+     </MaterialFraction>
+    <MaterialFraction fraction="0.5333">
+       <rMaterial name="materials:Oxygen"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="BPix_Silicone" density="1.365*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.3787448">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.21575329">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3239468">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.08155498">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+   <CompositeMaterial name="LCP_Glass_Enforced" density="2.10*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.08">
+          <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.52">
+          <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.39">
+          <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01">
+          <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+   <CompositeMaterial name="Silicon_Nitride" density="3.57*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.6006">
+          <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3994">
+          <rMaterial name="materials:Nitrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Full" density="3.85619*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75244">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15186">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04271">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05299">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Full_Upgrade" density="0.385619*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75244">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15186">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04271">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05299">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Half" density="3.34287*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.86861">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06085">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04931">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02123">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Hybrid_Full" density="4.63669*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.0063">
+      <rMaterial name="materials:Indium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.09358">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05034">
+      <rMaterial name="materials:Nickel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3217">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02405">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04379">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1596">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23875">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00379">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00741">
+      <rMaterial name="materials:Alumina"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0507">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Hybrid_Half" density="5.99196*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.00443">
+      <rMaterial name="materials:Indium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1322">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.03912">
+      <rMaterial name="materials:Nickel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.24865">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0185">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06187">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.22547">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00267">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.185">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01047">
+      <rMaterial name="materials:Alumina"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.07162">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Capacitor" density="2.33391*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="T_Pix_Bar_Cool" density="2.05219*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.61432">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.38568">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Bpix_CO2_-20C_Half" density="2.16867*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Bpix_Pipe_Steel_Half" density="16.842*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable" density="1.7601*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.43796">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02339">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19088">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.34777">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable_Upgrade" density="0.586698*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Pix_Bar_Cable"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+    <CompositeMaterial name="Pix_Bar_CableSignal_Upgrade" density="0.97125*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.249079">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.476682">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.274239">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+     <CompositeMaterial name="Pix_Bar_CablePower_Upgrade" density="0.97125*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.110505">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.751012">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.138483">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable_Layer1_Upgrade" density="6.006*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.46">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.54">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Pix_Bar_Cable_Layer234_Upgrade" density="4.5255*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.46">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.54">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer1" density="1.97789*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer2" density="1.83236*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer3" density="1.85551*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer4" density="2.04073*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Flange_with_Manifold_Layer1" density="5.25098*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.1636">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25809">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23898">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.12917">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19713">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01304">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Flange_with_Manifold_Upgrade" density="1.45883*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.1216">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1647">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.27897">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.35331">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02816">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05321">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Flange_with_Manifold_Layer2" density="5.61378*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.14778">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28678">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.20276">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15657">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.18269">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02342">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeInner_with_Manifold_Layer3" density="5.1513*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.10879">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.35422">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.36829">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.16871">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeOuter_Layer3" density="0.452991*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.11657">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.87067">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00339">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00938">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="T_CarbonFibreStrBox" density="1.85173*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeOuter_Layer3_Upgrade" density="0.151001*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="FlangeOuter_Layer3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+ <CompositeMaterial name="cable_endring_to_tube" density="2.04014*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.10301">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15922">
+      <rMaterial name="pixfwdMaterials:FPix_Silicone"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06696">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04431">
+      <rMaterial name="pixfwdMaterials:FPix_Cylind_Noryl"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02972">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.40314">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19365">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="cable_endring_to_tube_Upgrade" density="0.680043*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="cable_endring_to_tube"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer1_2_EndringPrints" density="1.22678*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.01765">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23843">
+      <rMaterial name="pixbarmaterial:LCP_Glass_Enforced"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3061">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00657">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01658">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.41468">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer1_2_EndringPrints_Upgrade" density="0.408923*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Layer1_2_EndringPrints"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer3_EndringPrints" density="1.1408*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.01766">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.238">
+      <rMaterial name="pixbarmaterial:LCP_Glass_Enforced"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.30544">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00789">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01706">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.41396">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer3_EndringPrints_Upgrade" density="0.380268*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Layer3_EndringPrints"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="silicone_pipes_plus_coolant" density="0.273315*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.53007">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.46993">
+      <rMaterial name="pixbarmaterial:BPix_Silicone"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+ <CompositeMaterial name="SectorA" density="0.441*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.329">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.333">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.320">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.018">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorA_3Disks" density="0.586026*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorA_10Disks" density="0.997511*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorB" density="0.787091*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.19011">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00494">
+      <rMaterial name="pixbarmaterial:Polyoxymethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1187">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14233">
+      <rMaterial name="materials:Acrylate"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0512">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.18915">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06486">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.17137">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05152">
+      <rMaterial name="materials:Polyvinylchloride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01581">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorC" density="0.83244*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.14778">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0139">
+      <rMaterial name="pixbarmaterial:Polyoxymethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.22693">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.11069">
+      <rMaterial name="materials:Acrylate"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.03989">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14938">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01005">
+      <rMaterial name="pixfwdMaterials:FPix_TinLeadSolder"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06396">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.20077">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02082">
+      <rMaterial name="pixfwdMaterials:FPix_Cylind_Polyester"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00319">
+      <rMaterial name="materials:Polyvinylchloride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01264">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorBC" density="1.18965*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.265">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.115">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.052">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.006">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.562">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorC_3Disks" density="1.28514*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorC_10Disks" density="2.29476*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorC_Upgrade" density="0.206346*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="PixelBarrelSupTubCables" density="0.68355*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.09162">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14907">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28441">
+      <rMaterial name="materials:Polyethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.4749">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+ <CompositeMaterial name="PixelBarrelSupTubCables2" density="0.43596*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.09162">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14907">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28441">
+      <rMaterial name="materials:Polyethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.4749">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="PixelBarrelSupTubCables2_3Disks" density="1.00817*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PixelBarrelSupTubCables2_10Disks" density="1.71608*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+</MaterialSection>
+
+</DDDefinition>
+
diff --git a/Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v1/pixbarmaterial.xml b/Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v1/pixbarmaterial.xml
new file mode 100644
index 0000000000000..eaf9a1ecef177
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/FlatPlus10Percent/2021/v1/pixbarmaterial.xml
@@ -0,0 +1,826 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<MaterialSection label="pixbarmaterial.xml">
+    <CompositeMaterial name="CFK" density="1.7325*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="Bpix_Pipe_Steel" density="8.822*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.0005">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.18">
+        <rMaterial name="materials:Chromium"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.1">
+        <rMaterial name="materials:Nickel"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.7195">
+        <rMaterial name="materials:Iron"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="Bpix_CO2_-20C" density="1.3597*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.27292145">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.72707855">
+        <rMaterial name="materials:Oxygen"/>
+      </MaterialFraction>
+    </CompositeMaterial>  
+
+<!--  Upgrade-->
+    <CompositeMaterial name="SupplyTubeConn3_Upgrade" density="0.53548*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.560">
+      <rMaterial name="trackermaterial:micro_twisted_boundle"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.440">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+<!-- New materials -->
+  <CompositeMaterial name="Polyurethane" density="0.05434*g/cm3" symbol=" " method="mixture by weight">   <!-- Airex -->
+     <MaterialFraction fraction="0.09">
+      <rMaterial name="materials:Nitrogen"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.6559">
+      <rMaterial name="materials:Carbon"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.0486">
+       <rMaterial name="materials:Hydrogen"/>
+     </MaterialFraction>
+    <MaterialFraction fraction="0.2056">
+       <rMaterial name="materials:Oxygen"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="SupplyTubeEpoxy" density="1.155*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.5999">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0719">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.2283">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0999">
+      <rMaterial name="materials:Nitrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SupplyTubeConn3" density="0.39116*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="0.027795">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.015259">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.0944924">
+      <rMaterial name="Polyurethane"/>
+     </MaterialFraction>
+	 <MaterialFraction fraction="0.256154">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+	 <MaterialFraction fraction="0.113846">
+      <rMaterial name="SupplyTubeEpoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.335428">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.085225">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.071801">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+   </CompositeMaterial>
+   
+  <CompositeMaterial name="SupplyTubeConn3_3Disks" density="0.51106*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="SupplyTubeConn3_10Disks" density="0.86988*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="CoolPipesDaisyChain" density="6.60*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="0.6458">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.3542">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+   
+  <CompositeMaterial name="Flange1_Airex" density="0.029667*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange2_Airex" density="0.029667*g/cm3" symbol=" " method="mixture by weight"> 
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange3_Airex" density="0.029667*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:Polyurethane"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+  <CompositeMaterial name="Flange4_InnerCFK" density="1.100*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="1.00">
+      <rMaterial name="pixbarmaterial:CFK"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="Flange1_CFK" density="0.946*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange2_CFK" density="0.946*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange3_CFK" density="0.946*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Flange4_CFK" density="1.7325*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Polyoxymethylene" density="1.54*g/cm3" symbol=" " method="mixture by weight">
+     <MaterialFraction fraction="0.4">
+      <rMaterial name="materials:Carbon"/>
+     </MaterialFraction>
+     <MaterialFraction fraction="0.06667">
+       <rMaterial name="materials:Hydrogen"/>
+     </MaterialFraction>
+    <MaterialFraction fraction="0.5333">
+       <rMaterial name="materials:Oxygen"/>
+     </MaterialFraction>
+   </CompositeMaterial>
+
+  <CompositeMaterial name="BPix_Silicone" density="1.43*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.3787448">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.21575329">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3239468">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.08155498">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+   <CompositeMaterial name="LCP_Glass_Enforced" density="2.2*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.08">
+          <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.52">
+          <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.39">
+          <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01">
+          <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+   <CompositeMaterial name="Silicon_Nitride" density="3.74*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.6006">
+          <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3994">
+          <rMaterial name="materials:Nitrogen"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Full" density="4.03982*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75244">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15186">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04271">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05299">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Full_Upgrade" density="0.403982*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75244">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15186">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04271">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05299">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Baseplate_Half" density="3.50206*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.86861">
+      <rMaterial name="pixbarmaterial:Silicon_Nitride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06085">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04931">
+      <rMaterial name="trackermaterial:T_Silicone_Gel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02123">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Hybrid_Full" density="4.85749*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.0063">
+      <rMaterial name="materials:Indium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.09358">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05034">
+      <rMaterial name="materials:Nickel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3217">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02405">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04379">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1596">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23875">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00379">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00741">
+      <rMaterial name="materials:Alumina"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0507">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Hybrid_Half" density="6.27729*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.00443">
+      <rMaterial name="materials:Indium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1322">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.03912">
+      <rMaterial name="materials:Nickel"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.24865">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0185">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06187">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.22547">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00267">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.185">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01047">
+      <rMaterial name="materials:Alumina"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.07162">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Capacitor" density="2.44505*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1">
+      <rMaterial name="trackermaterial:T_Barium_Titanate"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="T_Pix_Bar_Cool" density="2.14992*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.61432">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.38568">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Bpix_CO2_-20C_Half" density="2.27194*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Bpix_Pipe_Steel_Half" density="17.644*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable" density="1.84392*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.43796">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02339">
+      <rMaterial name="materials:Gold"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19088">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.34777">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable_Upgrade" density="0.614636*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Pix_Bar_Cable"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+    <CompositeMaterial name="Pix_Bar_CableSignal_Upgrade" density="1.0175*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.249079">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.476682">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.274239">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+     <CompositeMaterial name="Pix_Bar_CablePower_Upgrade" density="1.0175*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.110505">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.751012">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.138483">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Pix_Bar_Cable_Layer1_Upgrade" density="6.292*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.46">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.54">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Pix_Bar_Cable_Layer234_Upgrade" density="4.741*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.46">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.54">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer1" density="2.07207*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer2" density="1.91961*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer3" density="1.94387*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="CFK_Layer4" density="2.1379*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000">
+      <rMaterial name="pixbarmaterial:CFK"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Flange_with_Manifold_Layer1" density="5.50102*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.1636">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25809">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23898">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.12917">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19713">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01304">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Flange_with_Manifold_Upgrade" density="1.5283*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.1216">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1647">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.27897">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.35331">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02816">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05321">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Flange_with_Manifold_Layer2" density="5.88111*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.14778">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28678">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.20276">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15657">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.18269">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02342">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeInner_with_Manifold_Layer3" density="5.3966*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.10879">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.35422">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.36829">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.16871">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeOuter_Layer3" density="0.474562*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.11657">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.87067">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00339">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00938">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="T_CarbonFibreStrBox" density="1.93991*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="FlangeOuter_Layer3_Upgrade" density="0.158191*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="FlangeOuter_Layer3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+ <CompositeMaterial name="cable_endring_to_tube" density="2.13729*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.10301">
+      <rMaterial name="trackermaterial:T_Kapton"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.15922">
+      <rMaterial name="pixfwdMaterials:FPix_Silicone"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06696">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.04431">
+      <rMaterial name="pixfwdMaterials:FPix_Cylind_Noryl"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02972">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.40314">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.19365">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="cable_endring_to_tube_Upgrade" density="0.712426*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="cable_endring_to_tube"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer1_2_EndringPrints" density="1.2852*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.01765">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.23843">
+      <rMaterial name="pixbarmaterial:LCP_Glass_Enforced"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.3061">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00657">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01658">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.41468">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer1_2_EndringPrints_Upgrade" density="0.428395*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Layer1_2_EndringPrints"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer3_EndringPrints" density="1.19513*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.01766">
+      <rMaterial name="materials:Lead"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.238">
+      <rMaterial name="pixbarmaterial:LCP_Glass_Enforced"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.30544">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00789">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01706">
+      <rMaterial name="materials:Tin"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.41396">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="Layer3_EndringPrints_Upgrade" density="0.398376*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="Layer3_EndringPrints"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="silicone_pipes_plus_coolant" density="0.28633*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.53007">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.46993">
+      <rMaterial name="pixbarmaterial:BPix_Silicone"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+ <CompositeMaterial name="SectorA" density="0.4620*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.329">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.333">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.320">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.018">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorA_3Disks" density="0.613932*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorA_10Disks" density="1.04501*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorB" density="0.824571*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.19011">
+      <rMaterial name="materials:C6F14_F2_-10C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00494">
+      <rMaterial name="pixbarmaterial:Polyoxymethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.1187">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14233">
+      <rMaterial name="materials:Acrylate"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0512">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.18915">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06486">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.17137">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.05152">
+      <rMaterial name="materials:Polyvinylchloride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01581">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorC" density="0.87208*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.14778">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0139">
+      <rMaterial name="pixbarmaterial:Polyoxymethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.22693">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.11069">
+      <rMaterial name="materials:Acrylate"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.03989">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14938">
+      <rMaterial name="materials:Epoxy"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01005">
+      <rMaterial name="pixfwdMaterials:FPix_TinLeadSolder"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.06396">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.20077">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.02082">
+      <rMaterial name="pixfwdMaterials:FPix_Cylind_Polyester"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.00319">
+      <rMaterial name="materials:Polyvinylchloride"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.01264">
+      <rMaterial name="trackermaterial:T_Nomex"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorBC" density="1.2463*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.265">
+      <rMaterial name="trackermaterial:T_FR4"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.115">
+      <rMaterial name="trackermaterial:T_Aluminium"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.052">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.006">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.562">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorC_3Disks" density="1.34633*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorC_10Disks" density="2.40404*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="SectorC_Upgrade" density="0.216172*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+  <CompositeMaterial name="PixelBarrelSupTubCables" density="0.7161*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.09162">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14907">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28441">
+      <rMaterial name="materials:Polyethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.4749">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+ <CompositeMaterial name="PixelBarrelSupTubCables2" density="0.45672*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.09162">
+      <rMaterial name="pixbarmaterial:Bpix_CO2_-20C"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.14907">
+      <rMaterial name="materials:Steel-008"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.28441">
+      <rMaterial name="materials:Polyethylene"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.4749">
+      <rMaterial name="trackermaterial:T_Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="PixelBarrelSupTubCables2_3Disks" density="1.05618*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PixelBarrelSupTubCables2_10Disks" density="1.7978*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+
+</MaterialSection>
+
+</DDDefinition>
+
diff --git a/Geometry/TrackerCommonData/data/zeroMaterial/2021/v2/pixbarmaterial.xml b/Geometry/TrackerCommonData/data/zeroMaterial/2021/v2/pixbarmaterial.xml
new file mode 100644
index 0000000000000..f4304b0099d7c
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/zeroMaterial/2021/v2/pixbarmaterial.xml
@@ -0,0 +1,795 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+  <MaterialSection label="pixbarmaterial.xml">
+    <!-- Phase1 BPIX CFStrip material as defined by W. Bertl-->
+    <CompositeMaterial name="CFK" density="1.575e-07*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Bpix_Pipe_Steel" density="8.02e-07*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.0005">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.18">
+        <rMaterial name="materials:Chromium"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.1">
+        <rMaterial name="materials:Nickel"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.7195">
+        <rMaterial name="materials:Iron"/>
+      </MaterialFraction>
+    </CompositeMaterial>  
+    <CompositeMaterial name="Bpix_CO2_-20C" density="1.0327e-07*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.27292145">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.72707855">
+        <rMaterial name="materials:Oxygen"/>
+      </MaterialFraction>
+    </CompositeMaterial>  
+
+    <CompositeMaterial name="Polyurethane" density="4.94e-09*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.09">
+        <rMaterial name="materials:Nitrogen" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.6559">
+        <rMaterial name="materials:Carbon" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0486">
+        <rMaterial name="materials:Hydrogen" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.2056">
+        <rMaterial name="materials:Oxygen" />
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="SupplyTubeConn3_Upgrade" density="4.24e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.640">
+        <rMaterial name="trackermaterial:micro_twisted_boundle" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.360">
+        <rMaterial name="pixbarmaterial:CFK" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SupplyTubeEpoxy" density="1.05e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.5999">
+        <rMaterial name="materials:Carbon" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0719">
+        <rMaterial name="materials:Hydrogen" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.2283">
+        <rMaterial name="materials:Oxygen" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0999">
+        <rMaterial name="materials:Nitrogen" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SupplyTubeConn3" density="1.70599616340055e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="5.79362498699793e-09">
+        <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0318060527708586">
+        <rMaterial name="pixbarmaterial:Bpix_CO2_-20C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.196961154783739">
+        <rMaterial name="Polyurethane" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.533930640373977">
+        <rMaterial name="pixbarmaterial:CFK" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.237302043630065">
+        <rMaterial name="SupplyTubeEpoxy" />
+      </MaterialFraction>
+      <MaterialFraction fraction="6.99170369540832e-08">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="1.77644068903363e-08">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+      <MaterialFraction fraction="1.49662913362633e-08">
+        <rMaterial name="trackermaterial:T_Kapton" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SupplyTubeConn3_3Disks" density="2.22892524610769e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:SupplyTubeConn3" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SupplyTubeConn3_10Disks" density="3.79387448261291e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:SupplyTubeConn3" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="CoolPipesDaisyChain" density="2.12520038748e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1.82326336039992e-07">
+        <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.999999817673664">
+        <rMaterial name="pixbarmaterial:Bpix_CO2_-20C" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange1_Airex" density="2.697e-09*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:Polyurethane" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange2_Airex" density="2.697e-09*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:Polyurethane" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange3_Airex" density="2.697e-09*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:Polyurethane" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange4_InnerCFK" density="4.94e-09*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:Polyurethane" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange1_CFK" density="8.6e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="pixbarmaterial:CFK" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange2_CFK" density="8.6e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="pixbarmaterial:CFK" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange3_CFK" density="8.6e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="pixbarmaterial:CFK" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange4_CFK" density="1.575e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="pixbarmaterial:CFK" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Polyoxymethylene" density="1.4e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.4">
+        <rMaterial name="materials:Carbon" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.06667">
+        <rMaterial name="materials:Hydrogen" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.5333">
+        <rMaterial name="materials:Oxygen" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="BPix_Silicone" density="1.3e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.3787448">
+        <rMaterial name="materials:Silicon" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.21575329">
+        <rMaterial name="materials:Oxygen" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.3239468">
+        <rMaterial name="materials:Carbon" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.08155498">
+        <rMaterial name="materials:Hydrogen" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="LCP_Glass_Enforced" density="2e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.08">
+        <rMaterial name="materials:Silicon" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.52">
+        <rMaterial name="materials:Carbon" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.39">
+        <rMaterial name="materials:Oxygen" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.01">
+        <rMaterial name="materials:Hydrogen" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Silicon_Nitride" density="3.4e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.6006">
+        <rMaterial name="materials:Silicon" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.3994">
+        <rMaterial name="materials:Nitrogen" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Baseplate_Full" density="3.67255999999999e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.75244">
+        <rMaterial name="pixbarmaterial:Silicon_Nitride" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.15186">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.04271">
+        <rMaterial name="trackermaterial:T_Silicone_Gel" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.05299">
+        <rMaterial name="materials:Epoxy" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Baseplate_Full_Upgrade" density="3.67256e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.75244">
+        <rMaterial name="pixbarmaterial:Silicon_Nitride" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.15186">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.04271">
+        <rMaterial name="trackermaterial:T_Silicone_Gel" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.05299">
+        <rMaterial name="materials:Epoxy" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Baseplate_Half" density="3.18369000000001e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.86861">
+        <rMaterial name="pixbarmaterial:Silicon_Nitride" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.06085">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.04931">
+        <rMaterial name="trackermaterial:T_Silicone_Gel" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.02123">
+        <rMaterial name="materials:Epoxy" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Hybrid_Full" density="4.41594415899998e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.00629993700062999">
+        <rMaterial name="materials:Indium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0935790642093579">
+        <rMaterial name="materials:Lead" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.050339496605034">
+        <rMaterial name="materials:Nickel" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.32169678303217">
+        <rMaterial name="trackermaterial:T_Kapton" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.024049759502405">
+        <rMaterial name="materials:Gold" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0437895621043789">
+        <rMaterial name="materials:Epoxy" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.15959840401596">
+        <rMaterial name="materials:Tin" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.238747612523875">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.00378996210037899">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.00740992590074099">
+        <rMaterial name="materials:Alumina" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0506994930050699">
+        <rMaterial name="trackermaterial:T_Barium_Titanate" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Hybrid_Half" density="5.70662999999997e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.00443">
+        <rMaterial name="materials:Indium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.1322">
+        <rMaterial name="materials:Lead" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.03912">
+        <rMaterial name="materials:Nickel" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.24865">
+        <rMaterial name="trackermaterial:T_Kapton" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0185">
+        <rMaterial name="materials:Gold" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.06187">
+        <rMaterial name="materials:Epoxy" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.22547">
+        <rMaterial name="materials:Tin" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.00267">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.185">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.01047">
+        <rMaterial name="materials:Alumina" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.07162">
+        <rMaterial name="trackermaterial:T_Barium_Titanate" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Capacitor" density="2.22277e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="trackermaterial:T_Barium_Titanate" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="T_Pix_Bar_Cool" density="1.95447e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.61432">
+        <rMaterial name="materials:C6F14_F2_-10C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.38568">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Bpix_CO2_-20C_Half" density="2.0654e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:Bpix_CO2_-20C" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Bpix_Pipe_Steel_Half" density="1.604e-06*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:Bpix_Pipe_Steel" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Cable" density="1.67629e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.43796">
+        <rMaterial name="trackermaterial:T_Kapton" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.02339">
+        <rMaterial name="materials:Gold" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.19088">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.34777">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Cable_Upgrade" density="5.58759999999997e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:Pix_Bar_Cable" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_CableSignal_Upgrade" density="9.24999999999998e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.249079">
+        <rMaterial name="trackermaterial:T_Kapton" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.476682">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.274239">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_CablePower_Upgrade" density="9.25000000000005e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.110505">
+        <rMaterial name="trackermaterial:T_Kapton" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.751012">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.138483">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Cable_Layer1_Upgrade" density="5.72e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.46">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.54">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Pix_Bar_Cable_Layer234_Upgrade" density="4.31e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.46">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.54">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="CFK_Layer1" density="1.575*1.196e-07*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.000">
+	<rMaterial name="pixbarmaterial:CFK"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="CFK_Layer2" density="1.575*1.108e-07*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.000">
+	<rMaterial name="pixbarmaterial:CFK"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="CFK_Layer3" density="1.575*1.122e-07*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.000">
+	<rMaterial name="pixbarmaterial:CFK"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="CFK_Layer4" density="1.575*1.234e-07*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.000">
+	<rMaterial name="pixbarmaterial:CFK"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange_with_Manifold_Layer1" density="5.00098000929998e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.16359836401636">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.258087419125809">
+        <rMaterial name="materials:C6F14_F2_-10C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.238977610223898">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.129168708312917">
+        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.197128028719713">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.013039869601304">
+        <rMaterial name="trackermaterial:T_Nomex" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange_with_Manifold_Upgrade" density="1.389290532e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.121606080304015">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.164708235411771">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.27898394919746">
+        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.353327666383319">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0281614080704035">
+        <rMaterial name="trackermaterial:T_Nomex" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0532126606330316">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Flange_with_Manifold_Layer2" density="5.34646000000001e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.14778">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.28678">
+        <rMaterial name="materials:C6F14_F2_-10C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.20276">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.15657">
+        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.18269">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.02342">
+        <rMaterial name="trackermaterial:T_Nomex" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="FlangeInner_with_Manifold_Layer3" density="4.90604906e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.108788912110879">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.354216457835422">
+        <rMaterial name="materials:C6F14_F2_-10C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.368286317136829">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.168708312916871">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="FlangeOuter_Layer3" density="4.3142e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.11657">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.87067">
+        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.00339">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.00938">
+        <rMaterial name="materials:Air" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="T_CarbonFibreStrBox" density="1.76355e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="trackermaterial:T_CarbonFibreStr" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="FlangeOuter_Layer3_Upgrade" density="1.4381e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:FlangeOuter_Layer3" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="cable_endring_to_tube" density="1.9430094299e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.103008969910301">
+        <rMaterial name="trackermaterial:T_Kapton" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.159218407815922">
+        <rMaterial name="pixfwdMaterials:FPix_Silicone" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0669593304066959">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.044309556904431">
+        <rMaterial name="pixfwdMaterials:FPix_Cylind_Noryl" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.029719702802972">
+        <rMaterial name="materials:Epoxy" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.403135968640313">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.193648063519365">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="cable_endring_to_tube_Upgrade" density="6.47666476600003e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:cable_endring_to_tube" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Layer1_2_EndringPrints" density="1.1683716836e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.017649823501765">
+        <rMaterial name="materials:Lead" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.238427615723843">
+        <rMaterial name="pixbarmaterial:LCP_Glass_Enforced" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.30609693903061">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.00656993430065699">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.016579834201658">
+        <rMaterial name="materials:Tin" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.414675853241468">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Layer1_2_EndringPrints_Upgrade" density="3.89453894500001e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:Layer1_2_EndringPrints" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Layer3_EndringPrints" density="1.0864908648e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.017659823401766">
+        <rMaterial name="materials:Lead" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.2379976200238">
+        <rMaterial name="pixbarmaterial:LCP_Glass_Enforced" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.305436945630544">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.00788992110078899">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.017059829401706">
+        <rMaterial name="materials:Tin" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.413955860441395">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Layer3_EndringPrints_Upgrade" density="3.621636216e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:Layer3_EndringPrints" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="silicone_pipes_plus_coolant" density="2.603e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.53007">
+        <rMaterial name="materials:C6F14_F2_-10C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.46993">
+        <rMaterial name="pixbarmaterial:BPix_Silicone" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SectorA" density="3.661e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.329">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.333">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.32">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.018">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SectorA_3Disks" density="5.5812e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:SectorA" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SectorA_10Disks" density="9.5001e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:SectorA" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SectorB" density="7.496025039e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.190111901119011">
+        <rMaterial name="materials:C6F14_F2_-10C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.004940049400494">
+        <rMaterial name="pixbarmaterial:Polyoxymethylene" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.11870118701187">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.142331423314233">
+        <rMaterial name="materials:Acrylate" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.05120051200512">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.189151891518915">
+        <rMaterial name="materials:Epoxy" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.064860648606486">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.171371713717137">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.051520515205152">
+        <rMaterial name="materials:Polyvinylchloride" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.015810158101581">
+        <rMaterial name="trackermaterial:T_Nomex" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SectorC" density="7.92799999999996e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.14778">
+        <rMaterial name="pixbarmaterial:Bpix_CO2_-20C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0139">
+        <rMaterial name="pixbarmaterial:Polyoxymethylene" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.22693">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.11069">
+        <rMaterial name="materials:Acrylate" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.03989">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.14938">
+        <rMaterial name="materials:Epoxy" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.01005">
+        <rMaterial name="pixfwdMaterials:FPix_TinLeadSolder" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.06396">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.20077">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.02082">
+        <rMaterial name="pixfwdMaterials:FPix_Cylind_Polyester" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.00319">
+        <rMaterial name="materials:Polyvinylchloride" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.01264">
+        <rMaterial name="trackermaterial:T_Nomex" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SectorBC" density="9.875e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.265">
+        <rMaterial name="trackermaterial:T_FR4" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.115">
+        <rMaterial name="trackermaterial:T_Aluminium" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.052">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.006">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.562">
+        <rMaterial name="materials:Silicon" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SectorC_3Disks" density="1.22394e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:SectorC" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SectorC_10Disks" density="2.18549e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:SectorC" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="SectorC_Upgrade" density="1.9652e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:SectorC" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="PixelBarrelSupTubCables" density="6.51e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.09162">
+        <rMaterial name="pixbarmaterial:Bpix_CO2_-20C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.14907">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.28441">
+        <rMaterial name="materials:Polyethylene" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.4749">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="PixelBarrelSupTubCables2" density="4.152e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="0.09162">
+        <rMaterial name="pixbarmaterial:Bpix_CO2_-20C" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.14907">
+        <rMaterial name="materials:Steel-008" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.28441">
+        <rMaterial name="materials:Polyethylene" />
+      </MaterialFraction>
+      <MaterialFraction fraction="0.4749">
+        <rMaterial name="trackermaterial:T_Copper" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="PixelBarrelSupTubCables2_3Disks" density="9.6016e-08*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2" />
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="PixelBarrelSupTubCables2_10Disks" density="1.63436e-07*g/cm3" method="mixture by weight" pork="true" symbol=" ">
+      <MaterialFraction fraction="1">
+        <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2" />
+      </MaterialFraction>
+    </CompositeMaterial>
+
+    <CompositeMaterial name="T_Pix_Bar_Det" density="2.33e-05*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="materials:Silicon"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="T_Pix_Bar_Hybrid" density="3.918e-05*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="0.12227401">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.020384302">
+        <rMaterial name="materials:Hydrogen"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.23710889">
+        <rMaterial name="materials:Oxygen"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.24417229">
+        <rMaterial name="materials:Copper"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.17802235">
+        <rMaterial name="materials:Silicon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.19803815">
+        <rMaterial name="materials:Aluminium"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="T_Pix_Bar_Readout" density="2.33e-05*g/cm3" symbol=" " method="mixture by weight">
+      <MaterialFraction fraction="1.00000000">
+        <rMaterial name="materials:Silicon"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+  </MaterialSection>
+
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml b/Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml
new file mode 100644
index 0000000000000..d1fd9313994cd
--- /dev/null
+++ b/Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+ <MaterialSection label="RP_Materials.xml">
+  <CompositeMaterial name="PPS_AISI-316L-Steel" density="8*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="0.0003">
+    <rMaterial name="materials:Carbon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.02">
+    <rMaterial name="materials:Manganese"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.01">
+    <rMaterial name="materials:Silicon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.00045">
+    <rMaterial name="materials:Phosphor"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.0003">
+    <rMaterial name="materials:Sulfur"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.12">
+    <rMaterial name="materials:Nickel"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.18">
+    <rMaterial name="materials:Chromium"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.025">
+    <rMaterial name="materials:Molybdenum"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.64395">
+    <rMaterial name="materials:Iron"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="PPS_PCB" density="1.957*g/cm3" symbol=" " method="mixture by weight">
+  <MaterialFraction fraction="0.2562774130">
+   <rMaterial name="materials:Silicon"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.4720560530">
+   <rMaterial name="materials:Oxygen"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.0054740637">
+   <rMaterial name="materials:Bor 10"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.0240858800">
+   <rMaterial name="materials:Bor 11"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.0419495748">
+   <rMaterial name="materials:Sodium"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.1606190730">
+   <rMaterial name="materials:Carbon"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.0395379420">
+   <rMaterial name="materials:Hydrogen"/>
+  </MaterialFraction>
+ </CompositeMaterial>
+ 
+  <CompositeMaterial name="PPS_CE7" density="2.44*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="0.7">
+    <rMaterial name="materials:Silicon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.3">
+    <rMaterial name="materials:Aluminium"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+ </MaterialSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/VeryForwardData/data/dd4hep/cmsExtendedGeometry2021.xml
index e4ac6d75f7536..c7f76f90d4bbc 100644
--- a/Geometry/VeryForwardData/data/dd4hep/cmsExtendedGeometry2021.xml
+++ b/Geometry/VeryForwardData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -287,7 +287,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -342,7 +342,6 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
diff --git a/Geometry/VeryForwardGeometry/data/dd4hep/v5/geometryRPFromDD_2021.xml b/Geometry/VeryForwardGeometry/data/dd4hep/v5/geometryRPFromDD_2021.xml
new file mode 100644
index 0000000000000..1a2824670d25e
--- /dev/null
+++ b/Geometry/VeryForwardGeometry/data/dd4hep/v5/geometryRPFromDD_2021.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <open_geometry/>
+  <close_geometry/>
+  
+  <IncludeSection>
+    # common and strip files
+    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/extend/cmsextent.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cms/2017/v1/cms.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/beampipe/2017/v1/beampipe.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsBeam.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/mgnt.xml"/>
+    <Include ref="Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml"/>
+    <Include ref="Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v2/pixfwdMaterials.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/forward.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/totemRotations.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/totemMaterials.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml"/>
+    <!--<Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_022.xml"/>-->
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml"/>
+    <!--<Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_122.xml"/>-->
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Transformations.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml"/>
+    <!--<Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_022.xml"/>-->
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml"/>
+    <!--<Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_122.xml"/>-->
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Device.xml"/>
+
+    <Include ref="Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Reco/v2/RP_Vertical_Device.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Reco/v2/RP_Horizontal_Device.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Right_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Right_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Left_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Left_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v1/RP_Stations_Assembly.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Reco/v1/RP_Cuts_Per_Region.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/RP_Param_Beam_Region/v1/RP_Param_Beam_Region.xml"/>
+
+    # diamond files
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_X_Distance.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Timing_Positive_Station/v1/CTPPS_Timing_Positive_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Timing_Negative_Station/v1/CTPPS_Timing_Negative_Station.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Reco/v1/CTPPS_Timing_Stations_Assembly.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml"/>
+
+    # Totem Timing files
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Dist_Beam_Cent.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/TotemTiming_DetectorAssembly.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Parameters.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Plane.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/TotemTiming/v1/TotemTiming_Station.xml"/>
+
+    # pixel files
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml"/>
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml"/>
+
+    # RP distance
+    <Include ref="Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Reco/v1/RP_Dist_Beam_Cent.xml"/>    
+            
+  </IncludeSection>
+</DDDefinition> 
diff --git a/Geometry/VeryForwardGeometry/python/dd4hep/geometryRPFromDD_2021_cfi.py b/Geometry/VeryForwardGeometry/python/dd4hep/geometryRPFromDD_2021_cfi.py
index fb5adb97ce8dc..2960f549fc004 100644
--- a/Geometry/VeryForwardGeometry/python/dd4hep/geometryRPFromDD_2021_cfi.py
+++ b/Geometry/VeryForwardGeometry/python/dd4hep/geometryRPFromDD_2021_cfi.py
@@ -1 +1 @@
-from Geometry.VeryForwardGeometry.dd4hep.v4.geometryRPFromDD_2021_cfi import *
+from Geometry.VeryForwardGeometry.dd4hep.v5.geometryRPFromDD_2021_cfi import *
diff --git a/Geometry/VeryForwardGeometry/python/dd4hep/v5/geometryRPFromDD_2021_cfi.py b/Geometry/VeryForwardGeometry/python/dd4hep/v5/geometryRPFromDD_2021_cfi.py
new file mode 100644
index 0000000000000..014cd2966fc35
--- /dev/null
+++ b/Geometry/VeryForwardGeometry/python/dd4hep/v5/geometryRPFromDD_2021_cfi.py
@@ -0,0 +1,18 @@
+import FWCore.ParameterSet.Config as cms
+
+DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
+                                            confGeomXMLFiles = cms.FileInPath('Geometry/VeryForwardGeometry/data/dd4hep/v5/geometryRPFromDD_2021.xml'),
+                                            appendToDataLabel = cms.string('XMLIdealGeometryESSource_CTPPS')
+)
+
+DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer",
+                                            appendToDataLabel = cms.string('XMLIdealGeometryESSource_CTPPS')
+)
+
+ctppsGeometryESModule = cms.ESProducer("CTPPSGeometryESModule",
+    fromDD4hep = cms.untracked.bool(True),
+    isRun2 = cms.bool(False),
+    verbosity = cms.untracked.uint32(1),
+    compactViewTag = cms.string('XMLIdealGeometryESSource_CTPPS')
+)
+
diff --git a/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
index 346635d88520f..76504c27f9f14 100644
--- a/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
+++ b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
@@ -1 +1 @@
-from Geometry.VeryForwardGeometry.v2.geometryRPFromDD_2021_cfi import *
+from Geometry.VeryForwardGeometry.v3.geometryRPFromDD_2021_cfi import *
diff --git a/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2022_cfi.py b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2022_cfi.py
index 493d0cd1ee551..22d1549f8e45e 100644
--- a/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2022_cfi.py
+++ b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2022_cfi.py
@@ -1 +1 @@
-from Geometry.VeryForwardGeometry.v2.geometryRPFromDD_2022_cfi import *
+from Geometry.VeryForwardGeometry.v3.geometryRPFromDD_2022_cfi import *
diff --git a/Geometry/VeryForwardGeometry/python/v3/geometryRPFromDD_2021_cfi.py b/Geometry/VeryForwardGeometry/python/v3/geometryRPFromDD_2021_cfi.py
new file mode 100644
index 0000000000000..c3a2b82db86dd
--- /dev/null
+++ b/Geometry/VeryForwardGeometry/python/v3/geometryRPFromDD_2021_cfi.py
@@ -0,0 +1,141 @@
+import FWCore.ParameterSet.Config as cms
+
+# common and strip files
+totemGeomXMLFiles = cms.vstring(
+    'Geometry/CMSCommonData/data/materials.xml',
+    'Geometry/CMSCommonData/data/rotations.xml',
+    'Geometry/CMSCommonData/data/extend/cmsextent.xml',
+    'Geometry/CMSCommonData/data/cms/2017/v1/cms.xml',
+    'Geometry/CMSCommonData/data/beampipe/2017/v1/beampipe.xml',
+    'Geometry/CMSCommonData/data/cmsBeam.xml',
+    'Geometry/CMSCommonData/data/cmsMother.xml',
+    'Geometry/CMSCommonData/data/mgnt.xml',
+    'Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml',
+    'Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v2/pixfwdMaterials.xml',
+    'Geometry/ForwardCommonData/data/forward.xml',
+    'Geometry/ForwardCommonData/data/totemRotations.xml',
+    'Geometry/ForwardCommonData/data/totemMaterials.xml',
+    'Geometry/VeryForwardData/data/RP_Box.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml',
+#    'Geometry/VeryForwardData/data/RP_Boxv3//RP_Box_022.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml',
+#    'Geometry/VeryForwardData/data/RP_Boxv3//RP_Box_122.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
+    'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
+    'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
+    'Geometry/VeryForwardData/data/RP_Transformations.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
+#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_022.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
+#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_122.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
+    'Geometry/VeryForwardData/data/RP_Device.xml',
+    'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Reco/v2/RP_Vertical_Device.xml',
+    'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Reco/v2/RP_Horizontal_Device.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Right_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Right_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Left_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Left_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v1/RP_Stations_Assembly.xml',
+
+    'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Reco/v1/RP_Cuts_Per_Region.xml',
+
+    'Geometry/VeryForwardData/data/CTPPS_2021/RP_Param_Beam_Region/v1/RP_Param_Beam_Region.xml'
+    )
+
+# diamond files
+ctppsDiamondGeomXMLFiles = cms.vstring(
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_X_Distance.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Positive_Station/v1/CTPPS_Timing_Positive_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Negative_Station/v1/CTPPS_Timing_Negative_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Reco/v1/CTPPS_Timing_Stations_Assembly.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml'
+    )
+
+
+# Totem Timing files
+totemTimingGeomXMLFiles = cms.vstring(
+    # UFSDetectors
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Dist_Beam_Cent.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_DetectorAssembly.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Parameters.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Plane.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/v1/TotemTiming_Station.xml',
+    )
+
+# pixel files
+ctppsPixelGeomXMLFiles = cms.vstring(
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'
+    )
+
+XMLIdealGeometryESSource_CTPPS = cms.ESSource("XMLIdealGeometryESSource",
+                                              geomXMLFiles = totemGeomXMLFiles + ctppsDiamondGeomXMLFiles + totemTimingGeomXMLFiles + ctppsPixelGeomXMLFiles,
+                                              rootNodeName = cms.string('cms:CMSE')
+                                              )
+
+# position of RPs
+XMLIdealGeometryESSource_CTPPS.geomXMLFiles.append("Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Reco/v1/RP_Dist_Beam_Cent.xml")
+
+ctppsGeometryESModule = cms.ESProducer("CTPPSGeometryESModule",
+    verbosity = cms.untracked.uint32(1),
+    isRun2 = cms.bool(False),
+    compactViewTag = cms.string('XMLIdealGeometryESSource_CTPPS')
+)
diff --git a/Geometry/VeryForwardGeometry/python/v3/geometryRPFromDD_2022_cfi.py b/Geometry/VeryForwardGeometry/python/v3/geometryRPFromDD_2022_cfi.py
new file mode 100644
index 0000000000000..c3a2b82db86dd
--- /dev/null
+++ b/Geometry/VeryForwardGeometry/python/v3/geometryRPFromDD_2022_cfi.py
@@ -0,0 +1,141 @@
+import FWCore.ParameterSet.Config as cms
+
+# common and strip files
+totemGeomXMLFiles = cms.vstring(
+    'Geometry/CMSCommonData/data/materials.xml',
+    'Geometry/CMSCommonData/data/rotations.xml',
+    'Geometry/CMSCommonData/data/extend/cmsextent.xml',
+    'Geometry/CMSCommonData/data/cms/2017/v1/cms.xml',
+    'Geometry/CMSCommonData/data/beampipe/2017/v1/beampipe.xml',
+    'Geometry/CMSCommonData/data/cmsBeam.xml',
+    'Geometry/CMSCommonData/data/cmsMother.xml',
+    'Geometry/CMSCommonData/data/mgnt.xml',
+    'Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml',
+    'Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v2/pixfwdMaterials.xml',
+    'Geometry/ForwardCommonData/data/forward.xml',
+    'Geometry/ForwardCommonData/data/totemRotations.xml',
+    'Geometry/ForwardCommonData/data/totemMaterials.xml',
+    'Geometry/VeryForwardData/data/RP_Box.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml',
+#    'Geometry/VeryForwardData/data/RP_Boxv3//RP_Box_022.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml',
+#    'Geometry/VeryForwardData/data/RP_Boxv3//RP_Box_122.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
+    'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
+    'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
+    'Geometry/VeryForwardData/data/RP_Materials/v5/RP_Materials.xml',
+    'Geometry/VeryForwardData/data/RP_Transformations.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
+#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_022.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
+#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_122.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
+    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
+    'Geometry/VeryForwardData/data/RP_Device.xml',
+    'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Reco/v2/RP_Vertical_Device.xml',
+    'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Reco/v2/RP_Horizontal_Device.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Right_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Right_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_220_Left_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v2/RP_210_Left_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Reco/v1/RP_Stations_Assembly.xml',
+
+    'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
+    'Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Reco/v1/RP_Cuts_Per_Region.xml',
+
+    'Geometry/VeryForwardData/data/CTPPS_2021/RP_Param_Beam_Region/v1/RP_Param_Beam_Region.xml'
+    )
+
+# diamond files
+ctppsDiamondGeomXMLFiles = cms.vstring(
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_X_Distance.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Positive_Station/v1/CTPPS_Timing_Positive_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Negative_Station/v1/CTPPS_Timing_Negative_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Reco/v1/CTPPS_Timing_Stations_Assembly.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml'
+    )
+
+
+# Totem Timing files
+totemTimingGeomXMLFiles = cms.vstring(
+    # UFSDetectors
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Dist_Beam_Cent.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_DetectorAssembly.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Parameters.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Plane.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/v1/TotemTiming_Station.xml',
+    )
+
+# pixel files
+ctppsPixelGeomXMLFiles = cms.vstring(
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'
+    )
+
+XMLIdealGeometryESSource_CTPPS = cms.ESSource("XMLIdealGeometryESSource",
+                                              geomXMLFiles = totemGeomXMLFiles + ctppsDiamondGeomXMLFiles + totemTimingGeomXMLFiles + ctppsPixelGeomXMLFiles,
+                                              rootNodeName = cms.string('cms:CMSE')
+                                              )
+
+# position of RPs
+XMLIdealGeometryESSource_CTPPS.geomXMLFiles.append("Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Reco/v1/RP_Dist_Beam_Cent.xml")
+
+ctppsGeometryESModule = cms.ESProducer("CTPPSGeometryESModule",
+    verbosity = cms.untracked.uint32(1),
+    isRun2 = cms.bool(False),
+    compactViewTag = cms.string('XMLIdealGeometryESSource_CTPPS')
+)