Remove duplicate materials from PPS files

cms-sw · Feb 15, 2021 · 588f8ba · 588f8ba
1 parent b68775c
commit 588f8ba
Show file tree

Hide file tree

Showing 22 changed files with 1,984 additions and 109 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -20,6 +20,7 @@ Muon system:
 
 PPS:
 * P2: 2021 baseline (after using its own material files for pixel)
+* P3: 2021 baseline (same as P2 but removing common materials)
 
 The script also handles the common and forward elements of the geometry:
 * O3: 2021 baseline
@@ -28,12 +29,12 @@ The script also handles the common and forward elements of the geometry:
 * F1: 2021 baseline
 
 Several detector combinations have been generated:
-* 2021 = T3+C1+M1+P2+O3+F1
-* 2021ZeroMaterial = T4+C1+M1+P2+O4+F1
-* 2021FlatMinus05Percent = T5+C1+M1+P2+O5+F1
-* 2021FlatMinus10Percent = T6+C1+M1+P2+O5+F1
-* 2021FlatPlus05Percent = T7+C1+M1+P2+O5+F1
-* 2021FlatPlus10Percent = T8+C1+M1+P2+O5+F1
+* 2021 = T3+C1+M1+P3+O3+F1
+* 2021ZeroMaterial = T4+C1+M1+P3+O4+F1
+* 2021FlatMinus05Percent = T5+C1+M1+P3+O5+F1
+* 2021FlatMinus10Percent = T6+C1+M1+P3+O5+F1
+* 2021FlatPlus05Percent = T7+C1+M1+P3+O5+F1
+* 2021FlatPlus10Percent = T8+C1+M1+P3+O5+F1
 
 # Phase 2 Geometries
 

diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -2144,19 +2144,122 @@
         ],
         "reco" :[
 
+        ],
+    },
+    "P3" : {
+        2 : [
+            'Geometry/ForwardCommonData/data/Run2/totemMaterials.xml',
+            'Geometry/ForwardCommonData/data/totemRotations.xml',
+            'Geometry/VeryForwardData/data/RP_Box.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_000.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_001.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_002.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_003.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_004.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_005.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_020.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_021.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_022.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_023.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_024.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_025.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_100.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_101.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_102.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_103.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_104.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_105.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_120.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_121.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_122.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_123.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
+            'Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml',
+            'Geometry/VeryForwardData/data/RP_Materials/v2/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_020.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.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_120.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.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.xml',
+            'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
+            'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot.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_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
+            'Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_123.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml',
+            ],
+        "sim" : [
+
+        ],
+        "reco" :[
+
         ],
     },
 }
 
 allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, ppsDict ]
 
 detectorVersionDict = {
-    ("O3","T3","C1","M1","F1","P2") : "2021",
-    ("O4","T4","C1","M1","F1","P2") : "2021ZeroMaterial",
-    ("O5","T5","C1","M1","F1","P2") : "2021FlatMinus05Percent",
-    ("O5","T6","C1","M1","F1","P2") : "2021FlatMinus10Percent",
-    ("O5","T7","C1","M1","F1","P2") : "2021FlatPlus05Percent",
-    ("O5","T8","C1","M1","F1","P2") : "2021FlatPlus10Percent",
+    ("O3","T3","C1","M1","F1","P3") : "2021",
+    ("O4","T4","C1","M1","F1","P3") : "2021ZeroMaterial",
+    ("O5","T5","C1","M1","F1","P3") : "2021FlatMinus05Percent",
+    ("O5","T6","C1","M1","F1","P3") : "2021FlatMinus10Percent",
+    ("O5","T7","C1","M1","F1","P3") : "2021FlatPlus05Percent",
+    ("O5","T8","C1","M1","F1","P3") : "2021FlatPlus10Percent",
  }
 
-deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "P1" ])
+deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "P1", "P2" ])
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -289,7 +289,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v2/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'/>
@@ -315,10 +315,10 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
@@ -345,9 +345,9 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
@@ -289,7 +289,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v2/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'/>
@@ -315,10 +315,10 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
@@ -345,9 +345,9 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
@@ -289,7 +289,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v2/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'/>
@@ -315,10 +315,10 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
@@ -345,9 +345,9 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>