Make unique material names as default for all Run3 scenarios

cms-sw · Aug 23, 2021 · 78e336b · 78e336b
1 parent 399ed27
commit 78e336b
Show file tree

Hide file tree

Showing 14 changed files with 486 additions and 507 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -23,20 +23,22 @@ PPS:
 * P3: 2021 baseline (same as P2 but removing common materials)
 * P4: 2021 baseline (same as P2 or P3 but using the same Vacuum)
 * P5: new Run3 detectors
+* P6: Same as P5 but with unique names for materials
 
 The script also handles the common and forward elements of the geometry:
 * O3: 2021 baseline
 * O4: as O3, but with zero material
 * O5: as O3, but with trackermaterial removed (they are in T5, T6, T7, T8)
+* O6: Replaces O3 as baseline to rmove duplicate material definition
 * F1: 2021 baseline
 
 Several detector combinations have been generated:
-* 2021 = T3+C1+M1+P4+O3+F1
-* 2021ZeroMaterial = T4+C1+M1+P4+O4+F1
-* 2021FlatMinus05Percent = T5+C1+M1+P4+O5+F1
-* 2021FlatMinus10Percent = T6+C1+M1+P4+O5+F1
-* 2021FlatPlus05Percent = T7+C1+M1+P4+O5+F1
-* 2021FlatPlus10Percent = T8+C1+M1+P4+O5+F1
+* 2021 = T3+C1+M1+P6+O6+F1
+* 2021ZeroMaterial = T4+C1+M1+P6+O4+F1
+* 2021FlatMinus05Percent = T5+C1+M1+P6+O5+F1
+* 2021FlatMinus10Percent = T6+C1+M1+P6+O5+F1
+* 2021FlatPlus05Percent = T7+C1+M1+P6+O5+F1
+* 2021FlatPlus10Percent = T8+C1+M1+P6+O5+F1
 
 # Phase 2 Geometries
 

diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -2599,12 +2599,13 @@
 allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, ppsDict ]
 
 detectorVersionDict = {
-    ("O3","T3","C1","M1","F1","P5") : "2021",
-    ("O4","T4","C1","M1","F1","P5") : "2021ZeroMaterial",
-    ("O5","T5","C1","M1","F1","P5") : "2021FlatMinus05Percent",
-    ("O5","T6","C1","M1","F1","P5") : "2021FlatMinus10Percent",
-    ("O5","T7","C1","M1","F1","P5") : "2021FlatPlus05Percent",
-    ("O5","T8","C1","M1","F1","P5") : "2021FlatPlus10Percent",
+    ("O6","T3","C1","M1","F1","P6") : "2021",
+    ("O4","T4","C1","M1","F1","P6") : "2021ZeroMaterial",
+    ("O5","T5","C1","M1","F1","P6") : "2021FlatMinus05Percent",
+    ("O5","T6","C1","M1","F1","P6") : "2021FlatMinus10Percent",
+    ("O5","T7","C1","M1","F1","P6") : "2021FlatPlus05Percent",
+    ("O5","T8","C1","M1","F1","P6") : "2021FlatPlus10Percent",
  }
 
-deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "P1", "P2", "P3", "P4" ])
+deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3", 
+                          "P4", "P5" ])
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -4,7 +4,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref='Geometry/CMSCommonData/data/materials/2021/v2/materials.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v3/cmsextent.xml'/>
@@ -261,35 +261,33 @@
     <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/Run2/totemMaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/totemRotations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_000.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_001.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_002.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_003.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_004.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_005.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_020.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_021.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_022.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_023.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_024.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_025.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_100.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_101.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_102.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_103.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_104.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_105.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_120.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_121.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_122.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_123.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_124.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Box/v2/RP_Box_125.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v3/RP_Materials.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/v4/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'/>
@@ -310,20 +308,20 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.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/Simu/v1/RP_Vertical_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v1/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v2/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v2/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v2/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v2/CTPPS_210_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v2/CTPPS_Stations_Assembly.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.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/v1/CTPPS_Timing_Horizontal_Pot.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.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'/>
@@ -340,13 +338,13 @@
     <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.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml'/>
     <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/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v1/PPS_Pixel_Module_2x2_Run3.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v1/PPS_Pixel_Sens.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/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/v1/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v1/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>