Merge pull request #36307 from cvuosalo/pull/36163

[DD4hep] Remove unused PPS materials from Run 3 2021 (replaces #36163)
cms-sw · Dec 1, 2021 · 8fa87a9 · 8fa87a9
2 parents cfd502d + b5d4f10
commit 8fa87a9
Show file tree

Hide file tree

Showing 27 changed files with 4,625 additions and 46 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',