Restore 2023 version for RPC geometry

cms-sw · Feb 29, 2024 · 7aa69de · 7aa69de
1 parent 5f21687
commit 7aa69de
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 46 deletions.
diff --git a/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml
@@ -33,12 +33,12 @@
   <Trd1 name="RFGX" dz="84.55*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="27*cm " dx2="56.847*cm " />
   <Trd1 name="RHGX" dz="84.5*cm " dy1="5*mm " dy2="5*mm " dx1="26.95*cm " dx2="56.797*cm " />
   <Trd1 name="REG1" dz="80.25*cm " dy1="1*mm " dy2="1*mm " dx1="27.33*cm - 0.289116*cm" dx2="56.34*cm - 0.294116*cm " /><!-- Sergio: there was not -0.294116*cm -->
-  <Tubs name="RR4X" rMin="2.644*m  " rMax="6.99*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="RT4H" rMin="2.644*m  " rMax="3.3*m  " dz="2*cm " startPhi="-13*deg" deltaPhi="26*deg"/>
-  <Trd1 name="RFHX" dz="27.85*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="47.044*cm " dx2="56.847*cm " />
-  <Trd1 name="RHHX" dz="27.8*cm " dy1="5*mm " dy2="5*mm " dx1="46.994*cm " dx2="56.797*cm " />
-  <Trd1 name="REH1" dz="16.05*cm " dy1="1*mm " dy2="1*mm " dx1="51.134*cm " dx2="56.794*cm " />
-  <Trd1 name="REH2" dz="11.25*cm " dy1="1*mm " dy2="1*mm " dx1="46.991*cm " dx2="50.957*cm " />
+  <Tubs name="RR4X" rMin="3.29*m  " rMax="6.99*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RR4XX" rMin="1.79*m  " rMax="3.29*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RT4H" rMin="1.79*m  " rMax="3.29*m  " dz="2*cm " startPhi="-13*deg" deltaPhi="26*deg"/>
+  <Trd1 name="RFHX" dz="72.5*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="31.56*cm " dx2="57.13*cm " />
+  <Trd1 name="RHHX" dz="72.45*cm " dy1="5*mm " dy2="5*mm " dx1="31.56*cm - 0.00868326*cm" dx2="57.13*cm - 0.00899*cm" /><!-- Sergio: there was not - 0.00899*cm -->
+  <Trd1 name="REH1" dz="70.25*cm" dy1="1*mm" dy2="1*mm" dx1="31.52*cm - 0.254297*cm" dx2="57.0*cm - 0.2699*cm " /><!-- Sergio: there was not -0.2699*cm -->
  </SolidSection>
 
  <LogicalPartSection label="rpcf.xml">
@@ -177,6 +177,10 @@
     <rMaterial name="materials:M_RPC_Gas"/>
   </LogicalPart>
 
+  <LogicalPart name="RR4X" category="unspecified">
+    <rSolid name="RR4X"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
   <LogicalPart name="RR4XP" category="unspecified">
     <rSolid name="RR4X"/>
     <rMaterial name="materials:ME_free_space"/>
@@ -185,6 +189,15 @@
     <rSolid name="RR4X"/>
     <rMaterial name="materials:ME_free_space"/>
   </LogicalPart>
+  <LogicalPart name="RR4XXP" category="unspecified">
+    <rSolid name="RR4XX"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RR4XXN" category="unspecified">
+    <rSolid name="RR4XX"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+
   <LogicalPart name="RT4H" category="unspecified">
     <rSolid name="RT4H"/>
     <rMaterial name="materials:ME_free_space"/>
@@ -201,10 +214,6 @@
     <rSolid name="REH1"/>
     <rMaterial name="materials:M_RPC_Gas"/>
   </LogicalPart>
-  <LogicalPart name="REH2" category="unspecified">
-    <rSolid name="REH2"/>
-    <rMaterial name="materials:M_RPC_Gas"/>
-  </LogicalPart>
  </LogicalPartSection>
 
  <PosPartSection label="rpcf.xml">
@@ -378,15 +387,15 @@
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME3RingN"/>
-   <rChild name="rpcf:RR3XXN"/>
+   <rChild name="rpcf:RR3X"/>
    <rRotation name="rotations:R005"/>
-   <Translation x="0*fm " y="0*fm " z="21.95*cm "/>
+   <Translation x="0*fm " y="0*fm " z="28.25*cm "/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME3RingN"/>
-   <rChild name="rpcf:RR3X"/>
+   <rChild name="rpcf:RR3XXN"/>
    <rRotation name="rotations:R005"/>
-   <Translation x="0*fm " y="0*fm " z="28.25*cm "/>
+   <Translation x="0*fm " y="0*fm " z="21.95*cm "/>
   </PosPart>
 
   <PosPart copyNumber="1">
@@ -418,11 +427,24 @@
    <rRotation name="rotations:R005"/>
    <Translation x="0*fm " y="0*fm " z="29.175*cm " />
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME4RingP"/>
+   <rChild name="rpcf:RR4XXP"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="22.875*cm " />
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME4RingN"/>
+   <rChild name="rpcf:RR4XXN"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="22.875*cm " />
+  </PosPart>
+
   <PosPart copyNumber="1">
    <rParent name="rpcf:RT4H"/>
    <rChild name="rpcf:RFHX"/>
    <rRotation name="rotations:90XD"/>
-   <Translation x="2.943*m  " y="0*fm " z="0*fm " />
+   <Translation x="2.515*m  " y="0*fm " z="0*fm " />
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="rpcf:RFHX"/>
@@ -431,12 +453,7 @@
   <PosPart copyNumber="1">
    <rParent name="rpcf:RHHX"/>
    <rChild name="rpcf:REH1"/>
-   <Translation x="0*fm " y="0*fm " z="11.75*cm " />
-  </PosPart>
-  <PosPart copyNumber="1">
-   <rParent name="rpcf:RHHX"/>
-   <rChild name="rpcf:REH2"/>
-   <Translation x="0*fm " y="0*fm " z="-16.55*cm " />
+   <Translation x="0*fm " y="0*fm " z="0*cm " />
   </PosPart>
 </PosPartSection>
 
@@ -574,7 +591,7 @@
     <Numeric name="zoffset"     value="2.2*cm"/>
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
-    <rParent name="rpcf:RR4XP"/>
+    <rParent name="rpcf:RR4XXP"/>
     <String name="ChildName" value="RT4H"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="1"/>
@@ -585,7 +602,7 @@
     <Numeric name="zoffset"     value="-2.2*cm"/>
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
-    <rParent name="rpcf:RR4XP"/>
+    <rParent name="rpcf:RR4XXP"/>
     <String name="ChildName" value="RT4H"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="1"/>

diff --git a/Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml
@@ -33,12 +33,12 @@
   <Trd1 name="RFGX" dz="84.55*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="27*cm " dx2="56.847*cm " />
   <Trd1 name="RHGX" dz="84.5*cm " dy1="5*mm " dy2="5*mm " dx1="26.95*cm " dx2="56.797*cm " />
   <Trd1 name="REG1" dz="80.25*cm " dy1="1*mm " dy2="1*mm " dx1="27.33*cm - 0.289116*cm" dx2="56.34*cm - 0.294116*cm " /><!-- Sergio: there was not -0.294116*cm -->
-  <Tubs name="RR4X" rMin="2.644*m  " rMax="6.99*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="RT4H" rMin="2.644*m  " rMax="3.3*m  " dz="2*cm " startPhi="-13*deg" deltaPhi="26*deg"/>
-  <Trd1 name="RFHX" dz="27.85*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="47.044*cm " dx2="56.847*cm " />
-  <Trd1 name="RHHX" dz="27.8*cm " dy1="5*mm " dy2="5*mm " dx1="46.994*cm " dx2="56.797*cm " />
-  <Trd1 name="REH1" dz="16.05*cm " dy1="1*mm " dy2="1*mm " dx1="51.134*cm " dx2="56.794*cm " />
-  <Trd1 name="REH2" dz="11.25*cm " dy1="1*mm " dy2="1*mm " dx1="46.991*cm " dx2="50.957*cm " />
+  <Tubs name="RR4X" rMin="3.29*m  " rMax="6.99*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RR4XX" rMin="1.79*m  " rMax="3.29*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RT4H" rMin="1.79*m  " rMax="3.29*m  " dz="2*cm " startPhi="-13*deg" deltaPhi="26*deg"/>
+  <Trd1 name="RFHX" dz="72.5*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="31.56*cm " dx2="57.13*cm " />
+  <Trd1 name="RHHX" dz="72.45*cm " dy1="5*mm " dy2="5*mm " dx1="31.56*cm - 0.00868326*cm" dx2="57.13*cm - 0.00899*cm" /><!-- Sergio: there was not - 0.00899*cm -->
+  <Trd1 name="REH1" dz="70.25*cm" dy1="1*mm" dy2="1*mm" dx1="31.52*cm - 0.254297*cm" dx2="57.0*cm - 0.2699*cm " /><!-- Sergio: there was not -0.2699*cm -->
  </SolidSection>
 
  <LogicalPartSection label="rpcf.xml">
@@ -177,6 +177,10 @@
     <rMaterial name="materials:M_RPC_Gas"/>
   </LogicalPart>
 
+  <LogicalPart name="RR4X" category="unspecified">
+    <rSolid name="RR4X"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
   <LogicalPart name="RR4XP" category="unspecified">
     <rSolid name="RR4X"/>
     <rMaterial name="materials:ME_free_space"/>
@@ -185,6 +189,15 @@
     <rSolid name="RR4X"/>
     <rMaterial name="materials:ME_free_space"/>
   </LogicalPart>
+  <LogicalPart name="RR4XXP" category="unspecified">
+    <rSolid name="RR4XX"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RR4XXN" category="unspecified">
+    <rSolid name="RR4XX"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+
   <LogicalPart name="RT4H" category="unspecified">
     <rSolid name="RT4H"/>
     <rMaterial name="materials:ME_free_space"/>
@@ -201,10 +214,6 @@
     <rSolid name="REH1"/>
     <rMaterial name="materials:M_RPC_Gas"/>
   </LogicalPart>
-  <LogicalPart name="REH2" category="unspecified">
-    <rSolid name="REH2"/>
-    <rMaterial name="materials:M_RPC_Gas"/>
-  </LogicalPart>
  </LogicalPartSection>
 
  <PosPartSection label="rpcf.xml">
@@ -378,15 +387,15 @@
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME3RingN"/>
-   <rChild name="rpcf:RR3XXN"/>
+   <rChild name="rpcf:RR3X"/>
    <rRotation name="rotations:R005"/>
-   <Translation x="0*fm " y="0*fm " z="21.95*cm "/>
+   <Translation x="0*fm " y="0*fm " z="28.25*cm "/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME3RingN"/>
-   <rChild name="rpcf:RR3X"/>
+   <rChild name="rpcf:RR3XXN"/>
    <rRotation name="rotations:R005"/>
-   <Translation x="0*fm " y="0*fm " z="28.25*cm "/>
+   <Translation x="0*fm " y="0*fm " z="21.95*cm "/>
   </PosPart>
 
   <PosPart copyNumber="1">
@@ -418,11 +427,24 @@
    <rRotation name="rotations:R005"/>
    <Translation x="0*fm " y="0*fm " z="29.175*cm " />
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME4RingP"/>
+   <rChild name="rpcf:RR4XXP"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="22.875*cm " />
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME4RingN"/>
+   <rChild name="rpcf:RR4XXN"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="22.875*cm " />
+  </PosPart>
+
   <PosPart copyNumber="1">
    <rParent name="rpcf:RT4H"/>
    <rChild name="rpcf:RFHX"/>
    <rRotation name="rotations:90XD"/>
-   <Translation x="2.943*m  " y="0*fm " z="0*fm " />
+   <Translation x="2.515*m  " y="0*fm " z="0*fm " />
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="rpcf:RFHX"/>
@@ -431,12 +453,7 @@
   <PosPart copyNumber="1">
    <rParent name="rpcf:RHHX"/>
    <rChild name="rpcf:REH1"/>
-   <Translation x="0*fm " y="0*fm " z="11.75*cm " />
-  </PosPart>
-  <PosPart copyNumber="1">
-   <rParent name="rpcf:RHHX"/>
-   <rChild name="rpcf:REH2"/>
-   <Translation x="0*fm " y="0*fm " z="-16.55*cm " />
+   <Translation x="0*fm " y="0*fm " z="0*cm " />
   </PosPart>
 </PosPartSection>
 
@@ -574,7 +591,7 @@
     <Numeric name="zoffset"     value="2.2*cm"/>
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
-    <rParent name="rpcf:RR4XP"/>
+    <rParent name="rpcf:RR4XXP"/>
     <String name="ChildName" value="RT4H"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="1"/>
@@ -585,7 +602,7 @@
     <Numeric name="zoffset"     value="-2.2*cm"/>
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
-    <rParent name="rpcf:RR4XP"/>
+    <rParent name="rpcf:RR4XXP"/>
     <String name="ChildName" value="RT4H"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="1"/>