diff --git a/Geometry/CMSCommonData/data/materials.xml b/Geometry/CMSCommonData/data/materials.xml
index 5c36a7a7d9416..dac48a20b4568 100644
--- a/Geometry/CMSCommonData/data/materials.xml
+++ b/Geometry/CMSCommonData/data/materials.xml
@@ -1154,79 +1154,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/CMSCommonData/data/materials/2015/v1/materials.xml b/Geometry/CMSCommonData/data/materials/2015/v1/materials.xml
index 2747d93bc3298..b2817ff6e925c 100644
--- a/Geometry/CMSCommonData/data/materials/2015/v1/materials.xml
+++ b/Geometry/CMSCommonData/data/materials/2015/v1/materials.xml
@@ -1154,78 +1154,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/CMSCommonData/data/materials/2017ZeroMaterial/v1/materials.xml b/Geometry/CMSCommonData/data/materials/2017ZeroMaterial/v1/materials.xml
index f0a0aea038117..45b7dfcc2c865 100644
--- a/Geometry/CMSCommonData/data/materials/2017ZeroMaterial/v1/materials.xml
+++ b/Geometry/CMSCommonData/data/materials/2017ZeroMaterial/v1/materials.xml
@@ -1154,79 +1154,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/CMSCommonData/data/materials/2021/v1/materials.xml b/Geometry/CMSCommonData/data/materials/2021/v1/materials.xml
index be7dd9cf2c533..43ca2110ca045 100644
--- a/Geometry/CMSCommonData/data/materials/2021/v1/materials.xml
+++ b/Geometry/CMSCommonData/data/materials/2021/v1/materials.xml
@@ -1162,78 +1162,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/TrackerCommonData/data/2016/FlatMinus05Percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/2016/FlatMinus05Percent/trackermaterial.xml
index 97fd54e833333..5492c86eee733 100644
--- a/Geometry/TrackerCommonData/data/2016/FlatMinus05Percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/2016/FlatMinus05Percent/trackermaterial.xml
@@ -500,5 +500,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/2016/FlatMinus10Percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/2016/FlatMinus10Percent/trackermaterial.xml
index 584125a6a77c7..0e719d4f519cf 100644
--- a/Geometry/TrackerCommonData/data/2016/FlatMinus10Percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/2016/FlatMinus10Percent/trackermaterial.xml
@@ -500,5 +500,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/2016/FlatPlus05Percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/2016/FlatPlus05Percent/trackermaterial.xml
index df10223f66078..f924ba5c1161a 100644
--- a/Geometry/TrackerCommonData/data/2016/FlatPlus05Percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/2016/FlatPlus05Percent/trackermaterial.xml
@@ -500,5 +500,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/2016/FlatPlus10Percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/2016/FlatPlus10Percent/trackermaterial.xml
index b43b4d54db1e2..c07c9640bb289 100644
--- a/Geometry/TrackerCommonData/data/2016/FlatPlus10Percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/2016/FlatPlus10Percent/trackermaterial.xml
@@ -500,5 +500,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml b/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml
index 01c9b270a2dec..daf3d93c310a8 100644
--- a/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml
+++ b/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/Geometry/TrackerCommonData/data/Run2/trackermaterial.xml b/Geometry/TrackerCommonData/data/Run2/trackermaterial.xml
index 6f4fba429962c..e6838fd4da6da 100644
--- a/Geometry/TrackerCommonData/data/Run2/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/Run2/trackermaterial.xml
@@ -508,5 +508,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/flat10percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/flat10percent/trackermaterial.xml
index d35272b2fa0e1..9eef58919c57a 100644
--- a/Geometry/TrackerCommonData/data/flat10percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/flat10percent/trackermaterial.xml
@@ -486,5 +486,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/flat10services30percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/flat10services30percent/trackermaterial.xml
index d35272b2fa0e1..3e1ee79bd0244 100644
--- a/Geometry/TrackerCommonData/data/flat10services30percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/flat10services30percent/trackermaterial.xml
@@ -486,5 +486,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/flat20percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/flat20percent/trackermaterial.xml
index 6ca356364d3bb..02c45c2b6ab23 100644
--- a/Geometry/TrackerCommonData/data/flat20percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/flat20percent/trackermaterial.xml
@@ -486,5 +486,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/flat20services30percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/flat20services30percent/trackermaterial.xml
index 6ca356364d3bb..629e98de7a0e7 100644
--- a/Geometry/TrackerCommonData/data/flat20services30percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/flat20services30percent/trackermaterial.xml
@@ -486,5 +486,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/flat30percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/flat30percent/trackermaterial.xml
index 383ee371b8254..e32a56644c629 100644
--- a/Geometry/TrackerCommonData/data/flat30percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/flat30percent/trackermaterial.xml
@@ -486,5 +486,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/pixbarmaterial/2017ZeroMaterial/v1/pixbarmaterial.xml b/Geometry/TrackerCommonData/data/pixbarmaterial/2017ZeroMaterial/v1/pixbarmaterial.xml
index 46f7977792e86..ac2aa31c55a73 100644
--- a/Geometry/TrackerCommonData/data/pixbarmaterial/2017ZeroMaterial/v1/pixbarmaterial.xml
+++ b/Geometry/TrackerCommonData/data/pixbarmaterial/2017ZeroMaterial/v1/pixbarmaterial.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/Geometry/TrackerCommonData/data/services30percent/trackermaterial.xml b/Geometry/TrackerCommonData/data/services30percent/trackermaterial.xml
index fb5b43a446968..8eb886854acb6 100644
--- a/Geometry/TrackerCommonData/data/services30percent/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/services30percent/trackermaterial.xml
@@ -486,5 +486,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/test2014/trackermaterial.xml b/Geometry/TrackerCommonData/data/test2014/trackermaterial.xml
index cbcdf383ff61a..1b18f1bad67ec 100644
--- a/Geometry/TrackerCommonData/data/test2014/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/test2014/trackermaterial.xml
@@ -500,5 +500,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/trackermaterial.xml b/Geometry/TrackerCommonData/data/trackermaterial.xml
index 5147bf314dae1..c7c9da80c8c40 100644
--- a/Geometry/TrackerCommonData/data/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/trackermaterial.xml
@@ -500,5 +500,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/trackermaterial/2017ZeroMaterial/v1/trackermaterial.xml b/Geometry/TrackerCommonData/data/trackermaterial/2017ZeroMaterial/v1/trackermaterial.xml
index ad0f5282cb952..52ad2e0af25c0 100644
--- a/Geometry/TrackerCommonData/data/trackermaterial/2017ZeroMaterial/v1/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/trackermaterial/2017ZeroMaterial/v1/trackermaterial.xml
@@ -508,5 +508,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/TrackerCommonData/data/zeroMaterial/trackermaterial.xml b/Geometry/TrackerCommonData/data/zeroMaterial/trackermaterial.xml
index 4fb34bdec0c69..baddd679fbdec 100644
--- a/Geometry/TrackerCommonData/data/zeroMaterial/trackermaterial.xml
+++ b/Geometry/TrackerCommonData/data/zeroMaterial/trackermaterial.xml
@@ -500,5 +500,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+