diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
index 81383ca6a85fb..64d854d1bca93 100644
--- a/Configuration/Geometry/python/dict2021Geometry.py
+++ b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1399,7 +1399,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
@@ -1444,7 +1444,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
index 6019629c5bdae..45abeec748ec7 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
index c5f9e909e20a0..ae7c0366c9820 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
index ee82a20c8759b..bd9de84fc426c 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
index b80298a3ad38d..78cca73cba54f 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
index 0768c5ebc9cac..d74d444da27d4 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
index c6736b7bbd0c2..bf95ff9ab81a3 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml
index 6b0f7d30e8408..488220a515523 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus05Percent.xml
index e534a4605babf..f75f34ddda135 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus05Percent.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus10Percent.xml
index cc3fc1cd78def..47e4a36da511c 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatMinus10Percent.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus05Percent.xml
index 66732dba0368e..b2cbc3924c066 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus05Percent.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus10Percent.xml
index 632181777c8af..a38fca45e76f4 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023FlatPlus10Percent.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023ZeroMaterial.xml
index 8b97d07f18c09..4ce81ee4609fd 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023ZeroMaterial.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023ZeroMaterial.xml
@@ -243,7 +243,7 @@
-
+
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
index 49cb463045bc3..6f4b7942ada86 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
index e8bb664bbe0e5..e317c2bd67c9c 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
index ee0276bbd3d3d..5546fbdccbc62 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
index 38c9a82586ee2..cc914075051f9 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
index 2837d9a0a17d7..a6d997365dee4 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
index 76ccae9d9c911..56580e6d7e6c1 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus05PercentXML_cfi.py
index 0d4d83416f1fd..32a2523b8a147 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus05PercentXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus10PercentXML_cfi.py
index 6c2ecf2d1ce6a..f13070f8339c5 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatMinus10PercentXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus05PercentXML_cfi.py
index b35706bf93285..b10cfd31cbdc7 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus05PercentXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus10PercentXML_cfi.py
index 5e0dbf0720a37..a85ebbb96ba5f 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023FlatPlus10PercentXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
index cd6f44f5ada27..49ccb48031b7b 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023ZeroMaterialXML_cfi.py
index 32a853ab70918..db6495947ba26 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023ZeroMaterialXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023ZeroMaterialXML_cfi.py
@@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
+ 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
diff --git a/Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml
new file mode 100644
index 0000000000000..6f844462d01df
--- /dev/null
+++ b/Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml
@@ -0,0 +1,616 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.cc b/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.cc
index 63a662e6eb007..2d871d8383286 100644
--- a/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.cc
+++ b/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.cc
@@ -58,25 +58,25 @@ std::unique_ptr RPCGeometryBuilder::build(const cms::DDCompactView*
std::unique_ptr RPCGeometryBuilder::buildGeometry(DDFilteredView& fview,
const MuonGeometryConstants& muonConstants) {
- LogDebug("RPCGeometryBuilder") << "Building the geometry service";
+ edm::LogVerbatim("RPCGeometryBuilder") << "Building the geometry service";
std::unique_ptr geometry = std::make_unique();
- LogDebug("RPCGeometryBuilder") << "About to run through the RPC structure\n"
- << " First logical part " << fview.logicalPart().name().name();
+ edm::LogVerbatim("RPCGeometryBuilder") << "About to run through the RPC structure\n"
+ << " First logical part " << fview.logicalPart().name().name();
bool doSubDets = fview.firstChild();
- LogDebug("RPCGeometryBuilder") << "doSubDets = " << doSubDets;
+ edm::LogVerbatim("RPCGeometryBuilder") << "doSubDets = " << doSubDets;
while (doSubDets) {
- LogDebug("RPCGeometryBuilder") << "start the loop";
+ edm::LogVerbatim("RPCGeometryBuilder") << "start the loop";
MuonGeometryNumbering mdddnum(muonConstants);
- LogDebug("RPCGeometryBuilder") << "Getting the Muon base Number";
+ edm::LogVerbatim("RPCGeometryBuilder") << "Getting the Muon base Number";
MuonBaseNumber mbn = mdddnum.geoHistoryToBaseNumber(fview.geoHistory());
- LogDebug("RPCGeometryBuilder") << "Start the Rpc Numbering Schema";
+ // edm::LogVerbatim("RPCGeometryBuilder") << "Start the Rpc Numbering Schema";
RPCNumberingScheme rpcnum(muonConstants);
- LogDebug("RPCGeometryBuilder") << "Getting the Unit Number";
+ edm::LogVerbatim("RPCGeometryBuilder") << "Getting the Unit Number";
const int detid = rpcnum.baseNumberToUnitNumber(mbn);
- LogDebug("RPCGeometryBuilder") << "Getting the RPC det Id " << detid;
+ edm::LogVerbatim("RPCGeometryBuilder") << "Getting the RPC det Id " << detid;
RPCDetId rpcid(detid);
RPCDetId chid(rpcid.region(), rpcid.ring(), rpcid.station(), rpcid.sector(), rpcid.layer(), rpcid.subsector(), 0);
- LogDebug("RPCGeometryBuilder") << "The RPCDetid is " << rpcid;
+ edm::LogVerbatim("RPCGeometryBuilder") << "The RPCDetid is " << rpcid;
DDValue numbOfStrips("nStrips");
@@ -88,7 +88,8 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(DDFilteredView& f
}
}
- LogDebug("RPCGeometryBuilder") << ((nStrips == 0) ? ("No strip found!!") : (""));
+ if (nStrips == 0)
+ edm::LogVerbatim("RPCGeometryBuilder") << "No strip found!!";
std::vector dpar = fview.logicalPart().solid().parameters();
std::string name = fview.logicalPart().name().name();
@@ -102,7 +103,7 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(DDFilteredView& f
Surface::PositionType pos(geant_units::operators::convertMmToCm(tran.x()),
geant_units::operators::convertMmToCm(tran.y()),
geant_units::operators::convertMmToCm(tran.z()));
- edm::LogVerbatim("RPCGeometryBuilder") << "(2), tran.x() " << geant_units::operators::convertMmToCm(tran.x())
+ edm::LogVerbatim("RPCGeometryBuilder") << "(2) tran.x(): " << geant_units::operators::convertMmToCm(tran.x())
<< " tran.y(): " << geant_units::operators::convertMmToCm(tran.y())
<< " tran.z(): " << geant_units::operators::convertMmToCm(tran.z());
@@ -128,7 +129,7 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(DDFilteredView& f
// Barrel
edm::LogVerbatim("RPCGeometryBuilder")
- << "(3) dpar.size() == 3, width: " << width << " length: " << length << " thickness: " << thickness;
+ << "(3) Box, width: " << width << " length: " << length << " thickness: " << thickness;
bounds = new RectangularPlaneBounds(width, length, thickness);
const std::vector pars = {width, length, float(numbOfStrips.doubles()[0])};
@@ -143,13 +144,10 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(DDFilteredView& f
bounds = new TrapezoidalPlaneBounds(be, te, ap, ti);
- const std::vector pars = {float(geant_units::operators::convertMmToCm(dpar[4])),
- float(geant_units::operators::convertMmToCm(dpar[8])),
- float(geant_units::operators::convertMmToCm(dpar[0])),
- float(numbOfStrips.doubles()[0])};
+ const std::vector pars = {be, te, ap, float(numbOfStrips.doubles()[0])};
//Forward
- edm::LogVerbatim("RPCGeometryBuilder")
- << "(4), else, dpar[4]: " << be << " dpar[8]: " << te << " dpar[0]: " << ap << " ti: " << ti;
+ edm::LogVerbatim("RPCGeometryBuilder") << "(4) be: " << be << " te: " << te << " ap: " << ap << " ti: " << ti
+ << " strips " << numbOfStrips.doubles()[0];
rollspecs = new RPCRollSpecs(GeomDetEnumerators::RPCEndcap, name, pars);
@@ -159,7 +157,7 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(DDFilteredView& f
Basic3DVector newZ(0., 1., 0.);
rot.rotateAxes(newX, newY, newZ);
}
- LogDebug("RPCGeometryBuilder") << " Number of strips " << nStrips;
+ edm::LogVerbatim("RPCGeometryBuilder") << " Number of strips " << nStrips;
BoundPlane* bp = new BoundPlane(pos, rot, bounds);
ReferenceCountingPointer surf(bp);
@@ -250,13 +248,19 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(DDFilteredView& f
std::unique_ptr RPCGeometryBuilder::buildGeometry(cms::DDFilteredView& fview,
const MuonGeometryConstants& muonConstants) {
+ edm::LogVerbatim("RPCGeometryBuilder") << "Building the geometry service";
std::unique_ptr geometry = std::make_unique();
while (fview.firstChild()) {
+ edm::LogVerbatim("RPCGeometryBuilder") << "start the loop";
MuonGeometryNumbering mdddnum(muonConstants);
+ edm::LogVerbatim("RPCGeometryBuilder") << "Getting the Muon base Number";
RPCNumberingScheme rpcnum(muonConstants);
+ edm::LogVerbatim("RPCGeometryBuilder") << "Getting the Unit Number";
int rawidCh = rpcnum.baseNumberToUnitNumber(mdddnum.geoHistoryToBaseNumber(fview.history()));
+ edm::LogVerbatim("RPCGeometryBuilder") << "Getting the RPC det Id " << rawidCh;
RPCDetId rpcid = RPCDetId(rawidCh);
+ edm::LogVerbatim("RPCGeometryBuilder") << "The RPCDetid is " << rpcid;
RPCDetId chid(rpcid.region(), rpcid.ring(), rpcid.station(), rpcid.sector(), rpcid.layer(), rpcid.subsector(), 0);
@@ -267,7 +271,7 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(cms::DDFilteredVi
std::string_view name = fview.name();
edm::LogVerbatim("RPCGeometryBuilder")
- << "(1), detid: " << rawidCh << " name: " << std::string(name) << " number of Strips: " << nStrips;
+ << "(1) detid: " << rawidCh << " name: " << std::string(name) << " number of Strips: " << nStrips;
const Double_t* tran = fview.trans();
@@ -276,7 +280,7 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(cms::DDFilteredVi
Surface::PositionType pos(tran[0] / dd4hep::cm, tran[1] / dd4hep::cm, tran[2] / dd4hep::cm);
edm::LogVerbatim("RPCGeometryBuilder")
- << "(2), tran.x(): " << tran[0] / dd4hep::cm << " tran.y(): " << tran[1] / dd4hep::cm
+ << "(2) tran.x(): " << tran[0] / dd4hep::cm << " tran.y(): " << tran[1] / dd4hep::cm
<< " tran.z(): " << tran[2] / dd4hep::cm;
DD3Vector x, y, z;
rota.GetComponents(x, y, z);
@@ -298,7 +302,7 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(cms::DDFilteredVi
const float length = dpar[1] / dd4hep::cm;
const float thickness = dpar[2] / dd4hep::cm;
edm::LogVerbatim("RPCGeometryBuilder")
- << "(3), dd4hep::Box, width: " << dpar[0] / dd4hep::cm << " length: " << dpar[1] / dd4hep::cm
+ << "(3) Box, width: " << dpar[0] / dd4hep::cm << " length: " << dpar[1] / dd4hep::cm
<< " thickness: " << dpar[2] / dd4hep::cm;
bounds = new RectangularPlaneBounds(width, length, thickness);
@@ -310,15 +314,12 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(cms::DDFilteredVi
const float be = dpar[0] / dd4hep::cm;
const float te = dpar[1] / dd4hep::cm;
const float ap = dpar[3] / dd4hep::cm;
- const float ti = 0.4 / dd4hep::cm;
+ const float ti = 0.4;
bounds = new TrapezoidalPlaneBounds(be, te, ap, ti);
- const std::vector pars = {
- float(dpar[0] / dd4hep::cm), float(dpar[1] / dd4hep::cm), float(dpar[3] / dd4hep::cm), float(nStrips)};
+ const std::vector pars = {be, te, ap, float(nStrips)};
edm::LogVerbatim("RPCGeometryBuilder")
- << "(4), else, dpar[0] (i.e. dpar[4] for DD): " << dpar[0] / dd4hep::cm
- << " dpar[1] (i.e. dpar[8] for DD): " << dpar[1] / dd4hep::cm
- << " dpar[3] (i.e. dpar[0] for DD): " << dpar[3] / dd4hep::cm << " ti: " << ti / dd4hep::cm;
+ << "(4) be: " << be << " te: " << te << " ap: " << ap << " ti: " << ti << " strips " << nStrips;
rollspecs = new RPCRollSpecs(GeomDetEnumerators::RPCEndcap, std::string(name), pars);
Basic3DVector newX(1., 0., 0.);
@@ -327,6 +328,7 @@ std::unique_ptr RPCGeometryBuilder::buildGeometry(cms::DDFilteredVi
Basic3DVector newZ(0., 1., 0.);
rot.rotateAxes(newX, newY, newZ);
}
+ edm::LogVerbatim("RPCGeometryBuilder") << " Number of strips " << nStrips;
BoundPlane* bp = new BoundPlane(pos, rot, bounds);
ReferenceCountingPointer surf(bp);
diff --git a/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc b/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc
index 21027219df91e..5065c866d330e 100644
--- a/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc
+++ b/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc
@@ -80,7 +80,7 @@ void RPCGeometryParsFromDD::buildGeometry(DDFilteredView& fview,
}
}
if (nStrips == 0)
- std::cout << "No strip found!!" << std::endl;
+ edm::LogVerbatim("RPCGeometryParsFromDD") << "No strip found!!";
const std::vector dpar = fview.logicalPart().solid().parameters();