From 4dd23971dd7d0d84d5202d8c975639fee7c9b502 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Tue, 27 Feb 2024 05:39:24 +0100
Subject: [PATCH 1/3] Backport the correction to 2024 Geometry to CMSSW_14_0_X
 due to RPC detector (backport of #14065 and #14093)

---
 .../muonNumbering/2024/v1/muonNumbering.xml   | 504 ++++++++++++++
 .../MuonCommonData/data/rpcf/2023/v1/rpcf.xml | 615 ++++++++++++++++++
 .../MuonCommonData/data/rpcf/2024/v1/rpcf.xml |  77 ++-
 3 files changed, 1166 insertions(+), 30 deletions(-)
 create mode 100644 Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml
 create mode 100644 Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml

diff --git a/Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml
new file mode 100644
index 0000000000000..365bbd1ef8729
--- /dev/null
+++ b/Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml
@@ -0,0 +1,504 @@
+<?xml version="1.0"?>
+<DDDefinition>
+ <ConstantsSection label="muonconstants" eval="true">
+  <Constant name="xml_starts_with_copyno" value="1"/>
+  <Constant name="level" value="1000"/>
+  <Constant name="super" value="100"/>
+  <Constant name="base" value="1"/>
+  <Constant name="mb_region" value="1*[level]"/>
+  <Constant name="mb_wheel" value="2*[level]"/>
+  <Constant name="mb_station" value="3*[level]"/>
+  <Constant name="mb_superlayer" value="4*[level]"/>
+  <Constant name="mb_layer" value="5*[level]"/>
+  <Constant name="mb_wire" value="6*[level]"/>
+  <Constant name="me_region" value="[mb_region]"/>
+  <Constant name="me_station" value="2*[level]"/>
+  <Constant name="me_subring" value="3*[level]"/>
+  <Constant name="me_sector" value="4*[level]"/>
+  <Constant name="me_ring" value="5*[level]"/>
+  <Constant name="me_layer" value="6*[level]"/>
+  <Constant name="mr_region" value="[mb_region]"/>
+  <Constant name="mr_bwheel" value="[mb_wheel]"/>
+  <Constant name="mr_bstation" value="[mb_station]"/>
+  <Constant name="mr_bplane" value="4*[level]"/>
+  <Constant name="mr_bchamber" value="5*[level]"/>
+  <Constant name="mr_estation" value="[me_station]"/>
+  <Constant name="mr_eplane" value="3*[level]"/>
+  <Constant name="mr_esector" value="4*[level]"/>
+  <Constant name="mr_eroll" value="5*[level]"/>
+  <Constant name="mg_region" value="[mb_region]"/>
+  <Constant name="mg_station" value="[me_station]"/>
+  <Constant name="mg_ring" value="3*[level]"/>
+  <Constant name="mg_sector" value="4*[level]"/>
+  <Constant name="mg_roll" value="5*[level]"/>
+ </ConstantsSection>
+ <SpecParSection label="muonregionnumbering" eval="true">
+  <SpecPar name="MuonCommonNumbering">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep0" eval="false"/>
+   <PartSelector path="//MUON"/>
+   <Parameter name="xml_starts_with_copyno" value="[xml_starts_with_copyno]"/>
+   <Parameter name="level" value="[level]"/>
+   <Parameter name="super" value="[super]"/>
+   <Parameter name="base" value="[base]"/>
+   <Parameter name="mb_region" value="[mb_region]"/>
+   <Parameter name="mb_wheel"      value="[mb_wheel]"/>
+   <Parameter name="mb_station"    value="[mb_station]"/>
+   <Parameter name="mb_superlayer" value="[mb_superlayer]"/>
+   <Parameter name="mb_layer"      value="[mb_layer]"/>
+   <Parameter name="mb_wire"       value="[mb_wire]"/>
+   <Parameter name="me_region"     value="[me_region]"/>
+   <Parameter name="me_station"    value="[me_station]"/>
+   <Parameter name="me_subring"    value="[me_subring]"/>
+   <Parameter name="me_sector"     value="[me_sector]"/>
+   <Parameter name="me_ring"       value="[me_ring]"/>
+   <Parameter name="me_layer"      value="[me_layer]"/>
+   <Parameter name="mr_region"     value="[mr_region]"/>
+   <Parameter name="mr_bwheel"     value="[mr_bwheel]"/>
+   <Parameter name="mr_bstation"   value="[mr_bstation]"/>
+   <Parameter name="mr_bplane"     value="[mr_bplane]"/>
+   <Parameter name="mr_bchamber"   value="[mr_bchamber]"/>
+   <Parameter name="mr_estation"   value="[mr_estation]"/>
+   <Parameter name="mr_eplane"     value="[mr_eplane]"/>
+   <Parameter name="mr_esector"    value="[mr_esector]"/>
+   <Parameter name="mr_eroll"      value="[mr_eroll]"/>
+   <Parameter name="mg_region"     value="[mg_region]"/>
+   <Parameter name="mg_station"    value="[mg_station]"/>
+   <Parameter name="mg_ring"       value="[mg_ring]"/>
+   <Parameter name="mg_sector"     value="[mg_sector]"/>
+   <Parameter name="mg_roll"       value="[mg_roll]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrel">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep1" eval="false"/>
+   <PartSelector path="//MB"/>
+   <Parameter name="CopyNoTag" value="[mb_region]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcap">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep2" eval="false"/>
+   <PartSelector path="//MEP"/>
+   <PartSelector path="//MEN"/>
+   <Parameter name="CopyNoTag" value="[me_region]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonbarrelnumbering" eval="true">
+  <SpecPar name="MuonBarrelWheels">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep3" eval="false"/>
+   <PartSelector path="//MBWheel_.*"/>
+   <Parameter name="CopyNoTag" value="[mb_wheel]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep4" eval="false"/>
+   <PartSelector path="//MB1N0P"/>
+   <PartSelector path="//MB1P"/>
+   <PartSelector path="//MB1P0"/>
+   <PartSelector path="//MB1ChimP"/>
+   <PartSelector path="//MB1N"/>
+   <PartSelector path="//MB1ChimN"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep5" eval="false"/>
+   <PartSelector path="//MB2N32P"/>
+   <PartSelector path="//MB2P32P"/>
+   <PartSelector path="//MB2ChimP"/>
+   <PartSelector path="//MB2N32N"/>
+   <PartSelector path="//MB2ChimN"/>
+   <PartSelector path="//MB2P23P"/>
+   <PartSelector path="//MB2N23N"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep6" eval="false"/>
+   <PartSelector path="//MB3P"/>
+   <PartSelector path="//MB3N"/>
+   <PartSelector path="//MB3ChimP"/>
+   <PartSelector path="//MB3ChimN"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation4">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep7" eval="false"/>
+   <PartSelector path="//MB4BigLeftP"/>
+   <PartSelector path="//MB4BigRightP"/>
+   <PartSelector path="//MB4BigLeftN"/>
+   <PartSelector path="//MB4BigChimN"/>
+   <PartSelector path="//MB4BigRightN"/>
+   <PartSelector path="//MB4SmallRightP"/>
+   <PartSelector path="//MB4SmallLeftP"/>
+   <PartSelector path="//MB4SmallRightN"/>
+   <PartSelector path="//MB4SmallLeftN"/>
+   <PartSelector path="//MB4TopP"/>
+   <PartSelector path="//MB4TopChimP"/>
+   <PartSelector path="//MB4TopN"/>
+   <PartSelector path="//MB4BottomLeftP"/>
+   <PartSelector path="//MB4BottomRightP"/>
+   <PartSelector path="//MB4BottomRightN"/>
+   <PartSelector path="//MB4BottomLeftN"/>
+   <PartSelector path="//MB4FeetP"/>
+   <PartSelector path="//MB4FeetN"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelSuperLayer">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep8" eval="false"/>
+   <PartSelector path="//MB.*SuperLayer.*"/>
+   <Parameter name="CopyNoTag" value="[mb_superlayer]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelLayer">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep9" eval="false"/>
+   <PartSelector path="//MB.*SLPhiLayer.*"/>
+   <PartSelector path="//MB.*SLZLayer.*"/>
+   <Parameter name="CopyNoTag" value="[mb_layer]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelWire">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep10" eval="false"/>
+   <PartSelector path="//MBSLPhiGas"/>
+   <PartSelector path="//MBChimSLPhiGas"/>
+   <PartSelector path="//MB.*SLZGas"/>
+   <Parameter name="CopyNoTag" value="[mb_wire]"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonrpcnumbering" eval="true">
+  <SpecPar name="MuonRpcPlane1I">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep11" eval="false"/>
+   <PartSelector path="//MB1RPC_IP"/>
+   <PartSelector path="//MB1RPC_IN"/>
+   <PartSelector path="//MB1ChimRPC_IP"/>
+   <PartSelector path="//MB1ChimRPC_IN"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane1O">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep12" eval="false"/>
+   <PartSelector path="//MB1RPC_OP"/>
+   <PartSelector path="//MB1RPC_ON"/>
+   <PartSelector path="//MB1ChimRPC_OP"/>
+   <PartSelector path="//MB1ChimRPC_ON"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane2I">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep13" eval="false"/>
+   <PartSelector path="//MB22RPC_IP"/>
+   <PartSelector path="//MB22RPC_IN"/>
+   <PartSelector path="//MB23RPC_IP"/>
+   <PartSelector path="//MB23RPC_IN"/>
+   <PartSelector path="//MB2ChimRPC_IP"/>
+   <PartSelector path="//MB2ChimRPC_IN"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane2O">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep14" eval="false"/>
+   <PartSelector path="//MB22RPC_OP"/>
+   <PartSelector path="//MB22RPC_ON"/>
+   <PartSelector path="//MB23RPC_OP"/>
+   <PartSelector path="//MB23RPC_ON"/>
+   <PartSelector path="//MB2ChimRPC_OP"/>
+   <PartSelector path="//MB2ChimRPC_ON"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane3S">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep15" eval="false"/>
+   <PartSelector path="//MB3RPC_P"/>
+   <PartSelector path="//MB3RPC_N"/>
+   <PartSelector path="//MB3ChimRPC_P"/>
+   <PartSelector path="//MB3ChimRPC_N"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane4">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep16" eval="false"/>
+   <PartSelector path="//MB4RPC_P"/>
+   <PartSelector path="//MB4RPC_N"/>
+   <PartSelector path="//MB4SmallRPC_PS8"/>
+   <PartSelector path="//MB4SmallRPC_NS8"/>
+   <PartSelector path="//MB4SmallRPC_PS12"/>
+   <PartSelector path="//MB4SmallRPC_NS12"/>
+   <PartSelector path="//MB4TopRPC_P"/>
+   <PartSelector path="//MB4TopRPC_N"/>
+   <PartSelector path="//MB4FeetRPC_P"/>
+   <PartSelector path="//MB4FeetRPC_N"/>
+   <PartSelector path="//MB4BottomRPC_P"/>
+   <PartSelector path="//MB4BottomRPC_N"/>
+   <PartSelector path="//MB4TopChimRPC_P"/>
+   <PartSelector path="//MB4BigChimRPC_N"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcChamberLeft">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep17" eval="false"/>
+   <PartSelector path="//MB.*RPC.*GasLeft"/>
+   <Parameter name="CopyNoTag" value="[mr_bchamber]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcChamberMiddle">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep18" eval="false"/>
+   <PartSelector path="//MB.*RPC.*GasMiddle"/>
+   <Parameter name="CopyNoTag" value="[mr_bchamber]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcChamberRight">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep19" eval="false"/>
+   <PartSelector path="//MB.*RPC.*GasRight"/>
+   <Parameter name="CopyNoTag" value="[mr_bchamber]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep20" eval="false"/>
+   <PartSelector path="//RR12"/>
+   <PartSelector path="//RR12N"/>
+   <PartSelector path="//RR13"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep21" eval="false"/>
+   <PartSelector path="//RR2X"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep22" eval="false"/>
+   <PartSelector path="//RR3X.*"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap4">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep23" eval="false"/>
+   <PartSelector path="//RR4X.*"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapSector">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep24" eval="false"/>
+   <PartSelector path="//RT1B"/>
+   <PartSelector path="//RT1BN"/>
+   <PartSelector path="//RT1C"/>
+   <PartSelector path="//RTXU"/>
+   <PartSelector path="//RTXUR"/>
+   <PartSelector path="//RT3G"/>
+   <PartSelector path="//RT4H"/>
+   <Parameter name="CopyNoTag" value="[mr_esector]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberB1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep25" eval="false"/>
+   <PartSelector path="//REB1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberB2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep26" eval="false"/>
+   <PartSelector path="//REB2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberB3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep27" eval="false"/>
+   <PartSelector path="//REB3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberC1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep28" eval="false"/>
+   <PartSelector path="//REC1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberC2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep29" eval="false"/>
+   <PartSelector path="//REC2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberC3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep30" eval="false"/>
+   <PartSelector path="//REC3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberE1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep31" eval="false"/>
+   <PartSelector path="//REE1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberE2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep32" eval="false"/>
+   <PartSelector path="//REE2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberE3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep33" eval="false"/>
+   <PartSelector path="//REE3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberF1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep34" eval="false"/>
+   <PartSelector path="//REF1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberF2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep35" eval="false"/>
+   <PartSelector path="//REF2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberF3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep36" eval="false"/>
+   <PartSelector path="//REF3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberG1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep37" eval="false"/>
+   <PartSelector path="//REG1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="7*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberH1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep38" eval="false"/>
+   <PartSelector path="//REH.*"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="8*[super]+0"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonendcapnumbering" eval="true">
+  <SpecPar name="MuonEndcapStation1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep39" eval="false"/>
+   <PartSelector path="//ME1RingP"/>
+   <PartSelector path="//ME1RingN"/>
+   <PartSelector path="//ME12RingP"/>
+   <PartSelector path="//ME12RingN"/>
+   <PartSelector path="//ME13RingP"/>
+   <PartSelector path="//ME13RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapStation2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep40" eval="false"/>
+   <PartSelector path="//ME2RingP"/>
+   <PartSelector path="//ME2RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapStation3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep41" eval="false"/>
+   <PartSelector path="//ME3RingP"/>
+   <PartSelector path="//ME3RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapStation4">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep42" eval="false"/>
+   <PartSelector path="//ME4RingP"/>
+   <PartSelector path="//ME4RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapSubrings">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep43" eval="false"/>
+   <PartSelector path="//ME11Space"/>
+   <PartSelector path="//ME12Space"/>
+   <PartSelector path="//ME13Space"/>
+   <PartSelector path="//ME21Space"/>
+   <PartSelector path="//ME22Space"/>
+   <PartSelector path="//ME31Space"/>
+   <PartSelector path="//ME32Space"/>
+   <PartSelector path="//ME41Space"/>
+   <PartSelector path="//ME42Space"/>
+   <Parameter name="CopyNoTag" value="[me_subring]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapSectors">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep44" eval="false"/>
+   <PartSelector path="//ME11SpaceDivision"/>
+   <PartSelector path="//ME12SpaceDivision"/>
+   <PartSelector path="//ME13SpaceDivision"/>
+   <PartSelector path="//ME21SpaceDivision"/>
+   <PartSelector path="//ME22SpaceDivision"/>
+   <PartSelector path="//ME31SpaceDivision"/>
+   <PartSelector path="//ME32SpaceDivision"/>
+   <PartSelector path="//ME41SpaceDivision"/>
+   <PartSelector path="//ME42SpaceDivision"/>
+   <Parameter name="CopyNoTag" value="[me_sector]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapLayers">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep45" eval="false"/>
+   <PartSelector path="//ME11Layer"/>
+   <PartSelector path="//ME12Layer"/>
+   <PartSelector path="//ME13Layer"/>
+   <PartSelector path="//ME21Layer"/>
+   <PartSelector path="//ME22Layer"/>
+   <PartSelector path="//ME31Layer"/>
+   <PartSelector path="//ME32Layer"/>
+   <PartSelector path="//ME41Layer"/>
+   <PartSelector path="//ME42Layer"/>
+   <Parameter name="CopyNoTag" value="[me_layer]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRing1">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep46" eval="false"/>
+   <PartSelector path="//ME11AlumFrame"/>
+   <PartSelector path="//ME21AlumFrame"/>
+   <PartSelector path="//ME31AlumFrame"/>
+   <PartSelector path="//ME41AlumFrame"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRing2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep47" eval="false"/>
+   <PartSelector path="//ME12AlumFrame"/>
+   <PartSelector path="//ME22AlumFrame"/>
+   <PartSelector path="//ME32AlumFrame"/>
+   <PartSelector path="//ME42AlumFrame"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRing3">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep48" eval="false"/>
+   <PartSelector path="//ME13AlumFrame"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRingA">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep49" eval="false"/>
+   <PartSelector path="//ME1A_ActiveGasVol"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonGEMnumbering" eval="true">
+  <SpecPar name="MuonGEMEndcap">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep50" eval="false"/>
+   <PartSelector path="//GEMDisk11.*"/>
+   <Parameter name="CopyNoTag" value="[mg_ring]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonGEMEndcap2">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep51" eval="false"/>
+   <PartSelector path="//GEMDisk21L.*"/>
+   <Parameter name="CopyNoTag" value="[mg_ring]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonGEMSector">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep52" eval="false"/>
+   <PartSelector path="//GEMBox11.*"/>
+   <PartSelector path="//GEMBox21.*"/>
+   <Parameter name="CopyNoTag" value="[mg_sector]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonGEMChamber">
+   <Parameter name="OnlyForMuonNumbering" value="muonstep53" eval="false"/>
+   <PartSelector path="//GHA1.*"/>
+   <PartSelector path="//GHA2.*"/>
+   <Parameter name="CopyNoTag" value="[mg_roll]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+ </SpecParSection>
+</DDDefinition>
diff --git a/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml
new file mode 100644
index 0000000000000..e8bb1af4dbd1c
--- /dev/null
+++ b/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml
@@ -0,0 +1,615 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+ <SolidSection label="rpcf.xml">
+  <Tubs name="RR12" rMin="2.745*m  " rMax="4.644*m  " dz="5.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Trd1 name="RFBX" dz="92*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="24.368*cm " dx2="40.453*cm "/>
+  <Trd1 name="RHBX" dz="91.95*cm " dy1="5*mm " dy2="5*mm " dx1="24.318*cm " dx2="40.403*cm "/>
+  <Trd1 name="REB1" dz="26.75*cm " dy1="1*mm " dy2="1*mm " dx1="35.721*cm " dx2="40.40*cm "/>
+  <Trd1 name="REB2" dz="24.5*cm " dy1="1*mm " dy2="1*mm " dx1="31.347*cm " dx2="35.633*cm "/>
+  <Trd1 name="REB3" dz="39.7*cm " dy1="1*mm " dy2="1*mm " dx1="24.315*cm " dx2="31.26*cm "/>
+  <Tubs name="RR13" rMin="5.05*m  " rMax="6.87*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RT1C" rMin="5.05*m  " rMax="6.87*m  " dz="2*cm " startPhi="-8*deg" deltaPhi="16*deg"/>
+  <Trd1 name="RFCX" dz="87.15*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="44.435*cm " dx2="59.676*cm "/>
+  <Trd1 name="RHCX" dz="87.1*cm " dy1="5*mm " dy2="5*mm " dx1="44.385*cm " dx2="59.626*cm "/>
+  <Trd1 name="REC1" dz="20.15*cm " dy1="1*mm " dy2="1*mm " dx1="56.097*cm " dx2="59.623*cm "/>
+  <Trd1 name="REC2" dz="37.95*cm " dy1="1*mm " dy2="1*mm " dx1="49.369*cm " dx2="56.009*cm "/>
+  <Trd1 name="REC3" dz="28*cm " dy1="1*mm " dy2="1*mm " dx1="44.382*cm " dx2="49.281*cm "/>
+  <Tubs name="RTXU" rMin="3.29*m  " rMax="6.99*m  " dz="2*cm " startPhi="-8*deg" deltaPhi="16*deg"/>
+  <Tubs name="RTXUR" rMin="3.31*m  " rMax="6.99*m  " dz="2*cm " startPhi="-8*deg" deltaPhi="16*deg"/>
+  <Trd1 name="RFEX" dz="82.8*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="29.089*cm " dx2="43.569*cm "/>
+  <Trd1 name="RHEX" dz="82.75*cm " dy1="5*mm " dy2="5*mm " dx1="29.039*cm " dx2="43.519*cm "/>
+  <Trd1 name="REE1" dz="30.85*cm " dy1="1*mm " dy2="1*mm " dx1="38.118*cm " dx2="43.516*cm "/>
+  <Trd1 name="REE2" dz="26.95*cm " dy1="1*mm " dy2="1*mm " dx1="33.315*cm " dx2="38.03*cm "/>
+  <Trd1 name="REE3" dz="23.95*cm " dy1="1*mm " dy2="1*mm " dx1="29.036*cm " dx2="33.227*cm "/>
+  <Trd1 name="RFFX" dz="95.15*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="44.094*cm " dx2="60.734*cm "/>
+  <Trd1 name="RHFX" dz="95.1*cm " dy1="5*mm " dy2="5*mm " dx1="44.044*cm " dx2="60.684*cm "/>
+  <Trd1 name="REF1" dz="25.95*cm " dy1="1*mm " dy2="1*mm " dx1="56.14*cm " dx2="60.681*cm "/>
+  <Trd1 name="REF2" dz="37.95*cm " dy1="1*mm " dy2="1*mm " dx1="49.413*cm " dx2="56.053*cm "/>
+  <Trd1 name="REF3" dz="30.2*cm " dy1="1*mm " dy2="1*mm " dx1="44.041*cm " dx2="49.325*cm "/>
+  <Tubs name="RR3X" rMin="3.29*m  " rMax="6.99*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RR3XX" rMin="1.53*m  " rMax="3.29*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RT3G" rMin="1.53*m  " rMax="3.29*m  " dz="2*cm " startPhi="-13*deg" deltaPhi="26*deg"/>
+  <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="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">
+  <LogicalPart name="RR12" category="unspecified">
+   <rSolid name="RR12"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RR12N" category="unspecified">
+   <rSolid name="RR12"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RFBX" category="unspecified">
+   <rSolid name="RFBX"/>
+   <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHBX" category="unspecified">
+   <rSolid name="RHBX"/>
+   <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REB1" category="unspecified">
+   <rSolid name="REB1"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REB2" category="unspecified">
+   <rSolid name="REB2"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REB3" category="unspecified">
+   <rSolid name="REB3"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="RR13" category="unspecified">
+   <rSolid name="RR13"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RT1C" category="unspecified">
+   <rSolid name="RT1C"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RFCX" category="unspecified">
+   <rSolid name="RFCX"/>
+   <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHCX" category="unspecified">
+   <rSolid name="RHCX"/>
+   <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REC1" category="unspecified">
+   <rSolid name="REC1"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REC2" category="unspecified">
+   <rSolid name="REC2"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REC3" category="unspecified">
+   <rSolid name="REC3"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="RTXU" category="unspecified">
+   <rSolid name="RTXU"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RTXUR" category="unspecified">
+   <rSolid name="RTXUR"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RFEX" category="unspecified">
+   <rSolid name="RFEX"/>
+   <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHEX" category="unspecified">
+   <rSolid name="RHEX"/>
+   <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REE1" category="unspecified">
+   <rSolid name="REE1"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REE2" category="unspecified">
+   <rSolid name="REE2"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REE3" category="unspecified">
+   <rSolid name="REE3"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="RFFX" category="unspecified">
+   <rSolid name="RFFX"/>
+   <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHFX" category="unspecified">
+   <rSolid name="RHFX"/>
+   <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REF1" category="unspecified">
+   <rSolid name="REF1"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REF2" category="unspecified">
+   <rSolid name="REF2"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REF3" category="unspecified">
+   <rSolid name="REF3"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+
+  <LogicalPart name="RR3X" category="unspecified">
+   <rSolid name="RR3X"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RR3XXP" category="unspecified">
+   <rSolid name="RR3XX"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RR3XXN" category="unspecified">
+   <rSolid name="RR3XX"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+
+  <LogicalPart name="RT3G" category="unspecified">
+    <rSolid name="RT3G"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RFGX" category="unspecified">
+    <rSolid name="RFGX"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHGX" category="unspecified">
+    <rSolid name="RHGX"/>
+    <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REG1" category="unspecified">
+    <rSolid name="REG1"/>
+    <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"/>
+  </LogicalPart>
+  <LogicalPart name="RR4XN" category="unspecified">
+    <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"/>
+  </LogicalPart>
+  <LogicalPart name="RFHX" category="unspecified">
+    <rSolid name="RFHX"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHHX" category="unspecified">
+    <rSolid name="RHHX"/>
+    <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REH1" category="unspecified">
+    <rSolid name="REH1"/>
+    <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+ </LogicalPartSection>
+
+ <PosPartSection label="rpcf.xml">
+  <PosPart copyNumber="3">
+   <rParent name="mf:ME12RingP"/>
+   <rChild name="rpcf:RR12"/>
+   <rRotation name="rotations:R020"/>
+   <Translation x="0*fm " y="0*fm " z="306.3875*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="mf:ME12RingP"/>
+   <rChild name="rpcf:RR12N"/>
+   <rRotation name="rotations:R010"/>
+   <Translation x="0*fm " y="0*fm " z="-3.7665*mm"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+   <rParent name="mf:ME12RingN"/>
+   <rChild name="rpcf:RR12"/>
+   <rRotation name="rotations:R020"/>
+   <Translation x="0*fm " y="0*fm " z="306.3875*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="mf:ME12RingN"/>
+   <rChild name="rpcf:RR12N"/>
+   <rRotation name="rotations:R010"/>
+   <Translation x="0*fm " y="0*fm " z="-3.7665*mm"/>
+  </PosPart>
+  <Division name="RT1B" parent="RR12" axis="phi" offset="-10*deg" width="20*deg"/>
+  <Division name="RT1BN" parent="RR12N" axis="phi" offset="-10*deg" width="20*deg"/>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RT1B"/>
+   <rChild name="rpcf:RFBX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="3.692*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RT1BN"/>
+   <rChild name="rpcf:RFBX"/>
+   <rRotation name="rotations:90DX"/>
+   <Translation x="3.692*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFBX"/>
+   <rChild name="rpcf:RHBX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHBX"/>
+   <rChild name="rpcf:REB1"/>
+   <Translation x="0*fm " y="0*fm " z="65.2*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHBX"/>
+   <rChild name="rpcf:REB2"/>
+   <Translation x="0*fm " y="0*fm " z="12.95*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHBX"/>
+   <rChild name="rpcf:REB3"/>
+   <Translation x="0*fm " y="0*fm " z="-52.25*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME13RingP"/>
+   <rChild name="rpcf:RR13"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="7.176*m  "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME13RingN"/>
+   <rChild name="rpcf:RR13"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="7.176*m  "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RT1C"/>
+   <rChild name="rpcf:RFCX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="5.944*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFCX"/>
+   <rChild name="rpcf:RHCX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHCX"/>
+   <rChild name="rpcf:REC1"/>
+   <Translation x="0*fm " y="0*fm " z="66.95*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHCX"/>
+   <rChild name="rpcf:REC2"/>
+   <Translation x="0*fm " y="0*fm " z="7.85*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHCX"/>
+   <rChild name="rpcf:REC3"/>
+   <Translation x="0*fm " y="0*fm " z="-59.1*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RTXU"/>
+   <rChild name="rpcf:RFEX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="4.1465*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RTXUR"/>
+   <rChild name="rpcf:RFEX"/>
+   <rRotation name="rotations:90DX"/>
+   <Translation x="4.1465*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFEX"/>
+   <rChild name="rpcf:RHEX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHEX"/>
+   <rChild name="rpcf:REE1"/>
+   <Translation x="0*fm " y="0*fm " z="51.9*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHEX"/>
+   <rChild name="rpcf:REE2"/>
+   <Translation x="0*fm " y="0*fm " z="-6.9*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHEX"/>
+   <rChild name="rpcf:REE3"/>
+   <Translation x="0*fm " y="0*fm " z="-58.8*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RTXUR"/>
+   <rChild name="rpcf:RFFX"/>
+   <rRotation name="rotations:90DX"/>
+   <Translation x="5.985*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RTXU"/>
+   <rChild name="rpcf:RFFX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="5.985*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFFX"/>
+   <rChild name="rpcf:RHFX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHFX"/>
+   <rChild name="rpcf:REF1"/>
+   <Translation x="0*fm " y="0*fm " z="69.15*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHFX"/>
+   <rChild name="rpcf:REF2"/>
+   <Translation x="0*fm " y="0*fm " z="4.25*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHFX"/>
+   <rChild name="rpcf:REF3"/>
+   <Translation x="0*fm " y="0*fm " z="-64.9*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME3RingP"/>
+   <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: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"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="21.95*cm "/>
+  </PosPart>
+
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RT3G"/>
+   <rChild name="rpcf:RFGX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="2.38*m  " y="0*fm " z="0*fm " />
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFGX"/>
+   <rChild name="rpcf:RHGX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHGX"/>
+   <rChild name="rpcf:REG1"/>
+   <Translation x="0*fm " y="0*fm " z="0*cm " />
+  </PosPart>
+
+  <!-- -->
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME4RingP"/>
+   <rChild name="rpcf:RR4XP"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="29.175*cm " />
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME4RingN"/>
+   <rChild name="rpcf:RR4XN"/>
+   <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.515*m  " y="0*fm " z="0*fm " />
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFHX"/>
+   <rChild name="rpcf:RHHX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHHX"/>
+   <rChild name="rpcf:REH1"/>
+   <Translation x="0*fm " y="0*fm " z="0*cm " />
+  </PosPart>
+</PosPartSection>
+
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR13"/>
+    <String name="ChildName" value="RT1C"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR13"/>
+    <String name="ChildName" value="RT1C"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="mf:RR2X"/>
+    <String name="ChildName" value="RTXUR"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="mf:RR2X"/>
+    <String name="ChildName" value="RTXUR"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR3X"/>
+    <String name="ChildName" value="RTXU"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR3X"/>
+    <String name="ChildName" value="RTXU"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR3XXP"/>
+    <String name="ChildName" value="RT3G"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="1"/>
+    <Numeric name="startCopyNo" value="15"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="40*deg"/>
+    <Numeric name="startAngle"  value="280*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR3XXP"/>
+    <String name="ChildName" value="RT3G"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="1"/>
+    <Numeric name="startCopyNo" value="16"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="40*deg"/>
+    <Numeric name="startAngle"  value="300*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XP"/>
+    <String name="ChildName" value="RTXU"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XP"/>
+    <String name="ChildName" value="RTXU"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XN"/>
+    <String name="ChildName" value="RTXU"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XN"/>
+    <String name="ChildName" value="RTXU"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XXP"/>
+    <String name="ChildName" value="RT4H"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="1"/>
+    <Numeric name="startCopyNo" value="15"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="40*deg"/>
+    <Numeric name="startAngle"  value="280*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XXP"/>
+    <String name="ChildName" value="RT4H"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="1"/>
+    <Numeric name="startCopyNo" value="16"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="40*deg"/>
+    <Numeric name="startAngle"  value="300*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+
+</DDDefinition>
diff --git a/Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml
index 479dece38168d..4333c65fb38fb 100644
--- 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,14 @@
     <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 +213,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">
@@ -370,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"/>
@@ -382,12 +396,6 @@
    <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="rpcf:RT3G"/>
@@ -418,11 +426,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 +452,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>
 
@@ -538,11 +554,12 @@
     <Numeric name="incrCopyNo"  value="2"/>
     <Numeric name="stepAngle"   value="40*deg"/>
     <Numeric name="startAngle"  value="230*deg"/>
-    <Numeric name="zoffset"     value="-2.2*cm"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
 </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"/>
@@ -553,7 +570,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"/>
@@ -564,7 +581,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"/>
@@ -575,7 +592,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"/>
@@ -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"/>
@@ -596,7 +613,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"/>

From 5f2168703690f7a5e2160b4196cca78b08957c7e Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Thu, 29 Feb 2024 03:52:54 +0100
Subject: [PATCH 2/3] Make changes as suggested by RPC DPG

---
 .../MuonCommonData/data/rpcf/2023/v1/rpcf.xml |  74 +--
 .../MuonCommonData/data/rpcf/2024/v1/rpcf.xml |  86 +--
 .../MuonCommonData/data/rpcf/2024/v2/rpcf.xml | 610 ++++++++++++++++++
 .../python/testExtendedGeometry2024XML_cfi.py |   4 +-
 4 files changed, 670 insertions(+), 104 deletions(-)
 create mode 100644 Geometry/MuonCommonData/data/rpcf/2024/v2/rpcf.xml

diff --git a/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml
index e8bb1af4dbd1c..7792f97ee0511 100644
--- 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="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 -->
+  <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 " />
  </SolidSection>
 
  <LogicalPartSection label="rpcf.xml">
@@ -177,10 +177,6 @@
     <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"/>
@@ -189,14 +185,6 @@
     <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"/>
@@ -213,6 +201,10 @@
     <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,12 +370,6 @@
    <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"/>
@@ -396,6 +382,12 @@
    <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="rpcf:RT3G"/>
@@ -426,24 +418,11 @@
    <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.515*m  " y="0*fm " z="0*fm " />
+   <Translation x="2.943*m  " y="0*fm " z="0*fm " />
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="rpcf:RFHX"/>
@@ -452,7 +431,12 @@
   <PosPart copyNumber="1">
    <rParent name="rpcf:RHHX"/>
    <rChild name="rpcf:REH1"/>
-   <Translation x="0*fm " y="0*fm " z="0*cm " />
+   <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 " />
   </PosPart>
 </PosPartSection>
 
@@ -547,7 +531,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XP"/>
-    <String name="ChildName" value="RTXU"/>
+    <String name="ChildName" value="RTXUR"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="1"/>
@@ -558,7 +542,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XP"/>
-    <String name="ChildName" value="RTXU"/>
+    <String name="ChildName" value="RTXUR"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="2"/>
@@ -569,7 +553,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XN"/>
-    <String name="ChildName" value="RTXU"/>
+    <String name="ChildName" value="RTXUR"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="1"/>
@@ -580,7 +564,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XN"/>
-    <String name="ChildName" value="RTXU"/>
+    <String name="ChildName" value="RTXUR"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="2"/>
@@ -590,7 +574,7 @@
     <Numeric name="zoffset"     value="2.2*cm"/>
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
-    <rParent name="rpcf:RR4XXP"/>
+    <rParent name="rpcf:RR4XP"/>
     <String name="ChildName" value="RT4H"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="1"/>
@@ -601,7 +585,7 @@
     <Numeric name="zoffset"     value="-2.2*cm"/>
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
-    <rParent name="rpcf:RR4XXP"/>
+    <rParent name="rpcf:RR4XP"/>
     <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
index 4333c65fb38fb..7792f97ee0511 100644
--- 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="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 -->
+  <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 " />
  </SolidSection>
 
  <LogicalPartSection label="rpcf.xml">
@@ -177,10 +177,6 @@
     <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"/>
@@ -189,14 +185,6 @@
     <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"/>
@@ -213,6 +201,10 @@
     <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,12 +370,6 @@
    <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"/>
@@ -396,6 +382,12 @@
    <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="rpcf:RT3G"/>
@@ -426,24 +418,11 @@
    <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.515*m  " y="0*fm " z="0*fm " />
+   <Translation x="2.943*m  " y="0*fm " z="0*fm " />
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="rpcf:RFHX"/>
@@ -452,7 +431,12 @@
   <PosPart copyNumber="1">
    <rParent name="rpcf:RHHX"/>
    <rChild name="rpcf:REH1"/>
-   <Translation x="0*fm " y="0*fm " z="0*cm " />
+   <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 " />
   </PosPart>
 </PosPartSection>
 
@@ -545,21 +529,9 @@
     <Numeric name="startAngle"  value="300*deg"/>
     <Numeric name="zoffset"     value="2.2*cm"/>
 </Algorithm>
-<Algorithm name="muon:DDMuonAngular">
-    <rParent name="rpcf:RR3XXN"/>
-    <String name="ChildName" value="RT3G"/>
-    <String name="RotNameSpace" value="rotations"/>
-    <Numeric name="n" value="2"/>
-    <Numeric name="startCopyNo" value="16"/>
-    <Numeric name="incrCopyNo"  value="2"/>
-    <Numeric name="stepAngle"   value="40*deg"/>
-    <Numeric name="startAngle"  value="230*deg"/>
-    <Numeric name="zoffset"     value="2.2*cm"/>
-</Algorithm>
-
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XP"/>
-    <String name="ChildName" value="RTXU"/>
+    <String name="ChildName" value="RTXUR"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="1"/>
@@ -570,7 +542,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XP"/>
-    <String name="ChildName" value="RTXU"/>
+    <String name="ChildName" value="RTXUR"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="2"/>
@@ -581,7 +553,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XN"/>
-    <String name="ChildName" value="RTXU"/>
+    <String name="ChildName" value="RTXUR"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="1"/>
@@ -592,7 +564,7 @@
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
     <rParent name="rpcf:RR4XN"/>
-    <String name="ChildName" value="RTXU"/>
+    <String name="ChildName" value="RTXUR"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="18"/>
     <Numeric name="startCopyNo" value="2"/>
@@ -602,7 +574,7 @@
     <Numeric name="zoffset"     value="2.2*cm"/>
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
-    <rParent name="rpcf:RR4XXP"/>
+    <rParent name="rpcf:RR4XP"/>
     <String name="ChildName" value="RT4H"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="1"/>
@@ -613,7 +585,7 @@
     <Numeric name="zoffset"     value="-2.2*cm"/>
 </Algorithm>
 <Algorithm name="muon:DDMuonAngular">
-    <rParent name="rpcf:RR4XXP"/>
+    <rParent name="rpcf:RR4XP"/>
     <String name="ChildName" value="RT4H"/>
     <String name="RotNameSpace" value="rotations"/>
     <Numeric name="n" value="1"/>
diff --git a/Geometry/MuonCommonData/data/rpcf/2024/v2/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2024/v2/rpcf.xml
new file mode 100644
index 0000000000000..479dece38168d
--- /dev/null
+++ b/Geometry/MuonCommonData/data/rpcf/2024/v2/rpcf.xml
@@ -0,0 +1,610 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+ <SolidSection label="rpcf.xml">
+  <Tubs name="RR12" rMin="2.745*m  " rMax="4.644*m  " dz="5.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Trd1 name="RFBX" dz="92*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="24.368*cm " dx2="40.453*cm "/>
+  <Trd1 name="RHBX" dz="91.95*cm " dy1="5*mm " dy2="5*mm " dx1="24.318*cm " dx2="40.403*cm "/>
+  <Trd1 name="REB1" dz="26.75*cm " dy1="1*mm " dy2="1*mm " dx1="35.721*cm " dx2="40.40*cm "/>
+  <Trd1 name="REB2" dz="24.5*cm " dy1="1*mm " dy2="1*mm " dx1="31.347*cm " dx2="35.633*cm "/>
+  <Trd1 name="REB3" dz="39.7*cm " dy1="1*mm " dy2="1*mm " dx1="24.315*cm " dx2="31.26*cm "/>
+  <Tubs name="RR13" rMin="5.05*m  " rMax="6.87*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RT1C" rMin="5.05*m  " rMax="6.87*m  " dz="2*cm " startPhi="-8*deg" deltaPhi="16*deg"/>
+  <Trd1 name="RFCX" dz="87.15*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="44.435*cm " dx2="59.676*cm "/>
+  <Trd1 name="RHCX" dz="87.1*cm " dy1="5*mm " dy2="5*mm " dx1="44.385*cm " dx2="59.626*cm "/>
+  <Trd1 name="REC1" dz="20.15*cm " dy1="1*mm " dy2="1*mm " dx1="56.097*cm " dx2="59.623*cm "/>
+  <Trd1 name="REC2" dz="37.95*cm " dy1="1*mm " dy2="1*mm " dx1="49.369*cm " dx2="56.009*cm "/>
+  <Trd1 name="REC3" dz="28*cm " dy1="1*mm " dy2="1*mm " dx1="44.382*cm " dx2="49.281*cm "/>
+  <Tubs name="RTXU" rMin="3.29*m  " rMax="6.99*m  " dz="2*cm " startPhi="-8*deg" deltaPhi="16*deg"/>
+  <Tubs name="RTXUR" rMin="3.31*m  " rMax="6.99*m  " dz="2*cm " startPhi="-8*deg" deltaPhi="16*deg"/>
+  <Trd1 name="RFEX" dz="82.8*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="29.089*cm " dx2="43.569*cm "/>
+  <Trd1 name="RHEX" dz="82.75*cm " dy1="5*mm " dy2="5*mm " dx1="29.039*cm " dx2="43.519*cm "/>
+  <Trd1 name="REE1" dz="30.85*cm " dy1="1*mm " dy2="1*mm " dx1="38.118*cm " dx2="43.516*cm "/>
+  <Trd1 name="REE2" dz="26.95*cm " dy1="1*mm " dy2="1*mm " dx1="33.315*cm " dx2="38.03*cm "/>
+  <Trd1 name="REE3" dz="23.95*cm " dy1="1*mm " dy2="1*mm " dx1="29.036*cm " dx2="33.227*cm "/>
+  <Trd1 name="RFFX" dz="95.15*cm " dy1="5.5*mm " dy2="5.5*mm " dx1="44.094*cm " dx2="60.734*cm "/>
+  <Trd1 name="RHFX" dz="95.1*cm " dy1="5*mm " dy2="5*mm " dx1="44.044*cm " dx2="60.684*cm "/>
+  <Trd1 name="REF1" dz="25.95*cm " dy1="1*mm " dy2="1*mm " dx1="56.14*cm " dx2="60.681*cm "/>
+  <Trd1 name="REF2" dz="37.95*cm " dy1="1*mm " dy2="1*mm " dx1="49.413*cm " dx2="56.053*cm "/>
+  <Trd1 name="REF3" dz="30.2*cm " dy1="1*mm " dy2="1*mm " dx1="44.041*cm " dx2="49.325*cm "/>
+  <Tubs name="RR3X" rMin="3.29*m  " rMax="6.99*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RR3XX" rMin="1.53*m  " rMax="3.29*m  " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="RT3G" rMin="1.53*m  " rMax="3.29*m  " dz="2*cm " startPhi="-13*deg" deltaPhi="26*deg"/>
+  <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 " />
+ </SolidSection>
+
+ <LogicalPartSection label="rpcf.xml">
+  <LogicalPart name="RR12" category="unspecified">
+   <rSolid name="RR12"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RR12N" category="unspecified">
+   <rSolid name="RR12"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RFBX" category="unspecified">
+   <rSolid name="RFBX"/>
+   <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHBX" category="unspecified">
+   <rSolid name="RHBX"/>
+   <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REB1" category="unspecified">
+   <rSolid name="REB1"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REB2" category="unspecified">
+   <rSolid name="REB2"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REB3" category="unspecified">
+   <rSolid name="REB3"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="RR13" category="unspecified">
+   <rSolid name="RR13"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RT1C" category="unspecified">
+   <rSolid name="RT1C"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RFCX" category="unspecified">
+   <rSolid name="RFCX"/>
+   <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHCX" category="unspecified">
+   <rSolid name="RHCX"/>
+   <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REC1" category="unspecified">
+   <rSolid name="REC1"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REC2" category="unspecified">
+   <rSolid name="REC2"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REC3" category="unspecified">
+   <rSolid name="REC3"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="RTXU" category="unspecified">
+   <rSolid name="RTXU"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RTXUR" category="unspecified">
+   <rSolid name="RTXUR"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RFEX" category="unspecified">
+   <rSolid name="RFEX"/>
+   <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHEX" category="unspecified">
+   <rSolid name="RHEX"/>
+   <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REE1" category="unspecified">
+   <rSolid name="REE1"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REE2" category="unspecified">
+   <rSolid name="REE2"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REE3" category="unspecified">
+   <rSolid name="REE3"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="RFFX" category="unspecified">
+   <rSolid name="RFFX"/>
+   <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHFX" category="unspecified">
+   <rSolid name="RHFX"/>
+   <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REF1" category="unspecified">
+   <rSolid name="REF1"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REF2" category="unspecified">
+   <rSolid name="REF2"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+  <LogicalPart name="REF3" category="unspecified">
+   <rSolid name="REF3"/>
+   <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+
+  <LogicalPart name="RR3X" category="unspecified">
+   <rSolid name="RR3X"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RR3XXP" category="unspecified">
+   <rSolid name="RR3XX"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RR3XXN" category="unspecified">
+   <rSolid name="RR3XX"/>
+   <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+
+  <LogicalPart name="RT3G" category="unspecified">
+    <rSolid name="RT3G"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RFGX" category="unspecified">
+    <rSolid name="RFGX"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHGX" category="unspecified">
+    <rSolid name="RHGX"/>
+    <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REG1" category="unspecified">
+    <rSolid name="REG1"/>
+    <rMaterial name="materials:M_RPC_Gas"/>
+  </LogicalPart>
+
+  <LogicalPart name="RR4XP" category="unspecified">
+    <rSolid name="RR4X"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RR4XN" category="unspecified">
+    <rSolid name="RR4X"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RT4H" category="unspecified">
+    <rSolid name="RT4H"/>
+    <rMaterial name="materials:ME_free_space"/>
+  </LogicalPart>
+  <LogicalPart name="RFHX" category="unspecified">
+    <rSolid name="RFHX"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="RHHX" category="unspecified">
+    <rSolid name="RHHX"/>
+    <rMaterial name="materials:Bakelite"/>
+  </LogicalPart>
+  <LogicalPart name="REH1" category="unspecified">
+    <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">
+  <PosPart copyNumber="3">
+   <rParent name="mf:ME12RingP"/>
+   <rChild name="rpcf:RR12"/>
+   <rRotation name="rotations:R020"/>
+   <Translation x="0*fm " y="0*fm " z="306.3875*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="mf:ME12RingP"/>
+   <rChild name="rpcf:RR12N"/>
+   <rRotation name="rotations:R010"/>
+   <Translation x="0*fm " y="0*fm " z="-3.7665*mm"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+   <rParent name="mf:ME12RingN"/>
+   <rChild name="rpcf:RR12"/>
+   <rRotation name="rotations:R020"/>
+   <Translation x="0*fm " y="0*fm " z="306.3875*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="mf:ME12RingN"/>
+   <rChild name="rpcf:RR12N"/>
+   <rRotation name="rotations:R010"/>
+   <Translation x="0*fm " y="0*fm " z="-3.7665*mm"/>
+  </PosPart>
+  <Division name="RT1B" parent="RR12" axis="phi" offset="-10*deg" width="20*deg"/>
+  <Division name="RT1BN" parent="RR12N" axis="phi" offset="-10*deg" width="20*deg"/>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RT1B"/>
+   <rChild name="rpcf:RFBX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="3.692*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RT1BN"/>
+   <rChild name="rpcf:RFBX"/>
+   <rRotation name="rotations:90DX"/>
+   <Translation x="3.692*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFBX"/>
+   <rChild name="rpcf:RHBX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHBX"/>
+   <rChild name="rpcf:REB1"/>
+   <Translation x="0*fm " y="0*fm " z="65.2*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHBX"/>
+   <rChild name="rpcf:REB2"/>
+   <Translation x="0*fm " y="0*fm " z="12.95*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHBX"/>
+   <rChild name="rpcf:REB3"/>
+   <Translation x="0*fm " y="0*fm " z="-52.25*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME13RingP"/>
+   <rChild name="rpcf:RR13"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="7.176*m  "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME13RingN"/>
+   <rChild name="rpcf:RR13"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="7.176*m  "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RT1C"/>
+   <rChild name="rpcf:RFCX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="5.944*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFCX"/>
+   <rChild name="rpcf:RHCX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHCX"/>
+   <rChild name="rpcf:REC1"/>
+   <Translation x="0*fm " y="0*fm " z="66.95*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHCX"/>
+   <rChild name="rpcf:REC2"/>
+   <Translation x="0*fm " y="0*fm " z="7.85*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHCX"/>
+   <rChild name="rpcf:REC3"/>
+   <Translation x="0*fm " y="0*fm " z="-59.1*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RTXU"/>
+   <rChild name="rpcf:RFEX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="4.1465*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RTXUR"/>
+   <rChild name="rpcf:RFEX"/>
+   <rRotation name="rotations:90DX"/>
+   <Translation x="4.1465*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFEX"/>
+   <rChild name="rpcf:RHEX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHEX"/>
+   <rChild name="rpcf:REE1"/>
+   <Translation x="0*fm " y="0*fm " z="51.9*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHEX"/>
+   <rChild name="rpcf:REE2"/>
+   <Translation x="0*fm " y="0*fm " z="-6.9*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHEX"/>
+   <rChild name="rpcf:REE3"/>
+   <Translation x="0*fm " y="0*fm " z="-58.8*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RTXUR"/>
+   <rChild name="rpcf:RFFX"/>
+   <rRotation name="rotations:90DX"/>
+   <Translation x="5.985*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RTXU"/>
+   <rChild name="rpcf:RFFX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="5.985*m  " y="0*fm " z="0*fm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFFX"/>
+   <rChild name="rpcf:RHFX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHFX"/>
+   <rChild name="rpcf:REF1"/>
+   <Translation x="0*fm " y="0*fm " z="69.15*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHFX"/>
+   <rChild name="rpcf:REF2"/>
+   <Translation x="0*fm " y="0*fm " z="4.25*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHFX"/>
+   <rChild name="rpcf:REF3"/>
+   <Translation x="0*fm " y="0*fm " z="-64.9*cm "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME3RingP"/>
+   <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"/>
+   <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="rpcf:RT3G"/>
+   <rChild name="rpcf:RFGX"/>
+   <rRotation name="rotations:90XD"/>
+   <Translation x="2.38*m  " y="0*fm " z="0*fm " />
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFGX"/>
+   <rChild name="rpcf:RHGX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RHGX"/>
+   <rChild name="rpcf:REG1"/>
+   <Translation x="0*fm " y="0*fm " z="0*cm " />
+  </PosPart>
+
+  <!-- -->
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME4RingP"/>
+   <rChild name="rpcf:RR4XP"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="29.175*cm " />
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME4RingN"/>
+   <rChild name="rpcf:RR4XN"/>
+   <rRotation name="rotations:R005"/>
+   <Translation x="0*fm " y="0*fm " z="29.175*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 " />
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="rpcf:RFHX"/>
+   <rChild name="rpcf:RHHX"/>
+  </PosPart>
+  <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 " />
+  </PosPart>
+</PosPartSection>
+
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR13"/>
+    <String name="ChildName" value="RT1C"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR13"/>
+    <String name="ChildName" value="RT1C"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="mf:RR2X"/>
+    <String name="ChildName" value="RTXUR"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="mf:RR2X"/>
+    <String name="ChildName" value="RTXUR"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR3X"/>
+    <String name="ChildName" value="RTXU"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR3X"/>
+    <String name="ChildName" value="RTXU"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR3XXP"/>
+    <String name="ChildName" value="RT3G"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="1"/>
+    <Numeric name="startCopyNo" value="15"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="40*deg"/>
+    <Numeric name="startAngle"  value="280*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR3XXP"/>
+    <String name="ChildName" value="RT3G"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="1"/>
+    <Numeric name="startCopyNo" value="16"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="40*deg"/>
+    <Numeric name="startAngle"  value="300*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR3XXN"/>
+    <String name="ChildName" value="RT3G"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="2"/>
+    <Numeric name="startCopyNo" value="16"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="40*deg"/>
+    <Numeric name="startAngle"  value="230*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XP"/>
+    <String name="ChildName" value="RTXUR"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XP"/>
+    <String name="ChildName" value="RTXUR"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XN"/>
+    <String name="ChildName" value="RTXUR"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="1"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="5*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XN"/>
+    <String name="ChildName" value="RTXUR"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="18"/>
+    <Numeric name="startCopyNo" value="2"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="20*deg"/>
+    <Numeric name="startAngle"  value="15*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XP"/>
+    <String name="ChildName" value="RT4H"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="1"/>
+    <Numeric name="startCopyNo" value="15"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="40*deg"/>
+    <Numeric name="startAngle"  value="280*deg"/>
+    <Numeric name="zoffset"     value="-2.2*cm"/>
+</Algorithm>
+<Algorithm name="muon:DDMuonAngular">
+    <rParent name="rpcf:RR4XP"/>
+    <String name="ChildName" value="RT4H"/>
+    <String name="RotNameSpace" value="rotations"/>
+    <Numeric name="n" value="1"/>
+    <Numeric name="startCopyNo" value="16"/>
+    <Numeric name="incrCopyNo"  value="2"/>
+    <Numeric name="stepAngle"   value="40*deg"/>
+    <Numeric name="startAngle"  value="300*deg"/>
+    <Numeric name="zoffset"     value="2.2*cm"/>
+</Algorithm>
+
+</DDDefinition>
diff --git a/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py
index 6a60f40e605e2..7b50bebd202a8 100644
--- a/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py
+++ b/Geometry/MuonCommonData/python/testExtendedGeometry2024XML_cfi.py
@@ -241,7 +241,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/v2/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2024/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/2024/v1/gem21.xml',
@@ -249,7 +249,7 @@
         'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
     )+
     cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml',
         'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
         'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',

From 7aa69de0e431e966a2775dac420dee3a6d6ca73c Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Thu, 29 Feb 2024 09:48:28 +0100
Subject: [PATCH 3/3] Restore 2023 version for RPC geometry

---
 .../MuonCommonData/data/rpcf/2023/v1/rpcf.xml | 63 ++++++++++++-------
 .../MuonCommonData/data/rpcf/2024/v1/rpcf.xml | 63 ++++++++++++-------
 2 files changed, 80 insertions(+), 46 deletions(-)

diff --git a/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml
index 7792f97ee0511..6f844462d01df 100644
--- 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
index 7792f97ee0511..6f844462d01df 100644
--- 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"/>