Fix misordered materials in reduced material scenarios

cms-sw · Nov 30, 2021 · b5d4f10 · b5d4f10
1 parent 19e7054
commit b5d4f10
Show file tree

Hide file tree

Showing 16 changed files with 4,114 additions and 15 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',

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'/>

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'/>

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'/>

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'/>

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'/>

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',

diff --git 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',

diff --git 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',

diff --git 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',

diff --git 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',