Merge pull request #33257 from ghugo83/ddd_vs_dd4hep_materials

Fixed materials discrepancies between DDD and DD4hep: remove duplicate definitions of Phase 1 materials (FPix_CFSkin and cie)
cms-sw · Mar 26, 2021 · c497e4a · c497e4a
2 parents c055629 + e55cc02
commit c497e4a
Show file tree

Hide file tree

Showing 4 changed files with 701 additions and 3 deletions.
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -557,7 +557,7 @@
     "T3" : {
         1 : [
             'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
-            'Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v2/pixfwdMaterials.xml',
+            'Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v3/pixfwdMaterials.xml',
             'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml', 
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -25,7 +25,7 @@
     <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v2/pixfwdMaterials.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v3/pixfwdMaterials.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -26,7 +26,7 @@
         'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
         'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v2/pixfwdMaterials.xml',
+        'Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v3/pixfwdMaterials.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml',
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',