From 61a50cde6c1c2f8e6d44351128d2baa71c6302db Mon Sep 17 00:00:00 2001 From: Sunanda Date: Thu, 17 Oct 2024 20:06:44 +0200 Subject: [PATCH] Put all 2015 scenarios using the same hcalRecNumbering.xml file --- .../python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2015PilotXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015XML_RPC2Gap_cfi.py | 2 +- .../python/cmsExtendedGeometry2015XML_RPC4RE11_cfi.py | 2 +- .../python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py | 2 +- Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py | 2 +- Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py index 89194078ff8f0..41ae7761da4cb 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py @@ -220,7 +220,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py index b6bffb29d3e8b..4f07f051c6cb9 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py @@ -220,7 +220,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py index c49ae286522f3..628d8cced80b2 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py @@ -220,7 +220,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015PilotXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015PilotXML_cfi.py index e6a97df3fd061..953b1bc8bc049 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015PilotXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015PilotXML_cfi.py @@ -218,7 +218,7 @@ 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/MuonCommonData/data/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC2Gap_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC2Gap_cfi.py index 5a72fd2c7b857..cb98b657d7924 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC2Gap_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC2Gap_cfi.py @@ -219,7 +219,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/RPC2Gap/mbCommon.xml', 'Geometry/MuonCommonData/data/RPC2Gap/mb1.xml', 'Geometry/MuonCommonData/data/RPC2Gap/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC4RE11_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC4RE11_cfi.py index 7d3b1f7a4dc9a..1274fe15c17f9 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC4RE11_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC4RE11_cfi.py @@ -219,7 +219,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1.xml', 'Geometry/MuonCommonData/data/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py index 0e0d19d3bd5e5..58d481d95e623 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py @@ -220,7 +220,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py index 7ea88e8bfe669..f1330e4282af6 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py @@ -221,7 +221,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py index dd78096191531..f5f5cfe3ba39f 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py @@ -221,7 +221,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py index d2099f953623e..a0562db39d239 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py @@ -221,7 +221,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py index 646766fc57d82..8ce708a982317 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py @@ -219,7 +219,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py index be64a57a37682..8d10f0447ca7f 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py @@ -219,7 +219,7 @@ 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 'Geometry/HcalCommonData/data/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',