From defea7d2fbb7e6999fa2f799af1e2fb526f42759 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Mon, 26 Apr 2021 21:11:55 +0200 Subject: [PATCH] Remove overlap in for EB in 2 recent Phase2 scenarios D82 and D83 --- Configuration/Geometry/python/dict2026Geometry.py | 4 ++-- .../CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D82.xml | 2 +- .../CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2026D82XML_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2026D83XML_cfi.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index d3a363a8d5f49..f6b7e82c4b03f 100644 --- 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 index a6605b56f6366..cfec615fc257c 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D82.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D82.xml @@ -46,7 +46,7 @@ - + diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml index 38fec4ef11f0f..31104f2ae3740 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D83.xml @@ -46,7 +46,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D82XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D82XML_cfi.py index dae3745000696..f25cacba83744 100644 --- 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 index ad14785a5293f..ed393346f6df4 100644 --- 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',