Merge pull request #30579 from bsunanda/Phase2-geox04

Phase2-gex04 Fix some 2026 geometries by removing interfering duplicate file
cms-sw · Jul 9, 2020 · 5975d06 · 5975d06
2 parents 5ade261 + fcab990
commit 5975d06
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 16 deletions.
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -1160,7 +1160,6 @@
             'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
             'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
             'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
-            'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
             'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
             'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
@@ -1207,7 +1206,6 @@
             'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
             'Geometry/MuonCommonData/data/muonYoke/2021/v3/muonYoke.xml',
             'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-            'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
             'Geometry/MuonCommonData/data/mf/2026/v3/mf.xml',
             'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
             'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml
@@ -72,7 +72,6 @@
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
     <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml
@@ -72,7 +72,6 @@
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
     <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D51.xml
@@ -72,7 +72,6 @@
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
     <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D53.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D53.xml
@@ -72,7 +72,6 @@
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
     <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D54.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D54.xml
@@ -72,7 +72,6 @@
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
     <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml
@@ -72,7 +72,6 @@
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v3/muonYoke.xml'/>
     <Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mf/2026/v3/mf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D56.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D56.xml
@@ -72,7 +72,6 @@
     <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
     <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D49XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D49XML_cfi.py
@@ -73,7 +73,6 @@
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
         'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D50XML_cfi.py
@@ -73,7 +73,6 @@
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
         'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D51XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D51XML_cfi.py
@@ -73,7 +73,6 @@
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
         'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py
@@ -73,7 +73,6 @@
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
         'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D54XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D54XML_cfi.py
@@ -73,7 +73,6 @@
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
         'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py
@@ -73,7 +73,6 @@
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
         'Geometry/MuonCommonData/data/muonYoke/2021/v3/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
         'Geometry/MuonCommonData/data/mf/2026/v3/mf.xml',
         'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D56XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D56XML_cfi.py
@@ -73,7 +73,6 @@
         'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
         'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
         'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
         'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',