Backport the correction to 2024 Geometry to CMSSW_14_0_X due to RPC d…

…etector (backport of cms-sw#14065 and cms-sw#14093)
Raffaella07 · Apr 15, 2024 · 44c563b · 44c563b
1 parent 60e1d17
commit 44c563b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml
@@ -197,7 +197,6 @@
     <rSolid name="RR4XX"/>
     <rMaterial name="materials:ME_free_space"/>
   </LogicalPart>
-
   <LogicalPart name="RT4H" category="unspecified">
     <rSolid name="RT4H"/>
     <rMaterial name="materials:ME_free_space"/>
@@ -379,18 +378,18 @@
    <rRotation name="rotations:R005"/>
    <Translation x="0*fm " y="0*fm " z="28.25*cm "/>
   </PosPart>
-  <PosPart copyNumber="1">
-   <rParent name="mf:ME3RingP"/>
-   <rChild name="rpcf:RR3XXP"/>
-   <rRotation name="rotations:R005"/>
-   <Translation x="0*fm " y="0*fm " z="21.95*cm "/>
-  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME3RingN"/>
    <rChild name="rpcf:RR3X"/>
    <rRotation name="rotations:R005"/>
    <Translation x="0*fm " y="0*fm " z="28.25*cm "/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME3RingP"/>
+   <rChild name="rpcf:RR3XXP"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="21.95*cm "/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME3RingN"/>
    <rChild name="rpcf:RR3XXN"/>

diff --git a/Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml
@@ -197,7 +197,6 @@
     <rSolid name="RR4XX"/>
     <rMaterial name="materials:ME_free_space"/>
   </LogicalPart>
-
   <LogicalPart name="RT4H" category="unspecified">
     <rSolid name="RT4H"/>
     <rMaterial name="materials:ME_free_space"/>
@@ -379,6 +378,12 @@
    <rRotation name="rotations:R005"/>
    <Translation x="0*fm " y="0*fm " z="28.25*cm "/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME3RingN"/>
+   <rChild name="rpcf:RR3X"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="28.25*cm "/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME3RingP"/>
    <rChild name="rpcf:RR3XXP"/>
@@ -548,7 +553,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XP"/>
-    <String name="ChildName" value="RTXUR"/>
+    <String name="ChildName" value="RTXU"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="1"/>
@@ -559,7 +564,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XP"/>
-    <String name="ChildName" value="RTXUR"/>
+    <String name="ChildName" value="RTXU"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="2"/>
@@ -570,7 +575,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XN"/>
-    <String name="ChildName" value="RTXUR"/>
+    <String name="ChildName" value="RTXU"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="1"/>
@@ -581,7 +586,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XN"/>
-    <String name="ChildName" value="RTXUR"/>
+    <String name="ChildName" value="RTXU"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="2"/>