Merge pull request #33530 from bsunanda/Run4-hgx282

Run4-hgx282 Remove overlap in for EB in 2 recent Phase2 scenarios D82 and D83
cms-sw · Apr 30, 2021 · 46a73b7 · 46a73b7
2 parents 6a24449 + defea7d
commit 46a73b7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -751,7 +751,7 @@
             'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
             'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
-            'Geometry/EcalCommonData/data/ebcon.xml',
+            'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
             'Geometry/HcalCommonData/data/hcalrotations.xml',
             'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
@@ -837,7 +837,7 @@
             'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
             'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
-            'Geometry/EcalCommonData/data/ebcon.xml',
+            'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
             'Geometry/HcalCommonData/data/hcalrotations.xml',
             'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D82.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D82.xml
@@ -46,7 +46,7 @@
     <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml
@@ -46,7 +46,7 @@
     <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
     <Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D82XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D82XML_cfi.py
@@ -47,7 +47,7 @@
         'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
         'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
         'Geometry/HcalCommonData/data/hcalrotations.xml',
         'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D83XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D83XML_cfi.py
@@ -47,7 +47,7 @@
         'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
         'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
         'Geometry/HcalCommonData/data/hcalrotations.xml',
         'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',