From a1843ab969bbd8ba3243dea5016fc03b40df32be Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 22 Jan 2025 07:11:12 +0100 Subject: [PATCH 1/2] Modify all Run2 scenarios to include the modified RPC geometry --- .../python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015FlatMinus05PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015FlatMinus10PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015FlatPlus05PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015FlatPlus10PercentXML_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2015XML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2016XML_cfi.py | 2 +- .../python/cmsExtendedGeometry2016aXML_CTPPS_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2016aXML_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2017DDDXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2017Plan0XML_cfi.py | 2 +- .../cmsExtendedGeometry2017Plan1FlatMinus05PercentXML_cfi.py | 2 +- .../cmsExtendedGeometry2017Plan1FlatMinus10PercentXML_cfi.py | 2 +- .../cmsExtendedGeometry2017Plan1FlatPlus05PercentXML_cfi.py | 2 +- .../cmsExtendedGeometry2017Plan1FlatPlus10PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2017Plan1XML_cfi.py | 2 +- .../python/cmsExtendedGeometry2017Plan1ZeroMaterialXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2017XML_CTPPS_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2018DDDXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2018FlatMinus05PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2018FlatMinus10PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2018FlatPlus05PercentXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2018FlatPlus10PercentXML_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2018NoSDXML_cfi.py | 2 +- .../python/cmsExtendedGeometry2018Plan0XML_cfi.py | 2 +- .../python/cmsExtendedGeometry2018Plan36XML_cfi.py | 2 +- .../python/cmsExtendedGeometry2018XML_CTPPS_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2018XML_cfi.py | 2 +- .../python/cmsExtendedGeometry2018ZeroMaterialXML_cfi.py | 2 +- .../CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py | 2 +- .../cmsExtendedGeometryDetailedCavern2017Plan1XML_cfi.py | 2 +- ...tendedGeometryDetailedCavern2017Plan1ZeroMaterialXML_cfi.py | 3 ++- .../python/cmsExtendedGeometryDetailedCavern2017XML_cfi.py | 2 +- .../python/cmsExtendedGeometryDetailedCavern2018XML_cfi.py | 2 +- Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py | 2 +- .../CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py | 2 +- 44 files changed, 45 insertions(+), 44 deletions(-) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py index 41ae7761da4cb..cddd7ee28cd57 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py index 4f07f051c6cb9..8dd88323181a1 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py index 628d8cced80b2..2c030366c5229 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus05PercentXML_cfi.py index 7a9979f187da4..3161dfdaaca25 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus05PercentXML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus10PercentXML_cfi.py index e30ea662c0f65..1d94d70c2019a 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus10PercentXML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus05PercentXML_cfi.py index c350f803203af..6a601eac96f3c 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus05PercentXML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus10PercentXML_cfi.py index 2fbcb0ac92137..c712cbd9da688 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus10PercentXML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_cfi.py index c8b321a425d6b..40433f0d100a8 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py index 58d481d95e623..c920ae71b0c24 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py index f1330e4282af6..ee44738a3113a 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py @@ -229,7 +229,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py index f5f5cfe3ba39f..025d7b301b679 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py @@ -229,7 +229,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py index a0562db39d239..9f5e25d210799 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py @@ -229,7 +229,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py index 38d1bbcc827e0..270bdf4232bb9 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py @@ -229,7 +229,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2016XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2016XML_cfi.py index 1471c76485645..696a56da060c7 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2016XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2016XML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_CTPPS_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_CTPPS_cfi.py index 67d0503890d2e..14ed84b5ad325 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_CTPPS_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_CTPPS_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_cfi.py index e37f94151ea3d..fc770b3ce7b13 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_cfi.py @@ -228,7 +228,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017DDDXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017DDDXML_cfi.py index 02b6cbf969b9f..6f62fa5c0ed81 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017DDDXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017DDDXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan0XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan0XML_cfi.py index 59f8088a7debc..ac37a8c04a5e5 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan0XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan0XML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcfx.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus05PercentXML_cfi.py index 43aefbda93580..d707540f7ed76 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus05PercentXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus10PercentXML_cfi.py index 643434bf08dc2..f67c50aee60a5 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatMinus10PercentXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus05PercentXML_cfi.py index d8664dafc0957..2e850b7e254e3 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus05PercentXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus10PercentXML_cfi.py index 59089a4b5762e..eee5c0ff770be 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1FlatPlus10PercentXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1XML_cfi.py index 8182dcfbf0805..9f7c2a556e525 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1XML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1ZeroMaterialXML_cfi.py index 2e4c68af4ffab..a242461afec0d 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1ZeroMaterialXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan1ZeroMaterialXML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_CTPPS_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_CTPPS_cfi.py index a540dc7993b16..6dc252b9d0ef0 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_CTPPS_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_CTPPS_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py index 8182dcfbf0805..9f7c2a556e525 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018DDDXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018DDDXML_cfi.py index b7ffa867813d2..d3a997822b2f2 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018DDDXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018DDDXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatMinus05PercentXML_cfi.py index 709865bf58731..29ed30118348c 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatMinus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatMinus05PercentXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatMinus10PercentXML_cfi.py index 31e42fafedff1..8a95f6fd08293 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatMinus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatMinus10PercentXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatPlus05PercentXML_cfi.py index 839423590ef2e..4be8dd257ff24 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatPlus05PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatPlus05PercentXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatPlus10PercentXML_cfi.py index c48c98e517579..1a857bcd383ff 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatPlus10PercentXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018FlatPlus10PercentXML_cfi.py @@ -232,7 +232,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018NoSDXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018NoSDXML_cfi.py index 9c30a8aa3aebf..5a38a2a82f18d 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018NoSDXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018NoSDXML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018Plan0XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018Plan0XML_cfi.py index 5470a9185ee87..cf2d4e45658e1 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018Plan0XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018Plan0XML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018Plan36XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018Plan36XML_cfi.py index 49551f88f77e9..e5ef40baaa42f 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018Plan36XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018Plan36XML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018XML_CTPPS_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018XML_CTPPS_cfi.py index 8da8a2237e0e7..b63085d968191 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018XML_CTPPS_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018XML_CTPPS_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018XML_cfi.py index 49551f88f77e9..e5ef40baaa42f 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018XML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018ZeroMaterialXML_cfi.py index cc543a4e39d7b..4398e1120d292 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2018ZeroMaterialXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2018ZeroMaterialXML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py index e72be6f070b62..88b9cbf4d5b82 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py @@ -236,7 +236,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017Plan1XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017Plan1XML_cfi.py index 12e59076c185d..66e4aa25d55e5 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017Plan1XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017Plan1XML_cfi.py @@ -233,7 +233,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017Plan1ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017Plan1ZeroMaterialXML_cfi.py index ac8f3a6c66670..5effb839d6fd1 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017Plan1ZeroMaterialXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017Plan1ZeroMaterialXML_cfi.py @@ -1,3 +1,4 @@ + import FWCore.ParameterSet.Config as cms XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", @@ -233,7 +234,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017XML_cfi.py index a5cce8386760b..0282b13c82e67 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2017XML_cfi.py @@ -233,7 +233,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2018XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2018XML_cfi.py index 8a49ba6f2ed66..a03475e6f16f5 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2018XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryDetailedCavern2018XML_cfi.py @@ -234,7 +234,7 @@ 'Geometry/MuonCommonData/data/mb4Shield/2018/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v2/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py index 8ce708a982317..338f1d78368e1 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py @@ -227,7 +227,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py index 8d10f0447ca7f..10150133c64dd 100644 --- a/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py @@ -227,7 +227,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2015/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml', 'Geometry/ForwardCommonData/data/forward.xml', From 377a8ba9c97a169d5460c4095e45917aa37f6c43 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Thu, 23 Jan 2025 06:28:11 +0100 Subject: [PATCH 2/2] Bug fix --- .../CMSCommonData/python/cmsExtendedGeometry2017Plan0XML_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan0XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan0XML_cfi.py index ac37a8c04a5e5..7f812585826be 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan0XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017Plan0XML_cfi.py @@ -231,7 +231,7 @@ 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', 'Geometry/MuonCommonData/data/muonYoke/2015/v1/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2017/v1/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcfx.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v2/rpcf.xml', 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',