Backport cms-sw#46115 to avoid warning for RPD volume placement

bsunanda · Oct 4, 2024 · 8353345 · 8353345
1 parent 849be17
commit 8353345
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1729,7 +1729,7 @@
             'Geometry/ForwardCommonData/data/zdcrotations.xml',
             'Geometry/ForwardCommonData/data/lumirotations.xml',
             'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
-            'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml',
+            'Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml',
             'Geometry/ForwardCommonData/data/cmszdc.xml',
         ],
         3 : [

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2023.xml
@@ -262,7 +262,7 @@
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2024.xml
@@ -262,7 +262,7 @@
     <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023XML_cfi.py
@@ -265,7 +265,7 @@
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
         'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
-        'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml',
+        'Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2024XML_cfi.py
@@ -265,7 +265,7 @@
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
         'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
-        'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml',
+        'Geometry/ForwardCommonData/data/rpd/2021/v2/rpd.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
         'Geometry/VeryForwardData/data/RP_Box.xml',
         'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',