From 764bf020113adf752241515afb8770d9c5a9979c Mon Sep 17 00:00:00 2001
From: Menglin Xu <mexu@cern.ch>
Date: Wed, 5 Mar 2025 14:52:28 +0100
Subject: [PATCH 1/8] As the content in trunk is different from 2024-v00.00,
 create a 2025-v00.00 version for Pipe

---
 .../Pipe/2025-v00.00/AfterMagnet-Bakeout.xml  |   35 +
 .../Pipe/2025-v00.00/AfterMagnet-Params.xml   |  162 +
 .../Pipe/2025-v00.00/AfterMuon-BPMSW.xml      |  188 ++
 .../Pipe/2025-v00.00/AfterMuon-Params.xml     |  194 ++
 .../Pipe/2025-v00.00/AfterMuon-VVSGF.xml      |   64 +
 .../Pipe/2025-v00.00/AfterMuon-Vax.xml        |  522 ++++
 .../components/Pipe/2025-v00.00/AfterMuon.xml |   78 +
 .../Pipe/2025-v00.00/AfterT-Support.xml       |   40 +
 .../components/Pipe/2025-v00.00/AfterT.xml    |  116 +
 .../Pipe/2025-v00.00/BeforeMagnet.xml         |   94 +
 .../Pipe/2025-v00.00/BeforeVelo-Support.xml   |  579 ++++
 .../Pipe/2025-v00.00/BeforeVelo.xml           |   69 +
 .../Pipe/2025-v00.00/DebugDummies.xml         |   61 +
 .../Pipe/2025-v00.00/Downstream-Bakeout.xml   |   94 +
 .../2025-v00.00/Downstream-BakeoutParams.xml  |  107 +
 .../2025-v00.00/Downstream-Compensator.xml    |  228 ++
 .../2025-v00.00/Downstream-PipeParams.xml     |  438 +++
 .../Pipe/2025-v00.00/Downstream-Support.xml   |  559 ++++
 .../2025-v00.00/Downstream-SupportParams.xml  |  129 +
 .../Pipe/2025-v00.00/Downstream-UX853.xml     |  124 +
 .../Pipe/2025-v00.00/Downstream-UX854.xml     |  619 ++++
 .../Pipe/2025-v00.00/Downstream.xml           |   46 +
 .../Pipe/2025-v00.00/InRich1-Params.xml       |   75 +
 .../components/Pipe/2025-v00.00/InRich1.xml   |  234 ++
 compact/components/Pipe/2025-v00.00/InT.xml   |   77 +
 compact/components/Pipe/2025-v00.00/InTV.xml  |  392 +++
 compact/components/Pipe/2025-v00.00/InUP.xml  |   79 +
 compact/components/Pipe/2025-v00.00/InUT.xml  |   79 +
 compact/components/Pipe/2025-v00.00/InVP.xml  |  383 +++
 .../Pipe/2025-v00.00/Magnet-Bellows.xml       |  187 ++
 .../Pipe/2025-v00.00/Magnet-Compensator.xml   |  232 ++
 .../Pipe/2025-v00.00/Magnet-PipeParams.xml    |  625 ++++
 .../Pipe/2025-v00.00/Magnet-Support.xml       | 2769 +++++++++++++++++
 .../Pipe/2025-v00.00/Magnet-SupportParams.xml |  814 +++++
 .../Pipe/2025-v00.00/Magnet-UX851.xml         |  118 +
 .../Pipe/2025-v00.00/Magnet-UX852.xml         |  196 ++
 .../Pipe/2025-v00.00/Magnet-UX853.xml         |  118 +
 .../components/Pipe/2025-v00.00/Magnet.xml    |   83 +
 .../Pipe/2025-v00.00/PipeAfterMagnet.xml      |   14 +
 .../Pipe/2025-v00.00/PipeAfterMuon.xml        |   17 +
 .../Pipe/2025-v00.00/PipeAfterT.xml           |   14 +
 .../2025-v00.00/PipeBeforeMagGeomParams.xml   |  208 ++
 .../Pipe/2025-v00.00/PipeBeforeMagnet.xml     |   13 +
 .../Pipe/2025-v00.00/PipeBeforeVelo.xml       |   14 +
 .../Pipe/2025-v00.00/PipeCommon.xml           |   17 +
 .../Pipe/2025-v00.00/PipeDownstream.xml       |   21 +
 .../Pipe/2025-v00.00/PipeGeomParams.xml       |   83 +
 .../Pipe/2025-v00.00/PipeMagnet.xml           |   16 +
 compact/components/Pipe/2025-v00.00/PipeT.xml |   13 +
 .../components/Pipe/2025-v00.00/PipeTV.xml    |   13 +
 .../components/Pipe/2025-v00.00/PipeUP.xml    |   14 +
 .../components/Pipe/2025-v00.00/PipeUT.xml    |   14 +
 .../Pipe/2025-v00.00/PipeUpstream.xml         |   19 +
 .../components/Pipe/2025-v00.00/PipeVP.xml    |   13 +
 .../Pipe/2025-v00.00/Upstream-BPMSW.xml       |  192 ++
 .../Pipe/2025-v00.00/Upstream-Params.xml      |  236 ++
 .../Pipe/2025-v00.00/Upstream-UX84.xml        |   46 +
 .../Pipe/2025-v00.00/Upstream-VVSGF.xml       |   64 +
 .../Pipe/2025-v00.00/Upstream-Vax.xml         |  538 ++++
 .../components/Pipe/2025-v00.00/Upstream.xml  |  181 ++
 .../2025-v00.00/VMA/VMA-AA-Downstream.xml     |   39 +
 .../2025-v00.00/VMA/VMA-AA-DownstreamVax.xml  |   39 +
 .../Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml  |   39 +
 .../2025-v00.00/VMA/VMA-AA-UpstreamVax.xml    |   39 +
 .../Pipe/2025-v00.00/VMA/VMA-AA.xml           |   39 +
 .../Pipe/2025-v00.00/VMA/VMA-BJ.xml           |   40 +
 .../Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml  |   40 +
 .../Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml |   40 +
 .../Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml |   44 +
 .../Pipe/2025-v00.00/VMA/VMA-Params.xml       |   96 +
 .../components/Pipe/2025-v00.00/materials.xml |  280 ++
 .../Pipe/2025-v00.00/parameters.xml           |   67 +
 72 files changed, 13569 insertions(+)
 create mode 100644 compact/components/Pipe/2025-v00.00/AfterMagnet-Bakeout.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/AfterMagnet-Params.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon-BPMSW.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon-Params.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon-VVSGF.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon-Vax.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/AfterT-Support.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/AfterT.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/BeforeMagnet.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/BeforeVelo-Support.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/BeforeVelo.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/DebugDummies.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Downstream-Bakeout.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Downstream-BakeoutParams.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Downstream-Compensator.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Downstream-PipeParams.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Downstream-Support.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Downstream-SupportParams.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Downstream-UX853.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Downstream-UX854.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Downstream.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/InRich1-Params.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/InRich1.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/InT.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/InTV.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/InUP.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/InUT.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/InVP.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Magnet-Bellows.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Magnet-Compensator.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Magnet-PipeParams.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Magnet-Support.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Magnet-SupportParams.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Magnet-UX851.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Magnet-UX852.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Magnet-UX853.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Magnet.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeAfterMagnet.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeAfterMuon.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeAfterT.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeBeforeMagGeomParams.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeBeforeMagnet.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeBeforeVelo.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeCommon.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeDownstream.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeGeomParams.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeMagnet.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeT.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeTV.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeUP.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeUT.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeUpstream.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/PipeVP.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Upstream-BPMSW.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Upstream-Params.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Upstream-UX84.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Upstream-VVSGF.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Upstream-Vax.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/Upstream.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Downstream.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA-DownstreamVax.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA-UpstreamVax.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-BJ.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-Params.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/materials.xml
 create mode 100644 compact/components/Pipe/2025-v00.00/parameters.xml

diff --git a/compact/components/Pipe/2025-v00.00/AfterMagnet-Bakeout.xml b/compact/components/Pipe/2025-v00.00/AfterMagnet-Bakeout.xml
new file mode 100644
index 000000000..7009c85a5
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/AfterMagnet-Bakeout.xml
@@ -0,0 +1,35 @@
+<!--========================================================================== -->
+<!--  LHCb Detector Description                                                -->
+<!--========================================================================== -->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--========================================================================== -->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--========================================================================== -->
+<lccdd>
+
+  <detectors>
+    <!--==================================================================================-->
+    <!--==================================Bakeout ========================================-->
+    <!--==================================================================================-->
+    <detector name="PipeAfterMagnetBakeout" type="DD4hep_VolumeAssembly" parent="${PipeAfterMagnetBakeout:parent}" vis="Pipe:Vis">
+      <envelope name="lvUX85BakeoutAfterMagnet" material="Pipe:BakeOutAerogel">
+        <shape type="ConeSegment" name="UX85-3-Bakeout-Rich2"
+              dz="UX853BakeoutRich2Lenght/2"
+              rmin1="UX853BakeoutRich2RadiusZmin"
+              rmin2="UX853BakeoutRich2RadiusZmax"
+              rmax1="UX853BakeoutRich2RadiusZmin + UX853BakeoutRich2Thick"
+              rmax2="UX853BakeoutRich2RadiusZmax + UX853BakeoutRich2Thick"/>
+
+      </envelope>
+      <position z="(UX853BakeoutRich2StartIP + 0.5*UX853BakeoutRich2Lenght) - Regions:AfterMagnetZPos"/>
+      <nodebug/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMagnet-Params.xml b/compact/components/Pipe/2025-v00.00/AfterMagnet-Params.xml
new file mode 100644
index 000000000..adf1f8785
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/AfterMagnet-Params.xml
@@ -0,0 +1,162 @@
+<lccdd>
+<!--
+    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+
+  <!-- ****************************************************************** -->
+  <!-- *  BeamPipe in AfterMagnet geometry parameters                   * -->
+  <!-- *                                                                * -->
+  <!-- *  Date: 2006-03-16                                              * -->
+  <!-- *  Author: Gloria Corti                                          * -->
+  <!-- *                                                                * -->
+  <!-- *  This section of the beam pipe extend from z=7620mm to 11900mm * -->
+  <!-- *                                                                * -->
+  <!-- ****************************************************************** -->
+
+  <!-- ***************************************************************** -->
+  <!-- * UX85-3 AfterMagnet in T                                       * -->
+  <!-- ***************************************************************** -->
+  <!-- Start at beginning of at T, stops at end of T                     -->
+
+  <define>
+    <!-- UX85-3 Cone 10 mrad of Beryllium 1.6 mm thick - Split Magnet/T -->
+    <constant name="UX853Cone05BLenght"
+              value="UX853ZStartIP + UX853Flange01Cone02Lenght + UX853Cone0304Lenght +
+                     UX853Cone05Lenght - UX853MagnetTSplitZposIP"/>
+
+    <constant name="UX853Cone05BRadiusZmin"
+              value="UX853MagnetTSplitZposIP*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone05BRadiusZmax"
+              value="(UX853MagnetTSplitZposIP + UX853Cone05BLenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX853Cone05BThick"       value="1.60*mm"/>
+    <constant name="UX853Cone05BZpos"        value="0.5*UX853Cone05BLenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 1.7 mm thick -->
+    <constant name="UX853Cone06Lenght"       value="400.00*mm"/>
+    <constant name="UX853Cone06RadiusZmin"   value="UX853Cone05BRadiusZmax"/>
+    <constant name="UX853Cone06RadiusZmax"
+              value="(UX853MagnetTSplitZposIP + UX853Cone05BLenght + UX853Cone06Lenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX853Cone06Thick"        value="1.70*mm"/>
+    <constant name="UX853Cone06Zpos"
+              value="UX853Cone05BLenght + 0.5*UX853Cone06Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 1.9 mm thick - Split T/Rich2 -->
+    <constant name="UX853Cone07Lenght"       value="800.00*mm"/>
+
+    <constant name="UX853Cone07ALenght"
+              value="UX853TRich2SplitZposIP - UX853ZStartIP - UX853Flange01Cone02Lenght -
+                     UX853Cone0304Lenght - UX853Cone05Lenght - UX853Cone06Lenght"/>
+    <constant name="UX853Cone07ARadiusZmin"  value="UX853Cone06RadiusZmax"/>
+    <constant name="UX853Cone07ARadiusZmax"
+              value="(UX853MagnetTSplitZposIP + UX853Cone05BLenght + UX853Cone06Lenght +
+                     UX853Cone07ALenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone07AThick"       value="1.90*mm"/>
+    <constant name="UX853Cone07AZpos"
+              value="UX853Cone05BLenght + UX853Cone06Lenght + 0.5*UX853Cone07ALenght"/>
+
+    <!-- UX85-3 in T and Vacuum inside for whole of it -->
+    <constant name="UX853InTLenght"
+              value="UX853Cone05BLenght + UX853Cone06Lenght + UX853Cone07ALenght"/>
+
+    <!-- ***************************************************************** -->
+    <!-- * UX85-3 AfterMagnet after T                                    * -->
+    <!-- ***************************************************************** -->
+    <!-- Starts at end of T, ends with end of AfterMagnet                  -->
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 1.9 mm thick - Split T/Rich2 -->
+    <constant name="UX853Cone07BLenght"
+              value="UX853Cone07Lenght - UX853Cone07ALenght"/>
+    <constant name="UX853Cone07BRadiusZmin"  value="UX853Cone07ARadiusZmax"/>
+    <constant name="UX853Cone07BRadiusZmax"
+              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone07BThick"       value="1.90*mm"/>
+    <constant name="UX853Cone07BZpos"        value="0.5*UX853Cone07BLenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 2.0 mm thick -->
+    <constant name="UX853Cone08Lenght"       value="800.00*mm"/>
+    <constant name="UX853Cone08RadiusZmin"   value="UX853Cone07BRadiusZmax"/>
+    <constant name="UX853Cone08RadiusZmax"
+              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX853Cone08Thick"       value="2.00*mm"/>
+    <constant name="UX853Cone08Zpos"
+              value="UX853Cone07BLenght + 0.5*UX853Cone08Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 2.1 mm thick -->
+    <constant name="UX853Cone09Lenght"      value="400.00*mm"/>
+    <constant name="UX853Cone09RadiusZmin"  value="UX853Cone08RadiusZmax"/>
+    <constant name="UX853Cone09RadiusZmax"
+              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght +
+                     UX853Cone09Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone09Thick"       value="2.10*mm"/>
+    <constant name="UX853Cone09Zpos"
+              value="UX853Cone07BLenght + UX853Cone08Lenght + 0.5*UX853Cone09Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 2.3 mm thick -->
+    <constant name="UX853Cone10Lenght"      value="800.00*mm"/>
+    <constant name="UX853Cone10RadiusZmin"  value="UX853Cone09RadiusZmax"/>
+    <constant name="UX853Cone10RadiusZmax"
+              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght +
+                     UX853Cone09Lenght + UX853Cone10Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone10Thick"       value="2.30*mm"/>
+    <constant name="UX853Cone10Zpos"
+              value="UX853Cone07BLenght + UX853Cone08Lenght + UX853Cone09Lenght +
+                     0.5*UX853Cone10Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 2.4 mm thick -->
+    <constant name="UX853Cone11Lenght"
+              value="UX853Cone11Cone14Lenght + UX853Cone15Flange17Lenght -
+                     UX853ConeSupportFromEnd - UX853Cone12Lenght"/>
+    <constant name="UX853Cone11RadiusZmin"  value="UX853Cone10RadiusZmax"/>
+    <constant name="UX853Cone11RadiusZmax"
+              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght +
+                     UX853Cone09Lenght + UX853Cone10Lenght + UX853Cone11Lenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX853Cone11Thick"       value="2.40*mm"/>
+    <constant name="UX853Cone11Zpos"
+              value="UX853Cone07BLenght + UX853Cone08Lenght + UX853Cone09Lenght +
+                     UX853Cone10Lenght + 0.5*UX853Cone11Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium cylindrical part for support -->
+    <!-- Split Rich2/Downstream                                        -->
+    <constant name="UX853Cone12ALenght"
+              value="UX853Rich2DownSplitZposIP - UX853TRich2SplitZposIP -
+                     UX853Cone07BLenght - UX853Cone08Lenght - UX853Cone09Lenght -
+                     UX853Cone10Lenght - UX853Cone11Lenght"/>
+    <constant name="UX853Cone12ARadiusZmin"  value="UX853Cone11RadiusZmax"/>
+    <constant name="UX853Cone12ARadiusZmax"
+              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght +
+                     UX853Cone09Lenght + UX853Cone10Lenght + UX853Cone11Lenght +
+                     UX853Cone12ALenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone12AOuterRadius" value="122.10*mm"/>
+    <constant name="UX853Cone12AZpos"
+              value="UX853Cone07BLenght + UX853Cone08Lenght + UX853Cone09Lenght +
+                     UX853Cone10Lenght + UX853Cone11Lenght + 0.5*UX853Cone12ALenght"/>
+
+    <!-- UX85-3 after T and Vacuum inside for whole of it -->
+    <constant name="UX853AfterTLenght"
+              value="UX853Cone07BLenght + UX853Cone08Lenght + UX853Cone09Lenght +
+                     UX853Cone10Lenght + UX853Cone11Lenght + UX853Cone12ALenght"/>
+
+    <!-- Bakeout equipment -->
+    <constant  name="UX853BakeoutRich2DeltaPipeInner"  value="2.40*mm + 0.10*mm"/>
+    <constant  name="UX853BakeoutRich2RadiusZmin"
+               value="UX853BakeoutRich2StartIP*tan(UX851to4Angle) +
+                      UX853BakeoutRich2DeltaPipeInner"/>
+    <constant  name="UX853BakeoutRich2RadiusZmax"
+               value="(UX853BakeoutRich2StartIP + UX853BakeoutRich2Lenght)*
+                      tan(UX851to4Angle) + UX853BakeoutRich2DeltaPipeInner"/>
+    <constant  name="UX853BakeoutRich2Thick"           value="10.00*mm"/>
+
+  </define>
+
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon-BPMSW.xml b/compact/components/Pipe/2025-v00.00/AfterMuon-BPMSW.xml
new file mode 100644
index 000000000..46dd36050
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/AfterMuon-BPMSW.xml
@@ -0,0 +1,188 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--==================================  BPMSW  ================================-->
+<!--===========================================================================-->
+<pipe>
+  <!-- 1/8th of middle section -->
+  <volume name="lvDownStrBPMSWMidSect" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="subtraction" name="DownStrBPMSWMidSectSub">
+      <shape type="Tube" name="DownStrBPMSWMidSectTubs"
+             dz="DownStr:BPMSWMidSectLength/2"
+             rmin="DownStr:BPMSWMidSectRadius"
+             rmax="DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick"
+             startPhiAngle="44.9*degree"
+             deltaPhiAngle="89.8*degree"/>
+      <shape type="Box" name="DownStrBPMSWMidSectTopCut"
+             dx="(DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick)/2"
+             dy="(DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick)/2"
+             dz="(DownStr:BPMSWMidSectLength+1.0*mm)/2"/>
+      <position y="DownStr:BPMSWMidSectTopCutOffset + DownStr:BPMSWMidSectRadius/2 + DownStr:BPMSWMidSectThick/2"/>
+      <shape type="Tube" name="DownStrBPMSWMidSectHoleTubs"
+             dz="(DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick)/2"
+             rmax="DownStr:BPMSWMidSectHoleRadius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick/2" z="-DownStr:BPMSWMidSectHolePosZ"/>
+      </transformation>
+      <shape type="Tube" name="DownStrBPMSWMidSectEdgeTubs"
+             dz="DownStr:BPMSWMidSectEdgeDepth"
+             rmax="DownStr:BPMSWMidSectEdgeRadius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="DownStr:BPMSWMidSectTopCutOffset" z="-DownStr:BPMSWMidSectHolePosZ"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <!-- Upstream Flange -->
+  <volume name="lvDownStrBPMSWFlangeUp" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="Tube" name="DownStrBPMSWFlangeUpTubs"
+           dz="DownStr:BPMSWFlangeUpLength/2"
+           rmin="DownStr:BPMSWFlangeUpRadius"
+           rmax="DownStr:BPMSWFlangeUpRadius + DownStr:BPMSWFlangeUpThick"/>
+  </volume>
+
+  <!-- Downstream Flange -->
+  <volume name="lvDownStrBPMSWFlangeDown" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="Tube" name="DownStrBPMSWFlangeDownTubs"
+           dz="DownStr:BPMSWFlangeDownLength/2"
+           rmin="DownStr:BPMSWFlangeDownRadius"
+           rmax="DownStr:BPMSWFlangeDownRadius + DownStr:BPMSWFlangeDownThick"/>
+  </volume>
+
+  <!-- Entry tube -->
+  <volume name="lvDownStrBPMSWEntry" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="Tube" name="DownStrBPMSWEntryTubs"
+           dz="DownStr:BPMSWEntryLength/2"
+           rmin="DownStr:BPMSWEntryRadius"
+           rmax="DownStr:BPMSWEntryRadius + DownStr:BPMSWEntryThick"/>
+  </volume>
+
+  <!-- Exit Tube -->
+  <volume name="lvDownStrBPMSWExit" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="Tube" name="DownStrBPMSWExitTubs"
+           dz="DownStr:BPMSWExitLength/2"
+           rmin="DownStr:BPMSWExitRadius"
+           rmax="DownStr:BPMSWExitRadius + DownStr:BPMSWExitThick"/>
+  </volume>
+
+  <!-- Plug -->
+  <volume name="lvDownStrBPMSWPlug" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="lvDownStrBPMSWPlugUnion">
+      <shape type="Tube" name="lvDownStrBPMSWPlugFlange"
+             dz="0.5*DownStr:BPMSWPlugFlangeLength"
+             rmax="DownStr:BPMSWPlugFlangeRadius"/>
+      <shape type="Tube" name="lvDownStrBPMSWPlugPin"
+             dz="0.5*DownStr:BPMSWPlugPinLength"
+             rmax="DownStr:BPMSWPlugPinRadius"/>
+    </shape>
+  </volume>
+
+  <!-- Vacuum -->
+  <volume name="lvDownStrBPMSWVacuum" material="Vacuum" vis="Pipe:Vacuum">
+    <shape type="Tube" name="DownStrBPMSWVacuumTubs"
+           dz="0.5*DownStr:BPMSWVacuumLength"
+           rmax="DownStr:BPMSWFlangeUpRadius - 0.01*mm"/>
+  </volume>
+
+  <!-- 1/8th of middle section with plug -->
+  <volume name="lvDownStrBPMSWMidSectAss" vis="Pipe:AfterMuon">
+    <physvol name="pvDownStrBPMSWMidSect"                logvol="lvDownStrBPMSWMidSect"/>
+    <physvol name="pvDownStrBPMSWPlug"                   logvol="lvDownStrBPMSWPlug">
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="DownStr:BPMSWMidSectTopCutOffset + DownStr:BPMSWPlugFlangeLength/2" z="-DownStr:BPMSWMidSectHolePosZ"/>
+      </transformation>
+    </physvol>
+  </volume>
+
+  <!-- Assembly of body -->
+  <volume name="lvDownStrBPMSWBody" vis="Pipe:AfterMuon">
+    <physvol name="pvDownStrBPMSWFlangeUp"              logvol="lvDownStrBPMSWFlangeUp"/>
+    <physvol name="pvDownStrBPMSWEntry"                 logvol="lvDownStrBPMSWEntry">
+      <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength/2"/>
+    </physvol>
+    <physvol name="pvDownStrBPMSWMidSect0A"             logvol="lvDownStrBPMSWMidSectAss">
+      <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength/2"/>
+    </physvol>
+    <physvol name="pvDownStrBPMSWMidSect1A"             logvol="lvDownStrBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation z="90.0*degree"/>
+        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrBPMSWMidSect2A"             logvol="lvDownStrBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation z="180.0*degree"/>
+        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrBPMSWMidSect3A"             logvol="lvDownStrBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation z="270.0*degree"/>
+        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrBPMSWMidSect0B"             logvol="lvDownStrBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree"/>
+        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength + DownStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrBPMSWMidSect1B"             logvol="lvDownStrBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree" z="90.0*degree"/>
+        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength + DownStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrBPMSWMidSect2B"             logvol="lvDownStrBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree" z="180.0*degree"/>
+        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength + DownStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrBPMSWMidSect3B"             logvol="lvDownStrBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree" z="270.0*degree"/>
+        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength + DownStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrBPMSWExit"                  logvol="lvDownStrBPMSWExit">
+      <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength*2 + DownStr:BPMSWExitLength/2"/>
+    </physvol>
+    <physvol name="pvDownStrBPMSWFlangeDown"
+             logvol="lvDownStrBPMSWFlangeDown">
+      <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength*2 + DownStr:BPMSWExitLength + DownStr:BPMSWFlangeDownLength/2"/>
+    </physvol>
+  </volume>
+
+  <!-- DownStrBPMSW -->
+  <volume name="lvDownStrBPMSW" vis="Pipe:AfterMuon">
+    <physvol name="pvDownStrBPMSWBody"                 logvol="lvDownStrBPMSWBody"/>
+    <physvol name="pvDownStrBPMSWVacuum"               logvol="lvDownStrBPMSWVacuum">
+      <position z="-DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWVacuumLength/2"/>
+    </physvol>
+  </volume>
+
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon-Params.xml b/compact/components/Pipe/2025-v00.00/AfterMuon-Params.xml
new file mode 100644
index 000000000..c1375e79f
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/AfterMuon-Params.xml
@@ -0,0 +1,194 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+
+  <define>
+    <!--=====================================Pipe segment replacement of VVSSH (LHCb_Pipe_Section_Type_1)  -->
+    <constant name="DownStr:VVSSHPipeZ"                 value= "80.0*mm + 15.0*mm"/> <!-- 15mm to make pipe complete -->
+    <constant name="DownStr:VVSSHPipeRad"               value= "30.0*mm"/>
+    <constant name="DownStr:VVSSHPipeThick"             value= "1.5*mm"/>
+
+    <!--=====================================Parameters for pipe in MBXWS (LHCb_Pipe_Section_Type_1)  -->
+    <constant name="DownStr:MBXWSPipeLength"            value=  "1275.0*mm"/>
+    <constant name="DownStr:MBXWSPipeRadius"            value=  "26.0*mm"/>
+    <constant name="DownStr:MBXWSPipeThick"             value=  "2.0*mm"/>
+
+    <!--=====================================Parameters for VVSGF  -->
+    <constant name="DownStr:VVSGFBlockX"                value= "160.0*mm"/>
+    <constant name="DownStr:VVSGFBlockY"                value= "480.0*mm"/>
+    <constant name="DownStr:VVSGFBlockZ"                value= "55.0*mm"/>
+    <constant name="DownStr:VVSGFHoleY"                 value= "0.0*mm"/>
+    <constant name="DownStr:VVSGFFlangeZ"               value= "10.0*mm - 0.01*mm"/>
+    <constant name="DownStr:VVSGFBlockRad"              value= "31.5*mm"/>
+    <constant name="DownStr:VVSGFFlangeThick"           value= "100.0*mm - DownStr:VVSGFBlockRad"/>
+
+    <!--=====================================Parameters for BPMSWDownStr -->
+    <constant name="DownStr:BPMSWMidSectLength"         value=  "90.0*mm"/>
+    <constant name="DownStr:BPMSWMidSectRadius"         value=  "34.5*mm"/>
+    <constant name="DownStr:BPMSWMidSectThick"          value=  "56.5*mm - DownStr:BPMSWMidSectRadius"/>
+    <constant name="DownStr:BPMSWMidSectTopCutOffset"   value=  "47.9*mm"/>
+    <constant name="DownStr:BPMSWMidSectHoleRadius"     value=  "8.5*mm"/>
+    <constant name="DownStr:BPMSWMidSectHolePosZ"       value=  "15.0*mm"/>
+    <constant name="DownStr:BPMSWMidSectEdgeDepth"      value=  "4.0*mm"/>
+    <constant name="DownStr:BPMSWMidSectEdgeRadius"     value=  "28.0*mm"/>
+
+    <constant name="DownStr:BPMSWFlangeUpLength"        value=  "17.4*mm"/>
+    <constant name="DownStr:BPMSWFlangeUpRadius"        value=  "30.0*mm"/>
+    <constant name="DownStr:BPMSWFlangeUpThick"         value=  "57.0*mm - DownStr:BPMSWFlangeUpRadius"/>
+
+    <constant name="DownStr:BPMSWFlangeDownLength"      value=  "19.7*mm"/>
+    <constant name="DownStr:BPMSWFlangeDownRadius"      value=  "DownStr:BPMSWFlangeUpRadius"/>
+    <constant name="DownStr:BPMSWFlangeDownThick"       value=  "76.0*mm - DownStr:BPMSWFlangeDownRadius"/>
+
+    <constant name="DownStr:BPMSWEntryLength"           value=  "33.3*mm"/>
+    <constant name="DownStr:BPMSWEntryRadius"           value=  "DownStr:BPMSWFlangeUpRadius"/>
+    <constant name="DownStr:BPMSWEntryThick"            value=  "4.5*mm"/>
+
+    <constant name="DownStr:BPMSWExitLength"            value=  "34.6*mm"/>
+    <constant name="DownStr:BPMSWExitRadius"            value=  "DownStr:BPMSWFlangeUpRadius"/>
+    <constant name="DownStr:BPMSWExitThick"             value=  "51.5*mm - DownStr:BPMSWExitRadius"/>
+
+    <constant name="DownStr:BPMSWPlugFlangeLength"      value=  "11.0*mm"/>
+    <constant name="DownStr:BPMSWPlugFlangeRadius"      value=  "26.0*mm"/>
+    <constant name="DownStr:BPMSWPlugPinLength"         value=  "13.4*mm*2 + DownStr:BPMSWPlugFlangeLength"/>
+    <constant name="DownStr:BPMSWPlugPinRadius"         value=  "7.5*mm"/>
+
+    <constant name="DownStr:BPMSWVacuumLength"          value=  "DownStr:BPMSWFlangeUpLength + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength*2 + DownStr:BPMSWExitLength + DownStr:BPMSWFlangeDownLength"/>
+
+    <!--=====================================VaxDown  -->
+    <!-- Main -->
+    <constant name="DownStr:VaxMainBodyLength"               value="126.0*mm - 0.02*mm"/>
+    <constant name="DownStr:VaxMainBodyRadius"               value="100.0*mm"/>
+    <constant name="DownStr:VaxMainBodyThick"                value="2.0*mm"/>
+    <constant name="DownStr:VaxMainBodyHole1Radius"          value="50.0*mm"/>
+    <constant name="DownStr:VaxMainBodyHole2Radius"          value="50.0*mm"/>
+    <constant name="DownStr:VaxMainBodyHole3Radius"          value="30.25*mm"/>
+    <constant name="DownStr:VaxMainBodyHole4Radius"          value="19.6*mm"/>
+    <constant name="DownStr:VaxMainBodyHole5Radius"          value="8.5*mm"/>
+    <constant name="DownStr:VaxMainBodyHole4Offset"          value="30.0*mm"/>
+    <constant name="DownStr:VaxMainBodyHole5Offset"          value="45.0*mm"/>
+
+
+    <!-- Entry Window -->
+    <constant name="DownStr:VaxWindowTubsLenght"             value="4.0*mm"/>
+    <constant name="DownStr:VaxWindowFlangeRadius"           value="50.0*mm"/>
+    <constant name="DownStr:VaxWindowFlangeLength"           value="10.0*mm"/>
+    <constant name="DownStr:VaxWindowInnerRadius"            value="37.5*mm"/>
+    <constant name="DownStr:VaxWindowThick"                  value="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick - DownStr:VaxWindowFlangeRadius"/>
+    <constant name="DownStr:VaxWindowConeLength"             value="21.0*mm"/>
+    <constant name="DownStr:VaxWindowConeEndThick"           value="DownStr:VaxMainBodyRadius - DownStr:VaxWindowConeLength - DownStr:VaxWindowInnerRadius"/>
+    <constant name="DownStr:VaxWindowConeFlangeLength"       value="DownStr:VaxWindowFlangeLength - DownStr:VaxWindowTubsLenght"/>
+    <constant name="DownStr:VaxWindowConeEndLength"          value="5.0*mm"/>
+    <constant name="DownStr:VaxWindowConeEndRad"             value="59.0*mm"/>
+
+
+    <!-- End Pipe -->
+    <constant name="DownStr:VaxEndPipeLength"                value="64.0*mm"/>
+    <constant name="DownStr:VaxEndPipeRadius"                value="32.5*mm"/>
+    <constant name="DownStr:VaxEndPipeThick"                 value="2.0*mm"/>
+    <constant name="DownStr:VaxEndPipeFlangeLength"          value="17.5*mm"/>
+    <constant name="DownStr:VaxEndPipeFlangeRadius"          value="DownStr:VaxEndPipeRadius + DownStr:VaxEndPipeThick + 0.01*mm"/>
+    <constant name="DownStr:VaxEndPipeFlangeThick"           value="63.5*mm - DownStr:VaxEndPipeFlangeRadius"/>
+
+
+    <!-- End Cap -->
+    <constant name="DownStr:VaxEndCapTubsLenght"             value="DownStr:VaxWindowTubsLenght"/>
+    <constant name="DownStr:VaxEndCapInnerRadius"            value="DownStr:VaxEndPipeRadius + DownStr:VaxEndPipeThick + 0.01*mm"/>
+    <constant name="DownStr:VaxEndCapThick"                  value="DownStr:VaxMainBodyRadius - DownStr:VaxEndCapTubsLenght - DownStr:VaxEndCapInnerRadius"/>
+
+
+    <!-- RF screen -->
+    <constant name="DownStr:VaxRfScreenFlangeLength"         value="8.0*mm"/>
+    <constant name="DownStr:VaxRfScreenFlangeRadius"         value="31.5*mm"/>
+    <constant name="DownStr:VaxRfScreenFlangeThick"          value="49.0*mm - DownStr:VaxRfScreenFlangeRadius"/>
+    <constant name="DownStr:VaxRfScreenEntryLength"          value="101.0*mm"/>
+    <constant name="DownStr:VaxRfScreenEntryRadius"          value="DownStr:VaxRfScreenFlangeRadius"/>
+    <constant name="DownStr:VaxRfScreenEntryThick"           value="2.5*mm"/>
+    <constant name="DownStr:VaxRfScreenConsLength"           value="10.0*mm"/>
+    <constant name="DownStr:VaxRfScreenExitLength"           value="63.5*mm"/>
+    <constant name="DownStr:VaxRfScreenExitRadius"           value="29.0*mm"/>
+    <constant name="DownStr:VaxRfScreenExitThick"            value="2.0*mm"/>
+
+
+    <!-- Vacuum -->
+    <constant name="DownStr:VaxVacuumLength"                 value="190.0*mm"/>
+    <constant name="DownStr:VaxVacuumRadius"                 value="DownStr:VaxRfScreenExitRadius - 0.01*mm"/>
+
+
+    <!-- Pipe 1 -->
+    <constant name="DownStr:VaxPipe1Length"                  value="204.0*mm"/>
+    <constant name="DownStr:VaxPipe1Radius"                  value="DownStr:VaxMainBodyHole1Radius"/>
+    <constant name="DownStr:VaxPipe1Thick"                   value="1.5*mm"/>
+    <constant name="DownStr:VaxPipe1HoleRadius"              value="19.6*mm"/>
+    <constant name="DownStr:VaxPipe1HoleOffset"              value="160.0*mm"/>
+
+
+    <!-- Pipe 2 -->
+    <constant name="DownStr:VaxPipe2Length"                  value="330.0*mm"/>
+    <constant name="DownStr:VaxPipe2Radius"                  value="DownStr:VaxMainBodyHole2Radius"/>
+    <constant name="DownStr:VaxPipe2Thick"                   value="1.5*mm"/>
+    <constant name="DownStr:VaxPipe2FlangeLength"            value="19.8*mm"/>
+    <constant name="DownStr:VaxPipe2FlangeRadius"            value="DownStr:VaxPipe2Radius + DownStr:VaxPipe2Thick + 0.01*mm"/>
+    <constant name="DownStr:VaxPipe2FlangeThick"             value="75.5*mm - DownStr:VaxPipe2FlangeRadius"/>
+    <constant name="DownStr:VaxPipe2BeltLength"              value="5.0*mm"/>
+    <constant name="DownStr:VaxPipe2BeltPos"                 value="122.0*mm"/>
+
+    <!-- Pipe 3 -->
+    <constant name="DownStr:VaxPipe3EntryLength"             value="220.0*mm"/>
+    <constant name="DownStr:VaxPipe3ExitLength"              value="120.0*mm"/>
+    <constant name="DownStr:VaxPipe3CutLength"               value="50.0*mm"/>
+    <constant name="DownStr:VaxPipe3Radius"                  value="DownStr:VaxMainBodyHole3Radius"/>
+    <constant name="DownStr:VaxPipe3Thick"                   value="1.5*mm"/>
+    <constant name="DownStr:VaxPipe3FlangeLength"            value="17.0*mm"/>
+    <constant name="DownStr:VaxPipe3FlangeRadius"            value="DownStr:VaxPipe3Radius + DownStr:VaxPipe3Thick + 0.01*mm"/>
+    <constant name="DownStr:VaxPipe3FlangeThick"             value="57.0*mm - DownStr:VaxPipe3FlangeRadius"/>
+
+    <!-- Pipe 4 -->
+    <constant name="DownStr:VaxPipe4Length"                  value="158.5*mm"/>
+    <constant name="DownStr:VaxPipe4Radius"                  value="DownStr:VaxMainBodyHole4Radius"/>
+    <constant name="DownStr:VaxPipe4Thick"                   value="1.6*mm"/>
+    <constant name="DownStr:VaxPipe4FlangeLength"            value="13.0*mm"/>
+    <constant name="DownStr:VaxPipe4FlangeRadius"            value="DownStr:VaxPipe4Radius + DownStr:VaxPipe4Thick + 0.01*mm"/>
+    <constant name="DownStr:VaxPipe4FlangeThick"             value="35.0*mm - DownStr:VaxPipe4FlangeRadius"/>
+
+    <!-- Pipe 5 -->
+    <constant name="DownStr:VaxPipe5Length"                  value="138.5*mm"/>
+    <constant name="DownStr:VaxPipe5Radius"                  value="DownStr:VaxMainBodyHole5Radius"/>
+    <constant name="DownStr:VaxPipe5Thick"                   value="1.0*mm"/>
+    <constant name="DownStr:VaxPipe5FlangeLength"            value="7.0*mm"/>
+    <constant name="DownStr:VaxPipe5FlangeRadius"            value="DownStr:VaxPipe5Radius + DownStr:VaxPipe5Thick + 0.01*mm"/>
+    <constant name="DownStr:VaxPipe5FlangeThick"             value="17.0*mm - DownStr:VaxPipe5FlangeRadius"/>
+
+    <!-- Pipe 6 -->
+    <constant name="DownStr:VaxPipe6Length"                  value="110.0*mm"/>
+    <constant name="DownStr:VaxPipe6Radius"                  value="DownStr:VaxPipe1HoleRadius"/>
+    <constant name="DownStr:VaxPipe6Thick"                   value="1.6*mm"/>
+    <constant name="DownStr:VaxPipe6FlangeLength"            value="13.0*mm"/>
+    <constant name="DownStr:VaxPipe6FlangeRadius"            value="DownStr:VaxPipe6Radius + DownStr:VaxPipe6Thick + 0.01*mm"/>
+    <constant name="DownStr:VaxPipe6FlangeThick"             value="35.0*mm - DownStr:VaxPipe6FlangeRadius"/>
+
+    <!-- Pipe 7 -->
+    <constant name="DownStr:VaxPipe7EntryLength"             value="115.0*mm"/>
+    <constant name="DownStr:VaxPipe7ExitLength"              value="110.0*mm"/>
+    <constant name="DownStr:VaxPipe7CutLength"               value="50.0*mm"/>
+    <constant name="DownStr:VaxPipe7Radius"                  value="30.25*mm"/>
+    <constant name="DownStr:VaxPipe7Thick"                   value="1.5*mm"/>
+    <constant name="DownStr:VaxPipe7LidLength"               value="4.0*mm"/>
+    <constant name="DownStr:VaxPipe7LidThick"                value="DownStr:VaxPipe3Radius + DownStr:VaxPipe3Thick - DownStr:VaxPipe7Radius"/>
+    <constant name="DownStr:VaxPipe7FlangeLength"            value="17.0*mm"/>
+    <constant name="DownStr:VaxPipe7FlangeRadius"            value="DownStr:VaxPipe7Radius + DownStr:VaxPipe7Thick + 0.01*mm"/>
+    <constant name="DownStr:VaxPipe7FlangeThick"             value="57.0*mm - DownStr:VaxPipe7FlangeRadius"/>
+  </define>
+
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon-VVSGF.xml b/compact/components/Pipe/2025-v00.00/AfterMuon-VVSGF.xml
new file mode 100644
index 000000000..48cf5f4c9
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/AfterMuon-VVSGF.xml
@@ -0,0 +1,64 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--================================== VVSGF ==================================-->
+<!--===========================================================================-->
+<pipe>
+
+  <!-- Main body -->
+  <volume name="lvVVSGFBlock" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="subtraction" name="VVSGFBlockSub">
+      <shape type="Box" name="VVSGFBlockBox"
+             dx="0.5*DownStr:VVSGFBlockX"
+             dy="0.5*DownStr:VVSGFBlockY"
+             dz="0.5*DownStr:VVSGFBlockZ"/>
+      <shape type="Box" name="VVSGFBlockBoxAir"
+             dx="0.5*(DownStr:VVSGFBlockX - 20.0*mm)"
+             dy="0.5*(DownStr:VVSGFBlockY - 20.0*mm)"
+             dz="0.5*(DownStr:VVSGFBlockZ - 20.0*mm)"/>
+      <shape type="Tube" name="VVSGFBlockHole"
+             dz="0.5*(DownStr:VVSGFBlockZ + 1.0*mm)"
+             rmax="DownStr:VVSGFBlockRad"/>
+      <position y="DownStr:VVSGFHoleY"/>
+    </shape>
+  </volume>
+
+  <!-- Flange -->
+  <volume name="lvVVSGFFlange" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="Tube" name="VVSGFFlangeTubs"
+           dz="0.5*DownStr:VVSGFFlangeZ"
+           rmin="DownStr:VVSGFBlockRad"
+           rmax="DownStr:VVSGFBlockRad + DownStr:VVSGFFlangeThick"/>
+  </volume>
+
+  <!-- Vacuum -->
+  <volume name="lvVVSGFVacuum" material="Vacuum" vis="Pipe:Vacuum">
+    <shape type="Tube" name="VVSGFVacuumTubs"
+           dz="0.5*(DownStr:VVSGFFlangeZ*2 + DownStr:VVSGFBlockZ)"
+           rmax="DownStr:VVSGFBlockRad - 0.01*mm"/>
+  </volume>
+
+  <!-- VVSGF -->
+  <volume name="lvVVSGF" vis="Pipe:AfterMuon">
+    <physvol name="pvVVSGFVacuum"                 logvol="lvVVSGFVacuum"/>
+    <physvol name="pvVVSGFBlock"                  logvol="lvVVSGFBlock">
+      <position y="-DownStr:VVSGFHoleY"/>
+    </physvol>
+    <physvol name="pvVVSGFFlangeUp"               logvol="lvVVSGFFlange">
+      <position z="-DownStr:VVSGFBlockZ/2 - DownStr:VVSGFFlangeZ/2 - 0.01*mm"/>
+    </physvol>
+    <physvol name="pvVVSGFFlangeDown"             logvol="lvVVSGFFlange">
+      <position z="DownStr:VVSGFBlockZ/2 + DownStr:VVSGFFlangeZ/2 + 0.01*mm"/>
+    </physvol>
+  </volume>
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon-Vax.xml b/compact/components/Pipe/2025-v00.00/AfterMuon-Vax.xml
new file mode 100644
index 000000000..029d09ea8
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/AfterMuon-Vax.xml
@@ -0,0 +1,522 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--================================== VaxDownStrPipe =========================-->
+<!--===========================================================================-->
+<pipe>
+  <!-- Entry window -->
+
+  <volume name="lvDownStrVaxWindow" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="VaxDownStrWindowUnion">
+      <shape type="Tube" name="VaxDownStrWindowTubs"
+             dz="DownStr:VaxWindowTubsLenght/2"
+             rmin="DownStr:VaxWindowFlangeRadius"
+             rmax="DownStr:VaxWindowFlangeRadius + DownStr:VaxWindowThick"/>
+      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrWindowSub">
+        <shape type="ConeSegment" name="VaxDownStrWindowCons"
+              dz="DownStr:VaxWindowConeLength/2"
+              rmax1="DownStr:VaxMainBodyRadius - 0.01*mm"
+              rmax2="DownStr:VaxWindowInnerRadius + DownStr:VaxWindowConeEndThick"/>
+        <shape type="Tube" name="VaxDownStrWindowSubTubs1"
+               dz="0.5*(DownStr:VaxWindowConeLength + 1.0*mm)"
+               rmax="DownStr:VaxWindowInnerRadius"/>
+        <shape type="Tube" name="VaxDownStrWindowSubTubs2"
+               dz="DownStr:VaxWindowConeFlangeLength"
+               rmax="DownStr:VaxWindowFlangeRadius"/>
+        <position z="-DownStr:VaxWindowConeLength/2"/>
+        <shape type="Tube" name="VaxDownStrWindowSubTubs3"
+               dz="DownStr:VaxWindowConeEndLength"
+               rmax="DownStr:VaxWindowConeEndRad"/>
+        <position z="DownStr:VaxWindowConeLength/2"/>
+      </shape>
+      <position z="DownStr:VaxWindowTubsLenght/2 + DownStr:VaxWindowConeLength/2 + 0.01*mm"/>
+    </shape>
+  </volume>
+
+
+  <!-- Endcap -->
+  <volume name="lvDownStrVaxEndCap" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="lvDownStrVaxEndCapUnion">
+      <shape type="Tube" name="VaxDownStrEndCapTubs"
+             dz="0.5*DownStr:VaxEndCapTubsLenght"
+             rmin="DownStr:VaxEndCapInnerRadius + 0.01*mm"
+             rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick"/>
+      <shape type="ConeSegment" name="VaxDownStrEndCapCons"
+            dz="0.5*DownStr:VaxEndCapTubsLenght"
+            rmax1="DownStr:VaxEndCapInnerRadius + DownStr:VaxEndCapThick"
+            rmax2="DownStr:VaxMainBodyRadius - 0.01*mm"
+            rmin1="DownStr:VaxEndCapInnerRadius + 0.01*mm"
+            rmin2="DownStr:VaxEndCapInnerRadius + 0.01*mm"/>
+      <position z="-DownStr:VaxEndCapTubsLenght/2 - DownStr:VaxEndCapTubsLenght/2 - 0.01*mm"/>
+    </shape>
+  </volume>
+
+
+  <!-- Main Body -->
+  <volume name="lvDownStrVaxMainBody" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="subtraction" name="VaxDownStrMainBodySub">
+      <shape type="Tube" name="VaxDownStrMainBodyTubs"
+             dz="0.5*DownStr:VaxMainBodyLength"
+             rmin="DownStr:VaxMainBodyRadius"
+             rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick"/>
+      <shape type="Tube" name="VaxDownStrMainBodyHole1"
+             dz="0.5*DownStr:VaxMainBodyRadius"
+             rmax="DownStr:VaxMainBodyHole1Radius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="DownStr:VaxMainBodyRadius"/>
+      </transformation>
+      <shape type="Tube" name="VaxDownStrMainBodyHole2"
+             dz="0.5*DownStr:VaxMainBodyRadius"
+             rmax="DownStr:VaxMainBodyHole2Radius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-DownStr:VaxMainBodyRadius"/>
+      </transformation>
+      <shape type="Tube" name="VaxDownStrMainBodyHole3"
+             dz="0.5*DownStr:VaxMainBodyRadius"
+             rmax="DownStr:VaxMainBodyHole3Radius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="DownStr:VaxMainBodyRadius"/>
+      </transformation>
+      <shape type="Tube" name="VaxDownStrMainBodyHole4"
+             dz="0.5*DownStr:VaxMainBodyRadius"
+             rmax="DownStr:VaxMainBodyHole4Radius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="-DownStr:VaxMainBodyRadius" z="-DownStr:VaxMainBodyHole4Offset"/>
+      </transformation>
+      <shape type="Tube" name="VaxDownStrMainBodyHole5"
+             dz="0.5*DownStr:VaxMainBodyRadius"
+             rmax="DownStr:VaxMainBodyHole5Radius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="-DownStr:VaxMainBodyRadius" z="DownStr:VaxMainBodyHole5Offset"/>
+      </transformation>
+    </shape>
+  </volume>
+
+
+  <!-- End pipe -->
+  <volume name="lvDownStrVaxEndPipe" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="VaxDownStrEndPipeUnion">
+      <shape type="Tube" name="VaxDownStrEndPipeTubs"
+             dz="0.5*DownStr:VaxEndPipeLength"
+             rmin="DownStr:VaxEndPipeRadius"
+             rmax="DownStr:VaxEndPipeRadius + DownStr:VaxEndPipeThick"/>
+      <shape type="Tube" name="VaxDownStrEndPipeFlangeTubs"
+             dz="0.5*DownStr:VaxEndPipeFlangeLength"
+             rmin="DownStr:VaxEndPipeFlangeRadius"
+             rmax="DownStr:VaxEndPipeFlangeRadius + DownStr:VaxEndPipeFlangeThick"/>
+      <position z="DownStr:VaxEndPipeLength/2 - DownStr:VaxEndPipeFlangeLength/2"/>
+    </shape>
+  </volume>
+
+
+  <!-- RF Screen -->
+  <volume name="lvDownStrVaxRfScreen" material="Pipe:CuOFE" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="VaxDownStrRfScreenUnion">
+      <shape type="Tube" name="VaxDownStrRfScreenFlangeTubs"
+             dz="0.5*DownStr:VaxRfScreenFlangeLength"
+             rmin="DownStr:VaxRfScreenFlangeRadius"
+             rmax="DownStr:VaxRfScreenFlangeRadius + DownStr:VaxRfScreenFlangeThick"/>
+      <shape type="Tube" name="VaxDownStrRfScreenEntryTubs"
+             dz="0.5*DownStr:VaxRfScreenEntryLength"
+             rmin="DownStr:VaxRfScreenEntryRadius"
+             rmax="DownStr:VaxRfScreenEntryRadius + DownStr:VaxRfScreenEntryThick"/>
+      <position z="DownStr:VaxRfScreenFlangeLength/2 + DownStr:VaxRfScreenEntryLength/2 + 0.01*mm"/>
+      <shape type="ConeSegment" name="VaxDownStrRfScreenCons"
+            dz="0.5*DownStr:VaxRfScreenConsLength"
+            rmin1="DownStr:VaxRfScreenEntryRadius"
+            rmin2="DownStr:VaxRfScreenExitRadius"
+            rmax1="DownStr:VaxRfScreenEntryRadius + DownStr:VaxRfScreenEntryThick"
+            rmax2="DownStr:VaxRfScreenExitRadius + DownStr:VaxRfScreenExitThick"/>
+      <position z="DownStr:VaxRfScreenFlangeLength/2 + DownStr:VaxRfScreenEntryLength + DownStr:VaxRfScreenConsLength/2 + 0.02*mm"/>
+      <shape type="Tube" name="VaxDownStrRfScreenExitTubs"
+             dz="0.5*DownStr:VaxRfScreenExitLength"
+             rmin="DownStr:VaxRfScreenExitRadius"
+             rmax="DownStr:VaxRfScreenExitRadius + DownStr:VaxRfScreenExitThick"/>
+      <position z="DownStr:VaxRfScreenFlangeLength/2 + DownStr:VaxRfScreenEntryLength + DownStr:VaxRfScreenConsLength + DownStr:VaxRfScreenExitLength/2 + 0.03*mm"/>
+    </shape>
+  </volume>
+
+
+  <!-- Vacuum -->
+  <volume name="lvDownStrVaxVacuum" material="Vacuum" vis="Pipe:Vacuum">
+    <shape type="Tube" name="VaxDownStrVacuumTubs"
+           dz="0.5*DownStr:VaxVacuumLength"
+           rmax="DownStr:VaxVacuumRadius"/>
+  </volume>
+
+
+  <!-- Pipe1, top pipe -->
+  <volume name="lvDownStrVaxPipe1" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe1Sub">
+      <shape type="Tube" name="VaxDownStrPipe1Tubs"
+             dz="0.5*DownStr:VaxPipe1Length"
+             rmin="DownStr:VaxPipe1Radius"
+             rmax="DownStr:VaxPipe1Radius + DownStr:VaxPipe1Thick"/>
+      <shape type="Tube" name="VaxDownStrPipe1SubTubs"
+             dz="0.5*DownStr:VaxMainBodyLength"
+             rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position z="-DownStr:VaxPipe1Length/2"/>
+      </transformation>
+      <shape type="Tube" name="VaxDownStrPipe1Hole1"
+             dz="0.5*DownStr:VaxPipe1Radius"
+             rmax="DownStr:VaxPipe1HoleRadius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="DownStr:VaxPipe1Radius" z="-DownStr:VaxPipe1Length/2 + DownStr:VaxPipe1HoleOffset"/>
+      </transformation>
+      <shape type="Tube" name="VaxDownStrPipe1Hole2"
+             dz="0.5*DownStr:VaxPipe1Radius"
+             rmax="DownStr:VaxPipe1HoleRadius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="-DownStr:VaxPipe1Radius" z="-DownStr:VaxPipe1Length/2 + DownStr:VaxPipe1HoleOffset"/>
+      </transformation>
+      <shape type="Tube" name="VaxDownStrPipe1Hole3"
+             dz="0.5*DownStr:VaxPipe1Radius"
+             rmax="DownStr:VaxPipe1HoleRadius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="DownStr:VaxPipe1Radius" z="-DownStr:VaxPipe1Length/2 + DownStr:VaxPipe1HoleOffset"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <!-- Pipe2 -->
+  <volume name="lvDownStrVaxPipe2" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe2Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe2Sub">
+        <shape type="Tube" name="DownStr:VaxPipe2Tubs"
+               dz="0.5*DownStr:VaxPipe2Length"
+               rmin="DownStr:VaxPipe2Radius"
+               rmax="DownStr:VaxPipe2Radius + DownStr:VaxPipe2Thick"/>
+        <shape type="Tube" name="DownStr:VaxPipe2SubTubs"
+               dz="0.5*DownStr:VaxMainBodyLength"
+               rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation x="90.0*degree"/>
+          <position z="-DownStr:VaxPipe2Length/2"/>
+        </transformation>
+      </shape>
+      <shape type="Tube" name="VaxDownStrPipe2FlangeTubs"
+             dz="0.5*DownStr:VaxPipe2FlangeLength"
+             rmin="DownStr:VaxPipe2FlangeRadius"
+             rmax="DownStr:VaxPipe2FlangeRadius + DownStr:VaxPipe2FlangeThick"/>
+      <position z="DownStr:VaxPipe2Length/2 - DownStr:VaxPipe2FlangeLength/2"/>
+      <shape type="Tube" name="VaxDownStrPipe2BeltTubs"
+             dz="0.5*DownStr:VaxPipe2BeltLength"
+             rmin="DownStr:VaxPipe2FlangeRadius"
+             rmax="DownStr:VaxPipe2FlangeRadius + DownStr:VaxPipe2FlangeThick"/>
+      <position z="-DownStr:VaxPipe2Length/2 + DownStr:VaxPipe2BeltPos - DownStr:VaxPipe2BeltLength/2"/>
+    </shape>
+  </volume>
+
+  <!-- Pipe3 -->
+  <volume name="lvDownStrVaxPipe3" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe3Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe3Sub">
+        <shape type="Tube" name="VaxDownStrPipe3Tubs"
+               dz="0.5*DownStr:VaxPipe3EntryLength + DownStr:VaxPipe3CutLength"
+               rmin="DownStr:VaxPipe3Radius"
+               rmax="DownStr:VaxPipe3Radius + DownStr:VaxPipe3Thick"/>
+        <shape type="Tube" name="DownStr:VaxPipe3SubTubs"
+               dz="0.5*DownStr:VaxMainBodyLength"
+               rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation y="90.0*degree"/>
+          <position z="-DownStr:VaxPipe3EntryLength/2 - DownStr:VaxPipe3CutLength/2"/>
+        </transformation>
+        <shape type="Box" name="VaxDownStrPipe3SubBox"
+               dx="0.5*150.0*mm"
+               dy="0.5*150.0*mm"
+               dz="0.5*2*DownStr:VaxPipe3CutLength"/>
+        <transformation>
+          <position z="DownStr:VaxPipe3CutLength"/>
+          <rotation/>
+          <position/>
+          <rotation x="45.0*degree"/>
+          <position z="DownStr:VaxPipe3EntryLength/2 - DownStr:VaxPipe3CutLength/2"/>
+        </transformation>
+      </shape>
+      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe3Sub2">
+        <shape type="Tube" name="VaxDownStrPipe3Tubs2"
+               dz="0.5*DownStr:VaxPipe3ExitLength + DownStr:VaxPipe3CutLength"
+               rmin="DownStr:VaxPipe3Radius"
+               rmax="DownStr:VaxPipe3Radius + DownStr:VaxPipe3Thick"/>
+        <shape type="Box" name="VaxDownStrPipe3SubBox2"
+               dx="0.5*150.0*mm"
+               dy="0.5*150.0*mm"
+               dz="0.5*2*DownStr:VaxPipe3CutLength"/>
+        <transformation>
+          <position z="-DownStr:VaxPipe3CutLength"/>
+          <rotation/>
+          <position/>
+          <rotation x="-45.0*degree"/>
+          <position z="-DownStr:VaxPipe3ExitLength/2 + DownStr:VaxPipe3CutLength/2"/>
+        </transformation>
+      </shape>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-DownStr:VaxPipe3ExitLength/2 + DownStr:VaxPipe3CutLength/2" z="DownStr:VaxPipe3EntryLength/2 - DownStr:VaxPipe3CutLength/2 + 0.01*mm"/>
+      </transformation>
+      <shape type="Tube" name="VaxDownStrPipe3FlangeTubs"
+             dz="0.5*DownStr:VaxPipe3FlangeLength"
+             rmin="DownStr:VaxPipe3FlangeRadius"
+             rmax="DownStr:VaxPipe3FlangeRadius + DownStr:VaxPipe3FlangeThick"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-DownStr:VaxPipe3ExitLength + DownStr:VaxPipe3FlangeLength/2" z="DownStr:VaxPipe3EntryLength/2 - DownStr:VaxPipe3CutLength/2 + 0.01*mm"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <!-- Pipe4 -->
+  <volume name="lvDownStrVaxPipe4" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe4Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe4Sub">
+        <shape type="Tube" name="VaxDownStrPipe4Tubs"
+               dz="0.5*DownStr:VaxPipe4Length"
+               rmin="DownStr:VaxPipe4Radius"
+               rmax="DownStr:VaxPipe4Radius + DownStr:VaxPipe4Thick"/>
+        <shape type="Tube" name="VaxDownStrPipe4SubTubs"
+               dz="0.5*DownStr:VaxMainBodyLength"
+               rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation y="90.0*degree"/>
+          <position z="-DownStr:VaxPipe4Length/2"/>
+        </transformation>
+      </shape>
+      <shape type="Tube" name="VaxDownStrPipe4FlangeTubs"
+             dz="0.5*DownStr:VaxPipe4FlangeLength"
+             rmin="DownStr:VaxPipe4FlangeRadius"
+             rmax="DownStr:VaxPipe4FlangeRadius + DownStr:VaxPipe4FlangeThick"/>
+      <position z="DownStr:VaxPipe4Length/2 - DownStr:VaxPipe4FlangeLength/2"/>
+    </shape>
+  </volume>
+
+
+  <!-- Pipe5 -->
+  <volume name="lvDownStrVaxPipe5" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe5Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe5Sub">
+        <shape type="Tube" name="DownStr:VaxPipe5Tubs"
+               dz="0.5*DownStr:VaxPipe5Length"
+               rmin="DownStr:VaxPipe5Radius"
+               rmax="DownStr:VaxPipe5Radius + DownStr:VaxPipe5Thick"/>
+        <shape type="Tube" name="VaxDownStrPipe5SubTubs"
+               dz="0.5*DownStr:VaxMainBodyLength"
+               rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation y="90.0*degree"/>
+          <position z="-DownStr:VaxPipe5Length/2"/>
+        </transformation>
+      </shape>
+      <shape type="Tube" name="VaxDownStrPipe5FlangeTubs"
+             dz="0.5*DownStr:VaxPipe5FlangeLength"
+             rmin="DownStr:VaxPipe5FlangeRadius"
+             rmax="DownStr:VaxPipe5FlangeRadius + DownStr:VaxPipe5FlangeThick"/>
+      <position z="DownStr:VaxPipe5Length/2 - DownStr:VaxPipe5FlangeLength/2"/>
+    </shape>
+  </volume>
+
+
+  <!-- Pipe6 -->
+  <volume name="lvDownStrVaxPipe6" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe6Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe6Sub">
+        <shape type="Tube" name="VaxDownStrPipe6Tubs"
+               dz="0.5*DownStr:VaxPipe6Length"
+               rmin="DownStr:VaxPipe6Radius"
+               rmax="DownStr:VaxPipe6Radius + 1.6*mm"/>
+        <shape type="Tube" name="VaxDownStrPipe6SubTubs"
+               dz="0.5*DownStr:VaxPipe1Length"
+               rmax="DownStr:VaxPipe1Radius + DownStr:VaxPipe1Thick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation x="90.0*degree"/>
+          <position z="-DownStr:VaxPipe6Length/2"/>
+        </transformation>
+      </shape>
+      <shape type="Tube" name="VaxDownStrPipe6FlangeTubs"
+             dz="0.5*DownStr:VaxPipe6FlangeLength"
+             rmin="DownStr:VaxPipe6FlangeRadius"
+             rmax="DownStr:VaxPipe6FlangeRadius + DownStr:VaxPipe6FlangeThick"/>
+      <position z="DownStr:VaxPipe6Length/2 - DownStr:VaxPipe6FlangeLength/2"/>
+    </shape>
+  </volume>
+
+
+  <!-- Pipe7 -->
+  <volume name="lvDownStrVaxPipe7" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
+    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe7Union">
+      <shape type="Tube" name="VaxDownStrPipe7Lid"
+             dz="0.5*DownStr:VaxPipe7LidLength"
+             rmin="DownStr:VaxPipe7Radius"
+             rmax="DownStr:VaxPipe7Radius + DownStr:VaxPipe7LidThick"/>
+      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe7Sub">
+        <shape type="Tube" name="VaxDownStrPipe7Tubs"
+               dz="0.5*DownStr:VaxPipe7EntryLength + DownStr:VaxPipe7CutLength"
+               rmin="DownStr:VaxPipe7Radius"
+               rmax="DownStr:VaxPipe7Radius + DownStr:VaxPipe7Thick"/>
+        <shape type="Box" name="VaxDownStrPipe7SubBox"
+               dx="0.5*150.0*mm"
+               dy="0.5*150.0*mm"
+               dz="0.5*2*DownStr:VaxPipe7CutLength"/>
+        <transformation>
+          <position z="DownStr:VaxPipe7CutLength"/>
+          <rotation/>
+          <position/>
+          <rotation x="45.0*degree"/>
+          <position z="DownStr:VaxPipe7EntryLength/2 - DownStr:VaxPipe7CutLength/2"/>
+        </transformation>
+      </shape>
+      <position z="DownStr:VaxPipe7EntryLength/2 + DownStr:VaxPipe7CutLength/2 + DownStr:VaxPipe7LidLength/2 + 0.01*mm"/>
+      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe7Sub2">
+        <shape type="Tube" name="VaxDownStrPipe7Tubs2"
+               dz="0.5*DownStr:VaxPipe7ExitLength + DownStr:VaxPipe7CutLength"
+               rmin="DownStr:VaxPipe7Radius"
+               rmax="DownStr:VaxPipe7Radius + DownStr:VaxPipe7Thick"/>
+        <shape type="Box" name="VaxDownStrPipe7SubBox2"
+               dx="0.5*150.0*mm"
+               dy="0.5*150.0*mm"
+               dz="0.5*2*DownStr:VaxPipe7CutLength"/>
+        <transformation>
+          <position z="-DownStr:VaxPipe7CutLength"/>
+          <rotation/>
+          <position/>
+          <rotation x="-45.0*degree"/>
+          <position z="-DownStr:VaxPipe7ExitLength/2 + DownStr:VaxPipe7CutLength/2"/>
+        </transformation>
+      </shape>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-DownStr:VaxPipe7ExitLength/2 + DownStr:VaxPipe7CutLength/2" z="DownStr:VaxPipe7EntryLength + DownStr:VaxPipe7LidLength/2 + 0.04*mm"/>
+      </transformation>
+      <shape type="Tube" name="DownStr:VaxPipe7FlangeTubs"
+             dz="0.5*DownStr:VaxPipe7FlangeLength"
+             rmin="DownStr:VaxPipe7FlangeRadius"
+             rmax="DownStr:VaxPipe7FlangeRadius + DownStr:VaxPipe7FlangeThick"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-DownStr:VaxPipe7ExitLength + DownStr:VaxPipe7FlangeLength/2" z="DownStr:VaxPipe7EntryLength + DownStr:VaxPipe7LidLength/2 + 0.04*mm"/>
+      </transformation>
+    </shape>
+  </volume>
+
+
+  <!-- Complete -->
+  <volume name="lvDownStrVax" vis="Pipe:AfterMuon">
+    <physvol name="pvDownStrVaxMainBody"          logvol="lvDownStrVaxMainBody"/>
+    <physvol name="pvDownStrVaxWindow"            logvol="lvDownStrVaxWindow">
+      <position z="-DownStr:VaxMainBodyLength/2 - DownStr:VaxWindowTubsLenght/2 - 0.01*mm"/>
+    </physvol>
+    <physvol name="pvDownStrVaxRfScreen"          logvol="lvDownStrVaxRfScreen">
+      <position z="-DownStr:VaxMainBodyLength/2 - DownStr:VaxWindowTubsLenght - 0.01*mm + DownStr:VaxRfScreenFlangeLength/2"/>
+    </physvol>
+    <physvol name="pvDownStrVaxEndCap"            logvol="lvDownStrVaxEndCap">
+      <position z="DownStr:VaxMainBodyLength/2 + DownStr:VaxEndCapTubsLenght/2 + 0.01*mm"/>
+    </physvol>
+    <physvol name="pvDownStrVaxEndPipe"           logvol="lvDownStrVaxEndPipe">
+      <position z="DownStr:VaxMainBodyLength/2 - DownStr:VaxEndCapTubsLenght + 0.01*mm + DownStr:VaxEndPipeLength/2"/>
+    </physvol>
+    <physvol name="pvDownStrVaxPipe1"             logvol="lvDownStrVaxPipe1">
+      <transformation>
+        <position/>
+        <rotation x="-90.0*degree"/>
+        <position y="DownStr:VaxPipe1Length/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrVaxPipe2"             logvol="lvDownStrVaxPipe2">
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-DownStr:VaxPipe2Length/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrVaxPipe3"             logvol="lvDownStrVaxPipe3">
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="DownStr:VaxPipe3EntryLength/2 + DownStr:VaxPipe3CutLength/2 "/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrVaxPipe4"             logvol="lvDownStrVaxPipe4">
+      <transformation>
+        <position/>
+        <rotation y="-90.0*degree"/>
+        <position x="-DownStr:VaxPipe4Length/2" z="-DownStr:VaxMainBodyHole4Offset"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrVaxPipe5"             logvol="lvDownStrVaxPipe5">
+      <transformation>
+        <position/>
+        <rotation y="-90.0*degree"/>
+        <position x="-DownStr:VaxPipe5Length/2" z="DownStr:VaxMainBodyHole5Offset"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrVaxPipe6a"            logvol="lvDownStrVaxPipe6">
+      <transformation>
+        <position/>
+        <rotation y="-90.0*degree"/>
+        <position x="-DownStr:VaxPipe6Length/2" y="DownStr:VaxPipe1HoleOffset"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrVaxPipe6b"            logvol="lvDownStrVaxPipe6">
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="DownStr:VaxPipe6Length/2" y="DownStr:VaxPipe1HoleOffset"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrVaxPipe6c"            logvol="lvDownStrVaxPipe6">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree"/>
+        <position y="DownStr:VaxPipe1HoleOffset" z="-DownStr:VaxPipe6Length/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrVaxPipe7"             logvol="lvDownStrVaxPipe7">
+      <transformation>
+        <position/>
+        <rotation x="-90.0*degree" z="90.0*degree"/>
+        <position y="DownStr:VaxPipe1Length + DownStr:VaxPipe7LidLength/2 + 0.01*mm"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvDownStrVaxVacuum"             logvol="lvDownStrVaxVacuum">
+      <position z="-DownStr:VaxMainBodyLength/2 - DownStr:VaxWindowTubsLenght - 0.01*mm + DownStr:VaxVacuumLength/2"/>
+    </physvol>
+  </volume>
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon.xml b/compact/components/Pipe/2025-v00.00/AfterMuon.xml
new file mode 100644
index 000000000..023a40010
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/AfterMuon.xml
@@ -0,0 +1,78 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+
+  <detectors>
+    <detector name="PipeAfterMuon" type="DD4hep_VolumeAssembly" parent="${PipeAfterMuon:parent}" vis="Pipe:Vis">
+
+      <!-- Pipe segment replacement of VVSSH  (LHCb_Pipe_Section_Type_1) -->
+      <volume type="LHCb_Pipe_Section_Type_1" name="lvVVSSH">
+	<param name="vis"                value="Pipe:AfterMuon"/>
+	<param name="Material"           value="Pipe:Steel316LN"/>
+	<param name="Length"             value="DownStr:VVSSHPipeZ"/>
+	<param name="Radius"             value="DownStr:VVSSHPipeRad"/>
+	<param name="Thick"              value="DownStr:VVSSHPipeThick"/>
+	<param name="FlangeLength"       value="19.7*mm"/>
+	<param name="FlangeThick"        value="76.0*mm - (DownStr:VVSSHPipeRad + DownStr:VVSSHPipeThick + 0.01*mm)"/>
+	<param name="FlangeMaterial"     value="Pipe:Steel316LN"/>
+      </volume>
+
+      <!-- Pipe in DownStr:MBXWS  (LHCb_Pipe_Section_Type_1)  -->
+      <volume type="LHCb_Pipe_Section_Type_1" name="lvMBXWSPipe">
+	<param name="vis"                value="Pipe:AfterMuon"/>
+	<param name="Material"           value="Pipe:CuOFE"/>
+	<param name="Length"             value="DownStr:MBXWSPipeLength"/>
+	<param name="Radius"             value="DownStr:MBXWSPipeRadius"/>
+	<param name="Thick"              value="DownStr:MBXWSPipeThick"/>
+	<param name="FlangeUpLength"     value="19.8*mm"/>
+	<param name="FlangeUpThick"      value="48.0*mm"/>
+	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
+	<param name="FlangeDownLength"   value="17.4*mm"/>
+	<param name="FlangeDownThick"    value="29.0*mm"/>
+	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
+      </volume>
+      <include ref="AfterMuon-VVSGF.xml"/>
+      <include ref="AfterMuon-BPMSW.xml"/>
+      <include ref="AfterMuon-Vax.xml"/>
+
+      <!--==================================================================================-->
+      <!--===================================Final  Assembly================================-->
+      <!--==================================================================================-->
+      <envelope type="Assembly" name="lvPipeAfterMuon" vis="Pipe:AfterMuon">
+	<physvol name="pvVVSGF"		  volume="lvVVSGF">
+	  <position z="75.0*mm/2 - 2500.0*mm/2"/>
+	  <rotation z="-30.0*degree"/>
+	</physvol>
+	<physvol name="pvVVSSH"		  volume="lvVVSSH">
+	  <position z="75.0*mm + 280*mm + 80.0*mm/2 - 2500.0*mm/2"/>
+	</physvol>
+	<physvol name="pvMBXWSPipe"       volume="lvMBXWSPipe">
+	  <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm/2 - 2500.0*mm/2"/>
+	</physvol>
+	<physvol name="pvBPMSWDownStr"	  volume="lvDownStrBPMSW">
+	  <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm + 17.4*mm/2 - 2500.0*mm/2"/>
+	</physvol>
+	<physvol name="pvVaxDownStr" 	  volume="lvDownStrVax">
+	  <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm + 285.0*mm + 180.0*mm + 67.0*mm - 2500.0*mm/2"/>
+	</physvol>
+	<physvol name="pvVVSGF2"	  volume="lvVVSGF">
+	  <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm + 285.0*mm + 180.0*mm + 190.0*mm + 75.0*mm/2 - 2500.0*mm/2"/>
+	</physvol>
+      </envelope>
+
+      <position z="- Regions:AfterMuonHoleZSize/2"/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterT-Support.xml b/compact/components/Pipe/2025-v00.00/AfterT-Support.xml
new file mode 100644
index 000000000..2d3d8d05a
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/AfterT-Support.xml
@@ -0,0 +1,40 @@
+<!--========================================================================== -->
+<!--  LHCb Detector Description                                                -->
+<!--========================================================================== -->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--========================================================================== -->
+<!-- XML description of the Pipe support after the T area                      -->
+<!--========================================================================== -->
+<lccdd>
+  <detectors>
+
+    <!-- =================================Supports =========================== -->
+    <!-- Pipe support between Rich2 and M1 (part in Rich2)                     -->
+    <!-- ===================================================================== -->
+    <detector name="PipeSupportAfterT" type="DD4hep_VolumeAssembly" parent="${PipeAfterT:parent}" vis="Pipe:Vis">
+      <!-- UX85-3 Support: Spacer and Collar togheter, sectioning due to regions -->
+      <volume name="lvUX853AfterMagnetCollar" material="Pipe:Al6082" vis="Pipe:AfterT">
+        <shape type="Tube" name="UX85-3-Collar-A"
+              dz="UX853CollarRich2Size/2"
+              rmin="UX853CollarInnerRadius"
+              rmax="UX853CollarOuterRadius"/>
+      </volume>
+
+      <!-- UX85-3 Support -->
+      <envelope type="Assembly" name="lvUX85SupportsAfterMagnet" vis="Pipe:AfterT">
+        <physvol name ="pvUX853AfterMagnetCollar"  volume="lvUX853AfterMagnetCollar" vis="Pipe:AfterT">
+          <position z="- 0.5*UX853CollarRich2Size"/>
+        </physvol>
+      </envelope>
+      <position z="UX853Rich2DownSplitZposIP - Regions:AfterMagnetZPos"/>
+      <nodebug/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterT.xml b/compact/components/Pipe/2025-v00.00/AfterT.xml
new file mode 100644
index 000000000..dc58f13da
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/AfterT.xml
@@ -0,0 +1,116 @@
+<!--========================================================================== -->
+<!--  LHCb Detector Description                                                -->
+<!--========================================================================== -->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--========================================================================== -->
+<!-- XML description of the Beam Pipe after T                                  -->
+<!--========================================================================== -->
+<lccdd>
+
+  <detectors>
+    <!--==================================================================================-->
+    <!--==================================PiperAfter T====================================-->
+    <!--==================================================================================-->
+    <detector name="PipeAfterT" type="DD4hep_VolumeAssembly" parent="${PipeAfterT:parent}" vis="Pipe:Vis">
+      <!-- UX85-3 Cone 10 mrad of Beryllium 1.9 mm thick - Split T/Rich2 -->
+      <volume name="lvUX853Cone07B" material="Pipe:BeTV56" vis="Pipe:AfterT">
+        <shape type="ConeSegment" name="UX85-3-Cone10mrad-07B"
+              dz="UX853Cone07BLenght/2"
+              rmin2="UX853Cone07BRadiusZmax"
+              rmin1="UX853Cone07BRadiusZmin"
+              rmax2="UX853Cone07BRadiusZmax + UX853Cone07BThick"
+              rmax1="UX853Cone07BRadiusZmin + UX853Cone07BThick"/>
+      </volume>
+      <!-- UX85-3 Cone 10 mrad of Beryllium 2.0 mm thick -->
+      <volume name="lvUX853Cone08" material="Pipe:BeTV56" vis="Pipe:AfterT">
+        <shape type="ConeSegment" name="UX85-3-Cone10mrad-08"
+              dz="UX853Cone08Lenght/2"
+              rmin2="UX853Cone08RadiusZmax"
+              rmin1="UX853Cone08RadiusZmin"
+              rmax2="UX853Cone08RadiusZmax + UX853Cone08Thick"
+              rmax1="UX853Cone08RadiusZmin + UX853Cone08Thick"/>
+      </volume>
+      <!-- UX85-3 Cone 10 mrad of Beryllium 2.1 mm thick -->
+      <volume name="lvUX853Cone09" material="Pipe:BeTV56" vis="Pipe:AfterT">
+        <shape type="ConeSegment" name="UX85-3-Cone10mrad-09"
+              dz="UX853Cone09Lenght/2"
+              rmin2="UX853Cone09RadiusZmax"
+              rmin1="UX853Cone09RadiusZmin"
+              rmax2="UX853Cone09RadiusZmax + UX853Cone09Thick"
+              rmax1="UX853Cone09RadiusZmin + UX853Cone09Thick"/>
+      </volume>
+      <!-- UX85-3 Cone 10 mrad of Beryllium 2.3 mm thick -->
+      <volume name="lvUX853Cone10" material="Pipe:BeTV56" vis="Pipe:AfterT">
+        <shape type="ConeSegment" name="UX85-3-Cone10mrad-10"
+              dz="UX853Cone10Lenght/2"
+              rmin2="UX853Cone10RadiusZmax"
+              rmin1="UX853Cone10RadiusZmin"
+              rmax2="UX853Cone10RadiusZmax + UX853Cone10Thick"
+              rmax1="UX853Cone10RadiusZmin + UX853Cone10Thick"/>
+      </volume>
+      <!-- UX85-3 Cone 10 mrad of Beryllium 2.4 mm thick -->
+      <volume name="lvUX853Cone11" material="Pipe:BeTV56" vis="Pipe:AfterT">
+        <shape type="ConeSegment" name="UX85-3-Cone10mrad-11"
+              dz="UX853Cone11Lenght/2"
+              rmin2="UX853Cone11RadiusZmax"
+              rmin1="UX853Cone11RadiusZmin"
+              rmax2="UX853Cone11RadiusZmax + UX853Cone11Thick"
+              rmax1="UX853Cone11RadiusZmin + UX853Cone11Thick"/>
+      </volume>
+      <!-- UX85-3 Cone 10 mrad of Beryllium cylindrical part for support -->
+      <!-- Split Rich2/Downstream                                        -->
+      <volume name="lvUX853Cone12A" material="Pipe:BeTV56" vis="Pipe:AfterT">
+        <shape type="ConeSegment" name="UX85-3-Cone10mrad-12A"
+              dz="UX853Cone12ALenght/2"
+              rmin2="UX853Cone12ARadiusZmax"
+              rmin1="UX853Cone12ARadiusZmin"
+              rmax2="UX853Cone12AOuterRadius"
+              rmax1="UX853Cone12AOuterRadius"/>
+      </volume>
+      <!-- Vacuum in UX85-3 in whole AfterT lenght -->
+      <volume name="lvUX853Vacuum07B" material="Vacuum" vis="Pipe:AfterT">
+        <shape type="ConeSegment" name="UX85-3-Vacuum-07B"
+              dz="UX853AfterTLenght/2"
+              rmax1="UX853Cone07BRadiusZmin"
+              rmax2="UX853Cone12ARadiusZmax"/>
+      </volume>
+
+      <!-- Whole section: combination of sections -->
+      <envelope type="Assembly" name="lvUX853AfterT" vis="Pipe:AfterT">
+        <!-- Pipe of Be -->
+        <physvol name="pvUX853Cone07B" volume="lvUX853Cone07B">
+          <position z="UX853Cone07BZpos"/>
+        </physvol>
+        <physvol name="pvUX853Cone08" volume="lvUX853Cone08">
+          <position z="UX853Cone08Zpos"/>
+        </physvol>
+        <physvol name="pvUX853Cone09" volume="lvUX853Cone09">
+          <position z="UX853Cone09Zpos"/>
+        </physvol>
+        <physvol name="pvUX853Cone10" volume="lvUX853Cone10">
+          <position z="UX853Cone10Zpos"/>
+        </physvol>
+        <physvol name="pvUX853Cone11" volume="lvUX853Cone11">
+          <position z="UX853Cone11Zpos"/>
+        </physvol>
+        <physvol name="pvUX853Cone12A" volume="lvUX853Cone12A">
+          <position z="UX853Cone12AZpos"/>
+        </physvol>
+        <!-- Now the vacuum inside -->
+        <physvol name="pvUX853Vacuum07B" volume="lvUX853Vacuum07B">
+          <position z="0.5*UX853AfterTLenght"/>
+        </physvol>
+      </envelope>
+      <!-- Pipe log volume center AfterT is at split between T and Rich2 -->
+      <position z="UX853TRich2SplitZposIP - Regions:AfterMagnetZPos"/>
+      <nodebug/>
+    </detector>
+  </detectors>
+
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/BeforeMagnet.xml b/compact/components/Pipe/2025-v00.00/BeforeMagnet.xml
new file mode 100644
index 000000000..824dce210
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/BeforeMagnet.xml
@@ -0,0 +1,94 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Pipe in the BeforeMagnetRegion area                -->
+<!--===========================================================================-->
+<lccdd>
+  <define>
+    <constant name="Pipe:JuncSteelCyl4Z" value="20*mm"/>
+    <constant name="Pipe:JuncSteelCyl4InnerR" value="40*mm"/>
+    <constant name="Pipe:JuncSteelCyl4OuterR" value="76*mm"/>
+  </define>
+
+
+  <detectors>
+    <!--=================================Supports==============================-->
+    <!-- Beam pipe in the BeforeMagnet region                                  -->
+    <!--=======================================================================-->
+    <detector name="PipeBeforeMagnet" type="DD4hep_VolumeAssembly" parent="${PipeBeforeMagnet:parent}" vis="Pipe:Vis">
+
+      <!-- Whole section: combination of sections -->
+      <volume name="lvPipeJunctionBeforeVeloSteel" vis="Pipe:BeforeMagnet" material="Pipe:Steel316LN">
+        <shape type="BooleanShape" operation="union" name="PipeJuncB4VeloSteelUnion">
+          <shape type="Tube" name="Pipe:JuncSteelCyl4"
+                 dz="0.5*Pipe:JuncSteelCyl4Z"
+                 rmin="Pipe:JuncSteelCyl4InnerR"
+                 rmax="Pipe:JuncSteelCyl4OuterR"/>
+          <shape type="ConeSegment" name="JuncSteelCone"
+                 dz="0.5*30*mm"
+                 rmin2="(35*(38-27)/65)*mm+27*mm"
+                 rmin1="38*mm"
+                 rmax2="(35*(40-29)/65)*mm+29*mm"
+                 rmax1="Pipe:JuncSteelCyl4InnerR + 0.01*mm"/>
+          <position z="Pipe:JuncSteelCyl4Z/2+30*mm/2"/>
+        </shape>
+      </volume>
+
+      <volume name="lvPipeJunctionBeforeVeloVacuum" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="BooleanShape" operation="union" name="PipeJuncB4VeloVacuumUnion">
+          <shape type="Tube" name="JuncVacuumCyl4"
+                 dz="0.5*Pipe:JuncSteelCyl4Z"
+                 rmax="Pipe:JuncSteelCyl4InnerR"
+                 rmin="0*mm"/>
+          <shape type="ConeSegment" name="JuncVacuumCone"
+                 dz="0.5*30*mm"
+                 rmin2="0*mm"
+                 rmin1="0*mm"
+                 rmax2="(35*(38-27)/65)*mm+27*mm"
+                 rmax1="(35*(40-29)/65)*mm+29*mm"/>
+          <position z="Pipe:JuncSteelCyl4Z/2+30*mm/2"/>
+        </shape>
+      </volume>
+
+      <!-- This is a temporay volume to join velo to upstream beam pipe -->
+      <volume name="lvPipeJunctionBeforeVeloCuPipe" material="Copper" vis="Pipe:BeforeMagnet">
+        <shape type="Tube" name="JuncCuPipe"
+               dz="0.5*14*mm"      rmin="39.9*mm"       rmax="40*mm"/>
+      </volume>
+      <volume name="lvPipeJunctionBeforeVeloVacuumPipe" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="Tube" name="JuncVacPipe"
+               dz="0.5*14*mm"      rmin="0*mm"          rmax="39.9*mm"/>
+      </volume>
+      <!-- Assembly volume  -->
+      <volume name="lvPipeJunctionBeforeVelo" vis="Pipe:BeforeMagnet">
+        <physvol name="pvPipeJunctionB4VeloSteel"       volume="lvPipeJunctionBeforeVeloSteel" >
+        </physvol>
+        <physvol name="pvPipeJunctionB4VeloVacuum"      volume="lvPipeJunctionBeforeVeloVacuum" >
+        </physvol>
+        <physvol name="pvPipeJunctionB4VeloCuPipe"      volume="lvPipeJunctionBeforeVeloCuPipe" >
+          <position z="-Pipe:JuncSteelCyl4Z/2-14*mm/2"/>
+        </physvol>
+        <physvol name="pvPipeJunctionB4VeloVacPipe"     volume="lvPipeJunctionBeforeVeloVacuumPipe" >
+          <position z="-Pipe:JuncSteelCyl4Z/2-14*mm/2"/>
+        </physvol>
+      </volume>
+
+      <envelope type="Assembly" name="lvPipeBeforeVelo" vis="Pipe:BeforeMagnet">
+        <physvol name="pvPipeJunctionBeforeVelo"       volume="lvPipeJunctionBeforeVelo" >
+          <position z="-885*mm+20*mm/2"/>
+        </physvol>
+      </envelope>
+
+      <comment> Pipe position before in the region  </comment>
+      <position/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/BeforeVelo-Support.xml b/compact/components/Pipe/2025-v00.00/BeforeVelo-Support.xml
new file mode 100644
index 000000000..073abee57
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/BeforeVelo-Support.xml
@@ -0,0 +1,579 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Pipe in the BeforeMagnetRegion area                -->
+<!--===========================================================================-->
+<lccdd>
+
+  <detectors>
+    <detector name="PipeBeforeVeloSupFix" type="DD4hep_VolumeAssembly" parent="${PipeBeforeVelo:parent}" vis="Pipe:Vis">
+
+      <!-- Fixed Pipe Support -->
+
+      <!-- Large plate -->
+      <volume name="lvPipeSupBefVeloRec1" material="Pipe:Al6082" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="subtraction" name="PipeSupBefVeloRec1Sub">
+	  <shape type="Box" name="PipeSupBefVeloRec1"
+		 dx="0.5*PipeSupBefVeloRec1X"
+		 dy="0.5*PipeSupBefVeloRec1Y"
+		 dz="0.5*PipeSupBefVeloRec1Z"/>
+	  <shape type="Tube" name="PipeSupBefVeloRec1Hole"
+		 dz="0.5*PipeSupBefVeloRec1Z+0.2*mm"
+		 rmin="0.0*mm"
+		 rmax="PipeSupBefVeloRec1HoleRad"/>
+	</shape>
+      </volume>
+
+      <!-- Small plate -->
+      <volume name="lvPipeSupBefVeloRec2" material="Pipe:Al6082" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="subtraction" name="PipeSupBefVeloRec2Sub">
+	  <shape type="Box" name="PipeSupBefVeloRec2"
+		 dx="0.5*PipeSupBefVeloRec2X"
+		 dy="0.5*PipeSupBefVeloRec2Y"
+		 dz="0.5*PipeSupBefVeloRec2Z"/>
+	  <shape type="Tube" name="PipeSupBefVeloRec2Hole"
+		 dz="0.5*PipeSupBefVeloRec2Z+0.2*mm"
+		 rmin="0.0*mm"
+		 rmax="PipeSupBefVeloRec2HoleRad"/>
+	</shape>
+      </volume>
+      <envelope type="Assembly"  name="lvPipeSupBefVelo" vis="Pipe:BeforeVelo">
+	<physvol name="pvPipeSupBefVeloRec1"             volume="lvPipeSupBefVeloRec1">
+	</physvol>
+	<physvol name="pvPipeSupBefVeloRec2"             volume="lvPipeSupBefVeloRec2">
+	  <position z="PipeSupBefVeloRec1Z/2 + PipeSupBefVeloRec2Z/2"/>
+	</physvol>
+      </envelope>
+
+      <comment> Pipe position in the region  </comment>
+      <position z="-2164.5*mm + Regions:BeforeMagnetZSize/2 - Regions:BeforeVeloZSize/2"/>
+
+    </detector>
+
+<comment>
+What is this ? Looks like a VMA warm module ....
+
+    <detector name="PipeBeforeVeloSupMobile" type="DD4hep_VolumeAssembly" parent="${PipeBeforeVelo:parent}" vis="Pipe:Vis">
+
+      <!-- End pieces of bellows -->
+      <volume name="lvMobSupEntryUp" material="Pipe:Steel316LN" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="union" name="MobSupEntryUpSub">
+	  <shape type="Tube" name="MobSupEntryUpCyl"
+		 dz="0.5*MobSupEntryUpCylZ"
+		 rmin="MobSupEntryRad"
+		 rmax="MobSupEntryRad+MobSupEntryThick"/>
+
+	  <shape type="ConeSegment" name="MobSupEntryUpCons"
+		 dz="0.5*MobSupEntryConsZ"
+		 rmin1="MobSupEntryRad"
+		 rmin2="MobSupEntryConsRadEnd"
+		 rmax1="MobSupEntryRad+MobSupEntryThick"
+		 rmax2="MobSupEntryConsRadEnd+MobSupEntryThick"/>
+	  <position z="MobSupEntryUpCylZ/2+MobSupEntryConsZ/2"/>
+	</shape>
+      </volume>
+
+      <volume name="lvMobSupEntryDown" material="Pipe:Steel316LN" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="union" name="MobSupEntryDownSub">
+	  <shape type="Tube" name="MobSupEntryDownCyl"
+		 dz="0.5*MobSupEntryDownCylZ"
+		 rmin="MobSupEntryRad"
+		 rmax="MobSupEntryRad+MobSupEntryThick"/>
+
+	  <shape type="ConeSegment" name="MobSupEntryDownCons"
+		 dz="0.5*MobSupEntryConsZ"
+		 rmin2="MobSupEntryRad"
+		 rmin1="MobSupEntryConsRadEnd"
+		 rmax2="MobSupEntryRad+MobSupEntryThick"
+		 rmax1="MobSupEntryConsRadEnd+MobSupEntryThick"/>
+	  <position z="-MobSupEntryDownCylZ/2-MobSupEntryConsZ/2"/>
+	</shape>
+      </volume>
+
+      <!-- Bellows -->
+      <volume name="lvMobSupBellow" material="Pipe:Steel316LN" vis="Pipe:Support">
+	<shape type="Polycone" name="MobSupBellowPolyCone">
+	  <zplane z="-MobSupBellowZ/2"
+		  rmin="MobSupEntryConsRadEnd"
+		  rmax="MobSupEntryConsRadEnd+MobSupBellowThick"/>
+	  <zplane z="-MobSupBellowZ/2+MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch/2-MobSupBellowZ/2-MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch/2-MobSupBellowZ/2+MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*2/2-MobSupBellowZ/2-MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*2/2-MobSupBellowZ/2+MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*3/2-MobSupBellowZ/2-MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*3/2-MobSupBellowZ/2+MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*4/2-MobSupBellowZ/2-MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*4/2-MobSupBellowZ/2+MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*5/2-MobSupBellowZ/2-MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*5/2-MobSupBellowZ/2+MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*5/2-MobSupBellowZ/2+MobSupBellowCyl1Z-MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*5/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*6/2-MobSupBellowZ/2+MobSupBellowCyl1Z-MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*6/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*7/2-MobSupBellowZ/2+MobSupBellowCyl1Z-MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*7/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*8/2-MobSupBellowZ/2+MobSupBellowCyl1Z-MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*8/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*8/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*8/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*9/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*9/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*10/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*10/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*11/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*11/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*12/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
+		  rmin="MobSupBellowOuterRad"
+		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*12/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+
+	  <zplane z="MobSupBellowPitch*13/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
+		  rmin="MobSupBellowInnerRad"
+		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
+	  <zplane z="MobSupBellowPitch*13/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z"
+		  rmin="MobSupEntryConsRadEnd"
+		  rmax="MobSupEntryConsRadEnd+MobSupBellowThick"/>
+	</shape>
+      </volume>
+
+
+      <!-- Upstream Flange -->
+      <volume name="lvMobSupFlangeUp" material="Pipe:Steel316LN" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="subtraction" name="MobSupFlangeUpSub">
+	  <shape type="Tube" name="MobSupFlangeUpCyl"
+		 dz="0.5*MobSupFlangeUpCylZ"
+		 rmin="MobSupFlangeUpCylRad"
+		 rmax="MobSupFlangeUpCylRad+MobSupFlangeUpThick"/>
+	  <shape type="Tube" name="MobSupFlangeUpCylSub"
+		 dz="0.5*MobSupFlangeUpCylSubZ"
+		 rmin="0.0*mm"
+		 rmax="MobSupFlangeUpCylSubRad"/>
+	  <position z="MobSupFlangeUpCylSubZ/2-MobSupFlangeUpCylZ/2"/>
+	</shape>
+
+      </volume>
+
+      <!-- Downstream Flange -->
+      <volume name="lvMobSupFlangeDown" material="Pipe:Steel316LN" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="subtraction" name="MobSupFlangeDownSub">
+	  <shape type="Tube" name="MobSupFlangeDownCyl"
+		 dz="0.5*MobSupFlangeDownCylZ"
+		 rmin="MobSupFlangeDownCylRad"
+		 rmax="MobSupFlangeDownCylRad+MobSupFlangeDownThick"/>
+	  <shape type="Tube" name="MobSupFlangeDownCylSub"
+		 dz="0.5*MobSupFlangeDownCylSubZ+0.02*mm"
+		 rmin="0.0*mm"
+		 rmax="MobSupFlangeDownCylSubRad"/>
+	  <position z="-MobSupFlangeDownCylSubZ/2+MobSupFlangeDownCylZ/2+0.01*mm"/>
+	</shape>
+      </volume>
+
+      <!-- Transition tube and mount -->
+      <volume name="lvMobSupTransTubeComplete" vis="Pipe:Support">
+	<physvol name="pvMobSupTransTube"
+		 volume="lvMobSupTransTube">
+	</physvol>
+	<physvol name="pvMobSupTransTubeFlange"
+		 volume="lvMobSupTransTubeFlange">
+	  <position z="-MobSupTransTubeCylZ/2+MobSupTransTubeFlangeZ/2"/>
+	</physvol>
+      </volume>
+
+      <!-- Transition Tube -->
+      <volume name="lvMobSupTransTube" material="Pipe:CuOFE" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="union" name="TransTubeUnion">
+	  <shape type="Tube" name="TransTubeCyl"
+		 dz="0.5*MobSupTransTubeCylZ"
+		 rmin="MobSupTransTubeRad"
+		 rmax="MobSupTransTubeRad+MobSupTransTubeThick"/>
+	  <shape type="ConeSegment" name="TransTubeCons"
+		 dz="0.5*MobSupTransTubeConsZ"
+		 rmin1="MobSupTransTubeRad"
+		 rmin2="MobSupTransTubeConsRad"
+		 rmax1="MobSupTransTubeRad+MobSupTransTubeThick"
+		 rmax2="MobSupTransTubeConsRad+MobSupTransTubeThick"/>
+	  <position z="MobSupTransTubeCylZ/2-MobSupTransTubeConsZ/2"/>
+	</shape>
+      </volume>
+
+      <!-- Transition mount -->
+      <volume name="lvMobSupTransTubeFlange" material="Pipe:CuOFE" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="union" name="TransTubeFlangeUnion">
+	  <shape type="Tube" name="TransTubeFlange"
+		 dz="0.5*MobSupTransTubeFlangeZ"
+		 rmin="MobSupTransTubeRad+MobSupTransTubeThick+MobSupTransTubeFlangeInnerThick+0.01*mm"
+		 rmax="MobSupTransTubeRad+MobSupTransTubeThick+MobSupTransTubeFlangeInnerThick+MobSupTransTubeFlangeThick"/>
+	  <shape type="Tube" name="TransTubeFlangeLedge"
+		 dz="0.5*MobSupTransTubeFlangeInnerZ"
+		 rmin="MobSupTransTubeRad+MobSupTransTubeThick"
+		 rmax="MobSupTransTubeRad+MobSupTransTubeThick+MobSupTransTubeFlangeInnerThick"/>
+	  <position z="MobSupTransTubeFlangeInnerZ/2-MobSupTransTubeFlangeZ/2"/>
+	</shape>
+      </volume>
+
+      <!-- RF Contact ring -->
+      <volume name="lvMobSupRfContactRing" vis="Pipe:Support">
+	<physvol name="pvMobSupRfContact1"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="0*360*degree / 48 + 90*degree"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact2"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="1*360*degree / 48 + 90*degree"/>
+	  <rotation z="1*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact3"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="2*360*degree / 48 + 90*degree"/>
+	  <rotation z="2*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact4"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="3*360*degree / 48 + 90*degree"/>
+	  <rotation z="3*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact5"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="4*360*degree / 48 + 90*degree"/>
+	  <rotation z="4*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact6"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="5*360*degree / 48 + 90*degree"/>
+	  <rotation z="5*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact7"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="6*360*degree / 48 + 90*degree"/>
+	  <rotation z="6*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact8"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="7*360*degree / 48 + 90*degree"/>
+	  <rotation z="7*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact9"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="8*360*degree / 48 + 90*degree"/>
+	  <rotation z="8*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact10"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="9*360*degree / 48 + 90*degree"/>
+	  <rotation z="9*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact11"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="10*360*degree / 48 + 90*degree"/>
+	  <rotation z="10*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact12"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="11*360*degree / 48 + 90*degree"/>
+	  <rotation z="11*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact13"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="12*360*degree / 48 + 90*degree"/>
+	  <rotation z="12*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact14"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="13*360*degree / 48 + 90*degree"/>
+	  <rotation z="13*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact15"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="14*360*degree / 48 + 90*degree"/>
+	  <rotation z="14*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact16"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="15*360*degree / 48 + 90*degree"/>
+	  <rotation z="15*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact17"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="16*360*degree / 48 + 90*degree"/>
+	  <rotation z="16*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact18"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="17*360*degree / 48 + 90*degree"/>
+	  <rotation z="17*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact19"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="18*360*degree / 48 + 90*degree"/>
+	  <rotation z="18*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact20"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="19*360*degree / 48 + 90*degree"/>
+	  <rotation z="19*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact21"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="20*360*degree / 48 + 90*degree"/>
+	  <rotation z="20*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact22"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="21*360*degree / 48 + 90*degree"/>
+	  <rotation z="21*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact23"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="22*360*degree / 48 + 90*degree"/>
+	  <rotation z="22*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact24"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="23*360*degree / 48 + 90*degree"/>
+	  <rotation z="23*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact25"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="24*360*degree / 48 + 90*degree"/>
+	  <rotation z="24*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact26"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="25*360*degree / 48 + 90*degree"/>
+	  <rotation z="25*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact27"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="26*360*degree / 48 + 90*degree"/>
+	  <rotation z="26*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact28"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="27*360*degree / 48 + 90*degree"/>
+	  <rotation z="27*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact29"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="28*360*degree / 48 + 90*degree"/>
+	  <rotation z="28*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact30"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="29*360*degree / 48 + 90*degree"/>
+	  <rotation z="29*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact31"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="30*360*degree / 48 + 90*degree"/>
+	  <rotation z="30*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact32"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="31*360*degree / 48 + 90*degree"/>
+	  <rotation z="31*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact33"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="32*360*degree / 48 + 90*degree"/>
+	  <rotation z="32*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact34"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="33*360*degree / 48 + 90*degree"/>
+	  <rotation z="33*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact35"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="34*360*degree / 48 + 90*degree"/>
+	  <rotation z="34*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact36"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="35*360*degree / 48 + 90*degree"/>
+	  <rotation z="35*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact37"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="36*360*degree / 48 + 90*degree"/>
+	  <rotation z="36*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact38"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="37*360*degree / 48 + 90*degree"/>
+	  <rotation z="37*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact39"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="38*360*degree / 48 + 90*degree"/>
+	  <rotation z="38*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact40"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="39*360*degree / 48 + 90*degree"/>
+	  <rotation z="39*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact41"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="40*360*degree / 48 + 90*degree"/>
+	  <rotation z="40*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact42"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="41*360*degree / 48 + 90*degree"/>
+	  <rotation z="41*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact43"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="42*360*degree / 48 + 90*degree"/>
+	  <rotation z="42*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact44"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ  phi="43*360*degree / 48 + 90*degree"/>
+	  <rotation z="43*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact45"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ phi="44*360*degree / 48 + 90*degree"/>
+	  <rotation z="44*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact46"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ phi="45*360*degree / 48 + 90*degree"/>
+	  <rotation z="45*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact47"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ phi="46*360*degree / 48 + 90*degree"/>
+	  <rotation z="46*360*degree / 48"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact48"		 volume="lvMobSupRfContSingle">
+	  <positionRPhiZ phi="47*360*degree / 48 + 90*degree"/>
+	  <rotation z="47*360*degree / 48"/>
+	</physvol>
+      </volume>
+
+      <!-- RF contact mount -->
+      <volume name="lvMobSupRfContMount" material="Pipe:CuOFE" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="union" name="MobSupRfContUnion">
+	  <shape type="Tube" name="MobSupRfContCyl"
+		 dz="0.5*MobSupRfContactCylZ"
+		 rmin="MobSupRfContactRad"
+		 rmax="MobSupRfContactRad+MobSupRfContactThick"/>
+	  <shape type="Tube" name="MobSupRfContactFlange"
+		 dz="0.5*MobSupRfContactFlangeZ"
+		 rmin="MobSupRfContactRad+MobSupRfContactThick+0.01*mm"
+		 rmax="MobSupRfContactRad+MobSupRfContactThick+MobSupRfContactFlangeThick"/>
+	  <position z="MobSupRfContactCylZ/2-MobSupRfContactFlangeZ/2"/>
+	</shape>
+      </volume>
+
+      <!-- RF single contact -->
+      <volume name="lvMobSupRfContSingle" material="Pipe:CuBe17410" vis="Pipe:Support">
+	<shape type="BooleanShape" operation="union" name="MobSupRfContSingleUnion">
+	  <shape type="Tube" name="MobSupRfContSinglePlate"
+		 dz="0.5*MobSupRfContSinglePlateZ"
+		 rmin="MobSupRfContactRad - MobSupRfContSingleThick"
+		 rmax="MobSupRfContactRad"
+		 startPhiAngle="-360*degree / 96 + 90*degree"
+		 deltaPhiAngle="360*degree / 48"/>
+	  <shape type="Box" name="MobSupRfContSingleArm"
+		 dx="0.5*MobSupRfContSingleX"
+		 dy="0.5*MobSupRfContSingleThick"
+		 dz="0.5*MobSupRfContSingleArmZ"/>
+	  <position y="MobSupRfContSingleArmPosY" z="MobSupRfContSingleArmPosZ"/>
+	  <rotation x="MobSupRfContSingleArmAng"/>
+	  <shape type="Box" name="MobSupRfContSingleEnd"
+		 dx="0.5*MobSupRfContSingleX"
+		 dy="0.5*MobSupRfContSingleThick"
+		 dz="0.5*MobSupRfContSingleEndZ"/>
+	  <position y="MobSupRfContSingleEndPosY" z="MobSupRfContSingleEndPosZ"/>
+	  <rotation x="MobSupRfContSingleEndAng"/>
+	</shape>
+      </volume>
+
+      <!-- RF Contact -->
+      <volume name="lvMobSupRfContact" vis="Pipe:Support">
+	<physvol name="pvMobSupRfContMount"		 volume="lvMobSupRfContMount">
+	</physvol>
+	<physvol name="pvMobSupRfContactRing"		 volume="lvMobSupRfContactRing">
+	  <position z="MobSupRfContactCylZ/2-MobSupRfContSinglePlateZ/2-1*mm"/>
+	</physvol>
+      </volume>
+
+      <!-- Vacuum -->
+      <volume name="lvMobSupVacuum" material="Vacuum" vis="Pipe:Vacuum">
+	<shape type="Tube" name="MobSupVacuumCyl"
+               dz="0.5*MobSupFullZ"
+               rmin="0.0*mm"
+               rmax="MobSupVacuumRad"/>
+      </volume>
+
+      <!-- Mobile Support -->
+      <envelope type="Assembly"  name="lvPipeMobileSupport" vis="Pipe:BeforeVelo">
+	<physvol name="pvMobSupEntryUp"             volume="lvMobSupEntryUp">
+	  <position z="MobSupEntryUpPosZ"/>
+	</physvol>
+	<physvol name="pvMobSupFlangeUp"            volume="lvMobSupFlangeUp">
+	  <position z="MobSupFlangeUpPosZ"/>
+	</physvol>
+
+	<physvol name="pvMobSupTransTubeComplete"   volume="lvMobSupTransTubeComplete">
+	  <position z="MobSupTransTubePosZ"/>
+	</physvol>
+	<physvol name="pvMobSupBellow"              volume="lvMobSupBellow">
+	  <position z="MobSupBellowPosZ"/>
+	</physvol>
+	<physvol name="pvMobSupRfContact"           volume="lvMobSupRfContact">
+	  <position z="MobSupRfContactPosZ"/>
+	</physvol>
+
+	<physvol name="pvMobSupEntryDown"           volume="lvMobSupEntryDown">
+	  <position z="MobSupEntryDownPosZ"/>
+	</physvol>
+	<physvol name="pvMobSupFlangeDown"          volume="lvMobSupFlangeDown">
+	  <position z="MobSupFlangeDownPosZ"/>
+	</physvol>
+	<physvol name="pvMobSupVacuum"              volume="lvMobSupVacuum"/>
+      </envelope>
+
+      <comment> Pipe position in the region  </comment>
+      <position z="-2164.5*mm + BeforeMagnetZSize/2 - BeforeVeloZSize/2"/>
+
+    </detector>
+</comment>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/BeforeVelo.xml b/compact/components/Pipe/2025-v00.00/BeforeVelo.xml
new file mode 100644
index 000000000..5bfc5ecb8
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/BeforeVelo.xml
@@ -0,0 +1,69 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Pipe in the BeforeMagnetRegion area                -->
+<!--===========================================================================-->
+<lccdd>
+
+  <detectors>
+    <detector name="PipeBeforeVelo" type="DD4hep_VolumeAssembly" parent="${PipeBeforeVelo:parent}" vis="Pipe:Vis">
+      <!-- ************************************************************** -->
+      <!-- * BEAM PIPE                                                  * -->
+      <!-- * Sections in BeforeMagnetRegion                             * -->
+      <!-- *   from z=-2700 mm to z=-1079 mm                        * -->
+      <!-- *                                                            * -->
+      <!-- * UX85-1 in TT                                               * -->
+      <!-- *                                                            * -->
+      <!-- * Author: Magnus Lieng                                       * -->
+      <!-- *                                                            * -->
+      <!-- * Consists of:                                               * -->
+      <!-- *     - cylindrical section of 41 mm diameter                * -->
+      <!-- *     - cylindrical section of 76 mm diameter                * -->
+      <!-- *   and corresponding vaccum sections                        * -->
+      <!-- ************************************************************** -->
+
+      <include ref="BeforeVelo-Support.xml"/>
+
+      <!-- UX84 Cylinder of 40 mm radius -->
+      <volume name="lvUX842Cyl" vis="Pipe:BeforeVelo" material="Pipe:CuOFE">
+        <shape type="Tube" name="shape-UX84-2-Cylinder"
+               dz="0.5*UX842CylLength"         rmin="UX842CylRadius"      rmax="UX842CylRadius+UX842CylThick"/>
+      </volume>
+      <!-- Vacuum in UX84Cyl -->
+      <volume name="lvUX842Vacuum" vis="Pipe:Vacuum" material="Vacuum">
+        <shape type="Tube" name="shape-UX84-2-Vacuum"
+               dz="0.5*UX842CylLength"         rmax="UX842CylRadius"/>
+      </volume>
+      <!-- UX84 Flange of 76 mm radius -->
+      <volume name="lvUX84FlangeDown" vis="Pipe:BeforeVelo" material="Pipe:Steel316LN">
+        <shape type="Tube" name="shape-UX84-FlangeDown"
+              dz="0.5*UX84FlangeDownLength"
+              rmin="UX84FlangeDownRadius"
+              rmax="UX84FlangeDownRadius+UX84FlangeDownThick"/>
+      </volume>
+      <!-- Whole section: combination of sections -->
+      <envelope type="Assembly" name="lvUX84BeforeVelo" vis="Pipe:BeforeVelo">
+        <!-- Pipes of Cu -->
+        <physvol name="pvUX842Cyl"              volume="lvUX842Cyl"/>
+        <!-- Now the vacuum inside -->
+        <physvol name="pvUX842Vacuum"           volume="lvUX842Vacuum"/>
+        <!-- Flange of Steel -->
+        <physvol name="pvUX84FlangeDown"        volume="lvUX84FlangeDown">
+          <position z="UX84FlangeDownPosZ"/>
+        </physvol>
+      </envelope>
+
+      <comment> Pipe position in the region  </comment>
+      <position z="-1889.5*mm + Regions:BeforeMagnetZSize/2 - Regions:BeforeVeloZSize/2"/>
+
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/DebugDummies.xml b/compact/components/Pipe/2025-v00.00/DebugDummies.xml
new file mode 100644
index 000000000..54e03ddf6
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/DebugDummies.xml
@@ -0,0 +1,61 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<lccdd>
+  <define>
+    <!-- UT Geometry parameters -->
+    <constant name="UTFrameOuterWidth"    value="2586*mm"/>
+    <constant name="UTFrameOuterHeight"   value="2628*mm"/>
+    <constant name="UTBoxOuterThickness"  value="430.0*mm"/>
+    <constant name="UTSystemZ"            value="2485*mm"/>
+    <constant name="Rich1MasterXSize" value="2.50*m" />
+    <constant name="Rich1MasterYSize" value="5.0*m" />
+    <constant name="Rich1MasterZSize" value="2.30*m" />
+  </define>
+
+  <!-- Positions imported from BeforeMagnet/geometry.xml  -->
+  <detectors>
+    <!-- Dummy VP to support VP beampipe   -->
+    <detector name="VP" type="DD4hep_VolumeAssembly" parent="${VP:parent}" vis="LightGrey">
+      <envelope name="lvVP" vis="LightGrey" material="Air">
+        <shape type="BooleanShape" operation="union" name="VeloUnion">
+          <shape type="Tube" name="VeloTubs1"
+                 dz="VP:VeloZ/2"
+                 rmax="VP:VeloRad"/>
+          <shape type="Tube" name="VeloTubs2"
+                 dz="VP:VeloDSEndDeltaZ/2"
+                 rmax="VP:VeloRad"/>
+          <position z="VP:VeloDSEndStartZ+VP:VeloDSEndDeltaZ/2"/>
+          <shape type="Tube" name="VeloTubs3"
+                 dz="(VP:VeloEWFlangeZExcess+2*mm)/2"
+                 rmax="VP:vTankDownEWFlangeOR+2*mm"
+                 rmin="VP:vTankDownEWFlangeIR-2*mm"/>
+          <position z="VP:VeloDSEndStartZ+VP:VeloDSEndDeltaZ+(VP:VeloEWFlangeZExcess+2*mm)/2"/>
+        </shape>
+      </envelope>
+      <position z="0*mm"/>
+    </detector>
+    <!-- Dummy UT to support UT beampipe   -->
+    <detector name="UT" type="DD4hep_VolumeAssembly" parent="${UT:parent}" vis="LightGrey">
+      <envelope type="Box" vis="LightGrey" material="Air"
+                dx="UTFrameOuterWidth/2" dy="UTFrameOuterHeight/2" dz="UTBoxOuterThickness/2"/>
+      <position z="2495*mm"/>
+    </detector>
+    <!-- Dummy Rich1 to support Rich1 beampipe   -->
+    <detector name="Rich1" type="DD4hep_VolumeAssembly" parent="${Rich1:parent}" vis="LightGrey">
+      <envelope name="lvRich1Master" type="Box" vis="LightGrey" material="Air"
+                dx="Rich1MasterXSize/2" dy="Rich1MasterYSize/2" dz="Rich1MasterZSize/2"/>
+      <position z="1500*mm"/>
+    </detector>
+
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-Bakeout.xml b/compact/components/Pipe/2025-v00.00/Downstream-Bakeout.xml
new file mode 100644
index 000000000..25423beb5
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Downstream-Bakeout.xml
@@ -0,0 +1,94 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--=============================Downstream bakeout============================-->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+
+    <!--==================================================================================-->
+    <!--===================================Bakeout========================================-->
+    <!--==================================================================================-->
+    <detector name="DownstreamPipeBakeout" type="DD4hep_VolumeAssembly" parent="${PipeDownstream:parent}" vis="Pipe:Vis">
+
+      <!-- UX85-4 bakeout -->
+      <volume name="lvUX854Bakeout" material="Pipe:BakeOutAerogel" vis="Pipe:Bakeout">
+	<shape type="ConeSegment" name="UX85-4-Bakeout-Downstream"
+               dz="0.5*UX854BakeoutLenght"
+               rmin1="UX854BakeoutRadiusZmin"
+               rmin2="UX854BakeoutRadiusZmax"
+               rmax1="UX854BakeoutRadiusZmin + UX854BakeoutThick"
+               rmax2="UX854BakeoutRadiusZmax + UX854BakeoutThick"/>
+
+      </volume>
+
+      <!-- UX85-4 Win05 bakeout -->
+      <volume name="lvUX854Win05BakeoutMain" material="Pipe:BakeOutAerogel" vis="Pipe:Bakeout">
+	<shape type="BooleanShape" operation="subtraction" name="UX854Win05BakeoutSub">
+	  <shape type="ConeSegment" name="UX85-4-WindowBakeout15degree-05"
+		 dz="0.5*UX854Win05BakeoutLenght"
+		 rmin1="UX854Win05BakeoutRadiusZmin"
+		 rmin2="UX854Win05BakeoutRadiusZmax"
+		 rmax1="UX854Win05BakeoutRadiusZmin + UX854Win05BakeoutThick"
+		 rmax2="UX854Win05BakeoutRadiusZmax + UX854Win05BakeoutThick"/>
+	  <shape type="Tube" name="UX85-4-Win05Bakeout-Hole-1"
+		 dz="0.5*UX854Win05BakeoutHole1Length"
+		 rmax="UX854Win05BakeoutHole1Radius"/>
+	  <transformation>
+	    <position z="UX854Win05BakeoutHole1PosZ"/>
+	    <rotation x="UX854Win05BakeoutHole1RotX"/>
+	    <position/>
+	    <rotation z="UX854Win05BakeoutHole1RotZ"/>
+	    <posRPhiZ r="UX854Win05BakeoutHole1PosR" phi="UX854Win05BakeoutHole1PosPhi"/>
+	  </transformation>
+	  <shape type="Tube" name="UX85-4-Win05Bakeout-Hole-2"
+		 dz="0.5*UX854Win05BakeoutHole2Length"
+		 rmax="UX854Win05BakeoutHole2Radius"/>
+	  <transformation>
+	    <position/>
+	    <rotation x="UX854Win05BakeoutHole2RotX"/>
+	    <position y="UX854Win05BakeoutHole2PosY" z="UX854Win05BakeoutHole2PosZ"/>
+	  </transformation>
+	  <shape type="Tube" name="UX85-4-Win05Bakeout-Hole-3"
+		 dz="0.5*UX854Win05BakeoutHole3Length"
+		 rmax="UX854Win05BakeoutHole3Radius"/>
+	  <transformation>
+	    <position/>
+	    <rotation y="UX854Win05BakeoutHole3RotY"/>
+	    <position x="UX854Win05BakeoutHole3PosX" z="UX854Win05BakeoutHole3PosZ"/>
+	  </transformation>
+	  <shape type="Tube" name="UX85-4-Win05Bakeout-Hole-4"
+		 dz="0.5*UX854Win05BakeoutHole4Length"
+		 rmax="UX854Win05BakeoutHole4Radius"/>
+	  <transformation>
+	    <position/>
+	    <rotation y="UX854Win05BakeoutHole4RotY"/>
+	    <position x="UX854Win05BakeoutHole4PosX" z="UX854Win05BakeoutHole4PosZ"/>
+	  </transformation>
+	</shape>
+      </volume>
+
+      <envelope type="Assembly" name="lvUX85BakeoutDownstream" vis="Pipe:Vis">
+	<physvol name="pvUX854Bakeout"              volume="lvUX854Bakeout">
+	  <position z="UX854BakeoutZPos"/>
+	</physvol>
+	<physvol name="pvUX854Win05BakeoutMain"    volume="lvUX854Win05BakeoutMain">
+	  <position z="UX854Win05BakeoutZpos"/>
+	</physvol>
+      </envelope>
+      <position z="UX853Rich2DownSplitZposIP - Regions:DownstreamZPos"/>
+      <nodebug/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-BakeoutParams.xml b/compact/components/Pipe/2025-v00.00/Downstream-BakeoutParams.xml
new file mode 100644
index 000000000..8a2782d51
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Downstream-BakeoutParams.xml
@@ -0,0 +1,107 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+
+  <define>
+
+
+    <!-- ***************************************************************** -->
+    <!-- *  BeamPipe bakeout geometry parameters                         * -->
+    <!-- *                                                               * -->
+    <!-- *  Date: 2006-03-20                                             * -->
+    <!-- *  Author: Gloria Corti                                         * -->
+    <!-- *  Modified by Daria Savrina, Oct. 2008 to include bakeout      * -->
+    <!-- *  around the end window and switch off part under M1, ECAL     * -->
+    <!-- *  as installed                                                 * -->
+    <!-- *                                                               * -->
+    <!-- ***************************************************************** -->
+
+
+    <!-- UX85-4 bakeout -->
+    <constant  name="UX854BakeoutStartIP"
+               value="UX854ZStartIP + UX854Flange01Lenght"/>
+    <constant  name="UX854BakeoutLenght"
+               value="UX854Cone02Lenght + UX854Cone03Lenght + UX854Cone04Lenght"/>
+    <constant  name="UX854BakeoutDeltaPipeInner"      value="4.00*mm + 0.10*mm"/>
+    <constant  name="UX854BakeoutRadiusZmin"
+               value="UX854BakeoutStartIP * tan(UX851to4Angle)
+                      + UX854BakeoutDeltaPipeInner"/>
+    <constant  name="UX854BakeoutRadiusZmax"
+               value="(UX854BakeoutStartIP + UX854BakeoutLenght)*
+                      tan(UX851to4Angle) + UX854BakeoutDeltaPipeInner"/>
+    <constant  name="UX854BakeoutThick"               value="10.00*mm"/>
+    <constant  name="UX854BakeoutZPos"
+               value="UX853DownstreamLenght + UX85C13100Lenght + UX854Flange01Lenght + 0.5*UX854BakeoutLenght"/>
+
+    <!-- UX85-4 Win05 bakeout -->
+    <constant name="UX854Win05BakeoutLenght"        value="599.00*mm"/>
+    <constant name="UX854Win05BakeoutRadiusZmin"    value="UX854Win05RadiusZmin + UX854Win05Thick"/>
+    <constant name="UX854Win05BakeoutRadiusZmax"    value="UX854Win05RadiusZmax + UX854Win05Thick"/>
+    <constant name="UX854Win05BakeoutThick"         value="10.00*mm"/>
+    <constant name="UX854Win05BakeoutZpos"
+              value="UX853DownstreamLenght + UX85C13100Lenght + UX854Flange01Lenght + UX854BakeoutLenght + 0.5*UX854Win05BakeoutLenght"/>
+
+    <constant name="UX854Win05BakeoutHole1Length"   value="300.0*mm"/>
+    <constant name="UX854Win05BakeoutHole1Radius"   value="19.0*mm + UX854Win05Pipe1Thick"/>
+    <constant name="UX854Win05BakeoutHole1PosZ"     value="-119.0*mm"/>
+    <constant name="UX854Win05BakeoutHole1RotX"     value="-15.0*degree"/>
+    <constant name="UX854Win05BakeoutHole1RotZ"     value="45.0*degree"/>
+    <constant name="UX854Win05BakeoutHole1PosR"     value="145.3*mm"/>
+    <constant name="UX854Win05BakeoutHole1PosPhi"   value="135.0*degree"/>
+
+    <constant name="UX854Win05BakeoutHole2Length"   value="100.0*mm"/>
+    <constant name="UX854Win05BakeoutHole2Radius"   value="31.75*mm + UX854Win05Pipe2Thick"/>
+    <constant name="UX854Win05BakeoutHole2RotX"     value="90.0*degree"/>
+    <constant name="UX854Win05BakeoutHole2PosY"     value="95.0*mm"/>
+    <constant name="UX854Win05BakeoutHole2PosZ"     value="69.0*mm"/>
+
+    <constant name="UX854Win05BakeoutHole3Length"   value="300.0*mm"/>
+    <constant name="UX854Win05BakeoutHole3Radius"   value="30.0*mm + UX854Win05Pipe3Thick"/>
+    <constant name="UX854Win05BakeoutHole3RotY"     value="-20.0*degree"/>
+    <constant name="UX854Win05BakeoutHole3PosX"     value="-122.0*mm"/>
+    <constant name="UX854Win05BakeoutHole3PosZ"     value="-32.76*mm"/>
+
+    <constant name="UX854Win05BakeoutHole4Length"   value="200.0*mm"/>
+    <constant name="UX854Win05BakeoutHole4Radius"   value="9.5*mm + UX854Win05Pipe4Thick"/>
+    <constant name="UX854Win05BakeoutHole4RotY"     value="45.0*degree"/>
+    <constant name="UX854Win05BakeoutHole4PosX"     value="64.0*mm"/>
+    <constant name="UX854Win05BakeoutHole4PosZ"     value="191.6*mm"/>
+
+    <constant name="UX854Win05BakeoutPipeExtra"     value="50.0*mm"/> <!-- To accomodate cuts -->
+
+    <constant name="UX854Win05BakeoutPipe1BasicLength"   value="226.7*mm"/>
+    <constant name="UX854Win05BakeoutPipe1Length"   value="UX854Win05BakeoutPipe1BasicLength + UX854Win05BakeoutPipeExtra"/>
+    <constant name="UX854Win05BakeoutPipe1Thick"    value="10.0*mm"/>
+
+    <constant name="UX854Win05BakeoutPipe2CutLength" value="UX854Win05BakeoutHole2Radius*2"/>
+    <constant name="UX854Win05BakeoutPipe2BasicLength" value="135.0*mm"/>
+    <constant name="UX854Win05BakeoutPipe2Length"   value="UX854Win05BakeoutPipe2BasicLength + UX854Win05BakeoutPipeExtra
+							   + UX854Win05BakeoutPipe2CutLength"/>
+    <constant name="UX854Win05BakeoutPipe2Thick"    value="10.0*mm"/>
+    <constant name="UX854Win05BakeoutPipe2ExtendBasicLength" value="142.5*mm"/>
+    <constant name="UX854Win05BakeoutPipe2ExtendLength" value="UX854Win05BakeoutPipe2ExtendBasicLength + UX854Win05BakeoutPipe2CutLength"/>
+
+    <constant name="UX854Win05BakeoutPipe3BasicLength"   value="79.5*mm"/>
+    <constant name="UX854Win05BakeoutPipe3Length"   value="UX854Win05BakeoutPipe3BasicLength + UX854Win05BakeoutPipeExtra"/> <!--"182.0*mm"/>-->
+    <constant name="UX854Win05BakeoutPipe3Thick"    value="2.0*mm"/>
+    <constant name="UX854Win05BakeoutPipe3ExtendLength" value="50.5*mm"/>
+    <constant name="UX854Win05BakeoutPipe3Rad"      value="17.0*mm + UX854Win05Pipe3Thick"/>
+
+    <constant name="UX854Win05BakeoutPipe4BasicLength"   value="31.5*mm"/>
+    <constant name="UX854Win05BakeoutPipe4Length"   value="UX854Win05BakeoutPipe4BasicLength + UX854Win05BakeoutPipeExtra"/>
+    <constant name="UX854Win05BakeoutPipe4Thick"    value="10.0*mm"/>
+
+  </define>
+
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-Compensator.xml b/compact/components/Pipe/2025-v00.00/Downstream-Compensator.xml
new file mode 100644
index 000000000..4e0236e75
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Downstream-Compensator.xml
@@ -0,0 +1,228 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--==================================UX853====================================-->
+<!--===========================================================================-->
+<pipe>
+  <!-- Compensator at 2800 - Flange -->
+  <volume name="lvUX85C13100Flange01" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-C13100-Flange-01"
+           dz="0.5*UX85C13100Flange01Lenght"
+           rmin1="UX85C13100Flange01RadiusZmin"
+           rmin2="UX85C13100Flange01RadiusZmax"
+           rmax1="UX85C13100Flange01OuterRadius"
+           rmax2="UX85C13100Flange01OuterRadius"/>
+  </volume>
+  <!-- Compensator at 2800 cone of 10 mrad -->
+  <volume name="lvUX85C13100Cone02" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-C13100-Cone10mrad-02"
+           dz="0.5*UX85C13100Cone02Lenght"
+           rmin1="UX85C13100Cone02RadiusZmin"
+           rmin2="UX85C13100Cone02RadiusZmax"
+           rmax1="UX85C13100Cone02RadiusZmin + UX85C13100Cone02Thick"
+           rmax2="UX85C13100Cone02RadiusZmax + UX85C13100Cone02Thick"/>
+  </volume>
+  <!-- Compensator at 2800 connection to bellow -->
+  <volume name="lvUX85C13100BellowCnct03" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-C13100-Connection-03"
+           dz="0.5*UX85C13100BellowCnct03Lenght"
+           rmin1="UX85C13100BellowCnct03RadiusZmin"
+           rmin2="UX85C13100BellowCnct03RadiusZmax"
+           rmax1="UX85C13100BellowCnct03RadiusZmin + UX85C13100BellowCnct03Thick"
+           rmax2="UX85C13100BellowCnct03RadiusZmax + UX85C13100BellowCnct03Thick"/>
+  </volume>
+
+  <volume name="lvUX85C13100BellowBase" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Polycone" name="UX85-C13100-BellowBase-04">
+      <zplane z="-0.5*UX85C13100BellowLenght"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLenght + UX85C13100BellowWallThick"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLenght + UX85C13100BellowWallThick"
+              rmin="UX85C13100BellowOuterRadius - UX85C13100BellowWallThick"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLenght + UX85C13100BellowWallThick +
+                 UX85C13100BellowStep"
+              rmin="UX85C13100BellowOuterRadius - UX85C13100BellowWallThick"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLenght + UX85C13100BellowWallThick +
+                 UX85C13100BellowStep"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLenght + 2*UX85C13100BellowWallThick +
+                 UX85C13100BellowStep"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLenght + 2*UX85C13100BellowWallThick +
+                 UX85C13100BellowStep"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowInnerRadius + UX85C13100BellowWallThick "/>
+      <zplane z="-0.5*UX85C13100BellowLenght + 2*UX85C13100BellowWallThick +
+                 2*UX85C13100BellowStep"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowInnerRadius + UX85C13100BellowWallThick "/>
+    </shape>
+  </volume>
+
+  <volume name="lvUX85C13100BellowLast" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Polycone" name="UX85-C13100-BellowLast-04">
+      <zplane z="-0.5*UX85C13100BellowLastLenght"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLastLenght + UX85C13100BellowWallThick"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLastLenght + UX85C13100BellowWallThick"
+              rmin="UX85C13100BellowOuterRadius - UX85C13100BellowWallThick"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLastLenght + UX85C13100BellowWallThick +
+                 UX85C13100BellowStep"
+              rmin="UX85C13100BellowOuterRadius - UX85C13100BellowWallThick"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLastLenght + UX85C13100BellowWallThick +
+                 UX85C13100BellowStep"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C13100BellowLastLenght + 2*UX85C13100BellowWallThick +
+                 UX85C13100BellowStep"
+              rmin="UX85C13100BellowInnerRadius"
+              rmax="UX85C13100BellowOuterRadius"/>
+    </shape>
+  </volume>
+
+  <!-- Compensator at 2800 Bellow -->
+  <volume name="lvUX85C13100Bellow" vis="Pipe:Downstream">
+    <paramphysvol number="UX85C13100BellowNConv-1">
+      <physvol name="pvUX85C13100BellowBase"           volume="lvUX85C13100BellowBase"/>
+      <position z="UX85C13100BellowPitch"/>
+    </paramphysvol>
+    <physvol name="pvUX85C13100BellowLast"             volume="lvUX85C13100BellowLast">
+      <position z="-0.5*UX85C13100BellowLenght +
+                   (UX85C13100BellowNConv-1)*UX85C13100BellowPitch +
+                   0.5*UX85C13100BellowLastLenght"/>
+    </physvol>
+  </volume>
+
+
+  <!-- Compensator at 13100 connection to bellow -->
+  <volume name="lvUX85C13100BellowCnct05" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-C13100-Connection-05"
+           dz="0.5*UX85C13100BellowCnct05Lenght"
+           rmin1="UX85C13100BellowCnct05RadiusZmin"
+           rmin2="UX85C13100BellowCnct05RadiusZmax"
+           rmax1="UX85C13100BellowCnct05RadiusZmin + UX85C13100BellowCnct05Thick"
+           rmax2="UX85C13100BellowCnct05RadiusZmax + UX85C13100BellowCnct05Thick"/>
+  </volume>
+
+  <!-- Compensator at 13100 cone of 10 mrad -->
+  <volume name="lvUX85C13100Cone06" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-C13100-Cone10mrad-06"
+           dz="0.5*UX85C13100Cone06Lenght"
+           rmin1="UX85C13100Cone06RadiusZmin"
+           rmin2="UX85C13100Cone06RadiusZmax"
+           rmax1="UX85C13100Cone06RadiusZmin + UX85C13100Cone06Thick"
+           rmax2="UX85C13100Cone06RadiusZmax + UX85C13100Cone06Thick"/>
+  </volume>
+
+  <!-- Compensator at 13100 connection to bellow -->
+  <volume name="lvUX85C13100BellowCnct07" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-C13100-Connection-07"
+           dz="0.5*UX85C13100BellowCnct07Lenght"
+           rmin1="UX85C13100BellowCnct07RadiusZmin"
+           rmin2="UX85C13100BellowCnct07RadiusZmax"
+           rmax1="UX85C13100BellowCnct07RadiusZmin + UX85C13100BellowCnct07Thick"
+           rmax2="UX85C13100BellowCnct07RadiusZmax + UX85C13100BellowCnct07Thick"/>
+  </volume>
+
+  <!-- Compensator at 13100 connection to bellow -->
+  <volume name="lvUX85C13100BellowCnct09" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-C13100-Connection-09"
+           dz="0.5*UX85C13100BellowCnct09Lenght"
+           rmin1="UX85C13100BellowCnct09RadiusZmin"
+           rmin2="UX85C13100BellowCnct09RadiusZmax"
+           rmax1="UX85C13100BellowCnct09RadiusZmin + UX85C13100BellowCnct09Thick"
+           rmax2="UX85C13100BellowCnct09RadiusZmax + UX85C13100BellowCnct09Thick"/>
+  </volume>
+
+  <!-- Compensator at 13100 cone of 10 mrad -->
+  <volume name="lvUX85C13100Cone10" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-C13100-Cone10mrad-10"
+           dz="0.5*UX85C13100Cone10Lenght"
+           rmin1="UX85C13100Cone10RadiusZmin"
+           rmin2="UX85C13100Cone10RadiusZmax"
+           rmax1="UX85C13100Cone10RadiusZmin + UX85C13100Cone10Thick"
+           rmax2="UX85C13100Cone10RadiusZmax + UX85C13100Cone10Thick"/>
+  </volume>
+
+  <!-- Compensator at 13100 Flange -->
+  <volume name="lvUX85C13100Flange11" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-C13100-Flange-11"
+           dz="0.5*UX85C13100Flange11Lenght"
+           rmin1="UX85C13100Flange11RadiusZmin"
+           rmin2="UX85C13100Flange11RadiusZmax"
+           rmax1="UX85C13100Flange11OuterRadius"
+           rmax2="UX85C13100Flange11OuterRadius"/>
+  </volume>
+
+  <!-- Vacuum in UX85 Compensator 13100 -->
+  <volume name="lvUX85C13100Vacuum01" material="Vacuum" vis="Pipe:Vacuum">
+    <shape type="ConeSegment" name="UX85-C13100-Vacuum-01"
+           dz="0.5*UX85C13100Vacuum01Lenght"
+           rmax1="UX85C13100Flange01RadiusZmin"
+           rmax2="UX85C13100Flange11RadiusZmax"/>
+  </volume>
+
+  <!-- Compensator -->
+  <volume name="lvUX85Compensator13100" vis="Pipe:Downstream">
+    <physvol name="pvUX85C13100Flange01"          volume="lvUX85C13100Flange01">
+      <position z="UX85C13100Flange01Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100Cone02"            volume="lvUX85C13100Cone02">
+      <position z="UX85C13100Cone02Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100BellowCnct03"      volume="lvUX85C13100BellowCnct03">
+      <position z="UX85C13100BellowCnct03Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100Bellow04"          volume="lvUX85C13100Bellow">
+      <position z="UX85C13100Bellow04Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100BellowCnct05"      volume="lvUX85C13100BellowCnct05">
+      <position z="UX85C13100BellowCnct05Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100Cone06"            volume="lvUX85C13100Cone06">
+      <position z="UX85C13100Cone06Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100BellowCnct07"      volume="lvUX85C13100BellowCnct07">
+      <position z="UX85C13100BellowCnct07Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100Bellow08"          volume="lvUX85C13100Bellow">
+      <position z="UX85C13100Bellow08Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100BellowCnct09"      volume="lvUX85C13100BellowCnct09">
+      <position z="UX85C13100BellowCnct09Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100Cone10"            volume="lvUX85C13100Cone10">
+      <position z="UX85C13100Cone10Zpos"/>
+    </physvol>
+    <physvol name="pvUX85C13100Flange11"          volume="lvUX85C13100Flange11">
+      <position z="UX85C13100Flange11Zpos"/>
+    </physvol>
+    <!-- Now the vacuum inside -->
+    <physvol name="pvUX85C13100Vacuum01"          volume="lvUX85C13100Vacuum01">
+      <position z="0.5*UX85C13100Vacuum01Lenght"/>
+    </physvol>
+  </volume>
+
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-PipeParams.xml b/compact/components/Pipe/2025-v00.00/Downstream-PipeParams.xml
new file mode 100644
index 000000000..a533ee861
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Downstream-PipeParams.xml
@@ -0,0 +1,438 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+
+  <define>
+    <!-- UX85-3 Cone 10 mrad of Beryllium cylindrical part for support -->
+    <!-- Split Rich2/Downstream                                        -->
+    <constant name="UX853Cone12BLenght"
+              value="(UX85C13100ZStartIP - UX853ConeSupportFromEnd) -
+                     UX853Rich2DownSplitZposIP"/>
+    <constant name="UX853Cone12BRadiusZmin"
+              value="UX853Rich2DownSplitZposIP * tan(UX851to4Angle)"/>
+    <constant name="UX853Cone12BRadiusZmax"
+              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX853Cone12BOuterRadius" value="122.10*mm"/>
+    <constant name="UX853Cone12BZpos"
+              value="0.5*UX853Cone12BLenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 2.4 mm thick -->
+    <constant name="UX853Cone14Lenght"      value= "5.00*mm"/>
+
+    <constant name="UX853Cone13Lenght"
+              value="UX853ConeSupportFromEnd - UX853Cone15Flange17Lenght -
+                     UX853Cone14Lenght"/>
+    <constant name="UX853Cone13RadiusZmin"  value="UX853Cone12ARadiusZmax"/>
+    <constant name="UX853Cone13RadiusZmax"
+              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
+                     UX853Cone13Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone13Thick"       value="2.40*mm"/>
+    <constant name="UX853Cone13Zpos"
+              value="UX853Cone12BLenght + 0.5*UX853Cone13Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 3.5 mm thick for welding -->
+    <constant name="UX853Cone14RadiusZmin"  value="UX853Cone13RadiusZmax"/>
+    <constant name="UX853Cone14RadiusZmax"
+              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
+                     UX853Cone13Lenght + UX853Cone14Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone14Thick"       value="3.50*mm"/>
+    <constant name="UX853Cone14Zpos"
+              value="UX853Cone12BLenght + UX853Cone13Lenght + 0.5*UX853Cone14Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Aluminium 3.5 mm thick -->
+    <constant name="UX853Cone16Lenght"      value="16.00*mm"/>
+    <constant name="UX853Flange17Lenght"    value="48.00*mm"/>
+
+    <constant name="UX853Cone15Lenght"
+              value="UX853Cone15Flange17Lenght - UX853Flange17Lenght - UX853Cone16Lenght"/>
+    <constant name="UX853Cone15RadiusZmin"  value="UX853Cone14RadiusZmax"/>
+    <constant name="UX853Cone15RadiusZmax"
+              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
+                     UX853Cone13Lenght + UX853Cone14Lenght + UX853Cone15Lenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX853Cone15Thick"       value="3.50*mm"/>
+    <constant name="UX853Cone15Zpos"
+              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
+                     0.5*UX853Cone15Lenght"/>
+
+    <!-- UX85-3 Step 10 mrad of Aluminium for welding to flange -->
+    <constant name="UX853Cone16RadiusZmin"  value="UX853Cone15RadiusZmax"/>
+    <constant name="UX853Cone16RadiusZmax"
+              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
+                     UX853Cone13Lenght + UX853Cone14Lenght + UX853Cone15Lenght +
+                     UX853Cone16Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone16OuterRadius" value="139.85*mm"/>
+    <constant name="UX853Cone16Zpos"
+              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
+                     UX853Cone15Lenght + 0.5*UX853Cone16Lenght"/>
+
+    <!-- UX85-3 Bimetallic Flange - Aluminium -->
+    <constant name="UX853Flange17BLenght"   value="10.00*mm"/>
+    <constant name="UX853Flange17ALenght"
+              value="UX853Flange17Lenght - UX853Flange17BLenght"/>
+
+    <constant name="UX853Flange17ARadiusZmin"  value="UX853Cone16RadiusZmax"/>
+    <constant name="UX853Flange17ARadiusZmax"
+              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
+                     UX853Cone13Lenght + UX853Cone14Lenght + UX853Cone15Lenght +
+                     UX853Cone16Lenght + UX853Flange17ALenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Flange17AOuterRadius" value="162.50*mm"/>
+    <constant name="UX853Flange17AZpos"
+              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
+                     UX853Cone15Lenght + UX853Cone16Lenght + 0.5*UX853Flange17ALenght"/>
+
+    <!-- UX85-3 Bimetallic Flange - St.Steel -->
+    <constant name="UX853Flange17BRadiusZmin"  value="UX853Flange17ARadiusZmax"/>
+    <constant name="UX853Flange17BRadiusZmax"
+              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
+                     UX853Cone13Lenght + UX853Cone14Lenght + UX853Cone15Lenght +
+                     UX853Cone16Lenght + UX853Flange17Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Flange17BOuterRadius" value="UX853Flange17AOuterRadius"/>
+    <constant name="UX853Flange17BZpos"
+              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
+                     UX853Cone15Lenght + UX853Cone16Lenght + UX853Flange17ALenght +
+                     0.5*UX853Flange17BLenght"/>
+
+    <!-- UX85-3 Downstream and Vacuum inside for whole of it -->
+    <constant name="UX853DownstreamLenght"
+              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
+                     UX853Cone15Lenght + UX853Cone16Lenght + UX853Flange17Lenght"/>
+
+    <!-- ***************************************************************** -->
+    <!-- Compensator at 13100mm (UX85-3 shorter by 5mm i.e. at 13095mm   * -->
+    <!-- ***************************************************************** -->
+    <!-- Compensator at 13100 Flange -->
+    <constant name="UX85C13100Flange01Lenght"      value="26.00*mm"/>
+    <constant name="UX85C13100Flange01RadiusZmin"
+              value="UX85C13100ZStartIP * tan(UX851to4Angle)"/>
+    <constant name="UX85C13100Flange01RadiusZmax"
+              value="(UX85C13100ZStartIP + UX85C13100Flange01Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX85C13100Flange01OuterRadius" value="UX853Flange17AOuterRadius"/>
+    <constant name="UX85C13100Flange01Zpos"        value="0.5*UX85C13100Flange01Lenght"/>
+
+    <!-- Compensator at 13100 cone of 10 mrad -->
+    <constant name="UX85C13100Cone02Lenght"
+              value="110.00*mm - UX85C13100Flange01Lenght"/>
+    <constant name="UX85C13100Cone02RadiusZmin"    value="UX85C13100Flange01RadiusZmax"/>
+    <constant name="UX85C13100Cone02RadiusZmax"
+              value="(UX85C13100ZStartIP + UX85C13100Flange01Lenght + UX85C13100Cone02Lenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX85C13100Cone02Thick"         value="3.00*mm"/>
+    <constant name="UX85C13100Cone02Zpos"
+              value="UX85C13100Flange01Lenght + 0.5*UX85C13100Cone02Lenght"/>
+
+    <!-- Compensator at 13100 connection to bellow -->
+    <constant name="UX85C13100BellowCnct03Lenght"     value="40.00*mm"/>
+    <constant name="UX85C13100BellowCnct03RadiusZmin" value="UX85C13100Cone02RadiusZmax"/>
+    <constant name="UX85C13100BellowCnct03RadiusZmax" value="144.00*mm"/>
+    <constant name="UX85C13100BellowCnct03Thick"      value="3.00*mm"/>
+    <constant name="UX85C13100BellowCnct03Zpos"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     0.5*UX85C13100BellowCnct03Lenght"/>
+
+    <!-- Compensator at 13100 Bellow -->
+    <!-- Pitch different then drawing to take into account pre-expantion 0.5*(10+5)*mm    -->
+    <!-- to keep non periodic number compensate in drift tube by 0.5mm                    -->
+    <constant name="UX85C13100BellowNConv"        value="10"/>
+    <constant name="UX85C13100BellowWallThick"    value="0.40*mm"/>
+    <constant name="UX85C13100BellowStep"         value="10.45*mm"/>
+
+    <constant name="UX85C13100BellowPitch"
+              value="2*(UX85C13100BellowWallThick + UX85C13100BellowStep)"/>
+
+    <constant name="UX85C13100BellowLastLenght"
+              value="2*UX85C13100BellowWallThick + UX85C13100BellowStep"/>
+
+    <constant name="UX85C13100BellowInnerRadius"  value="144.00*mm"/>
+    <constant name="UX85C13100BellowOuterRadius"  value="166.00*mm"/>
+
+    <constant name="UX85C13100BellowLenght"
+              value="(UX85C13100BellowNConv - 1)*UX85C13100BellowPitch +
+                     UX85C13100BellowLastLenght"/>
+    <constant name="UX85C13100Bellow04Zpos"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + 0.5*UX85C13100BellowLenght"/>
+
+    <!-- Compensator at 13100 connection to bellow -->
+    <constant name="UX85C13100BellowCnct05Lenght"      value="40.00*mm"/>
+    <constant name="UX85C13100BellowCnct05RadiusZmin"
+              value="UX85C13100BellowCnct03RadiusZmax"/>
+    <constant name="UX85C13100BellowCnct05RadiusZmax"  value="134.90*mm"/>
+    <constant name="UX85C13100BellowCnct05Thick"       value= "3.00*mm"/>
+    <constant name="UX85C13100BellowCnct05Zpos"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     0.5*UX85C13100BellowCnct05Lenght"/>
+
+    <!-- Compensator at 13100 cone of 10 mrad, lenght compensate for approx in bellow step -->
+    <constant name="UX85C13100Cone06Lenght"            value="526.90*mm"/>
+    <constant name="UX85C13100Cone06RadiusZmin"
+              value="UX85C13100BellowCnct05RadiusZmax"/>
+    <constant name="UX85C13100Cone06RadiusZmax"        value="140.15*mm"/>
+    <constant name="UX85C13100Cone06Thick"             value= "3.00*mm"/>
+    <constant name="UX85C13100Cone06Zpos"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct05Lenght + 0.5*UX85C13100Cone06Lenght"/>
+
+    <!-- Compensator at 13100 connection to bellow -->
+    <constant name="UX85C13100BellowCnct07Lenght"      value="25.00*mm"/>
+    <constant name="UX85C13100BellowCnct07RadiusZmin"
+              value="UX85C13100Cone06RadiusZmax"/>
+    <constant name="UX85C13100BellowCnct07RadiusZmax"  value="144.00*mm"/>
+    <constant name="UX85C13100BellowCnct07Thick"       value= "3.00*mm"/>
+    <constant name="UX85C13100BellowCnct07Zpos"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
+                     0.5*UX85C13100BellowCnct07Lenght"/>
+
+    <!-- Compensator at 13100 Bellow -->
+    <constant name="UX85C13100Bellow08Zpos"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
+                     UX85C13100BellowCnct07Lenght + 0.5*UX85C13100BellowLenght"/>
+
+    <!-- Compensator at 13100 connection to bellow -->
+    <constant name="UX85C13100BellowCnct09Lenght"       value="30.00*mm"/>
+    <constant name="UX85C13100BellowCnct09RadiusZmin"
+              value="UX85C13100BellowCnct07RadiusZmax"/>
+    <constant name="UX85C13100BellowCnct09RadiusZmax"
+              value="(UX85C13100ZStartIP + UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
+                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct09Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX85C13100BellowCnct09Thick"        value=" 3.00*mm"/>
+    <constant name="UX85C13100BellowCnct09Zpos"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
+                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
+                     0.5*UX85C13100BellowCnct09Lenght"/>
+
+    <!-- Compensator at 13100 cone of 10 mrad -->
+    <constant name="UX85C13100Flange11Lenght"    value="26.00*mm"/>
+
+    <constant name="UX85C13100Cone10Lenght"
+              value="120.00*mm - UX85C13100Flange11Lenght"/>
+    <constant name="UX85C13100Cone10RadiusZmin"
+              value="UX85C13100BellowCnct09RadiusZmax"/>
+    <constant name="UX85C13100Cone10RadiusZmax"
+              value="(UX85C13100ZStartIP + UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
+                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct09Lenght + UX85C13100Cone10Lenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX85C13100Cone10Thick"        value=" 3.00*mm"/>
+    <constant name="UX85C13100Cone10Zpos"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
+                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct09Lenght + 0.5*UX85C13100Cone10Lenght"/>
+
+    <!-- Compensator at 13100 Flange -->
+    <constant name="UX85C13100Flange11RadiusZmin"  value="UX85C13100Cone10RadiusZmin"/>
+    <constant name="UX85C13100Flange11RadiusZmax"  value="144.00*mm"/>
+    <constant name="UX85C13100Flange11OuterRadius" value="177.50*mm"/>
+    <constant name="UX85C13100Flange11Zpos"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
+                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct09Lenght + UX85C13100Cone10Lenght +
+                     0.5*UX85C13100Flange11Lenght"/>
+
+    <!-- Compensator at 13100 -->
+    <constant name="UX85C13100Lenght"
+              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
+                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
+                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
+                     UX85C13100BellowCnct09Lenght + UX85C13100Cone10Lenght +
+                     UX85C13100Flange11Lenght"/>
+
+    <!-- Vacuum sections overlapping all the mechanical sections above -->
+    <!-- only segmentation due to shape or regions (ignore bellows)    -->
+    <constant name="UX85C13100Vacuum01Lenght"
+              value="UX85C13100Lenght"/>
+
+    <!-- ***************************************************************** -->
+    <!-- * UX85-4 Parameters                                             * -->
+    <!-- ***************************************************************** -->
+    <!-- UX85-4 Flange  -->
+    <constant name="UX854Flange01Lenght"         value="28.50*mm"/>
+    <constant name="UX854Flange01RadiusZmin"  value="UX85C13100Flange11RadiusZmax"/>
+    <constant name="UX854Flange01RadiusZmax"
+              value="(UX854ZStartIP + UX854Flange01Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX854Flange01OuterRadius" value="UX85C13100Flange11OuterRadius"/>
+    <constant name="UX854Flange01Zpos"        value="0.5*UX854Flange01Lenght"/>
+
+    <!-- UX85-4 Cone 10 mrad St.Steel 4 mm thick -->
+    <constant name="UX854Cone02Lenght"
+              value="2337.00*mm - (UX854Flange01Lenght - 13.00*mm)"/>
+    <constant name="UX854Cone02RadiusZmin"    value="UX854Flange01RadiusZmax"/>
+    <constant name="UX854Cone02RadiusZmax"
+              value="(UX854ZStartIP + UX854Flange01Lenght + UX854Cone02Lenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX854Cone02Thick"         value="4.00*mm"/>
+    <constant name="UX854Cone02Zpos"
+              value="UX854Flange01Lenght + 0.5*UX854Cone02Lenght"/>
+
+    <!-- UX85-4 Support flange around pipe -->
+    <constant name="UX854SupportFlangeFromStart"   value="1126.99*mm"/>
+
+    <constant name="UX854SupportFlangeLenght"      value=  "7.00*mm"/>
+    <constant name="UX854SupportFlangeRadiusZmin"
+              value="(UX854ZStartIP + UX854SupportFlangeFromStart)*tan(UX851to4Angle)"/>
+    <constant name="UX854SupportFlangeRadiusZmax"
+              value="(UX854ZStartIP + UX854SupportFlangeFromStart +
+                     UX854SupportFlangeLenght)*tan(UX851to4Angle)"/>
+    <constant name="UX854SupportFlangeOuterRadius" value="164.25*mm"/>
+    <constant name="UX854SupportFlangeZpos"
+              value="UX854SupportFlangeFromStart + 0.5*UX854SupportFlangeLenght"/>
+
+    <!-- UX85-4 Cone 10 mrad St.Steel 4 mm thick -->
+    <constant name="UX854Cone03Lenght"        value="2305.00*mm"/>
+    <constant name="UX854Cone03RadiusZmin"    value="UX854Cone02RadiusZmax"/>
+    <constant name="UX854Cone03RadiusZmax"
+              value="(UX854ZStartIP + UX854Flange01Lenght + UX854Cone02Lenght +
+                     UX854Cone03Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX854Cone03Thick"         value="4.00*mm"/>
+    <constant name="UX854Cone03Zpos"
+              value="UX854Flange01Lenght + UX854Cone02Lenght + 0.5*UX854Cone03Lenght"/>
+
+    <!-- UX85-4 Cone 10 mrad St.Steel connection to window thick -->
+    <constant name="UX854Cone04Lenght"        value="23.50*mm"/>
+    <constant name="UX854Cone04RadiusZmin"    value="UX854Cone03RadiusZmax"/>
+    <constant name="UX854Cone04RadiusZmax"    value="190.50*mm"/>
+    <constant name="UX854Cone04Thick"         value="4.00*mm"/>
+    <constant name="UX854Cone04Zpos"
+              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
+                     0.5*UX854Cone04Lenght"/>
+
+    <!-- UX85-4 Window -15 degree St.Steel 3 mm thick -->
+    <constant name="UX854Win05Lenght"        value="599.00*mm"/>
+    <constant name="UX854Win05RadiusZmin"    value="UX854Cone04RadiusZmax"/>
+    <constant name="UX854Win05RadiusZmax"    value="30.00*mm"/>
+    <constant name="UX854Win05Thick"         value= "3.00*mm"/>
+    <constant name="UX854Win05Zpos"
+              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
+                     UX854Cone04Lenght + 0.5*UX854Win05Lenght"/>
+
+    <constant name="UX854Win05Hole1Length"   value="300.0*mm"/>
+    <constant name="UX854Win05Hole1Radius"   value="19.0*mm"/>
+    <constant name="UX854Win05Hole1PosZ"     value="-119.0*mm"/>
+    <constant name="UX854Win05Hole1RotX"     value="-15.0*degree"/>
+    <constant name="UX854Win05Hole1RotZ"     value="45.0*degree"/>
+    <constant name="UX854Win05Hole1PosR"     value="145.3*mm"/>
+    <constant name="UX854Win05Hole1PosPhi"   value="135.0*degree"/>
+
+    <constant name="UX854Win05Hole2Length"   value="100.0*mm"/>
+    <constant name="UX854Win05Hole2Radius"   value="31.75*mm"/>
+    <constant name="UX854Win05Hole2RotX"     value="90.0*degree"/>
+    <constant name="UX854Win05Hole2PosY"     value="95.0*mm"/>
+    <constant name="UX854Win05Hole2PosZ"     value="69.0*mm"/>
+
+    <constant name="UX854Win05Hole3Length"   value="300.0*mm"/>
+    <constant name="UX854Win05Hole3Radius"   value="30.0*mm"/>
+    <constant name="UX854Win05Hole3RotY"     value="-20.0*degree"/>
+    <constant name="UX854Win05Hole3PosX"     value="-122.0*mm"/>
+    <constant name="UX854Win05Hole3PosZ"     value="-32.76*mm"/>
+
+    <constant name="UX854Win05Hole4Length"   value="200.0*mm"/>
+    <constant name="UX854Win05Hole4Radius"   value="9.5*mm"/>
+    <constant name="UX854Win05Hole4RotY"     value="45.0*degree"/>
+    <constant name="UX854Win05Hole4PosX"     value="64.0*mm"/>
+    <constant name="UX854Win05Hole4PosZ"     value="191.6*mm"/>
+
+    <constant name="UX854Win05PipeExtra"     value="50.0*mm"/> <!-- To accomodate cuts -->
+
+    <constant name="UX854Win05Pipe1BasicLength"   value="226.7*mm"/>
+    <constant name="UX854Win05Pipe1Length"   value="UX854Win05Pipe1BasicLength + UX854Win05PipeExtra"/>
+    <constant name="UX854Win05Pipe1Thick"    value="2.0*mm"/>
+    <constant name="UX854Win05Pipe1FlangeRad" value="35.0*mm"/>
+    <constant name="UX854Win05Pipe1FlangeThick" value="12.7*mm"/>
+
+    <constant name="UX854Win05Pipe2CutLength" value="UX854Win05Hole2Radius*2"/>
+    <constant name="UX854Win05Pipe2BasicLength" value="135.0*mm"/>
+    <constant name="UX854Win05Pipe2Length"   value="UX854Win05Pipe2BasicLength + UX854Win05PipeExtra + UX854Win05Pipe2CutLength"/>
+    <constant name="UX854Win05Pipe2Thick"    value="2.0*mm"/>
+    <constant name="UX854Win05Pipe2ExtendBasicLength" value="142.5*mm"/>
+    <constant name="UX854Win05Pipe2ExtendLength" value="UX854Win05Pipe2ExtendBasicLength + UX854Win05Pipe2CutLength"/>
+    <constant name="UX854Win05Pipe2FlangeRad" value="57.0*mm"/>
+    <constant name="UX854Win05Pipe2FlangeThick" value="17.3*mm"/>
+
+    <constant name="UX854Win05Pipe3BasicLength"   value="79.5*mm"/>
+    <constant name="UX854Win05Pipe3Length"   value="UX854Win05Pipe3BasicLength + UX854Win05PipeExtra"/> <!--"182.0*mm"/>-->
+    <constant name="UX854Win05Pipe3Thick"    value="2.0*mm"/>
+    <constant name="UX854Win05Pipe3ExtendLength" value="50.5*mm"/>
+    <constant name="UX854Win05Pipe3Rad"      value="17.0*mm"/>
+    <constant name="UX854Win05Pipe3FlangeRad"      value="35.0*mm"/>
+    <constant name="UX854Win05Pipe3FlangeThick"    value="12.7*mm"/>
+
+    <constant name="UX854Win05Pipe4BasicLength"   value="31.5*mm"/>
+    <constant name="UX854Win05Pipe4Length"   value="UX854Win05Pipe4BasicLength + UX854Win05PipeExtra"/>
+    <constant name="UX854Win05Pipe4Thick"    value="2.0*mm"/>
+    <constant name="UX854Win05Pipe4FlangeRad"      value="17.0*mm"/>
+    <constant name="UX854Win05Pipe4FlangeThick"    value="7.0*mm"/>
+
+    <!-- UX85-4 Cylinder 3 mm thick -->
+    <constant name="UX854Cyl06Flange08Lenght"   value="52.50*mm"/>
+    <constant name="UX854Flange08Lenght"        value="19.70*mm"/>
+    <constant name="UX854Cyl07Lenght"
+              value="5.00*mm + 25.00*mm - (UX854Flange08Lenght- 8.00*mm)"/>
+
+    <constant name="UX854Cyl06Lenght"
+              value="UX854Cyl06Flange08Lenght - UX854Flange08Lenght - UX854Cyl07Lenght"/>
+    <constant name="UX854Cyl06InnerRadius"   value="UX854Win05RadiusZmax"/>
+    <constant name="UX854Cyl06Thick"         value="3.00*mm"/>
+    <constant name="UX854Cyl06Zpos"
+              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
+                     UX854Cone04Lenght + UX854Win05Lenght + 0.5*UX854Cyl06Lenght"/>
+
+    <!-- UX85-4 Cylinder 1.5 mm thick -->
+    <constant name="UX854Cyl07InnerRadius"   value="UX854Cyl06InnerRadius"/>
+    <constant name="UX854Cyl07OuterRadius"   value="31.50*mm"/>
+    <constant name="UX854Cyl07Zpos"
+              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
+                     UX854Cone04Lenght + UX854Win05Lenght + UX854Cyl06Lenght +
+                     0.5*UX854Cyl07Lenght"/>
+
+    <!-- UX85-4 Cylinder Flange -->
+    <constant name="UX854Flange08InnerRadius"   value="UX854Cyl06InnerRadius"/>
+    <constant name="UX854Flange08OuterRadius"   value="76.00*mm"/>
+    <constant name="UX854Flange08Zpos"
+              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
+                     UX854Cone04Lenght + UX854Win05Lenght + UX854Cyl06Lenght +
+                     UX854Cyl07Lenght + 0.5*UX854Flange08Lenght "/>
+
+    <!-- Corresponding vacuum sections segmentation due to shape -->
+    <!-- Vacuum in 10 mrad, in window, in cilinder -->
+    <constant name="UX854Vacuum01Lenght"
+              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
+                     UX854Cone04Lenght"/>
+    <constant name="UX854Vacuum05Lenght"    value="UX854Win05Lenght"/>
+    <constant name="UX854Vacuum06Lenght"    value="UX854Cyl06Flange08Lenght"/>
+
+    <!-- Whole UX85-4 -->
+    <constant name="UX854Lenght"
+              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
+                     UX854Cone04Lenght + UX854Win05Lenght + UX854Cyl06Flange08Lenght"/>
+  </define>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-Support.xml b/compact/components/Pipe/2025-v00.00/Downstream-Support.xml
new file mode 100644
index 000000000..2d53baa43
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Downstream-Support.xml
@@ -0,0 +1,559 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--=============================Downstream support============================-->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+
+    <!--==================================================================================-->
+    <!--===================================Bakeout========================================-->
+    <!--==================================================================================-->
+    <detector name="DownstreamPipeSupport" type="DD4hep_VolumeAssembly" parent="${PipeDownstream:parent}" vis="Pipe:Vis">
+      <!-- Foot upper plate -->
+      <volume name="lvUX854SlSupFootTop" material="Pipe:Steel316LN" vis="Pipe:Support">
+        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupFootTopSub">
+          <shape type="Box" name="UX854SlSupFootTopBox"
+                 dx="0.5*UX854SlSupFootTopX"
+                 dy="0.5*UX854SlSupFootTopY"
+                 dz="0.5*UX854SlSupFootTopThick"/>
+
+          <shape type="Tube" name="UX854SlSupFootTopCentralHole"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
+                 rmax="UX854SlSupFootTopCentralHoleRad"/>
+
+          <shape type="Tube" name="UX854SlSupFootTopHole1A"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
+                 rmax="UX854SlSupFootTopHoleRad"/>
+          <position x="UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY + UX854SlSupFootTopHoleOffset"/>
+          <shape type="Tube" name="UX854SlSupFootTopHole1B"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
+                 rmax="UX854SlSupFootTopHoleRad"/>
+          <position x="UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY - UX854SlSupFootTopHoleOffset"/>
+          <shape type="Box" name="UX854SlSupFootHoleBox1"
+                 dx="0.5*UX854SlSupFootTopHoleWidth"
+                 dy="0.5*UX854SlSupFootTopHoleLength"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"/>
+          <position x="UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY"/>
+
+          <shape type="Tube" name="UX854SlSupFootTopHole2A"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
+                 rmax="UX854SlSupFootTopHoleRad"/>
+          <position x="UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY - UX854SlSupFootTopHoleOffset"/>
+          <shape type="Tube" name="UX854SlSupFootTopHole2B"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
+                 rmax="UX854SlSupFootTopHoleRad"/>
+          <position x="UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY + UX854SlSupFootTopHoleOffset"/>
+          <shape type="Box" name="UX854SlSupFootHoleBox2"
+                 dx="0.5*UX854SlSupFootTopHoleWidth"
+                 dy="0.5*UX854SlSupFootTopHoleLength"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"/>
+          <position x="UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY"/>
+
+          <shape type="Tube" name="UX854SlSupFootTopHole3A"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
+                 rmax="UX854SlSupFootTopHoleRad"/>
+          <position x="-UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY - UX854SlSupFootTopHoleOffset"/>
+          <shape type="Tube" name="UX854SlSupFootTopHole3B"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
+                 rmax="UX854SlSupFootTopHoleRad"/>
+          <position x="-UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY + UX854SlSupFootTopHoleOffset"/>
+          <shape type="Box" name="UX854SlSupFootHoleBox3"
+                 dx="0.5*UX854SlSupFootTopHoleWidth"
+                 dy="0.5*UX854SlSupFootTopHoleLength"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"/>
+          <position x="-UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY"/>
+
+          <shape type="Tube" name="UX854SlSupFootTopHole4A"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
+                 rmax="UX854SlSupFootTopHoleRad"/>
+          <position x="-UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY + UX854SlSupFootTopHoleOffset"/>
+          <shape type="Tube" name="UX854SlSupFootTopHole4B"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
+                 rmax="UX854SlSupFootTopHoleRad"/>
+          <position x="-UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY - UX854SlSupFootTopHoleOffset"/>
+          <shape type="Box" name="UX854SlSupFootHoleBox4"
+                 dx="0.5*UX854SlSupFootTopHoleWidth"
+                 dy="0.5*UX854SlSupFootTopHoleLength"
+                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"/>
+          <position x="-UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY"/>
+        </shape>
+
+      </volume>
+
+      <!-- Tube for foot -->
+      <volume name="lvUX854SlSupFootTube" material="Pipe:Steel" vis="Pipe:Support">
+        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupFootTubeSub">
+          <shape type="Box" name="UX854SlSupFootTubeBox"
+                 dx="0.5*UX854SlSupFootTubeWidth"
+                 dy="0.5*UX854SlSupFootTubeWidth"
+                 dz="0.5*UX854SlSupFootTubeLength"/>
+          <shape type="Box" name="UX854SlSupFootTubeInnerBox"
+                 dx="0.5*UX854SlSupFootTubeWidth - UX854SlSupFootTubeThick*2"
+                 dy="0.5*UX854SlSupFootTubeWidth - UX854SlSupFootTubeThick*2"
+                 dz="0.5*(UX854SlSupFootTubeLength + 1.0*mm)"/>
+        </shape>
+      </volume>
+
+      <!-- Foot base plate -->
+      <volume name="lvUX854SlSupFootBase" material="Pipe:Steel" vis="Pipe:Support">
+        <shape type="Box" name="UX854SlSupFootBaseBox"
+               dx="0.5*UX854SlSupFootBaseX"
+               dy="0.5*UX854SlSupFootBaseY"
+               dz="0.5*UX854SlSupFootBaseThick"/>
+      </volume>
+
+      <!-- Foot shim -->
+      <volume name="lvUX854SlSupFootShim" material="Pipe:Steel" vis="Pipe:Support">
+        <shape type="Box" name="UX854SlSupFootShimBox"
+               dx="0.5*UX854SlSupFootShimWidth"
+               dy="0.5*UX854SlSupFootShimWidth"
+               dz="0.5*UX854SlSupFootShimThick"/>
+      </volume>
+
+      <!-- Base -->
+      <volume name="lvUX854SlSupFoot" vis="Pipe:Support">
+        <physvol name="pvUX854SlSupFootTop"                   volume="lvUX854SlSupFootTop"/>
+        <physvol name="pvUX854SlSupFootTube"                  volume="lvUX854SlSupFootTube">
+          <position z="UX854SlSupFootTubePosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupFootBase"                  volume="lvUX854SlSupFootBase">
+          <position z="UX854SlSupFootBasePosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupFootShim1"                 volume="lvUX854SlSupFootShim">
+          <position x="UX854SlSupFootShimPosX" y="UX854SlSupFootShimPosY" z="UX854SlSupFootShimPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupFootShim2"                 volume="lvUX854SlSupFootShim">
+          <position x="UX854SlSupFootShimPosX" y="-UX854SlSupFootShimPosY" z="UX854SlSupFootShimPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupFootShim3"                 volume="lvUX854SlSupFootShim">
+          <position x="-UX854SlSupFootShimPosX" y="-UX854SlSupFootShimPosY" z="UX854SlSupFootShimPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupFootShim4"                 volume="lvUX854SlSupFootShim">
+          <position x="-UX854SlSupFootShimPosX" y="UX854SlSupFootShimPosY" z="UX854SlSupFootShimPosZ"/>
+        </physvol>
+
+      </volume>
+
+
+      <!-- Rod -->
+      <volume name="lvUX854SlSupRod" material="Pipe:Steel" vis="Pipe:Support">
+        <shape type="Tube" name="Ux854SlSupRodTubs"
+               dz="0.5*UX854SlSupRodLength"
+               rmax="UX854SlSupRodRad"/>
+      </volume>
+
+      <!-- Washer -->
+      <volume name="lvUX854SlSupWasher" material="Pipe:Steel" vis="Pipe:Support">
+        <shape type="Tube" name="Ux854SlSupWasherTubs"
+               dz="0.5*UX854SlSupWasherLenght"
+               rmax="UX854SlSupWasherRad + UX854SlSupWasherThick"
+               rmin="UX854SlSupWasherThick"/>
+      </volume>
+
+      <!-- Nut -->
+      <volume name="lvUX854SlSupNut" material="Pipe:Steel" vis="Pipe:Support">
+        <shape type="Tube" name="Ux854SlSupNutTubs"
+               dz="0.5*UX854SlSupNutLength"
+               rmax="UX854SlSupNutRad + UX854SlSupNutThick"
+               rmin="UX854SlSupNutRad"/>
+      </volume>
+
+      <!-- Assebled rod -->
+      <volume name="lvUX854SlSupRodAss" vis="Pipe:Support">
+        <physvol name="pvUX854SlSupRod"                 volume="lvUX854SlSupRod"/>
+        <physvol name="pvUX854SlSupNut1"                volume="lvUX854SlSupNut">
+          <position z="UX854SlSupRodAssNut1PosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupNut2"                volume="lvUX854SlSupNut">
+          <position z="UX854SlSupRodAssNut2PosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupWasher1"             volume="lvUX854SlSupWasher">
+          <position z="UX854SlSupRodAssWasher1PosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupWasher2"             volume="lvUX854SlSupWasher">
+          <position z="UX854SlSupRodAssWasher2PosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupNut3"                volume="lvUX854SlSupNut">
+          <position z="UX854SlSupRodAssNut3PosZ"/>
+        </physvol>
+      </volume>
+
+
+      <!-- Top Plate -->
+      <volume name="lvUX854SlSupTop" material="Pipe:Steel316LN" vis="Pipe:Support">
+        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupTopSub">
+          <shape type="Box" name="UX854SlSupTopBox"
+                 dx="0.5*UX854SlSupTopX"
+                 dy="0.5*UX854SlSupTopY"
+                 dz="0.5*UX854SlSupTopThick"/>
+
+          <shape type="Tube" name="UX854SlSupTopHoleA"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleCentRad"/>
+          <position x="UX854SlSupTopHoleCentOffset"/>
+          <shape type="Tube" name="UX854SlSupTopHoleB"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleCentRad"/>
+          <position x="-UX854SlSupTopHoleCentOffset"/>
+          <shape type="Box" name="UX854SlSupHoleBox"
+                 dx="0.5*UX854SlSupTopHoleCentLength"
+                 dy="0.5*UX854SlSupTopHoleCentWidth"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"/>
+
+          <shape type="Tube" name="UX854SlSupTopHole1"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleRad"/>
+          <position x="UX854SlSupTopHolePosX" y="UX854SlSupTopHolePosY"/>
+          <shape type="Tube" name="UX854SlSupTopHole2"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleRad"/>
+          <position x="UX854SlSupTopHolePosX" y="-UX854SlSupTopHolePosY"/>
+          <shape type="Tube" name="UX854SlSupTopHole3"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleRad"/>
+          <position x="-UX854SlSupTopHolePosX" y="-UX854SlSupTopHolePosY"/>
+          <shape type="Tube" name="UX854SlSupTopHole4"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleRad"/>
+          <position x="-UX854SlSupTopHolePosX" y="UX854SlSupTopHolePosY"/>
+
+          <shape type="Tube" name="UX854SlSupTopHoleInner1"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleInnerRad"/>
+          <position x="UX854SlSupTopHoleInnerPosX" y="UX854SlSupTopHoleInnerPosY"/>
+          <shape type="Tube" name="UX854SlSupTopHoleInner2"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleInnerRad"/>
+          <position x="UX854SlSupTopHoleInnerPosX" y="-UX854SlSupTopHoleInnerPosY"/>
+          <shape type="Tube" name="UX854SlSupTopHoleInner3"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleInnerRad"/>
+          <position x="-UX854SlSupTopHoleInnerPosX" y="-UX854SlSupTopHoleInnerPosY"/>
+          <shape type="Tube" name="UX854SlSupTopHoleInner4"
+                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
+                 rmax="UX854SlSupTopHoleInnerRad"/>
+          <position x="-UX854SlSupTopHoleInnerPosX" y="UX854SlSupTopHoleInnerPosY"/>
+
+        </shape>
+      </volume>
+
+      <!-- Rail main plate-->
+      <volume name="lvUX854SlSupRailBase" material="Pipe:Steel316LN" vis="Pipe:Support">
+        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupRailBaseSub">
+          <shape type="Box" name="UX854SlSupRailBaseBox"
+                 dx="0.5*UX854SlSupRailBaseX"
+                 dy="0.5*UX854SlSupRailBaseY"
+                 dz="0.5*UX854SlSupRailBaseThick"/>
+
+          <shape type="Tube" name="UX854SlSupRailBaseCentralHole"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
+                 rmax="UX854SlSupRailBaseCentralHoleRad"/>
+
+          <shape type="Tube" name="UX854SlSupRailBaseHole1A"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
+                 rmax="UX854SlSupRailBaseHoleRad"/>
+          <position x="UX854SlSupRailBaseHolePosX + UX854SlSupRailBaseHoleOffset" y="UX854SlSupRailBaseHolePosY"/>
+          <shape type="Tube" name="UX854SlSupRailBaseHole1B"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
+                 rmax="UX854SlSupRailBaseHoleRad"/>
+          <position x="UX854SlSupRailBaseHolePosX - UX854SlSupRailBaseHoleOffset" y="UX854SlSupRailBaseHolePosY"/>
+          <shape type="Box" name="UX854SlSupRailBaseHoleBox1"
+                 dx="0.5*UX854SlSupRailBaseHoleLength"
+                 dy="0.5*UX854SlSupRailBaseHoleWidth"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"/>
+          <position x="UX854SlSupRailBaseHolePosX" y="UX854SlSupRailBaseHolePosY"/>
+
+          <shape type="Tube" name="UX854SlSupRailBaseHole2A"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
+                 rmax="UX854SlSupRailBaseHoleRad"/>
+          <position x="UX854SlSupRailBaseHolePosX + UX854SlSupRailBaseHoleOffset" y="-UX854SlSupRailBaseHolePosY"/>
+          <shape type="Tube" name="UX854SlSupRailBaseHole2B"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
+                 rmax="UX854SlSupRailBaseHoleRad"/>
+          <position x="UX854SlSupRailBaseHolePosX - UX854SlSupRailBaseHoleOffset" y="-UX854SlSupRailBaseHolePosY"/>
+          <shape type="Box" name="UX854SlSupRailBaseHoleBox2"
+                 dx="0.5*UX854SlSupRailBaseHoleLength"
+                 dy="0.5*UX854SlSupRailBaseHoleWidth"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"/>
+          <position x="UX854SlSupRailBaseHolePosX" y="-UX854SlSupRailBaseHolePosY"/>
+
+          <shape type="Tube" name="UX854SlSupRailBaseHole3A"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
+                 rmax="UX854SlSupRailBaseHoleRad"/>
+          <position x="-UX854SlSupRailBaseHolePosX - UX854SlSupRailBaseHoleOffset" y="-UX854SlSupRailBaseHolePosY"/>
+          <shape type="Tube" name="UX854SlSupRailBaseHole3B"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
+                 rmax="UX854SlSupRailBaseHoleRad"/>
+          <position x="-UX854SlSupRailBaseHolePosX + UX854SlSupRailBaseHoleOffset" y="-UX854SlSupRailBaseHolePosY"/>
+          <shape type="Box" name="UX854SlSupRailBaseHoleBox3"
+                 dx="0.5*UX854SlSupRailBaseHoleLength"
+                 dy="0.5*UX854SlSupRailBaseHoleWidth"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"/>
+          <position x="-UX854SlSupRailBaseHolePosX" y="-UX854SlSupRailBaseHolePosY"/>
+
+          <shape type="Tube" name="UX854SlSupRailBaseHole4A"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
+                 rmax="UX854SlSupRailBaseHoleRad"/>
+          <position x="-UX854SlSupRailBaseHolePosX - UX854SlSupRailBaseHoleOffset" y="UX854SlSupRailBaseHolePosY"/>
+          <shape type="Tube" name="UX854SlSupRailBaseHole4B"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
+                 rmax="UX854SlSupRailBaseHoleRad"/>
+          <position x="-UX854SlSupRailBaseHolePosX + UX854SlSupRailBaseHoleOffset" y="UX854SlSupRailBaseHolePosY"/>
+          <shape type="Box" name="UX854SlSupRailBaseHoleBox4"
+                 dx="0.5*UX854SlSupRailBaseHoleLength"
+                 dy="0.5*UX854SlSupRailBaseHoleWidth"
+                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"/>
+          <position x="-UX854SlSupRailBaseHolePosX" y="UX854SlSupRailBaseHolePosY"/>
+        </shape>
+      </volume>
+
+      <!-- Rail block -->
+      <volume name="lvUX854SlSupRailBlock" material="Pipe:Steel316LN" vis="Pipe:Support">
+        <shape type="Box" name="UX854SlSupRailBlockBox"
+               dx="0.5*UX854SlSupRailBlockLength"
+               dy="0.5*UX854SlSupRailBlockWidth"
+               dz="0.5*UX854SlSupRailBlockHeight"/>
+      </volume>
+
+      <!-- Rail -->
+      <volume name="lvUX854SlSupRail" vis="Pipe:Support">
+        <physvol name="pvUX854SlSupRailBase"                 volume="lvUX854SlSupRailBase"/>
+        <physvol name="pvUX854SlSupRailBlock1"               volume="lvUX854SlSupRailBlock">
+          <position y="UX854SlSupRailPosY" z="UX854SlSupRailPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRailBlock2"               volume="lvUX854SlSupRailBlock">
+          <position y="-UX854SlSupRailPosY" z="UX854SlSupRailPosZ"/>
+        </physvol>
+      </volume>
+
+      <!-- Rail Screw -->
+      <volume name="lvUX854SlSupRailScrew" material="Pipe:Steel" vis="Pipe:Support">
+        <shape type="BooleanShape" operation="union" name="UX854SlSupRailScrewUnion">
+          <shape type="Tube" name="UX854SlSupRailScrewHeadTubs"
+                 dz="0.5*UX854SlSupRailScrewHeadLength"
+                 rmax="UX854SlSupRailScrewHeadRad"/>
+          <shape type="Tube" name="UX854SlSupRailScrewTubs"
+                 dz="0.5*UX854SlSupRailScrewLength"
+                 rmax="UX854SlSupRailScrewRad"/>
+          <position z="-UX854SlSupRailScrewLength/2 - UX854SlSupRailScrewHeadLength/2 - 0.01*mm"/>
+        </shape>
+      </volume>
+
+      <!-- Rail Rod -->
+      <volume name="lvUX854SlSupRailRod" material="Pipe:Steel" vis="Pipe:Support">
+        <shape type="Tube" name="UX854SlSupRailRodTubs"
+               dz="0.5*UX854SlSupRailRodLength"
+               rmax="UX854SlSupRailRodRad"/>
+      </volume>
+
+      <!-- Rail Cover -->
+      <volume name="lvUX854SlSupRailCover" material="Pipe:Brass" vis="Pipe:Support">
+        <shape type="Box" name="UX854SlSupRailCoverBox"
+               dx="0.5*UX854SlSupRailCoverLength"
+               dy="0.5*UX854SlSupRailCoverThick"
+               dz="0.5*UX854SlSupRailCoverWidth"/>
+      </volume>
+
+      <!-- Rail assebled -->
+      <volume name="lvUX854SlSupRailAssem" vis="Pipe:Support">
+        <physvol name="pvUX854SlSupRail"                 volume="lvUX854SlSupRail"/>
+        <physvol name="pvUX854SlSupRailCover1"           volume="lvUX854SlSupRailCover">
+          <position y="UX854SlSupRailCoverPosY" z="UX854SlSupRailCoverPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRailCover2"           volume="lvUX854SlSupRailCover">
+          <position y="-UX854SlSupRailCoverPosY" z="UX854SlSupRailCoverPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRailRod"              volume="lvUX854SlSupRailRod">
+          <position z="UX854SlSupRailRodPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRailNut1"             volume="lvUX854SlSupNut">
+          <position z="UX854SlSupRailNut1PosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRailNut2"             volume="lvUX854SlSupNut">
+          <position z="UX854SlSupRailNut2PosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRailScrew1"           volume="lvUX854SlSupRailScrew">
+          <position x="UX854SlSupRailScrewPosX" y="UX854SlSupRailScrewPosY" z="UX854SlSupRailScrewPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRailScrew2"           volume="lvUX854SlSupRailScrew">
+          <position x="UX854SlSupRailScrewPosX" y="-UX854SlSupRailScrewPosY" z="UX854SlSupRailScrewPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRailScrew3"           volume="lvUX854SlSupRailScrew">
+          <position x="-UX854SlSupRailScrewPosX" y="-UX854SlSupRailScrewPosY" z="UX854SlSupRailScrewPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRailScrew4"           volume="lvUX854SlSupRailScrew">
+          <position x="-UX854SlSupRailScrewPosX" y="UX854SlSupRailScrewPosY" z="UX854SlSupRailScrewPosZ"/>
+        </physvol>
+
+      </volume>
+
+      <!-- Trolley main plate -->
+      <volume name="lvUX854SlSupTrolleyPlate" material="Pipe:Steel316LN" vis="Pipe:Support">
+        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupTrolleyPlateSub">
+          <shape type="Box" name="UX854SlSupTrolleyPlateBox"
+                 dx="0.5*UX854SlSupTrolleyPlateLength"
+                 dy="0.5*UX854SlSupTrolleyPlateHeight"
+                 dz="0.5*UX854SlSupTrolleyPlateWidth"/>
+
+          <shape type="Tube" name="UX854SlSupTrolleyPlateHole"
+                 dz="0.5*(UX854SlSupTrolleyPlateWidth + 1.0*mm)"
+                 rmax="UX854SlSupTrolleyPlateHoleRad"/>
+          <position y="-UX854SlSupTrolleyPlateHolePosY"/>
+
+          <shape type="Box" name="UX854SlSupTrolleyPlateScrape1"
+                 dx="0.5*UX854SlSupTrolleyPlateLength"
+                 dy="0.5*UX854SlSupTrolleyPlateHeight"
+                 dz="0.5*(UX854SlSupTrolleyPlateWidth + 1.0*mm)"/>
+          <position x="UX854SlSupTrolleyPlateCutPosX" y="-UX854SlSupTrolleyPlateCutPosY"/>
+          <shape type="Box" name="UX854SlSupTrolleyPlateScrape2"
+                 dx="0.5*UX854SlSupTrolleyPlateLength"
+                 dy="0.5*UX854SlSupTrolleyPlateHeight"
+                 dz="0.5*(UX854SlSupTrolleyPlateWidth + 1.0*mm)"/>
+          <position x="-UX854SlSupTrolleyPlateCutPosX" y="-UX854SlSupTrolleyPlateCutPosY"/>
+        </shape>
+      </volume>
+
+      <!-- Trolley Pin -->
+      <volume name="lvUX854SlSupTrolleyPin" material="Pipe:Steel316LN" vis="Pipe:Support">
+        <shape type="Tube" name="Ux854SlSupTrolleyPinTubs"
+               dz="0.5*UX854SlSupTrolleyPinLength"
+               rmax="UX854SlSupTrolleyPinRad"/>
+      </volume>
+
+      <!-- Trolley wheel -->
+      <volume name="lvUX854SlSupTrolleyWheel" material="Pipe:Steel" vis="Pipe:Support">
+        <shape type="Tube" name="Ux854SlSupTrolleyWheelTubs"
+               dz="0.5*UX854SlSupTrolleyWheelWidth"
+               rmax="UX854SlSupTrolleyWheelRad + UX854SlSupTrolleyWheelThick"
+               rmin="UX854SlSupTrolleyWheelRad"/>
+      </volume>
+
+      <!-- Trolley -->
+      <volume name="lvUX854SlSupTrolley" vis="Pipe:Support">
+        <physvol name="pvUX854SlSupTrolleyPlate"                 volume="lvUX854SlSupTrolleyPlate"/>
+        <physvol name="pvUX854SlSupTrolleyPin"                   volume="lvUX854SlSupTrolleyPin">
+          <position y="-UX854SlSupTrolleyHolePosY"/>
+        </physvol>
+        <physvol name="pvUX854SlSupTrolleyWheel1"                volume="lvUX854SlSupTrolleyWheel">
+          <position y="-UX854SlSupTrolleyHolePosY" z="UX854SlSupTrolleyWheelPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupTrolleyWheel2"                volume="lvUX854SlSupTrolleyWheel">
+          <position y="-UX854SlSupTrolleyHolePosY" z="-UX854SlSupTrolleyWheelPosZ"/>
+        </physvol>
+      </volume>
+
+      <!-- Rail and trolley assebly -->
+      <volume name="lvUX854SlSupRailTroll" vis="Pipe:Support">
+        <physvol name="pvUX854SlSupRailAssem"                    volume="lvUX854SlSupRailAssem"/>
+        <physvol name="pvUX854SlSupTrolley"                      volume="lvUX854SlSupTrolley">
+          <position z="UX854SlSupRailTrollPosZ"/>
+          <rotation x="90.0*degree"/>
+        </physvol>
+      </volume>
+
+      <!-- Sliding support -->
+      <volume name="lvUX854SlSupLow" vis="Pipe:Support">
+        <physvol name="pvUX854SlSupTop"                          volume="lvUX854SlSupTop"/>
+        <physvol name="pvUX854SlSupRodAss1"                      volume="lvUX854SlSupRodAss">
+          <position x="UX854SlSupRodAssPosX" y="UX854SlSupRodAssPosY" z="-UX854SlSupRodAssPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRodAss2"                      volume="lvUX854SlSupRodAss">
+          <position x="UX854SlSupRodAssPosX" y="-UX854SlSupRodAssPosY" z="-UX854SlSupRodAssPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRodAss3"                      volume="lvUX854SlSupRodAss">
+          <position x="-UX854SlSupRodAssPosX" y="-UX854SlSupRodAssPosY" z="-UX854SlSupRodAssPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupRodAss4"                      volume="lvUX854SlSupRodAss">
+          <position x="-UX854SlSupRodAssPosX" y="UX854SlSupRodAssPosY" z="-UX854SlSupRodAssPosZ"/>
+        </physvol>
+        <physvol name="pvUX854SlSupFoot"                         volume="lvUX854SlSupFoot">
+          <position z="-UX854SlSupFootPosZ"/>
+        </physvol>
+      </volume>
+
+      <volume name="lvUX854SlSup" vis="Pipe:Support">
+        <physvol name="pvUX854SlSupRailTroll"                    volume="lvUX854SlSupRailTroll"/>
+        <physvol name="pvUX854SlSupLow"                          volume="lvUX854SlSupLow">
+          <position z="-UX854SlSupLowPosZ"/>
+        </physvol>
+      </volume>
+
+
+      <!-- UX85-3 Support: Spacer and Collar togheter, sectioning due to regions -->
+      <volume name="lvUX853CollarDownstream" material="Pipe:Al6082" vis="Pipe:Support">
+        <shape type="Tube" name="UX85-3-Collar-B"
+               dz="0.5*UX853CollarDownstreamSize"
+               rmin="UX853CollarInnerRadius"
+               rmax="UX853CollarOuterRadius"/>
+      </volume>
+
+      <!-- UX85-3 Support: Cables -->
+      <volume name="lvUX853CableDownstream" material="Pipe:Steel316LN" vis="Pipe:Support">
+        <shape type="Tube" name="UX85-3-Cable-Downstream"
+               dz="0.5*UX853CableDownstreamLenght"
+               rmax="UX853CableDownstreamRadius"/>
+      </volume>
+
+
+      <envelope type="Assembly" name="lvUX85SupportsDownstream" vis="Pipe:Support">
+        <!-- UX85-3 Support -->
+        <physvol name="pvUX853DownstreamCollar"                  volume="lvUX853CollarDownstream">
+          <position z="0.5*UX853CollarDownstreamSize"/>
+        </physvol>
+
+        <physvol name="pvUX853CableDownstream01"                 volume="lvUX853CableDownstream">
+          <transformation>
+            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
+            <rotation x="90.0*degree" y="0.0*degree" z="0.0*degree"/>
+            <position x="0.0*mm" y="UX853CableDownstreamXYpos" z="UX853CableDownstreamZpos"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853CableDownstream02"                 volume="lvUX853CableDownstream">
+          <transformation>
+            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
+            <rotation x="90.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <position x="UX853CableDownstreamXYpos" y="0.0*mm" z="UX853CableDownstreamZpos"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853CableDownstream03"                 volume="lvUX853CableDownstream">
+          <transformation>
+            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
+            <rotation x="90.0*degree" y="0.0*degree" z="0.0*degree"/>
+            <position x="0.0*mm" y="-UX853CableDownstreamXYpos" z="UX853CableDownstreamZpos"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853CableDownstream04"                 volume="lvUX853CableDownstream">
+          <transformation>
+            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
+            <rotation x="90.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <position x="-UX853CableDownstreamXYpos" y="0.0*mm" z="UX853CableDownstreamZpos"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX854SlSup"                             volume="lvUX854SlSup">
+          <transformation>
+            <position/>
+            <rotation x="-90.0*degree" z="90.0*degree"/>
+            <position y="-100.0*mm - 44.22*mm" z="7663.0*mm"/>
+          </transformation>
+        </physvol>
+      </envelope>
+      <position z="UX853Rich2DownSplitZposIP - Regions:DownstreamZPos"/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-SupportParams.xml b/compact/components/Pipe/2025-v00.00/Downstream-SupportParams.xml
new file mode 100644
index 000000000..ec87b5b17
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Downstream-SupportParams.xml
@@ -0,0 +1,129 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe downstream support                       -->
+<!--===========================================================================-->
+<lccdd>
+
+  <define>
+
+    <constant name="UX854SlSupRodLength" value="154.0*mm"/>
+    <constant name="UX854SlSupRailBaseThick" value="15.0*mm"/>
+    <constant name="UX854SlSupFootBaseY" value="230.0*mm"/>
+    <constant name="UX854SlSupFootBaseX" value="220.0*mm"/>
+    <constant name="UX854SlSupRailBaseHoleOffset" value="10.0*mm"/>
+    <constant name="UX854SlSupTrolleyWheelThick" value="8.0*mm"/>
+    <constant name="UX854SlSupTopHoleInnerRad" value="4.0*mm + 0.01*mm"/>
+    <constant name="UX854SlSupFootTopHoleOffset" value="15.0*mm"/>
+    <constant name="UX854SlSupFootTopThick" value="15.0*mm"/>
+    <constant name="UX854SlSupTopHolePosY" value="80.0*mm"/>
+    <constant name="UX854SlSupTopHolePosX" value="90.0*mm"/>
+    <constant name="UX854SlSupFootTubeLength" value="157.0*mm"/>
+    <constant name="UX854SlSupFootTubeThick" value="4.5*mm"/>
+    <constant name="UX854SlSupFootShimWidth" value="50.0*mm"/>
+    <constant name="UX854SlSupTopHoleCentRad" value="6.5*mm"/>
+    <constant name="UX854SlSupTrolleyPlateCutPosY" value="6.5*mm"/>
+    <constant name="UX854SlSupTopHoleInnerPosY" value="66.0*mm"/>
+    <constant name="UX854SlSupTopHoleCentOffset" value="12.0*mm"/>
+    <constant name="UX854SlSupRailCoverWidth" value="5.0*mm"/>
+    <constant name="UX854SlSupTrolleyPlateHeight" value="30.7*mm"/>
+    <constant name="UX854SlSupTopThick" value="15.0*mm"/>
+    <constant name="UX854SlSupWasherThick" value="6.0*mm"/>
+    <constant name="UX854SlSupTopX" value="220.0*mm"/>
+    <constant name="UX854SlSupTopY" value="200.0*mm"/>
+    <constant name="UX854SlSupFootTopHolePosY" value="80.0*mm"/>
+    <constant name="UX854SlSupTrolleyPinLength" value="83.5*mm"/>
+    <constant name="UX854SlSupFootShimThick" value="10.0*mm"/>
+    <constant name="UX854SlSupNutLength" value="10.0*mm"/>
+    <constant name="UX854SlSupRailCoverThick" value="19.9*mm"/>
+    <constant name="UX854SlSupRodRad" value="6.0*mm"/>
+    <constant name="UX854SlSupTrolleyPlateHolePosY" value="5.35*mm"/>
+    <constant name="UX854SlSupRailBlockHeight" value="28.2*mm"/>
+    <constant name="UX854SlSupLowSeparation" value="80.0*mm"/>
+    <constant name="UX854SlSupTrolleyPlateWidth" value="68.0*mm"/>
+    <constant name="UX854SlSupRailBaseY" value="152.0*mm"/>
+    <constant name="UX854SlSupRailBaseX" value="120.0*mm"/>
+    <constant name="UX854SlSupNutThick" value="4.0*mm"/>
+    <constant name="UX854SlSupRailBaseHoleRad" value="4.5*mm"/>
+    <constant name="UX854SlSupRailScrewHeadLength" value="7.0*mm"/>
+    <constant name="UX854SlSupRailPosY" value="49.0*mm"/>
+    <constant name="UX854SlSupTrolleyPinRad" value="6.0*mm"/>
+    <constant name="UX854SlSupWasherLenght" value="7.0*mm"/>
+    <constant name="UX854SlSupRailBlockWidth" value="11.75*mm"/>
+    <constant name="UX854SlSupTrolleyWheelWidth" value="8.0*mm"/>
+    <constant name="UX854SlSupFootTopCentralHoleRad" value="28.0*mm"/>
+    <constant name="UX854SlSupFootBaseThick" value="20.0*mm"/>
+    <constant name="UX854SlSupFootTubeWidth" value="110.0*mm"/>
+    <constant name="UX854SlSupFootTopX" value="220.0*mm"/>
+    <constant name="UX854SlSupFootTopY" value="230.0*mm"/>
+    <constant name="UX854SlSupTrolleyPlateBlockLength" value="30.0*mm"/>
+    <constant name="UX854SlSupTopHoleInnerPosX" value="30.0*mm"/>
+    <constant name="UX854SlSupFootTopHoleRad" value="6.5*mm"/>
+    <constant name="UX854SlSupRailRodLength" value="70.0*mm"/>
+    <constant name="UX854SlSupRailBaseHolePosX" value="30.0*mm"/>
+    <constant name="UX854SlSupRailBaseHolePosY" value="66.0*mm"/>
+    <constant name="UX854SlSupFootTopHolePosX" value="90.0*mm"/>
+    <constant name="UX854SlSupRailScrewHeadRad" value="7.0*mm"/>
+    <constant name="UX854SlSupRailBaseHoleLength" value="UX854SlSupRailBaseHoleOffset*2 + 0.1*mm"/>
+    <constant name="UX854SlSupRailScrewRad" value="UX854SlSupTopHoleInnerRad - 0.01*mm"/>
+    <constant name="UX854SlSupFootTopHoleLength" value="UX854SlSupFootTopHoleOffset*2 + 0.1*mm"/>
+    <constant name="UX854SlSupRodAssPosY" value="UX854SlSupTopHolePosY"/>
+    <constant name="UX854SlSupRodAssPosX" value="UX854SlSupTopHolePosX"/>
+    <constant name="UX854SlSupFootTubePosZ" value="-UX854SlSupFootTopThick/2 - UX854SlSupFootTubeLength/2 - 0.01*mm"/>
+    <constant name="UX854SlSupFootShimPosX" value="UX854SlSupFootBaseX/2 - UX854SlSupFootShimWidth/2"/>
+    <constant name="UX854SlSupFootShimPosY" value="UX854SlSupFootBaseY/2 - UX854SlSupFootShimWidth/2"/>
+    <constant name="UX854SlSupTopHoleCentWidth" value="UX854SlSupTopHoleCentRad*2"/>
+    <constant name="UX854SlSupTopHoleCentLength" value="UX854SlSupTopHoleCentOffset*2 + 0.1*mm"/>
+    <constant name="UX854SlSupRailScrewLength" value="UX854SlSupTopThick + UX854SlSupRailBaseThick"/>
+    <constant name="UX854SlSupLowPosZ" value="UX854SlSupTopThick + 0.01*mm"/>
+    <constant name="UX854SlSupRodAssPosZ" value="UX854SlSupRodLength/2 - UX854SlSupTopThick/2"/>
+    <constant name="UX854SlSupRodAssNut1PosZ" value="UX854SlSupRodLength/2 - UX854SlSupNutLength/2 - UX854SlSupTopThick - 0.01*mm"/>
+    <constant name="UX854SlSupRailNut1PosZ" value="-UX854SlSupRailBaseThick/2 - UX854SlSupFootTopThick - UX854SlSupNutLength/2 - 5.0*mm"/>
+    <constant name="UX854SlSupWasherRad" value="UX854SlSupRodRad + 0.01*mm"/>
+    <constant name="UX854SlSupNutRad" value="UX854SlSupRodRad + 0.01*mm"/>
+    <constant name="UX854SlSupRailRodRad" value="UX854SlSupRodRad"/>
+    <constant name="UX854SlSupTopHoleRad" value="UX854SlSupRodRad + 0.01*mm"/>
+    <constant name="UX854SlSupTrolleyHolePosY" value="UX854SlSupTrolleyPlateHolePosY"/>
+    <constant name="UX854SlSupRailPosZ" value="UX854SlSupRailBaseThick/2 + UX854SlSupRailBlockHeight/2 + 0.01*mm"/>
+    <constant name="UX854SlSupFootPosZ" value="UX854SlSupLowSeparation + UX854SlSupTopThick/2 + UX854SlSupFootTopThick/2"/>
+    <constant name="UX854SlSupTrolleyPlateLength" value="UX854SlSupRailBaseX"/>
+    <constant name="UX854SlSupRailBlockLength" value="UX854SlSupRailBaseX"/>
+    <constant name="UX854SlSupRailBaseHoleWidth" value="UX854SlSupRailBaseHoleRad*2"/>
+    <constant name="UX854SlSupRailScrewPosZ" value="UX854SlSupTopThick/2 + UX854SlSupRailScrewHeadLength/2 + 0.01*mm"/>
+    <constant name="UX854SlSupTrolleyWheelRad" value="UX854SlSupTrolleyPinRad + 0.01*mm"/>
+    <constant name="UX854SlSupTrolleyPlateHoleRad" value="UX854SlSupTrolleyPinRad + 0.01*mm"/>
+    <constant name="UX854SlSupRailCoverPosY" value="UX854SlSupRailPosY + UX854SlSupRailBlockWidth/2 - UX854SlSupRailCoverThick/2"/>
+    <constant name="UX854SlSupTrolleyWheelPosZ" value="UX854SlSupTrolleyPlateWidth/2 + UX854SlSupTrolleyWheelWidth/2 + 0.01*mm"/>
+    <constant name="UX854SlSupFootTopHoleWidth" value="UX854SlSupFootTopHoleRad*2"/>
+    <constant name="UX854SlSupRailRodPosZ" value="UX854SlSupRailBaseThick/2 - UX854SlSupRailRodLength/2"/>
+    <constant name="UX854SlSupRailScrewPosX" value="UX854SlSupRailBaseHolePosX"/>
+    <constant name="UX854SlSupRailScrewPosY" value="UX854SlSupRailBaseHolePosY"/>
+    <constant name="UX854SlSupFootBasePosZ" value="UX854SlSupFootTubePosZ - UX854SlSupFootTubeLength/2 - UX854SlSupFootBaseThick/2 - 0.01*mm"/>
+    <constant name="UX854SlSupRodAssWasher1PosZ" value="UX854SlSupRodAssNut1PosZ + UX854SlSupNutLength/2 - UX854SlSupLowSeparation + UX854SlSupWasherLenght/2 + 0.01*mm"/>
+    <constant name="UX854SlSupRailNut2PosZ" value="UX854SlSupRailNut1PosZ - UX854SlSupNutLength - 0.01*mm"/>
+    <constant name="UX854SlSupRailBaseCentralHoleRad" value="UX854SlSupRailRodRad + 0.01*mm"/>
+    <constant name="UX854SlSupRailCoverPosZ" value="UX854SlSupRailPosZ + UX854SlSupRailBlockHeight/2 + UX854SlSupRailCoverWidth/2 + 0.01*mm "/>
+    <constant name="UX854SlSupTrolleyPlateCutPosX" value="UX854SlSupTrolleyPlateLength/2 + UX854SlSupTrolleyPlateBlockLength/2 "/>
+    <constant name="UX854SlSupRailCoverLength" value="UX854SlSupRailBlockLength"/>
+    <constant name="UX854SlSupRailTrollPosZ" value="UX854SlSupRailBaseThick/2 + UX854SlSupTrolleyPlateHolePosY + UX854SlSupTrolleyWheelRad + UX854SlSupTrolleyWheelThick + 0.01*mm"/>
+    <constant name="UX854SlSupFootShimPosZ" value="UX854SlSupFootBasePosZ - UX854SlSupFootBaseThick/2 - UX854SlSupFootShimThick/2 - 0.01*mm"/>
+    <constant name="UX854SlSupRodAssWasher2PosZ" value="UX854SlSupRodAssWasher1PosZ - UX854SlSupFootTopThick - UX854SlSupWasherLenght - 0.02*mm"/>
+    <constant name="UX854SlSupRodAssNut2PosZ" value="UX854SlSupRodAssWasher1PosZ + UX854SlSupNutLength/2 + UX854SlSupWasherLenght/2 + 0.01*mm"/>
+    <constant name="UX854SlSupRodAssNut3PosZ" value="UX854SlSupRodAssWasher2PosZ - UX854SlSupWasherLenght/2 - UX854SlSupNutLength/2 -0.01*mm"/>
+    <constant name="UX853CollarDownstreamSize"    value="UX853CollarSize - UX853CollarRich2Size"/>
+
+    <constant name="UX853CableDownstreamLenght"   value="3700.00*mm"/>
+    <constant name="UX853CableDownstreamRadius"   value="2.50*mm"/>
+    <constant name="UX853CableDownstreamZpos"     value="UX853CableZposIP - UX853Rich2DownSplitZposIP"/>
+    <constant name="UX853CableDownstreamXYpos"    value="(UX853CollarOuterRadius + 0.5*UX853CableDownstreamLenght)"/>
+  </define>
+
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-UX853.xml b/compact/components/Pipe/2025-v00.00/Downstream-UX853.xml
new file mode 100644
index 000000000..cad14fd08
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Downstream-UX853.xml
@@ -0,0 +1,124 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--==================================UX853====================================-->
+<!--===========================================================================-->
+<pipe>
+  <!-- UX85-3 Cone 10 mrad of Beryllium cylindrical part for support -->
+  <!-- Split Rich2/Downstream                                        -->
+  <volume name="lvUX853Cone12B" material="Pipe:BeTV56" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-3-Cone10mrad-12B"
+           dz="0.5*UX853Cone12BLenght"
+           rmin2="UX853Cone12BRadiusZmax"
+           rmin1="UX853Cone12BRadiusZmin"
+           rmax2="UX853Cone12BOuterRadius"
+           rmax1="UX853Cone12BOuterRadius"/>
+  </volume>
+
+  <!-- UX85-3 Cone 10 mrad of Beryllium 2.4 mm thick -->
+  <volume name="lvUX853Cone13" material="Pipe:BeTV56" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-3-Cone10mrad-13"
+           dz="0.5*UX853Cone13Lenght"
+           rmin2="UX853Cone13RadiusZmax"
+           rmin1="UX853Cone13RadiusZmin"
+           rmax2="UX853Cone13RadiusZmax + UX853Cone13Thick"
+           rmax1="UX853Cone13RadiusZmin + UX853Cone13Thick"/>
+  </volume>
+
+  <!-- UX85-3 Cone 10 mrad of Beryllium 3.5 mm thick for welding -->
+  <volume name="lvUX853Cone14" material="Pipe:BeTV56" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-3-Cone10mrad-14"
+           dz="0.5*UX853Cone14Lenght"
+           rmin2="UX853Cone14RadiusZmax"
+           rmin1="UX853Cone14RadiusZmin"
+           rmax2="UX853Cone14RadiusZmax + UX853Cone14Thick"
+           rmax1="UX853Cone14RadiusZmin + UX853Cone14Thick"/>
+  </volume>
+
+  <!-- UX85-3 Cone 10 mrad of Aluminium 3.5 mm thick -->
+  <volume name="lvUX853Cone15" material="Pipe:Al2219F" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-3-Cone10mrad-15"
+           dz="0.5*UX853Cone15Lenght"
+           rmin2="UX853Cone15RadiusZmax"
+           rmin1="UX853Cone15RadiusZmin"
+           rmax2="UX853Cone15RadiusZmax + UX853Cone15Thick"
+           rmax1="UX853Cone15RadiusZmin + UX853Cone15Thick"/>
+  </volume>
+
+  <!-- UX85-3 Step 10 mrad of Aluminium for welding to flange -->
+  <volume name="lvUX853Cone16" material="Pipe:Al2219F" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-3-Cone10mrad-16"
+           dz="0.5*UX853Cone16Lenght"
+           rmin2="UX853Cone16RadiusZmax"
+           rmin1="UX853Cone16RadiusZmin"
+           rmax2="UX853Cone16OuterRadius"
+           rmax1="UX853Cone16OuterRadius"/>
+  </volume>
+
+  <!-- UX85-3 Bimetallic Flange - Aluminium -->
+  <volume name="lvUX853Flange17A" material="Pipe:Al2219F" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-3-Flange-17A"
+           dz="0.5*UX853Flange17ALenght"
+           rmin2="UX853Flange17ARadiusZmax"
+           rmin1="UX853Flange17ARadiusZmin"
+           rmax2="UX853Flange17AOuterRadius"
+           rmax1="UX853Flange17AOuterRadius"/>
+  </volume>
+
+  <!-- UX85-3 Bimetallic Flange - St.Steel -->
+  <volume name="lvUX853Flange17B" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-3-Flange-17B"
+           dz="0.5*UX853Flange17BLenght"
+           rmin2="UX853Flange17BRadiusZmax"
+           rmin1="UX853Flange17BRadiusZmin"
+           rmax2="UX853Flange17BOuterRadius"
+           rmax1="UX853Flange17BOuterRadius"/>
+  </volume>
+
+  <!-- Vacuum inside whole of it -->
+  <volume name="lvUX853Vacuum12B" material="Vacuum" vis="Pipe:Vacuum">
+    <shape type="ConeSegment" name="UX85-3-Vacuum-12B"
+           dz="0.5*UX853DownstreamLenght"
+           rmax1="UX853Cone12BRadiusZmin"
+           rmax2="UX853Flange17BRadiusZmax"/>
+  </volume>
+
+  <volume name="lvUX853Downstream" vis="Pipe:Downstream">
+    <physvol name="pvUX853Cone12B"               logvol="lvUX853Cone12B">
+      <position z="UX853Cone12BZpos"/>
+    </physvol>
+    <physvol name="pvUX853Cone13"                logvol="lvUX853Cone13">
+      <position z="UX853Cone13Zpos"/>
+    </physvol>
+    <physvol name="pvUX853Cone14"                logvol="lvUX853Cone14">
+      <position z="UX853Cone14Zpos"/>
+    </physvol>
+    <physvol name="pvUX853Cone15"                logvol="lvUX853Cone15">
+      <position z="UX853Cone15Zpos"/>
+    </physvol>
+    <physvol name="pvUX853Cone16"                logvol="lvUX853Cone16">
+      <position z="UX853Cone16Zpos"/>
+    </physvol>
+    <physvol name="pvUX853Flange17A"             logvol="lvUX853Flange17A">
+      <position z="UX853Flange17AZpos"/>
+    </physvol>
+    <physvol name="pvUX853Flange17B"             logvol="lvUX853Flange17B">
+      <position z="UX853Flange17BZpos"/>
+    </physvol>
+    <!-- Now the vacuum inside -->
+    <physvol name="pvUX853Vacuum12B"             logvol="lvUX853Vacuum12B">
+      <position z="0.5*UX853DownstreamLenght"/>
+    </physvol>
+  </volume>
+
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-UX854.xml b/compact/components/Pipe/2025-v00.00/Downstream-UX854.xml
new file mode 100644
index 000000000..f359dc76a
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Downstream-UX854.xml
@@ -0,0 +1,619 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--==================================UX853====================================-->
+<!--===========================================================================-->
+<pipe>
+
+  <!-- UX85-4 Flange  -->
+  <volume name="lvUX854Flange01" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-4-Flange01"
+           dz="0.5*UX854Flange01Lenght"
+           rmin1="UX854Flange01RadiusZmin"
+           rmin2="UX854Flange01RadiusZmax"
+           rmax1="UX854Flange01OuterRadius"
+           rmax2="UX854Flange01OuterRadius"/>
+  </volume>
+
+  <!-- UX85-4 Cone 10 mrad St.Steel 4 mm thick -->
+  <volume name="lvUX854Cone02" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-4-Cone10mrad-02"
+           dz="0.5*UX854Cone02Lenght"
+           rmin1="UX854Cone02RadiusZmin"
+           rmin2="UX854Cone02RadiusZmax"
+           rmax1="UX854Cone02RadiusZmin + UX854Cone02Thick"
+           rmax2="UX854Cone02RadiusZmax + UX854Cone02Thick"/>
+  </volume>
+
+  <!-- UX85-4 Support flange around pipe -->
+  <volume name="lvUX854SupportFlange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-4-SupportFlange"
+           dz="0.5*UX854SupportFlangeLenght"
+           rmin1="UX854SupportFlangeRadiusZmin"
+           rmin2="UX854SupportFlangeRadiusZmax"
+           rmax1="UX854SupportFlangeOuterRadius"
+           rmax2="UX854SupportFlangeOuterRadius"/>
+  </volume>
+
+  <!-- UX85-4 Cone 10 mrad St.Steel 4 mm thick -->
+  <volume name="lvUX854Cone03" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-4-Cone10mrad-03"
+           dz="0.5*UX854Cone03Lenght"
+           rmin1="UX854Cone03RadiusZmin"
+           rmin2="UX854Cone03RadiusZmax"
+           rmax1="UX854Cone03RadiusZmin + UX854Cone03Thick"
+           rmax2="UX854Cone03RadiusZmax + UX854Cone03Thick"/>
+  </volume>
+
+  <!-- UX85-4 Cone 10 mrad St.Steel connection to window thick -->
+  <volume name="lvUX854Cone04" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-4-Cone10mrad-04"
+           dz="0.5*UX854Cone04Lenght"
+           rmin1="UX854Cone04RadiusZmin"
+           rmin2="UX854Cone04RadiusZmax"
+           rmax1="UX854Cone04RadiusZmin + UX854Cone04Thick"
+           rmax2="UX854Cone04RadiusZmax + UX854Cone04Thick"/>
+  </volume>
+
+  <!-- UX85-4 Window -15 degree St.Steel 3 mm thick -->
+  <volume name="lvUX854Win05Cone" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Sub">
+      <shape type="ConeSegment" name="UX85-4-Window15degree-05"
+             dz="0.5*UX854Win05Lenght"
+             rmin1="UX854Win05RadiusZmin"
+             rmin2="UX854Win05RadiusZmax"
+             rmax1="UX854Win05RadiusZmin + UX854Win05Thick"
+             rmax2="UX854Win05RadiusZmax + UX854Win05Thick"/>
+      <shape type="Tube" name="UX85-4-Win05-Hole-1"
+             dz="0.5*UX854Win05Hole1Length"
+             rmax="UX854Win05Hole1Radius"/>
+      <transformation>
+        <position z="UX854Win05Hole1PosZ"/>
+        <rotation x="UX854Win05Hole1RotX"/>
+        <position/>
+        <rotation z="UX854Win05Hole1RotZ"/>
+        <posRPhiZ r="UX854Win05Hole1PosR" phi="UX854Win05Hole1PosPhi"/>
+      </transformation>
+      <shape type="Tube" name="UX85-4-Win05-Hole-2"
+             dz="0.5*UX854Win05Hole2Length"
+             rmax="UX854Win05Hole2Radius"/>
+      <transformation>
+        <position/>
+        <rotation x="UX854Win05Hole2RotX"/>
+        <position y="UX854Win05Hole2PosY" z="UX854Win05Hole2PosZ"/>
+      </transformation>
+      <shape type="Tube" name="UX85-4-Win05-Hole-3"
+             dz="0.5*UX854Win05Hole3Length"
+             rmax="UX854Win05Hole3Radius"/>
+      <transformation>
+        <position/>
+        <rotation y="UX854Win05Hole3RotY"/>
+        <position x="UX854Win05Hole3PosX" z="UX854Win05Hole3PosZ"/>
+      </transformation>
+      <shape type="Tube" name="UX85-4-Win05-Hole-4"
+             dz="0.5*UX854Win05Hole4Length"
+             rmax="UX854Win05Hole4Radius"/>
+      <transformation>
+        <position/>
+        <rotation y="UX854Win05Hole4RotY"/>
+        <position x="UX854Win05Hole4PosX" z="UX854Win05Hole4PosZ"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <!-- UX85-4 Window, Pipe for hole 1 -->
+  <volume name="lvUX854Win05Pipe1" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe1Sub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-1"
+             dz="0.5*UX854Win05Pipe1Length"
+             rmin="UX854Win05Hole1Radius"
+             rmax="UX854Win05Hole1Radius+UX854Win05Pipe1Thick"/>
+      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-1-Cut"
+             dz="0.5*UX854Win05Lenght"
+             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
+             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
+      <transformation>
+        <position y="UX854Win05Hole1PosR" z="-UX854Win05Hole1PosZ"/>
+        <rotation/>
+        <position/>
+        <rotation x="UX854Win05Hole1RotX"/>
+        <position z="-UX854Win05Pipe1Length/2 + UX854Win05PipeExtra"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe1Vac" material="Vacuum" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe1VacSub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-1Vac"
+             dz="0.5*UX854Win05Pipe1Length"
+             rmax="UX854Win05Hole1Radius-0.01*mm"/>
+      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-1Vac-Cut"
+             dz="0.5*UX854Win05Lenght"
+             rmax1="UX854Win05RadiusZmin + 0.01*mm"
+             rmax2="UX854Win05RadiusZmax + 0.01*mm"/>
+      <transformation>
+        <position y="UX854Win05Hole1PosR" z="-UX854Win05Hole1PosZ"/>
+        <rotation/>
+        <position/>
+        <rotation x="UX854Win05Hole1RotX"/>
+        <position z="-UX854Win05Pipe1Length/2 + UX854Win05PipeExtra"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe1Flange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX854Win05Pipe1Flange"
+           dz="0.5*UX854Win05Pipe1FlangeThick"
+           rmin="UX854Win05Hole1Radius + UX854Win05Pipe1Thick + 0.01*mm"
+           rmax="UX854Win05Pipe1FlangeRad"/>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe1Lid" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX854Win05Pipe1Lid"
+           dz="0.5*UX854Win05Pipe1FlangeThick"
+           rmax="UX854Win05Pipe1FlangeRad"/>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe1Ass" vis="Pipe:Downstream">
+    <physvol name="pvUX854Win05Pipe1"             volume="lvUX854Win05Pipe1"/>
+    <physvol name="pvUX854Win05Pipe1Vac"          volume="lvUX854Win05Pipe1Vac"/>
+    <physvol name="pvUX854Win05Pipe1Flange"       volume="lvUX854Win05Pipe1Flange">
+      <position z="UX854Win05Pipe1Length/2 - UX854Win05Pipe1FlangeThick/2"/>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe1Lid"          volume="lvUX854Win05Pipe1Lid">
+      <position z="UX854Win05Pipe1Length/2 + UX854Win05Pipe1FlangeThick - UX854Win05Pipe1FlangeThick/2"/>
+    </physvol>
+  </volume>
+
+  <!-- UX85-4 Window, Pipe for hole 2 -->
+  <volume name="lvUX854Win05Pipe2" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe2Sub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-2"
+             dz="0.5*UX854Win05Pipe2Length"
+             rmin="UX854Win05Hole2Radius"
+             rmax="UX854Win05Hole2Radius+UX854Win05Pipe2Thick"/>
+      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-2-Cut"
+             dz="0.5*UX854Win05Lenght"
+             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
+             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
+      <transformation>
+        <position y="-UX854Win05Hole2PosY" z="-UX854Win05Hole2PosZ"/>
+        <rotation/>
+        <position/>
+        <rotation x="UX854Win05Hole2RotX"/>
+        <position z="-UX854Win05Pipe2Length/2 + UX854Win05PipeExtra"/>
+      </transformation>
+      <shape type="Box" name="UX85-4-Win05-Pipe-2-Cut2"
+             dx="0.5*UX854Win05Hole2Radius*4"
+             dy="0.5*UX854Win05Hole2Radius*10"
+             dz="0.5*UX854Win05Hole2Radius*4"/>
+      <transformation>
+        <position z="UX854Win05Hole2Radius*2"/>
+        <rotation/>
+        <position/>
+        <rotation x="45.0*degree"/>
+        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe2Vac" material="Vacuum" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe2VacSub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-2Vac"
+             dz="0.5*UX854Win05Pipe2Length"
+             rmax="UX854Win05Hole2Radius-0.01*mm"/>
+      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-2Vac-Cut"
+             dz="0.5*UX854Win05Lenght"
+             rmax1="UX854Win05RadiusZmin + 0.01*mm"
+             rmax2="UX854Win05RadiusZmax + 0.01*mm"/>
+      <transformation>
+        <position y="-UX854Win05Hole2PosY" z="-UX854Win05Hole2PosZ"/>
+        <rotation/>
+        <position/>
+        <rotation x="UX854Win05Hole2RotX"/>
+        <position z="-UX854Win05Pipe2Length/2 + UX854Win05PipeExtra"/>
+      </transformation>
+      <shape type="Box" name="UX85-4-Win05-Pipe-2Vac-Cut2"
+             dx="0.5*UX854Win05Hole2Radius*4"
+             dy="0.5*UX854Win05Hole2Radius*10"
+             dz="0.5*UX854Win05Hole2Radius*4"/>
+      <transformation>
+        <position z="UX854Win05Hole2Radius*2"/>
+        <rotation/>
+        <position/>
+        <rotation x="45.0*degree"/>
+        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe2Extend" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe2ExtendSub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-2Ext"
+             dz="0.5*UX854Win05Pipe2ExtendLength"
+             rmin="UX854Win05Hole2Radius"
+             rmax="UX854Win05Hole2Radius+UX854Win05Pipe2Thick"/>
+      <shape type="Box" name="UX85-4-Win05-Pipe-2Ext-Cut"
+             dx="0.5*UX854Win05Hole2Radius*4"
+             dy="0.5*UX854Win05Hole2Radius*10"
+             dz="0.5*UX854Win05Hole2Radius*4"/>
+      <transformation>
+        <position z="UX854Win05Hole2Radius*2"/>
+        <rotation/>
+        <position/>
+        <rotation x="45.0*degree"/>
+        <position z="UX854Win05Pipe2ExtendLength/2 - UX854Win05Pipe2CutLength"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe2ExtendVac" material="Vacuum" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe2ExtendVacSub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-2ExtVac"
+             dz="0.5*UX854Win05Pipe2ExtendLength"
+             rmax="UX854Win05Hole2Radius-0.01*mm"/>
+      <shape type="Box" name="UX85-4-Win05-Pipe-2ExtVac-Cut"
+             dx="0.5*UX854Win05Hole2Radius*4"
+             dy="0.5*UX854Win05Hole2Radius*10"
+             dz="0.5*UX854Win05Hole2Radius*4"/>
+      <transformation>
+        <position z="UX854Win05Hole2Radius*2"/>
+        <rotation/>
+        <position/>
+        <rotation x="45.0*degree"/>
+        <position z="UX854Win05Pipe2ExtendLength/2 - UX854Win05Pipe2CutLength"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe2Flange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX854Win05Pipe2Flange"
+           dz="0.5*UX854Win05Pipe2FlangeThick"
+           rmin="UX854Win05Hole2Radius + UX854Win05Pipe3Thick + 0.01*mm"
+           rmax="UX854Win05Pipe2FlangeRad"/>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe2Lid" material="Pipe:Steel316LN">
+    <shape type="Tube" name="UX854Win05Pipe2Lid"
+           dz="0.5*UX854Win05Pipe2FlangeThick"
+           rmax="UX854Win05Pipe2FlangeRad"/>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe2Ass" vis="Pipe:Downstream">
+    <physvol name="pvUX854Win05Pipe2"                volume="lvUX854Win05Pipe2"/>
+    <physvol name="pvUX854Win05Pipe2Vac"             volume="lvUX854Win05Pipe2Vac"/>
+    <physvol name="pvUX854Win05Pipe2Extend"          volume="lvUX854Win05Pipe2Extend">
+      <transformation>
+        <position/>
+        <rotation x="-90.0*degree" z="180.0*degree"/>
+        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength + 0.01*mm" y="-UX854Win05Pipe2ExtendLength/2 + UX854Win05Pipe2CutLength - 0.01*mm"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe2ExtendVac"       volume="lvUX854Win05Pipe2ExtendVac">
+      <transformation>
+        <position/>
+        <rotation x="-90.0*degree" z="180.0*degree"/>
+        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength + 0.01*mm" y="-UX854Win05Pipe2ExtendLength/2 + UX854Win05Pipe2CutLength - 0.01*mm"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe2Flange"          volume="lvUX854Win05Pipe2Flange">
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength + 0.01*mm" y="-UX854Win05Pipe2ExtendBasicLength - 0.01*mm + UX854Win05Pipe2FlangeThick/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe2Lid"             volume="lvUX854Win05Pipe2Lid">
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength + 0.01*mm" y="-UX854Win05Pipe2ExtendBasicLength - 0.01*mm - UX854Win05Pipe2FlangeThick + UX854Win05Pipe2FlangeThick/2"/>
+      </transformation>
+    </physvol>
+  </volume>
+
+  <!-- UX85-4 Window, Pipe for hole 3 -->
+  <volume name="lvUX854Win05Pipe3" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe3Sub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-3"
+             dz="0.5*UX854Win05Pipe3Length"
+             rmin="UX854Win05Hole3Radius"
+             rmax="UX854Win05Hole3Radius+UX854Win05Pipe3Thick"/>
+      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-3-Cut"
+             dz="0.5*UX854Win05Lenght"
+             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
+             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
+      <transformation>
+        <position y="UX854Win05Hole3PosX" z="-UX854Win05Hole3PosZ"/>
+        <rotation/>
+        <position/>
+        <rotation x="-UX854Win05Hole3RotY"/>
+        <position z="-UX854Win05Pipe3Length/2 + UX854Win05PipeExtra"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe3Vac" material="Vacuum" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe3VacSub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-3Vac"
+             dz="0.5*UX854Win05Pipe3Length"
+             rmax="UX854Win05Hole3Radius-0.01*mm"/>
+      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-3Vac-Cut"
+             dz="0.5*UX854Win05Lenght"
+             rmax1="UX854Win05RadiusZmin + 0.01*mm"
+             rmax2="UX854Win05RadiusZmax + 0.01*mm"/>
+      <transformation>
+        <position y="UX854Win05Hole3PosX" z="-UX854Win05Hole3PosZ"/>
+        <rotation/>
+        <position/>
+        <rotation x="-UX854Win05Hole3RotY"/>
+        <position z="-UX854Win05Pipe3Length/2 + UX854Win05PipeExtra"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe3Extend" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="union" name="UX854Win05Pipe3ExtendUnion">
+      <shape type="Tube" name="UX854Win05Pipe3ExtendPlate"
+             dz="0.5*UX854Win05Pipe3Thick"
+             rmin="UX854Win05Pipe3Rad"
+             rmax="UX854Win05Hole3Radius + UX854Win05Pipe3Thick"/>
+      <shape type="Tube" name="UX854Win05Pipe3ExtendTubs"
+             dz="0.5*(UX854Win05Pipe3ExtendLength - UX854Win05Pipe3Thick)"
+             rmin="UX854Win05Pipe3Rad"
+             rmax="UX854Win05Pipe3Rad + UX854Win05Pipe3Thick"/>
+      <position z="UX854Win05Pipe3ExtendLength/2 + 0.01*mm"/>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe3ExtendVac" material="Vacuum" vis="Pipe:Vacuum">
+    <shape type="Tube" name="UX854Win05Pipe3ExtendVacTubs"
+           dz="0.5*UX854Win05Pipe3ExtendLength"
+           rmax="UX854Win05Pipe3Rad - 0.01*mm"/>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe3Flange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX854Win05Pipe3Flange"
+           dz="0.5*UX854Win05Pipe3FlangeThick"
+           rmin="UX854Win05Pipe3Rad + UX854Win05Pipe3Thick + 0.01*mm"
+           rmax="UX854Win05Pipe3FlangeRad"/>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe3Lid" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX854Win05Pipe3Lid"
+           dz="0.5*UX854Win05Pipe3FlangeThick"
+           rmax="UX854Win05Pipe3FlangeRad"/>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe3Ass" vis="Pipe:Downstream">
+    <physvol name="pvUX854Win05Pipe3"             volume="lvUX854Win05Pipe3"/>
+    <physvol name="pvUX854Win05Pipe3Vac"          volume="lvUX854Win05Pipe3Vac"/>
+    <physvol name="pvUX854Win05Pipe3Extend"       volume="lvUX854Win05Pipe3Extend">
+      <position z="UX854Win05Pipe3Length/2 + UX854Win05Pipe3Thick/2 + 0.01*mm"/>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe3ExtendVac"    volume="lvUX854Win05Pipe3ExtendVac">
+      <position z="UX854Win05Pipe3Length/2 + UX854Win05Pipe3ExtendLength/2 + 0.01*mm"/>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe3Flange"       volume="lvUX854Win05Pipe3Flange">
+      <position z="UX854Win05Pipe3Length/2 + UX854Win05Pipe3ExtendLength - UX854Win05Pipe3FlangeThick/2"/>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe3Lid"          volume="lvUX854Win05Pipe3Lid">
+      <position z="UX854Win05Pipe3Length/2 + UX854Win05Pipe3ExtendLength + UX854Win05Pipe3FlangeThick - UX854Win05Pipe3FlangeThick/2"/>
+    </physvol>
+  </volume>
+
+  <!-- UX85-4 Window, Pipe for hole 4 -->
+  <volume name="lvUX854Win05Pipe4" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe4Sub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-4"
+             dz="0.5*UX854Win05Pipe4Length"
+             rmin="UX854Win05Hole4Radius"
+             rmax="UX854Win05Hole4Radius+UX854Win05Pipe4Thick"/>
+      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-4-Cut"
+             dz="0.5*UX854Win05Lenght"
+             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
+             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
+      <transformation>
+        <position y="UX854Win05Hole4PosX" z="-UX854Win05Hole4PosZ"/>
+        <rotation/>
+        <position/>
+        <rotation x="-UX854Win05Hole4RotY"/>
+        <position z="-UX854Win05Pipe4Length/2 + UX854Win05PipeExtra"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe4Vac" material="Vacuum" vis="Pipe:Vacuum">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe4VacSub">
+      <shape type="Tube" name="UX85-4-Win05-Pipe-4Vac"
+             dz="0.5*UX854Win05Pipe4Length"
+             rmax="UX854Win05Hole4Radius - 0.01*mm"/>
+      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-4Vac-Cut"
+             dz="0.5*UX854Win05Lenght"
+             rmax1="UX854Win05RadiusZmin + 0.01*mm"
+             rmax2="UX854Win05RadiusZmax + 0.01*mm"/>
+      <transformation>
+        <position y="UX854Win05Hole4PosX" z="-UX854Win05Hole4PosZ"/>
+        <rotation/>
+        <position/>
+        <rotation x="-UX854Win05Hole4RotY"/>
+        <position z="-UX854Win05Pipe4Length/2 + UX854Win05PipeExtra"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe4Flange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX854Win05Pipe4Flange"
+           dz="0.5*UX854Win05Pipe4FlangeThick"
+           rmin="UX854Win05Hole4Radius + UX854Win05Pipe4Thick + 0.01*mm"
+           rmax="UX854Win05Pipe4FlangeRad"/>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe4Lid" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX854Win05Pipe4Lid"
+           dz="0.5*UX854Win05Pipe4FlangeThick"
+           rmax="UX854Win05Pipe4FlangeRad"/>
+  </volume>
+
+  <volume name="lvUX854Win05Pipe4Ass" vis="Pipe:Downstream">
+    <physvol name="pvUX854Win05Pipe4"             volume="lvUX854Win05Pipe4"/>
+    <physvol name="pvUX854Win05Pipe4Vac"          volume="lvUX854Win05Pipe4Vac"/>
+    <physvol name="pvUX854Win05Pipe4Flange"       volume="lvUX854Win05Pipe4Flange">
+      <position z="UX854Win05Pipe4Length/2 - UX854Win05Pipe4FlangeThick/2"/>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe4Lid"          volume="lvUX854Win05Pipe4Lid">
+      <position z="UX854Win05Pipe4Length/2 - UX854Win05Pipe4FlangeThick/2 + UX854Win05Pipe4FlangeThick"/>
+    </physvol>
+  </volume>
+
+  <!-- UX85-4 Window, Mount -->
+  <volume name="lvUX854Win05Mount" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="BooleanShape" operation="subtraction" name="UX854Win05MountSub">
+      <shape type="Box" name="UX85-4-Win05-Mount"
+             dx="0.5*66.0*mm"                dy="0.5*100.0*mm"             dz="0.5*120.0*mm"/>
+      <shape type="ConeSegment" name="UX85-4-Win05-Mount-Cut"
+             dz="0.5*UX854Win05Lenght"
+             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
+             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
+      <position y="100.0*mm/2" z="-599.0*mm/2+54.4*mm+120.0*mm/2"/>
+      <shape type="Box" name="UX85-4-Win05-Mount-Cut2"
+             dx="0.5*(66.0*mm-4.0*mm)"       dy="0.5*(100.0*mm-4.0*mm)"    dz="0.5*(120.0*mm+4.0*mm)"/>
+    </shape>
+  </volume>
+
+
+  <!-- UX85-4 Window, With pipes -->
+  <volume name="lvUX854Win05" vis="Pipe:Downstream">
+    <physvol name="pvUX854Win05Main"          volume="lvUX854Win05Cone"/>
+    <physvol name="pvUX854Win05Pipe1Ass"      volume="lvUX854Win05Pipe1Ass">
+      <transformation>
+        <position z="-UX854Win05PipeExtra + UX854Win05Pipe1Length/2"/>
+        <rotation/>
+        <position z="UX854Win05Hole1PosZ"/>
+        <rotation x="UX854Win05Hole1RotX" z="180.0*degree"/>
+        <position/>
+        <rotation z="UX854Win05Hole1RotZ"/>
+        <posRPhiZ r="UX854Win05Hole1PosR" phi="UX854Win05Hole1PosPhi"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe2Ass"      volume="lvUX854Win05Pipe2Ass">
+      <transformation>
+        <position z="-UX854Win05PipeExtra + UX854Win05Pipe2Length/2"/>
+        <rotation/>
+        <position/>
+        <rotation x="-UX854Win05Hole2RotX"/>
+        <position y="UX854Win05Hole2PosY" z="UX854Win05Hole2PosZ"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe3Ass"      volume="lvUX854Win05Pipe3Ass">
+      <transformation>
+        <position z="-UX854Win05PipeExtra + UX854Win05Pipe3Length/2"/>
+        <rotation/>
+        <position/>
+        <rotation y="UX854Win05Hole3RotY" z="90.0*degree"/>
+        <position x="UX854Win05Hole3PosX" z="UX854Win05Hole3PosZ"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvUX854Win05Pipe4Ass"      volume="lvUX854Win05Pipe4Ass">
+      <transformation>
+        <position z="-UX854Win05PipeExtra + UX854Win05Pipe4Length/2"/>
+        <rotation/>
+        <position/>
+        <rotation y="UX854Win05Hole4RotY" z="90.0*degree"/>
+        <position x="UX854Win05Hole4PosX" z="UX854Win05Hole4PosZ"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvUX854Win05Mount"         volume="lvUX854Win05Mount">
+      <position y="-100.0*mm/2" z="599.0*mm/2-54.4*mm-120.0*mm/2"/>
+    </physvol>
+  </volume>
+
+
+  <!-- UX85-4 Cylinder 3 mm thick -->
+  <volume name="lvUX854Cyl06" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX85-4-Cylinder-06"
+           dz="0.5*UX854Cyl06Lenght"          rmin="UX854Cyl06InnerRadius"      rmax="UX854Cyl06InnerRadius + UX854Cyl06Thick"/>
+  </volume>
+
+  <!-- UX85-4 Cylinder 1.5 mm thick -->
+  <volume name="lvUX854Cyl07" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX85-4-Cylinder-07"
+           dz="0.5*UX854Cyl07Lenght"          rmin="UX854Cyl07InnerRadius"      rmax="UX854Cyl07OuterRadius"/>
+  </volume>
+
+  <!-- UX85-4 Flange -->
+  <volume name="lvUX854Flange08" material="Pipe:Steel316LN" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX85-4-Flange08"
+           dz="0.5*UX854Flange08Lenght"       rmin="UX854Flange08InnerRadius"   rmax="UX854Flange08OuterRadius"/>
+  </volume>
+
+  <!-- Vacuum in 10 mrad -->
+  <volume name="lvUX854Vacuum01" material="Vacuum" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-4-Vacuum-01"
+           dz="0.5*UX854Vacuum01Lenght"       rmax1="UX854Flange01RadiusZmin"   rmax2="UX854Cone04RadiusZmax"/>
+  </volume>
+
+  <!-- Vacuum in -15 degree window -->
+  <volume name="lvUX854Vacuum05" material="Vacuum" vis="Pipe:Downstream">
+    <shape type="ConeSegment" name="UX85-4-Vacuum-05"
+           dz="0.5*UX854Vacuum05Lenght"       rmax1="UX854Win05RadiusZmin"     rmax2="UX854Win05RadiusZmax"/>
+  </volume>
+
+  <!-- Vacuum in cylinders -->
+  <volume name="lvUX854Vacuum06" material="Vacuum" vis="Pipe:Downstream">
+    <shape type="Tube" name="UX85-4-Vacuum-06"
+           dz="0.5*UX854Vacuum06Lenght"       rmax="UX854Cyl06InnerRadius"/>
+  </volume>
+
+  <!-- UX85-4 Pipes St.Steel -->
+  <volume name="lvUX854" vis="Pipe:Downstream">
+    <physvol name="pvUX854Flange01"           volume="lvUX854Flange01">
+      <position z="UX854Flange01Zpos"/>
+    </physvol>
+    <physvol name="pvUX854Cone02"             volume="lvUX854Cone02">
+      <position z="UX854Cone02Zpos"/>
+    </physvol>
+    <physvol name="pvUX854SupportFlange"      volume="lvUX854SupportFlange">
+      <position z="UX854SupportFlangeZpos"/>
+    </physvol>
+    <physvol name="pvUX854Cone03"             volume="lvUX854Cone03">
+      <position z="UX854Cone03Zpos"/>
+    </physvol>
+    <physvol name="pvUX854Cone04"             volume="lvUX854Cone04">
+      <position z="UX854Cone04Zpos"/>
+    </physvol>
+    <physvol name="pvUX854Win05"              volume="lvUX854Win05">
+      <position z="UX854Win05Zpos"/>
+    </physvol>
+    <physvol name="pvUX854Cyl06"              volume="lvUX854Cyl06">
+      <position z="UX854Cyl06Zpos"/>
+    </physvol>
+    <physvol name="pvUX854Cyl07"              volume="lvUX854Cyl07">
+      <position z="UX854Cyl07Zpos"/>
+    </physvol>
+    <physvol name="pvUX854Flange08"           volume="lvUX854Flange08">
+      <position z="UX854Flange08Zpos"/>
+    </physvol>
+    <physvol name="pvUX854Vacuum01"           volume="lvUX854Vacuum01">
+      <position z="0.5*UX854Vacuum01Lenght"/>
+    </physvol>
+    <physvol name="pvUX854Vacuum05"           volume="lvUX854Vacuum05">
+      <position z="UX854Vacuum01Lenght + 0.5*UX854Vacuum05Lenght"/>
+    </physvol>
+    <physvol name="pvUX854Vacuum06"
+             volume="lvUX854Vacuum06">
+      <position z="UX854Vacuum01Lenght + UX854Vacuum05Lenght+ 0.5*UX854Vacuum06Lenght"/>
+    </physvol>
+
+  </volume>
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream.xml b/compact/components/Pipe/2025-v00.00/Downstream.xml
new file mode 100644
index 000000000..1beb42a19
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Downstream.xml
@@ -0,0 +1,46 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+
+    <!--==================================================================================-->
+    <!--===================================Bakeout========================================-->
+    <!--==================================================================================-->
+    <detector name="DownstreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeDownstream:parent}" vis="Pipe:Vis">
+
+      <include ref="Downstream-UX853.xml"/>
+      <include ref="Downstream-UX854.xml"/>
+      <include ref="Downstream-Compensator.xml"/>
+
+      <!--==================================================================================-->
+      <!--===================================Final  Assembly================================-->
+      <!--==================================================================================-->
+      <envelope type="Assembly" name="lvUX85Downstream" vis="GreenVis">
+        <physvol name="pvUX853Downstream"      volume="lvUX853Downstream">
+          <position z="0*mm"/>
+        </physvol>
+        <physvol name="pvUX85Compensator13100" volume="lvUX85Compensator13100">
+          <position z="UX853DownstreamLenght"/>
+        </physvol>
+        <physvol name="pvUX854"                volume="lvUX854">
+          <position z="UX853DownstreamLenght + UX85C13100Lenght"/>
+        </physvol>
+      </envelope>
+      <position z="UX853Rich2DownSplitZposIP - Regions:DownstreamZPos"/>
+
+      <nodebug/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InRich1-Params.xml b/compact/components/Pipe/2025-v00.00/InRich1-Params.xml
new file mode 100644
index 000000000..095a883ed
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/InRich1-Params.xml
@@ -0,0 +1,75 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+
+  <define>
+    <!-- this file contains the geometry parameters for Rich1 BeamPipe -->
+
+    <constant name="Rh1BeamPipeThickness" value="UX851Cyl04Thick"/>
+    <constant name="Rh1BeamPipeUpsAssemblyLHCbZ" value="UX851ZStartIP"/>
+    <constant name="Rh1BeamPipeConeUpsAddtionalLargeZSize" value="300.0*mm"/>
+    <constant name="Rh1BeamPipeHoleRadialTolerence" value="1.0*mm"/>
+    <constant name="Rh1BeamPipeDnstFlangeRadialThickness" value="9.75*mm"/>
+    <constant name="Rh1BeamPipeDnstFlangeInnerRad" value="UX851Rich1FlangeRadiusZMax"/>
+    <constant name="Rh1BeamPipeConeInnerRad2" value="UX851Cone05BRadiusZmax"/>
+    <constant name="Rh1SubMasterHoleZSizeAfterMagSh" value="Rh1SubMasterDnstrZLim-Rh1MagShMainPartDnsZLim"/>
+    <constant name="Rh1BeamPipeConeDnsAddtionalLargeZSize" value="300.0*mm"/>
+    <constant name="Rh1BeamPipeCylBeginInLHCbZ" value="UX851Rich1SplitZminIP"/>
+    <constant name="Rh1SubMasterHoleRadiusAfterMagSh" value="UX851Cone05BRadiusZmax+2.0*mm"/>
+    <constant name="Rh1BeamPipeAssemblyInSubMasterLHCbZ" value="UX851ZStartIP"/>
+    <constant name="Rh1BeamPipeCylInnerRad" value="UX851Cyl04Radius"/>
+    <constant name="Rh1BeamPipeCylEndInLHCbZ" value="1080.0*mm"/>
+    <constant name="Rh1BeamPipeDnstFlangeZBeginInLHCb" value="UX851Rich1FlangeOffsetIP"/>
+    <constant name="Rh1BeamPipeHoleZTolerence" value="0.1*mm"/>
+    <constant name="Rh1BeamPipeDnsAssemblyLHCbZ" value="UX851ZStartIP"/>
+    <constant name="Rh1BeamPipeDnstFlangeZSize" value="UX851Rich1Flange1Length"/>
+    <constant name="Rh1BeamPipeConeEndInLHCbZ" value="2210.0*mm"/>
+    <constant name="Rh1BeamPipeUpsAssemblyRMZ" value="Rh1BeamPipeUpsAssemblyLHCbZ-Rich1MasterZ"/>
+    <constant name="Rh1BeamPipeDnstFlangeOuterRad" value="Rh1BeamPipeDnstFlangeInnerRad+Rh1BeamPipeDnstFlangeRadialThickness"/>
+    <constant name="Rh1BeamPipeConeOuterRad2" value="Rh1BeamPipeConeInnerRad2+Rh1BeamPipeThickness"/>
+    <constant name="Rh1SubMasterHoleZLocationAfterMagSh" value="Rh1MagShMainPartDnsZLim+0.5*Rh1SubMasterHoleZSizeAfterMagSh-Rh1SubMasterZ-Rich1MasterZ"/>
+    <constant name="Rh1BeamPipeExtendedConeZShift" value="0.5*(Rh1BeamPipeConeDnsAddtionalLargeZSize-Rh1BeamPipeConeUpsAddtionalLargeZSize)"/>
+    <constant name="Rh1BeamPipeAssemblyZ" value="Rh1BeamPipeAssemblyInSubMasterLHCbZ-Rich1MasterZ-Rh1SubMasterZ"/>
+    <constant name="Rh1BeamPipeConeInnerRad1" value="Rh1BeamPipeCylInnerRad"/>
+    <constant name="Rh1BeamPipeCylOuterRad" value="Rh1BeamPipeCylInnerRad+Rh1BeamPipeThickness"/>
+    <constant name="Rh1BeamPipeConeBeginInLHCbZ" value="Rh1BeamPipeCylEndInLHCbZ"/>
+    <constant name="Rh1BeamPipeCylZSize" value="Rh1BeamPipeCylEndInLHCbZ-Rh1BeamPipeCylBeginInLHCbZ"/>
+    <constant name="Rh1BeamPipeDnsAssemblyRMZ" value="Rh1BeamPipeDnsAssemblyLHCbZ-Rich1MasterZ"/>
+    <constant name="Rh1BeamPipeDnstFlangeHoleZSize" value="Rh1BeamPipeDnstFlangeZSize+2.0*Rh1BeamPipeHoleZTolerence"/>
+    <constant name="Rh1BeamPipeDnstFlangeZInLHCb" value="Rh1BeamPipeDnstFlangeZBeginInLHCb+0.5*Rh1BeamPipeDnstFlangeZSize"/>
+    <constant name="Rh1BeamPipeDnstFlangeHoleOuterRad" value="Rh1BeamPipeDnstFlangeOuterRad+Rh1BeamPipeHoleRadialTolerence"/>
+    <constant name="Rh1BeamPipeConeHoleOuterRad2" value="Rh1BeamPipeConeOuterRad2+Rh1BeamPipeHoleRadialTolerence"/>
+    <constant name="Rh1BeamPipeConeOuterRad1" value="Rh1BeamPipeConeInnerRad1+Rh1BeamPipeThickness"/>
+    <constant name="Rh1BeamPipeCylHoleOuterRad" value="Rh1BeamPipeCylOuterRad+Rh1BeamPipeHoleRadialTolerence"/>
+    <constant name="Rh1BeamPipeConeBeginInRh1SubMasterZ" value="Rh1BeamPipeConeBeginInLHCbZ-Rich1MasterZ-Rh1SubMasterZ"/>
+    <constant name="Rh1BeamPipeConeZSize" value="Rh1BeamPipeConeEndInLHCbZ-Rh1BeamPipeConeBeginInLHCbZ"/>
+    <constant name="Rh1BeamPipeDnstFlangeRMZ" value="Rh1BeamPipeDnstFlangeZInLHCb-Rich1MasterZ"/>
+    <constant name="Rh1BeamPipeConeHoleOuterRad1" value="Rh1BeamPipeConeOuterRad1+Rh1BeamPipeHoleRadialTolerence"/>
+    <constant name="Rh1BeamPipeConeSlope" value="(Rh1BeamPipeConeOuterRad2-Rh1BeamPipeConeOuterRad1)/Rh1BeamPipeConeZSize"/>
+    <constant name="Rh1BeamPipeExtendedConeHoleZSize" value="Rh1BeamPipeConeZSize+Rh1BeamPipeConeUpsAddtionalLargeZSize+Rh1BeamPipeConeDnsAddtionalLargeZSize"/>
+    <constant name="Rh1BeamPipeConeRMZ" value="Rh1BeamPipeConeBeginInLHCbZ+(0.5*Rh1BeamPipeConeZSize)-Rich1MasterZ"/>
+    <constant name="Rh1BeamPipeDnstFlangeZ" value="Rh1BeamPipeDnstFlangeRMZ-Rh1SubMasterZ"/>
+    <constant name="Rh1BeamPipeExtendedConeHoleOuterRad1" value="Rh1BeamPipeConeHoleOuterRad1-(Rh1BeamPipeConeUpsAddtionalLargeZSize*Rh1BeamPipeConeSlope)"/>
+    <constant name="Rh1BeamPipeExtendedConeHoleOuterRad2" value="Rh1BeamPipeConeHoleOuterRad2+(Rh1BeamPipeConeDnsAddtionalLargeZSize*Rh1BeamPipeConeSlope)"/>
+    <constant name="Rh1Mirror1BeamPipeConeZSize" value="Rh1BeamPipeExtendedConeHoleZSize"/>
+    <constant name="Rh1BeamPipeExtendedConeHoleRMZ" value="Rh1BeamPipeConeRMZ+Rh1BeamPipeExtendedConeZShift"/>
+    <constant name="Rh1BeamPipeConeZ" value="Rh1BeamPipeConeRMZ-Rh1SubMasterZ"/>
+    <!--parameter name="Rh1Mirror1BeamPipeConeOuterRad1" value="Rh1BeamPipeExtendedConeHoleOuterRad1+Rh1Mirror1BeamPipeHoleRadialTolerance" /-->
+    <!--parameter name="Rh1Mirror1BeamPipeConeOuterRad2" value="Rh1BeamPipeExtendedConeHoleOuterRad2+Rh1Mirror1BeamPipeHoleRadialTolerance" /-->
+    <constant name="Rh1BeamPipeExtendedConeHoleZ" value="Rh1BeamPipeExtendedConeHoleRMZ-Rh1SubMasterZ"/>
+    <!--parameter name="Rh1Mirror1BeamPipeConeX" value="Rh1BeamPipeExtendedConeHoleZ-Rh1Mirror1CCZ-Rh1MirrorSingleADiagDeltaZ" /-->
+
+  </define>
+
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InRich1.xml b/compact/components/Pipe/2025-v00.00/InRich1.xml
new file mode 100644
index 000000000..0eb7099ae
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/InRich1.xml
@@ -0,0 +1,234 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe inside the UT region                     -->
+<!--===========================================================================-->
+<!--==================================Pipe In  UT=============================-->
+<!--===========================================================================-->
+<lccdd>
+
+      <!-- UX85-1 Step to 54 mm diameter (after RF connection in Velo2Rich1 -->
+      <volume name="lvUX851Cyl01" material="Pipe:Al2219F" vis="Pipe:InRich1">
+        <shape type="Tube" name="UX85-1-Cylinder-01"
+              dz="0.5*UX851Cyl01Lenght"
+              rmin="UX851Cyl01Radius"
+              rmax="UX851Cyl01Radius+UX851Cyl01Thick"/>
+      </volume>
+
+      <!-- UX85-1 Cylinder 54 mm diamater Aluminium -->
+      <volume name="lvUX851Cyl02" material="Pipe:Al2219F" vis="Pipe:InRich1">
+        <shape type="Tube" name="UX85-1-Cylinder-02"
+              dz="0.5*UX851Cyl02Lenght"
+              rmin="UX851Cyl02Radius"
+              rmax="UX851Cyl02Radius+UX851Cyl02Thick"/>
+      </volume>
+
+      <!-- UX85-1 Cylinder 54 mm diamater Beryllium - RICH1SubMaster split -->
+      <volume name="lvUX851Cyl03A" material="Pipe:BeTV56" vis="Pipe:InRich1">
+        <shape type="Tube" name="UX85-1-Cylinder-03A"
+              dz="0.5*UX851Cyl03ALenght"
+              rmin="UX851Cyl03Radius"
+              rmax="UX851Cyl03Radius+UX851Cyl03Thick"/>
+      </volume>
+      <volume name="lvUX851Cyl03B" material="Pipe:BeTV56" vis="Pipe:InRich1">
+        <shape type="Tube" name="UX85-1-Cylinder-03B"
+              dz="0.5*UX851Cyl03BLenght"
+              rmin="UX851Cyl03Radius"
+              rmax="UX851Cyl03Radius+UX851Cyl03Thick"/>
+      </volume>
+
+      <!-- UX85-1 Cylinder 54 mm diamater Beryllium -->
+      <volume name="lvUX851Cyl04" material="Pipe:BeTV56" vis="Pipe:InRich1">
+        <shape type="Tube" name="UX85-1-Cylinder-04"
+              dz="0.5*UX851Cyl04Lenght"
+              rmin="UX851Cyl04Radius"
+              rmax="UX851Cyl04Radius+UX851Cyl04Thick"/>
+      </volume>
+
+      <!-- UX85-1 Cone 25 mrad - RICH1SubMaster split -->
+      <volume name="lvUX851Cone05A" material="Pipe:BeTV56" vis="Pipe:InRich1">
+        <shape type="ConeSegment" name="UX85-1-Cone25mrad-05A"
+              dz="0.5*UX851Cone05ALenght"
+              rmin2="UX851Cone05ARadiusZmax"
+              rmin1="UX851Cone05ARadiusZmin"
+              rmax2="UX851Cone05ARadiusZmax+UX851Cone05Thick"
+              rmax1="UX851Cone05ARadiusZmin+UX851Cone05Thick"/>
+      </volume>
+      <volume name="lvUX851Cone05B" material="Pipe:BeTV56" vis="Pipe:InRich1">
+        <shape type="ConeSegment" name="UX85-1-Cone25mrad-05B"
+              dz="0.5*UX851Cone05BLenght"
+              rmin2="UX851Cone05BRadiusZmax"
+              rmin1="UX851Cone05BRadiusZmin"
+              rmax2="UX851Cone05BRadiusZmax+UX851Cone05Thick"
+              rmax1="UX851Cone05BRadiusZmin+UX851Cone05Thick"/>
+      </volume>
+
+      <!-- UX85-1 Flange to seal to RICH1 - Around beam pipe -->
+      <!-- 10 microns is added to avoid intersections        -->
+      <volume name="lvUX851Rich1Flange" material="Pipe:BeTV56" vis="Pipe:InRich1">
+        <shape type="ConeSegment" name="UX85-1-Rich1Flange"
+              dz="0.5*UX851Rich1Flange1Length"
+              rmin2="UX851Rich1FlangeRadiusZMax+0.10*mm"
+              rmin1="UX851Rich1FlangeRadiusZmin+0.10*mm"
+              rmax2="UX851Rich1FlangeOuterRadius"
+              rmax1="UX851Rich1FlangeOuterRadius"/>
+      </volume>
+
+      <!-- UX85-1 Window of -37 degree at end of 25 mrad cone -->
+      <volume name="lvUX851Win06" material="Pipe:BeTV56" vis="Pipe:InRich1">
+        <shape type="ConeSegment" name="UX85-1-Window37degree-06"
+              dz="0.5*UX851Win06Lenght"
+              rmin2="UX851Win06RadiusZmax"
+              rmin1="UX851Win06RadiusZmin"
+              rmax2="UX851Win06RadiusZmax+UX851Win06Thick"
+              rmax1="UX851Win06RadiusZmin+UX851Win06Thick"/>
+      </volume>
+
+      <!-- UX85-1 Cylinder of 50 mm diameter -->
+      <volume name="lvUX851Cyl07A" material="Pipe:BeTV56" vis="Pipe:InRich1">
+        <shape type="Tube" name="UX85-1-Cylinder-07A"
+              dz="0.5*UX851Cyl07ALenght"
+              rmin="UX851Cyl07Radius"
+              rmax="UX851Cyl07Radius+UX851Cyl07Thick"/>
+      </volume>
+
+      <!-- Vacuum in UX851Cyl01, UX851Cyl02, UX851Cyl03A in Rich1 Master -->
+      <volume name="lvUX851Vacuum01" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="Tube" name="UX85-1-Vacuum-01"
+              dz="0.5*UX85Vacuum01Lenght"
+              rmax="UX851Cyl01Radius"/>
+      </volume>
+
+      <!-- Vacuum in UX851Cyl03B, UX851Cyl04 in Rich1 SubMaster -->
+      <volume name="lvUX851Vacuum03B" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="Tube" name="UX85-1-Vacuum-03B"
+              dz="0.5*UX85Vacuum03BLenght"
+              rmax="UX851Cyl03Radius"/>
+      </volume>
+
+      <!-- Vacuum in UX851Cone05A in Rich1 SubMaster -->
+      <volume name="lvUX851Vacuum05A" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="ConeSegment" name="UX85-1-Vacuum-05A"
+              dz="0.5*UX851Cone05ALenght"
+              rmax1="UX851Cone05ARadiusZmin"
+              rmax2="UX851Cone05ARadiusZmax"/>
+      </volume>
+
+      <!-- Vacuum in UX851Cone05B in Rich1 Master -->
+      <volume name="lvUX851Vacuum05B" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="ConeSegment" name="UX85-1-Vacuum-05B"
+              dz="0.5*UX851Cone05BLenght"
+              rmax1="UX851Cone05BRadiusZmin"
+              rmax2="UX851Cone05BRadiusZmax"/>
+      </volume>
+
+      <!-- Vacuum in UX851Win06 in Rich1 Master -->
+      <volume name="lvUX851Vacuum06" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="ConeSegment" name="UX85-1-Vacuum-06"
+              dz="0.5*UX851Win06Lenght"
+              rmax1="UX851Win06RadiusZmin"
+              rmax2="UX851Win06RadiusZmax"/>
+      </volume>
+
+      <!-- Vacuum in UX851Cyl07A in Rich1 Master -->
+      <volume name="lvUX851Vacuum07A" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="Tube" name="UX85-1-Vacuum-07A"
+              dz="0.5*UX851Cyl07ALenght"
+              rmax="UX851Cyl07Radius"/>
+      </volume>
+
+      <!-- Before SubMaster -->
+      <volume name="lvUX851InRich1BeforeSubM" vis="Pipe:InRich1">
+        <!-- Pipes of Al and Be -->
+        <physvol name="pvUX851Cyl01"                 volume="lvUX851Cyl01">
+          <position z="UX851Cyl01Zpos"/>
+        </physvol>
+        <physvol name="pvUX851Cyl02"                 volume="lvUX851Cyl02">
+          <position z="UX851Cyl02Zpos"/>
+        </physvol>
+        <physvol name="pvUX851Cyl03A"                volume="lvUX851Cyl03A">
+          <position z="UX851Cyl03AZpos"/>
+        </physvol>
+        <!-- Now the vacuum inside -->
+        <physvol name="pvUX851Vacuum01"              volume="lvUX851Vacuum01">
+          <position z="0.5*UX85Vacuum01Lenght"/>
+        </physvol>
+
+      </volume>
+
+      <!-- In SubMaster -->
+      <volume name="lvUX851InRich1SubMaster" vis="Pipe:InRich1">
+        <physvol name="pvUX851Cyl03B"                volume="lvUX851Cyl03B">
+          <position z="UX851Cyl03BZpos"/>
+        </physvol>
+        <physvol name="pvUX851Cyl04"                 volume="lvUX851Cyl04">
+          <position z="UX851Cyl04Zpos"/>
+        </physvol>
+        <physvol name="pvUX851Cone05A"               volume="lvUX851Cone05A">
+          <position z="UX851Cone05AZpos"/>
+        </physvol>
+
+        <!-- Now the vacuum inside -->
+        <physvol name="pvUX851Vacuum03B"             volume="lvUX851Vacuum03B">
+          <position z="UX85Vacuum01Lenght+0.5*UX85Vacuum03BLenght"/>
+        </physvol>
+        <physvol name="pvUX851Rich1Flange"           volume="lvUX851Rich1Flange">
+          <position z="UX851Rich1FlangeZpos"/>
+        </physvol>
+        <physvol name="pvUX851Vacuum05A"             volume="lvUX851Vacuum05A">
+          <position z="UX85Vacuum01Lenght+UX85Vacuum03BLenght+0.5*UX851Cone05ALenght"/>
+        </physvol>
+
+      </volume>
+
+      <!-- After SubMaster -->
+      <volume name="lvUX851InRich1AfterSubM" vis="Pipe:InRich1">
+        <physvol name="pvUX851Cone05B"               volume="lvUX851Cone05B">
+          <position z="UX851Cone05BZpos"/>
+        </physvol>
+        <physvol name="pvUX851Win06"                 volume="lvUX851Win06">
+          <position z="UX851Win06Zpos"/>
+        </physvol>
+        <physvol name="pvUX851Cyl07A"                volume="lvUX851Cyl07A">
+          <position z="UX851Cyl07AZpos"/>
+        </physvol>
+        <!-- Now the vacuum inside -->
+        <physvol name="pvUX851Vacuum05B"             volume="lvUX851Vacuum05B">
+          <position z="UX85Vacuum01Lenght+UX85Vacuum03BLenght+UX851Cone05ALenght+
+                       0.5*UX851Cone05BLenght"/>
+        </physvol>
+        <physvol name="pvUX851Vacuum06"              volume="lvUX851Vacuum06">
+          <position z="UX85Vacuum01Lenght+UX85Vacuum03BLenght+UX851Cone05ALenght+
+                       UX851Cone05BLenght+0.5*UX851Win06Lenght"/>
+        </physvol>
+        <physvol name="pvUX851Vacuum07A"             volume="lvUX851Vacuum07A">
+          <position z="UX85Vacuum01Lenght+UX85Vacuum03BLenght+UX851Cone05ALenght+
+                       UX851Cone05BLenght+UX851Win06Lenght+0.5*UX851Cyl07ALenght"/>
+        </physvol>
+      </volume>
+
+      <envelope type="Assembly" name="lvPipeInRich1" vis="Pipe:InRich1">
+        <!--    Begin Rich1MasterBeamPipe
+                This is the part upstream of rich1 submaster
+                and downstream of rich1submaster -->
+        <physvol name="pvUX851InRich1BeforeSubM"      volume="lvUX851InRich1BeforeSubM" >
+          <position z="Rh1BeamPipeUpsAssemblyRMZ"/>
+        </physvol>
+        <physvol name="pvUX851InRich1AfterSubM"       volume="lvUX851InRich1AfterSubM" >
+          <position z="Rh1BeamPipeDnsAssemblyRMZ"/>
+        </physvol>
+        <!-- This is the part inside of rich1 submaster  -->
+        <physvol name="pvUX851InRich1SubMaster"       volume="lvUX851InRich1SubMaster" >
+          <position z="Rh1BeamPipeAssemblyZ"/>
+        </physvol>
+      </envelope>
+      <position/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InT.xml b/compact/components/Pipe/2025-v00.00/InT.xml
new file mode 100644
index 000000000..511c69b7b
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/InT.xml
@@ -0,0 +1,77 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe inside the T region                      -->
+<!--===========================================================================-->
+<!--================================== Pipe In   T=============================-->
+<!--===========================================================================-->
+<lccdd>
+
+  <detectors>
+    <detector name="PipeInT" type="DD4hep_VolumeAssembly" parent="${PipeInT:parent}" vis="Pipe:Vis">
+      <!-- UX85-3 Cone 10 mrad of Beryllium 1.6 mm thick - Split Magnet/T -->
+      <volume name="lvUX853Cone05B" material="Pipe:BeTV56" vis="Pipe:InT">
+        <shape type="ConeSegment" name="UX85-3-Cone10mrad-05B"
+               dz="UX853Cone05BLenght/2"
+               rmin2="UX853Cone05BRadiusZmax"
+               rmin1="UX853Cone05BRadiusZmin"
+               rmax2="UX853Cone05BRadiusZmax + UX853Cone05BThick"
+               rmax1="UX853Cone05BRadiusZmin + UX853Cone05BThick"/>
+      </volume>
+      <!-- UX85-3 Cone 10 mrad of Beryllium 1.7 mm thick -->
+      <volume name="lvUX853Cone06" material="Pipe:BeTV56" vis="Pipe:InT">
+        <shape type="ConeSegment" name="UX85-3-Cone10mrad-06"
+               dz="UX853Cone06Lenght/2"
+               rmin2="UX853Cone06RadiusZmax"
+               rmin1="UX853Cone06RadiusZmin"
+               rmax2="UX853Cone06RadiusZmax + UX853Cone06Thick"
+               rmax1="UX853Cone06RadiusZmin + UX853Cone06Thick"/>
+      </volume>
+      <!-- UX85-3 Cone 10 mrad of Beryllium 1.9 mm thick - Split T/Rich2 -->
+      <volume name="lvUX853Cone07A" material="Pipe:BeTV56" vis="Pipe:InT">
+        <shape type="ConeSegment" name="UX85-3-Cone10mrad-07A"
+               dz="UX853Cone07ALenght/2"
+               rmin2="UX853Cone07ARadiusZmax"
+               rmin1="UX853Cone07ARadiusZmin"
+               rmax2="UX853Cone07ARadiusZmax + UX853Cone07AThick"
+               rmax1="UX853Cone07ARadiusZmin + UX853Cone07AThick"/>
+      </volume>
+      <!-- Vacuum in UX85-3 in T whole lenght -->
+      <volume name="lvUX853Vacuum05B" material="Vacuum" vis="Pipe:InT">
+        <shape type="ConeSegment" name="UX85-3-Vacuum-05B"
+               dz="UX853InTLenght/2"
+               rmax1="UX853Cone05BRadiusZmin"
+               rmax2="UX853Cone07ARadiusZmax"/>
+      </volume>
+
+      <!-- For the moment assume sections put at 0.0 of this (set with center at split  -->
+      <envelope type="Assembly" name="lvUX853InT" vis="Pipe:InT">
+        <!-- Pipe of Be -->
+        <physvol name="pvUX853Cone05B"           volume="lvUX853Cone05B">
+          <position z="UX853Cone05BZpos"/>
+        </physvol>
+        <physvol name="pvUX853Cone06"            volume="lvUX853Cone06">
+          <position z="UX853Cone06Zpos"/>
+        </physvol>
+        <physvol name="pvUX853Cone07A"           volume="lvUX853Cone07A">
+          <position z="UX853Cone07AZpos"/>
+        </physvol>
+        <!-- Now the vacuum inside -->
+        <physvol name="pvUX853Vacuum05B"         volume="lvUX853Vacuum05B">
+          <position z="0.5*UX853InTLenght"/>
+        </physvol>
+
+      </envelope>
+        <position z="UX853MagnetTSplitZposIP - Regions:TZPos"/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InTV.xml b/compact/components/Pipe/2025-v00.00/InTV.xml
new file mode 100644
index 000000000..0c88e1539
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/InTV.xml
@@ -0,0 +1,392 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe inside the TV region                      -->
+<!--===========================================================================-->
+<!--==================================Pipe In  TV=============================-->
+<!--===========================================================================-->
+<lccdd>
+
+  <define>
+    <!-- ****************************************************** -->
+    <!-- * Definition of CuBe pipe sections in velo tank      * -->
+    <!-- * and supports                                       * -->
+    <!-- ****************************************************** -->
+
+    <!-- SPOKE CAP:
+	 - this is the small cap at the end of the spokes which are supposed
+	 to support the wf suppressor end and the punctured CuBe pipe.
+	 Let's start with a simplified conical description, not corresponding
+	 to actual shape.
+	 z_end_wf should correspond here to z_end. If not, adjust.
+	 - see CDD drawings:  ...
+	 - centered to beam axis
+	 - material: aluminium
+	 cone1:  r_in_start=47   r_out_start=57   z_start=-470
+         r_in_end=27   r_out_end=37   z_end=-540 -->
+
+    <constant name="PipeTV:SpokeZ" value="70*mm"/>
+    <constant name="PipeTV:SpokeInnerRPZ" value="47*mm"/>
+    <constant name="PipeTV:SpokeInnerRMZ" value="27*mm"/>
+    <constant name="PipeTV:SpokeOuterRPZ" value="57*mm"/>
+    <constant name="PipeTV:SpokeOuterRMZ" value="37*mm"/>
+
+    <!-- COPPERBERYLLIUM PUNCTURED PIPE:
+	 - this is the CuBe pipe with holes inside the VELO vacuum (upstream of RF Boxes)
+	 - see CDD drawings:
+	 http://www.nikhef.nl/pub/departments/mt/projects/lhcb-vertex/pdf/TVE-LAYOUTS/TVE65.pdf
+	 - centered to beam axis
+	 - material: aluminium
+	 cylinder1: r_in=27     r_out=39
+         z_start=-540     z_end=-550
+	 - material: copper
+	 cylinder2: r_in=27     r_out=27.1
+         z_start=-550     z_end=-729
+	 - material: aluminium
+	 cylinder3: r_in=27     r_out=39
+         z_start=-729     z_end=-739
+	 cylinder2==cylinder3 -->
+
+    <constant name="PipeTV:AlCylinderZ" value="10*mm"/>
+    <constant name="PipeTV:AlCylinderInnerR" value="27*mm"/>
+    <constant name="PipeTV:AlCylinderOuterR" value="39*mm"/>
+    <constant name="PipeTV:CuCylinderZ" value="179*mm"/>
+    <constant name="PipeTV:CuCylinderInnerR" value="27*mm"/>
+    <constant name="PipeTV:CuCylinderOuterR" value="27.1*mm"/>
+    <constant name="PipeTV:Z" value="PipeTV:AlCylinderZ+PipeTV:CuCylinderZ+PipeTV:AlCylinderZ"/>
+
+    <!-- UPSTREAM VELO PIPE JUNCTION:
+	 - this is a series of pieces that connect from the CuBe punctured pipe in the
+	 VELO to the LHC upstream beam pipe bellow connection.
+	 - see CDD drawings: LHBTVV__0084, 0085, 0057 and
+	 http://www.nikhef.nl/pub/departments/mt/projects/lhcb-vertex/pdf/TVE-LAYOUTS/TVE65.pdf
+	 NB: the extra connection flange at z=-760...-800 is not shown in these drawings.
+	 - material: stainless steel
+	 cylinder1: r_in=27     r_out=30
+         z_start=-739     z_end=-800
+	 - material: stainless steel
+	 cylinder2: r_in=30     r_out=39
+         z_start=-739     z_end=-745
+	 - material: stainless steel
+	 cylinder3: r_in=30     r_out=39
+         z_start=-760     z_end=-800
+	 - material: stainless steel
+	 cone1:  r_in_start=27   r_out_start=29   z_start=-800
+         r_in_end=38   r_out_end=40   z_end=-865
+	 - material: stainless steel
+	 cylinder4: r_in=40     r_out=76
+         z_start=-865     z_end=-885 -->
+    <constant name="PipeTV:JunkSteelCyl1Z" value="61*mm"/>
+    <constant name="PipeTV:JunkSteelCyl1InnerR" value="27*mm"/>
+    <constant name="PipeTV:JunkSteelCyl1OuterR" value="30*mm"/>
+
+    <constant name="PipeTV:JunkSteelCyl2Z" value="6*mm"/>
+    <constant name="PipeTV:JunkSteelCyl2InnerR" value="30*mm"/>
+    <constant name="PipeTV:JunkSteelCyl2OuterR" value="39*mm"/>
+
+    <constant name="PipeTV:JunkSteelCyl3Z" value="40*mm"/>
+    <constant name="PipeTV:JunkSteelCyl3InnerR" value="30*mm"/>
+    <constant name="PipeTV:JunkSteelCyl3OuterR" value="39*mm"/>
+
+    <!-- Velo volume ends at -835mm so second half of the cone is moved into Before
+	 Magnet pipe volume. -->
+    <constant name="PipeTV:JunkSteelConeZ" value="35*mm"/>
+    <constant name="PipeTV:JunkSteelConeInnerRPZ" value="27*mm"/>
+    <constant name="PipeTV:JunkSteelConeInnerRMZ" value="(35*(38-27)/65)*mm+27*mm"/>
+    <constant name="PipeTV:JunkSteelConeOuterRPZ" value="29*mm"/>
+    <constant name="PipeTV:JunkSteelConeOuterRMZ" value="(35*(40-29)/65)*mm+29*mm"/>
+
+    <constant name="PipeTV:JunkSteelCyl4Z" value="20*mm"/>
+    <constant name="PipeTV:JunkSteelCyl4InnerR" value="40*mm"/>
+    <constant name="PipeTV:JunkSteelCyl4OuterR" value="76*mm"/>
+
+    <constant name="PipeTV:JunkZ" value="PipeTV:JunkSteelCyl1Z+PipeTV:JunkSteelConeZ"/>
+    <constant name="PipeTV:UpstreamPipeZ" value="PipeTV:SpokeZ+PipeTV:Z+PipeTV:JunkZ"/>
+
+    <!-- The downstream beam pipe sections -->
+    <!-- NB any changes here must be propagated to the subtractions in the gas volumes included in the vacuum tank description -->
+
+    <constant name="PipeTV:ExitWindowHoleZ" value="858.6*mm"/>
+    <constant name="PipeTV:ExitWindowZSize" value="945*mm-PipeTV:ExitWindowHoleZ"/>
+    <constant name="PipeTV:ExitWindow2BellowsZSize" value="55.54*mm"/>
+    <constant name="PipeTV:BellowsStartZ" value="PipeTV:ExitWindowHoleZ+PipeTV:ExitWindow2BellowsZSize"/>
+    <constant name="PipeTV:BellowsInnerRadius" value="34*mm"/>
+    <constant name="PipeTV:BellowsOuterRadius" value="46*mm"/>
+    <constant name="PipeTV:BellowsThickness" value="0.3*mm"/>
+    <constant name="PipeTV:BellowsSpacing" value="2.7*mm"/>
+    <constant name="PipeTV:BellowsZSize" value="8*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing"/>
+    <constant name="PipeTV:DSTubeZToWeld" value="16.56*mm"/>
+    <constant name="PipeTV:DSTube1ZSize" value="PipeTV:DSTubeZToWeld+6*mm"/>
+    <constant name="PipeTV:DSTube1InnerRadius" value="PipeTV:BellowsInnerRadius"/>
+    <constant name="PipeTV:DSTube1Thickness" value="2.5*mm"/>
+    <constant name="PipeTV:DSTube2ZSize" value="2.5*mm"/>
+    <constant name="PipeTV:DSTube2InnerRadius" value="28*mm"/>
+    <constant name="PipeTV:DSTube2Thickness" value="PipeTV:DSTube1InnerRadius-PipeTV:DSTube2InnerRadius"/>
+    <constant name="PipeTV:DSTube3ZSize" value="12*mm"/>
+    <constant name="PipeTV:DSTube3InnerRadius" value="PipeTV:DSTube2InnerRadius"/>
+    <constant name="PipeTV:DSTube3Thickness" value="PipeTV:DSTube1Thickness"/>
+    <constant name="PipeTV:WFSGrooveZSize" value="2.2*mm"/>
+    <constant name="PipeTV:WFSGrooveRSize" value="1*mm"/>
+    <constant name="PipeTV:DSTube4ZSize" value="2.5*mm"/>
+    <constant name="PipeTV:DSTube4InnerRadius" value="27*mm"/>
+    <constant name="PipeTV:DSTube4Thickness" value="1*mm"/>
+    <constant name="PipeTV:BellowsEpsilon" value="0.01*mm"/>
+    <constant name="PipeTV:RadiusChange" value="TV:vTankDownExitWindowHoleR-(PipeTV:BellowsInnerRadius+2*mm)"/>
+  </define>
+
+  <detectors>
+    <detector name="TVUpStreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeInTV:parent}" vis="Pipe:InTV">
+      <!-- ****************************************************** -->
+      <!-- * Definition of CuBe pipe sections in velo tank      * -->
+      <!-- * and supports                                       * -->
+      <!-- ****************************************************** -->
+
+      <!-- SPOKE CAP -->
+      <volume name="lvSpokeCap" material="Pipe:Al" vis="Pipe:InTV">
+	<shape type="ConeSegment" name="SpokeCapCone"
+               dz="0.5*PipeTV:SpokeZ"
+               rmin2="PipeTV:SpokeInnerRPZ"
+               rmin1="PipeTV:SpokeInnerRMZ"
+               rmax2="PipeTV:SpokeOuterRPZ"
+               rmax1="PipeTV:SpokeOuterRMZ"/>
+      </volume>
+
+      <!-- COPPERBERYLLIUM PUNCTURED PIPE -->
+      <volume name="lvPipeAlCylinder" material="Pipe:Al" vis="Pipe:InTV">
+	<shape type="Tube" name="PipeAlCylTubs"
+	       dz="0.5*PipeTV:AlCylinderZ"
+	       rmin="PipeTV:AlCylinderInnerR"
+	       rmax="PipeTV:AlCylinderOuterR"/>
+      </volume>
+      <volume name="lvPipeCuCylinder" material="Pipe:Cu" vis="Pipe:InTV">
+	<shape type="Tube" name="PipeCuCylTubs"
+	       dz="0.5*PipeTV:CuCylinderZ"
+	       rmin="PipeTV:CuCylinderInnerR"
+	       rmax="PipeTV:CuCylinderOuterR"/>
+      </volume>
+
+      <!-- UPSTREAM VELO PIPE JUNCTION -->
+      <volume name="lvPipeJuncCyl1" material="Pipe:Steel316LN" vis="Pipe:InTV">
+	<shape type="Tube" name="PipeTV:JunkSteelCyl1"
+	       dz="0.5*PipeTV:JunkSteelCyl1Z"
+	       rmin="PipeTV:JunkSteelCyl1InnerR"
+	       rmax="PipeTV:JunkSteelCyl1OuterR"/>
+      </volume>
+      <volume name="lvPipeJuncCyl2" material="Pipe:Steel316LN" vis="Pipe:InTV">
+	<shape type="Tube" name="PipeTV:JunkSteelCyl2"
+	       dz="0.5*PipeTV:JunkSteelCyl2Z"
+	       rmin="PipeTV:JunkSteelCyl2InnerR+0.01*mm"
+	       rmax="PipeTV:JunkSteelCyl2OuterR"/>
+      </volume>
+      <volume name="lvPipeJuncCyl3" material="Pipe:Steel316LN" vis="Pipe:InTV">
+	<shape type="Tube" name="PipeTV:JunkSteelCyl3"
+	       dz="0.5*PipeTV:JunkSteelCyl3Z"
+	       rmin="PipeTV:JunkSteelCyl3InnerR+0.01*mm"
+	       rmax="PipeTV:JunkSteelCyl3OuterR"/>
+      </volume>
+      <volume name="lvPipeJuncCone1" material="Pipe:Steel316LN" vis="Pipe:InTV">
+	<shape type="ConeSegment" name="PipeTV:JunkSteelCone"
+	       dz="0.5*PipeTV:JunkSteelConeZ"
+	       rmin2="PipeTV:JunkSteelConeInnerRPZ"
+	       rmin1="PipeTV:JunkSteelConeInnerRMZ"
+	       rmax2="PipeTV:JunkSteelConeOuterRPZ"
+	       rmax1="PipeTV:JunkSteelConeOuterRMZ"/>
+      </volume>
+
+
+      <envelope type="Assembly" name="lvVeloUpStreamPipe" vis="Pipe:InTV">
+	<!-- Spoke cap -->
+	<physvol volume="lvSpokeCap" name="SpokeCap">
+	  <position z="-505*mm"/>
+	</physvol>
+	<!-- CuBe pipe -->
+	<physvol volume="lvPipeAlCylinder" name="PipeAlCyl1">
+	  <position z="-545*mm"/>
+	</physvol>
+	<physvol volume="lvPipeCuCylinder" name="PipeCuCyl">
+	  <position z="-639.5*mm"/>
+	</physvol>
+	<physvol volume="lvPipeAlCylinder" name="PipeAlCyl2">
+	  <position z="-734*mm"/>
+	</physvol>
+	<!-- Pipe junction -->
+	<physvol volume="lvPipeJuncCone1" name="PipeJuncCone1">
+	  <position z="-817.5*mm"/>
+	</physvol>
+	<physvol volume="lvPipeJuncCyl1" name="PipeJuncCyl1">
+	  <position z="-769.5*mm"/>
+	</physvol>
+	<physvol volume="lvPipeJuncCyl2" name="PipeJuncCyl2">
+	  <position z="-742*mm"/>
+	</physvol>
+	<physvol volume="lvPipeJuncCyl3" name="PipeJuncCyl3">
+	  <position z="-780*mm"/>
+	</physvol>
+      </envelope>
+      <position/>
+    </detector>
+
+
+    <detector name="VeloDownStreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeInTV:parent}" vis="Pipe:InTV">
+
+      <!-- Definition of section joining Al exit window with beam pipe -->
+      <volume name="lvExitWindow2Bellows" material="Pipe:Al6061" vis="Pipe:InTV">
+	<shape type="ConeSegment" name="ExitWindow2Bellows"
+	       dz="0.5*PipeTV:ExitWindow2BellowsZSize"
+	       rmin2="PipeTV:BellowsInnerRadius"
+	       rmin1="TV:vTankDownExitWindowHoleR-2*mm"
+	       rmax2="PipeTV:BellowsInnerRadius+2*mm"
+	       rmax1="TV:vTankDownExitWindowHoleR"/>
+      </volume>
+
+      <volume name="lvVelo2Rich1GasEW2B" material="Rich:C4F10" vis="Pipe:InTV">
+	<shape type="BooleanShape" operation="subtraction" name="V2R1GasEW2BSub">
+	  <shape type="Tube" name="V2R1GasEW2BTubs1"
+		 dz="0.5*PipeTV:ExitWindow2BellowsZSize"
+		 rmax="TV:vTankDownExitWindowHoleR"/>
+	  <shape type="ConeSegment" name="V2R1GasEW2BCons1"
+		 dz="0.5*2*PipeTV:ExitWindow2BellowsZSize"
+		 rmin2="0*mm"
+		 rmin1="0*mm"
+		 rmax2="(PipeTV:BellowsInnerRadius+2*mm)-PipeTV:RadiusChange/2"
+		 rmax1="TV:vTankDownExitWindowHoleR+PipeTV:RadiusChange/2"/>
+	</shape>
+      </volume>
+
+      <!-- Definition of the bellows section of the beam pipe -->
+      <volume name="lvBellows" material="Pipe:Al6061" vis="Pipe:InTV">
+	<shape type="Polycone" name="Bellows">
+	  <!-- 1 -->  <zplane z="PipeTV:BellowsStartZ"                                                    rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 2 -->  <zplane z="PipeTV:BellowsStartZ+PipeTV:BellowsThickness"                                   rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 3 -->  <zplane z="PipeTV:BellowsStartZ+PipeTV:BellowsThickness+PipeTV:BellowsEpsilon"                    rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 4 -->  <zplane z="PipeTV:BellowsStartZ+PipeTV:BellowsThickness+PipeTV:BellowsSpacing"                    rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 5 -->  <zplane z="PipeTV:BellowsStartZ+PipeTV:BellowsThickness+PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon"     rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 6 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+PipeTV:BellowsSpacing"                  rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 7 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon"   rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 8 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 9 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 10 --> <zplane z="PipeTV:BellowsStartZ+3*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 11 --> <zplane z="PipeTV:BellowsStartZ+3*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 12 --> <zplane z="PipeTV:BellowsStartZ+3*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 13 --> <zplane z="PipeTV:BellowsStartZ+3*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 14 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 15 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 16 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 17 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 18 --> <zplane z="PipeTV:BellowsStartZ+5*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 19 --> <zplane z="PipeTV:BellowsStartZ+5*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 20 --> <zplane z="PipeTV:BellowsStartZ+5*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 21 --> <zplane z="PipeTV:BellowsStartZ+5*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 22 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 23 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 24 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 25 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 26 --> <zplane z="PipeTV:BellowsStartZ+7*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 27 --> <zplane z="PipeTV:BellowsStartZ+7*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 28 --> <zplane z="PipeTV:BellowsStartZ+7*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 29 --> <zplane z="PipeTV:BellowsStartZ+7*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	  <!-- 30 --> <zplane z="PipeTV:BellowsStartZ+8*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
+	</shape>
+      </volume>
+
+      <!-- The RICH1 gas sections DS of the exit window -->
+
+      <volume name="lvVelo2Rich1GasBellows" material="Rich:C4F10" vis="Pipe:InTV">
+	<shape type="Polycone" name="V2R1GasBellows">
+	  <!-- 1 -->  <zplane z="PipeTV:BellowsStartZ"                                                    rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
+	  <!-- 6 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+PipeTV:BellowsSpacing"                  rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
+	  <!-- 7 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon"   rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 8 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 9 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
+	  <!-- 14 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
+	  <!-- 15 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 16 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 17 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
+	  <!-- 22 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
+	  <!-- 23 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 24 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
+	  <!-- 25 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
+	  <!-- 30 --> <zplane z="PipeTV:BellowsStartZ+8*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing-PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
+	</shape>
+      </volume>
+
+      <!-- Definition of the tube section of the beam pipe -->
+      <!-- TODO: Looks like the groove for the connection of the wakefield suppressor is in the wrong place?
+           It's DS edge is currently located at 968mm but the wakefield suppressor ends at 954mm -->
+      <volume name="lvDSTubeSection" material="Pipe:Al2219F" vis="Pipe:InTV">
+	<shape type="BooleanShape" operation="union" name="DSTubeUnion">
+	  <shape type="Tube" name="DSTube1"
+		 dz="0.5*PipeTV:DSTube1ZSize"
+		 rmin="PipeTV:DSTube1InnerRadius"
+		 rmax="PipeTV:DSTube1InnerRadius+PipeTV:DSTube1Thickness"/>
+	  <shape type="Tube" name="DSTube2"
+		 dz="0.5*PipeTV:DSTube2ZSize"
+		 rmin="PipeTV:DSTube2InnerRadius"
+		 rmax="PipeTV:DSTube2InnerRadius+PipeTV:DSTube2Thickness"/>
+	  <position z="(PipeTV:DSTube1ZSize-PipeTV:DSTube2ZSize)/2"/>
+	  <shape type="BooleanShape" operation="subtraction" name="DSTube3Sub">
+            <shape type="Tube" name="DSTube3a"
+		   dz="0.5*PipeTV:DSTube3ZSize"
+		   rmin="PipeTV:DSTube3InnerRadius"
+		   rmax="PipeTV:DSTube3InnerRadius+PipeTV:DSTube3Thickness"/>
+            <shape type="Tube" name="DSTube3b"
+		   dz="0.5*PipeTV:WFSGrooveZSize"
+		   rmin="0*mm"
+		   rmax="PipeTV:DSTube3InnerRadius+PipeTV:WFSGrooveRSize"/>
+            <position z="(PipeTV:DSTube3ZSize-PipeTV:WFSGrooveZSize)/2-2*mm"/>
+	  </shape>
+	  <position z="(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)/2"/>
+	</shape>
+      </volume>
+
+      <volume name="lvVelo2Rich1GasDSTube" material="Rich:C4F10" vis="Pipe:InTV">
+	<shape type="BooleanShape" operation="subtraction" name="DSTubeGasSub">
+	  <shape type="Tube" name="DSTubeGas"
+		 dz="0.5*(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)"
+		 rmin="0*mm"
+		 rmax="TV:vTankDownExitWindowHoleR"/>
+	  <shape type="Tube" name="DSTube1Gas"
+		 dz="0.5*2*PipeTV:DSTube1ZSize"
+		 rmin="0*mm"
+		 rmax="PipeTV:DSTube1InnerRadius+PipeTV:DSTube1Thickness"/>
+	  <position z="-(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)/2"/>
+	  <shape type="Tube" name="DSTube3Gas"
+		 dz="0.5*2*PipeTV:DSTube3ZSize"
+		 rmin="0*mm"
+		 rmax="PipeTV:DSTube3InnerRadius+PipeTV:DSTube3Thickness"/>
+	  <position z="(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)/2"/>
+	</shape>
+      </volume>
+
+      <envelope type="Assembly" name="lvVeloDownStreamPipe" vis="Pipe:InTV">
+	<physvol volume="lvExitWindow2Bellows" name="VeloDSPipe1">
+          <position z="PipeTV:ExitWindowHoleZ+PipeTV:ExitWindow2BellowsZSize/2"/>
+	</physvol>
+	<physvol volume="lvVelo2Rich1GasEW2B" name="VeloDSPipe1Gas">
+          <position z="PipeTV:ExitWindowHoleZ+PipeTV:ExitWindow2BellowsZSize/2"/>
+	</physvol>
+
+	<physvol volume="lvBellows" name="VeloDSPipe2">
+	</physvol>
+	<physvol volume="lvVelo2Rich1GasBellows" name="VeloDSPipe2Gas">
+	</physvol>
+	<physvol volume="lvDSTubeSection" name="VeloDSPipe3">
+          <position z="PipeTV:BellowsStartZ+PipeTV:BellowsZSize+(PipeTV:DSTube1ZSize)/2"/>
+	</physvol>
+	<physvol volume="lvVelo2Rich1GasDSTube" name="VeloDSPipe3Gas">
+          <position z="PipeTV:BellowsStartZ+PipeTV:BellowsZSize+(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)/2"/>
+	</physvol>
+      </envelope>
+      <position/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InUP.xml b/compact/components/Pipe/2025-v00.00/InUP.xml
new file mode 100644
index 000000000..092263950
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/InUP.xml
@@ -0,0 +1,79 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe inside the UP region                   -->
+<!--===========================================================================-->
+<!--==================================Pipe In  UP============================-->
+<!--===========================================================================-->
+<lccdd>
+
+  <detectors>
+    <detector name="PipeInUP" type="DD4hep_VolumeAssembly" parent="${PipeInUP:parent}" vis="Pipe:Vis">
+
+      <!-- UX85-1 Cylinder of 50 mm diameter -->
+      <volume name="lvUX851Cyl07B" material="Pipe:BeTV56" vis="Pipe:InUP">
+        <shape type="Tube" name="UX85-1-Cylinder-07B"
+               dz="0.5*UX851Cyl07BLenght"
+               rmin="UX851Cyl07Radius"
+               rmax="UX851Cyl07Radius+UX851Cyl07Thick"/>
+      </volume>
+
+      <!-- UX85-1 Cone 10 mrad                    -->
+      <!-- Stop at end of BeforeMagnet Region     -->
+      <volume name="lvUX851Cone08A" material="Pipe:BeTV56" vis="Pipe:InUP">
+        <shape type="ConeSegment" name="UX85-1-Cone10mrad-08A"
+               dz="0.5*UX851Cone08ALenght"
+               rmin2="UX851Cone08ARadiusZmax"
+               rmin1="UX851Cone08ARadiusZmin"
+               rmax2="UX851Cone08ARadiusZmax+UX851Cone08AThick"
+               rmax1="UX851Cone08ARadiusZmin+UX851Cone08AThick"/>
+      </volume>
+
+      <!-- Vacuum in UX851Cyl07B in UP -->
+      <volume name="lvUX851Vacuum07B" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="Tube" name="UX85-1-Vacuum-07B"
+               dz="0.5*UX851Cyl07BLenght"
+               rmax="UX851Cyl07Radius"/>
+      </volume>
+
+      <!-- Vacuum in UX851Cone08A in UP -->
+      <volume name="lvUX851Vacuum08A" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="ConeSegment" name="UX85-1-Vacuum-08A"
+               dz="0.5*UX851Cone08ALenght"
+               rmax1="UX851Cone08ARadiusZmin"
+               rmax2="UX851Cone08ARadiusZmax"/>
+      </volume>
+
+      <!-- Whole section: combination of sections -->
+      <!-- For the moment assume sections put at 0.0 of this (set with center at 970mm  -->
+      <envelope type="Assembly" name="lvUX851InUP" vis="Pipe:InUP">
+        <!-- Pipes of Al and Be -->
+        <physvol name="pvUX851Cyl07B"            volume="lvUX851Cyl07B">
+          <position z="UX851Cyl07BZpos"/>
+        </physvol>
+
+        <physvol name="pvUX851Cone08A"           volume="lvUX851Cone08A">
+          <position z="UX851Cone08AZpos"/>
+        </physvol>
+
+        <!-- Now the vacuum inside -->
+        <physvol name="pvUX851Vacuum07B"         volume="lvUX851Vacuum07B">
+          <position z="UX851Cyl07BZpos"/>
+        </physvol>
+
+        <physvol name="pvUX851Vacuum08A"         volume="lvUX851Vacuum08A">
+          <position z="UX851Cone08AZpos"/>
+        </physvol>
+      </envelope>
+      <position z="UX851Rich1TTSplitZposIP-UPSystemZ"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InUT.xml b/compact/components/Pipe/2025-v00.00/InUT.xml
new file mode 100644
index 000000000..38fe79cf2
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/InUT.xml
@@ -0,0 +1,79 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe inside the UT region                     -->
+<!--===========================================================================-->
+<!--==================================Pipe In  UT=============================-->
+<!--===========================================================================-->
+<lccdd>
+
+  <detectors>
+    <detector name="PipeInUT" type="DD4hep_VolumeAssembly" parent="${PipeInUT:parent}" vis="Pipe:Vis">
+
+      <!-- UX85-1 Cylinder of 50 mm diameter -->
+      <volume name="lvUX851Cyl07B" material="Pipe:BeTV56" vis="Pipe:InUT">
+        <shape type="Tube" name="UX85-1-Cylinder-07B"
+               dz="0.5*UX851Cyl07BLenght"
+               rmin="UX851Cyl07Radius"
+               rmax="UX851Cyl07Radius+UX851Cyl07Thick"/>
+      </volume>
+
+      <!-- UX85-1 Cone 10 mrad                    -->
+      <!-- Stop at end of BeforeMagnet Region     -->
+      <volume name="lvUX851Cone08A" material="Pipe:BeTV56" vis="Pipe:InUT">
+        <shape type="ConeSegment" name="UX85-1-Cone10mrad-08A"
+               dz="0.5*UX851Cone08ALenght"
+               rmin2="UX851Cone08ARadiusZmax"
+               rmin1="UX851Cone08ARadiusZmin"
+               rmax2="UX851Cone08ARadiusZmax+UX851Cone08AThick"
+               rmax1="UX851Cone08ARadiusZmin+UX851Cone08AThick"/>
+      </volume>
+
+      <!-- Vacuum in UX851Cyl07B in UT -->
+      <volume name="lvUX851Vacuum07B" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="Tube" name="UX85-1-Vacuum-07B"
+               dz="0.5*UX851Cyl07BLenght"
+               rmax="UX851Cyl07Radius"/>
+      </volume>
+
+      <!-- Vacuum in UX851Cone08A in UT -->
+      <volume name="lvUX851Vacuum08A" material="Vacuum" vis="Pipe:Vacuum">
+        <shape type="ConeSegment" name="UX85-1-Vacuum-08A"
+               dz="0.5*UX851Cone08ALenght"
+               rmax1="UX851Cone08ARadiusZmin"
+               rmax2="UX851Cone08ARadiusZmax"/>
+      </volume>
+
+      <!-- Whole section: combination of sections -->
+      <!-- For the moment assume sections put at 0.0 of this (set with center at 970mm  -->
+      <envelope type="Assembly" name="lvUX851InUT" vis="Pipe:InUT">
+        <!-- Pipes of Al and Be -->
+        <physvol name="pvUX851Cyl07B"            volume="lvUX851Cyl07B">
+          <position z="UX851Cyl07BZpos"/>
+        </physvol>
+
+        <physvol name="pvUX851Cone08A"           volume="lvUX851Cone08A">
+          <position z="UX851Cone08AZpos"/>
+        </physvol>
+
+        <!-- Now the vacuum inside -->
+        <physvol name="pvUX851Vacuum07B"         volume="lvUX851Vacuum07B">
+          <position z="UX851Cyl07BZpos"/>
+        </physvol>
+
+        <physvol name="pvUX851Vacuum08A"         volume="lvUX851Vacuum08A">
+          <position z="UX851Cone08AZpos"/>
+        </physvol>
+      </envelope>
+      <position z="UX851Rich1TTSplitZposIP-UTSystemZ"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InVP.xml b/compact/components/Pipe/2025-v00.00/InVP.xml
new file mode 100644
index 000000000..c112267bb
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/InVP.xml
@@ -0,0 +1,383 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe inside the VP region                      -->
+<!--===========================================================================-->
+<!--==================================Pipe In  VP=============================-->
+<!--===========================================================================-->
+<lccdd>
+
+  <define>
+    <!-- ****************************************************** -->
+    <!-- * Definition of CuBe pipe sections in velo tank      * -->
+    <!-- * and supports                                       * -->
+    <!-- ****************************************************** -->
+
+    <!-- SPOKE CAP:
+	 - this is the small cap at the end of the spokes which are supposed
+	 to support the wf suppressor end and the punctured CuBe pipe.
+	 Let's start with a simplified conical description, not corresponding
+	 to actual shape.
+	 z_end_wf should correspond here to z_end. If not, adjust.
+	 - see CDD drawings:  ...
+	 - centered to beam axis
+	 - material: aluminium
+	 cone1:  r_in_start=47   r_out_start=57   z_start=-470
+         r_in_end=27   r_out_end=37   z_end=-540 -->
+
+    <constant name="PipeVP:SpokeZ" value="70*mm"/>
+    <constant name="PipeVP:SpokeInnerRPZ" value="47*mm"/>
+    <constant name="PipeVP:SpokeInnerRMZ" value="27*mm"/>
+    <constant name="PipeVP:SpokeOuterRPZ" value="57*mm"/>
+    <constant name="PipeVP:SpokeOuterRMZ" value="37*mm"/>
+
+    <!-- COPPERBERYLLIUM PUNCTURED PIPE:
+	 - this is the CuBe pipe with holes inside the VELO vacuum (upstream of RF Boxes)
+	 - see CDD drawings:
+	 http://www.nikhef.nl/pub/departments/mt/projects/lhcb-vertex/pdf/TVE-LAYOUTS/TVE65.pdf
+	 - centered to beam axis
+	 - material: aluminium
+	 cylinder1: r_in=27     r_out=39
+         z_start=-540     z_end=-550
+	 - material: copper
+	 cylinder2: r_in=27     r_out=27.1
+         z_start=-550     z_end=-729
+	 - material: aluminium
+	 cylinder3: r_in=27     r_out=39
+         z_start=-729     z_end=-739
+	 cylinder2==cylinder3 -->
+
+    <constant name="PipeVP:AlCylinderZ" value="10*mm"/>
+    <constant name="PipeVP:AlCylinderInnerR" value="27*mm"/>
+    <constant name="PipeVP:AlCylinderOuterR" value="39*mm"/>
+    <constant name="PipeVP:CuCylinderZ" value="2*mm"/>
+    <constant name="PipeVP:CuCylinderInnerR" value="27*mm"/>
+    <constant name="PipeVP:CuCylinderOuterR" value="27.1*mm"/>
+    <constant name="PipeVP:Z" value="PipeVP:AlCylinderZ+PipeVP:CuCylinderZ+PipeVP:AlCylinderZ"/>
+
+    <!-- UPSTREAM VELO PIPE JUNCTION:
+	 - this is a series of pieces that connect from the CuBe punctured pipe in the
+	 VELO to the LHC upstream beam pipe bellow connection.
+	 - see CDD drawings: LHBTVV__0084, 0085, 0057 and
+	 http://www.nikhef.nl/pub/departments/mt/projects/lhcb-vertex/pdf/TVE-LAYOUTS/TVE65.pdf
+	 NB: the extra connection flange at z=-760...-800 is not shown in these drawings.
+	 - material: stainless steel
+	 cylinder1: r_in=27     r_out=30
+         z_start=-739     z_end=-800
+	 - material: stainless steel
+	 cylinder2: r_in=30     r_out=39
+         z_start=-739     z_end=-745
+	 - material: stainless steel
+	 cylinder3: r_in=30     r_out=39
+         z_start=-760     z_end=-800
+	 - material: stainless steel
+	 cone1:  r_in_start=27   r_out_start=29   z_start=-800
+         r_in_end=38   r_out_end=40   z_end=-865
+	 - material: stainless steel
+	 cylinder4: r_in=40     r_out=76
+         z_start=-865     z_end=-885 -->
+    <constant name="PipeVP:JunkSteelCyl1Z" value="61*mm"/>
+    <constant name="PipeVP:JunkSteelCyl1InnerR" value="27*mm"/>
+    <constant name="PipeVP:JunkSteelCyl1OuterR" value="30*mm"/>
+
+    <constant name="PipeVP:JunkSteelCyl2Z" value="6*mm"/>
+    <constant name="PipeVP:JunkSteelCyl2InnerR" value="30*mm"/>
+    <constant name="PipeVP:JunkSteelCyl2OuterR" value="39*mm"/>
+
+    <constant name="PipeVP:JunkSteelCyl3Z" value="40*mm"/>
+    <constant name="PipeVP:JunkSteelCyl3InnerR" value="30*mm"/>
+    <constant name="PipeVP:JunkSteelCyl3OuterR" value="39*mm"/>
+
+    <!-- Velo volume ends at -835mm so second half of the cone is moved into Before
+	 Magnet pipe volume. -->
+    <constant name="PipeVP:JunkSteelConeZ" value="35*mm"/>
+    <constant name="PipeVP:JunkSteelConeInnerRPZ" value="27*mm"/>
+    <constant name="PipeVP:JunkSteelConeInnerRMZ" value="(35*(38-27)/65)*mm+27*mm"/>
+    <constant name="PipeVP:JunkSteelConeOuterRPZ" value="29*mm"/>
+    <constant name="PipeVP:JunkSteelConeOuterRMZ" value="(35*(40-29)/65)*mm+29*mm"/>
+
+    <constant name="PipeVP:JunkSteelCyl4Z" value="20*mm"/>
+    <constant name="PipeVP:JunkSteelCyl4InnerR" value="40*mm"/>
+    <constant name="PipeVP:JunkSteelCyl4OuterR" value="76*mm"/>
+
+    <constant name="PipeVP:JunkZ" value="PipeVP:JunkSteelCyl1Z+PipeVP:JunkSteelConeZ"/>
+    <constant name="PipeVP:UpstreamPipeZ" value="PipeVP:SpokeZ+PipeVP:Z+PipeVP:JunkZ"/>
+
+    <!-- The downstream beam pipe sections -->
+    <!-- NB any changes here must be propagated to the subtractions in the gas volumes included in the vacuum tank description -->
+
+    <constant name="PipeVP:ExitWindowHoleZ" value="858.6*mm"/>
+    <constant name="PipeVP:ExitWindowZSize" value="945*mm-PipeVP:ExitWindowHoleZ"/>
+    <constant name="PipeVP:ExitWindow2BellowsZSize" value="55.54*mm"/>
+    <constant name="PipeVP:BellowsStartZ" value="PipeVP:ExitWindowHoleZ+PipeVP:ExitWindow2BellowsZSize"/>
+    <constant name="PipeVP:BellowsInnerRadius" value="34*mm"/>
+    <constant name="PipeVP:BellowsOuterRadius" value="46*mm"/>
+    <constant name="PipeVP:BellowsThickness" value="0.3*mm"/>
+    <constant name="PipeVP:BellowsSpacing" value="2.7*mm"/>
+    <constant name="PipeVP:BellowsZSize" value="8*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing"/>
+    <constant name="PipeVP:DSTubeZToWeld" value="16.56*mm"/>
+    <constant name="PipeVP:DSTube1ZSize" value="PipeVP:DSTubeZToWeld+6*mm"/>
+    <constant name="PipeVP:DSTube1InnerRadius" value="PipeVP:BellowsInnerRadius"/>
+    <constant name="PipeVP:DSTube1Thickness" value="2.5*mm"/>
+    <constant name="PipeVP:DSTube2ZSize" value="2.5*mm"/>
+    <constant name="PipeVP:DSTube2InnerRadius" value="29.5*mm"/>
+    <constant name="PipeVP:DSTube2Thickness" value="PipeVP:DSTube1InnerRadius-PipeVP:DSTube2InnerRadius"/>
+    <constant name="PipeVP:DSTube3ZSize" value="12*mm"/>
+    <constant name="PipeVP:DSTube3InnerRadius" value="PipeVP:DSTube2InnerRadius"/>
+    <constant name="PipeVP:DSTube3Thickness" value="PipeVP:DSTube1Thickness"/>
+    <constant name="PipeVP:WFSGrooveZSize" value="2.2*mm"/>
+    <constant name="PipeVP:WFSGrooveRSize" value="1.5*mm"/>
+    <constant name="PipeVP:DSTube4ZSize" value="2.5*mm"/>
+    <constant name="PipeVP:DSTube4InnerRadius" value="27*mm"/>
+    <constant name="PipeVP:DSTube4Thickness" value="1*mm"/>
+    <constant name="PipeVP:BellowsEpsilon" value="0.01*mm"/>
+    <constant name="PipeVP:RadiusChange" value="VP:vTankDownExitWindowHoleR-(PipeVP:BellowsInnerRadius+2*mm)"/>
+  </define>
+
+  <detectors>
+    <detector name="VPUpStreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeInVP:parent}" vis="Pipe:InVP">
+      <!-- ****************************************************** -->
+      <!-- * Definition of CuBe pipe sections in velo tank      * -->
+      <!-- * and supports                                       * -->
+      <!-- ****************************************************** -->
+
+      <!-- SPOKE CAP -->
+      <volume name="lvSpokeCap" material="Pipe:Al" vis="Pipe:InVP">
+	<shape type="ConeSegment" name="SpokeCapCone"
+               dz="0.5*PipeVP:SpokeZ"
+               rmin2="PipeVP:SpokeInnerRPZ"
+               rmin1="PipeVP:SpokeInnerRMZ"
+               rmax2="PipeVP:SpokeOuterRPZ"
+               rmax1="PipeVP:SpokeOuterRMZ"/>
+      </volume>
+
+      <!-- COPPERBERYLLIUM PUNCTURED PIPE -->
+      <volume name="lvPipeAlCylinder" material="Pipe:Al" vis="Pipe:InVP">
+	<shape type="Tube" name="PipeAlCylTubs"
+	       dz="0.5*PipeVP:AlCylinderZ"
+	       rmin="PipeVP:AlCylinderInnerR"
+	       rmax="PipeVP:AlCylinderOuterR"/>
+      </volume>
+      <volume name="lvPipeCuCylinder" material="Pipe:Cu" vis="Pipe:InVP">
+	<shape type="Tube" name="PipeCuCylTubs"
+	       dz="0.5*PipeVP:CuCylinderZ"
+	       rmin="PipeVP:CuCylinderInnerR"
+	       rmax="PipeVP:CuCylinderOuterR"/>
+      </volume>
+
+      <!-- UPSTREAM VELO PIPE JUNCTION -->
+      <volume name="lvPipeJuncCyl1" material="Pipe:Steel316LN" vis="Pipe:InVP">
+	<shape type="Tube" name="PipeVP:JunkSteelCyl1"
+	       dz="0.5*PipeVP:JunkSteelCyl1Z"
+	       rmin="PipeVP:JunkSteelCyl1InnerR"
+	       rmax="PipeVP:JunkSteelCyl1OuterR"/>
+      </volume>
+      <volume name="lvPipeJuncCyl2" material="Pipe:Steel316LN" vis="Pipe:InVP">
+	<shape type="Tube" name="PipeVP:JunkSteelCyl2"
+	       dz="0.5*PipeVP:JunkSteelCyl2Z"
+	       rmin="PipeVP:JunkSteelCyl2InnerR+0.01*mm"
+	       rmax="PipeVP:JunkSteelCyl2OuterR"/>
+      </volume>
+      <volume name="lvPipeJuncCyl3" material="Pipe:Steel316LN" vis="Pipe:InVP">
+	<shape type="Tube" name="PipeVP:JunkSteelCyl3"
+	       dz="0.5*PipeVP:JunkSteelCyl3Z"
+	       rmin="PipeVP:JunkSteelCyl3InnerR+0.01*mm"
+	       rmax="PipeVP:JunkSteelCyl3OuterR"/>
+      </volume>
+      <volume name="lvPipeJuncCone1" material="Pipe:Steel316LN" vis="Pipe:InVP">
+	<shape type="ConeSegment" name="PipeVP:JunkSteelCone"
+	       dz="0.5*PipeVP:JunkSteelConeZ"
+	       rmin2="PipeVP:JunkSteelConeInnerRPZ"
+	       rmin1="PipeVP:JunkSteelConeInnerRMZ"
+	       rmax2="PipeVP:JunkSteelConeOuterRPZ"
+	       rmax1="PipeVP:JunkSteelConeOuterRMZ"/>
+      </volume>
+
+
+      <envelope type="Assembly" name="lvVeloUpStreamPipe" vis="Pipe:InVP">
+	<!-- Spoke cap -->
+	<!-- waiting for the drawing by the Vacuum group -->
+	<!-- CuBe pipe -->
+	<!-- waiting for the drawing by the Vacuum group -->
+	<physvol volume="lvPipeCuCylinder" name="PipeCuCyl">
+	  <position z="-728*mm"/>
+	</physvol>
+	<physvol volume="lvPipeAlCylinder" name="PipeAlCyl2">
+	  <position z="-734*mm"/>
+	</physvol>
+	<!-- Pipe junction -->
+	<physvol volume="lvPipeJuncCone1" name="PipeJuncCone1">
+	  <position z="-817.5*mm"/>
+	</physvol>
+	<physvol volume="lvPipeJuncCyl1" name="PipeJuncCyl1">
+	  <position z="-769.5*mm"/>
+	</physvol>
+	<physvol volume="lvPipeJuncCyl2" name="PipeJuncCyl2">
+	  <position z="-742*mm"/>
+	</physvol>
+	<physvol volume="lvPipeJuncCyl3" name="PipeJuncCyl3">
+	  <position z="-780*mm"/>
+	</physvol>
+      </envelope>
+      <position/>
+    </detector>
+
+
+    <detector name="VeloDownStreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeInVP:parent}" vis="Pipe:InVP">
+
+      <!-- Definition of section joining Al exit window with beam pipe -->
+      <volume name="lvExitWindow2Bellows" material="Pipe:Al6061" vis="Pipe:InVP">
+	<shape type="ConeSegment" name="ExitWindow2Bellows"
+	       dz="0.5*PipeVP:ExitWindow2BellowsZSize"
+	       rmin2="PipeVP:BellowsInnerRadius"
+	       rmin1="VP:vTankDownExitWindowHoleR-2*mm"
+	       rmax2="PipeVP:BellowsInnerRadius+2*mm"
+	       rmax1="VP:vTankDownExitWindowHoleR"/>
+      </volume>
+
+      <volume name="lvVelo2Rich1GasEW2B" material="Rich:C4F10" vis="Pipe:InVP">
+	<shape type="BooleanShape" operation="subtraction" name="V2R1GasEW2BSub">
+	  <shape type="Tube" name="V2R1GasEW2BTubs1"
+		 dz="0.5*PipeVP:ExitWindow2BellowsZSize"
+		 rmax="VP:vTankDownExitWindowHoleR"/>
+	  <shape type="ConeSegment" name="V2R1GasEW2BCons1"
+		 dz="PipeVP:ExitWindow2BellowsZSize"
+		 rmin2="0*mm"
+		 rmax2="PipeVP:BellowsInnerRadius + 2*mm - PipeVP:RadiusChange/2 + VP:Epsilon"
+		 rmin1="0*mm"
+		 rmax1="VP:vTankDownExitWindowHoleR + PipeVP:RadiusChange/2 + VP:Epsilon"/>
+	</shape>
+      </volume>
+
+      <!-- Definition of the bellows section of the beam pipe -->
+      <volume name="lvBellows" material="Pipe:Al6061" vis="Pipe:InVP">
+	<shape type="Polycone" name="Bellows">
+	  <!-- 1 -->  <zplane z="PipeVP:BellowsStartZ"                                                    rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 2 -->  <zplane z="PipeVP:BellowsStartZ+PipeVP:BellowsThickness"                                   rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 3 -->  <zplane z="PipeVP:BellowsStartZ+PipeVP:BellowsThickness+PipeVP:BellowsEpsilon"                    rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 4 -->  <zplane z="PipeVP:BellowsStartZ+PipeVP:BellowsThickness+PipeVP:BellowsSpacing"                    rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 5 -->  <zplane z="PipeVP:BellowsStartZ+PipeVP:BellowsThickness+PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon"     rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 6 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+PipeVP:BellowsSpacing"                  rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 7 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon"   rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 8 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 9 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 10 --> <zplane z="PipeVP:BellowsStartZ+3*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 11 --> <zplane z="PipeVP:BellowsStartZ+3*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 12 --> <zplane z="PipeVP:BellowsStartZ+3*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 13 --> <zplane z="PipeVP:BellowsStartZ+3*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 14 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 15 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 16 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 17 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 18 --> <zplane z="PipeVP:BellowsStartZ+5*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 19 --> <zplane z="PipeVP:BellowsStartZ+5*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 20 --> <zplane z="PipeVP:BellowsStartZ+5*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 21 --> <zplane z="PipeVP:BellowsStartZ+5*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 22 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 23 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 24 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 25 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 26 --> <zplane z="PipeVP:BellowsStartZ+7*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 27 --> <zplane z="PipeVP:BellowsStartZ+7*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 28 --> <zplane z="PipeVP:BellowsStartZ+7*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 29 --> <zplane z="PipeVP:BellowsStartZ+7*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	  <!-- 30 --> <zplane z="PipeVP:BellowsStartZ+8*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
+	</shape>
+      </volume>
+
+      <!-- The RICH1 gas sections DS of the exit window -->
+
+      <volume name="lvVelo2Rich1GasBellows" material="Rich:C4F10" vis="Pipe:InVP">
+	<shape type="Polycone" name="V2R1GasBellows">
+	  <!-- 1 -->  <zplane z="PipeVP:BellowsStartZ"                                                    rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
+	  <!-- 6 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+PipeVP:BellowsSpacing"                  rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
+	  <!-- 7 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon"   rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 8 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 9 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
+	  <!-- 14 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
+	  <!-- 15 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 16 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 17 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
+	  <!-- 22 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
+	  <!-- 23 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 24 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
+	  <!-- 25 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
+	  <!-- 30 --> <zplane z="PipeVP:BellowsStartZ+8*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing-PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
+	</shape>
+      </volume>
+
+      <!-- Definition of the tube section of the beam pipe -->
+      <!-- TODO: Looks like the groove for the connection of the wakefield suppressor is in the wrong place?
+           It's DS edge is currently located at 968mm but the wakefield suppressor ends at 954mm -->
+      <volume name="lvDSTubeSection" material="Pipe:Al2219F" vis="Pipe:InVP">
+	<shape type="BooleanShape" operation="union" name="DSTubeUnion">
+	  <shape type="Tube" name="DSTube1"
+		 dz="0.5*PipeVP:DSTube1ZSize"
+		 rmin="PipeVP:DSTube1InnerRadius"
+		 rmax="PipeVP:DSTube1InnerRadius+PipeVP:DSTube1Thickness"/>
+	  <shape type="Tube" name="DSTube2"
+		 dz="0.5*PipeVP:DSTube2ZSize"
+		 rmin="PipeVP:DSTube2InnerRadius"
+		 rmax="PipeVP:DSTube2InnerRadius+PipeVP:DSTube2Thickness"/>
+	  <position z="(PipeVP:DSTube1ZSize-PipeVP:DSTube2ZSize)/2"/>
+	  <shape type="BooleanShape" operation="subtraction" name="DSTube3Sub">
+            <shape type="Tube" name="DSTube3a"
+		   dz="0.5*PipeVP:DSTube3ZSize"
+		   rmin="PipeVP:DSTube3InnerRadius"
+		   rmax="PipeVP:DSTube3InnerRadius+PipeVP:DSTube3Thickness"/>
+            <shape type="Tube" name="DSTube3b"
+		   dz="0.5*PipeVP:WFSGrooveZSize"
+		   rmin="0*mm"
+		   rmax="PipeVP:DSTube3InnerRadius+PipeVP:WFSGrooveRSize"/>
+            <position z="(PipeVP:DSTube3ZSize-PipeVP:WFSGrooveZSize)/2-1*mm"/>
+	  </shape>
+	  <position z="(PipeVP:DSTube1ZSize+PipeVP:DSTube3ZSize)/2"/>
+	</shape>
+      </volume>
+
+      <volume name="lvVelo2Rich1GasDSTube" material="Rich:C4F10" vis="Pipe:InVP">
+	<shape type="BooleanShape" operation="subtraction" name="DSTubeGasSub">
+	  <shape type="Tube" name="DSTubeGas"
+		 dz="0.5*(PipeVP:DSTube1ZSize+PipeVP:DSTube3ZSize)"
+		 rmin="PipeVP:DSTube1InnerRadius+PipeVP:DSTube1Thickness+VP:Epsilon"
+		 rmax="VP:vTankDownExitWindowHoleR"/>
+	  <shape type="Tube" name="DSTube3Gas"
+		 dz="PipeVP:DSTube3ZSize"
+		 rmin="0*mm"
+		 rmax="PipeVP:DSTube3InnerRadius+PipeVP:DSTube3Thickness+VP:Epsilon"/>
+	  <position z="(PipeVP:DSTube1ZSize+PipeVP:DSTube3ZSize)/2"/>
+	</shape>
+      </volume>
+
+      <envelope type="Assembly" name="lvVeloDownStreamPipe" vis="Pipe:InVP">
+	<physvol volume="lvExitWindow2Bellows" name="VeloDSPipe1">
+          <position z="PipeVP:ExitWindowHoleZ+PipeVP:ExitWindow2BellowsZSize/2"/>
+	</physvol>
+	<physvol volume="lvVelo2Rich1GasEW2B" name="VeloDSPipe1Gas">
+          <position z="PipeVP:ExitWindowHoleZ+PipeVP:ExitWindow2BellowsZSize/2"/>
+	</physvol>
+
+	<physvol volume="lvBellows" name="VeloDSPipe2">
+	</physvol>
+	<physvol volume="lvVelo2Rich1GasBellows" name="VeloDSPipe2Gas">
+	</physvol>
+	<physvol volume="lvDSTubeSection" name="VeloDSPipe3">
+          <position z="PipeVP:BellowsStartZ+PipeVP:BellowsZSize+(PipeVP:DSTube1ZSize)/2"/>
+	</physvol>
+	<physvol volume="lvVelo2Rich1GasDSTube" name="VeloDSPipe3Gas">
+          <position z="PipeVP:BellowsStartZ+PipeVP:BellowsZSize+(PipeVP:DSTube1ZSize+PipeVP:DSTube3ZSize)/2"/>
+	</physvol>
+      </envelope>
+      <position/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-Bellows.xml b/compact/components/Pipe/2025-v00.00/Magnet-Bellows.xml
new file mode 100644
index 000000000..166572d2b
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Magnet-Bellows.xml
@@ -0,0 +1,187 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<pipe>
+
+  <!-- Bellow at 6900 - Flange -->
+  <volume name="lvUX85B6900Flange01" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Tube" name="UX85-B6900-Flange-01"
+           dz="0.5*UX85B6900Flange01Lenght"
+           rmin="UX85B6900Flange01InnerRadius"
+           rmax="UX85B6900Flange01OuterRadius"/>
+  </volume>
+
+  <!-- Bellow at 6900 cylinder (almost cone 10 mrad)  -->
+  <volume name="lvUX85B6900Cyl02" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Tube" name="UX85-B6900-Cylinder-02"
+           dz="0.5*UX85B6900Cyl02Lenght"
+           rmin="UX85B6900Cyl02InnerRadius"
+           rmax="UX85B6900Cyl02OuterRadius"/>
+  </volume>
+
+  <!-- Bellow at 6900 rib around cone -->
+  <volume name="lvUX85B6900Rib03" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Tube" name="UX85-B6900-Rib-03"
+           dz="0.5*UX85B6900Rib03Lenght"
+           rmin="UX85B6900Rib03InnerRadius"
+           rmax="UX85B6900Rib03OuterRadius"/>
+  </volume>
+
+  <volume name="lvUX85B6900BellowBase" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Polycone" name="UX85-B6900-BellowBase-04">
+      <zplane z="-0.5*UX85B6900BellowLenght"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLenght + UX85B6900BellowWallThick"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLenght + UX85B6900BellowWallThick"
+              rmin="UX85B6900BellowOuterRadius - UX85B6900BellowWallThick"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLenght + UX85B6900BellowWallThick +
+                 UX85B6900BellowStep"
+              rmin="UX85B6900BellowOuterRadius - UX85B6900BellowWallThick"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLenght + UX85B6900BellowWallThick +
+                 UX85B6900BellowStep"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLenght + 2*UX85B6900BellowWallThick +
+                 UX85B6900BellowStep"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLenght + 2*UX85B6900BellowWallThick +
+                 UX85B6900BellowStep"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowInnerRadius + UX85B6900BellowWallThick "/>
+      <zplane z="-0.5*UX85B6900BellowLenght + 2*UX85B6900BellowWallThick +
+                 2*UX85B6900BellowStep"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowInnerRadius + UX85B6900BellowWallThick "/>
+    </shape>
+  </volume>
+
+  <volume name="lvUX85B6900BellowLast" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Polycone" name="UX85-B6900-BellowLast-04">
+      <zplane z="-0.5*UX85B6900BellowLastLenght"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLastLenght + UX85B6900BellowWallThick"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLastLenght + UX85B6900BellowWallThick"
+              rmin="UX85B6900BellowOuterRadius - UX85B6900BellowWallThick"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLastLenght + UX85B6900BellowWallThick +
+                 UX85B6900BellowStep"
+              rmin="UX85B6900BellowOuterRadius - UX85B6900BellowWallThick"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLastLenght + UX85B6900BellowWallThick +
+                 UX85B6900BellowStep"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowOuterRadius"/>
+      <zplane z="-0.5*UX85B6900BellowLastLenght + 2*UX85B6900BellowWallThick +
+                 UX85B6900BellowStep"
+              rmin="UX85B6900BellowInnerRadius"
+              rmax="UX85B6900BellowOuterRadius"/>
+    </shape>
+  </volume>
+  <!-- Bellow at 6900 Bellow -->
+  <volume name="lvUX85B6900Bellow">
+    <paramphysvol number="UX85B6900BellowNConv-1">
+      <physvol name="pvUX85B6900BellowBase" volume="lvUX85B6900BellowBase"/>
+      <position z="UX85B6900BellowPitch"/>
+    </paramphysvol>
+    <physvol name="pvUX85B6900BellowLast"   volume="lvUX85B6900BellowLast">
+      <position z="-0.5*UX85B6900BellowLenght +
+                   (UX85B6900BellowNConv-1)*UX85B6900BellowPitch +
+                   0.5*UX85B6900BellowLastLenght"/>
+    </physvol>
+  </volume>
+
+
+  <!-- Bellow at 6900 rib around cone -->
+  <volume name="lvUX85B6900Rib05" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Tube" name="UX85-B6900-Rib-05"
+           dz="0.5*UX85B6900Rib05Lenght"
+           rmin="UX85B6900Rib05InnerRadius"
+           rmax="UX85B6900Rib05OuterRadius"/>
+  </volume>
+  <!-- Bellow at 6900 cylinder (almost cone 10 mrad)  -->
+  <volume name="lvUX85B6900Cyl06" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Tube" name="UX85-B6900-Cylinder-06"
+           dz="0.5*UX85B6900Cyl06Lenght"
+           rmin="UX85B6900Cyl06InnerRadius"
+           rmax="UX85B6900Cyl06OuterRadius"/>
+  </volume>
+  <!-- Bellow at 6900 Flange -->
+  <volume name="lvUX85B6900Flange07" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Tube" name="UX85-B6900-Flange-07"
+           dz="0.5*UX85B6900Flange07Lenght"
+           rmin="UX85B6900Flange07InnerRadius"
+           rmax="UX85B6900Flange07OuterRadius"/>
+  </volume>
+  <!-- Vacuum in Bellow 6900 series of cylinders -->
+  <volume name="lvUX85B6900Vacuum01" vis="Pipe:Magnet" material="Vacuum">
+    <shape type="Tube" name="UX85-B6900-Vacuum-01"
+           dz="0.5*UX85B6900Vacuum01Lenght"
+           rmax="UX85B6900Flange01InnerRadius"/>
+  </volume>
+  <volume name="lvUX85B6900Vacuum04" vis="Pipe:Magnet" material="Vacuum">
+    <shape type="Tube" name="UX85-B6900-Vacuum-04"
+           dz="0.5*UX85B6900Vacuum04Lenght"
+           rmax="UX85B6900BellowInnerRadius"/>
+  </volume>
+  <volume name="lvUX85B6900Vacuum06" vis="Pipe:Magnet" material="Vacuum">
+    <shape type="Tube" name="UX85-B6900-Vacuum-06"
+           dz="0.5*UX85B6900Vacuum06Lenght"
+           rmax="UX85B6900Cyl06InnerRadius"/>
+  </volume>
+
+
+  <!-- Bellow Section -->
+  <volume name="lvUX85Bellow6900" vis="Pipe:Magnet">
+    <physvol name="pvUX85B6900Flange01"              volume="lvUX85B6900Flange01">
+      <position z="UX85B6900Flange01Zpos"/>
+    </physvol>
+    <physvol name="pvUX85B6900Cyl02"                 volume="lvUX85B6900Cyl02">
+      <position z="UX85B6900Cyl02Zpos"/>
+    </physvol>
+    <physvol name="pvUX85B6900Rib03"                 volume="lvUX85B6900Rib03">
+      <position z="UX85B6900Rib03Zpos"/>
+    </physvol>
+    <physvol name="pvUX85B6900Bellow04"              volume="lvUX85B6900Bellow">
+      <position z="UX85B6900Bellow04Zpos"/>
+    </physvol>
+    <physvol name="pvUX85B6900Rib05"                 volume="lvUX85B6900Rib05">
+      <position z="UX85B6900Rib05Zpos"/>
+    </physvol>
+    <physvol name="pvUX85B6900Cyl06"                 volume="lvUX85B6900Cyl06">
+      <position z="UX85B6900Cyl06Zpos"/>
+    </physvol>
+    <physvol name="pvUX85B6900Flange07"              volume="lvUX85B6900Flange07">
+      <position z="UX85B6900Flange07Zpos"/>
+    </physvol>
+    <!-- Now the vacuum inside -->
+    <physvol name="pvUX85B6900Vacuum01"             volume="lvUX85B6900Vacuum01">
+      <position z="UX85B6900Vacuum01Zpos"/>
+    </physvol>
+    <physvol name="pvUX85B6900Vacuum04"             volume="lvUX85B6900Vacuum04">
+      <position z="UX85B6900Vacuum04Zpos"/>
+    </physvol>
+    <physvol name="pvUX85B6900Vacuum06"             volume="lvUX85B6900Vacuum06">
+      <position z="UX85B6900Vacuum06Zpos"/>
+    </physvol>
+  </volume>
+
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-Compensator.xml b/compact/components/Pipe/2025-v00.00/Magnet-Compensator.xml
new file mode 100644
index 000000000..6d034ced3
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Magnet-Compensator.xml
@@ -0,0 +1,232 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe compensator in the magnet region         -->
+<!--===========================================================================-->
+<pipe>
+
+  <!-- Compensator at 2800 - Flange -->
+  <volume name="lvUX85C2800Flange01" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="ConeSegment" name="UX85-C2800-Flange-01"
+           dz="0.5*UX85C2800Flange01Lenght"
+           rmin1="UX85C2800Flange01RadiusZmin"
+           rmin2="UX85C2800Flange01RadiusZmax"
+           rmax1="UX85C2800Flange01OuterRadius"
+           rmax2="UX85C2800Flange01OuterRadius"/>
+  </volume>
+
+  <!-- Compensator at 2800 cone of 10 mrad -->
+  <volume name="lvUX85C2800Cone02" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="ConeSegment" name="UX85-C2800-Cone10mrad-02"
+           dz="0.5*UX85C2800Cone02Lenght"
+           rmin1="UX85C2800Cone02RadiusZmin"
+           rmin2="UX85C2800Cone02RadiusZmax"
+           rmax1="UX85C2800Cone02OuterRadius"
+           rmax2="UX85C2800Cone02OuterRadius"/>
+  </volume>
+
+  <!-- Compensator at 2800 connection to bellow -->
+  <volume name="lvUX85C2800BellowCnct03" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="ConeSegment" name="UX85-C2800-Connection-03"
+           dz="0.5*UX85C2800BellowCnct03Lenght"
+           rmin1="UX85C2800BellowCnct03RadiusZmin"
+           rmin2="UX85C2800BellowCnct03RadiusZmax"
+           rmax1="UX85C2800BellowCnct03RadiusZmin + UX85C2800BellowCnct03Thick"
+           rmax2="UX85C2800BellowCnct03RadiusZmax + UX85C2800BellowCnct03Thick"/>
+  </volume>
+
+  <volume name="lvUX85C2800BellowBase" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Polycone" name="UX85-C2800-BellowBase-04">
+      <zplane z="-0.5*UX85C2800BellowCRLength"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowCRLength + UX85C2800BellowWallThick"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowCRLength + UX85C2800BellowWallThick"
+              rmin="UX85C2800BellowOuterRadius - UX85C2800BellowWallThick"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowCRLength + UX85C2800BellowWallThick +
+                 UX85C2800BellowStep"
+              rmin="UX85C2800BellowOuterRadius - UX85C2800BellowWallThick"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowCRLength + UX85C2800BellowWallThick +
+                 UX85C2800BellowStep"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowCRLength + 2*UX85C2800BellowWallThick +
+                 UX85C2800BellowStep"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowCRLength + 2*UX85C2800BellowWallThick +
+                 UX85C2800BellowStep"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowInnerRadius + UX85C2800BellowWallThick "/>
+      <zplane z="-0.5*UX85C2800BellowCRLength + 2*UX85C2800BellowWallThick +
+                 2*UX85C2800BellowStep"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowInnerRadius + UX85C2800BellowWallThick "/>
+    </shape>
+  </volume>
+
+  <volume name="lvUX85C2800BellowLast" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="Polycone" name="UX85-C2800-BellowLast-04">
+      <zplane z="-0.5*UX85C2800BellowLastLenght"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowLastLenght + UX85C2800BellowWallThick"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowLastLenght + UX85C2800BellowWallThick"
+              rmin="UX85C2800BellowOuterRadius - UX85C2800BellowWallThick"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowLastLenght + UX85C2800BellowWallThick +
+                 UX85C2800BellowStep"
+              rmin="UX85C2800BellowOuterRadius - UX85C2800BellowWallThick"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowLastLenght + UX85C2800BellowWallThick +
+                 UX85C2800BellowStep"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowOuterRadius"/>
+      <zplane z="-0.5*UX85C2800BellowLastLenght + 2*UX85C2800BellowWallThick +
+                 UX85C2800BellowStep"
+              rmin="UX85C2800BellowInnerRadius"
+              rmax="UX85C2800BellowOuterRadius"/>
+    </shape>
+  </volume>
+
+  <!-- Compensator at 2800 Bellow -->
+  <volume name="lvUX85C2800BellowCR">
+    <paramphysvol number="UX85C2800BellowNConvCR-1">
+      <physvol name="pvUX85C2800BellowBaseCR"           volume="lvUX85C2800BellowBase"/>
+      <position z="UX85C2800BellowPitch"/>
+    </paramphysvol>
+    <physvol name="pvUX85C2800BellowLastCR"             volume="lvUX85C2800BellowLast">
+      <position z="-0.5*(UX85C2800BellowCRLength +
+                   (UX85C2800BellowNConvCR-1)*UX85C2800BellowPitch +
+                   0.5*UX85C2800BellowLastLenght)"/>
+    </physvol>
+  </volume>
+
+
+  <!-- Compensator at 2800 connection to bellow -->
+  <volume name="lvUX85C2800BellowCnct05" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="ConeSegment" name="UX85-C2800-Connection-05"
+           dz="0.5*UX85C2800BellowCnct05Lenght"
+           rmin1="UX85C2800BellowCnct05RadiusZmin"
+           rmin2="UX85C2800BellowCnct05RadiusZmax"
+           rmax1="UX85C2800BellowCnct05RadiusZmin + UX85C2800BellowCnct05Thick"
+           rmax2="UX85C2800BellowCnct05RadiusZmax + UX85C2800BellowCnct05Thick"/>
+  </volume>
+
+  <!-- Compensator at 2800 cone of 10 mrad -->
+  <volume name="lvUX85C2800Cone06" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="ConeSegment" name="UX85-C2800-Cone10mrad-06"
+           dz="0.5*UX85C2800Cone06Length"
+           rmin1="UX85C2800Cone06RadiusZmin"
+           rmin2="UX85C2800Cone06RadiusZmax"
+           rmax1="UX85C2800Cone06RadiusZmin + UX85C2800Cone06Thick"
+           rmax2="UX85C2800Cone06RadiusZmax + UX85C2800Cone06Thick"/>
+  </volume>
+
+  <!-- Compensator at 2800 cone of 10 mrad, slightly thicker-->
+  <volume name="lvUX85C2800Cone07" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="ConeSegment" name="UX85-C2800-Cone10mrad-07"
+           dz="0.5*UX85C2800Cone07Length"
+           rmin1="UX85C2800Cone07RadiusZmin"
+           rmin2="UX85C2800Cone07RadiusZmax"
+           rmax1="UX85C2800Cone07OuterRadius"
+           rmax2="UX85C2800Cone07OuterRadius"/>
+  </volume>
+
+
+  <!-- Compensator at 2800 connection to bellow -->
+
+  <!-- Compensator at 2800 cone of 10 mrad -->
+  <volume name="lvUX85C2800Cone11" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="ConeSegment" name="UX85-C2800-Cone10mrad-11"
+           dz="0.5*UX85C2800Cone11Lenght"
+           rmin1="UX85C2800Cone11RadiusZmin"
+           rmin2="UX85C2800Cone11RadiusZmax"
+           rmax1="UX85C2800Cone11OuterRadius"
+           rmax2="UX85C2800Cone11OuterRadius"/>
+  </volume>
+
+  <!-- Compensator at 2800 Flange -->
+  <volume name="lvUX85C2800Flange12" vis="Pipe:Magnet" material="Pipe:Al2219F">
+    <shape type="ConeSegment" name="UX85-C2800-Flange-12"
+           dz="0.5*UX85C2800Flange12Lenght"
+           rmin1="UX85C2800Flange12RadiusZmin"
+           rmin2="UX85C2800Flange12RadiusZmax"
+           rmax1="UX85C2800Flange12OuterRadius"
+           rmax2="UX85C2800Flange12OuterRadius"/>
+  </volume>
+
+  <!-- Vacuum in UX85Compensator2800 -->
+  <volume name="lvUX85C2800Vacuum01" vis="Pipe:Magnet" material="Vacuum">
+    <shape type="ConeSegment" name="UX85-C2800-Vacuum-01"
+           dz="0.5*UX85C2800Vacuum01Lenght"
+           rmax1="UX85C2800Flange01RadiusZmin"
+           rmax2="UX85C2800Flange12RadiusZmax"/>
+  </volume>
+
+  <!-- Compensator -->
+  <volume name="lvUX85Compensator2800">
+    <!--     <shape type="Tube" name="UX85Compensator2800-Cylinder"
+         dz="0.5*UX85C2800Lenght"
+         rmax="46.00*mm+1.0*mm"/>
+    -->
+
+    <physvol name="pvUX85C2800Flange01"             volume="lvUX85C2800Flange01">
+      <position z="UX85C2800Flange01Zpos"/>
+    </physvol>
+
+    <physvol name="pvUX85C2800Cone02"               volume="lvUX85C2800Cone02">
+      <position z="UX85C2800Cone02Zpos"/>
+    </physvol>
+
+    <physvol name="pvUX85C2800BellowCnct03"         volume="lvUX85C2800BellowCnct03">
+      <position z="UX85C2800BellowCnct03Zpos"/>
+    </physvol>
+
+    <physvol name="pvUX85C2800BellowCR04"           volume="lvUX85C2800BellowCR">
+      <position z="UX85C2800Bellow04Zpos"/>
+    </physvol>
+
+    <physvol name="pvUX85C2800BellowCnct05"         volume="lvUX85C2800BellowCnct05">
+      <position z="UX85C2800BellowCnct05Zpos"/>
+    </physvol>
+
+    <physvol name="pvUX85C2800Cone06"               volume="lvUX85C2800Cone06">
+      <position z="UX85C2800Cone06Zpos"/>
+    </physvol>
+
+    <physvol name="pvUX85C2800Cone07"               volume="lvUX85C2800Cone07">
+      <position z="UX85C2800Cone07Zpos"/>
+    </physvol>
+
+
+    <physvol name="pvUX85C2800Cone11"               volume="lvUX85C2800Cone11">
+      <position z="UX85C2800Cone11Zpos"/>
+    </physvol>
+
+    <physvol name="pvUX85C2800Flange12"             volume="lvUX85C2800Flange12">
+      <position z="UX85C2800Flange12Zpos"/>
+    </physvol>
+
+    <!-- Now the vacuum inside -->
+    <physvol name="pvUX85C2800Vacuum01"             volume="lvUX85C2800Vacuum01">
+      <position z="0.5*UX85C2800Vacuum01Lenght"/>
+    </physvol>
+
+  </volume>
+
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-PipeParams.xml b/compact/components/Pipe/2025-v00.00/Magnet-PipeParams.xml
new file mode 100644
index 000000000..8808e034a
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Magnet-PipeParams.xml
@@ -0,0 +1,625 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout in the Magnet                    -->
+<!--===========================================================================-->
+<lccdd>
+  <define>
+
+    <!-- ***************************************************************** -->
+    <!-- * UX85-1 Parameters                                             * -->
+    <!-- ***************************************************************** -->
+    <!-- UX85-1 Cone 10 mrad of Beryllium 1mm thick   -->
+    <!-- Start at end of BeforeMagnet Region          -->
+    <constant name="UX851Cone09Lenght"      value="5.00*mm"/>
+    <constant name="UX851Cone10Lenght"      value="36.00*mm"/>
+    <constant name="UX851Flange11Lenght"    value="12.8*mm"/>
+
+    <constant name="UX851Cone08BLenght"
+              value="UX85C2800ZStartIP - UX851TTMagnetSplitZposIP -
+                     UX851Cone09Lenght - UX851Cone10Lenght - UX851Flange11Lenght"/>
+    <!--  value="UX851Cone08Lenght - UX851Cone08ALenght - UX851Cone09Lenght"/ -->
+
+    <constant name="UX851Cone08BThick"      value="1.00*mm"/>
+    <constant name="UX851Cone08BRadiusZmin"
+              value="UX851TTMagnetSplitZposIP*tan(UX851to4Angle)"/>
+    <constant name="UX851Cone08BRadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851Cone08BLenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX851Cone08BZpos" value="0.5*UX851Cone08BLenght"/>
+
+    <!-- UX85-1 Cone 10 mrad of Beryllium 1.5mm thick for welding  -->
+    <constant name="UX851Cone09Thick"      value="1.50*mm"/>
+    <constant name="UX851Cone09RadiusZmin" value="UX851Cone08BRadiusZmax"/>
+    <constant name="UX851Cone09RadiusZmax" value="27.50*mm"/>
+    <constant name="UX851Cone09Zpos"
+              value="UX851Cone08BLenght + 0.5*UX851Cone09Lenght"/>
+
+    <!-- UX85-1 Cone 10 mrad of Alumimium 1.5mm thick for flange  -->
+    <constant name="UX851Cone10Thick"      value="1.50*mm"/>
+    <constant name="UX851Cone10RadiusZmin" value="UX851Cone09RadiusZmax"/>
+    <constant name="UX851Cone10RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851Cone08BLenght +
+                     UX851Cone09Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX851Cone10Zpos"
+              value="UX851Cone08BLenght + UX851Cone09Lenght +
+                     0.5*UX851Cone10Lenght"/>
+
+    <!-- UX85-1 Flange  -->
+    <constant name="UX851Flange11RadiusZmin"  value="UX851Cone10RadiusZmax"/>
+    <constant name="UX851Flange11RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851Cone08BLenght +
+                     UX851Cone09Lenght + UX851Cone10Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX851Flange11OuterRadius" value="43.00*mm"/>
+    <constant name="UX851Flange11Zpos"
+              value="UX851Cone08BLenght + UX851Cone09Lenght+
+                     UX851Cone10Lenght + 0.5*UX851Flange11Lenght"/>
+
+    <!-- UX851InMagnet -->
+    <constant name="UX851InMagnetLenght"
+              value="UX851Cone08BLenght + UX851Cone09Lenght + UX851Cone10Lenght +
+                     UX851Flange11Lenght"/>
+
+    <!-- Vacuum sections overlapping all the mechanical sections above -->
+    <!-- only segmentation due to shape or regions                     -->
+    <constant name="UX851Vacuum08BLenght"  value="UX851InMagnetLenght"/>
+
+    <!-- ***************************************************************** -->
+    <!-- * Compensator Parameters                                        * -->
+    <!-- ***************************************************************** -->
+    <!-- Compensator at 2800 Flange -->
+    <constant name="UX85C2800Flange01Lenght"   value="14.00*mm"/>
+    <constant name="UX85C2800Flange01RadiusZmin"
+              value="UX851Flange11RadiusZmax"/>
+    <constant name="UX85C2800Flange01RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Flange01Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX85C2800Flange01OuterRadius" value="43.00*mm"/>
+    <constant name="UX85C2800Flange01Zpos"
+              value="0.5*UX85C2800Flange01Lenght"/>
+
+    <!-- Compensator at 2800 cone of 10 mrad -->
+    <constant name="UX85C2800Cone02Lenght"
+              value="42.35*mm - UX85C2800Flange01Lenght"/>
+    <constant name="UX85C2800Cone02RadiusZmin"
+              value="UX85C2800Flange01RadiusZmax"/>
+    <constant name="UX85C2800Cone02RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Flange01Lenght + UX85C2800Cone02Lenght)
+                     *tan(UX851to4Angle)"/>
+    <constant name="UX85C2800Cone02OuterRadius"  value="30.50*mm"/>
+    <constant name="UX85C2800Cone02Zpos"
+              value="UX85C2800Flange01Lenght + 0.5*UX85C2800Cone02Lenght"/>
+
+    <!-- Compensator at 2800 connection to bellow -->
+    <constant name="UX85C2800BellowCnct03Lenght"     value="16.85*mm"/>
+    <constant name="UX85C2800BellowCnct03RadiusZmin"
+              value="UX85C2800Cone02RadiusZmax+1.0*mm"/>
+    <constant name="UX85C2800BellowCnct03RadiusZmax"
+              value="UX85C2800BellowCnct03RadiusZmin +UX85C2800BellowCnct03Lenght*tan(UX851to4Angle)"/>
+
+    <!--
+	<constant name="UX85C2800BellowCnct03RadiusZmin"
+        value="UX85C2800Cone02RadiusZmax"/>
+	<constant name="UX85C2800BellowCnct03RadiusZmax"
+        value="UX85C2800BellowCnct03RadiusZmin +
+        UX85C2800BellowCnct03Lenght*tan(15*degree)"/>
+
+<constant name="UX85C2800BellowCnct03Thick"      value="2.00*mm"/>
+    -->
+    <constant name="UX85C2800BellowCnct03Thick"      value="1.00*mm"/>
+    <constant name="UX85C2800BellowCnct03Zpos"
+              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
+                     0.5*UX85C2800BellowCnct03Lenght"/>
+
+    <!-- Compensator at 2800 Bellow -->
+    <!-- Pitch different then drawing to take into account pre-expantion 2.5*mm    -->
+    <!--  of which 1 mm in connection to bellow afterward to avoid periodic lenght -->
+
+
+    <!-- modified value from June 2015 -->
+    <constant name="UX85C2800BellowNConvCR"      value="13"/>
+
+    <constant name="UX85C2800BellowWallThick"  value="0.40*mm"/>
+    <constant name="UX85C2800BellowStep"       value="2.80*mm"/>
+
+    <constant name="UX85C2800BellowPitch"
+              value="2*(UX85C2800BellowWallThick + UX85C2800BellowStep)"/>
+
+    <constant name="UX85C2800BellowLastLenght"
+              value="2*UX85C2800BellowWallThick + UX85C2800BellowStep"/>
+
+
+
+    <!-- Modified in June 2015 -->
+    <!--
+	<constant name="UX85C2800BellowInnerRadius"  value="34.00*mm"/>
+	<constant name="UX85C2800BellowOuterRadius"  value="46.00*mm"/>
+    -->
+    <constant name="UX85C2800BellowOuterRadius"  value="(79.40/2.0)*mm"/>
+    <constant name="UX85C2800BellowGrooveSize"   value="(6+3.4)*mm"/>
+
+
+    <constant name="UX85C2800BellowInnerRadius"  value="UX85C2800BellowOuterRadius-UX85C2800BellowGrooveSize"/>
+
+    <!-- modified value from June 2015 -->
+    <constant name="UX85C2800BellowCRLength"
+              value="(UX85C2800BellowNConvCR - 1)*UX85C2800BellowPitch +
+                     UX85C2800BellowLastLenght"/>
+
+    <constant name="UX85C2800Bellow04Zpos"
+              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
+                     UX85C2800BellowCnct03Lenght + 0.5*UX85C2800BellowCRLength"/>
+
+    <!-- Compensator at 2800 connection to bellow -->
+    <!--  adding 1 mm for bellow pre-expansion    -->
+    <constant name="UX85C2800BellowCnct05Lenght"      value="14.95*mm"/>
+    <constant name="UX85C2800BellowCnct05RadiusZmin"
+              value="UX85C2800BellowCnct03RadiusZmax"/>
+    <constant name="UX85C2800BellowCnct05RadiusZmax"  value="29.00*mm"/>
+
+    <!--
+	<constant name="UX85C2800BellowCnct05RadiusZmin"
+        value="UX85C2800BellowCnct03RadiusZmax"/>
+	<constant name="UX85C2800BellowCnct05RadiusZmax"  value="29.22*mm"/>
+	<constant name="UX85C2800BellowCnct05Thick"       value=" 2.00*mm"/>
+    -->
+
+    <constant name="UX85C2800BellowCnct05Thick"       value=" 1.00*mm"/>
+    <constant name="UX85C2800BellowCnct05Zpos"
+              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
+                     0.5*UX85C2800BellowCnct05Lenght"/>
+
+    <!-- Compensator at 2800 cone of 10 mrad -->
+    <!-- modified value in Jne 2015 -->
+    <!-- old value to be removed -->
+    <!--  <constant name="UX85C2800Cone06Lenght"       value="175.25*mm"/> -->
+    <!-- end old value to be removed -->
+
+    <constant name="UX85C2800Cone06LengthIncreaseinLS1" value="29.23*mm"/>
+
+    <constant name="UX85C2800Cone06Length"       value="175.25*mm + UX85C2800Cone06LengthIncreaseinLS1"/>
+    <constant name="UX85C2800Cone06RadiusZmin"
+              value="UX85C2800BellowCnct05RadiusZmax"/>
+    <!--
+	<constant name="UX85C2800Cone06RadiusZmax"   value="30.95*mm"/>
+    -->
+    <!--  Modified in June 2015  -->
+
+    <constant name="UX85C2800Cone06RadiusZmax"   value="31.24*mm"/>
+
+    <constant name="UX85C2800Cone06Thick"        value= "2.00*mm"/>
+    <constant name="UX85C2800Cone06Zpos"
+              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
+                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
+                     UX85C2800BellowCnct05Lenght + 0.5*UX85C2800Cone06Length"/>
+
+    <!-- Compensator at 2800 cone of 10 mrad, slightly thicker -->
+
+    <!-- modified label from June 2015 -->
+
+    <constant name="UX85C2800Cone07Length"       value="10.59*mm"/>
+
+
+    <constant name="UX85C2800Cone07RadiusZmin"
+              value="UX85C2800Cone06RadiusZmax"/>
+    <!--
+	<constant name="UX85C2800Cone07RadiusZmax"   value="31.06*mm"/>
+	<constant name="UX85C2800Cone07OuterRadius"  value="33.25*mm"/>
+    -->
+    <!-- modified in June 2015 -->
+    <constant name="UX85C2800Cone07RadiusZmax"   value="31.35*mm"/>
+    <constant name="UX85C2800Cone07OuterRadius"  value="33.54*mm"/>
+
+    <constant name="UX85C2800Cone07Zpos"
+              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
+                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
+                     UX85C2800BellowCnct05Lenght + UX85C2800Cone06Length +
+                     0.5*UX85C2800Cone07Length"/>
+
+    <!-- Compensator at 2800 connection to bellow -->
+
+
+    <!-- Compensator at 2800 cone of 10 mrad -->
+    <constant name="UX85C2800Flange12Lenght"    value="14.00*mm"/>
+
+    <constant name="UX85C2800Cone11Lenght"
+              value="54.38*mm - UX85C2800Flange12Lenght"/>
+
+    <!-- modified in June 2015 -->
+
+    <constant name="UX85C2800Cone11RadiusZmin" value="UX85C2800Cone07RadiusZmax"/>
+
+    <constant name="UX85C2800Cone11RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP +  UX85C2800Cone07Zpos +
+                     UX85C2800Cone11Lenght)*tan(UX851to4Angle)"/>
+
+    <constant name="UX85C2800Cone11OuterRadius" value="34.25* mm"/>
+
+    <constant name="UX85C2800Cone11Zpos"
+              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
+                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
+                     UX85C2800BellowCnct05Lenght + UX85C2800Cone06Length +
+                     UX85C2800Cone07Length + 0.5*UX85C2800Cone11Lenght"/>
+
+    <!-- Compensator at 2800 Flange -->
+    <constant name="UX85C2800Flange12RadiusZmin"
+              value="UX85C2800Cone11RadiusZmin"/>
+    <constant name="UX85C2800Flange12RadiusZmax"  value="32.18*mm"/>
+    <constant name="UX85C2800Flange12OuterRadius" value="47.00*mm"/>
+    <constant name="UX85C2800Flange12Zpos"
+              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
+                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
+                     UX85C2800BellowCnct05Lenght + UX85C2800Cone06Length +
+                     UX85C2800Cone07Length + UX85C2800Cone11Lenght + 0.5*UX85C2800Flange12Lenght"/>
+
+    <!-- Compensator at 2800 -->
+    <constant name="UX85C2800Lenght"
+              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
+                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
+                     UX85C2800BellowCnct05Lenght + UX85C2800Cone06Length +
+                     UX85C2800Cone07Length +
+                     UX85C2800Cone11Lenght + UX85C2800Flange12Lenght"/>
+
+    <!-- Vacuum sections overlapping all the mechanical sections above -->
+    <!-- only segmentation due to shape or regions (ignore bellows)    -->
+    <constant name="UX85C2800Vacuum01Lenght"
+              value="UX85C2800Lenght"/>
+
+    <!-- ***************************************************************** -->
+    <!-- * UX85-2 Parameters                                             * -->
+    <!-- ***************************************************************** -->
+    <!-- UX85-2 Flange  -->
+    <constant name="UX852Flange01Lenght"      value="14.00*mm"/>
+    <constant name="UX852Flange01RadiusZmin"  value="32.25*mm"/>
+    <constant name="UX852Flange01RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght )*tan(UX851to4Angle)"/>
+    <constant name="UX852Flange01OuterRadius" value="47.00*mm"/>
+    <constant name="UX852Flange01Zpos"        value="0.5*UX852Flange01Lenght"/>
+
+    <!-- UX85-2 Cone 10 mrad of Alumimium 1.5mm thick for flange  -->
+    <constant name="UX852Cone02Lenght"      value="50.00*mm - UX852Flange01Lenght"/>
+    <constant name="UX852Cone02RadiusZmin"  value="UX852Flange01RadiusZmax"/>
+    <constant name="UX852Cone02RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght)
+                     *tan(UX851to4Angle)"/>
+    <constant name="UX852Cone02Thick"       value="1.50*mm"/>
+    <constant name="UX852Cone02Zpos"
+              value="UX852Flange01Lenght + 0.5*UX852Cone02Lenght"/>
+
+    <!-- UX85-2 Cone 10 mrad of Beryllium 1.0mm thick -->
+    <constant name="UX852Cone03Lenght"      value="738.20*mm"/>
+    <constant name="UX852Cone03RadiusZmin"  value="UX852Cone02RadiusZmax"/>
+    <constant name="UX852Cone03RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
+                     UX852Cone03Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX852Cone03Thick"       value="1.00*mm"/>
+    <constant name="UX852Cone03Zpos"
+              value="UX852Flange01Lenght + UX852Cone02Lenght + 0.5*UX852Cone03Lenght"/>
+
+    <!-- UX85-2 Cone 10 mrad of Beryllium section for support A  -->
+    <constant name="UX852Cone04ALenght"      value="5.00*mm"/>
+    <constant name="UX852Cone04ARadiusZmin"  value="UX852Cone03RadiusZmax"/>
+    <constant name="UX852Cone04ARadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
+                     UX852Cone03Lenght + UX852Cone04ALenght)
+                     *tan(UX851to4Angle)"/>
+    <constant name="UX852Cone04AThick"       value="1.00*mm"/>
+
+    <!-- UX85-2 Cone 10 mrad of Beryllium section for support B - cylindrical on outside -->
+    <constant name="UX852Cone04BLenght"      value="19.00*mm"/>
+    <constant name="UX852Cone04BRadiusZmin"  value="UX852Cone04ARadiusZmax"/>
+    <constant name="UX852Cone04BRadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
+                     UX852Cone03Lenght + UX852Cone04ALenght + UX852Cone04BLenght)
+                     *tan(UX851to4Angle)"/>
+    <constant name="UX852Cone04BOuterRadius" value="42.50*mm"/>
+
+    <!-- UX85-2 Cone 10 mrad of Beryllium section for support C -->
+    <constant name="UX852Cone04CLenght"      value="5.00*mm"/>
+    <constant name="UX852Cone04CRadiusZmin"  value="UX852Cone04BRadiusZmax"/>
+    <constant name="UX852Cone04CRadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
+                     UX852Cone03Lenght + UX852Cone04ALenght + UX852Cone04BLenght +
+                     UX852Cone04CLenght)*tan(UX851to4Angle)"/>
+    <constant name="UX852Cone04CThick"       value="1.00*mm"/>
+
+    <!-- UX85-2 Cone 10 mrad of Beryllium section for support - flange surrounds B section -->
+    <constant name="UX852Cone04RibLenght"       value="6.00*mm"/>
+    <constant name="UX852Cone04RibInnerRadius"  value="UX852Cone04BOuterRadius"/>
+    <constant name="UX852Cone04RibOuterRadius"  value="48.50*mm"/>
+
+    <!-- UX85-2 Cone 10 mrad of Beryllium section for support - whole -->
+    <constant name="UX852Cone04Lenght"
+              value="UX852Cone04ALenght + UX852Cone04BLenght + UX852Cone04CLenght"/>
+    <constant name="UX852Cone04Zpos"
+              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
+                     0.5*UX852Cone04Lenght"/>
+
+    <!-- UX85-2 Cone 10 mrad of Beryllium 1.0 mm thick -->
+    <constant name="UX852Cone05Lenght"      value="784.00*mm"/>
+    <constant name="UX852Cone05RadiusZmin"  value="UX852Cone04CRadiusZmax"/>
+    <constant name="UX852Cone05RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
+                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght)
+                     *tan(UX851to4Angle)"/>
+    <constant name="UX852Cone05Thick"       value="1.00*mm"/>
+    <constant name="UX852Cone05Zpos"
+              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
+                     UX852Cone04Lenght + 0.5*UX852Cone05Lenght"/>
+
+    <!-- UX85-2 Cone 10 mrad of Beryllium 1.1 mm thick -->
+    <constant name="UX852Cone06Lenght"      value="800.00*mm"/>
+    <constant name="UX852Cone06RadiusZmin"  value="UX852Cone05RadiusZmax"/>
+    <constant name="UX852Cone06RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
+                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght +
+                     UX852Cone06Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX852Cone06Thick"       value="1.10*mm"/>
+    <constant name="UX852Cone06Zpos"
+              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
+                     UX852Cone04Lenght + UX852Cone05Lenght + 0.5*UX852Cone06Lenght"/>
+
+    <!-- UX85-2 Cone 10 mrad of Beryllium 1.3 mm thick -->
+    <constant name="UX852Cone07Lenght"      value="1247.00*mm"/>
+    <constant name="UX852Cone07RadiusZmin"  value="UX852Cone06RadiusZmax"/>
+    <constant name="UX852Cone07RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
+                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght +
+                     UX852Cone06Lenght + UX852Cone07Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX852Cone07Thick"       value="1.30*mm"/>
+    <constant name="UX852Cone07Zpos"
+              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
+                     UX852Cone04Lenght + UX852Cone05Lenght + UX852Cone06Lenght +
+                     0.5*UX852Cone07Lenght"/>
+
+    <!-- UX85-2 Cone 10 mrad of Aluminum 2.0 mm thick -->
+    <constant name="UX852Cone08Lenght"      value="9.00*mm"/>
+    <constant name="UX852Cone08RadiusZmin"  value="UX852Cone07RadiusZmax"/>
+    <constant name="UX852Cone08RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
+                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght +
+                     UX852Cone06Lenght + UX852Cone07Lenght + UX852Cone08Lenght)
+                     *tan(UX851to4Angle)"/>
+    <constant name="UX852Cone08Thick"       value="2.00*mm"/>
+    <constant name="UX852Cone08Zpos"
+              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
+                     UX852Cone04Lenght + UX852Cone05Lenght + UX852Cone06Lenght +
+                     UX852Cone07Lenght + 0.5*UX852Cone08Lenght"/>
+
+    <!-- UX85-2 Flange -->
+    <constant name="UX852Flange09Lenght"      value="20.00*mm"/>
+    <constant name="UX852Flange09RadiusZmin"  value="UX852Cone08RadiusZmax"/>
+    <constant name="UX852Flange09RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
+                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght +
+                     UX852Cone06Lenght + UX852Cone07Lenght + UX852Cone08Lenght +
+                     UX852Flange09Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX852Flange09OuterRadius"  value="88.95*mm"/>
+    <constant name="UX852Flange09Zpos"
+              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
+                     UX852Cone04Lenght + UX852Cone05Lenght + UX852Cone06Lenght +
+                     UX852Cone07Lenght + UX852Cone08Lenght + 0.5*UX852Flange09Lenght"/>
+
+    <!-- UX85-2 (whole in magnet) -->
+    <constant name="UX852Lenght"
+              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
+                     UX852Cone04Lenght + UX852Cone05Lenght + UX852Cone06Lenght +
+                     UX852Cone07Lenght + UX852Cone08Lenght + UX852Flange09Lenght"/>
+
+    <!-- Vacuum sections overlapping all the mechanical sections above -->
+    <!-- only segmentation due to shape or regions                     -->
+    <constant name="UX852Vacuum01Lenght"  value="UX852Lenght"/>
+
+    <!-- ***************************************************************** -->
+    <!-- * Bellow Section Parameters                                     * -->
+    <!-- ***************************************************************** -->
+    <!-- Bellow at 6900 - Flange -->
+    <constant name="UX85B6900Flange01Lenght"       value="20.00*mm"/>
+    <constant name="UX85B6900Flange01InnerRadius"  value="69.60*mm"/>
+    <constant name="UX85B6900Flange01OuterRadius"  value="88.95*mm"/>
+    <constant name="UX85B6900Flange01Zpos"
+              value="0.5*UX85B6900Flange01Lenght"/>
+
+    <!-- Bellow at 6900 cylinder (almost cone 10 mrad) -->
+    <!-- Make it 1.5*mm/2 longer to compensate for pre-expansion 5mm that cannot all be -->
+    <!-- accounted in bellow step.                                                      -->
+    <constant name="UX85B6900Cyl02Lenght"        value="7.00*mm + 16.00*mm + 0.75*mm"/>
+    <constant name="UX85B6900Cyl02InnerRadius"   value="69.60*mm"/>
+    <constant name="UX85B6900Cyl02OuterRadius"   value="71.60*mm"/>
+    <constant name="UX85B6900Cyl02Zpos"
+              value="UX85B6900Flange01Lenght + 0.5*UX85B6900Cyl02Lenght"/>
+
+    <!-- Bellow at 6900 rib around cone -->
+    <constant name="UX85B6900Rib03Lenght"       value="2.00*mm"/>
+    <constant name="UX85B6900Rib03InnerRadius"  value="UX85B6900Cyl02OuterRadius"/>
+    <constant name="UX85B6900Rib03OuterRadius"  value="73.50*mm"/>
+    <constant name="UX85B6900Rib03Zpos"
+              value="UX85B6900Flange01Lenght + 7.00*mm + 6.00*mm + 0.5*UX85B6900Rib03Lenght"/>
+
+    <!-- Bellow at 6900 Bellow -->
+    <!-- Pre-expansion is 5*mm but make it a little more to be equally distributed on steps -->
+    <!-- anyway there would be 2 extra half convolutions...                                 -->
+    <constant name="UX85B6900BellowNConv"       value="7"/>
+    <constant name="UX85B6900BellowWallThick"   value="0.50*mm"/>
+    <constant name="UX85B6900BellowStep"        value="4.50*mm"/>
+
+    <constant name="UX85B6900BellowPitch"
+              value="2*(UX85B6900BellowWallThick + UX85B6900BellowStep)"/>
+
+    <constant name="UX85B6900BellowLastLenght"
+              value="2*UX85B6900BellowWallThick + UX85B6900BellowStep"/>
+
+    <constant name="UX85B6900BellowInnerRadius"  value="71.00*mm"/>
+    <constant name="UX85B6900BellowOuterRadius"  value="90.00*mm"/>
+
+    <constant name="UX85B6900BellowLenght"
+              value="(UX85B6900BellowNConv - 1)*UX85B6900BellowPitch +
+                     UX85B6900BellowLastLenght"/>
+
+    <constant name="UX85B6900Bellow04Zpos"
+              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght +
+                     0.5*UX85B6900BellowLenght"/>
+
+    <!-- Bellow at 6900 rib around cone -->
+    <constant name="UX85B6900Cyl06Lenght"       value="7.00*mm + 16.00*mm + 0.75*mm"/>
+    <constant name="UX85B6900Cyl06OuterRadius"  value="72.50*mm"/>
+
+    <constant name="UX85B6900Rib05Lenght"       value="2.00*mm"/>
+    <constant name="UX85B6900Rib05InnerRadius"  value="UX85B6900Cyl06OuterRadius"/>
+    <constant name="UX85B6900Rib05OuterRadius"  value="74.50*mm"/>
+    <constant name="UX85B6900Rib05Zpos"
+              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght + UX85B6900BellowLenght +
+                     UX85B6900Cyl06Lenght - 7.00*mm - 6.0*mm - 0.5*UX85B6900Rib05Lenght"/>
+
+    <!-- Bellow at 6900 cylinder (almost cone 10 mrad) -->
+    <constant name="UX85B6900Cyl06InnerRadius"   value="70.50*mm"/>
+    <constant name="UX85B6900Cyl06Zpos"
+              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght + UX85B6900BellowLenght +
+                     0.5*UX85B6900Cyl06Lenght"/>
+
+    <!-- Bellow at 6900 - Flange -->
+    <constant name="UX85B6900Flange07Lenght"       value="20.00*mm"/>
+    <constant name="UX85B6900Flange07InnerRadius"  value="70.50*mm"/>
+    <constant name="UX85B6900Flange07OuterRadius"  value="88.95*mm"/>
+    <constant name="UX85B6900Flange07Zpos"
+              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght + UX85B6900BellowLenght +
+                     UX85B6900Cyl06Lenght + 0.5*UX85B6900Flange07Lenght"/>
+
+    <!-- Whole bellow lenght -->
+    <constant name="UX85B6900Lenght"
+              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght + UX85B6900BellowLenght +
+                     UX85B6900Cyl06Lenght + UX85B6900Flange07Lenght"/>
+
+    <!-- Vacuum section overlapping the Flange and cylinder -->
+    <constant name="UX85B6900Vacuum01Lenght"
+              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght"/>
+    <constant name="UX85B6900Vacuum01Zpos"
+              value="0.5*UX85B6900Vacuum01Lenght"/>
+
+    <!-- Vacuum section overlapping the bellow -->
+    <constant name="UX85B6900Vacuum04Lenght"
+              value="UX85B6900BellowLenght"/>
+    <constant name="UX85B6900Vacuum04Zpos"
+              value="UX85B6900Vacuum01Lenght + 0.5*UX85B6900Vacuum04Lenght"/>
+
+    <!-- Vacuum section overlapping the Flange and cylinder -->
+    <constant name="UX85B6900Vacuum06Lenght"
+              value="UX85B6900Cyl06Lenght + UX85B6900Flange07Lenght"/>
+    <constant name="UX85B6900Vacuum06Zpos"
+              value="UX85B6900Vacuum01Lenght + UX85B6900BellowLenght +
+                     0.5*UX85B6900Vacuum06Lenght"/>
+
+    <!-- ***************************************************************** -->
+    <!-- * UX85-3 Parameters                                             * -->
+    <!-- ***************************************************************** -->
+    <!-- UX85-3 Flange  -->
+    <constant name="UX853Flange01Lenght"      value="20.00*mm"/>
+    <constant name="UX853Flange01RadiusZmin"  value="70.50*mm"/>
+    <constant name="UX853Flange01RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Lenght + UX85B6900Lenght +
+                     UX853Flange01Lenght )*tan(UX851to4Angle)"/>
+    <constant name="UX853Flange01OuterRadius" value="89.00*mm"/>
+    <constant name="UX853Flange01Zpos"        value="0.5*UX853Flange01Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Alumimium ~2-2.4*mm thick for flange  -->
+    <constant name="UX853Cone02Lenght"
+              value="UX853Flange01Cone02Lenght - UX853Flange01Lenght"/>
+    <constant name="UX853Cone02RadiusZmin"    value="UX853Flange01RadiusZmax"/>
+    <constant name="UX853Cone02RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Lenght + UX85B6900Lenght +
+                     UX853Flange01Lenght + UX853Cone02Lenght)*
+                     tan(UX851to4Angle)"/>
+    <constant name="UX853Cone02OuterRadius" value="73.10*mm"/>
+    <constant name="UX853Cone02Zpos"
+              value="UX853Flange01Lenght + 0.5*UX853Cone02Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium ~2*mm thick for welding and -->
+    <!-- support flange  -->
+    <constant name="UX853Cone03FlangeLenght"  value="2.50*mm"/>
+
+    <constant name="UX853Cone03Lenght"
+              value="50.00*mm + UX853Cone03FlangeLenght + 8.00*mm"/>
+    <constant name="UX853Cone03RadiusZmin"    value="UX853Cone02RadiusZmax"/>
+    <constant name="UX853Cone03RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Lenght + UX85B6900Lenght +
+                     UX853Flange01Lenght + UX853Cone02Lenght +
+                     UX853Cone03Lenght )*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone03OuterRadius" value="73.10*mm"/>
+    <constant name="UX853Cone03Zpos"
+              value="UX853Flange01Lenght + UX853Cone02Lenght +
+                     0.5*UX853Cone03Lenght"/>
+
+    <!-- UX85-3 little flange for support, surrounds Cone03 -->
+    <constant name="UX853Cone03FlangeInnerRadius"  value="UX853Cone03OuterRadius"/>
+    <constant name="UX853Cone03FlangeOuterRadius"  value="80.30*mm"/>
+    <constant name="UX853Cone03FlangeZpos"
+              value="UX853Flange01Lenght + UX853Cone02Lenght + 50.00*mm +
+                     0.5*UX853Cone03FlangeLenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 1.4 mm thick -->
+    <constant name="UX853Cone04Lenght"
+              value="UX853Cone0304Lenght - UX853Cone03Lenght"/>
+    <constant name="UX853Cone04RadiusZmin"    value="UX853Cone03RadiusZmax"/>
+    <constant name="UX853Cone04RadiusZmax"
+              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
+                     UX85C2800Lenght + UX852Lenght + UX85B6900Lenght +
+                     UX853Flange01Lenght + UX853Cone02Lenght +
+                     UX853Cone03Lenght + UX853Cone04Lenght)*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone04Thick"         value="1.4*mm"/>
+    <constant name="UX853Cone04Zpos"
+              value="UX853Flange01Lenght + UX853Cone02Lenght + UX853Cone03Lenght +
+                     0.5*UX853Cone04Lenght"/>
+
+    <!-- UX85-3 Cone 10 mrad of Beryllium 1.6 mm thick - Split Magnet/AfterMagnet -->
+    <constant name="UX853Cone05ALenght"
+              value="UX853MagnetTSplitZposIP - UX853ZStartIP - UX853Flange01Lenght -
+                     UX853Cone02Lenght - UX853Cone03Lenght - UX853Cone04Lenght"/>
+
+    <constant name="UX853Cone05ARadiusZmin"    value="UX853Cone04RadiusZmax"/>
+    <constant name="UX853Cone05ARadiusZmax"
+              value="UX853MagnetTSplitZposIP*tan(UX851to4Angle)"/>
+    <constant name="UX853Cone05AThick"         value="1.6*mm"/>
+    <constant name="UX853Cone05AZpos"
+              value="UX853Flange01Lenght + UX853Cone02Lenght + UX853Cone03Lenght +
+                     UX853Cone04Lenght + 0.5*UX853Cone05ALenght"/>
+
+    <!-- UX85-3 InMagnet -->
+    <constant name="UX853InMagnetLenght"
+              value="UX853Flange01Lenght + UX853Cone02Lenght + UX853Cone03Lenght +
+                     UX853Cone04Lenght + UX853Cone05ALenght"/>
+
+    <!-- Vacuum sections overlapping all the mechanical sections above -->
+    <!-- only segmentation due to regions                              -->
+    <constant name="UX853Vacuum01Lenght"  value="UX853InMagnetLenght"/>
+
+    <!-- ***************************************************************** -->
+    <!-- * General Parameters                                            * -->
+    <!-- ***************************************************************** -->
+    <!-- UX85InMagnet -->
+    <constant name="UX85InMagnetLenght"
+              value="UX851InMagnetLenght + UX85C2800Lenght + UX852Lenght + UX85B6900Lenght"/>
+  </define>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-Support.xml b/compact/components/Pipe/2025-v00.00/Magnet-Support.xml
new file mode 100644
index 000000000..8cd5a33eb
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Magnet-Support.xml
@@ -0,0 +1,2769 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+
+  <materials>
+    <!-- ### Pipe Supports Titanium small pins ### -->
+    <material name    = "Pipe:TitaniumG5">
+      <D name="density" value="4.42" unit="g/cm3"/>
+      <fraction ref = "Al" n="0.06"/>
+      <fraction ref = "Fe" n="0.0025"/>
+      <fraction ref = "Ti" n="0.8955"/>
+      <fraction ref = "V"  n="0.04"/>
+      <fraction ref = "O"  n="0.0020"/>
+    </material>
+  </materials>
+
+  <detectors>
+    <detector name="PipeMagnet-Support" type="DD4hep_VolumeAssembly" parent="${PipeMagnet:parent}" vis="Pipe:Vis">
+      <position z="-0.5*Regions:MagnetRegionZSize"/>
+      <!-- *************************************************************************** -->
+      <!-- * UX85-1 Support                                                          * -->
+      <!-- *************************************************************************** -->
+      <!-- UX85-1 Support: Collar -->
+      <volume name="lvUX851Collar" material="Pipe:Al2219F">
+        <shape type="Tube" name="UX85-1-Collar"
+               dz="0.5*UX851CollarLenght"
+               rmin="UX851CollarRadius"
+               rmax="UX851CollarRadius+UX851CollarThick"/>
+      </volume>
+
+      <!-- UX85-1 Support: Cables -->
+      <volume name="lvUX851Cable" material="Pipe:Steel316LN">
+        <shape type="Tube" name="UX85-1-Cable"
+               dz="0.5*UX851CableLenght"
+               rmax="UX851CableRadius"/>
+      </volume>
+
+      <!-- *************************************************************************** -->
+      <!-- UX85-2 Fixed Point                                                          -->
+      <!-- *************************************************************************** -->
+      <volume name="lvUX852InnerRing" material="Pipe:Beryllium">
+        <shape type="Tube" name="UX85-2-InnerRing"
+               dz="0.5*UX852FixCollarRingLength"
+               rmin="UX852FixCollarRingInnerRad"
+               rmax="UX852FixCollarRingOuterRad"/>
+      </volume>
+
+      <volume name="lvUX852BigRingSect1" material="Pipe:Beryllium">
+        <shape type="Tube" name="UX85-2-BigRingSect1"
+               dz="0.5*UX852FixCollarLength"
+               rmin="UX852FixCollarInnerRad"
+               rmax="UX852FixCollarAttOuterRad"
+               deltaPhiAngle="UX852FixCollarSect1DelthaAngle"/>
+      </volume>
+
+      <volume name="lvUX852BigRingSect2" material="Pipe:Beryllium">
+        <shape type="BooleanShape" operation="subtraction" name="UX852Sect2Sub">
+          <shape type="Tube" name="UX85-2-BigRingSect2"
+                 dz="0.5*UX852FixCollarLength"
+                 rmin="UX852FixCollarInnerRad"
+                 rmax="UX852FixCollarAttOuterRad"
+                 startPhiAngle="UX852FixCollarSect1DelthaAngle"
+                 deltaPhiAngle="UX852FixCollarSect2DelthaAngle"/>
+          <shape type="Box" name="UX85-2-BigRingSect2-Slope"
+                 dx="0.5*UX852BigRingSect2SlopeXsize"
+                 dy="0.5*UX852BigRingSect2SlopeYsize"
+                 dz="0.5*(UX852FixCollarLength+0.5*mm)"/>
+          <transformation>
+            <position/>
+            <rotation z="UX852BigRingSect2SlopeZrot"/>
+            <position/>
+            <rotation/>
+            <positionRPhiZ r="0.5*(UX852FixCollarAttOuterRad+UX852FixCollarOuterRad+UX852BigRingSect2SlopeYsize)" phi="UX852BigRingSect2SlopePhipos"/>
+          </transformation>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852BigRingSect3" material="Pipe:Beryllium">
+        <shape type="BooleanShape" operation="subtraction" name="UX852Sect3Sub">
+          <shape type="Tube" name="UX85-2-BigRingSect3"
+                 dz="0.5*UX852FixCollarLength"
+                 rmin="UX852FixCollarInnerRad"
+                 rmax="UX852FixCollarOuterRad"
+                 startPhiAngle="UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle"
+                 deltaPhiAngle="UX852FixCollarSect3DelthaAngle"/>
+          <shape type="Tube" name="UX852BigRingTransHole1"
+                 dz="0.5*UX852FixCollarHoleSect3Length"
+                 rmax="UX852FixCollarHoleSect3Rad"/>
+          <transformation>
+            <positionRPhiZ/>
+            <rotation y="90*degree"/>
+            <positionRPhiZ r="UX852FixCollarHoleSect3Rpos" phi="UX852FixCollarHoleSect3Phipos"/>
+            <rotation z="45*degree-UX852FixCollarSect1Rot"/>
+          </transformation>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852BigRingSect4" material="Pipe:Beryllium">
+        <shape type="BooleanShape" operation="subtraction" name="UX852Sect4Sub">
+          <shape type="Tube" name="UX85-2-BigRingSect4"
+                 dz="0.5*UX852FixCollarLength"
+                 rmin="UX852FixCollarInnerRad"
+                 rmax="UX852FixCollarAttOuterRad"
+                 startPhiAngle="UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle + UX852FixCollarSect3DelthaAngle"
+                 deltaPhiAngle="UX852FixCollarSect2DelthaAngle"/>
+          <shape type="Box" name="UX85-2-BigRingSect4-Slope"
+                 dx="0.5*UX852BigRingSect2SlopeXsize"
+                 dy="0.5*UX852BigRingSect2SlopeYsize"
+                 dz="0.5*(UX852FixCollarLength+0.5*mm)"/>
+          <transformation>
+            <position/>
+            <rotation z="UX852BigRingSect2SlopeZrot - 5*degree"/>
+            <position/>
+            <rotation/>
+            <positionRPhiZ r="0.5*(UX852FixCollarAttOuterRad+UX852FixCollarOuterRad+UX852BigRingSect2SlopeYsize)" phi="UX852BigRingSect4SlopePhipos"/>
+          </transformation>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852BigRingQuarter">
+        <physvol name="pvUX852BigRingSect1"                 volume="lvUX852BigRingSect1">
+        </physvol>
+        <physvol name="pvUX852BigRingSect2"                 volume="lvUX852BigRingSect2">
+        </physvol>
+        <physvol name="pvUX852BigRingSect3"                 volume="lvUX852BigRingSect3">
+        </physvol>
+        <physvol name="pvUX852BigRingSect4"                 volume="lvUX852BigRingSect4">
+        </physvol>
+      </volume>
+
+      <!-- UX825 Fix Collar -->
+      <volume name="lvUX852FixCollar">
+        <physvol name="pvUX852InnerRing"                 volume="lvUX852InnerRing">
+          <position z="UX852FixCollarZpos"/>
+        </physvol>
+
+        <physvol name="pvUX852BigRingQuarter1"           volume="lvUX852BigRingQuarter">
+          <position z="UX852FixCollarZpos"/>
+          <rotation z="UX852FixCollarSect1Rot"/>
+        </physvol>
+
+        <physvol name="pvUX852BigRingQuarter2"           volume="lvUX852BigRingQuarter">
+          <position z="UX852FixCollarZpos"/>
+          <rotation z="UX852FixCollarSect1Rot+UX852FixCollarQuarterRot"/>
+        </physvol>
+
+        <physvol name="pvUX852BigRingQuarter3"           volume="lvUX852BigRingQuarter">
+          <position z="UX852FixCollarZpos"/>
+          <rotation z="UX852FixCollarSect1Rot+2*UX852FixCollarQuarterRot"/>
+        </physvol>
+
+        <physvol name="pvUX852BigRingQuarter4"           volume="lvUX852BigRingQuarter">
+          <position z="UX852FixCollarZpos"/>
+          <rotation z="UX852FixCollarSect1Rot+3*UX852FixCollarQuarterRot"/>
+        </physvol>
+      </volume>
+
+      <!-- Attachments -->
+      <volume name="lvUX852CollarAtt" material="Pipe:Beryllium">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-2-CollarAttMainSub">
+          <shape type="Box" name="UX85-2-CollarAttMain"
+                 dx="0.5*UX852CollarAttMainPartXsize"
+                 dy="0.5*UX852CollarAttMainPartYsize"
+                 dz="0.5*UX852CollarAttMainPartZsize"/>
+          <shape type="Box" name="UX85-2-CollarAttMainSub1"
+                 dx="0.5*UX852CollarAttMainPartXsize"
+                 dy="0.5*UX852CollarAttMainPartYsize+100*mm"
+                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"/>
+          <transformation>
+            <positionRPhiZ r="UX852CollarAttSlope1RPos"/>
+            <rotation z="UX852CollarAttSlope1YRot"/>
+            <position/>
+            <rotation y="180*degree"/>
+            <positionRPhiZ/>
+          </transformation>
+          <shape type="Box" name="UX85-2-CollarAttMainSub2"
+                 dx="0.5*UX852CollarAttMainPartXsize"
+                 dy="0.5*UX852CollarAttMainPartYsize"
+                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"/>
+          <transformation>
+            <positionRPhiZ r="UX852CollarAttSlope2RPos"/>
+            <rotation/>
+            <position y="UX852CollarAttSlope2ZPos"/>
+            <rotation/>
+            <positionRPhiZ/>
+          </transformation>
+          <shape type="Box" name="UX85-2-CollarAttMainSub3"
+                 dx="0.5*UX852CollarAttMainPartXsize"
+                 dy="0.5*(UX852CollarAttMainPartYsize-5*mm)"
+                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"/>
+          <transformation>
+            <positionRPhiZ r="UX852CollarAttSlope3RPos"/>
+            <rotation z="UX852CollarAttSlope3YRot"/>
+            <position/>
+            <rotation/>
+            <positionRPhiZ/>
+          </transformation>
+          <shape type="Tube" name="UX85-2-CollarAttMain-Hole1"
+                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
+                 rmax="UX852CollarAttMainHole1Rad"/>
+          <transformation>
+            <positionRPhiZ r="UX852CollarAttMainHole1RadPos"/>
+            <rotation/>
+            <position/>
+            <position y="UX852CollarAttMainHole1ZPos"/>
+            <rotation y="180*degree"/>
+            <positionRPhiZ/>
+          </transformation>
+          <shape type="Tube" name="UX85-2-CollarAttMain-Hole2"
+                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
+                 rmax="UX852CollarAttMainHole2Rad"/>
+          <transformation>
+            <positionRPhiZ r="UX852CollarAttMainHole2RadPos"/>
+            <rotation/>
+            <position y="UX852CollarAttMainHole2ZPos"/>
+            <rotation/>
+            <positionRPhiZ/>
+          </transformation>
+          <shape type="Tube" name="UX85-2-CollarAttMain-RoundEdge1"
+                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
+                 rmin="UX852CollarAttMainPartEdge1InnerRad"
+                 rmax="UX852CollarAttMainPartEdge1InnerRad+10*mm"
+                 startPhiAngle="UX852CollarAttMainPartEdge1StartPhi"
+                 deltaPhiAngle="UX852CollarAttMainPartEdge1DeltaPhi"/>
+          <transformation>
+            <positionRPhiZ r="UX852CollarAttMainHole1RadPos"/>
+            <rotation/>
+            <position y="UX852CollarAttMainHole1ZPos"/>
+            <rotation y="180*degree"/>
+            <positionRPhiZ/>
+          </transformation>
+          <shape type="Tube" name="UX85-2-CollarAttMain-RoundEdge2"
+                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
+                 rmin="UX852CollarAttMainPartEdge2InnerRad"
+                 rmax="UX852CollarAttMainPartEdge2InnerRad+10*mm"
+                 startPhiAngle="UX852CollarAttMainPartEdge2StartPhi"
+                 deltaPhiAngle="UX852CollarAttMainPartEdge2DeltaPhi"/>
+          <transformation>
+            <positionRPhiZ r="UX852CollarAttMainHole2RadPos"/>
+            <rotation/>
+            <position y="UX852CollarAttMainHole2ZPos"/>
+            <rotation/>
+            <positionRPhiZ/>
+          </transformation>
+          <shape type="Tube" name="UX85-2-CollarAttMain-RoundEdge2b"
+                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
+                 rmin="UX852CollarAttMainPartEdge2InnerRad"
+                 rmax="UX852CollarAttMainPartEdge2InnerRad+10*mm"
+                 startPhiAngle="UX852CollarAttMainPartEdge2bStartPhi"
+                 deltaPhiAngle="UX852CollarAttMainPartEdge2bDeltaPhi"/>
+          <transformation>
+            <positionRPhiZ r="UX852CollarAttMainHole2RadPos"/>
+            <rotation/>
+            <position y="UX852CollarAttMainHole2ZPos"/>
+            <rotation/>
+            <positionRPhiZ/>
+          </transformation>
+        </shape>
+      </volume>
+
+      <!-- Cable attachments -->
+      <!-- New Cable attachment from 2015 June -->
+      <volume name="lvUX852CollarForkAttachProngCyl" material="Pipe:AW7075">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-2-CollarForkAttachProngSub" >
+          <shape type="Tube" name="UX85-2-CollarForkAttachCyl"
+                 dz="0.5*UX852CollarForkAttachProngThickness"
+                 rmax="UX852CollarForkAttachProngOuterRadius"
+                 rmin="UX852CollarForkAttachProngInnerRadius"/>
+          <shape type="Box" name="UX85-2-CollarForkAttachProngSubBox"
+                 dx="0.5*UX852CollarForkAttachProngSubBoxLargeXSize"
+                 dy="0.5*UX852CollarForkAttachProngSubBoxLargeYSize"
+                 dz="0.5*UX852CollarForkAttachProngSubBoxLargeZSize"/>
+          <position  y="UX852CollarForkAttachProngSubBoxShiftY"/>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852CollarForkAttachProngTrap" material="Pipe:AW7075">
+        <shape type="Trapezoid" name="UX85-2-CollarForkAttachTrd"
+               z="0.5*UX852CollarForkAttachProngTrapZSize"
+               x1="0.5*UX852CollarForkAttachProngTrapX1Size"
+               x2="0.5*UX852CollarForkAttachProngTrapX2Size"
+               y1="0.5*UX852CollarForkAttachProngTrapY1Size"
+               y2="0.5*UX852CollarForkAttachProngTrapY2Size"/>
+      </volume>
+      <volume name="lvUX852CollarForkAttachProngBox" material="Pipe:AW7075">
+        <shape type="Box" name="UX85-2-CollarForkAttachBox"
+               dx="0.5*UX852CollarForkAttachProngBoxXSize"
+               dy="0.5*UX852CollarForkAttachProngBoxYSize"
+               dz="0.5*UX852CollarForkAttachProngBoxZSize"/>
+      </volume>
+
+      <volume name="lvUX852CollarForkAttachStemTrap" material="Pipe:AW7075">
+        <shape type="BooleanShape" operation="subtraction" name="UX852CollarForkAttachStemSub" >
+          <shape type="Trapezoid" name="UX852CollarForkAttachTrd"
+                 z="0.5*UX852CollarForkAttachStemTrapZSize"
+                 x1="0.5*UX852CollarForkAttachStemTrapX1Size"
+                 x2="0.5*UX852CollarForkAttachStemTrapX2Size"
+                 y1="0.5*UX852CollarForkAttachStemTrapY1Size"
+                 y2="0.5*UX852CollarForkAttachStemTrapY2Size"/>
+
+          <shape type="BooleanShape" operation="subtraction" name="UX852CollarForkAttachStemCylSub" >
+            <shape type="Tube" name="UX852CollarStemLargeCylSub"
+                   dz="0.5*UX852CollarForkAttachStemLargeCylZSize"
+                   rmax="UX852CollarForkAttachStemLargeCylRadius"
+                   startPhiAngle="UX852CollarForkAttachStemCylStartPhi"
+                   deltaPhiAngle="UX852CollarForkAttachStemCylDeltaPhi"/>
+            <shape type="Tube" name="UX852CollarStemCylSub"
+                   dz="0.5*UX852CollarForkAttachStemCylZSize"
+                   rmax="UX852CollarForkAttachStemCylRadius"/>
+            <position/>
+          </shape>
+          <position z="UX852CollarForkAttachStemCylCenterZFromTrapCenter"/>
+          <rotation  x="UX852CollarForkAttachStemCylRotX"/>
+
+          <shape type="Tube"  name="UX852CollarForkStemCylHoleSub"
+                 dz="0.5*UX852CollarForkAttachStemHoleLargeZSize"
+                 rmax="UX852CollarForkAttachStemHoleRadius"/>
+          <position  z="UX852CollarForkAttachStemCylCenterZFromTrapCenter"/>
+          <rotation  x="UX852CollarForkAttachStemCylRotX"/>
+
+          <shape type="Trapezoid" name="UX852CollarForkStemTrdholeSub"
+                 z="0.5*UX852CollarForkStemTrdholeLargeZSize"
+                 x1="0.5*UX852CollarForkStemTrdholeX1Size"
+                 x2="0.5*UX852CollarForkStemTrdholeX2Size"
+                 y1="0.5*UX852CollarForkStemTrdholeY1LargeSize"
+                 y2="0.5*UX852CollarForkStemTrdholeY2LargeSize"/>
+          <position z="UX852CollarForkStemTrdholeZPos"/>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852CollarForkAttachProng" >
+        <physvol name="pvUX852CollarForkAttachProngCylUps"                 volume="lvUX852CollarForkAttachProngCyl" >
+          <position z="UX852CollarForkAttachProngUpsPosZ"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarForkAttachProngCylDns"                 volume="lvUX852CollarForkAttachProngCyl" >
+          <position z="UX852CollarForkAttachProngDnsPosZ"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarForkAttachProngTrapUps"                volume="lvUX852CollarForkAttachProngTrap" >
+          <position y="UX852CollarForkAttachProngTrapPosY"
+                    z="UX852CollarForkAttachProngTrapUpsPosZ"/>
+          <rotation x="UX852CollarForkAttachProngTrapRotX"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarForkAttachProngTrapDns"                volume="lvUX852CollarForkAttachProngTrap" >
+          <position y="UX852CollarForkAttachProngTrapPosY"
+                    z="UX852CollarForkAttachProngTrapDnsPosZ"/>
+          <rotation x="UX852CollarForkAttachProngTrapRotX"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarForkAttachProngBoxUps"                 volume="lvUX852CollarForkAttachProngBox" >
+          <position y="UX852CollarForkAttachProngBoxYPos"
+                    z="UX852CollarForkAttachProngBoxUpsPosZ"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarForkAttachProngBoxDns"                 volume="lvUX852CollarForkAttachProngBox" >
+          <position y="UX852CollarForkAttachProngBoxYPos"
+                    z="UX852CollarForkAttachProngBoxDnsPosZ"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarForkAttachStemTrap"                    volume="lvUX852CollarForkAttachStemTrap" >
+          <transformation>
+            <position/>
+            <rotation x="UX852CollarForkStemRotX"/>
+            <position y="UX852CollarForkStemPosY"/>
+            <rotation y="UX852CollarForkStemRotY"/>
+          </transformation>
+        </physvol>
+
+      </volume>
+
+
+      <volume name="lvUX852TechnoraCableHeadTypeACyl"  material="Pipe:Celazole">
+        <shape type="Tube" name="UX85-2-TechnoraCableHeadTypeATub"
+               dz="0.5*UX852TechnoraCableHeadThickness"
+               rmax="UX852TechnoraCableHeadTypeAOuterRadius"
+               rmin="UX852TechnoraCableHeadInnerRadius"/>
+      </volume>
+
+      <volume name="lvUX852TechnoraCableHeadTypeBCyl"  material="Pipe:Celazole">
+        <shape type="Tube" name="UX85-2-TechnoraCableHeadTypeBTub"
+               dz="0.5*UX852TechnoraCableHeadThickness"
+               rmax="UX853TechnoraCableHeadTypeBOuterRadius"
+               rmin="UX852TechnoraCableHeadInnerRadius"/>
+      </volume>
+
+      <volume name="lvUX852TechnoraCableHeadDemiCable" material="Pipe:Technora">
+        <shape type="Tube" name="UX85-2-TechnoraCableHeadDemiCableTub"
+               dz="0.5*UX852TechnoraCableHeadDemiCableLength"
+               rmax="UX852TechnoraCableHeadDemiCableRadius"/>
+      </volume>
+
+      <volume name="lvUX852TechnoraCableHeadTypeAWithoutPin" >
+        <physvol name="pvUX852TechnoraCableHeadCylTypeAWithoutPin"       volume="lvUX852TechnoraCableHeadTypeACyl"/>
+        <physvol name="pvUX852TechnoraCableHeadDemiCableSideATypeAWithoutPin"
+                 volume="lvUX852TechnoraCableHeadDemiCable" >
+          <position x="UX852TechnoraCableHeadDemiCableSideAPosX"
+                    y="UX852TechnoraCableHeadDemiCableSidePosY"/>
+          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
+        </physvol>
+        <physvol name="pvUX852TechnoraCableHeadDemiCableSideBTypeAWithoutPin"
+                 volume="lvUX852TechnoraCableHeadDemiCable" >
+          <position x="UX852TechnoraCableHeadDemiCableSideBPosX"
+                    y="UX852TechnoraCableHeadDemiCableSidePosY"/>
+          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
+        </physvol>
+
+      </volume>
+
+      <volume name="lvUX852TechnoraCableHeadTypeBWithoutPin" >
+        <physvol name="pvUX852TechnoraCableHeadCylTypeBWithoutPin"       volume="lvUX852TechnoraCableHeadTypeBCyl"/>
+        <physvol name="pvUX852TechnoraCableHeadDemiCableSideATypeBWithoutPin"
+                 volume="lvUX852TechnoraCableHeadDemiCable" >
+          <position x="UX852TechnoraCableHeadDemiCableSideAPosX"
+                    y="UX852TechnoraCableHeadDemiCableSidePosY"/>
+          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
+        </physvol>
+        <physvol name="pvUX852TechnoraCableHeadDemiCableSideBTypeBWithoutPin"
+                 volume="lvUX852TechnoraCableHeadDemiCable" >
+          <position x="UX852TechnoraCableHeadDemiCableSideBPosX"
+                    y="UX852TechnoraCableHeadDemiCableSidePosY"/>
+          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
+        </physvol>
+      </volume>
+
+      <volume name="lvUX852FutureFibreCableHeadOuterCyl"  material="Pipe:Celazole">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-2-FutureFibreCableHeadTubSub" >
+          <shape type="Tube" name="UX85-2-FutureFibreCableHeadTub"
+                 dz="0.5*UX852CableHeadBasicThickness"
+                 rmax="UX852CableHeadOuterRadius"
+                 rmin="UX852CableHeadOuterPartInnerRadius"/>
+
+          <shape type="Tube" name="UX85-2-FutureFibreCableHeadSubTub"
+                 dz="0.5*UX852CableHeadHoleLargeZSize"
+                 rmax="UX852CableHeadOuterHoleOuterRadius"
+                 startPhiAngle="UX852CableHeadOuterHoleBeginPhi"
+                 deltaPhiAngle="UX852CableHeadOuterHoleDeltaPhi"/>
+          <position/>
+        </shape>
+      </volume>
+
+
+      <volume name="lvUX852FutureFibreCableHeadFittingBoreSph" material="Pipe:Celazole">
+        <shape type="BooleanShape" operation="subtraction" name="UX852FutureFibreCableHeadFittingBoreSphSub">
+          <sphere name="UX852FutureFibreCableHeadFittingBoreSph"
+                  rmax="UX852CableHeadSphereRadius"/>
+          <shape type="Tube" name="UX852FutureFibreCableHeadTubsSub"
+                 rmax="UX852CableHeadInnerRadius"
+                 dz="0.5*UX852CableHeadHoleLargeZSize"/>
+          <position/>
+        </shape>
+      </volume>
+
+
+      <!-- start  place holder. not used -->
+      <!--
+          <volume name="lvUX852FutureFibreCableHeadCentralPinCyl" material="Pipe:Celazole">
+
+<shape type="Tube" name="UX852CableHeadCentralPinTub"
+dz="0.5*UX852CableHeadCentralPinThickness"
+rmax="UX852CableHeadCentralPinRadius"/>
+
+</volume>
+      -->
+      <!-- end  place holder. not used -->
+
+      <volume name="lvUX852FutureFibreCableHeadDemiCableCylSideA" material="Pipe:FutureFibre">
+        <shape type="BooleanShape" operation="subtraction" name="UX852FutureFibreCableHeadDemiCableSubSideA" >
+          <shape type="Tube" name="UX852FutureFibreCableHeadDemiCableTubSideA"
+                 dz="0.5*UX852CableHeadDemiCableLength"
+                 rmax="UX852CableHeadDemiCableRadius"/>
+          <shape type="Box" name="UX852FutureFibreCableHeadDemiCableBoxSubSideA"
+                 dx="0.5*UX852CableHeadDemiCableSubBoxLargeXSize"
+                 dy="0.5*UX852CableHeadDemiCableSubBoxLargeYSize"
+                 dz="0.5*UX852CableHeadDemiCableSubBoxLargeZSize"/>
+          <position z="UX852CableHeadDemiCableSubBoxPosZ"/>
+          <rotation y="UX852CableHeadDemiCableSubBoxTilt"/>
+          <shape type="Box" name="UX852FutureFibreCableHeadDemiCableBoxSubFarEndSideA"
+                 dx="0.5*UX852CableHeadDemiCableSubBoxLargeXSize"
+                 dy="0.5*UX852CableHeadDemiCableSubBoxLargeYSize"
+                 dz="0.5*UX852CableHeadDemiCableSubBoxLargeZSize"/>
+          <position z="UX852CableHeadDemiCableSubBoxFarEndPosZ"/>
+          <rotation y="-UX852CableHeadDemiCableSubBoxTilt"/>
+        </shape>
+      </volume>
+      <volume name="lvUX852FutureFibreCableHeadDemiCableCylSideB" material="Pipe:FutureFibre">
+        <shape type="BooleanShape" operation="subtraction" name="UX852FutureFibreCableHeadDemiCableSubSideB" >
+          <shape type="Tube" name="UX852FutureFibreCableHeadDemiCableTubSideB"
+                 dz="0.5*UX852CableHeadDemiCableLength"
+                 rmax="UX852CableHeadDemiCableRadius"/>
+          <shape type="Box" name="UX852FutureFibreCableHeadDemiCableBoxSubSideB"
+                 dx="0.5*UX852CableHeadDemiCableSubBoxLargeXSize"
+                 dy="0.5*UX852CableHeadDemiCableSubBoxLargeYSize"
+                 dz="0.5*UX852CableHeadDemiCableSubBoxLargeZSize"/>
+          <position z="UX852CableHeadDemiCableSubBoxPosZ"/>
+          <rotation y="-UX852CableHeadDemiCableSubBoxTilt"/>
+
+          <shape type="Box" name="UX852FutureFibreCableHeadDemiCableBoxSubFarEndSideB"
+                 dx="0.5*UX852CableHeadDemiCableSubBoxLargeXSize"
+                 dy="0.5*UX852CableHeadDemiCableSubBoxLargeYSize"
+                 dz="0.5*UX852CableHeadDemiCableSubBoxLargeZSize"/>
+          <position z="UX852CableHeadDemiCableSubBoxFarEndPosZ"/>
+          <rotation y="UX852CableHeadDemiCableSubBoxTilt"/>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852FutureFibreCableHeadWithoutPin">
+        <physvol name="pvUX852FutureFibreCableHeadOuterCylWithoutPin"        volume="lvUX852FutureFibreCableHeadOuterCyl"/>
+        <physvol name="pvUX852FutureFibreCableHeadFittingBoreSphWithoutPin"  volume="lvUX852FutureFibreCableHeadFittingBoreSph"/>
+        <physvol name="pvUX852FutureFibreCableHeadDemiCableCylSideAWithoutPin"
+                 volume="lvUX852FutureFibreCableHeadDemiCableCylSideA" >
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadDemiCableSideBRotX"/>
+
+            <position x="UX852CableHeadDemiCableSideAPosX"
+                      y="UX852CableHeadDemiCablePosY"/>
+            <rotation z="UX852CableHeadDemiCableTiltAngle"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCableHeadDemiCableCylSideBWithoutPin"
+                 volume="lvUX852FutureFibreCableHeadDemiCableCylSideB" >
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadDemiCableSideBRotX"/>
+            <position x="UX852CableHeadDemiCableSideBPosX"
+                      y="UX852CableHeadDemiCablePosY"/>
+            <rotation z="-UX852CableHeadDemiCableTiltAngle"/>
+          </transformation>
+
+        </physvol>
+      </volume>
+
+
+      <!-- End Cable attachment from 2015 June -->
+
+      <!-- UX852 Cables from 2015 -->
+
+      <!-- UX852 backward -->
+      <volume name="lvUX852FutureFibreCable03" material="Pipe:FutureFibre">
+        <shape type="Tube" name="UX85-2-FutureFibre-Cable-03-Tub"
+               dz="0.5*UX852FutureFibreCable03ReducedLength"
+               rmax="UX852FutureFibreCable03Radius"/>
+      </volume>
+
+      <!-- UX852 Forward -->
+      <volume name="lvUX852TechnoraCable04" material="Pipe:Technora">
+        <shape type="Tube" name="UX85-2-Technora-Cable-04-Tub"
+               dz="0.5*UX852TechnoraCable04ReducedLength"
+               rmax="UX852TechnoraCable04Radius"/>
+      </volume>
+
+      <!-- UX853 Backward  Vertical -->
+      <volume name="lvUX853FutureFibreCable05"  material="Pipe:FutureFibre">
+        <shape type="Tube" name="UX85-3-FutureFibre-Cable-05-Tub"
+               dz="0.5*UX853FutureFibreCable05ReducedLength"
+               rmax="UX853FutureFibreCable05Radius"/>
+      </volume>
+
+
+      <!-- UX853 Backward  Horizontal -->
+      <volume name="lvUX853FutureFibreCable06"  material="Pipe:FutureFibre">
+        <shape type="Tube" name="UX85-3-FutureFibre-Cable-06-Tub"
+               dz="0.5*UX853FutureFibreCable06ReducedLength"
+               rmax="UX853FutureFibreCable06Radius"/>
+      </volume>
+
+
+
+      <!-- UX853 Forward Vertical -->
+      <volume name="lvUX853TechnoraCable07"  material="Pipe:Technora">
+        <shape type="Tube" name="UX85-3-Technora-Cable-07-Tub"
+               dz="0.5*UX853TechnoraCable07ReducedLength"
+               rmax="UX853TechnoraCable07Radius"/>
+      </volume>
+
+      <!-- UX853 Forward Horizontal -->
+      <volume name="lvUX853TechnoraCable08"  material="Pipe:Technora">
+        <shape type="Tube" name="UX85-3-Technora-Cable-08-Tub"
+               dz="0.5*UX853TechnoraCable08ReducedLength"
+               rmax="UX853TechnoraCable08Radius"/>
+      </volume>
+
+      <!-- End UX852 Cables from 2015 -->
+      <volume name="lvUX852FwdAttRod" material="Pipe:Al6082">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-2-FwdAttRodSub">
+          <shape type="Tube" name="UX85-2-FwdAttRod"
+                 dz="0.5*UX852FwdCableAttRodLength"
+                 rmax="UX852FwdCableAttRodHeadRad"
+                 rmin="UX852FwdCableAttRodInnerHoleRad"/>
+          <shape type="Tube" name="UX85-2-FwdAttRod-CutLeft"
+                 dz="0.5*UX852FwdCableAttRodCutLength"
+                 rmin="UX852FwdCableAttRodCutRad"
+                 rmax="UX852FwdCableAttRodRad + 10.00*mm"/>
+          <position z="0.5*(UX852FwdCableAttRodLength + UX852FwdCableAttRodCutLength) - UX852FwdCableAttRodCutZpos"/>
+          <rotation/>
+
+          <shape type="Tube" name="UX85-2-FwdAttRod-MainPart"
+                 dz="0.5*UX852FwdCableAttRodManPartLargeLength"
+                 rmax="UX852FwdCableAttRodRad + 10*mm"
+                 rmin="UX852FwdCableAttRodRad"/>
+
+          <position z="UX852FwdCableAttRodManPartPosZ"/>
+          <rotation/>
+
+        </shape>
+      </volume>
+
+      <volume name="lvUX852BckAttRod" material="Pipe:Al6082">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-2-BckAttRodSub">
+          <shape type="Tube" name="UX85-2-BckAttRod"
+                 dz="0.5*UX852BckCableAttRodLength"
+                 rmax="UX852BckCableAttRodHeadRad"
+                 rmin="UX852BckCableAttRodInnerHoleRad"/>
+          <shape type="Tube" name="UX85-2-BckAttRod-CutLeft"
+                 dz="0.5*UX852BckCableAttRodCutLength"
+                 rmin="UX852BckCableAttRodCutRad"
+                 rmax="UX852BckCableAttRodRad + 10.00*mm"/>
+
+          <position z="0.5*(UX852BckCableAttRodLength + UX852BckCableAttRodCutLength) - UX852BckCableAttRodCutZpos"/>
+          <rotation/>
+
+
+          <shape type="Tube" name="UX85-2-BckAttRod-MainPart"
+                 dz="0.5*UX852BckCableAttRodManPartLargeLength"
+                 rmax="UX852BckCableAttRodRad + 10*mm"
+                 rmin="UX852BckCableAttRodRad"/>
+
+          <position z="UX852BckCableAttRodManPartPosZ"/>
+          <rotation/>
+
+
+        </shape>
+      </volume>
+
+      <volume name="lvUX852BckFAAttRod" material="Pipe:Al6082">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-2-BckFAAttRodSub">
+          <shape type="Tube" name="UX85-2-BckFAAttRod"
+                 dz="0.5*UX852BckFACableAttRodLength"
+                 rmax="UX852BckFACableAttRodHeadRad"
+                 rmin="UX852BckFACableAttRodInnerHoleRad"/>
+          <shape type="Tube" name="UX85-2-BckFAAttRod-CutLeft"
+                 dz="0.5*UX852BckFACableAttRodCutLength"
+                 rmin="UX852BckFACableAttRodCutRad"
+                 rmax="UX852BckFACableAttRodRad + 10.00*mm"/>
+
+          <position z="0.5*(UX852BckFACableAttRodLength + UX852BckFACableAttRodCutLength) - UX852BckFACableAttRodCutZpos"/>
+          <rotation/>
+          <shape type="Tube" name="UX85-2-BckFAAttRod-MainPart"
+                 dz="0.5*UX852BckFACableAttRodManPartLargeLength"
+                 rmax="UX852BckFACableAttRodRad + 10*mm"
+                 rmin="UX852BckFACableAttRodRad"/>
+
+          <position z="UX852BckFACableAttRodManPartPosZ"/>
+          <rotation/>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852TechnoraCableHeadTypeA" >
+        <physvol name="pvUX852TechnoraCableHeadCylTypeA"                 volume="lvUX852TechnoraCableHeadTypeACyl"/>
+        <physvol name="pvUX852TechnoraCableHeadCentralPinCylTypeA"       volume="lvUX852BckFAAttRod"/>
+        <physvol name="pvUX852TechnoraCableHeadDemiCableSideATypeA"      volume="lvUX852TechnoraCableHeadDemiCable" >
+          <position x="UX852TechnoraCableHeadDemiCableSideAPosX"         y="UX852TechnoraCableHeadDemiCableSidePosY"/>
+          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
+        </physvol>
+        <physvol name="pvUX852TechnoraCableHeadDemiCableSideBTypeA"      volume="lvUX852TechnoraCableHeadDemiCable" >
+          <position x="UX852TechnoraCableHeadDemiCableSideBPosX"         y="UX852TechnoraCableHeadDemiCableSidePosY"/>
+          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
+        </physvol>
+      </volume>
+
+      <volume name="lvUX852TechnoraCableHeadTypeB" >
+        <physvol name="pvUX852TechnoraCableHeadTypeBCyl"                 volume="lvUX852TechnoraCableHeadTypeBCyl"/>
+        <physvol name="pvUX852TechnoraCableHeadCentralPinCylTypeB"       volume="lvUX852BckFAAttRod"/>
+        <physvol name="pvUX852TechnoraCableHeadDemiCableSideATypeB"      volume="lvUX852TechnoraCableHeadDemiCable" >
+          <position x="UX852TechnoraCableHeadDemiCableSideAPosX"         y="UX852TechnoraCableHeadDemiCableSidePosY"/>
+          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCableHeadDemiCableSideBTypeB"      volume="lvUX852TechnoraCableHeadDemiCable" >
+          <position x="UX852TechnoraCableHeadDemiCableSideBPosX"         y="UX852TechnoraCableHeadDemiCableSidePosY"/>
+          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
+        </physvol>
+      </volume>
+
+      <volume name="lvUX852FutureFibreCableHead">
+        <physvol name="pvUX852FutureFibreCableHeadOuterCyl"                 volume="lvUX852FutureFibreCableHeadOuterCyl"/>
+        <physvol name="pvUX852FutureFibreCableHeadFittingBoreSph"           volume="lvUX852FutureFibreCableHeadFittingBoreSph"/>
+        <physvol name="pvUX852FutureFibreCableHeadCentralPinCyl"            volume="lvUX852BckFAAttRod"/>
+        <physvol name="pvUX852FutureFibreCableHeadDemiCableCylSideA"        volume="lvUX852FutureFibreCableHeadDemiCableCylSideA">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadDemiCableSideBRotX"/>
+            <position x="UX852CableHeadDemiCableSideAPosX"
+                      y="UX852CableHeadDemiCablePosY"/>
+            <rotation z="UX852CableHeadDemiCableTiltAngle"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCableHeadDemiCableCylSideB"        volume="lvUX852FutureFibreCableHeadDemiCableCylSideB">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadDemiCableSideBRotX"/>
+            <position x="UX852CableHeadDemiCableSideBPosX"                  y="UX852CableHeadDemiCablePosY"/>
+            <rotation z="-UX852CableHeadDemiCableTiltAngle"/>
+          </transformation>
+        </physvol>
+      </volume>
+
+
+      <!-- UX852 Collar Clips -->
+      <!-- Now for the collar clips from June 2015 -->
+      <volume name="lvUX852CollarClipSmallSectSF" material="Pipe:Celazole">
+        <shape type="BooleanShape" operation="subtraction" name="ClipSmallSectSubSF">
+          <shape type="Tube" name="UX85-2-CollarClipSmallSectSF"
+                 dz="0.5*UX852CollarClipRing1Length"
+                 rmin="UX852CollarClipRing1InnerRad"
+                 rmax="UX852CollarClipRing1OuterRad"
+                 deltaPhiAngle="UX852CollarClipSFDeltaPhi-0.5*UX852CollarGapSFDeltaPhi"
+                 startPhiAngle="UX852CollarClipSFStartPhi"/>
+          <shape type="Tube" name="UX85-2-CollarClipSmallHole1SF"
+                 dz="0.5*UX852CollarClipHolesLength"
+                 rmax="UX852CollarClipHolesRad"/>
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="-1.0*UX852CollarClipHolesSFDeltaPhi"/>
+          <shape type="Tube" name="UX85-2-CollarClipSmallHole2SF"
+                 dz="0.5*UX852CollarClipHolesLength"
+                 rmax="UX852CollarClipHolesRad"/>
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="0.0*rad"/>
+          <shape type="Tube" name="UX85-2-CollarClipSmallHole3SF"
+                 dz="0.5*UX852CollarClipHolesLength"
+                 rmax="UX852CollarClipHolesRad"/>
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="1.0*UX852CollarClipHolesSFDeltaPhi"/>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852CollarClipBigSectSF" material="Pipe:Celazole">
+        <shape type="BooleanShape" operation="subtraction" name="ClipBigSectSubSF">
+          <shape type="Tube" name="UX85-2-CollarClipBigSectSF"
+                 dz="0.5*UX852CollarClipRing2Length"
+                 rmin="UX852CollarClipRing2InnerRad"
+                 rmax="UX852CollarClipRing2OuterRad"
+                 deltaPhiAngle="UX852CollarClipSFDeltaPhi-0.5*UX852CollarGapSFDeltaPhi"
+                 startPhiAngle="UX852CollarClipSFStartPhi"/>
+
+          <shape type="Tube" name="UX85-2-CollarClipBigHole1SF"
+                 dz="0.5*UX852CollarClipHolesLength"
+                 rmax="UX852CollarClipHolesRad"/>
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="-1.0*UX852CollarClipHolesSFDeltaPhi"/>
+
+          <shape type="Tube" name="UX85-2-CollarClipBigHole2SF"
+                 dz="0.5*UX852CollarClipHolesLength"
+                 rmax="UX852CollarClipHolesRad"/>
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="0.0*rad"/>
+
+          <shape type="Tube" name="UX85-2-CollarClipBigHole3SF"
+                 dz="0.5*UX852CollarClipHolesLength"
+                 rmax="UX852CollarClipHolesRad"/>
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="1.0*UX852CollarClipHolesSFDeltaPhi"/>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852CollarClipScrew"  material="Pipe:TitaniumG5" >
+        <shape type="BooleanShape" operation="subtraction" name="UX852CollarClipScrewSubSF" >
+          <shape type="Tube" name="UX852CollarClipScrewSFTubs"
+                 dz="0.5*UX852CollarClipHoleScrewLength"
+                 rmax="UX852CollarClipHoleScrewHeadRad"/>
+          <shape type="Tube" name="UX852CollarClipScrewSFSubtractTubs"
+                 dz="0.5*UX852CollarClipHoleScrewSubLargeLength"
+                 rmin="UX852CollarClipHoleScrewRad"
+                 rmax="UX852CollarClipHoleScrewSubLargeRadius"/>
+          <position z="UX852CollarClipHoleScrewSubPosZ"/>
+        </shape>
+      </volume>
+
+      <volume name="lvUX852CollarClip">
+        <physvol name="pvUX852CollarClipSmallSect1SF"                 volume="lvUX852CollarClipSmallSectSF">
+          <position z="- 0.5*UX852CollarClipRing1Length "/>
+          <rotation z="UX852CollarClipSFPosStartPhi"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarClipSmallSect2SF"                 volume="lvUX852CollarClipSmallSectSF">
+          <position z="- 0.5*UX852CollarClipRing1Length"/>
+          <rotation z="UX852CollarClipSFPosStartPhi+ UX852CollarClipSFDeltaPhi"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarClipSmallSect3SF"                 volume="lvUX852CollarClipSmallSectSF">
+          <position z="- 0.5*UX852CollarClipRing1Length"/>
+          <rotation z="UX852CollarClipSFPosStartPhi+  2*UX852CollarClipSFDeltaPhi"/>
+        </physvol>
+
+
+        <physvol name="pvUX852CollarClipBigSect1SF"                   volume="lvUX852CollarClipBigSectSF">
+          <position z="- UX852CollarClipRing1Length - 0.5*UX852CollarClipRing2Length"/>
+          <rotation z="UX852CollarClipSFPosStartPhi"/>
+        </physvol>
+
+
+        <physvol name="pvUX852CollarClipBigSect2SF"                   volume="lvUX852CollarClipBigSectSF">
+          <position z="- UX852CollarClipRing1Length - 0.5*UX852CollarClipRing2Length"/>
+          <rotation z="UX852CollarClipSFPosStartPhi + UX852CollarClipSFDeltaPhi"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarClipBigSect3SF"                   volume="lvUX852CollarClipBigSectSF">
+          <position z="- UX852CollarClipRing1Length - 0.5*UX852CollarClipRing2Length"/>
+          <rotation z="UX852CollarClipSFPosStartPhi + 2*UX852CollarClipSFDeltaPhi"/>
+        </physvol>
+      </volume>
+
+      <!-- UX852Cables -->
+      <!--
+          <volume name="lvUX852FixCollarCable03" material="Pipe:Steel316LN">
+          <shape type="Tube" name="UX85-2-FixCollar-Cable-03"
+          dz="0.5*UX852FixCollarCable03Lenght"
+          rmax="UX852FixCollarCable03Radius"/>
+          </volume>
+
+<volume name="lvUX852FixCollarCable04" material="Pipe:Steel316LN">
+<shape type="Tube" name="UX85-3-FixCollar-Cable-04"
+dz="0.5*UX852FixCollarCable04Lenght"
+rmax="UX852FixCollarCable04Radius"/>
+</volume>
+
+<volume name="lvUX852FixCollarCable08" material="Pipe:Steel316LN">
+<shape type="Tube" name="UX85-2-FixCollar-Cable-08"
+dz="0.5*UX852FixCollarCable08Lenght"
+rmax="UX852FixCollarCable08Radius"/>
+</volume>
+      -->
+
+      <!-- *************************************************************************** -->
+      <!-- UX85-3 Fixed Point                                                          -->
+      <!-- *************************************************************************** -->
+      <volume name="lvUX853BigRingQuarter" material="Pipe:Beryllium">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-3-BigRingQuarter-Sub">
+          <shape type="Tube" name="UX853BigRingQuarter"
+                 dz="0.5*UX853FixCollarLength"
+                 rmin="UX853FixCollarInnerRad"
+                 rmax="UX853FixCollarAttOuterRad"
+                 deltaPhiAngle="UX853FixCollarDeltaPhi"
+                 startPhiAngle="UX853FixCollarPhiStart"/>
+          <shape type="Box" name="UX85-3-BigRingQuarter-Slope"
+                 dx="0.5*UX853BigRingQuarterSlopeXsize"
+                 dy="0.5*UX853BigRingQuarterSlopeYsize"
+                 dz="0.5*(UX853FixCollarLength+0.5*mm)"/>
+          <transformation>
+            <position/>
+            <rotation z="UX853BigRingQuarterSlopeZrot"/>
+            <position/>
+            <rotation/>
+            <positionRPhiZ r="0.5*(UX853FixCollarAttOuterRad+UX853FixCollarOuterRad+UX853BigRingQuarterSlopeYsize)-4.5*mm" phi="UX853BigRingQuarterSlopePhipos"/>
+          </transformation>
+          <shape type="Box" name="UX85-3-BigRingQuarter-Slope2"
+                 dx="0.5*UX853BigRingQuarterSlopeXsize"
+                 dy="0.5*UX853BigRingQuarterSlopeYsize"
+                 dz="0.5*(UX853FixCollarLength+0.5*mm)"/>
+          <transformation>
+            <position/>
+            <rotation z="UX853BigRingQuarterSlopeZrot+5*degree"/>
+            <position/>
+            <rotation/>
+            <positionRPhiZ r="0.5*(UX853FixCollarAttOuterRad+UX853FixCollarOuterRad+UX853BigRingQuarterSlopeYsize)-9.5*mm" phi="UX853BigRingQuarterSlope2Phipos"/>
+          </transformation>
+          <shape type="Tube" name="UX853BigRingCircleCut1"
+                 dz="0.5*(UX853FixCollarLength + 0.5*mm)"
+                 rmin="UX853FixCollarOuterRad"
+                 rmax="UX853FixCollarAttOuterRad + 5*mm"
+                 startPhiAngle="UX853FixCollarPhiStart - 1*degree"
+                 deltaPhiAngle="0.25*UX853FixCollarCircleCutDeltaPhi + 1*degree"/>
+          <shape type="Tube" name="UX853BigRingCircleCut2"
+                 dz="0.5*(UX853FixCollarLength + 0.5*mm)"
+                 rmin="UX853FixCollarOuterRad"
+                 rmax="UX853FixCollarAttOuterRad + 5*mm"
+                 startPhiAngle="UX853FixCollarPhiStart +UX853FixCollarDeltaPhi - 0.75*UX853FixCollarCircleCutDeltaPhi "
+                 deltaPhiAngle="0.75*UX853FixCollarCircleCutDeltaPhi + 1*degree"/>
+          <shape type="Tube" name="UX853BigRingTransHole1"
+                 dz="0.5*UX853FixCollarTransHoleLength"
+                 rmax="UX853FixCollarTransHoleRad"/>
+          <transformation>
+            <position/>
+            <rotation x="90*degree"/>
+            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos"/>
+            <rotation z="45*degree"/>
+          </transformation>
+          <shape type="Tube" name="UX853BigRingTransHole2a"
+                 dz="0.5*UX853FixCollarTransHoleLength"
+                 rmax="UX853FixCollarTransHoleRad"/>
+          <transformation>
+            <position/>
+            <rotation x="90*degree"/>
+            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos+7*degree"/>
+            <rotation z="45*degree+7*degree"/>
+          </transformation>
+          <shape type="Box" name="UX853BigRingTransHole2b"
+                 dz="0.5*UX853FixCollarTransHoleLength"
+                 dx="0.5*2*UX853FixCollarTransHoleRad"
+                 dy="0.5*2*UX853FixCollarTransHoleRad"/>
+          <transformation>
+            <position/>
+            <rotation x="90*degree"/>
+            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos+9.5*degree"/>
+            <rotation z="45*degree+9.5*degree"/>
+          </transformation>
+          <shape type="Tube" name="UX853BigRingTransHole2c"
+                 dz="0.5*UX853FixCollarTransHoleLength"
+                 rmax="UX853FixCollarTransHoleRad"/>
+          <transformation>
+            <position/>
+            <rotation x="90*degree"/>
+            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos+13*degree"/>
+            <rotation z="45*degree+13*degree"/>
+          </transformation>
+          <shape type="Tube" name="UX853BigRingTransHole2d"
+                 dz="0.5*UX853FixCollarTransHoleLength"
+                 rmax="UX853FixCollarTransHoleRad"/>
+          <transformation>
+            <position/>
+            <rotation x="90*degree"/>
+            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarPhiStart+1*degree"/>
+            <rotation z="90*degree+45*degree+13*degree"/>
+          </transformation>
+          <shape type="Tube" name="UX853BigRingTransHole3a"
+                 dz="0.5*UX853FixCollarTransHoleLength"
+                 rmax="UX853FixCollarTransHoleRad"/>
+          <transformation>
+            <position/>
+            <rotation x="90*degree"/>
+            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos-7*degree"/>
+            <rotation z="45*degree-7*degree"/>
+          </transformation>
+          <shape type="Box" name="UX853BigRingTransHole3b"
+                 dz="0.5*UX853FixCollarTransHoleLength"
+                 dx="0.5*2*UX853FixCollarTransHoleRad"
+                 dy="0.5*2*UX853FixCollarTransHoleRad"/>
+          <transformation>
+            <position/>
+            <rotation x="90*degree"/>
+            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos-9.5*degree"/>
+            <rotation z="45*degree-9.5*degree"/>
+          </transformation>
+          <shape type="Tube" name="UX853BigRingTransHole3c"
+                 dz="0.5*UX853FixCollarTransHoleLength"
+                 rmax="UX853FixCollarTransHoleRad"/>
+          <transformation>
+            <position/>
+            <rotation x="90*degree"/>
+            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos-13*degree"/>
+            <rotation z="45*degree-13*degree"/>
+          </transformation>
+        </shape>
+      </volume>
+
+      <volume name="lvUX853InnerRing" material="Pipe:Beryllium">
+        <shape type="Tube" name="UX85-3-InnerRing"
+               dz="0.5*UX853FixCollarRingLength"
+               rmin="UX853FixCollarRingInnerRad"
+               rmax="UX853FixCollarRingOuterRad"/>
+      </volume>
+
+      <!-- UX853 Fix Collar -->
+      <volume name="lvUX853FixCollar">
+        <physvol name="pvUX853InnerRing"                       volume="lvUX853InnerRing">
+          <position z="UX853FixCollarZpos"/>
+        </physvol>
+
+        <physvol name="pvUX853BigRingQuarter1"                 volume="lvUX853BigRingQuarter">
+          <position z="UX853FixCollarZpos"/>
+          <rotation/>
+        </physvol>
+
+        <physvol name="pvUX853BigRingQuarter2"                 volume="lvUX853BigRingQuarter">
+          <position z="UX853FixCollarZpos"/>
+          <rotation z="UX853FixCollarQuarterRot"/>
+        </physvol>
+
+        <physvol name="pvUX853BigRingQuarter3"                 volume="lvUX853BigRingQuarter">
+          <position z="UX853FixCollarZpos"/>
+          <rotation z="2*UX853FixCollarQuarterRot"/>
+        </physvol>
+
+        <physvol name="pvUX853BigRingQuarter4"                 volume="lvUX853BigRingQuarter">
+          <position z="UX853FixCollarZpos"/>
+          <rotation z="3*UX853FixCollarQuarterRot"/>
+        </physvol>
+      </volume>
+
+      <!-- UX853 Collar Clips -->
+      <volume name="lvUX853CollarClipSmallSectSF" material="Pipe:Celazole">
+        <shape type="BooleanShape" operation="subtraction" name="UX853ClipSmallSectSubSF">
+          <shape type="Tube" name="UX85-3-CollarClipSmallSect"
+                 dz="0.5*UX853CollarClipRing1Length"
+                 rmin="UX853CollarClipRing1InnerRad"
+                 rmax="UX853CollarClipRing1OuterRad"
+                 deltaPhiAngle="UX853CollarClipSFDeltaPhi-0.5*UX853CollarGapSFDeltaPhi"
+                 startPhiAngle="UX853CollarClipSFStartPhi"/>
+          <shape type="Tube" name="UX85-3-CollarClipSmallHole1SF"
+                 dz="0.5*UX853CollarClipHolesLength"
+                 rmax="UX853CollarClipHolesRad"/>
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="-1.5*UX853CollarClipHolesDeltaPhiSF"/>
+          <shape type="Tube" name="UX85-3-CollarClipSmallHole2SF"
+                 dz="0.5*UX853CollarClipHolesLength"
+                 rmax="UX853CollarClipHolesRad"/>
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="-0.5*UX853CollarClipHolesDeltaPhiSF"/>
+          <shape type="Tube" name="UX85-3-CollarClipSmallHole3SF"
+                 dz="0.5*UX853CollarClipHolesLength"
+                 rmax="UX853CollarClipHolesRad"/>
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="0.5*UX853CollarClipHolesDeltaPhiSF"/>
+          <shape type="Tube" name="UX85-3-CollarClipSmallHole4"
+                 dz="0.5*UX853CollarClipHolesLength"
+                 rmax="UX853CollarClipHolesRad"/>
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="1.5*UX853CollarClipHolesDeltaPhiSF"/>
+        </shape>
+      </volume>
+
+      <volume name="lvUX853CollarClipBigSectSF" material="Pipe:Celazole">
+        <shape type="BooleanShape" operation="subtraction" name="UX853ClipBigSectSubSF">
+          <shape type="Tube" name="UX85-3-CollarClipBigSect"
+                 dz="0.5*UX853CollarClipRing2Length"
+                 rmin="UX853CollarClipRing2InnerRad"
+                 rmax="UX853CollarClipRing2OuterRad"
+                 deltaPhiAngle="UX853CollarClipSFDeltaPhi-0.5*UX853CollarGapSFDeltaPhi"
+                 startPhiAngle="UX853CollarClipSFStartPhi"/>
+
+          <shape type="Tube" name="UX85-3-CollarClipBigHole1SF"
+                 dz="0.5*UX853CollarClipHolesLength"
+                 rmax="UX853CollarClipHolesRad"/>
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="-1.5*UX853CollarClipHolesDeltaPhiSF"/>
+
+          <shape type="Tube" name="UX85-3-CollarClipBigHole2SF"
+                 dz="0.5*UX853CollarClipHolesLength"
+                 rmax="UX853CollarClipHolesRad"/>
+          <positionRPhiZ   r="UX853CollarClipHolesRpos"
+                           phi="-0.5*UX853CollarClipHolesDeltaPhiSF"/>
+
+          <shape type="Tube" name="UX85-3-CollarClipBigHole3SF"
+                 dz="0.5*UX853CollarClipHolesLength"
+                 rmax="UX853CollarClipHolesRad"/>
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="0.5*UX853CollarClipHolesDeltaPhiSF"/>
+          <shape type="Tube" name="UX85-3-CollarClipBigHole4SF"
+                 dz="0.5*UX853CollarClipHolesLength"
+                 rmax="UX853CollarClipHolesRad"/>
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="1.5*UX853CollarClipHolesDeltaPhiSF"/>
+
+        </shape>
+      </volume>
+
+      <volume name="lvUX853CollarClipScrew"  material="Pipe:TitaniumG5" >
+        <shape type="BooleanShape" operation="subtraction" name="UX853CollarClipScrewSubSF" >
+          <shape type="Tube" name="UX853CollarClipScrewSFTubs"
+                 dz="0.5*UX853CollarClipHoleScrewLength"
+                 rmax="UX853CollarClipHoleScrewHeadRad"/>
+          <shape type="Tube" name="UX853CollarClipScrewSFSubtractTubs"
+                 dz="0.5*UX853CollarClipHoleScrewSubLargeLength"
+                 rmin="UX853CollarClipHoleScrewRad"
+                 rmax="UX853CollarClipHoleScrewSubLargeRadius"/>
+          <position z="UX853CollarClipHoleScrewSubPosZ"/>
+        </shape>
+      </volume>
+
+      <volume name="lvUX853CollarClip">
+        <physvol name="pvUX853CollarClipSmallSect1SF"                 volume="lvUX853CollarClipSmallSectSF">
+          <position z="- 0.5*UX853CollarClipRing1Length"/>
+          <rotation z="UX853CollarClipHolesDeltaPhiSF"/>
+        </physvol>
+        <physvol name="pvUX853CollarClipSmallSect2SF"                 volume="lvUX853CollarClipSmallSectSF">
+          <position z="- 0.5*UX853CollarClipRing1Length"/>
+          <rotation z="UX853CollarClipSFDeltaPhi+UX853CollarClipHolesDeltaPhiSF"/>
+        </physvol>
+        <physvol name="pvUX853CollarClipSmallSect3SF"                 volume="lvUX853CollarClipSmallSectSF">
+          <position z="- 0.5*UX853CollarClipRing1Length"/>
+          <rotation z="2*UX853CollarClipSFDeltaPhi+UX853CollarClipHolesDeltaPhiSF"/>
+        </physvol>
+        <physvol name="pvUX853CollarClipBigSect1SF"                   volume="lvUX853CollarClipBigSectSF">
+          <position z="- UX853CollarClipRing1Length - 0.5*UX853CollarClipRing2Length"/>
+          <rotation z="UX853CollarClipHolesDeltaPhiSF"/>
+        </physvol>
+        <physvol name="pvUX853CollarClipBigSect2SF"                   volume="lvUX853CollarClipBigSectSF">
+          <position z="- UX853CollarClipRing1Length - 0.5*UX853CollarClipRing2Length"/>
+          <rotation z="UX853CollarClipSFDeltaPhi+UX853CollarClipHolesDeltaPhiSF"/>
+        </physvol>
+        <physvol name="pvUX853CollarClipBigSect3SF"                   volume="lvUX853CollarClipBigSectSF">
+          <position z="- UX853CollarClipRing1Length - 0.5*UX853CollarClipRing2Length"/>
+          <rotation z="2*UX853CollarClipSFDeltaPhi+UX853CollarClipHolesDeltaPhiSF"/>
+        </physvol>
+      </volume>
+
+      <!-- UX85-3 Cable Attacments -->
+      <!-- In the Collar Part -->
+      <volume name="lvUX853CollarAtt" material="Pipe:Beryllium">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-3-CollarAttMainSub">
+          <shape type="Box" name="UX85-3-CollarAttMain"
+                 dx="0.5*UX853CollarAttMainPartXsize"
+                 dy="0.5*UX853CollarAttMainPartYsize"
+                 dz="0.5*UX853CollarAttMainPartZsize"/>
+          <shape type="Box" name="UX85-3-CollarAttMainSub1"
+                 dx="0.5*UX853CollarAttMainPartXsize"
+                 dy="0.5*(UX853CollarAttMainPartYsize+200*mm)"
+                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"/>
+          <transformation>
+            <positionRPhiZ r="UX853CollarAttSlope1RPos"/>
+            <rotation/>
+            <position y="UX853CollarAttSlope1Zpos"/>
+            <rotation y="0*degree" z="UX853CollarAttSlope1YRot"/>
+            <position/>
+          </transformation>
+          <shape type="Box" name="UX85-3-CollarAttMainSub2"
+                 dx="0.5*UX853CollarAttMainPartXsize"
+                 dy="0.5*UX853CollarAttMainPartYsize"
+                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"/>
+          <transformation>
+            <positionRPhiZ r="UX853CollarAttSlope2RPos"/>
+            <rotation/>
+            <position/>
+            <rotation z="UX853CollarAttSlope2YRot"/>
+            <position y="UX853CollarAttSlope2ZPos"/>
+          </transformation>
+          <shape type="Tube" name="UX85-3-CollarAttMain-Hole1"
+                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"
+                 rmax="UX853CollarAttMainHole1Rad"/>
+          <transformation>
+            <positionRPhiZ r="UX853CollarAttMainHole1RadPos"/>
+            <rotation/>
+            <position/>
+            <position y="UX853CollarAttMainHole1ZPos"/>
+            <rotation y="180*degree"/>
+            <position/>
+          </transformation>
+          <shape type="Tube" name="UX85-3-CollarAttMain-Hole2"
+                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"
+                 rmax="UX853CollarAttMainHole2Rad"/>
+          <transformation>
+            <positionRPhiZ r="UX853CollarAttMainHole2RadPos"/>
+            <rotation/>
+            <position y="UX853CollarAttMainHole2ZPos"/>
+          </transformation>
+          <shape type="Tube" name="UX85-3-CollarAttMain-RoundEdge1"
+                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"
+                 rmin="UX853CollarAttMainPartEdge1InnerRad"
+                 rmax="UX853CollarAttMainPartEdge1InnerRad+10*mm"
+                 startPhiAngle="UX853CollarAttMainPartEdge1StartPhi"
+                 deltaPhiAngle="UX853CollarAttMainPartEdge1DeltaPhi"/>
+          <transformation>
+            <positionRPhiZ r="UX853CollarAttMainHole1RadPos"/>
+            <rotation/>
+            <position y="UX853CollarAttMainHole1ZPos"/>
+            <rotation y="180*degree"/>
+          </transformation>
+          <shape type="Tube" name="UX85-3-CollarAttMain-RoundEdge2"
+                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"
+                 rmin="UX853CollarAttMainPartEdge2InnerRad"
+                 rmax="UX853CollarAttMainPartEdge2InnerRad+10*mm"
+                 startPhiAngle="UX853CollarAttMainPartEdge2StartPhi"
+                 deltaPhiAngle="UX853CollarAttMainPartEdge2DeltaPhi"/>
+          <transformation>
+            <positionRPhiZ r="UX853CollarAttMainHole2RadPos"/>
+            <rotation/>
+            <position y="UX853CollarAttMainHole2ZPos"/>
+          </transformation>
+        </shape>
+      </volume>
+
+      <!-- Forward Cable Att -->
+      <volume name="lvUX853FwdCableAtt" material="Pipe:AW2219">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-3-FwdCableAttMain-Sub">
+          <shape type="Tube" name="UX85-3-FwdCableAttMain"
+                 dz="0.5*UX853FwdCableAttMainLength"
+                 rmax="UX853FwdCableAttMainRad"/>
+          <shape type="Tube" name="UX85-3-FwdCableAttMainLongHole"
+                 dz="0.5*UX853FwdCableAttLongHoleLength"
+                 rmax="UX853FwdCableAttLongHoleRad"/>
+          <transformation>
+            <position z="0.5*(UX853FwdCableAttMainLength - UX853FwdCableAttLongHoleLength) + 1.00*mm"/>
+          </transformation>
+          <shape type="Box" name="UX85-3-FwdCableAttMainCut1-Left"
+                 dx="0.5*UX853FwdCableAttCut1SizeX"
+                 dy="0.5*UX853FwdCableAttCut1SizeY"
+                 dz="0.5*UX853FwdCableAttCut1SizeZ"/>
+          <transformation>
+            <position z="0.5*(-UX853FwdCableAttMainLength + UX853FwdCableAttCut1SizeZ) - 1.00*mm"
+                      x="UX853FwdCableAttMainRad - 0.5*UX853FwdCableAttCut1SizeX"/>
+          </transformation>
+          <shape type="Box" name="UX85-3-FwdCableAttMainCut1-Right"
+                 dx="0.5*UX853FwdCableAttCut1SizeX"
+                 dy="0.5*UX853FwdCableAttCut1SizeY"
+                 dz="0.5*UX853FwdCableAttCut1SizeZ"/>
+          <transformation>
+            <position z="0.5*(-UX853FwdCableAttMainLength + UX853FwdCableAttCut1SizeZ) - 1.00*mm"
+                      x="-UX853FwdCableAttMainRad + 0.5*UX853FwdCableAttCut1SizeX"/>
+          </transformation>
+          <shape type="Box" name="UX85-3-FwdCableAttMainCut2-Left"
+                 dx="0.5*UX853FwdCableAttCut2SizeX"
+                 dy="0.5*UX853FwdCableAttCut2SizeY"
+                 dz="0.5*UX853FwdCableAttCut2SizeZ"/>
+          <transformation>
+            <position z="0.5*(UX853FwdCableAttMainLength - UX853FwdCableAttCut2SizeZ) - UX853FwdCableAttCut2posZ"
+                      x="UX853FwdCableAttMainRad - 0.5*UX853FwdCableAttCut2SizeX"/>
+          </transformation>
+          <shape type="Box" name="UX85-3-FwdCableAttMainCut2-Right"
+                 dx="0.5*UX853FwdCableAttCut2SizeX"
+                 dy="0.5*UX853FwdCableAttCut2SizeY"
+                 dz="0.5*UX853FwdCableAttCut2SizeZ"/>
+          <transformation>
+            <position z="0.5*(UX853FwdCableAttMainLength - UX853FwdCableAttCut2SizeZ) - UX853FwdCableAttCut2posZ"
+                      x="-UX853FwdCableAttMainRad + 0.5*UX853FwdCableAttCut2SizeX"/>
+          </transformation>
+          <shape type="Tube" name="UX85-3-FwdCableAttMainHole"
+                 dz="0.5*2*UX853FwdCableAttMainRad"
+                 rmax="UX853FwdCableAttRingInnerRad"/>
+          <transformation>
+            <position/>
+            <rotation y="90*degree"/>
+            <position z="- 0.5*UX853FwdCableAttMainLength + UX853FwdCableAttRingOuterRad"/>
+          </transformation>
+          <shape type="Tube" name="UX85-3-FwdCableAttMainRing"
+                 dz="0.5*2*UX853FwdCableAttMainRad"
+                 rmin="UX853FwdCableAttRingOuterRad"
+                 rmax="UX853FwdCableAttRingOuterRad + 10.00*mm"
+                 deltaPhiAngle="UX853FwdCableAttRingDeltaAng"
+                 startPhiAngle="-0.5*UX853FwdCableAttRingDeltaAng"/>
+          <transformation>
+            <position/>
+            <rotation y="90*degree"/>
+            <position z="-0.5*UX853FwdCableAttMainLength + UX853FwdCableAttRingOuterRad"/>
+          </transformation>
+        </shape>
+      </volume>
+
+      <volume name="lvUX853FwdAttRod" material="Pipe:Al6082">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-3-FwdAttRodSub">
+          <shape type="Tube" name="UX85-3-FwdAttRod"
+                 dz="0.5*UX853FwdCableAttRodLength"
+                 rmax="UX853FwdCableAttRodHeadRad"
+                 rmin="UX853FwdCableAttRodInnerHoleRad"/>
+          <shape type="Tube" name="UX85-3-FwdAttRod-CutLeft"
+                 dz="0.5*UX853FwdCableAttRodCutLength"
+                 rmin="UX853FwdCableAttRodCutRad"
+                 rmax="UX853FwdCableAttRodRad + 10.00*mm"/>
+          <position z="0.5*(UX853FwdCableAttRodLength + UX853FwdCableAttRodCutLength) - UX853FwdCableAttRodCutZpos"/>
+          <rotation/>
+
+          <shape type="Tube" name="UX85-3-FwdAttRod-MainPart"
+                 dz="0.5*UX853FwdCableAttRodManPartLargeLength"
+                 rmax="UX853FwdCableAttRodRad + 10*mm"
+                 rmin="UX853FwdCableAttRodRad"/>
+
+          <position z="UX853FwdCableAttRodManPartPosZ"/>
+          <rotation/>
+
+        </shape>
+      </volume>
+
+      <!-- Backward Cable Att -->
+      <volume name="lvUX853BckAttRod" material="Pipe:Al6082">
+        <shape type="BooleanShape" operation="subtraction" name="UX85-3-BckAttRodSub">
+          <shape type="Tube" name="UX85-3-BckAttRod"
+                 dz="0.5*UX853BckCableAttRodLength"
+                 rmax="UX853BckCableAttRodHeadRad"
+                 rmin="UX853BckCableAttRodInnerHoleRad"/>
+          <shape type="Tube" name="UX85-3-BckAttRod-CutLeft"
+                 dz="0.5*UX853BckCableAttRodCutLength"
+                 rmin="UX853BckCableAttRodCutRad"
+                 rmax="UX853BckCableAttRodRad + 10.00*mm"/>
+
+          <position z="0.5*(UX853BckCableAttRodLength + UX853BckCableAttRodCutLength) - UX853BckCableAttRodCutZpos"/>
+          <rotation/>
+
+
+          <shape type="Tube" name="UX85-3-BckAttRod-MainPart"
+                 dz="0.5*UX853BckCableAttRodManPartLargeLength"
+                 rmax="UX853BckCableAttRodRad + 10*mm"
+                 rmin="UX853BckCableAttRodRad"/>
+
+          <position z="UX853BckCableAttRodManPartPosZ"/>
+          <rotation/>
+
+
+        </shape>
+      </volume>
+
+      <envelope type="Assembly" name="lvUX85SupportsInMagnet" vis="Pipe:Magnet">
+        <!-- UX85-1 Support -->
+        <physvol name="pvUX851Collar"                 volume="lvUX851Collar">
+          <position z="UX851CollarZpos"/>
+        </physvol>
+
+        <physvol name="pvUX851Cable01"                volume="lvUX851Cable">
+          <transformation>
+            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
+            <rotation x="90.0*degree" y="UX851CablePhiAngle" z="0.0*degree"/>
+            <position x="-UX851CableXYpos" y="UX851CableXYpos" z="UX851CableZpos"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX851Cable02"                volume="lvUX851Cable">
+          <transformation>
+            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
+            <rotation x="90.0*degree" y="-UX851CablePhiAngle" z="0.0*degree"/>
+            <position x="UX851CableXYpos" y="UX851CableXYpos" z="UX851CableZpos"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX851Cable03"                volume="lvUX851Cable">
+          <transformation>
+            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
+            <rotation x="90.0*degree" y="UX851CablePhiAngle" z="0.0*degree"/>
+            <position x="UX851CableXYpos" y="-UX851CableXYpos" z="UX851CableZpos"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX851Cable04"                 volume="lvUX851Cable">
+          <transformation>
+            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
+            <rotation x="90.0*degree" y="-UX851CablePhiAngle"
+                      z="0.0*degree"/>
+            <position x="-UX851CableXYpos" y="-UX851CableXYpos" z="UX851CableZpos"/>
+          </transformation>
+        </physvol>
+
+        <!-- UX85-2 Fixed point -->
+        <physvol name="pvUX852FixCollar"               volume="lvUX852FixCollar">
+          <transformation>
+            <position/>
+            <rotation z="UX852FixCollarZrot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852CollarClip1"             volume="lvUX852CollarClip">
+          <position z="UX852FixCollarZpos"/>
+        </physvol>
+
+        <physvol name="pvUX852CollarClip2"             volume="lvUX852CollarClip">
+          <transformation>
+            <position/>
+            <rotation y="180*degree"/>
+            <position z="UX852FixCollarZpos"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="lvUX852CollarClipScrew11"       volume="lvUX852CollarClipScrew">
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="UX852CollarClipSFPosStartPhi-UX852CollarClipHolesSFDeltaPhi"
+                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
+        </physvol>
+
+        <physvol name="lvUX852CollarClipScrew12"       volume="lvUX852CollarClipScrew">
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="UX852CollarClipSFPosStartPhi"
+                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX852CollarClipScrew13"       volume="lvUX852CollarClipScrew">
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="UX852CollarClipSFPosStartPhi+UX852CollarClipHolesSFDeltaPhi"
+                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
+
+        </physvol>
+
+        <physvol name="lvUX852CollarClipScrew21"       volume="lvUX852CollarClipScrew">
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="UX852CollarClipSFPosStartPhi+ UX852CollarClipSFDeltaPhi-UX852CollarClipHolesSFDeltaPhi"
+                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
+        </physvol>
+
+        <physvol name="lvUX852CollarClipScrew22"       volume="lvUX852CollarClipScrew">
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="UX852CollarClipSFPosStartPhi+ UX852CollarClipSFDeltaPhi"
+                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX852CollarClipScrew23"       volume="lvUX852CollarClipScrew">
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="UX852CollarClipSFPosStartPhi+ UX852CollarClipSFDeltaPhi +UX852CollarClipHolesSFDeltaPhi"
+                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
+        </physvol>
+
+
+        <physvol name="lvUX852CollarClipScrew31"        volume="lvUX852CollarClipScrew">
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="UX852CollarClipSFPosStartPhi+2* UX852CollarClipSFDeltaPhi-UX852CollarClipHolesSFDeltaPhi"
+                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
+        </physvol>
+
+        <physvol name="lvUX852CollarClipScrew32"        volume="lvUX852CollarClipScrew">
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="UX852CollarClipSFPosStartPhi+ 2* UX852CollarClipSFDeltaPhi"
+                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX852CollarClipScrew33"        volume="lvUX852CollarClipScrew">
+          <positionRPhiZ r="UX852CollarClipHolesRpos"
+                         phi="UX852CollarClipSFPosStartPhi+2* UX852CollarClipSFDeltaPhi +UX852CollarClipHolesSFDeltaPhi"
+                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
+
+        </physvol>
+
+
+
+        <physvol name="pvUX852CollarAtt-1a"             volume="lvUX852CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree"                     y="45*degree"/>
+            <positionRPhiZ z="UX852FixCollarZpos"
+                           r="UX852CollarAttMainPartRPos"
+                           phi="UX852FixCollarZrot-0.5*UX852FixCollarSect1DelthaAngle+UX852CollarAttMainPartPhiShift"/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX852CollarAtt-1b"              volume="lvUX852CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree"                      y="45*degree"/>
+            <positionRPhiZ z="UX852FixCollarZpos"
+                           r="UX852CollarAttMainPartRPos"
+                           phi="UX852FixCollarZrot+0.5*UX852FixCollarSect1DelthaAngle-UX852CollarAttMainPartPhiShift"/>
+            <rotation/>
+            <position/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX852CollarAtt-2a"              volume="lvUX852CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree"                      y="135*degree"/>
+            <positionRPhiZ z="UX852FixCollarZpos"
+                           r="UX852CollarAttMainPartRPos"
+                           phi="UX852FixCollarZrot-0.5*UX852FixCollarSect1DelthaAngle+UX852FixCollarQuarterRot+UX852CollarAttMainPartPhiShift"/>
+            <rotation/>
+            <position/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX852CollarAtt-2b"              volume="lvUX852CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree"                      y="135*degree"/>
+            <positionRPhiZ z="UX852FixCollarZpos"
+                           r="UX852CollarAttMainPartRPos"
+                           phi="UX852FixCollarZrot+0.5*UX852FixCollarSect1DelthaAngle+UX852FixCollarQuarterRot-UX852CollarAttMainPartPhiShift"/>
+            <rotation/>
+            <position/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX852CollarAtt-3a"              volume="lvUX852CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree"                      y="225*degree"/>
+            <positionRPhiZ z="UX852FixCollarZpos"
+                           r="UX852CollarAttMainPartRPos"
+                           phi="UX852FixCollarZrot-0.5*UX852FixCollarSect1DelthaAngle+2*UX852FixCollarQuarterRot+UX852CollarAttMainPartPhiShift"/>
+            <rotation/>
+            <position/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX852CollarAtt-3b"              volume="lvUX852CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree"                      y="225*degree"/>
+            <positionRPhiZ z="UX852FixCollarZpos"
+                           r="UX852CollarAttMainPartRPos"
+                           phi="UX852FixCollarZrot+0.5*UX852FixCollarSect1DelthaAngle+2*UX852FixCollarQuarterRot-UX852CollarAttMainPartPhiShift"/>
+            <rotation/>
+            <position/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX852CollarAtt-4a"               volume="lvUX852CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree"                       y="315*degree"/>
+            <positionRPhiZ z="UX852FixCollarZpos"
+                           r="UX852CollarAttMainPartRPos"
+                           phi="UX852FixCollarZrot-0.5*UX852FixCollarSect1DelthaAngle+3*UX852FixCollarQuarterRot+UX852CollarAttMainPartPhiShift"/>
+            <rotation/>
+            <position/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX852CollarAtt-4b"               volume="lvUX852CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree"                       y="315*degree"/>
+            <positionRPhiZ z="UX852FixCollarZpos"
+                           r="UX852CollarAttMainPartRPos"
+                           phi="UX852FixCollarZrot+0.5*UX852FixCollarSect1DelthaAngle+3*UX852FixCollarQuarterRot-UX852CollarAttMainPartPhiShift"/>
+            <rotation/>
+            <position/>
+          </transformation>
+        </physvol>
+
+        <!--  Now placing the new back collar attachments modifications in June 2015 at UX852 -->
+        <physvol name="pvUX852CollarForkAttachProngBck-1" volume="lvUX852CollarForkAttachProng">
+          <transformation>
+            <position/>
+            <rotation x="UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation x="-UX852FutureFibreCable03XRot"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
+                           r="UX852BckCollarForkAttachRpos"
+                           phi="UX852FixCollarZrot"/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852CollarForkAttachProngBck-2" volume="lvUX852CollarForkAttachProng">
+          <transformation>
+            <position/>
+            <rotation x="UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation x="UX852FutureFibreCable03XRot"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
+                           r="UX852BckCollarForkAttachRpos"
+                           phi="UX852FixCollarZrot +UX852FixCollarQuarterRot "/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence - UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852CollarForkAttachProngBck-3" volume="lvUX852CollarForkAttachProng">
+          <transformation>
+            <position/>
+            <rotation x="UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation x="-UX852FutureFibreCable03XRot"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+
+            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
+                           r="UX852BckCollarForkAttachRpos"
+                           phi="UX852FixCollarZrot + 2*UX852FixCollarQuarterRot "/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence - 2*UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852CollarForkAttachProngBck-4" volume="lvUX852CollarForkAttachProng">
+          <transformation>
+            <position/>
+            <rotation x="UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation x="UX852FutureFibreCable03XRot"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+
+            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
+                           r="UX852BckCollarForkAttachRpos"
+                           phi="UX852FixCollarZrot + 3*UX852FixCollarQuarterRot "/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence - 3*UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <!-- Now placing the cable heads in UX852 Bck in June 2015 -->
+        <physvol name="pvUX852FutureFibreCableHeadBeamPipeEndBck-1"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation x="UX852FutureFibreCable03XRot"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
+                           r="UX852BckCollarForkAttachRpos"
+                           phi="UX852BckCollarForkAttachPhiPos"/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCableHeadMagnetFaceEndBck-1"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="-UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation x="UX852FutureFibreCable03XRot"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachMagnetFaceZpos"
+                           r="UX852BckCollarForkAttachMagnetFaceRpos"
+                           phi="UX852BckCollarForkAttachMagnetFacePhiPos"/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCableHeadBeamPipeEndBck-2"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation x="-UX852FutureFibreCable03XRot"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
+                           r="UX852BckCollarForkAttachRpos"
+                           phi="UX852BckCollarForkAttachPhiPos+ UX852FixCollarQuarterRot"/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCableHeadMagnetFaceEndBck-2"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="-UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation x="-UX852FutureFibreCable03XRot"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachMagnetFaceZpos"
+                           r="UX852BckCollarForkAttachMagnetFaceRpos"
+                           phi="UX852BckCollarForkAttachMagnetFacePhiPos+ UX852FixCollarQuarterRot"/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- UX852FixCollarQuarterRot-UX852FutureFibreCableHeadPhiPosTolerence"/>
+          </transformation>
+        </physvol>
+
+
+        <physvol name="pvUX852FutureFibreCableHeadBeamPipeEndBck-3"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation x="UX852FutureFibreCable03XRot"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
+                           r="UX852BckCollarForkAttachRpos"
+                           phi="UX852BckCollarForkAttachPhiPos+ 2.0*UX852FixCollarQuarterRot"/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- 2.0*UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCableHeadMagnetFaceEndBck-3"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="-UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation x="UX852FutureFibreCable03XRot"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachMagnetFaceZpos"
+                           r="UX852BckCollarForkAttachMagnetFaceRpos"
+                           phi="UX852BckCollarForkAttachMagnetFacePhiPos+ 2*UX852FixCollarQuarterRot"/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- 2*UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCableHeadBeamPipeEndBck-4"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation x="-UX852FutureFibreCable03XRot"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
+                           r="UX852BckCollarForkAttachRpos"
+                           phi="UX852BckCollarForkAttachPhiPos+ 3.0*UX852FixCollarQuarterRot"/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- 3.0*UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCableHeadMagnetFaceEndBck-4"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="-UX852BckCollarForkAttachRotX"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation x="-UX852FutureFibreCable03XRot"/>
+            <positionRPhiZ z="UX852BckCollarForkAttachMagnetFaceZpos"
+                           r="UX852BckCollarForkAttachMagnetFaceRpos"
+                           phi="UX852BckCollarForkAttachMagnetFacePhiPos+ 3*UX852FixCollarQuarterRot"/>
+            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- 3*UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <!-- Now placing the cable heads in UX852 fwd -->
+        <physvol name="pvUX852TechnoraCableHeadBeamPipeEndFwd-1"
+                 volume="lvUX852TechnoraCableHeadTypeAWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation x="-UX852TechnoraCable04XRot"/>
+            <positionRPhiZ z="UX852TechnoraCable04ZShift"
+                           r="UX852TechnoraCable04RShift"
+                           phi="UX852FwdTechnoraCableHeadPhiPos"/>
+            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCableHeadMagnetFaceEndFwd-1"
+                 volume="lvUX852TechnoraCableHeadTypeA">
+
+          <transformation>
+            <position/>
+            <rotation x="-1.0*UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation x="-UX852TechnoraCable04XRot"/>
+            <positionRPhiZ z="UX852FwdCableHeadMagnetFaceZpos"
+                           r="UX852FwdCableHeadMagnetFaceRpos"
+                           phi="UX852FwdCableHeadMagnetFacePhiPos"/>
+            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCableHeadBeamPipeEndFwd-2"
+                 volume="lvUX852TechnoraCableHeadTypeAWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation x="UX852TechnoraCable04XRot"/>
+            <positionRPhiZ z="UX852TechnoraCable04ZShift"
+                           r="UX852TechnoraCable04RShift"
+                           phi="UX852FwdTechnoraCableHeadPhiPos +  UX852FixCollarQuarterRot"/>
+            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence - UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+
+
+        <physvol name="pvUX852TechnoraCableHeadMagnetFaceEndFwd-2"
+                 volume="lvUX852TechnoraCableHeadTypeA">
+
+          <transformation>
+            <position/>
+            <rotation x="-1.0*UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation x="UX852TechnoraCable04XRot"/>
+            <positionRPhiZ z="UX852FwdCableHeadMagnetFaceZpos"
+                           r="UX852FwdCableHeadMagnetFaceRpos"
+                           phi="UX852FwdCableHeadMagnetFacePhiPos+  UX852FixCollarQuarterRot"/>
+            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence- UX852FixCollarQuarterRot-UX852TechnoraCableHeadPhiPosTolerence "/>
+
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCableHeadBeamPipeEndFwd-3"
+                 volume="lvUX852TechnoraCableHeadTypeAWithoutPin">
+
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation x="-UX852TechnoraCable04XRot"/>
+            <positionRPhiZ z="UX852TechnoraCable04ZShift"
+                           r="UX852TechnoraCable04RShift"
+                           phi="UX852FwdTechnoraCableHeadPhiPos+  2*UX852FixCollarQuarterRot"/>
+            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence - 2*UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCableHeadMagnetFaceEndFwd-3"
+                 volume="lvUX852TechnoraCableHeadTypeA">
+          <transformation>
+            <position/>
+            <rotation x="-1.0*UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation x="-UX852TechnoraCable04XRot"/>
+            <positionRPhiZ z="UX852FwdCableHeadMagnetFaceZpos"
+                           r="UX852FwdCableHeadMagnetFaceRpos"
+                           phi="UX852FwdCableHeadMagnetFacePhiPos+  2*UX852FixCollarQuarterRot"/>
+            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence- 2*UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCableHeadBeamPipeEndFwd-4"
+                 volume="lvUX852TechnoraCableHeadTypeAWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation x="UX852TechnoraCable04XRot"/>
+            <positionRPhiZ z="UX852TechnoraCable04ZShift"
+                           r="UX852TechnoraCable04RShift"
+                           phi="UX852FwdTechnoraCableHeadPhiPos+  3*UX852FixCollarQuarterRot"/>
+            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence- 3*UX852FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCableHeadMagnetFaceEndFwd-4"
+                 volume="lvUX852TechnoraCableHeadTypeA">
+          <transformation>
+            <position/>
+            <rotation x="-1.0*UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation x="UX852TechnoraCable04XRot"/>
+            <positionRPhiZ z="UX852FwdCableHeadMagnetFaceZpos"
+                           r="UX852FwdCableHeadMagnetFaceRpos"
+                           phi="UX852FwdCableHeadMagnetFacePhiPos+  3*UX852FixCollarQuarterRot"/>
+            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence- 3*UX852FixCollarQuarterRot"/>
+
+          </transformation>
+        </physvol>
+
+        <!-- Now placing the cables in UX852 Bck -->
+        <physvol name="pvUX852FutureFibreCable03BottomLeft"
+                 volume="lvUX852FutureFibreCable03">
+          <transformation>
+            <position/>
+            <rotation x="UX852FutureFibreCable03XRot"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation z="UX852FutureFibreCable03ZRot"/>
+            <positionRPhiZ r="UX852FutureFibreCable03RPos"
+                           z="UX852FutureFibreCable03ZPos"
+                           phi="-UX852FutureFibreCable03ZRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCable03TopLeft"
+                 volume="lvUX852FutureFibreCable03">
+          <transformation>
+            <position/>
+            <rotation x="-UX852FutureFibreCable03XRot"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation z="UX852FutureFibreCable03ZRot - 90.0 *degree "/>
+            <positionRPhiZ r="UX852FutureFibreCable03RPos"
+                           z="UX852FutureFibreCable03ZPos"
+                           phi="UX852FutureFibreCable03ZRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCable03TopRight"
+                 volume="lvUX852FutureFibreCable03">
+          <transformation>
+            <position/>
+            <rotation x="UX852FutureFibreCable03XRot"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation z="UX852FutureFibreCable03ZRot - 180.0 *degree "/>
+            <positionRPhiZ r="UX852FutureFibreCable03RPos"
+                           z="UX852FutureFibreCable03ZPos"
+                           phi="-UX852FutureFibreCable03PhiPos - UX852FutureFibreCable03PhiPosTolerence + 180*degree"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FutureFibreCable03BottomRight"
+                 volume="lvUX852FutureFibreCable03">
+          <transformation>
+            <position/>
+            <rotation x="-UX852FutureFibreCable03XRot"/>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position/>
+            <rotation z="UX852FutureFibreCable03ZRot + 90.0 *degree "/>
+            <positionRPhiZ r="UX852FutureFibreCable03RPos"
+                           z="UX852FutureFibreCable03ZPos"
+                           phi="-UX852FutureFibreCable03PhiPos - UX852FutureFibreCable03PhiPosTolerence  -90*degree"/>
+          </transformation>
+        </physvol>
+
+        <!-- Now placing the cables in UX852 fwd -->
+        <physvol name="pvUX852TechnoraCable04BottomLeft"
+                 volume="lvUX852TechnoraCable04">
+          <transformation>
+            <position/>
+            <rotation x="UX852TechnoraCable04XRot"/>
+            <position/>
+            <rotation z="UX852TechnoraCable04ZRot"/>
+            <positionRPhiZ r="UX852TechnoraCable04RPos"
+                           z="UX852TechnoraCable04ZPos"
+                           phi="-UX852TechnoraCable04ZRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCable04TopLeft"
+                 volume="lvUX852TechnoraCable04">
+          <transformation>
+            <position/>
+            <rotation x="-UX852TechnoraCable04XRot"/>
+            <position/>
+            <rotation z="UX852TechnoraCable04ZRot - 90.0 *degree "/>
+            <positionRPhiZ r="UX852TechnoraCable04RPos"
+                           z="UX852TechnoraCable04ZPos"
+                           phi="UX852TechnoraCable04ZRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCable04TopRight"
+                 volume="lvUX852TechnoraCable04">
+          <transformation>
+            <position/>
+            <rotation x="UX852TechnoraCable04XRot"/>
+            <position/>
+            <rotation z="UX852TechnoraCable04ZRot - 180.0 *degree "/>
+            <positionRPhiZ r="UX852TechnoraCable04RPos"
+                           z="UX852TechnoraCable04ZPos"
+                           phi="-UX852TechnoraCable04PhiPos - UX852TechnoraCable04PhiPosTolerence + 180*degree"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852TechnoraCable04BottomRight"
+                 volume="lvUX852TechnoraCable04">
+          <transformation>
+            <position/>
+            <rotation x="-UX852TechnoraCable04XRot"/>
+            <position/>
+            <rotation z="UX852TechnoraCable04ZRot + 90.0 *degree "/>
+            <positionRPhiZ r="UX852TechnoraCable04RPos"
+                           z="UX852TechnoraCable04ZPos"
+                           phi="-UX852TechnoraCable04PhiPos - UX852TechnoraCable04PhiPosTolerence  -90*degree"/>
+          </transformation>
+        </physvol>
+
+        <!-- End modifications in June 2015 for UX852 -->
+        <physvol name="pvUX852FwdAttRod1"
+                 volume="lvUX852FwdAttRod">
+          <transformation>
+            <position/>
+            <rotation x="UX852FixCollarCable03XRot" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX852FwdCableAttRodZpos"
+                           r="UX852FwdCableAttRodRpos"
+                           phi="UX852FixCollarZrot"/>
+            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 40.2*degree"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FwdAttRod2"
+                 volume="lvUX852FwdAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX852FwdCableAttRodZpos"
+                           r="UX852FwdCableAttRodRpos"
+                           phi="UX852FixCollarZrot+UX852FixCollarQuarterRot"/>
+            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - UX852FixCollarQuarterRot-40.2*degree"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FwdAttRod3"
+                 volume="lvUX852FwdAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX852FwdCableAttRodZpos"
+                           r="UX852FwdCableAttRodRpos"
+                           phi="UX852FixCollarZrot+2*UX852FixCollarQuarterRot"/>
+            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 2*UX852FixCollarQuarterRot -40.2*degree"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852FwdAttRod4"
+                 volume="lvUX852FwdAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX852FwdCableAttRodZpos"
+                           r="UX852FwdCableAttRodRpos"
+                           phi="UX852FixCollarZrot+3*UX852FixCollarQuarterRot"/>
+            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 3*UX852FixCollarQuarterRot -40.2*degree"/>
+          </transformation>
+        </physvol>
+
+
+        <physvol name="pvUX852BckAttRod1"
+                 volume="lvUX852BckAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX852BckCableAttRodZpos"
+                           r="UX852BckCableAttRodRpos"
+                           phi="UX852FixCollarZrot"/>
+            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot -40.2*degree"/> <!--- UX852FixCollarZrot-0.2*degree"/>-->
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852BckAttRod2"
+                 volume="lvUX852BckAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX852BckCableAttRodZpos"
+                           r="UX852BckCableAttRodRpos"
+                           phi="UX852FixCollarZrot+UX852FixCollarQuarterRot"/>
+            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - UX852FixCollarQuarterRot -40.2*degree"/> <!-- - UX852FixCollarZrot-0.2*degree"/>-->
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852BckAttRod3"
+                 volume="lvUX852BckAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX852BckCableAttRodZpos"
+                           r="UX852BckCableAttRodRpos"
+                           phi="UX852FixCollarZrot+2*UX852FixCollarQuarterRot"/>
+            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 2*UX852FixCollarQuarterRot - 40.2*degree"/> <!-- - UX852FixCollarZrot-0.2*degree"/>-->
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX852BckAttRod4"
+                 volume="lvUX852BckAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX852BckCableAttRodZpos"
+                           r="UX852BckCableAttRodRpos"
+                           phi="UX852FixCollarZrot+3*UX852FixCollarQuarterRot"/>
+            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 3*UX852FixCollarQuarterRot -40.2*degree"/> <!-- - UX852FixCollarZrot -0.2*degree"/>-->
+          </transformation>
+        </physvol>
+
+
+        <!-- UX85-3 Fixed point -->
+        <physvol name="pvUX853FixCollar"
+                 volume="lvUX853FixCollar">
+        </physvol>
+
+        <physvol name="pvUX853CollarClip1"
+                 volume="lvUX853CollarClip">
+          <position z="UX853FixCollarZpos"/>
+        </physvol>
+
+
+
+
+        <physvol name="pvUX853CollarClip2"
+                 volume="lvUX853CollarClip">
+          <transformation>
+            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
+            <rotation x="180*degree"/>
+            <position z="UX853FixCollarZpos"/>
+          </transformation>
+        </physvol>
+
+
+
+        <physvol name="lvUX853CollarClipScrew11"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF-1.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX853CollarClipScrew12"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF-0.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX853CollarClipScrew13"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+0.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX853CollarClipScrew14"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+1.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+
+        <physvol name="lvUX853CollarClipScrew21"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+UX853CollarClipSFDeltaPhi-1.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX853CollarClipScrew22"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+UX853CollarClipSFDeltaPhi-0.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX853CollarClipScrew23"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+UX853CollarClipSFDeltaPhi+0.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX853CollarClipScrew124"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+UX853CollarClipSFDeltaPhi+1.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+
+        <physvol name="lvUX853CollarClipScrew31"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+2*UX853CollarClipSFDeltaPhi-1.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX853CollarClipScrew32"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+2*UX853CollarClipSFDeltaPhi-0.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX853CollarClipScrew33"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+2*UX853CollarClipSFDeltaPhi+0.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+        <physvol name="lvUX853CollarClipScrew134"
+                 volume="lvUX853CollarClipScrew">
+          <positionRPhiZ r="UX853CollarClipHolesRpos"
+                         phi="UX853CollarClipHolesDeltaPhiSF+2*UX853CollarClipSFDeltaPhi+1.5*UX853CollarClipHolesDeltaPhiSF"
+                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
+        </physvol>
+
+
+        <physvol name="pvUX853CollarAtt1a"
+                 volume="lvUX853CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree" y="90*degree"/>
+            <positionRPhiZ z="UX853CollarAttMainPartZPos"
+                           r="UX853CollarAttMainPartRPos"
+                           phi="UX853FixCollarPhiStart+34*degree-UX853CollarAttMainPartPhiShift"/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX853CollarAtt1b"
+                 volume="lvUX853CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree" y="90*degree"/>
+            <positionRPhiZ z="UX853CollarAttMainPartZPos"
+                           r="UX853CollarAttMainPartRPos"
+                           phi="UX853FixCollarPhiStart+34*degree+UX853CollarAttMainPartPhiShift"/>
+          </transformation>
+        </physvol>
+
+
+        <physvol name="pvUX853CollarAtt2a"
+                 volume="lvUX853CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree" y="180*degree"/>
+            <positionRPhiZ z="UX853CollarAttMainPartZPos"
+                           r="UX853CollarAttMainPartRPos"
+                           phi="UX853FixCollarPhiStart+UX853FixCollarQuarterRot+34*degree-UX853CollarAttMainPartPhiShift"/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX853CollarAtt2b"
+                 volume="lvUX853CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree" y="180*degree"/>
+            <positionRPhiZ z="UX853CollarAttMainPartZPos"
+                           r="UX853CollarAttMainPartRPos"
+                           phi="UX853FixCollarPhiStart+UX853FixCollarQuarterRot+34*degree+UX853CollarAttMainPartPhiShift"/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX853CollarAtt3a"
+                 volume="lvUX853CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree" y="270*degree"/>
+            <positionRPhiZ z="UX853CollarAttMainPartZPos"
+                           r="UX853CollarAttMainPartRPos"
+                           phi="UX853FixCollarPhiStart+2*UX853FixCollarQuarterRot+34*degree-UX853CollarAttMainPartPhiShift"/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX853CollarAtt3b"
+                 volume="lvUX853CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree" y="270*degree"/>
+            <positionRPhiZ z="UX853CollarAttMainPartZPos"
+                           r="UX853CollarAttMainPartRPos"
+                           phi="UX853FixCollarPhiStart+2*UX853FixCollarQuarterRot+34*degree+UX853CollarAttMainPartPhiShift"/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX853CollarAtt4a"
+                 volume="lvUX853CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree" y="0*degree"/>
+            <positionRPhiZ z="UX853CollarAttMainPartZPos"
+                           r="UX853CollarAttMainPartRPos"
+                           phi="UX853FixCollarPhiStart+3*UX853FixCollarQuarterRot+34*degree-UX853CollarAttMainPartPhiShift"/>
+          </transformation>
+        </physvol>
+        <physvol name="pvUX853CollarAtt4b"
+                 volume="lvUX853CollarAtt">
+          <transformation>
+            <position/>
+            <rotation x="90*degree" y="0*degree"/>
+            <positionRPhiZ z="UX853CollarAttMainPartZPos"
+                           r="UX853CollarAttMainPartRPos"
+                           phi="UX853FixCollarPhiStart+3*UX853FixCollarQuarterRot+34*degree+UX853CollarAttMainPartPhiShift"/>
+          </transformation>
+        </physvol>
+
+
+        <!-- Now placing the new Cable head in UX853 from June 2015 -->
+
+
+        <physvol name="pvUX853FutureCableHeadBeamPipeEndBck-1"
+                 volume="lvUX852FutureFibreCableHeadWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation y="180.0*degree"  x="UX853FixCollarCableBckTheta"/>
+            <positionRPhiZ z="UX853BckCableHeadZpos"
+                           r="UX853BckCableHeadRpos"
+                           phi="UX853BckCableHeadCommonPhipos"/>
+
+          </transformation>
+
+        </physvol>
+
+        <physvol name="pvUX853FutureCableHeadMagnetFaceEndBck-1"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="-UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+
+            <position/>
+            <rotation y="180.0*degree"  x="UX853FixCollarCableBckTheta"/>
+
+            <positionRPhiZ z="UX853BckCable05HeadMagnetFaceZpos"
+                           r="UX853BckCable05HeadMagnetFaceRpos"
+                           phi="UX853BckCable05HeadMagnetFaceCommonPhipos"/>
+
+          </transformation>
+
+        </physvol>
+
+        <physvol name="pvUX853FutureCableHeadBeamPipeEndBck-2"
+                 volume="lvUX852FutureFibreCableHeadWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90.0*degree"/>
+
+            <position/>
+            <rotation y="180*degree"/>
+
+            <position/>
+            <rotation z="UX853FixCollarCableBckPlaneRotZHorizRight"/>
+            <positionRPhiZ z="UX853BckCableHeadZpos"
+                           r="UX853BckCableHeadRpos"
+                           phi="UX853BckCableHeadCommonPhipos +UX853FixCollarQuarterRot"/>
+
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizRight"
+                     angle="-UX853FixCollarCableBckTheta"/>
+
+          </transformation>
+
+        </physvol>
+
+        <physvol name="pvUX853FutureCableHeadMagnetFaceEndBck-2"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="-UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90.0*degree"/>
+
+            <position/>
+            <rotation y="180*degree"/>
+
+            <position/>
+            <rotation z="UX853FixCollarCableBckPlaneRotZHorizRight"/>
+            <positionRPhiZ z="UX853BckCable06HeadMagnetFaceZpos"
+                           r="UX853BckCable06HeadMagnetFaceRpos"
+                           phi="UX853BckCable06HeadMagnetFaceCommonPhipos +UX853FixCollarQuarterRot"/>
+
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizRight"
+                     angle="-UX853FixCollarCableBckTheta"/>
+
+          </transformation>
+
+        </physvol>
+
+
+
+
+        <physvol name="pvUX853FutureCableHeadBeamPipeEndBck-3"
+                 volume="lvUX852FutureFibreCableHeadWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+
+            <position/>
+            <rotation z="90.0*degree"/>
+
+            <position/>
+            <rotation y="180.0*degree"  x="-UX853FixCollarCableBckTheta"/>
+            <positionRPhiZ z="UX853BckCableHeadZpos"
+                           r="UX853BckCableHeadRpos"
+                           phi="UX853BckCableHeadCommonPhipos + 2*UX853FixCollarQuarterRot "/>
+
+          </transformation>
+
+        </physvol>
+
+        <physvol name="pvUX853FutureCableHeadMagnetFaceEndBck-3"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="-UX852CableHeadHRotX"/>
+
+            <position/>
+            <rotation z="90.0*degree"/>
+
+            <position/>
+            <rotation y="180.0*degree"  x="-UX853FixCollarCableBckTheta"/>
+            <positionRPhiZ z="UX853BckCable05HeadMagnetFaceZpos"
+                           r="UX853BckCable05HeadMagnetFaceRpos"
+                           phi="UX853BckCable05HeadMagnetFaceCommonPhipos + 2*UX853FixCollarQuarterRot "/>
+
+          </transformation>
+
+        </physvol>
+
+
+        <physvol name="pvUX853FutureCableHeadBeamPipeEndBck-4"
+                 volume="lvUX852FutureFibreCableHeadWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90.0*degree"/>
+
+            <position/>
+            <rotation y="180*degree"/>
+
+            <position/>
+            <rotation z="UX853FixCollarCableBckPlaneRotZHorizLeft"/>
+            <positionRPhiZ z="UX853BckCableHeadZpos"
+                           r="UX853BckCableHeadRpos"
+                           phi="UX853BckCableHeadCommonPhipos + 3*UX853FixCollarQuarterRot"/>
+
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizLeft"
+                     angle="-UX853FixCollarCableBckTheta"/>
+
+          </transformation>
+
+        </physvol>
+
+        <physvol name="pvUX853FutureCableHeadMagnetFaceEndBck-4"
+                 volume="lvUX852FutureFibreCableHead">
+          <transformation>
+            <position/>
+            <rotation x="-UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90.0*degree"/>
+
+            <position/>
+            <rotation y="180*degree"/>
+
+            <position/>
+            <rotation z="UX853FixCollarCableBckPlaneRotZHorizLeft"/>
+            <positionRPhiZ z="UX853BckCable06HeadMagnetFaceZpos"
+                           r="UX853BckCable06HeadMagnetFaceRpos"
+                           phi="UX853BckCableHeadCommonPhipos + 3*UX853FixCollarQuarterRot"/>
+
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizLeft"
+                     angle="-UX853FixCollarCableBckTheta"/>
+
+          </transformation>
+
+        </physvol>
+
+        <physvol name="pvUX853TechnoraCableHeadBeamPipeEndFwd-1"
+                 volume="lvUX852TechnoraCableHeadTypeBWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation  x="-UX853FixCollarCableFwdTheta"
+                       z="UX853FixCollarCableFwdPlaneRotZTopVertical"/>
+            <positionRPhiZ z="UX853FwdCableHeadZpos"
+                           r="UX853FwdCableHeadRpos"
+                           phi="UX853FwdCableHeadCommonPhipos"/>
+
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853TechnoraCableHeadMagnetFaceEndFwd-1"
+                 volume="lvUX852TechnoraCableHeadTypeB">
+          <transformation>
+            <position/>
+            <rotation x="-UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation  x="-UX853FixCollarCableFwdTheta"
+                       z="UX853FixCollarCableFwdPlaneRotZTopVertical"/>
+            <positionRPhiZ z="UX853FwdCable07HeadMagnetFaceZpos"
+                           r="UX853FwdCable07HeadMagnetFaceRpos"
+                           phi="UX853FwdCable07HeadMagnetFaceCommonPhipos"/>
+
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853TechnoraCableHeadBeamPipeEndFwd-2"
+                 volume="lvUX852TechnoraCableHeadTypeBWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation  z="UX853FixCollarCableFwdPlaneRotZHorizRight"/>
+            <positionRPhiZ z="UX853FwdCableHeadZpos"
+                           r="UX853FwdCableHeadRpos"
+                           phi="UX853FwdCableHeadCommonPhipos+UX853FixCollarQuarterRot"/>
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizRight"
+                     angle="-UX853FixCollarCableFwdTheta"/>
+
+          </transformation>
+        </physvol>
+        <physvol name="pvUX853TechnoraCableHeadMagnetFaceEndFwd-2"
+                 volume="lvUX852TechnoraCableHeadTypeB">
+          <transformation>
+            <position/>
+            <rotation x="-UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation z="UX853FixCollarCableFwdPlaneRotZHorizRight"/>
+            <positionRPhiZ z="UX853FwdCable08HeadMagnetFaceZpos"
+                           r="UX853FwdCable08HeadMagnetFaceRpos"
+                           phi="UX853FwdCable08HeadMagnetFaceCommonPhipos+UX853FixCollarQuarterRot "/>
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizRight"
+                     angle="-UX853FixCollarCableFwdTheta"/>
+
+          </transformation>
+        </physvol>
+
+
+
+
+        <physvol name="pvUX853TechnoraCableHeadBeamPipeEndFwd-3"
+                 volume="lvUX852TechnoraCableHeadTypeBWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation  x="UX853FixCollarCableFwdTheta"
+                       z="UX853FixCollarCableFwdPlaneRotZBotVertical"/>
+            <positionRPhiZ z="UX853FwdCableHeadZpos"
+                           r="UX853FwdCableHeadRpos"
+                           phi="UX853FwdCableHeadCommonPhipos + 2*UX853FixCollarQuarterRot"/>
+
+          </transformation>
+        </physvol>
+
+
+
+
+        <physvol name="pvUX853TechnoraCableHeadMagnetFaceEndFwd-3"
+                 volume="lvUX852TechnoraCableHeadTypeB">
+          <transformation>
+            <position/>
+            <rotation x="-UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation  x="UX853FixCollarCableFwdTheta"
+                       z="UX853FixCollarCableFwdPlaneRotZBotVertical"/>
+            <positionRPhiZ z="UX853FwdCable07HeadMagnetFaceZpos"
+                           r="UX853FwdCable07HeadMagnetFaceRpos"
+                           phi="UX853FwdCable07HeadMagnetFaceCommonPhipos + 2*UX853FixCollarQuarterRot"/>
+
+          </transformation>
+        </physvol>
+
+
+        <physvol name="pvUX853TechnoraCableHeadBeamPipeEndFwd-4"
+                 volume="lvUX852TechnoraCableHeadTypeBWithoutPin">
+          <transformation>
+            <position/>
+            <rotation x="UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation  z="UX853FixCollarCableFwdPlaneRotZHorizLeft"/>
+            <positionRPhiZ z="UX853FwdCableHeadZpos"
+                           r="UX853FwdCableHeadRpos"
+                           phi="UX853FwdCableHeadCommonPhipos+3*UX853FixCollarQuarterRot"/>
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizLeft"
+                     angle="-UX853FixCollarCableFwdTheta"/>
+
+          </transformation>
+        </physvol>
+
+
+        <physvol name="pvUX853TechnoraCableHeadMagnetFaceEndFwd-4" volume="lvUX852TechnoraCableHeadTypeB">
+          <transformation>
+            <position/>
+            <rotation x="-UX852CableHeadHRotX"/>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation z="UX853FixCollarCableFwdPlaneRotZHorizLeft"/>
+            <positionRPhiZ z="UX853FwdCable08HeadMagnetFaceZpos"
+                           r="UX853FwdCable08HeadMagnetFaceRpos"
+                           phi="UX853FwdCable08HeadMagnetFaceCommonPhipos+ 3*UX853FixCollarQuarterRot "/>
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizLeft"
+                     angle="-UX853FixCollarCableFwdTheta"/>
+          </transformation>
+        </physvol>
+
+        <!-- End placing the new Cable head in UX853 from June 2015 -->
+        <!-- Now place the cables in UX853 from June 2015 -->
+        <!-- Now placing the backward cables in UX853 from June 2015 -->
+        <physvol name="pvUX853FixCollarCable05BckTop"        volume="lvUX853FutureFibreCable05">
+          <transformation>
+            <position/>
+            <rotation y="180.0*degree"  x="UX853FixCollarCableBckTheta"/>
+            <positionRPhiZ z="UX853BckCable05ZPos"
+                           r="UX853BckCable05RPos"
+                           phi="UX853BckCableHeadCommonPhipos"/>
+
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FixCollarCable06BckHorizRight" volume="lvUX853FutureFibreCable06">
+          <transformation>
+            <position/>
+            <rotation z="90.0*degree"/>
+
+            <position/>
+            <rotation z="UX853FixCollarCableBckPlaneRotZHorizRight"/>
+            <positionRPhiZ z="UX853BckCable06ZPos"
+                           r="UX853BckCable06RPos"
+                           phi="UX853BckCableHeadCommonPhipos +UX853FixCollarQuarterRot"/>
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizRight"
+                     angle="-UX853FixCollarCableBckTheta"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FixCollarCable05BckBot"       volume="lvUX853FutureFibreCable05">
+          <transformation>
+            <position/>
+            <rotation y="180.0*degree"  x="-UX853FixCollarCableBckTheta"/>
+            <positionRPhiZ z="UX853BckCable05ZPos"
+                           r="UX853BckCable05RPos"
+                           phi="UX853BckCableHeadCommonPhipos+ 2*UX853FixCollarQuarterRot"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FixCollarCable06BckHorizLeft"  volume="lvUX853FutureFibreCable06">
+          <transformation>
+            <position/>
+            <rotation z="90.0*degree"/>
+            <position/>
+            <rotation z="UX853FixCollarCableBckPlaneRotZHorizLeft"/>
+            <positionRPhiZ z="UX853BckCable06ZPos"
+                           r="UX853BckCable06RPos"
+                           phi="UX853BckCableHeadCommonPhipos +3* UX853FixCollarQuarterRot"/>
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizLeft"
+                     angle="-UX853FixCollarCableBckTheta"/>
+          </transformation>
+        </physvol>
+
+        <!-- Now placing the forward cables in UX853 from June 2015 -->
+        <physvol name="pvUX853FixCollarCable07FwdTop"        volume="lvUX853TechnoraCable07">
+          <transformation>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation  x="-UX853FixCollarCableFwdTheta"
+                       z="UX853FixCollarCableFwdPlaneRotZTopVertical"/>
+
+            <positionRPhiZ z="UX853FwdCable07ZPos"
+                           r="UX853FwdCable07RPos"
+                           phi="UX853FwdCableHeadCommonPhipos"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FixCollarCable08FwdHorizRight" volume="lvUX853TechnoraCable08">
+          <transformation>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation z="UX853FixCollarCableFwdPlaneRotZHorizRight"/>
+            <positionRPhiZ z="UX853FwdCable08ZPos"
+                           r="UX853FwdCable08RPos"
+                           phi="UX853FwdCableHeadCommonPhipos+ UX853FixCollarQuarterRot "/>
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizRight"
+                     angle="-UX853FixCollarCableFwdTheta"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FixCollarCable07FwdBot"        volume="lvUX853TechnoraCable07">
+          <transformation>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation  x="UX853FixCollarCableFwdTheta"
+                       z="UX853FixCollarCableFwdPlaneRotZBotVertical"/>
+            <positionRPhiZ z="UX853FwdCable07ZPos"
+                           r="UX853FwdCable07RPos"
+                           phi="UX853FwdCableHeadCommonPhipos + 2*UX853FixCollarQuarterRot "/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FixCollarCable08FwdHorizLeft"  volume="lvUX853TechnoraCable08">
+
+          <transformation>
+            <position/>
+            <rotation z="90*degree"/>
+            <position/>
+            <rotation z="UX853FixCollarCableFwdPlaneRotZHorizLeft"/>
+            <positionRPhiZ z="UX853FwdCable08ZPos"
+                           r="UX853FwdCable08RPos"
+                           phi="UX853FwdCableHeadCommonPhipos+ 3*UX853FixCollarQuarterRot "/>
+            <rotAxis axTheta="90.0*degree"
+                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizLeft"
+                     angle="-UX853FixCollarCableFwdTheta"/>
+          </transformation>
+        </physvol>
+
+        <!-- End  placing the cables in UX853 from June 2015 -->
+        <physvol name="pvUX853BckAttRod1"                    volume="lvUX853BckAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="180.0*degree"/>
+            <positionRPhiZ z="UX853BckCableAttRodZpos"
+                           r="UX853BckCableAttRodRpos"
+                           phi="UX853FixCollarPhiStart+34*degree"/>
+            <rotation z="-(UX853FixCollarPhiStart+34*degree+UX853FixCollarQuarterRot)"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853BckAttRod2"                 volume="lvUX853BckAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX853BckCableAttRodZpos"
+                           r="UX853BckCableAttRodRpos"
+                           phi="UX853FixCollarPhiStart+34*degree+UX853FixCollarQuarterRot"/>
+            <rotation z="-(UX853FixCollarPhiStart+34*degree+2*UX853FixCollarQuarterRot)"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853BckAttRod3"                 volume="lvUX853BckAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX853BckCableAttRodZpos"
+                           r="UX853BckCableAttRodRpos"
+                           phi="UX853FixCollarPhiStart+34*degree+2*UX853FixCollarQuarterRot"/>
+            <rotation z="-(UX853FixCollarPhiStart+34*degree+3*UX853FixCollarQuarterRot)"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853BckAttRod4"                 volume="lvUX853BckAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX853BckCableAttRodZpos"
+                           r="UX853BckCableAttRodRpos"
+                           phi="UX853FixCollarPhiStart+34*degree+3*UX853FixCollarQuarterRot"/>
+            <rotation z="-(UX853FixCollarPhiStart+34*degree+4*UX853FixCollarQuarterRot)"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FwdAttRod1"                 volume="lvUX853FwdAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX853FwdCableAttRodZpos"
+                           r="UX853FwdCableAttRodRpos"
+                           phi="UX853FixCollarPhiStart+34*degree"/>
+            <rotation z="-(UX853FixCollarPhiStart+34*degree+UX853FixCollarQuarterRot)"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FwdAttRod2"                 volume="lvUX853FwdAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX853FwdCableAttRodZpos"
+                           r="UX853FwdCableAttRodRpos"
+                           phi="UX853FixCollarPhiStart+34*degree+UX853FixCollarQuarterRot"/>
+            <rotation z="-(UX853FixCollarPhiStart+34*degree+2*UX853FixCollarQuarterRot)"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FwdAttRod3"                 volume="lvUX853FwdAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX853FwdCableAttRodZpos"
+                           r="UX853FwdCableAttRodRpos"
+                           phi="UX853FixCollarPhiStart+34*degree+2*UX853FixCollarQuarterRot"/>
+            <rotation z="-(UX853FixCollarPhiStart+34*degree+3*UX853FixCollarQuarterRot)"/>
+          </transformation>
+        </physvol>
+
+        <physvol name="pvUX853FwdAttRod4"                 volume="lvUX853FwdAttRod">
+          <transformation>
+            <position/>
+            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
+            <positionRPhiZ z="UX853FwdCableAttRodZpos"
+                           r="UX853FwdCableAttRodRpos"
+                           phi="UX853FixCollarPhiStart+34*degree+3*UX853FixCollarQuarterRot"/>
+            <rotation z="-(UX853FixCollarPhiStart+34*degree+4*UX853FixCollarQuarterRot)"/>
+          </transformation>
+        </physvol>
+      </envelope>
+
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-SupportParams.xml b/compact/components/Pipe/2025-v00.00/Magnet-SupportParams.xml
new file mode 100644
index 000000000..af7a3d164
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Magnet-SupportParams.xml
@@ -0,0 +1,814 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout in the Magnet                    -->
+<!--===========================================================================-->
+<lccdd>
+  <define>
+
+    <!-- ***************************************************************** -->
+    <!-- *  BeamPipe Supports geometry parameters                        * -->
+    <!-- *                                                               * -->
+    <!-- *  Date: 2006-03-02                                             * -->
+    <!-- *  Author: Gloria Corti                                         * -->
+    <!-- *  Modified by Daria Savrina, Oct. 2008 to adapt supports as    * -->
+    <!-- *  installed                                                    * -->
+    <!-- * Modified by Jimmy McCarthy May 2012  to adapt supports as     * -->
+    <!-- * installed during 2012 LSD                                     * -->
+    <!-- * Modified by Sajan Easo in June 2015 for the new supports      * -->
+    <!-- *                                                               * -->
+    <!-- ***************************************************************** -->
+
+    <!-- ***************************************************************** -->
+    <!-- * UX85-1 Support                                                * -->
+    <!-- ***************************************************************** -->
+    <!-- UX85-1 Support: Collar -->
+    <constant name="UX851CollarLenght" value="30.00*mm"/>
+    <constant name="UX851CollarRadius" value="43.00*mm"/>
+    <constant name="UX851CollarThick" value="4.00*mm"/>
+    <constant name="UX851CollarZpos" value="2798.80*mm - 0.5*Regions:BeforeMagnetZSize - 0.5*UX851CollarLenght "/>
+
+    <!-- UX85-1 Support: Cables -->
+    <constant name="UX851CableRadius" value="1.00*mm"/>
+    <constant name="UX851CableLenght" value="1000.00*mm"/>
+    <constant name="UX851CablePhiAngle" value="45.0*degree"/>
+    <constant name="UX851CableZpos" value="2780.00*mm - 0.5*Regions:BeforeMagnetZSize"/>
+    <constant name="UX851CableXYpos" value="(UX851CollarRadius + UX851CollarThick + 0.5*UX851CableLenght) * sin(UX851CablePhiAngle)"/>
+
+    <!-- ***************************************************************** -->
+    <!-- * UX85-2 Fixed Point                                            * -->
+    <!-- ***************************************************************** -->
+    <!-- UX85-2 Fixed Point: Collar before/after rib and around -->
+    <constant name="UX852FixCollarLenght" value="24.00*mm"/>
+
+    <!-- UX85-2 Fixed Point: Collar -->
+    <!-- Inner ring -->
+    <constant name="UX852FixCollarRingInnerRad" value="55.50*mm"/>
+    <constant name="UX852FixCollarRingOuterRad" value="57.50*mm"/>
+    <constant name="UX852FixCollarRingLength" value="6.00*mm"/>
+    <constant name="UX852FixCollarZpos" value="4025.50*mm - 0.5*Regions:BeforeMagnetZSize"/>
+    <constant name="UX852FixCollarZrot" value="45.00*degree"/>
+
+    <!-- Big ring -->
+    <constant name="UX852FixCollarInnerRad" value="57.50*mm"/>
+    <constant name="UX852FixCollarOuterRad" value="64.50*mm"/>
+    <constant name="UX852FixCollarLength" value="12.00*mm"/>
+    <constant name="UX852FixCollarCutAngl" value="45*degree"/>
+    <constant name="UX852FixCollarQuarterRot" value="90*degree"/>
+    <constant name="UX852FixCollarAttOuterRad" value="77.50*mm"/>
+
+    <!-- For the first type of sections -->
+    <constant name="UX852FixCollarSect1DelthaAngle" value="14.8*degree"/>
+    <constant name="UX852FixCollarSect1Rot" value="-7.4*degree"/>
+    <!-- For the second type of sections -->
+    <constant name="UX852FixCollarSect2DelthaAngle" value="15.1*degree"/>
+    <constant name="UX852FixCollarSect2Rot" value="(UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle)*0.5"/>
+    <!-- For the third type of sections -->
+    <constant name="UX852FixCollarSect3DelthaAngle" value="45*degree"/>
+    <constant name="UX852FixCollarSect3Rot" value="(UX852FixCollarSect1DelthaAngle + UX852FixCollarSect3DelthaAngle)*0.5 + UX852FixCollarSect2DelthaAngle"/>
+
+    <!--Ring Cut cut for the slope -->
+    <constant name="UX852BigRingSect2SlopeXsize" value="40*mm"/>
+    <constant name="UX852BigRingSect2SlopeYsize" value="20*mm"/>
+    <constant name="UX852BigRingSect2SlopeZrot" value="145*degree"/>
+    <constant name="UX852BigRingSect2SlopePhipos" value="UX852FixCollarSect1DelthaAngle + 0.5*UX852FixCollarSect2DelthaAngle"/>
+    <constant name="UX852BigRingSect4SlopePhipos" value="UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle + UX852FixCollarSect3DelthaAngle + 0.5*UX852FixCollarSect2DelthaAngle"/>
+
+    <!-- Transverse hole -->
+    <constant name="UX852FixCollarHoleSect3Rad" value="4.00*mm"/>
+    <constant name="UX852FixCollarHoleSect3Length" value="0.5*(UX852FixCollarOuterRad-UX852FixCollarInnerRad)"/>
+    <constant name="UX852FixCollarHoleSect3Rpos" value="UX852FixCollarOuterRad-0.5*UX852FixCollarHoleSect3Length"/>
+    <constant name="UX852FixCollarHoleSect3Phipos" value="UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle+0.5*UX852FixCollarSect3DelthaAngle"/>
+
+    <!-- Collar clips -->
+    <!-- begin remove in future -->
+    <constant name="UX852CollarClipDeltaPhi" value="120.00*degree - 0.20*degree"/>
+    <constant name="UX852CollarGapDeltaPhi" value="0.20*degree"/>
+    <!-- end remove in future-->
+    <constant name="UX852CollarGapSFDeltaPhi" value="0.20*degree"/>
+    <constant name="UX852CollarClipSFDeltaPhi" value="120.00*degree"/>
+    <constant name="UX852CollarClipSFStartPhi" value="-0.5*UX852CollarClipSFDeltaPhi+0.5*UX852CollarGapSFDeltaPhi"/>
+    <constant name="UX852CollarClipSFPosStartPhi" value="90.0*degree"/>
+
+    <!-- Ring one -->
+    <constant name="UX852CollarClipRing1Length" value="2.90*mm"/>
+    <constant name="UX852CollarClipRing1InnerRad" value="48.50*mm"/>
+    <constant name="UX852CollarClipRing1OuterRad" value="55.50*mm"/>
+    <!-- Ring two -->
+    <constant name="UX852CollarClipRing2Length" value="0.5*UX852FixCollarLength - UX852CollarClipRing1Length"/>
+    <constant name="UX852CollarClipRing2InnerRad" value="43.50*mm"/>
+    <constant name="UX852CollarClipRing2OuterRad" value="57.50*mm"/>
+
+    <!-- The following from LHCVC8B-0161_VAA  in June 2015 -->
+    <constant name="UX852CollarClipHolesLength" value="45.00*mm"/>
+    <constant name="UX852CollarClipHolesRad" value="1.75*mm"/>
+    <constant name="UX852CollarClipHolesSFDeltaPhi" value="40*degree"/>
+    <constant name="UX852CollarClipHolesRpos" value="52.50*mm"/>
+
+    <!-- The following in June2015 from type M3 in iso4762 -->
+    <constant name="UX852CollarClipHoleScrewHeadLength" value="3.0*mm"/>
+    <constant name="UX852CollarClipHoleScrewLengthTolerence" value="0.2*mm"/>
+    <constant name="UX852CollarClipHoleScrewLength" value="18.5*mm"/>
+    <constant name="UX852CollarClipHoleScrewRad" value="1.25*mm"/>
+    <constant name="UX852CollarClipHoleScrewHeadRad" value="2.75*mm"/>
+    <constant name="UX852CollarClipHoleScrewSubLargeLength" value="50.0*mm"/>
+    <constant name="UX852CollarClipHoleScrewSubLargeRadius" value="10.0*mm"/>
+    <constant name="UX852CollarClipHoleScrewSubPosZ" value="0.5*(UX852CollarClipHoleScrewSubLargeLength-UX852CollarClipHoleScrewLength) + UX852CollarClipHoleScrewHeadLength "/>
+    <constant name="UX852CollarClipHoleScrewPosZ" value="0.5*UX852CollarClipHoleScrewLength-0.5*UX852FixCollarLength-UX852CollarClipHoleScrewHeadLength-UX852CollarClipHoleScrewLengthTolerence"/>
+
+    <!-- Cable attachments -->
+
+    <!-- Collar part -->
+    <constant name="UX852CollarAttMainPartXsize" value="32.0*mm"/>
+    <constant name="UX852CollarAttMainPartYsize" value="47.0*mm"/>
+    <constant name="UX852CollarAttMainPartZsize" value="5.50*mm"/>
+    <constant name="UX852CollarAttMainPartRPos" value="59.5*mm+0.5*UX852CollarAttMainPartXsize+2*mm"/>
+    <constant name="UX852CollarAttMainPartPhiShift" value="1.0*degree"/>
+
+    <!--Holes -->
+    <constant name="UX852CollarAttMainHole1RadTolerence" value="0.3*mm"/>
+    <constant name="UX852CollarAttMainHole1Rad" value="5*mm+UX852CollarAttMainHole1RadTolerence"/>
+    <constant name="UX852CollarAttMainHole1RadPos" value="-(67.5*mm-UX852FixCollarInnerRad-0.5*UX852CollarAttMainPartXsize-2*mm)"/>
+    <constant name="UX852CollarAttMainHole1ZPos" value="19.0*mm+UX852CollarClipRing1Length-0.5*UX852FixCollarLength"/>
+    <constant name="UX852CollarAttMainHole2RadTolerence" value="0.3*mm"/>
+    <constant name="UX852CollarAttMainHole2Rad" value="4*mm+UX852CollarAttMainHole2RadTolerence"/>
+    <constant name="UX852CollarAttMainHole2RadPos" value="80.314*mm-UX852FixCollarInnerRad-0.5*UX852CollarAttMainPartXsize-2*mm"/>
+    <constant name="UX852CollarAttMainHole2ZPos" value="-8.7*mm-0.5*UX852FixCollarLength"/>
+
+    <!--Rounded edges -->
+    <constant name="UX852CollarAttMainPartEdge1InnerRad" value="8.0*mm"/>
+    <constant name="UX852CollarAttMainPartEdge2InnerRad" value="9.0*mm"/>
+    <constant name="UX852CollarAttMainPartEdge1DeltaPhi" value="180*degree"/>
+    <constant name="UX852CollarAttMainPartEdge1StartPhi" value="0*degree"/>
+    <constant name="UX852CollarAttMainPartEdge2StartPhi" value="225*degree"/>
+    <constant name="UX852CollarAttMainPartEdge2DeltaPhi" value="135*degree"/>
+    <constant name="UX852CollarAttMainPartEdge2bStartPhi" value="0*degree"/>
+    <constant name="UX852CollarAttMainPartEdge2bDeltaPhi" value="45*degree"/>
+
+    <!--Slope 1-->
+    <constant name="UX852CollarAttSlope1RPos" value="UX852CollarAttMainPartXsize+18*mm"/>
+    <constant name="UX852CollarAttSlope1YRot" value="90*degree+40*degree"/>
+    <!--Slope 2-->
+    <constant name="UX852CollarAttSlope2RPos" value="16*mm"/>
+    <constant name="UX852CollarAttSlope2ZPos" value="UX852CollarAttMainHole1ZPos+0.5*UX852CollarAttMainPartYsize-19*mm+UX852FixCollarRingLength+3*mm"/>
+    <!--Slope 3-->
+    <constant name="UX852CollarAttSlope3RPos" value="25*mm"/>
+    <constant name="UX852CollarAttSlope3YRot" value="38*degree"/>
+
+
+    <!-- UX85-2 Fixed Point: Backward Cables, 3.0 mm diameter position-->
+    <constant name="UX852FixCollarCable03Radius" value="1.50*mm"/>
+    <constant name="UX852FixCollarCable03ZRot" value="45.00*degree"/>
+    <constant name="UX852FixCollarCable03XRot" value="45.00*degree"/>
+    <constant name="UX852FixCollarCable03Lenght" value="2050.00*mm"/>
+    <constant name="UX852FixCollarCableTolerence" value="2.00*mm"/>
+
+    <!-- Forward cable attachements -->
+    <constant name="UX852FwdCableAttMainRad" value="9.00*mm"/>
+    <constant name="UX852FwdCableAttRingOuterRad" value="7.00*mm"/>
+    <constant name="UX852FwdCableAttMainLength" value="48.00*mm+UX852FwdCableAttRingOuterRad"/>
+    <constant name="UX852FwdCableAttRingInnerRad" value="2.50*mm"/>
+    <constant name="UX852FwdCableAttRingDeltaAng" value="200*degree"/>
+    <constant name="UX852FwdCableAttCut1SizeX" value="5.50*mm"/>
+    <constant name="UX852FwdCableAttCut1SizeY" value="2*UX852FwdCableAttMainRad"/>
+    <constant name="UX852FwdCableAttCut1SizeZ" value="13.00*mm+UX852FwdCableAttRingOuterRad"/>
+    <constant name="UX852FwdCableAttCut2SizeX" value="2.50*mm"/>
+    <constant name="UX852FwdCableAttCut2SizeY" value="2*UX852FwdCableAttMainRad"/>
+    <constant name="UX852FwdCableAttCut2SizeZ" value="10.00*mm"/>
+    <constant name="UX852FwdCableAttCut2posZ" value="23.00*mm"/>
+    <constant name="UX852FwdCableAttHoleRad" value="UX852FwdCableAttRingInnerRad"/>
+    <constant name="UX852FwdCableAttLongHoleRad" value="4.00*mm"/>
+    <constant name="UX852FwdCableAttLongHoleLength" value="27.00*mm"/>
+    <constant name="UX852FwdCableAttRpos" value="-UX852CollarAttMainHole1RadPos+UX852CollarAttMainPartRPos+0.5*UX852FwdCableAttMainLength*sin(UX852FixCollarCable03XRot) - 0.5*UX852CollarAttMainHole1Rad-0.5*UX852FwdCableAttRingOuterRad+1*mm"/>
+    <constant name="UX852FwdCableAttZpos" value="UX852CollarAttMainHole1ZPos+UX852FixCollarZpos+0.5*UX852FwdCableAttMainLength*cos(UX852FixCollarCable03XRot) - 0.5*UX852CollarAttMainHole1Rad-0.5*UX852FwdCableAttRingOuterRad+1*mm"/>
+
+    <!-- UX85-2 Fixed Point: Backward Cables, 3.0 mm diameter RPhiZ-->
+    <constant name="UX852FixCollarCable03PhiPos" value="UX852FixCollarCable03ZRot"/>
+    <constant name="UX852FixCollarCable03RPos" value="UX852FwdCableAttRpos+0.5*UX852FixCollarCable03Lenght*sin(UX852FixCollarCable03ZRot)+UX852FixCollarCableTolerence"/>
+    <constant name="UX852FixCollarCable03ZPos" value="UX852FwdCableAttZpos+0.5*UX852FixCollarCable03Lenght*cos(UX852FixCollarCable03ZRot)+UX852FixCollarCableTolerence"/>
+
+    <!-- UX85-2 Fixed Point: Forward Rods, 8.0 mm poisition-->
+    <constant name="UX852FixCollarCable08Radius" value="4.00*mm"/>
+    <constant name="UX852FixCollarCable08Lenght" value="2418.00*mm"/>
+    <constant name="UX852FixCollarCable08XRot" value="67.5*degree"/>
+    <constant name="UX852FixCollarCable08ZRot" value="45.00*degree"/>
+
+     <!-- UX85-2 Fixed Point: Forward Cables, 4.0 mm diameter poisition-->
+    <constant name="UX852FixCollarCable04Radius" value="2.00*mm"/>
+    <constant name="UX852FixCollarCable04Lenght" value="1440.00*mm"/>
+    <constant name="UX852FixCollarCable04XRot" value="45.00*degree"/>
+    <constant name="UX852FixCollarCable04ZRot" value="45.00*degree"/>
+
+    <!-- Backward cable attachements -->
+    <constant name="UX852BckCableAttMainRad" value="9.00*mm"/>
+    <constant name="UX852BckCableAttRingOuterRad" value="7.50*mm"/>
+    <constant name="UX852BckCableAttMainLength" value="48.00*mm+UX852BckCableAttRingOuterRad"/>
+    <constant name="UX852BckCableAttRingInnerRad" value="3.00*mm"/>
+    <constant name="UX852BckCableAttRingDeltaAng" value="200*degree"/>
+    <constant name="UX852BckCableAttCut1SizeX" value="5.50*mm"/>
+    <constant name="UX852BckCableAttCut1SizeY" value="2*UX852BckCableAttMainRad"/>
+    <constant name="UX852BckCableAttCut1SizeZ" value="14.00*mm+UX852BckCableAttRingOuterRad"/>
+    <constant name="UX852BckCableAttCut2SizeX" value="2.50*mm"/>
+    <constant name="UX852BckCableAttCut2SizeY" value="2*UX852BckCableAttMainRad"/>
+    <constant name="UX852BckCableAttCut2SizeZ" value="10.00*mm"/>
+    <constant name="UX852BckCableAttCut2posZ" value="22.00*mm"/>
+    <constant name="UX852BckCableAttHoleRad" value="UX852BckCableAttRingInnerRad"/>
+    <constant name="UX852BckCableAttLongHoleRad" value="4.00*mm"/>
+    <constant name="UX852BckCableAttLongHoleLength" value="27.00*mm"/>
+    <constant name="UX852BckCableAtt08Rpos" value="UX852CollarAttMainHole2RadPos+UX852CollarAttMainPartRPos+0.5*UX852FwdCableAttMainLength*sin(UX852FixCollarCable08XRot) - 0.5*UX852CollarAttMainHole2Rad-0.5*UX852BckCableAttRingOuterRad-1*mm"/>
+    <constant name="UX852BckCableAtt08Zpos" value="UX852CollarAttMainHole2ZPos+UX852FixCollarZpos-0.5*UX852FwdCableAttMainLength*cos(UX852FixCollarCable08XRot) + 0.5*UX852CollarAttMainHole2Rad+0.5*UX852BckCableAttRingOuterRad-3*mm"/>
+    <constant name="UX852BckCableAtt04Rpos" value="UX852CollarAttMainHole2RadPos+UX852CollarAttMainPartRPos+0.5*UX852FwdCableAttMainLength*sin(UX852FixCollarCable04XRot) - 0.5*UX852CollarAttMainHole2Rad-0.5*UX852BckCableAttRingOuterRad-1*mm"/>
+    <constant name="UX852BckCableAtt04Zpos" value="UX852CollarAttMainHole2ZPos+UX852FixCollarZpos-0.5*UX852FwdCableAttMainLength*cos(UX852FixCollarCable04XRot) + 0.5*UX852CollarAttMainHole2Rad+0.5*UX852BckCableAttRingOuterRad-3*mm"/>
+
+     <!-- UX85-2 Fixed Point: Forward Rods, 8.0 mm RPhiZ-->
+    <constant name="UX852FixCollarCable08RPos" value="UX852BckCableAtt08Rpos+0.5*UX852FixCollarCable08Lenght*sin(UX852FixCollarCable08XRot)+UX852FixCollarCableTolerence"/>
+    <constant name="UX852FixCollarCable08ZPos" value="UX852BckCableAtt08Zpos-0.5*UX852FixCollarCable08Lenght*cos(UX852FixCollarCable08XRot)-UX852FixCollarCableTolerence"/>
+    <constant name="UX852FixCollarCable08PhiPos" value="UX852FixCollarCable08ZRot"/>
+
+     <!-- UX85-2 Fixed Point: Forward Cables, 4.0 mm diameter RPhiZ-->
+    <constant name="UX852FixCollarCable04PhiPos" value="UX852FixCollarCable04ZRot"/>
+    <constant name="UX852FixCollarCable04RPos" value="UX852BckCableAtt04Rpos+0.5*UX852FixCollarCable04Lenght*sin(UX852FixCollarCable04XRot)+UX852FixCollarCableTolerence"/>
+    <constant name="UX852FixCollarCable04ZPos" value="UX852BckCableAtt04Zpos-0.5*UX852FixCollarCable04Lenght*cos(UX852FixCollarCable04XRot)-UX852FixCollarCableTolerence"/>
+
+    <!-- Forward rod Modified in June 2015 from LHCBVC8B-167-B -->
+    <constant name="UX852FwdCableAttRodRad" value="5.00*mm"/>
+    <constant name="UX852FwdCableAttRodLength" value="28.10*mm"/>
+    <constant name="UX852FwdCableAttRodCutRad" value="4.80*mm"/>
+    <constant name="UX852FwdCableAttRodCutLength" value="1.10*mm"/>
+    <constant name="UX852FwdCableAttRodCutZpos" value="3.60*mm"/>
+    <constant name="UX852FwdCableAttRodInnerHoleRad" value="4.0*mm"/>
+    <constant name="UX852FwdCableAttRodHeadLength" value="1.5*mm"/>
+    <constant name="UX852FwdCableAttRodHeadRad" value="6.5*mm"/>
+    <constant name="UX852FwdCableAttRodManPartLargeLength" value="50.0*mm"/>
+    <constant name="UX852FwdCableAttRodManPartPosZ" value="-0.5*UX852FwdCableAttRodLength+0.5*UX852FwdCableAttRodManPartLargeLength+UX852FwdCableAttRodHeadLength"/>
+    <constant name="UX852FwdCableAttRodZpos" value="UX852CollarAttMainHole1ZPos+UX852FixCollarZpos"/>
+    <constant name="UX852FwdCableAttRodRpos" value="-UX852CollarAttMainHole1RadPos+UX852CollarAttMainPartRPos"/>
+
+    <!-- Backward rod Modified in June 2015 from LHCVC8B-164-B -->
+    <constant name="UX852BckCableAttRodRad" value="4.00*mm"/>
+    <constant name="UX852BckCableAttRodLength" value="28.10*mm"/>
+    <constant name="UX852BckCableAttRodCutRad" value="3.8*mm"/>
+    <constant name="UX852BckCableAttRodCutLength" value="1.10*mm"/>
+    <constant name="UX852BckCableAttRodCutZpos" value="3.60*mm"/>
+    <constant name="UX852BckCableAttRodInnerHoleRad" value="2.0*mm"/>
+    <constant name="UX852BckCableAttRodHeadLength" value="1.5*mm"/>
+    <constant name="UX852BckCableAttRodHeadRad" value="5.5*mm"/>
+    <constant name="UX852BckCableAttRodManPartLargeLength" value="50.0*mm"/>
+    <constant name="UX852BckCableAttRodManPartPosZ" value="-0.5*UX852BckCableAttRodLength+0.5*UX852BckCableAttRodManPartLargeLength+UX852BckCableAttRodHeadLength"/>
+    <constant name="UX852BckCableAttRodZpos" value="UX852CollarAttMainHole2ZPos+UX852FixCollarZpos"/>
+    <constant name="UX852BckCableAttRodRpos" value="UX852CollarAttMainHole2RadPos+UX852CollarAttMainPartRPos"/>
+
+    <!-- Backward rod at the prongs of the collar fork attach Modified in June 2015 from LHCVC8B-164-C -->
+    <constant name="UX852BckFACableAttRodRad" value="4.00*mm"/>
+    <constant name="UX852BckFACableAttRodLength" value="30.10*mm"/>
+    <constant name="UX852BckFACableAttRodCutRad" value="3.8*mm"/>
+    <constant name="UX852BckFACableAttRodCutLength" value="1.10*mm"/>
+    <constant name="UX852BckFACableAttRodCutZpos" value="3.60*mm"/>
+    <constant name="UX852BckFACableAttRodInnerHoleRad" value="2.0*mm"/>
+    <constant name="UX852BckFACableAttRodHeadLength" value="1.5*mm"/>
+    <constant name="UX852BckFACableAttRodHeadRad" value="5.5*mm"/>
+    <constant name="UX852BckFACableAttRodManPartLargeLength" value="50.0*mm"/>
+    <constant name="UX852BckFACableAttRodManPartPosZ" value="-0.5*UX852BckFACableAttRodLength+0.5*UX852BckFACableAttRodManPartLargeLength+UX852BckFACableAttRodHeadLength"/>
+
+    <!-- Begin Beampipe cable support modifications in Magnet from 2015 -->
+    <!-- The cable attachment to the collar is from the edms drawing in lhcvc8b_0194_v0 and lhcbvc0177_v0 Each of the two prongs for this CollarForkAttach are
+     setp as cylinder-box, trapizoid and a box .
+     The central part is setup as a trap-trap-(cylinder-cylinder) - cylinder(for the hole) -->
+    <!-- UX85-2 Collar attachment for cables - New from June 2015 -->
+    <!-- Now for the collar attachment in the shape of a two pronged fork near the beampipe in the magnet -->
+    <constant name="UX852CollarForkAttachProngOuterRadius" value="10.0*mm"/>
+    <constant name="UX852CollarForkAttachProngRadiusTolerence" value="0.2*mm"/>
+
+    <constant name="UX852CollarForkAttachProngInnerRadius" value="4.0*mm+UX852CollarForkAttachProngRadiusTolerence"/>
+    <constant name="UX852CollarForkAttachProngThickness" value="5.0*mm"/>
+    <constant name="UX852CollarForkAttachProngSubBoxLargeXSize" value="200.*mm"/>
+    <constant name="UX852CollarForkAttachProngSubBoxLargeYSize" value="200.*mm"/>
+    <constant name="UX852CollarForkAttachProngSubBoxLargeZSize" value="200.*mm"/>
+    <constant name="UX852CollarForkAttachProngSubBoxShiftLocalY" value="4.2*mm"/>
+    <constant name="UX852CollarForkAttachProngSubBoxShiftY" value="-UX852CollarForkAttachProngSubBoxShiftLocalY - 0.5*UX852CollarForkAttachProngSubBoxLargeYSize"/>
+    <constant name="UX852CollarForkAttachProngShiftZ" value="7.0*mm + 0.5*UX852CollarForkAttachProngThickness"/>
+    <constant name="UX852CollarForkAttachProngUpsPosZ" value="-1.0*UX852CollarForkAttachProngShiftZ"/>
+    <constant name="UX852CollarForkAttachProngDnsPosZ" value="UX852CollarForkAttachProngShiftZ"/>
+    <constant name="UX852CollarForkAttachProngTrapX1Size" value="8.0*mm"/>
+    <constant name="UX852CollarForkAttachProngTrapY1Size" value="UX852CollarForkAttachProngThickness"/>
+    <constant name="UX852CollarForkAttachProngTrapX2Size" value="18.0*mm"/>
+    <constant name="UX852CollarForkAttachProngTrapY2Size" value="UX852CollarForkAttachProngThickness"/>
+    <constant name="UX852CollarForkAttachProngTrapZSize" value="12.24*mm"/>
+    <constant name="UX852CollarForkAttachProngTrapRotX" value="(-1.0*pi/2.0)*rad"/>
+    <constant name="UX852CollarForkAttachProngTrapPosY" value="-1.0*(UX852CollarForkAttachProngSubBoxShiftLocalY+0.5*UX852CollarForkAttachProngTrapZSize)"/>
+    <constant name="UX852CollarForkAttachProngTrapUpsPosZ" value="UX852CollarForkAttachProngUpsPosZ"/>
+    <constant name="UX852CollarForkAttachProngTrapDnsPosZ" value="UX852CollarForkAttachProngDnsPosZ"/>
+
+    <constant name="UX852CollarForkAttachProngBoxXSize" value="UX852CollarForkAttachProngTrapX1Size"/>
+    <constant name="UX852CollarForkAttachProngBoxZSize" value="UX852CollarForkAttachProngThickness"/>
+    <constant name="UX852CollarForkAttachProngBoxYSize" value="5.0*mm"/>
+    <constant name="UX852CollarForkAttachProngBoxYPos" value="UX852CollarForkAttachProngTrapPosY-0.5*(UX852CollarForkAttachProngTrapZSize+UX852CollarForkAttachProngBoxYSize-0.1*mm)"/>
+    <constant name="UX852CollarForkAttachProngBoxUpsPosZ" value="UX852CollarForkAttachProngUpsPosZ"/>
+    <constant name="UX852CollarForkAttachProngBoxDnsPosZ" value="UX852CollarForkAttachProngDnsPosZ"/>
+
+    <constant name="UX852CollarForkAttachStemTrapX1Size" value="13.5*mm"/>
+    <constant name="UX852CollarForkAttachStemTrapX2Size" value="24.0*mm"/>
+    <constant name="UX852CollarForkAttachStemTrapY1Size" value="UX852CollarForkAttachProngTrapX1Size"/>
+    <constant name="UX852CollarForkAttachStemTrapY2Size" value="UX852CollarForkAttachProngTrapX1Size"/>
+    <constant name="UX852CollarForkAttachStemTrapZSize" value="24.56*mm"/>
+    <constant name="UX852CollarForkAttachStemLargeCylRadius" value="50.0*mm"/>
+    <constant name="UX852CollarForkAttachStemLargeCylZSize" value="50.0*mm"/>
+
+    <constant name="UX852CollarForkAttachStemCylStartPhi" value="pi*(1.0+ ((18.0/2.0)/180.0) )*rad"/>
+    <constant name="UX852CollarForkAttachStemCylDeltaPhi" value="pi*(1.0- (18.0/180.0) )*rad"/>
+
+    <constant name="UX852CollarForkAttachStemCylRadius" value="9.0*mm"/>
+    <constant name="UX852CollarForkAttachStemCylZSize" value="UX852CollarForkAttachProngTrapX1Size"/>
+    <constant name="UX852CollarForkAttachStemCylCenterZFromTrapCenter" value="-0.5*UX852CollarForkAttachStemTrapZSize + UX852CollarForkAttachStemCylRadius+2.0*mm "/>
+    <constant name="UX852CollarForkAttachStemCylRotX" value="(pi/2)*rad"/>
+    <constant name="UX852CollarForkAttachStemHoleRadiusTolerence" value="0.3*mm"/>
+    <constant name="UX852CollarForkAttachStemHoleRadius" value="4.0*mm+UX852CollarForkAttachStemHoleRadiusTolerence"/>
+    <constant name="UX852CollarForkAttachStemHoleLargeZSize" value="50.0*mm"/>
+    <constant name="UX852CollarForkStemTrdholeX1Size" value="8.0*mm"/>
+    <constant name="UX852CollarForkStemTrdholeX2Size" value="115.0*mm"/>
+    <constant name="UX852CollarForkStemTrdholeY1LargeSize" value="100.0*mm"/>
+    <constant name="UX852CollarForkStemTrdholeY2LargeSize" value="100.0*mm"/>
+    <constant name="UX852CollarForkStemTrdholeLargeZSize" value="100.0*mm"/>
+    <constant name="UX852CollarForkStemTrdholeZPos" value="UX852CollarForkAttachStemCylCenterZFromTrapCenter+8.0*mm+0.5*UX852CollarForkStemTrdholeLargeZSize"/>
+    <constant name="UX852CollarForkStemRotX" value="-(pi/2.0)*rad"/>
+    <constant name="UX852CollarForkStemRotY" value="(pi/2.0)*rad"/>
+    <constant name="UX852CollarForkStemPosY" value="-35.0*mm-UX852CollarForkAttachStemCylCenterZFromTrapCenter"/>
+    <constant name="UX852CollarForkAttachLengthProtrusion" value="35.0*mm"/>
+
+    <!--  Now for the Cable head near the beam pipe -->
+    <!--  Using dimensions from Document with label "S2F Collar -1_HMC" and ID  8045A-13-C-SF2-1 and filename Assembly_S2F_1. Similar document  Assembly_S2F_2 for the second cable   -->
+    <constant name="UX852CableHeadOuterRadius" value="(28.5/2.0)*mm"/>
+    <constant name="UX852CableHeadInnerRadiusTolerence" value="0.2*mm"/>
+    <constant name="UX852CableHeadInnerRadius" value="(12/2.0)*mm +UX852CableHeadInnerRadiusTolerence"/>
+    <constant name="UX852CableHeadSphereRadius" value="9.4*mm"/>
+    <constant name="UX852CableHeadOuterPartInnerRadius" value="UX852CableHeadSphereRadius+0.2*mm"/>
+    <constant name="UX852CableHeadHoleLargeZSize" value="100.0*mm"/>
+
+    <constant name="UX852CableHeadOuterHoleOuterRadius" value="UX852CableHeadOuterRadius-1.5*mm"/>
+    <constant name="UX852CableHeadOuterHoleBeginPhi" value="60*degree"/>
+    <constant name="UX852CableHeadOuterHoleDeltaPhi" value="60*degree"/>
+
+    <constant name="UX852CableHeadBasicThickness" value="11.5*mm"/>
+
+    <constant name="UX852CableHeadCentralPinRadius" value="3.8*mm"/>
+    <constant name="UX852CableHeadCentralPinThickness" value="19.0*mm"/>
+
+    <constant name="UX852CableHeadDemiCableRadius" value="1.5*mm"/>
+    <constant name="UX852CableHeadDemiCableLength" value="50.0*mm"/>
+    <constant name="UX852CableHeadDemiCableTiltAngle" value="0.22*rad"/>
+    <constant name="UX852CableHeadDemiCableSubBoxLargeXSize" value="100*mm"/>
+    <constant name="UX852CableHeadDemiCableSubBoxLargeYSize" value="100*mm"/>
+    <constant name="UX852CableHeadDemiCableSubBoxLargeZSize" value="100*mm"/>
+    <constant name="UX852CableHeadDemiCableSubBoxTilt" value="3.0*UX852CableHeadDemiCableTiltAngle"/>
+    <constant name="UX852CableHeadDemiCableSubBoxPosZ" value="-0.5*(UX852CableHeadDemiCableSubBoxLargeZSize+UX852CableHeadDemiCableLength)+2.2*mm"/>
+    <constant name="UX852CableHeadDemiCableSubBoxFarEndPosZ" value="0.5*(UX852CableHeadDemiCableSubBoxLargeZSize+UX852CableHeadDemiCableLength)+12.0*mm"/>
+    <constant name="UX852CableHeadDemiCablePosY" value="0.4*UX852CableHeadDemiCableLength"/>
+    <constant name="UX852CableHeadDemiCableSideARotX" value="-(pi/2.0)*rad"/>
+    <constant name="UX852CableHeadDemiCableSideAPosX" value="0.5*UX852CableHeadDemiCableLength*sin(UX852CableHeadDemiCableTiltAngle)+UX852CableHeadDemiCableRadius*1.5"/>
+    <constant name="UX852CableHeadDemiCableSideBRotX" value="UX852CableHeadDemiCableSideARotX"/>
+    <constant name="UX852CableHeadDemiCableSideBPosX" value="-1.0*UX852CableHeadDemiCableSideAPosX"/>
+
+    <constant name="UX852CableHeadLengthReductionValue" value="2.0*UX852CableHeadDemiCableLength*cos(UX852CableHeadDemiCableTiltAngle)"/>
+    <constant name="UX852CableHeadLengthReductionValueTolerence" value="4.0*mm"/>
+
+    <!-- Begin Technora CableHead from June 2015 -->
+    <constant name="UX852TechnoraCableHeadTypeAOuterRadius" value="(17.5/2.0)*mm"/>
+    <constant name="UX853TechnoraCableHeadTypeBOuterRadius" value="(16.0/2.0)*mm"/>
+
+    <constant name="UX852TechnoraCableHeadInnerRadiusTolerence" value="0.2*mm"/>
+    <constant name="UX852TechnoraCableHeadInnerRadius" value="(10.0/2.0)*mm+UX852TechnoraCableHeadInnerRadiusTolerence"/>
+    <constant name="UX852TechnoraCableHeadThickness" value="10.8*mm"/>
+    <constant name="UX852TechnoraCableHeadDemiCableLength" value="16*mm"/>
+    <constant name="UX852TechnoraCableHeadDemiCableRadius" value="2.5*mm"/>
+    <constant name="UX852TechnoraCableHeadDemiCableLengthTolerence" value="0.3*mm"/>
+    <constant name="UX852TechnoraCableHeadDemiCableRadiusTolerence" value="0.15*mm"/>
+    <constant name="UX852TechnoraCableHeadDemiCableSidePosY" value="UX852TechnoraCableHeadTypeAOuterRadius+0.5*UX852TechnoraCableHeadDemiCableLength+UX852TechnoraCableHeadDemiCableLengthTolerence"/>
+    <constant name="UX852TechnoraCableHeadDemiCableSideAPosX" value="-UX852TechnoraCableHeadDemiCableRadius-UX852TechnoraCableHeadDemiCableRadiusTolerence"/>
+    <constant name="UX852TechnoraCableHeadDemiCableSideBPosX" value="-1.0*UX852TechnoraCableHeadDemiCableSideAPosX"/>
+    <constant name="UX852TechnoraCableHeadDemiCableRotX" value="(pi/2.0)*rad"/>
+
+    <constant name="UX852TechnoraCableHeadLengthReductionValue" value="2.0*(UX852TechnoraCableHeadDemiCableLength+ UX852TechnoraCableHeadTypeAOuterRadius+UX852TechnoraCableHeadDemiCableLengthTolerence)"/>
+    <constant name="UX852TechnoraCableHeadLengthReductionValueTolerence" value="1.0*mm"/>
+
+    <!-- End Technora Cable Head from June 2015 -->
+
+    <!-- Begin FutureFibre cables from June 2015 -->
+
+    <!-- UX85-2 Fixed Point: FutureFibre Backward Cables, 6.8 mm diameter-->
+    <constant name="UX852FutureFibreCable03Radius" value="2.25*mm"/>
+    <constant name="UX852FutureFibreCable03ZRot" value="45.00*degree"/>
+    <constant name="UX852FutureFibreCable03XRot" value="67.50*degree"/>
+    <constant name="UX852FutureFibreCable03Length" value="1290.0*mm"/>
+
+    <constant name="UX852FutureFibreCable03ReducedLength" value="UX852FutureFibreCable03Length - UX852CableHeadLengthReductionValue"/>
+    <constant name="UX852FutureFibreCableTolerence" value="1.00*mm"/>
+
+    <constant name="UX852FutureFibreCable03PhiPos" value="UX852FutureFibreCable03ZRot"/>
+
+    <constant name="UX852BckCollarForkAttachRpos" value="UX852CollarAttMainHole2RadPos+UX852CollarAttMainPartRPos+ UX852CollarForkAttachLengthProtrusion*sin(UX852FutureFibreCable03XRot)"/>
+    <constant name="UX852BckCollarForkAttachZpos" value="UX852CollarAttMainHole2ZPos+UX852FixCollarZpos-UX852CollarForkAttachLengthProtrusion*cos(UX852FutureFibreCable03XRot)"/>
+    <constant name="UX852FutureFibreCable03RPos" value="UX852BckCollarForkAttachRpos+(0.5*UX852FutureFibreCable03Length-UX852CableHeadLengthReductionValueTolerence)*sin(UX852FutureFibreCable03XRot)+UX852FutureFibreCableTolerence-2.0*mm"/>
+    <constant name="UX852FutureFibreCable03ZPos" value="UX852BckCollarForkAttachZpos-(0.5*UX852FutureFibreCable03Length-UX852CableHeadLengthReductionValueTolerence)*cos(UX852FutureFibreCable03XRot)+UX852FutureFibreCableTolerence"/>
+    <constant name="UX852FutureFibreCable03PhiPosTolerence" value="-0.01*degree"/>
+
+    <!-- UX85-2 Fixed Point: Technora Forward Cables, 4.5 mm diameter-->
+
+    <constant name="UX852TechnoraCable04Radius" value="2.25*mm"/>
+    <constant name="UX852TechnoraCable04Length" value="3360.00*mm"/>
+
+    <constant name="UX852TechnoraCable04XRot" value="45.00*degree"/>
+    <constant name="UX852TechnoraCable04ZRot" value="UX852FixCollarZrot"/>
+    <constant name="UX852TechnoraCable04ReducedLength" value="UX852TechnoraCable04Length - UX852TechnoraCableHeadLengthReductionValue"/>
+    <constant name="UX852TechnoraCableTolerence" value="1.00*mm"/>
+
+    <constant name="UX852TechnoraCable04RShift" value="-UX852CollarAttMainHole1RadPos+UX852CollarAttMainPartRPos"/>
+    <constant name="UX852TechnoraCable04ZShift" value="UX852CollarAttMainHole1ZPos+UX852FixCollarZpos"/>
+    <constant name="UX852FwdTechnoraCableHeadPhiPos" value="UX852FixCollarZrot-0.05*degree"/>
+    <constant name="UX852TechnoraCableHeadPhiPosTolerence" value="-0.025*degree"/>
+
+    <constant name="UX852TechnoraCable04PhiPos" value="UX852TechnoraCable04ZRot"/>
+    <constant name="UX852TechnoraCable04PhiPosTolerence" value="-0.01*degree"/>
+    <constant name="UX852TechnoraCable04RPos" value="UX852TechnoraCable04RShift+(0.5*UX852TechnoraCable04Length-UX852TechnoraCableHeadLengthReductionValueTolerence)*sin(UX852TechnoraCable04XRot)+UX852TechnoraCableTolerence"/>
+    <constant name="UX852TechnoraCable04ZPos" value="UX852TechnoraCable04ZShift+(0.5*UX852TechnoraCable04Length-UX852TechnoraCableHeadLengthReductionValueTolerence)*cos(UX852TechnoraCable04XRot)+UX852TechnoraCableTolerence"/>
+
+    <!-- UX85-3 Fixed Point: FutureFibre Backward Vertical Cable, 6.8 mm diameter-->
+    <constant name="UX853FutureFibreCable05Radius" value="3.4*mm"/>
+    <constant name="UX853FutureFibreCable05Length" value="2590.0*mm"/>
+    <constant name="UX853FutureFibreCable05ReducedLength" value="UX853FutureFibreCable05Length - UX852CableHeadLengthReductionValue"/>
+
+    <!-- UX85-3 Fixed Point: FutureFibre Backward Horizontal Cable, 6.8 mm diameter-->
+    <constant name="UX853FutureFibreCable06Radius" value="3.4*mm"/>
+    <constant name="UX853FutureFibreCable06Length" value="1710.0*mm"/>
+    <constant name="UX853FutureFibreCable06ReducedLength" value="UX853FutureFibreCable06Length - UX852CableHeadLengthReductionValue"/>
+
+    <!-- UX85-3 Fixed Point: Technora Forward Vertical Cable, 4.5 mm diameter-->
+    <constant name="UX853TechnoraCable07Radius" value="2.25*mm"/>
+    <constant name="UX853TechnoraCable07Length" value="2080.0*mm"/>
+    <constant name="UX853TechnoraCable07ReducedLength" value="UX853TechnoraCable07Length - UX852TechnoraCableHeadLengthReductionValue"/>
+
+    <!-- UX85-3 Fixed Point: Technora Forward Horizontal Cable, 4.5 mm diameter-->
+    <constant name="UX853TechnoraCable08Radius" value="2.25*mm"/>
+    <constant name="UX853TechnoraCable08Length" value="1690.0*mm"/>
+    <constant name="UX853TechnoraCable08ReducedLength" value="UX853TechnoraCable08Length - UX852TechnoraCableHeadLengthReductionValue"/>
+
+    <!-- Now to position the cable heads for the Future fibre cable -->
+    <constant name="UX852CableHeadHRotX" value="(pi/2)*rad"/>
+
+    <constant name="UX852FwdCableHeadMagnetFaceRpos" value="UX852TechnoraCable04RPos+ (0.5*UX852TechnoraCable04Length-UX852CableHeadLengthReductionValueTolerence+4.5*mm)*sin(UX852TechnoraCable04XRot)"/>
+    <constant name="UX852FwdCableHeadMagnetFaceZpos" value="UX852TechnoraCable04ZPos+ (0.5*UX852TechnoraCable04Length-UX852CableHeadLengthReductionValueTolerence+4.5*mm)*cos(UX852TechnoraCable04XRot) "/>
+    <constant name="UX852FwdCableHeadMagnetFacePhiPos" value="UX852FixCollarZrot-0.05*degree"/>
+
+    <constant name="UX852FutureFibreCableHeadCommonRotZ" value="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 40.2*degree"/>
+    <constant name="UX852TechnoraCableHeadCommonRotZ" value="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 40.2*degree"/>
+
+    <constant name="UX852TechnoraCableHeadCommonRotZWithTolerence" value="UX852TechnoraCableHeadCommonRotZ + 1.2*degree"/>
+    <constant name="UX852FutureFibreCableHeadCommonRotZWithBckTolerence" value="UX852FutureFibreCableHeadCommonRotZ+2.7*degree"/>
+
+    <constant name="UX852FutureFibreCableHeadPhiPosTolerence" value="-0.025*degree"/>
+
+    <constant name="UX852BckCollarForkAttachPhiPos" value="UX852FixCollarZrot-0.05*degree"/>
+    <constant name="UX852BckCollarForkAttachRotX" value="(pi/2)*rad"/>
+
+    <constant name="UX852BckCollarForkAttachMagnetFaceRpos" value="UX852FutureFibreCable03RPos+ (0.5*UX852FutureFibreCable03Length-UX852CableHeadLengthReductionValueTolerence+1.0*mm)*sin(UX852FutureFibreCable03XRot)"/>
+    <constant name="UX852BckCollarForkAttachMagnetFaceZpos" value="UX852FutureFibreCable03ZPos- (0.5*UX852FutureFibreCable03Length-UX852CableHeadLengthReductionValueTolerence)*cos(UX852FutureFibreCable03XRot) "/>
+    <constant name="UX852BckCollarForkAttachMagnetFacePhiPos" value="UX852FixCollarZrot-0.05*degree"/>
+
+    <!-- End FutureFibre cables from June 2015 -->
+
+    <!-- End Beampipe cable support modifications in Magnet from June 2015 -->
+
+    <!-- ***************************************************************** -->
+    <!-- * UX85-3 Fixed Point                                            * -->
+    <!-- ***************************************************************** -->
+    <!-- UX85-3 Fixed Point: Collar before/after rib and around -->
+
+    <constant name="UX853FixCollarLenght" value="40.00*mm"/>
+    <constant name="UX853FixCollarRibLenght" value="8.00*mm"/>
+    <constant name="UX853FixCollarBeforeRibLenght" value="0.5*(UX853FixCollarLenght - UX853FixCollarRibLenght)"/>
+    <constant name="UX853FixCollarInnerRadius" value="35.5*mm"/>
+    <constant name="UX853FixCollarRibInnerRadius" value="81.30*mm"/>
+    <constant name="UX853FixCollarOuterRadius" value="133.00*mm"/>
+    <constant name="UX853FixCollarZpos" value="7150.00*mm - 0.5*Regions:BeforeMagnetZSize"/>
+
+    <!-- Inner ring -->
+    <constant name="UX853FixCollarRingInnerRad" value="90.50*mm"/>
+    <constant name="UX853FixCollarRingOuterRad" value="93.50*mm"/>
+    <constant name="UX853FixCollarInnerRad" value="UX853FixCollarRingOuterRad"/>
+    <constant name="UX853FixCollarRingLength" value="12.00*mm"/>
+
+    <!-- Big ring -->
+    <constant name="UX853FixCollarOuterRad" value="103.00*mm"/>
+    <constant name="UX853FixCollarAttOuterRad" value="119.50*mm"/>
+    <constant name="UX853FixCollarLength" value="25.00*mm"/>
+    <constant name="UX853FixCollarQuarterRot" value="90*degree"/>
+    <constant name="UX853FixCollarDeltaPhi" value="90*degree"/>
+    <constant name="UX853FixCollarPhiStart" value="(90-34)*degree"/>
+
+    <!--Big Ring Cuts -->
+    <constant name="UX853FixCollarCircleCutDeltaPhi" value="50*degree"/>
+    <constant name="UX853BigRingQuarterSlope2Phipos" value="UX853FixCollarPhiStart + UX853FixCollarDeltaPhi - 0.75*UX853FixCollarCircleCutDeltaPhi-5*degree"/>
+    <constant name="UX853BigRingQuarterSlopePhipos" value="UX853FixCollarPhiStart+0.25*UX853FixCollarCircleCutDeltaPhi"/>
+    <constant name="UX853BigRingQuarterSlopeZrot" value="130*degree"/>
+    <constant name="UX853BigRingQuarterSlopeXsize" value="30*mm"/>
+    <constant name="UX853BigRingQuarterSlopeYsize" value="50*mm"/>
+
+    <!-- Big transverse holes in it -->
+    <constant name="UX853FixCollarTransHoleRad" value="5.00*mm"/>
+    <constant name="UX853FixCollarTransHoleLength" value="0.5*(UX853FixCollarOuterRad-UX853FixCollarInnerRad)"/>
+    <constant name="UX853FixCollarTransHoleRpos" value="UX853FixCollarOuterRad-0.5*UX853FixCollarTransHoleLength"/>
+    <constant name="UX853FixCollarTransHolePhipos" value="UX853FixCollarPhiStart+34*degree+45*degree"/>
+
+    <!-- Collar clips -->
+    <!--begin to remove in future -->
+    <constant name="UX853CollarClipDeltaPhi" value="120.00*degree - 0.20*degree"/>
+    <constant name="UX853CollarGapDeltaPhi" value="0.20*degree"/>
+    <!-- end to remove in fuutre -->
+
+    <constant name="UX853CollarClipSFDeltaPhi" value="120.00*degree"/>
+    <constant name="UX853CollarGapSFDeltaPhi" value="0.20*degree"/>
+    <constant name="UX853CollarClipSFStartPhi" value="-0.5*UX853CollarClipSFDeltaPhi+ 0.5*UX853CollarGapSFDeltaPhi"/>
+
+    <constant name="UX853CollarClipHoleRing12TotalLength" value="14.5*mm"/>
+
+    <!-- Ring one -->
+    <constant name="UX853CollarClipRing1Length" value="2.90*mm"/>
+    <constant name="UX853CollarClipRing1InnerRad" value="80.30*mm"/>
+    <constant name="UX853CollarClipRing1OuterRad" value="90.50*mm"/>
+
+    <!-- Ring two -->
+    <constant name="UX853CollarClipRing2Length" value="UX853CollarClipHoleRing12TotalLength - UX853CollarClipRing1Length"/>
+    <constant name="UX853CollarClipRing2InnerRad" value="75.30*mm"/>
+    <constant name="UX853CollarClipRing2OuterRad" value="93.50*mm"/>
+
+    <!-- Holes -->
+    <constant name="UX853CollarClipHolesLength" value="17.00*mm"/>
+    <constant name="UX853CollarClipHolesRad" value="2.25*mm"/>
+    <constant name="UX853CollarClipHolesRpos" value="86.00*mm"/>
+    <constant name="UX853CollarClipHolesDeltaPhiSF" value="30*degree"/>
+    <constant name="UX853CollarClipHoleDoubleRingTotalLength" value="2*UX853CollarClipHoleRing12TotalLength"/>
+
+    <!-- The following in June2015 from type M6 in iso4762 -->
+    <constant name="UX853CollarClipHoleScrewHeadLength" value="4.0*mm"/>
+    <constant name="UX853CollarClipHoleScrewLengthTolerence" value="0.2*mm"/>
+    <constant name="UX853CollarClipHoleScrewLength" value="37.5*mm"/>
+    <constant name="UX853CollarClipHoleScrewRad" value="1.5*mm"/>
+    <constant name="UX853CollarClipHoleScrewHeadRad" value="3.5*mm"/>
+    <constant name="UX853CollarClipHoleScrewSubLargeLength" value="50.0*mm"/>
+    <constant name="UX853CollarClipHoleScrewSubLargeRadius" value="10.0*mm"/>
+    <constant name="UX853CollarClipHoleScrewSubPosZ" value="0.5*(UX853CollarClipHoleScrewSubLargeLength-UX853CollarClipHoleScrewLength) + UX853CollarClipHoleScrewHeadLength "/>
+    <constant name="UX853CollarClipHoleScrewPosZ" value="0.5*UX853CollarClipHoleScrewLength-0.5*UX853CollarClipHoleDoubleRingTotalLength-UX853CollarClipHoleScrewHeadLength-UX853CollarClipHoleScrewLengthTolerence"/>
+
+    <!-- Cable Attachments -->
+    <!-- Collar part -->
+
+    <!--Rounded edges -->
+    <constant name="UX853CollarAttMainPartEdge1InnerRad" value="12.0*mm"/>
+    <constant name="UX853CollarAttMainPartEdge1DeltaPhi" value="90*degree"/>
+    <constant name="UX853CollarAttMainPartEdge1StartPhi" value="270*degree"/>
+    <constant name="UX853CollarAttMainPartEdge2InnerRad" value="10.0*mm"/>
+    <constant name="UX853CollarAttMainPartEdge2StartPhi" value="45*degree"/>
+    <constant name="UX853CollarAttMainPartEdge2DeltaPhi" value="90*degree"/>
+    <constant name="UX853CollarAttMainPartEdge2bStartPhi" value="0*degree"/>
+    <constant name="UX853CollarAttMainPartEdge2bDeltaPhi" value="45*degree"/>
+
+    <constant name="UX853CollarAttMainPartXsize" value="40.0*mm"/>
+    <constant name="UX853CollarAttMainPartYsize" value="52.0*mm"/>
+    <constant name="UX853CollarAttMainPartZsize" value="8.0*mm"/>
+    <constant name="UX853CollarAttMainPartRPos" value="97*mm+0.5*UX853CollarAttMainPartXsize"/>
+    <constant name="UX853CollarAttMainPartZPos" value="UX853FixCollarZpos - 0.5*UX853CollarAttMainPartYsize + 0.5*UX853FixCollarLength + UX853CollarAttMainPartEdge2InnerRad-1.5*mm"/>
+    <constant name="UX853CollarAttMainPartPhiShift" value="5.5*degree"/>
+
+    <!--Holes -->
+    <constant name="UX853CollarAttMainHoleRadTolerence" value="0.2*mm"/>
+    <constant name="UX853CollarAttMainHole1Rad" value="6*mm+ UX853CollarAttMainHoleRadTolerence"/>
+    <constant name="UX853CollarAttMainHole1RadPos" value="-(109*mm-UX853FixCollarInnerRad-0.5*UX853CollarAttMainPartXsize-3*mm)"/>
+    <constant name="UX853CollarAttMainHole1ZPos" value="-29.5*mm+0.5*UX852FixCollarLength+0.5*UX853CollarAttMainPartYsize-0.5*UX853FixCollarLength-3*mm"/>
+    <constant name="UX853CollarAttMainHole2Rad" value="5*mm + UX853CollarAttMainHoleRadTolerence"/>
+    <constant name="UX853CollarAttMainHole2RadPos" value="128*mm-UX853FixCollarInnerRad-0.5*UX853CollarAttMainPartXsize-3*mm"/>
+    <constant name="UX853CollarAttMainHole2ZPos" value="1.6*mm+0.5*UX853FixCollarLength+0.5*UX853CollarAttMainPartYsize-0.5*UX853FixCollarLength - UX853CollarAttMainPartEdge2InnerRad -3*mm"/>
+
+    <!--Slope 1-->
+    <constant name="UX853CollarAttSlope1RPos" value="0.5*UX853CollarAttMainPartXsize+8*mm"/>
+    <constant name="UX853CollarAttSlope1YRot" value="-90*degree+9.7*degree"/>
+    <constant name="UX853CollarAttSlope1Zpos" value="0.5*UX853CollarAttMainPartYsize+UX853CollarAttMainPartXsize+3*mm"/>
+    <!--Slope 2-->
+    <constant name="UX853CollarAttSlope2RPos" value="0.5*UX853CollarAttMainPartXsize+13*mm"/>
+    <constant name="UX853CollarAttSlope2ZPos" value="0*mm"/>
+    <constant name="UX853CollarAttSlope2YRot" value="-90*degree+61.8*degree"/>
+    <!-- Collar part -->
+    <constant name="UX853CollarAttMainPartRad" value="16.00*mm"/>
+    <constant name="UX853CollarAttMainPartLength" value="66.00*mm"/>
+    <!-- Holes in it -->
+    <constant name="UX853CollarAttMainBigHoleLength" value="40.00*mm"/>
+    <constant name="UX853CollarAttMainBigHoleRad" value="6.00*mm"/>
+    <constant name="UX853CollarAttMainBigHoleZpos" value="23.00*mm"/>
+    <constant name="UX853CollarAttMainBigHoleYpos" value="-2.70*mm"/>
+    <constant name="UX853CollarAttMainSmallHoleLength" value="20.00*mm"/>
+    <constant name="UX853CollarAttMainSmallHoleRad" value="0.20*mm"/>
+    <constant name="UX853CollarAttMainSmallHoleZpos1" value="10.00*mm - UX853CollarAttMainPartLength*0.5"/>
+    <constant name="UX853CollarAttMainSmallHoleZpos2" value="30.00*mm - UX853CollarAttMainPartLength*0.5"/>
+    <constant name="UX853CollarAttMainSmallHoleYpos" value="UX853CollarAttMainPartRad - 0.5*UX853CollarAttMainSmallHoleLength"/>
+    <constant name="UX853CollarAttMainBoxHoleZsize" value="UX853CollarAttMainPartLength - 41.50*mm"/>
+    <constant name="UX853CollarAttMainBoxHoleYsize" value="40.00*mm"/>
+    <constant name="UX853CollarAttMainBoxHoleXsize" value="14.00*mm"/>
+    <constant name="UX853CollarAttMainBoxHoleZpos" value="0.5*(UX853CollarAttMainPartLength - UX853CollarAttMainBoxHoleZsize)"/>
+    <!-- Circle -->
+    <constant name="UX853CollarAttCircleRad" value="20.00*mm"/>
+    <constant name="UX853CollarAttCircleLength" value="3.00*mm"/>
+    <constant name="UX853CollarAttCircleZpos" value="-0.5*(UX853CollarAttMainPartLength + UX853CollarAttCircleLength)"/>
+    <!-- Cut in it -->
+    <constant name="UX853CollarAttCircleCutBoxZsize" value="2.50*mm"/>
+    <constant name="UX853CollarAttCircleCutBoxYsize" value="40.00*mm"/>
+    <constant name="UX853CollarAttCircleCutBoxXsize" value="12.00*mm"/>
+    <!-- Plate -->
+    <constant name="UX853CollarAttPlateZsize" value="15.00*mm"/>
+    <constant name="UX853CollarAttPlateYsize1" value="13.40*mm"/>
+    <constant name="UX853CollarAttPlateXsize1" value="8.00*mm"/>
+    <constant name="UX853CollarAttPlateYsize2" value="43.60*mm"/>
+    <constant name="UX853CollarAttPlateXsize2" value="8.00*mm"/>
+    <constant name="UX853CollarAttPlateZpos" value="-0.5*(UX853CollarAttMainPartLength + UX853CollarAttPlateZsize) - UX853CollarAttCircleLength"/>
+    <constant name="UX853CollarAttPlateYpos" value="-0.5*UX853CollarAttPlateYsize1"/>
+    <constant name="UX853CollarAttPlateXpos" value="0.5*(UX853CollarAttCircleCutBoxXsize + UX853CollarAttPlateXsize1)"/>
+    <constant name="UX853CollarAttPlateCutZsize" value="18.00*mm"/>
+    <constant name="UX853CollarAttPlateCutYsize" value="18.00*mm"/>
+    <constant name="UX853CollarAttPlateCutXsize" value="10.00*mm"/>
+    <constant name="UX853CollarAttPlateCutZpos" value="UX853CollarAttPlateZpos"/>
+    <constant name="UX853CollarAttPlateCutYpos" value="0.5*(UX853CollarAttPlateCutYsize + UX853CollarAttPlateYsize1)"/>
+    <constant name="UX853CollarAttPlateCutXpos" value="UX853CollarAttPlateXpos"/>
+    <!-- Hole in it -->
+    <constant name="UX853CollarAttTrdHoleRad" value="4.00*mm"/>
+    <constant name="UX853CollarAttTrdHoleLength" value="40.00*mm"/>
+    <constant name="UX853CollarAttTrdHoleZpos" value="-3.00*mm"/>
+    <constant name="UX853CollarAttTrdHoleYpos" value="1.60*mm"/>
+
+    <!-- UX85-3 Fixed Point: Backward Cables, 3.0 mm diameter-->
+    <constant name="UX853FixCollarCable03Radius" value="1.50*mm"/>
+    <constant name="UX853FixCollarCable03Lenght" value="3127.00*mm"/>
+    <constant name="UX853FixCollarCable03Theta" value="79.1*degree"/>
+
+    <!--  Some of the following may be obsolete and be removed -->
+    <!-- Forward cable part -->
+    <constant name="UX853FwdCableAttMainRad" value="9.00*mm"/>
+    <constant name="UX853FwdCableAttMainLength" value="57.50*mm"/>
+    <constant name="UX853FwdCableAttRingOuterRad" value="9.50*mm"/>
+    <constant name="UX853FwdCableAttRingInnerRad" value="4.00*mm"/>
+    <constant name="UX853FwdCableAttRingDeltaAng" value="143*degree"/>
+    <constant name="UX853FwdCableAttCut1SizeX" value="3.00*mm"/>
+    <constant name="UX853FwdCableAttCut1SizeY" value="2*UX853FwdCableAttMainRad"/>
+    <constant name="UX853FwdCableAttCut1SizeZ" value="13.00*mm+UX853FwdCableAttRingOuterRad"/>
+    <constant name="UX853FwdCableAttCut2SizeX" value="2.50*mm"/>
+    <constant name="UX853FwdCableAttCut2SizeY" value="2*UX853FwdCableAttMainRad"/>
+    <constant name="UX853FwdCableAttCut2SizeZ" value="10.00*mm"/>
+    <constant name="UX853FwdCableAttCut2posZ" value="23.00*mm"/>
+    <constant name="UX853FwdCableAttHoleRad" value="UX853FwdCableAttRingInnerRad"/>
+    <constant name="UX853FwdCableAttLongHoleRad" value="4.00*mm"/>
+    <constant name="UX853FwdCableAttLongHoleLength" value="27.00*mm"/>
+    <constant name="UX853FwdCableAttZpos" value="UX853CollarAttMainPartZPos+UX853CollarAttMainHole2ZPos+0.5*UX853FwdCableAttMainLength*cos(UX853FixCollarCable03Theta)-2*mm"/>
+    <constant name="UX853FwdCableAttRpos" value="UX853CollarAttMainHole2RadPos+UX853CollarAttMainPartRPos+0.5*UX853FwdCableAttMainLength*sin(UX853FixCollarCable03Theta) -0.5*UX853CollarAttMainHole2Rad-0.5*UX853FwdCableAttRingOuterRad-3*mm"/>
+
+    <!-- end  Some the parts  may be obsolete and be removed in future -->
+
+    <!-- Forward rod -->
+
+    <!-- Forward rod at UX853 Modified in June 2015 from LHCBVC8B-167-A -->
+    <constant name="UX853FwdCableAttRodRad" value="5.00*mm"/>
+    <constant name="UX853FwdCableAttRodLength" value="36.10*mm"/>
+    <constant name="UX853FwdCableAttRodCutRad" value="4.80*mm"/>
+    <constant name="UX853FwdCableAttRodCutLength" value="1.10*mm"/>
+    <constant name="UX853FwdCableAttRodCutZpos" value="3.60*mm"/>
+    <constant name="UX853FwdCableAttRodInnerHoleRad" value="4.0*mm"/>
+    <constant name="UX853FwdCableAttRodHeadLength" value="1.5*mm"/>
+    <constant name="UX853FwdCableAttRodHeadRad" value="6.5*mm"/>
+    <constant name="UX853FwdCableAttRodManPartLargeLength" value="50.0*mm"/>
+    <constant name="UX853FwdCableAttRodManPartPosZ" value="-0.5*UX853FwdCableAttRodLength+0.5*UX853FwdCableAttRodManPartLargeLength+UX853FwdCableAttRodHeadLength"/>
+
+    <constant name="UX853FwdCableAttRodZpos" value="UX853CollarAttMainPartZPos+UX853CollarAttMainHole2ZPos"/>
+    <constant name="UX853FwdCableAttRodRpos" value="UX853CollarAttMainHole2RadPos+UX853CollarAttMainPartRPos"/>
+
+     <!-- UX85-3 Fixed Point: Forward Rods, 8.0 mm -->
+    <constant name="UX853FixCollarCable08Radius" value="4.00*mm"/>
+    <constant name="UX853FixCollarCable08Lenght" value="3200.00*mm"/>
+    <constant name="UX853FixCollarCable08Theta" value="45.00*degree"/>
+
+    <!-- Backward cable part -->
+    <constant name="UX853BckCableAttMainRad" value="10.00*mm"/>
+    <constant name="UX853BckCableAttMainLength" value="62.00*mm"/>
+    <constant name="UX853BckCableAttRingOuterRad" value="14.00*mm"/>
+    <constant name="UX853BckCableAttRingInnerRad" value="6.00*mm"/>
+    <constant name="UX853BckCableAttRingDeltaAng" value="89*degree"/>
+    <constant name="UX853BckCableAttCut1SizeX" value="3.00*mm"/>
+    <constant name="UX853BckCableAttCut1SizeY" value="2*UX853BckCableAttMainRad"/>
+    <constant name="UX853BckCableAttCut1SizeZ" value="18*mm+UX853BckCableAttRingOuterRad"/>
+    <constant name="UX853BckCableAttCut2SizeX" value="2.00*mm"/>
+    <constant name="UX853BckCableAttCut2SizeY" value="2*UX853BckCableAttMainRad"/>
+    <constant name="UX853BckCableAttCut2SizeZ" value="10.00*mm"/>
+    <constant name="UX853BckCableAttCut2posZ" value="18.00*mm"/>
+    <constant name="UX853BckCableAttHoleRad" value="UX853BckCableAttRingInnerRad"/>
+    <constant name="UX853BckCableAttLongHoleRad" value="4.00*mm"/>
+    <constant name="UX853BckCableAttLongHoleLength" value="34.00*mm"/>
+    <constant name="UX853BckCableAttZpos" value="UX853CollarAttMainPartZPos+UX853CollarAttMainHole1ZPos-0.5*UX853BckCableAttMainLength*cos(UX853FixCollarCable08Theta) +0.5*UX853CollarAttMainHole1Rad+0.5*UX853BckCableAttRingOuterRad"/>
+    <constant name="UX853BckCableAttRpos" value="-UX853CollarAttMainHole1RadPos+UX853CollarAttMainPartRPos+0.5*UX853BckCableAttMainLength*sin(UX853FixCollarCable08Theta) -0.5*UX853CollarAttMainHole1Rad-0.5*UX853BckCableAttRingOuterRad"/>
+
+    <!-- Backward rod -->
+    <!-- Backward rod at UX853 Modified in June 2015 from LHCVC8B-164-A -->
+
+    <constant name="UX853BckCableAttRodRad" value="6.00*mm"/>
+    <constant name="UX853BckCableAttRodLength" value="36.10*mm"/>
+    <constant name="UX853BckCableAttRodCutRad" value="5.75*mm"/>
+    <constant name="UX853BckCableAttRodCutLength" value="1.10*mm"/>
+    <constant name="UX853BckCableAttRodCutZpos" value="3.60*mm"/>
+    <constant name="UX853BckCableAttRodInnerHoleRad" value="3.0*mm"/>
+    <constant name="UX853BckCableAttRodHeadLength" value="1.5*mm"/>
+    <constant name="UX853BckCableAttRodHeadRad" value="7.5*mm"/>
+    <constant name="UX853BckCableAttRodManPartLargeLength" value="50.0*mm"/>
+    <constant name="UX853BckCableAttRodManPartPosZ" value="-0.5*UX853BckCableAttRodLength+0.5*UX853BckCableAttRodManPartLargeLength+UX853BckCableAttRodHeadLength"/>
+
+    <constant name="UX853BckCableAttRodZpos" value="UX853CollarAttMainPartZPos+UX853CollarAttMainHole1ZPos"/>
+    <constant name="UX853BckCableAttRodRpos" value="-UX853CollarAttMainHole1RadPos+UX853CollarAttMainPartRPos"/>
+
+    <!-- Now to place the Collar attachment in UX 853 from June 2015 -->
+    <!-- begin test param added March 27 ,2006  SE
+     Modified June 16, 2015  SE  for the new cables at UX853
+     The cable heads are labelled  as one looks from the interaction point along the positive Z axis.
+     The labels 1,2,3,4 are for Vertical, right horiz, bottom, left horiz respectively.-->
+
+    <!-- End place the Collar attachment in UX 853 from June 2015 -->
+
+    <constant name="UX853FixCollarCableFwdTheta" value="79.1*degree"/>
+    <constant name="UX853FixCollarCableBckTheta" value="45.00*degree"/>
+    <constant name="UX853FixCollarCablePlaneAbsRotZ" value="90*degree"/>
+    <constant name="UX853FixCollarCableFwdPlaneRotZTopVertical" value="90.0*degree+UX853FixCollarCablePlaneAbsRotZ"/>
+    <constant name="UX853FixCollarCableFwdPlaneRotZBotVertical" value="270*degree+UX853FixCollarCablePlaneAbsRotZ"/>
+
+    <constant name="UX853FixCollarCableFwdPlaneRotZHorizRight" value="UX853FixCollarCablePlaneAbsRotZ"/>
+    <constant name="UX853FixCollarCableFwdPlaneRotZHorizLeft" value="180*degree+UX853FixCollarCablePlaneAbsRotZ"/>
+
+    <constant name="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizRight" value="UX853FixCollarCableFwdPlaneRotZHorizRight"/>
+    <constant name="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizLeft" value="UX853FixCollarCableFwdPlaneRotZHorizLeft"/>
+
+    <constant name="UX853FwdCableHeadZpos" value="UX853FwdCableAttRodZpos"/>
+    <constant name="UX853FwdCableHeadRpos" value="UX853FwdCableAttRodRpos"/>
+    <constant name="UX853FwdCableHeadCommonPhipos" value="UX853FixCollarPhiStart+34*degree"/>
+
+    <constant name="UX853BckCableHeadZpos" value="UX853BckCableAttRodZpos"/>
+    <constant name="UX853BckCableHeadRpos" value="UX853BckCableAttRodRpos"/>
+    <constant name="UX853BckCableHeadCommonPhipos" value="UX853FixCollarPhiStart+34*degree"/>
+
+    <constant name="UX853FixCollarCableBckPlaneRotZHorizRight" value="UX853FixCollarCablePlaneAbsRotZ"/>
+    <constant name="UX853FixCollarCableBckPlaneRotZHorizLeft" value="UX853FixCollarCablePlaneAbsRotZ"/>
+    <constant name="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizRight" value="UX853FixCollarCableBckPlaneRotZHorizRight+ 180*degree "/>
+    <constant name="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizLeft" value="UX853FixCollarCableBckPlaneRotZHorizLeft"/>
+
+    <!-- Now Place cables in UX853 -->
+    <constant name="UX853BckCable05ZPos" value="UX853BckCableHeadZpos - (0.5*UX853FutureFibreCable05Length -UX852CableHeadLengthReductionValueTolerence)*cos(UX853FixCollarCableBckTheta)+UX852FutureFibreCableTolerence"/>
+    <constant name="UX853BckCable05RPos" value="UX853BckCableHeadRpos + (0.5*UX853FutureFibreCable05Length -UX852CableHeadLengthReductionValueTolerence)*sin(UX853FixCollarCableBckTheta)+UX852FutureFibreCableTolerence"/>
+
+    <constant name="UX853BckCable05HeadMagnetFaceZpos" value="UX853BckCable05ZPos - (0.5*UX853FutureFibreCable05Length - UX852CableHeadLengthReductionValueTolerence +4.5*mm) * cos(UX853FixCollarCableBckTheta)"/>
+    <constant name="UX853BckCable05HeadMagnetFaceRpos" value="UX853BckCable05RPos + (0.5*UX853FutureFibreCable05Length - UX852CableHeadLengthReductionValueTolerence +4.5*mm)*sin(UX853FixCollarCableBckTheta)"/>
+    <constant name="UX853BckCable05HeadMagnetFaceCommonPhipos" value="UX853BckCableHeadCommonPhipos"/>
+
+    <constant name="UX853BckCable06ZPos" value="UX853BckCableHeadZpos - (0.5*UX853FutureFibreCable06Length -UX852CableHeadLengthReductionValueTolerence)*cos(UX853FixCollarCableBckTheta)+UX852FutureFibreCableTolerence"/>
+    <constant name="UX853BckCable06RPos" value="UX853BckCableHeadRpos + (0.5*UX853FutureFibreCable06Length -UX852CableHeadLengthReductionValueTolerence)*sin(UX853FixCollarCableBckTheta)+UX852FutureFibreCableTolerence"/>
+
+    <constant name="UX853BckCable06HeadMagnetFaceZpos" value="UX853BckCable06ZPos - (0.5*UX853FutureFibreCable06Length - UX852CableHeadLengthReductionValueTolerence +4.5*mm) * cos(UX853FixCollarCableBckTheta)"/>
+    <constant name="UX853BckCable06HeadMagnetFaceRpos" value="UX853BckCable06RPos + (0.5*UX853FutureFibreCable06Length - UX852CableHeadLengthReductionValueTolerence +4.5*mm)*sin(UX853FixCollarCableBckTheta)"/>
+    <constant name="UX853BckCable06HeadMagnetFaceCommonPhipos" value="UX853BckCableHeadCommonPhipos"/>
+
+    <constant name="UX853FwdCable07ZPos" value="UX853FwdCableHeadZpos + (0.5*UX853TechnoraCable07Length -UX852TechnoraCableHeadLengthReductionValueTolerence)*cos(UX853FixCollarCableFwdTheta)+UX852TechnoraCableTolerence"/>
+    <constant name="UX853FwdCable07RPos" value="UX853FwdCableHeadRpos + (0.5*UX853TechnoraCable07Length -UX852TechnoraCableHeadLengthReductionValueTolerence)*sin(UX853FixCollarCableFwdTheta)+UX852TechnoraCableTolerence"/>
+
+    <constant name="UX853FwdCable07HeadMagnetFaceZpos" value="UX853FwdCable07ZPos + (0.5*UX853TechnoraCable07Length - UX852TechnoraCableHeadLengthReductionValueTolerence+4.5*mm) * cos(UX853FixCollarCableFwdTheta)"/>
+    <constant name="UX853FwdCable07HeadMagnetFaceRpos" value="UX853FwdCable07RPos + (0.5*UX853TechnoraCable07Length - UX852CableHeadLengthReductionValueTolerence+4.5*mm)*sin(UX853FixCollarCableFwdTheta)"/>
+    <constant name="UX853FwdCable07HeadMagnetFaceCommonPhipos" value="UX853FwdCableHeadCommonPhipos"/>
+
+    <constant name="UX853FwdCable08ZPos" value="UX853FwdCableHeadZpos + (0.5*UX853TechnoraCable08Length -UX852TechnoraCableHeadLengthReductionValueTolerence)*cos(UX853FixCollarCableFwdTheta)+UX852TechnoraCableTolerence"/>
+    <constant name="UX853FwdCable08RPos" value="UX853FwdCableHeadRpos + (0.5*UX853TechnoraCable08Length -UX852TechnoraCableHeadLengthReductionValueTolerence)*sin(UX853FixCollarCableFwdTheta)+UX852TechnoraCableTolerence"/>
+
+    <constant name="UX853FwdCable08HeadMagnetFaceZpos" value="UX853FwdCable08ZPos + (0.5*UX853TechnoraCable08Length - UX852TechnoraCableHeadLengthReductionValueTolerence+4.5*mm) * cos(UX853FixCollarCableFwdTheta)"/>
+    <constant name="UX853FwdCable08HeadMagnetFaceRpos" value="UX853FwdCable08RPos + (0.5*UX853TechnoraCable08Length - UX852CableHeadLengthReductionValueTolerence+4.5*mm)*sin(UX853FixCollarCableFwdTheta)"/>
+    <constant name="UX853FwdCable08HeadMagnetFaceCommonPhipos" value="UX853FwdCableHeadCommonPhipos"/>
+
+    <!-- End place Cables in UX 853 -->
+    <!-- begin test param added March 27 ,2006  SE
+     Modified June 16, 2015  SE  for the new cables at UX853
+
+     the cable08 is backward pointing cable and cable 03 is forward pointing cable
+     wrt the Z axis.
+     The cables are labelled  as one looks from the interaction point along the positive Z axis.
+     TopLeft , TopRight BottomLeft, Bottom Right  -->
+
+    <constant name="UX853FixCollarCableRadialTolerence" value="2.0*mm"/>
+    <constant name="UX853FixCollarCable08ZTolerence" value="5.0*mm"/>
+    <constant name="UX853FixCollarCable03ZTolerence" value="2.0*mm"/>
+
+
+  </define>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-UX851.xml b/compact/components/Pipe/2025-v00.00/Magnet-UX851.xml
new file mode 100644
index 000000000..ce2d80526
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Magnet-UX851.xml
@@ -0,0 +1,118 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<pipe>
+
+  <!-- ************************************************************** -->
+  <!-- * BEAM PIPE                                                  * -->
+  <!-- * Sections in MagnetRegion                                   * -->
+  <!-- *   from z=2270 mm to z=7620 mm                          * -->
+  <!-- *                                                            * -->
+  <!-- * UX85-1, Compensator at 2800mm, UX85-2, Bellow connection   * -->
+  <!-- * at 6900 and UX85-3                                         * -->
+  <!-- *                                                            * -->
+  <!-- * Author: Gloria Corti                                       * -->
+  <!-- *                                                            * -->
+  <!-- * Consists of                                                * -->
+  <!-- *   UX85-1:                                                  * -->
+  <!-- *     - conical sections of 10 mrad of different thickness   * -->
+  <!-- *       and materials                                        * -->
+  <!-- *     - flange                                               * -->
+  <!-- *   and corresponding vaccum conical sections                * -->
+  <!-- ************************************************************** -->
+
+  <!-- UX85-1 Cone 10 mrad of Beryllium 1mm thick   -->
+  <!-- Start at end of BeforeMagnet Region          -->
+  <!-- <volume vis="UT:PipeHeater" material="UT:PipeHeater" name="lvUTPipeHeaterDownstreamInMagnet">
+		<shape name="utPipeHeaterInUT" operation="subtraction" type="BooleanShape">
+			<shape dz="UTPipeHeaterDownstreamLength/2" name="UTPipeHeaterDownstream" rmax2="UTPipeHeaterDownstreamRadiusZmax+UTPipeHeaterDownstreamThick" rmax1="UTPipeHeaterDownstreamRadiusZmin+UTPipeHeaterDownstreamThick" rmin2="UTPipeHeaterDownstreamRadiusZmax" rmin1="UTPipeHeaterDownstreamRadiusZmin" type="ConeSegment" />
+			<shape rmax="UTPipeHeaterDownstreamRadiusZmax+UTPipeHeaterDownstreamThick+UTEpsilon" dz="UTPipeHeaterDownstreamLengthInUT/2+UTEpsilon" name="UTPipeHeaterDownstreamInUTSubMagnet" type="Tube" />
+			<position z="UTPipeHeaterDownstreamZmin+UTPipeHeaterDownstreamLengthInUT/2-UTPipeHeaterDownstreamPos-UTSystemZ-UTEpsilon" />
+		</shape>
+	</volume> -->
+
+  <volume name="lvUX851Cone08B" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-1-Cone10mrad-08B"
+           dz="0.5*UX851Cone08BLenght"
+           rmin1="UX851Cone08BRadiusZmin"
+           rmin2="UX851Cone08BRadiusZmax"
+           rmax1="UX851Cone08BRadiusZmin+UX851Cone08BThick"
+           rmax2="UX851Cone08BRadiusZmax+UX851Cone08BThick"/>
+  </volume>
+
+  <!-- UX85-1 Cone 10 mrad of Beryllium 1.5mm thick for welding  -->
+  <volume name="lvUX851Cone09" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-1-Cone10mrad-09"
+           dz="0.5*UX851Cone09Lenght"
+           rmin1="UX851Cone09RadiusZmin"
+           rmin2="UX851Cone09RadiusZmax"
+           rmax1="UX851Cone09RadiusZmin+UX851Cone09Thick"
+           rmax2="UX851Cone09RadiusZmax+UX851Cone09Thick"/>
+  </volume>
+
+  <!-- UX85-1 Cone 10 mrad of Alumimium 1.5mm thick for flange  -->
+  <volume name="lvUX851Cone10" material="Pipe:Al2219F" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-1-Cone10mrad-10"
+           dz="0.5*UX851Cone10Lenght"
+           rmin1="UX851Cone10RadiusZmin"
+           rmin2="UX851Cone10RadiusZmax"
+           rmax1="UX851Cone10RadiusZmin+UX851Cone10Thick"
+           rmax2="UX851Cone10RadiusZmax+UX851Cone10Thick"/>
+  </volume>
+
+  <!-- UX85-1 Flange  -->
+  <volume name="lvUX851Flange11" material="Pipe:Al2219F" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-1-Flange11"
+           dz="0.5*UX851Flange11Lenght"
+           rmin1="UX851Flange11RadiusZmin"
+           rmin2="UX851Flange11RadiusZmax"
+           rmax1="UX851Flange11OuterRadius"
+           rmax2="UX851Flange11OuterRadius"/>
+  </volume>
+
+  <!-- Vacuum in UX851InMagnet -->
+  <volume name="lvUX851Vacuum08B" material="Vacuum" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-1-Vacuum-08B"
+           dz="0.5*UX851Vacuum08BLenght"
+           rmax1="UX851Cone08BRadiusZmin"
+           rmax2="UX851Flange11RadiusZmax"/>
+  </volume>
+
+  <volume name="lvUX851InMagnet" vis="Pipe:Magnet">
+    <!-- <physvol name="pvUTPipeHeaterDownstreamInMagnet" volume="lvUTPipeHeaterDownstreamInMagnet">
+      <position z="UTPipeHeaterDownstreamLengthInMagnet-UTPipeHeaterDownstreamLength/2"/>
+    </physvol> -->
+
+    <physvol name="pvUX851Cone08B"               volume="lvUX851Cone08B">
+      <position z="UX851Cone08BZpos"/>
+    </physvol>
+
+    <physvol name="pvUX851Cone09"                volume="lvUX851Cone09">
+      <position z="UX851Cone09Zpos"/>
+    </physvol>
+
+    <physvol name="pvUX851Cone10"                volume="lvUX851Cone10">
+      <position z="UX851Cone10Zpos"/>
+    </physvol>
+
+    <physvol name="pvUX851Flange11"              volume="lvUX851Flange11">
+      <position z="UX851Flange11Zpos"/>
+    </physvol>
+
+    <!-- Now the vacuum inside -->
+    <physvol name="pvUX851Vacuum08B"             volume="lvUX851Vacuum08B">
+      <position z="0.5*UX851Vacuum08BLenght"/>
+    </physvol>
+
+  </volume>
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-UX852.xml b/compact/components/Pipe/2025-v00.00/Magnet-UX852.xml
new file mode 100644
index 000000000..8ab1a3bb3
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Magnet-UX852.xml
@@ -0,0 +1,196 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<pipe>
+
+  <!-- ************************************************************** -->
+  <!-- * BEAM PIPE                                                  * -->
+  <!-- * Sections in MagnetRegion                                   * -->
+  <!-- *   from z=2270 mm to z=7620 mm                          * -->
+  <!-- *                                                            * -->
+  <!-- * Author: Gloria Corti                                       * -->
+  <!-- *                                                            * -->
+  <!-- * Consists of                                                * -->
+  <!-- *   UX85-2:                                                  * -->
+  <!-- *     - conical sections of 10 mrad of different thickness   * -->
+  <!-- *     - two flanges                                          * -->
+  <!-- *   and corresponding vaccum conical sections                * -->
+  <!-- ************************************************************** -->
+
+  <!-- UX85-2 Flange  -->
+  <volume name="lvUX852Flange01" material="Pipe:Al2219F" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Flange01"
+           dz="0.5*UX852Flange01Lenght"
+           rmin1="UX852Flange01RadiusZmin"
+           rmin2="UX852Flange01RadiusZmax"
+           rmax1="UX852Flange01OuterRadius"
+           rmax2="UX852Flange01OuterRadius"/>
+  </volume>
+
+  <!-- UX85-2 Cone 10 mrad of Alumimium 1.5mm thick for flange  -->
+  <volume name="lvUX852Cone02" material="Pipe:Al2219F" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Cone10mrad-02"
+           dz="0.5*UX852Cone02Lenght"
+           rmin1="UX852Cone02RadiusZmin"
+           rmin2="UX852Cone02RadiusZmax"
+           rmax1="UX852Cone02RadiusZmin + UX852Cone02Thick"
+           rmax2="UX852Cone02RadiusZmax + UX852Cone02Thick"/>
+  </volume>
+
+  <!-- UX85-2 Cone 10 mrad of Beryllium 1.0mm thick -->
+  <volume name="lvUX852Cone03" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Cone10mrad-03"
+           dz="0.5*UX852Cone03Lenght"
+           rmin1="UX852Cone03RadiusZmin"
+           rmin2="UX852Cone03RadiusZmax"
+           rmax1="UX852Cone03RadiusZmin + UX852Cone03Thick"
+           rmax2="UX852Cone03RadiusZmax + UX852Cone03Thick"/>
+  </volume>
+  <!-- UX85-2 Cone 10 mrad of Beryllium section for support A  -->
+  <volume name="lvUX852Cone04A" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Cone10mrad-04A"
+           dz="0.5*UX852Cone04ALenght"
+           rmin1="UX852Cone04ARadiusZmin"
+           rmin2="UX852Cone04ARadiusZmax"
+           rmax1="UX852Cone04ARadiusZmin + UX852Cone04AThick"
+           rmax2="UX852Cone04ARadiusZmax + UX852Cone04AThick"/>
+  </volume>
+  <!-- UX85-2 Cone 10 mrad of Beryllium section for support B - cylindrical on outside -->
+  <volume name="lvUX852Cone04B" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Cone10mrad-04B"
+           dz="0.5*UX852Cone04BLenght"
+           rmin1="UX852Cone04BRadiusZmin"
+           rmin2="UX852Cone04BRadiusZmax"
+           rmax1="UX852Cone04BOuterRadius"
+           rmax2="UX852Cone04BOuterRadius"/>
+  </volume>
+  <!-- UX85-2 Cone 10 mrad of Beryllium section for support C -->
+  <volume name="lvUX852Cone04C" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Cone10mrad-04C"
+           dz="0.5*UX852Cone04CLenght"
+           rmin1="UX852Cone04CRadiusZmin"
+           rmin2="UX852Cone04CRadiusZmax"
+           rmax1="UX852Cone04CRadiusZmin + UX852Cone04CThick"
+           rmax2="UX852Cone04CRadiusZmax + UX852Cone04CThick"/>
+  </volume>
+  <!-- UX85-2 Cone 10 mrad of Beryllium section for support - flange surrounds B section -->
+  <volume name="lvUX852Cone04Rib" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="Tube" name="UX85-2-Cone04-Rib"
+           dz="0.5*UX852Cone04RibLenght"
+           rmin="UX852Cone04RibInnerRadius"
+           rmax="UX852Cone04RibOuterRadius"/>
+  </volume>
+  <!-- UX85-2 Cone 10 mrad of Beryllium section for support A+B+C+flange -->
+  <volume name="lvUX852Cone04"  vis="Pipe:Magnet">
+    <physvol name="pvUX852Cone04A"             volume="lvUX852Cone04A">
+      <position z="-0.5*UX852Cone04Lenght + 0.5*UX852Cone04ALenght"/>
+    </physvol>
+    <physvol name="pvUX852Cone04B"             volume="lvUX852Cone04B">
+      <position z="-0.5*UX852Cone04Lenght + UX852Cone04ALenght + 0.5*UX852Cone04BLenght"/>
+    </physvol>
+    <physvol name="pvUX852Cone04C"             volume="lvUX852Cone04C">
+      <position z="-0.5*UX852Cone04Lenght + UX852Cone04ALenght + UX852Cone04BLenght + 0.5*UX852Cone04CLenght"/>
+    </physvol>
+    <physvol name="pvUX852Cone04Rib"           volume="lvUX852Cone04Rib">
+      <position z="-0.5*UX852Cone04Lenght + UX852Cone04ALenght + 0.5*UX852Cone04BLenght"/>
+    </physvol>
+  </volume>
+  <!-- UX85-2 Cone 10 mrad of Beryllium 1.0 mm thick -->
+  <volume name="lvUX852Cone05" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Cone10mrad-05"
+           dz="0.5*UX852Cone05Lenght"
+           rmin1="UX852Cone05RadiusZmin"
+           rmin2="UX852Cone05RadiusZmax"
+           rmax1="UX852Cone05RadiusZmin + UX852Cone05Thick"
+           rmax2="UX852Cone05RadiusZmax + UX852Cone05Thick"/>
+  </volume>
+  <!-- UX85-2 Cone 10 mrad of Beryllium 1.1 mm thick -->
+  <volume name="lvUX852Cone06" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Cone10mrad-06"
+           dz="0.5*UX852Cone06Lenght"
+           rmin1="UX852Cone06RadiusZmin"
+           rmin2="UX852Cone06RadiusZmax"
+           rmax1="UX852Cone06RadiusZmin + UX852Cone06Thick"
+           rmax2="UX852Cone06RadiusZmax + UX852Cone06Thick"/>
+  </volume>
+  <!-- UX85-2 Cone 10 mrad of Beryllium 1.3 mm thick -->
+  <volume name="lvUX852Cone07" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Cone10mrad-07"
+           dz="0.5*UX852Cone07Lenght"
+           rmin1="UX852Cone07RadiusZmin"
+           rmin2="UX852Cone07RadiusZmax"
+           rmax1="UX852Cone07RadiusZmin + UX852Cone07Thick"
+           rmax2="UX852Cone07RadiusZmax + UX852Cone07Thick"/>
+  </volume>
+  <!-- UX85-2 Cone 10 mrad of Aluminum 2.0 mm thick -->
+  <volume name="lvUX852Cone08" material="Pipe:Al2219F" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Cone10mrad-08"
+           dz="0.5*UX852Cone08Lenght"
+           rmin1="UX852Cone08RadiusZmin"
+           rmin2="UX852Cone08RadiusZmax"
+           rmax1="UX852Cone08RadiusZmin + UX852Cone08Thick"
+           rmax2="UX852Cone08RadiusZmax + UX852Cone08Thick"/>
+  </volume>
+  <!-- UX85-2 Flange -->
+  <volume name="lvUX852Flange09" material="Pipe:Al2219F" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Flange09"
+           dz="0.5*UX852Flange09Lenght"
+           rmin1="UX852Flange09RadiusZmin"
+           rmin2="UX852Flange09RadiusZmax"
+           rmax1="UX852Flange09OuterRadius"
+           rmax2="UX852Flange09OuterRadius"/>
+  </volume>
+  <!-- Vacuum in UX852 -->
+  <volume name="lvUX852Vacuum01" material="Vacuum" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-2-Vacuum-01"
+           dz="0.5*UX852Vacuum01Lenght"
+           rmax1="UX852Flange01RadiusZmin"
+           rmax2="UX852Flange09RadiusZmax"/>
+  </volume>
+
+  <!-- UX85-2 Pipes of Al and Be -->
+  <volume name="lvUX852" vis="Pipe:Magnet">
+    <physvol name="pvUX852Flange01"             volume="lvUX852Flange01">
+      <position z="UX852Flange01Zpos"/>
+    </physvol>
+    <physvol name="pvUX852Cone02"               volume="lvUX852Cone02">
+      <position z="UX852Cone02Zpos"/>
+    </physvol>
+    <physvol name="pvUX852Cone03"               volume="lvUX852Cone03">
+      <position z="UX852Cone03Zpos"/>
+    </physvol>
+    <physvol name="pvUX852Cone04"               volume="lvUX852Cone04">
+      <position z="UX852Cone04Zpos"/>
+    </physvol>
+    <physvol name="pvUX852Cone05"               volume="lvUX852Cone05">
+      <position z="UX852Cone05Zpos"/>
+    </physvol>
+    <physvol name="pvUX852Cone06"               volume="lvUX852Cone06">
+      <position z="UX852Cone06Zpos"/>
+    </physvol>
+    <physvol name="pvUX852Cone07"               volume="lvUX852Cone07">
+      <position z="UX852Cone07Zpos"/>
+    </physvol>
+    <physvol name="pvUX852Cone08"               volume="lvUX852Cone08">
+      <position z="UX852Cone08Zpos"/>
+    </physvol>
+    <physvol name="pvUX852Flange09"             volume="lvUX852Flange09">
+      <position z="UX852Flange09Zpos"/>
+    </physvol>
+    <physvol name="pvUX852Vacuum01"             volume="lvUX852Vacuum01">
+      <position z="0.5*UX852Vacuum01Lenght"/>
+    </physvol>
+
+  </volume>
+
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-UX853.xml b/compact/components/Pipe/2025-v00.00/Magnet-UX853.xml
new file mode 100644
index 000000000..be50cae71
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Magnet-UX853.xml
@@ -0,0 +1,118 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<pipe>
+
+
+  <!-- ************************************************************** -->
+  <!-- * BEAM PIPE                                                  * -->
+  <!-- * Sections in MagnetRegion                                   * -->
+  <!-- *   from z=2270 mm to z=7620 mm                          * -->
+  <!-- *                                                            * -->
+  <!-- * Author: Gloria Corti                                       * -->
+  <!-- *                                                            * -->
+  <!-- * Consists of                                                * -->
+  <!-- *   UX85-3:                                                  * -->
+  <!-- *     - one flange                                           * -->
+  <!-- *     - conical section of 10 mrad                           * -->
+  <!-- *   and corresponding vaccum conical sections                * -->
+  <!-- ************************************************************** -->
+
+  <!-- UX85-3 Flange  -->
+  <volume name="lvUX853Flange01" material="Pipe:Al2219F" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-3-Flange01"
+           dz="0.5*UX853Flange01Lenght"
+           rmin1="UX853Flange01RadiusZmin"
+           rmin2="UX853Flange01RadiusZmax"
+           rmax1="UX853Flange01OuterRadius"
+           rmax2="UX853Flange01OuterRadius"/>
+  </volume>
+  <!-- UX85-3 Cone 10 mrad of Alumimium ~2-2.4*mm thick for flange  -->
+  <volume name="lvUX853Cone02" material="Pipe:Al2219F" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-3-Cone10mrad-02"
+           dz="0.5*UX853Cone02Lenght"
+           rmin1="UX853Cone02RadiusZmin"
+           rmin2="UX853Cone02RadiusZmax"
+           rmax1="UX853Cone02OuterRadius"
+           rmax2="UX853Cone02OuterRadius"/>
+  </volume>
+  <!-- UX85-3 Cone 10 mrad of Beryllium ~2*mm thick for welding and -->
+  <!-- support flange  -->
+  <volume name="lvUX853Cone03" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-3-Cone10mrad-03"
+           dz="0.5*UX853Cone03Lenght"
+           rmin1="UX853Cone03RadiusZmin"
+           rmin2="UX853Cone03RadiusZmax"
+           rmax1="UX853Cone03OuterRadius"
+           rmax2="UX853Cone03OuterRadius"/>
+  </volume>
+  <!-- UX85-3 little flange for support, surrounds Cone03 -->
+  <volume name="lvUX853Cone03Flange" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="Tube" name="UX85-3-Cone03-Flange"
+           dz="0.5*UX853Cone03FlangeLenght"
+           rmin="UX853Cone03FlangeInnerRadius"
+           rmax="UX853Cone03FlangeOuterRadius"/>
+  </volume>
+  <!-- UX85-3 Cone 10 mrad of Beryllium 1.4 mm thick -->
+  <volume name="lvUX853Cone04" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-3-Cone10mrad-04"
+           dz="0.5*UX853Cone04Lenght"
+           rmin1="UX853Cone04RadiusZmin"
+           rmin2="UX853Cone04RadiusZmax"
+           rmax1="UX853Cone04RadiusZmin + UX853Cone04Thick"
+           rmax2="UX853Cone04RadiusZmax + UX853Cone04Thick"/>
+  </volume>
+  <!-- UX85-3 Cone 10 mrad of Beryllium 1.6 mm thick -->
+  <volume name="lvUX853Cone05A" material="Pipe:BeTV56" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-3-Cone10mrad-05A"
+           dz="0.5*UX853Cone05ALenght"
+           rmin1="UX853Cone05ARadiusZmin"
+           rmin2="UX853Cone05ARadiusZmax"
+           rmax1="UX853Cone05ARadiusZmin + UX853Cone05AThick"
+           rmax2="UX853Cone05ARadiusZmax + UX853Cone05AThick"/>
+  </volume>
+  <!-- Vacuum in UX853InMagnet -->
+  <volume name="lvUX853Vacuum01" material="Vacuum" vis="Pipe:Magnet">
+    <shape type="ConeSegment" name="UX85-3-Vacuum-01"
+           dz="0.5*UX853Vacuum01Lenght"
+           rmax1="UX853Flange01RadiusZmin"
+           rmax2="UX853Cone05ARadiusZmax"/>
+  </volume>
+
+  <volume name="lvUX853InMagnet" vis="Pipe:Magnet">
+    <physvol name="pvUX853Flange01"                volume="lvUX853Flange01">
+      <position z="UX853Flange01Zpos"/>
+    </physvol>
+    <physvol name="pvUX853Cone02"                   volume="lvUX853Cone02">
+      <position z="UX853Cone02Zpos"/>
+    </physvol>
+    <physvol name="pvUX853Cone03"                   volume="lvUX853Cone03">
+      <position z="UX853Cone03Zpos"/>
+    </physvol>
+    <physvol name="pvUX853Cone03Flange"             volume="lvUX853Cone03Flange">
+      <position z="UX853Cone03FlangeZpos"/>
+    </physvol>
+    <physvol name="pvUX853Cone04"                   volume="lvUX853Cone04">
+      <position z="UX853Cone04Zpos"/>
+    </physvol>
+    <physvol name="pvUX853Cone05A"                  volume="lvUX853Cone05A">
+      <position z="UX853Cone05AZpos"/>
+    </physvol>
+    <!-- Now the vacuum inside -->
+    <physvol name="pvUX853Vacuum01"                 volume="lvUX853Vacuum01">
+      <position z="0.5*UX853Vacuum01Lenght"/>
+    </physvol>
+
+  </volume>
+
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet.xml b/compact/components/Pipe/2025-v00.00/Magnet.xml
new file mode 100644
index 000000000..2f5354c0b
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Magnet.xml
@@ -0,0 +1,83 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+
+  <detectors>
+    <detector name="PipeMagnet" type="DD4hep_VolumeAssembly" parent="${PipeMagnet:parent}" vis="Pipe:Vis">
+      <!-- ************************************************************** -->
+      <!-- * BEAM PIPE                                                  * -->
+      <!-- * Sections in MagnetRegion                                   * -->
+      <!-- *   from z=2270 mm to z=7620 mm                              * -->
+      <!-- *                                                            * -->
+      <!-- * UX85-1, Compensator at 2800mm, UX85-2, Bellow connection   * -->
+      <!-- * at 6900 and UX85-3                                         * -->
+      <!-- *                                                            * -->
+      <!-- * Author: Gloria Corti                                       * -->
+      <!-- *                                                            * -->
+      <!-- * Consists of                                                * -->
+      <!-- *   UX85-1:                                                  * -->
+      <!-- *     - conical sections of 10 mrad of different thickness   * -->
+      <!-- *       and materials                                        * -->
+      <!-- *     - flange                                               * -->
+      <!-- *   Compensator:                                             * -->
+      <!-- *     - two bellows                                          * -->
+      <!-- *     - conical sections of 10 mrad                          * -->
+      <!-- *     - two flanges                                          * -->
+      <!-- *   UX85-2:                                                  * -->
+      <!-- *     - conical sections of 10 mrad of different thickness   * -->
+      <!-- *     - two flanges                                          * -->
+      <!-- *   Bellow at 6900:                                          * -->
+      <!-- *     - one bellows                                          * -->
+      <!-- *     - conical section of 10 mrad                           * -->
+      <!-- *     - two flanges                                          * -->
+      <!-- *   UX85-3:                                                  * -->
+      <!-- *     - one flange                                           * -->
+      <!-- *     - conical section of 10 mrad                           * -->
+      <!-- *   and corresponding vaccum conical sections                * -->
+      <!-- ************************************************************** -->
+
+      <include ref="Magnet-UX851.xml"/>
+      <include ref="Magnet-UX852.xml"/>
+      <include ref="Magnet-UX853.xml"/>
+      <include ref="Magnet-Bellows.xml"/>
+      <include ref="Magnet-Compensator.xml"/>
+
+      <!--==================================================================================-->
+      <!--===================================Final  Assembly================================-->
+      <!--==================================================================================-->
+      <!-- For the moment assume sections put at 0.0 of this (set with center
+	   at start of MagnetRegion (=2700 mm) -->
+      <envelope type="Assembly" name="lvUX85InMagnet" vis="Pipe:Magnet">
+	<physvol name="pvUX851InMagnet"		 volume="lvUX851InMagnet">
+	  <position z="0.0*mm"/>
+	</physvol>
+	<physvol name="pvUX85Compensator2800"    volume="lvUX85Compensator2800">
+	  <position z="UX851InMagnetLenght"/>
+	</physvol>
+	<physvol name="pvUX852"  		 volume="lvUX852">
+	  <position z="UX851InMagnetLenght + UX85C2800Lenght"/>
+	</physvol>
+	<physvol name="pvUX85Bellow6900"	 volume="lvUX85Bellow6900">
+	  <position z="UX851InMagnetLenght + UX85C2800Lenght + UX852Lenght"/>
+	</physvol>
+	<physvol name="pvUX853" 		 volume="lvUX853InMagnet">
+	  <position z="UX851InMagnetLenght + UX85C2800Lenght + UX852Lenght + UX85B6900Lenght"/>
+	</physvol>
+      </envelope>
+      <!-- Central position of the pipe in the magnet region  -->
+      <position z= "0.5*Regions:BeforeMagnetZSize - Regions:MagnetRegionZPos" />
+      <nodebug/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeAfterMagnet.xml b/compact/components/Pipe/2025-v00.00/PipeAfterMagnet.xml
new file mode 100644
index 000000000..0623811e6
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeAfterMagnet.xml
@@ -0,0 +1,14 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="AfterMagnet-Params.xml"/>
+  <include ref="AfterMagnet-Bakeout.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeAfterMuon.xml b/compact/components/Pipe/2025-v00.00/PipeAfterMuon.xml
new file mode 100644
index 000000000..f12873179
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeAfterMuon.xml
@@ -0,0 +1,17 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="AfterMuon-Params.xml"/>
+  <include ref="AfterMuon.xml"/>
+  <include ref="VMA/VMA-AA-Downstream.xml"/>
+  <include ref="VMA/VMA-AA-DownstreamVax.xml"/>
+  <include ref="VMA/VMA-BJ.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeAfterT.xml b/compact/components/Pipe/2025-v00.00/PipeAfterT.xml
new file mode 100644
index 000000000..9d87ef226
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeAfterT.xml
@@ -0,0 +1,14 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="AfterT.xml"/>
+  <include ref="AfterT-Support.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeBeforeMagGeomParams.xml b/compact/components/Pipe/2025-v00.00/PipeBeforeMagGeomParams.xml
new file mode 100644
index 000000000..59b1cde20
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeBeforeMagGeomParams.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+<define>
+<!-- ***************************************************************** -->
+<!-- *  BeamPipe in BeforeMagnet geometry parameters                 * -->
+<!-- *                                                               * -->
+<!-- *  Date: 2006-03-02                                             * -->
+<!-- *  Author: Gloria Corti                                         * -->
+<!-- *                                                               * -->
+<!-- *  The connection to Velo window is in Velo2Rich1               * -->
+<!-- *  This section of the beam pipe extend from z=970mm to 2700mm  * -->
+<!-- *                                                               * -->
+<!-- ***************************************************************** -->
+
+<!-- ***************************************************************** -->
+<!-- * UX85-1 In RICH1                                               * -->
+<!-- ***************************************************************** -->
+
+<!-- UX84-2 -->
+  <constant name = "UX842CylLength"    value =  "1621.00*mm"/>
+  <constant name = "UX842CylThick"     value =  "2.00*mm"/>
+  <constant name = "UX842CylRadius"    value = "40.00*mm"/>
+
+<!-- UX84 Flange Down -->
+  <constant name = "UX84FlangeDownLength"    value =  "20.00*mm"/>
+  <constant name = "UX84FlangeDownThick"     value =  "34.00*mm"/>
+  <constant name = "UX84FlangeDownRadius"    value = "UX842CylRadius+UX842CylThick"/>
+  <constant name = "UX84FlangeDownPosZ"      value = "UX842CylLength/2-UX84FlangeDownLength/2"/>
+
+<!-- UX84 Support -->
+  <constant name = "PipeSupBefVeloRec1X"       value =  "300.00*mm"/>
+  <constant name = "PipeSupBefVeloRec1Y"       value =  "380.00*mm"/>
+  <constant name = "PipeSupBefVeloRec1Z"       value =  "15.00*mm"/>
+  <constant name = "PipeSupBefVeloRec1HoleRad" value =  "81.00*mm"/>
+  <constant name = "PipeSupBefVeloRec2X"       value =  "180.00*mm"/>
+  <constant name = "PipeSupBefVeloRec2Y"       value =  "187.00*mm"/>
+  <constant name = "PipeSupBefVeloRec2Z"       value =  "20.00*mm"/>
+  <constant name = "PipeSupBefVeloRec2HoleRad" value =  "42.50*mm"/>
+
+<!-- UX85-1 Step to 54 mm diameter (after RF connection in Velo2Rich1 -->
+  <constant name = "UX851Cyl01Lenght"  value =  "1.00*mm"/>
+  <constant name = "UX851Cyl01Thick"   value =  "3.50*mm"/>
+  <constant name = "UX851Cyl01Radius"  value = "27.00*mm"/>
+  <constant name = "UX851Cyl01Zpos"    value = "0.5*UX851Cyl01Lenght"/>
+
+<!-- UX85-1 Cylinder 54 mm diamater Aluminium -->
+  <constant name  = "UX851Cyl02Lenght"  value = "16.00*mm"/>
+  <constant name  = "UX851Cyl02Thick"   value =  "1.50*mm"/>
+  <constant name  = "UX851Cyl02Radius"  value = "27.00*mm"/>
+  <constant name  = "UX851Cyl02Zpos"
+             value = "UX851Cyl01Lenght + 0.5*UX851Cyl02Lenght"/>
+
+<!-- UX85-1 Cylinder 54 mm diamater Beryllium - welding              -->
+<!--    extend from z = 987 mm to z = 982 mm -  RICH1SubMaster split -->
+<!-- ***************************************************************** -->
+  <constant name  = "UX851Cyl03Lenght"   value = "5.00*mm"/>
+  <constant name  = "UX851Cyl03Thick"    value = "1.50*mm"/>
+  <constant name  = "UX851Cyl03Radius"   value = "27.00*mm"/>
+
+  <constant name  = "UX851Cyl03ALenght"
+             value = "UX851Rich1SplitZminIP - UX851ZStartIP - UX851Cyl01Lenght -
+                      UX851Cyl02Lenght"/>
+  <constant name  = "UX851Cyl03AZpos"
+             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + 0.5*UX851Cyl03ALenght"/>
+
+  <constant name  = "UX851Cyl03BLenght"
+             value = "UX851Cyl03Lenght - UX851Cyl03ALenght"/>
+  <constant name  = "UX851Cyl03BZpos"
+             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03ALenght+
+                      0.5*UX851Cyl03BLenght"/>
+
+<!-- UX85-1 Cylinder 54 mm diamater Beryllium -->
+  <constant name  = "UX851Cyl04Lenght"   value = "88.00*mm"/>
+  <constant name  = "UX851Cyl04Radius"   value = "27.00*mm"/>
+  <constant name  = "UX851Cyl04Thick"    value =  "1.00*mm"/>
+  <constant name  = "UX851Cyl04Zpos"
+             value = "UX851Cyl01Lenght + UX851Cyl02Lenght+UX851Cyl03Lenght +
+                      0.5*UX851Cyl04Lenght"/>
+
+<!-- UX85-1 Cone 25 mrad                                               -->
+<!--    extend from z = 1080 mm to z = 2210 mm -  RICH1SubMaster split -->
+<!-- ***************************************************************** -->
+  <constant name  = "UX851Cone05Lenght"      value = "1130.00*mm"/>
+  <constant name  = "UX851Cone05Thick"       value =    "1.00*mm"/>
+
+  <constant name  = "UX851Cone05ALenght"
+             value = "UX851Rich1SplitZmaxIP - UX851ZStartIP - UX851Cyl01Lenght -
+                      UX851Cyl02Lenght - UX851Cyl03Lenght - UX851Cyl04Lenght"/>
+  <constant name  = "UX851Cone05ARadiusZmin" value = "27.00*mm"/>
+  <constant name  = "UX851Cone05ARadiusZmax"
+             value = "UX851Rich1SplitZmaxIP*tan(UX851Angle)"/>
+  <constant name  = "UX851Cone05AZpos"
+             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght +
+                      UX851Cyl04Lenght + 0.5*UX851Cone05ALenght"/>
+
+  <constant name  = "UX851Cone05BLenght"
+             value = "UX851Cone05Lenght - UX851Cone05ALenght"/>
+  <constant name  = "UX851Cone05BRadiusZmin" value = "UX851Cone05ARadiusZmax"/>
+  <constant name  = "UX851Cone05BRadiusZmax" value = "55.21*mm"/>
+  <constant name  = "UX851Cone05BZpos"
+             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght+
+                      UX851Cyl04Lenght + UX851Cone05ALenght + 0.5*UX851Cone05BLenght"/>
+
+<!-- UX85-1 Flange to seal RICH1 gas enclosure - around UX851Cone05 -->
+  <constant name  = "UX851Rich1Flange1Length"      value = "1*mm"/>
+  <constant name  = "UX851Rich1FlangeOffset"
+             value = "UX851Rich1FlangeOffsetIP - UX851ZStartIP"/>
+  <constant name  = "UX851Rich1FlangeOuterRadius"  value = "63.00*mm"/>
+  <constant name  = "UX851Rich1FlangeRadiusZmin"
+             value = "UX851Rich1FlangeOffsetIP*tan(UX851Angle) +
+                      UX851Cone05Thick"/>
+  <constant name  = "UX851Rich1FlangeRadiusZMax"
+             value = "(UX851Rich1FlangeOffsetIP + UX851Rich1Flange1Length)*
+                      tan(UX851Angle) + UX851Cone05Thick"/>
+  <constant name  = "UX851Rich1FlangeZpos"
+             value = "UX851Rich1FlangeOffset + 0.5*UX851Rich1Flange1Length"/>
+
+<!-- UX85-1 Window of -37 degree at end of 25 mrad cone -->
+  <constant name  = "UX851Win06Lenght"      value = "40.10*mm"/>
+  <constant name  = "UX851Win06Thick"       value = "1.0*mm"/>
+  <constant name  = "UX851Win06RadiusZmin"  value = "UX851Cone05BRadiusZmax"/>
+  <constant name  = "UX851Win06RadiusZmax"  value = "25*mm"/>
+  <constant name  = "UX851Win06Zpos"
+             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght +
+                      UX851Cyl04Lenght + UX851Cone05Lenght + 0.5*UX851Win06Lenght"/>
+
+<!-- UX85-1 Cylinder of 50 mm diameter                             -->
+<!--    extend from z = 2250.1 mm to z = 2500 mm -  RICH1/TT split -->
+<!--    Rich1 section                                              -->
+  <constant name  = "UX851Cyl07Lenght"  value = "249.90*mm"/>
+  <constant name  = "UX851Cyl07Thick"   value =   "1.00*mm"/>
+  <constant name  = "UX851Cyl07Radius"  value =  "25.00*mm"/>
+
+  <constant name  = "UX851Cyl07ALenght"
+             value = "UX851Rich1TTSplitZposIP - UX851ZStartIP - UX851Cyl01Lenght -
+                      UX851Cyl02Lenght - UX851Cyl03Lenght - UX851Cyl04Lenght -
+                      UX851Cone05Lenght - UX851Win06Lenght"/>
+  <constant name  = "UX851Cyl07AZpos"
+             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght +
+                      UX851Cyl04Lenght + UX851Cone05Lenght + UX851Win06Lenght +
+                      0.5*UX851Cyl07ALenght"/>
+
+<!-- UX85-1 in Rich1 -->
+  <constant name  = "UX851Rich1ALenght"
+             value = "UX851Cyl01Lenght+UX851Cyl02Lenght+UX851Cyl03ALenght"/>
+  <constant name  = "UX851Rich1BLenght"
+             value = "UX851Cyl03BZpos+UX851Cyl04Lenght+UX851Cone05ALenght"/>
+  <constant name  = "UX851Rich1CLenght"
+             value = "UX851Cone05BLenght+UX851Win06Lenght+UX851Cyl07ALenght"/>
+
+  <constant name  = "UX851InRich1Lenght"
+             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght +
+                      UX851Cyl04Lenght + UX851Cone05Lenght + UX851Win06Lenght +
+                      UX851Cyl07ALenght"/>
+
+<!-- Vacuum sections overlapping various of the mechanical sections above -->
+<!-- only segmentation due to shape or regions -->
+<!-- Rich1 Before SubMaster                    -->
+  <constant name  = "UX85Vacuum01Lenght"
+             value = "UX851Cyl01Lenght+UX851Cyl02Lenght+UX851Cyl03ALenght"/>
+<!-- Rich1 In SubMaster                        -->
+  <constant name  = "UX85Vacuum03BLenght"
+             value = "UX851Cyl03BLenght+UX851Cyl04Lenght"/>
+
+<!-- ***************************************************************** -->
+<!-- * UX85-1 In TT                                                  * -->
+<!-- ***************************************************************** -->
+
+<!-- UX85-1 Cylinder of 50 mm diameter                             -->
+<!--    extend from z = 2250.1 mm to z = 2500 mm -  RICH1/TT split -->
+<!--    TT section                                                 -->
+  <constant name  = "UX851Cyl07BLenght"
+             value = "UX851Cyl07Lenght - UX851Cyl07ALenght"/>
+  <constant name  = "UX851Cyl07BZpos"
+             value = "0.5*UX851Cyl07BLenght"/>
+
+<!-- UX85-1 Cone 10 mrad                    -->
+<!-- Stop at end of BeforeMagnet Region     -->
+  <constant name  = "UX851Cone08ALenght"
+             value = "UX851TTMagnetSplitZposIP - UX851ZStartIP - UX851Cyl01Lenght -
+                      UX851Cyl02Lenght - UX851Cyl03Lenght - UX851Cyl04Lenght -
+                      UX851Cone05Lenght - UX851Win06Lenght - UX851Cyl07Lenght"/>
+  <constant name  = "UX851Cone08AThick"      value =  "1.00*mm"/>
+  <constant name  = "UX851Cone08ARadiusZmin" value = "25.00*mm"/>
+  <constant name  = "UX851Cone08ARadiusZmax"
+             value = "UX851TTMagnetSplitZposIP*tan(UX851to4Angle)"/>
+  <constant name  = "UX851Cone08AZpos"
+             value = "UX851Cyl07BLenght + 0.5*UX851Cone08ALenght"/>
+
+<!-- UX85-1 in TT      -->
+  <constant name  = "UX851TTLenght"
+             value = "UX851Cyl07BZpos+UX851Cone08ALenght"/>
+
+<!-- UX85BeforeMagnet -->
+  <constant name  = "UX85BeforeMagnetLenght"
+             value = "UX851Rich1ALenght+UX851Rich1BLenght+UX851Rich1CLenght+
+                      UX851TTLenght"/>
+
+</define>
diff --git a/compact/components/Pipe/2025-v00.00/PipeBeforeMagnet.xml b/compact/components/Pipe/2025-v00.00/PipeBeforeMagnet.xml
new file mode 100644
index 000000000..1f837885d
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeBeforeMagnet.xml
@@ -0,0 +1,13 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="BeforeMagnet.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeBeforeVelo.xml b/compact/components/Pipe/2025-v00.00/PipeBeforeVelo.xml
new file mode 100644
index 000000000..d2ecdaebd
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeBeforeVelo.xml
@@ -0,0 +1,14 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="BeforeVelo.xml"/>
+  <include ref="BeforeVelo-Support.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeCommon.xml b/compact/components/Pipe/2025-v00.00/PipeCommon.xml
new file mode 100644
index 000000000..597a556df
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeCommon.xml
@@ -0,0 +1,17 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="parameters.xml"/>
+  <include ref="materials.xml"/>
+  <include ref="VMA/VMA-Params.xml"/>
+  <include ref="PipeGeomParams.xml"/>
+  <include ref="PipeBeforeMagGeomParams.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeDownstream.xml b/compact/components/Pipe/2025-v00.00/PipeDownstream.xml
new file mode 100644
index 000000000..f8324af3c
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeDownstream.xml
@@ -0,0 +1,21 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+
+  <include ref="Downstream-PipeParams.xml"/>
+  <include ref="Downstream.xml"/>
+
+  <include ref="Downstream-BakeoutParams.xml"/>
+  <include ref="Downstream-Bakeout.xml"/>
+
+  <include ref="Downstream-SupportParams.xml"/>
+  <include ref="Downstream-Support.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeGeomParams.xml b/compact/components/Pipe/2025-v00.00/PipeGeomParams.xml
new file mode 100644
index 000000000..1f8ba4dbe
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeGeomParams.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+<define>
+
+<!-- ***************************************************************** -->
+<!-- *  BeamPipe geometry parameters                                 * -->
+<!-- *                                                               * -->
+<!-- *  Date: 2006-03-02                                             * -->
+<!-- *  Author: Gloria Corti                                         * -->
+<!-- *                                                               * -->
+<!-- *  The connection to Velo window is in Velo2Rich1               * -->
+<!-- ***************************************************************** -->
+
+<!-- Angle of cones of the beam pipe -->
+
+  <constant name  = "UX851Angle"              value = "25.0*mrad"/>
+  <constant name  = "UX851to4Angle"           value = "10.0*mrad"/>
+
+<!-- UX85-1 General Positions and splits -->
+  <constant name = "UX851ZStartIP"            value =  "970.00*mm"/>
+  <constant name = "UX851Rich1SplitZminIP"    value =  "990.00*mm"/>
+  <constant name = "UX851Rich1SplitZmaxIP"    value = "2165.00*mm"/>
+  <constant name = "UX851Rich1TTSplitZposIP"  value = "2270.00*mm"/>
+  <constant name = "UX851TTMagnetSplitZposIP" value = "2700.00*mm"/>
+  <constant name = "UX851Rich1FlangeOffsetIP" value = "2146.00*mm"/>
+
+<!-- UX85-1 Lenght of section split between BeforeMagnet and Magnet -->
+  <constant name  = "UX851Cone08Lenght"       value =  "250.00*mm"/>
+
+<!-- Compensator at 2800 General Positions -->
+  <constant name = "UX85C2800ZStartIP"        value = "2798.80*mm"/>
+
+<!-- UX85-3 General Positions and splits -->
+  <constant name = "UX853ZStartIP"               value =  "7050.00*mm"/>
+  <constant name = "UX853MagnetTSplitZposIP"     value =  "7620.00*mm"/>
+  <constant name = "UX853TRich2SplitZposIP"      value =  "9439.00*mm"/>
+  <constant name = "UX853Rich2DownSplitZposIP"   value = "11900.00*mm"/>
+
+<!-- UX85-3 Lenght of sections related to split between Magnet and T -->
+  <constant name  = "UX853Flange01Cone02Lenght"  value =  "48.80*mm"/>
+  <constant name  = "UX853Cone0304Lenght"        value = "401.20*mm"/>
+  <constant name  = "UX853Cone05Lenght"          value = "800.00*mm"/>
+
+<!-- UX85-3 Lenght of sections related to split between Rich2 and Downstream -->
+<!-- manifactured 5 mm shorter than design                                   -->
+  <constant name  = "UX853Cone11Cone14Lenght"    value = "1495.00*mm"/>
+  <constant name  = "UX853Cone15Flange17Lenght"  value =  "100.00*mm"/>
+  <constant name  = "UX853ConeSupportFromEnd"    value = "1175.50*mm"/>
+  <constant name  = "UX853Cone12Lenght"          value =   "50.00*mm"/>
+
+<!-- Support Ring between Rich2 and M1 split -->
+  <constant name  = "UX853CableZposIP"           value = "11907.00*mm"/>
+  <constant name  = "UX853CollarInnerRadius"     value =   "122.10*mm"/>
+  <constant name  = "UX853CollarMiddleRadius"    value =   "126.50*mm"/>
+  <constant name  = "UX853CollarOuterRadius"     value =   "140.00*mm"/>
+  <constant name  = "UX853CollarSize"            value =    "24.00*mm"/>
+  <constant name  = "UX853CollarRich2Size"
+             value = "UX853Rich2DownSplitZposIP -
+                      (UX853CableZposIP - 0.5*UX853CollarSize)"/>
+
+<!-- Permanent Bakeout in RICH2 -->
+ <constant  name  = "UX853BakeoutRich2StartIP"   value = "9450.00*mm"/>
+ <constant  name  = "UX853BakeoutRich2Lenght"
+             value = "(UX853Rich2DownSplitZposIP - UX853CollarRich2Size) -
+                      UX853BakeoutRich2StartIP" />
+
+<!-- Compensator at 13100 (-5mm shorter) General Positions and splits -->
+  <constant name = "UX85C13100ZStartIP"          value ="13095.00*mm"/>
+
+<!-- UX85-4 General Positions-->
+  <constant name = "UX854ZStartIP"               value ="14400.00*mm"/>
+
+
+</define>
diff --git a/compact/components/Pipe/2025-v00.00/PipeMagnet.xml b/compact/components/Pipe/2025-v00.00/PipeMagnet.xml
new file mode 100644
index 000000000..030ea7c1d
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeMagnet.xml
@@ -0,0 +1,16 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="Magnet-PipeParams.xml"/>
+  <include ref="Magnet.xml"/>
+  <include ref="Magnet-SupportParams.xml"/>
+  <include ref="Magnet-Support.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeT.xml b/compact/components/Pipe/2025-v00.00/PipeT.xml
new file mode 100644
index 000000000..bfbea67fa
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeT.xml
@@ -0,0 +1,13 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="InT.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeTV.xml b/compact/components/Pipe/2025-v00.00/PipeTV.xml
new file mode 100644
index 000000000..25d44b6ca
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeTV.xml
@@ -0,0 +1,13 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="InTV.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeUP.xml b/compact/components/Pipe/2025-v00.00/PipeUP.xml
new file mode 100644
index 000000000..1291f86f0
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeUP.xml
@@ -0,0 +1,14 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="InUP.xml"/>
+  <include ref="VMA/VMA-AA.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeUT.xml b/compact/components/Pipe/2025-v00.00/PipeUT.xml
new file mode 100644
index 000000000..97a711eed
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeUT.xml
@@ -0,0 +1,14 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="InUT.xml"/>
+  <include ref="VMA/VMA-AA.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeUpstream.xml b/compact/components/Pipe/2025-v00.00/PipeUpstream.xml
new file mode 100644
index 000000000..96f00f4bb
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeUpstream.xml
@@ -0,0 +1,19 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="Upstream-Params.xml"/>
+  <include ref="Upstream.xml"/>
+  <include ref="VMA/VMA-AA-UpstreamVax.xml"/>
+  <include ref="VMA/VMA-AA-Upstream.xml"/>
+  <include ref="VMA/VMA-CA-Upstream1.xml"/>
+  <include ref="VMA/VMA-CA-Upstream2.xml"/>
+  <include ref="VMA/VMA-BK-Upstream.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeVP.xml b/compact/components/Pipe/2025-v00.00/PipeVP.xml
new file mode 100644
index 000000000..e4e3d0b67
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/PipeVP.xml
@@ -0,0 +1,13 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+  <include ref="InVP.xml"/>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-BPMSW.xml b/compact/components/Pipe/2025-v00.00/Upstream-BPMSW.xml
new file mode 100644
index 000000000..bfc2fc84e
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Upstream-BPMSW.xml
@@ -0,0 +1,192 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--==================================BPMSW==================================-->
+<!--===========================================================================-->
+<pipe>
+
+
+  <!-- UpStr:BPMSW -->
+  <!-- 1/8th of middle section -->
+  <volume name="lvBPMSWMidSect" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="subtraction" name="UpStr:BPMSWMidSectSub">
+      <shape type="Tube" name="UpStr:BPMSWMidSectTubs"
+             dz="0.5*UpStr:BPMSWMidSectLength"
+             rmin="UpStr:BPMSWMidSectRadius"
+             rmax="UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick"
+             startPhiAngle="44.9*degree"
+             deltaPhiAngle="89.8*degree"/>
+      <shape type="Box" name="UpStr:BPMSWMidSectTopCut"
+             dx="0.5*UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick"
+             dy="0.5*UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick"
+             dz="0.5*UpStr:BPMSWMidSectLength+1.0*mm"/>
+      <position y="UpStr:BPMSWMidSectTopCutOffset + UpStr:BPMSWMidSectRadius/2 + UpStr:BPMSWMidSectThick/2"/>
+      <shape type="Tube" name="UpStr:BPMSWMidSectHoleTubs"
+             dz="0.5*UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick"
+             rmax="UpStr:BPMSWMidSectHoleRadius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick/2" z="-UpStr:BPMSWMidSectHolePosZ"/>
+      </transformation>
+      <shape type="Tube" name="UpStr:BPMSWMidSectEdgeTubs"
+             dz="0.5*UpStr:BPMSWMidSectEdgeDepth*2"
+             rmax="UpStr:BPMSWMidSectEdgeRadius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="UpStr:BPMSWMidSectTopCutOffset" z="-UpStr:BPMSWMidSectHolePosZ"/>
+      </transformation>
+    </shape>
+  </volume>
+
+  <!-- Upstream Flange -->
+  <volume name="lvBPMSWFlangeUp" material="Pipe:Steel316LN">
+    <shape type="Tube" name="UpStr:BPMSWFlangeUpTubs"
+           dz="0.5*UpStr:BPMSWFlangeUpLength"
+           rmin="UpStr:BPMSWFlangeUpRadius"
+           rmax="UpStr:BPMSWFlangeUpRadius + UpStr:BPMSWFlangeUpThick"/>
+  </volume>
+
+  <!-- Upstream Flange -->
+  <volume name="lvBPMSWFlangeDown" material="Pipe:Steel316LN">
+    <shape type="Tube" name="UpStr:BPMSWFlangeDownTubs"
+           dz="0.5*UpStr:BPMSWFlangeDownLength"
+           rmin="UpStr:BPMSWFlangeDownRadius"
+           rmax="UpStr:BPMSWFlangeDownRadius + UpStr:BPMSWFlangeDownThick"/>
+  </volume>
+
+  <!-- Entry tube -->
+  <volume name="lvBPMSWEntry" material="Pipe:Steel316LN">
+    <shape type="Tube" name="UpStr:BPMSWEntryTubs"
+           dz="0.5*UpStr:BPMSWEntryLength"
+           rmin="UpStr:BPMSWEntryRadius"
+           rmax="UpStr:BPMSWEntryRadius + UpStr:BPMSWEntryThick"/>
+  </volume>
+
+  <!-- Exit Tube -->
+  <volume name="lvBPMSWExit" material="Pipe:Steel316LN">
+    <shape type="Tube" name="UpStr:BPMSWExitTubs"
+           dz="0.5*UpStr:BPMSWExitLength"
+           rmin="UpStr:BPMSWExitRadius"
+           rmax="UpStr:BPMSWExitRadius + UpStr:BPMSWExitThick"/>
+  </volume>
+
+  <!-- Plug -->
+  <volume name="lvBPMSWPlug" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="lvBPMSWPlugUnion">
+      <shape type="Tube" name="lvBPMSWPlugFlange"
+             dz="0.5*UpStr:BPMSWPlugFlangeLength"
+             rmax="UpStr:BPMSWPlugFlangeRadius"/>
+      <shape type="Tube" name="lvBPMSWPlugPin"
+             dz="0.5*UpStr:BPMSWPlugPinLength"
+             rmax="UpStr:BPMSWPlugPinRadius"/>
+    </shape>
+  </volume>
+
+  <!-- Vacuum -->
+  <volume name="lvBPMSWVacuum" material="Vacuum">
+    <shape type="Tube" name="UpStr:BPMSWVacuumTubs"
+           dz="0.5*UpStr:BPMSWVacuumLength"
+           rmax="UpStr:BPMSWFlangeUpRadius - 0.01*mm"/>
+  </volume>
+
+  <!-- 1/8th of middle section with plug -->
+  <volume name="lvBPMSWMidSectAss">
+    <physvol name="pvBPMSWMidSect"                volume="lvBPMSWMidSect"/>
+    <physvol name="pvBPMSWPlug"                   volume="lvBPMSWPlug">
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="UpStr:BPMSWMidSectTopCutOffset + UpStr:BPMSWPlugFlangeLength/2" z="-UpStr:BPMSWMidSectHolePosZ"/>
+      </transformation>
+    </physvol>
+  </volume>
+
+  <!-- Assebly of body -->
+  <volume name="lvBPMSWBody">
+    <physvol name="pvBPMSWFlangeUp"               volume="lvBPMSWFlangeUp"/>
+    <physvol name="pvBPMSWEntry"                  volume="lvBPMSWEntry">
+      <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength/2"/>
+    </physvol>
+
+    <physvol name="pvBPMSWMidSect0A"
+             volume="lvBPMSWMidSectAss">
+      <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength/2"/>
+    </physvol>
+    <physvol name="pvBPMSWMidSect1A"              volume="lvBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation z="90.0*degree"/>
+        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvBPMSWMidSect2A"              volume="lvBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation z="180.0*degree"/>
+        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvBPMSWMidSect3A"              volume="lvBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation z="270.0*degree"/>
+        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+
+    <physvol name="pvBPMSWMidSect0B"              volume="lvBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree"/>
+        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength + UpStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvBPMSWMidSect1B"              volume="lvBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree" z="90.0*degree"/>
+        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength + UpStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvBPMSWMidSect2B"              volume="lvBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree" z="180.0*degree"/>
+        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength + UpStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvBPMSWMidSect3B"              volume="lvBPMSWMidSectAss">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree" z="270.0*degree"/>
+        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength + UpStr:BPMSWMidSectLength/2"/>
+      </transformation>
+    </physvol>
+
+    <physvol name="pvBPMSWExit"                   volume="lvBPMSWExit">
+      <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength*2 + UpStr:BPMSWExitLength/2"/>
+    </physvol>
+    <physvol name="pvBPMSWFlangeDown"             volume="lvBPMSWFlangeDown">
+      <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength*2 + UpStr:BPMSWExitLength + UpStr:BPMSWFlangeDownLength/2"/>
+    </physvol>
+  </volume>
+
+  <volume name="lvBPMSW">
+    <physvol name="pvBPMSWBody"                   volume="lvBPMSWBody"/>
+    <physvol name="pvBPMSWVacuum"                 volume="lvBPMSWVacuum">
+      <position z="-UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWVacuumLength/2"/>
+    </physvol>
+  </volume>
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-Params.xml b/compact/components/Pipe/2025-v00.00/Upstream-Params.xml
new file mode 100644
index 000000000..13b6479a9
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Upstream-Params.xml
@@ -0,0 +1,236 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+
+  <define>
+    <!--=====================================Pipe segment replacement of VVSSH  -->
+    <constant name="UpStr:VVSSHPipeZ"                 value="80.0*mm + 15.0*mm"/> <!-- 15mm to make pipe complete -->
+    <constant name="UpStr:VVSSHPipeRad"               value="30.0*mm"/>
+    <constant name="UpStr:VVSSHPipeThick"             value="1.5*mm"/>
+
+    <!--=====================================Parameters for VVSGF  -->
+    <constant name="UpStr:VVSGFBlockX"                value="160.0*mm"/>
+    <constant name="UpStr:VVSGFBlockY"                value="480.0*mm"/>
+    <constant name="UpStr:VVSGFBlockZ"                value="55.0*mm"/>
+    <constant name="UpStr:VVSGFHoleY"                 value="0.0*mm"/>
+    <constant name="UpStr:VVSGFFlangeZ"               value="10.0*mm - 0.01*mm"/>
+    <constant name="UpStr:VVSGFBlockRad"              value="31.5*mm"/>
+    <constant name="UpStr:VVSGFFlangeThick"           value="100.0*mm - UpStr:VVSGFBlockRad"/>
+
+    <!-- UX84 -->
+    <constant name="UpStr:UX84CylLength"    value="327.00*mm"/>
+    <constant name="UpStr:UX84CylThick"     value="2.00*mm"/>
+    <constant name="UpStr:UX84CylRadius"    value="40.00*mm"/>
+
+    <!-- UX84 Flange Up -->
+    <constant name="UpStr:UX84FlangeLength"    value="20.00*mm"/>
+    <constant name="UpStr:UX84FlangeThick"     value="34.00*mm"/>
+    <constant name="UpStr:UX84FlangeRadius"    value="UpStr:UX84CylRadius+UpStr:UX84CylThick"/>
+    <constant name="UpStr:UX84FlangePosZ"      value="-UpStr:UX84CylLength/2+UpStr:UX84FlangeLength/2"/>
+
+    <!-- Parameters for UpStr:BPMSW -->
+    <constant name="UpStr:BPMSWMidSectLength"          value="90.0*mm"/>
+    <constant name="UpStr:BPMSWMidSectRadius"          value="34.5*mm"/>
+    <constant name="UpStr:BPMSWMidSectThick"           value="56.5*mm - UpStr:BPMSWMidSectRadius"/>
+    <constant name="UpStr:BPMSWMidSectTopCutOffset"    value="47.9*mm"/>
+    <constant name="UpStr:BPMSWMidSectHoleRadius"      value="8.5*mm"/>
+    <constant name="UpStr:BPMSWMidSectHolePosZ"        value="15.0*mm"/>
+    <constant name="UpStr:BPMSWMidSectEdgeDepth"       value="4.0*mm"/>
+    <constant name="UpStr:BPMSWMidSectEdgeRadius"      value="28.0*mm"/>
+
+    <constant name="UpStr:BPMSWFlangeUpLength"         value="17.4*mm"/>
+    <constant name="UpStr:BPMSWFlangeUpRadius"         value="30.0*mm"/>
+    <constant name="UpStr:BPMSWFlangeUpThick"          value="57.0*mm - UpStr:BPMSWFlangeUpRadius"/>
+
+    <constant name="UpStr:BPMSWFlangeDownLength"       value="19.7*mm"/>
+    <constant name="UpStr:BPMSWFlangeDownRadius"       value="UpStr:BPMSWFlangeUpRadius"/>
+    <constant name="UpStr:BPMSWFlangeDownThick"        value="76.0*mm - UpStr:BPMSWFlangeDownRadius"/>
+
+    <constant name="UpStr:BPMSWEntryLength"            value="33.3*mm"/>
+    <constant name="UpStr:BPMSWEntryRadius"            value="UpStr:BPMSWFlangeUpRadius"/>
+    <constant name="UpStr:BPMSWEntryThick"             value="4.5*mm"/>
+
+    <constant name="UpStr:BPMSWExitLength"             value="34.6*mm"/>
+    <constant name="UpStr:BPMSWExitRadius"             value="UpStr:BPMSWFlangeUpRadius"/>
+    <constant name="UpStr:BPMSWExitThick"              value="51.5*mm - UpStr:BPMSWExitRadius"/>
+
+    <constant name="UpStr:BPMSWPlugFlangeLength"       value="11.0*mm"/>
+    <constant name="UpStr:BPMSWPlugFlangeRadius"       value="26.0*mm"/>
+    <constant name="UpStr:BPMSWPlugPinLength"          value="13.4*mm*2 + UpStr:BPMSWPlugFlangeLength"/>
+    <constant name="UpStr:BPMSWPlugPinRadius"          value="7.5*mm"/>
+
+    <constant name="UpStr:BPMSWVacuumLength"           value="UpStr:BPMSWFlangeUpLength + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength*2 + UpStr:BPMSWExitLength + UpStr:BPMSWFlangeDownLength"/>
+
+    <!-- Parameters for pipe UX86Adapter  -->
+    <constant name="UpStr:UX86AdapterPipeZ"              value="72.0*mm"/>
+    <constant name="UpStr:UX86AdapterPipeRad"            value="30.15*mm"/>
+    <constant name="UpStr:UX86AdapterPipeThick"          value="1.6*mm"/>
+
+    <!-- Parameters for pipe in MBXWH -->
+    <constant name="UpStr:MBXWHPipeLength"             value="3916.0*mm"/>
+    <constant name="UpStr:MBXWHPipeRadius"             value="26.0*mm"/>
+    <constant name="UpStr:MBXWHPipeThick"              value="2.0*mm"/>
+
+    <!-- Parameters for pipe in UpStr:MBXWS -->
+    <constant name="UpStr:MBXWSPipeLength"             value="1275.0*mm"/>
+    <constant name="UpStr:MBXWSPipeRadius"             value="26.0*mm"/>
+    <constant name="UpStr:MBXWSPipeThick"              value="2.0*mm"/>
+
+    <!-- Parameters for pipe in VCDA -->
+    <constant name="UpStr:VCDAPipeLength"              value="7000.0*mm"/>
+    <constant name="UpStr:VCDAPipeRadius"              value="40.0*mm"/>
+    <constant name="UpStr:VCDAPipeThick"               value="2.0*mm"/>
+
+    <!-- Parameters for pipe in VCDBU -->
+    <constant name="UpStr:VCDBUPipeLength"             value="5130.0*mm"/>
+    <constant name="UpStr:VCDBUPipeRadius"             value="40.0*mm"/>
+    <constant name="UpStr:VCDBUPipeThick"              value="2.0*mm"/>
+
+    <!-- Parameters for pipe in Trans -->
+    <constant name="UpStr:TransPipeLength"             value="75.0*mm"/>
+    <constant name="UpStr:TransPipeRadius"             value="40.0*mm"/>
+    <constant name="UpStr:TransPipeThick"              value="2.0*mm"/>
+
+
+<!-- Main -->
+  <constant name="UpStr:VaxMainBodyLength"                value="126.0*mm - 0.02*mm"/>
+  <constant name="UpStr:VaxMainBodyRadius"                value="100.0*mm"/>
+  <constant name="UpStr:VaxMainBodyThick"                 value="2.0*mm"/>
+  <constant name="UpStr:VaxMainBodyHole1Radius"           value="50.0*mm"/>
+  <constant name="UpStr:VaxMainBodyHole2Radius"           value="50.0*mm"/>
+  <constant name="UpStr:VaxMainBodyHole3Radius"           value="30.25*mm"/>
+  <constant name="UpStr:VaxMainBodyHole4Radius"           value="19.6*mm"/>
+  <constant name="UpStr:VaxMainBodyHole5Radius"           value="8.5*mm"/>
+  <constant name="UpStr:VaxMainBodyHole4Offset"           value="30.0*mm"/>
+  <constant name="UpStr:VaxMainBodyHole5Offset"           value="45.0*mm"/>
+
+
+<!-- Entry Window -->
+  <constant name="UpStr:VaxWindowTubsLenght"              value="4.0*mm"/>
+  <constant name="UpStr:VaxWindowFlangeRadius"            value="50.0*mm"/>
+  <constant name="UpStr:VaxWindowFlangeLength"            value="10.0*mm"/>
+  <constant name="UpStr:VaxWindowInnerRadius"             value="37.5*mm"/>
+  <constant name="UpStr:VaxWindowThick"                   value="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick - UpStr:VaxWindowFlangeRadius"/>
+  <constant name="UpStr:VaxWindowConeLength"              value="21.0*mm"/>
+  <constant name="UpStr:VaxWindowConeEndThick"            value="UpStr:VaxMainBodyRadius - UpStr:VaxWindowConeLength - UpStr:VaxWindowInnerRadius"/>
+  <constant name="UpStr:VaxWindowConeFlangeLength"        value="UpStr:VaxWindowFlangeLength - UpStr:VaxWindowTubsLenght"/>
+  <constant name="UpStr:VaxWindowConeEndLength"           value="5.0*mm"/>
+  <constant name="UpStr:VaxWindowConeEndRad"              value="59.0*mm"/>
+
+
+<!-- End Pipe -->
+  <constant name="UpStr:VaxEndPipeLength"                 value="64.0*mm"/>
+  <constant name="UpStr:VaxEndPipeRadius"                 value="32.5*mm"/>
+  <constant name="UpStr:VaxEndPipeThick"                  value="2.0*mm"/>
+  <constant name="UpStr:VaxEndPipeFlangeLength"           value="17.5*mm"/>
+  <constant name="UpStr:VaxEndPipeFlangeRadius"           value="UpStr:VaxEndPipeRadius + UpStr:VaxEndPipeThick + 0.01*mm"/>
+  <constant name="UpStr:VaxEndPipeFlangeThick"            value="63.5*mm - UpStr:VaxEndPipeFlangeRadius"/>
+
+
+<!-- End Cap -->
+  <constant name="UpStr:VaxEndCapTubsLenght"              value="UpStr:VaxWindowTubsLenght"/>
+  <constant name="UpStr:VaxEndCapInnerRadius"             value="UpStr:VaxEndPipeRadius + UpStr:VaxEndPipeThick + 0.01*mm"/>
+  <constant name="UpStr:VaxEndCapThick"                   value="UpStr:VaxMainBodyRadius - UpStr:VaxEndCapTubsLenght - UpStr:VaxEndCapInnerRadius"/>
+
+
+<!-- RF screen -->
+  <constant name="UpStr:VaxRfScreenFlangeLength"          value="8.0*mm"/>
+  <constant name="UpStr:VaxRfScreenFlangeRadius"          value="31.5*mm"/>
+  <constant name="UpStr:VaxRfScreenFlangeThick"           value="49.0*mm - UpStr:VaxRfScreenFlangeRadius"/>
+  <constant name="UpStr:VaxRfScreenEntryLength"           value="101.0*mm"/>
+  <constant name="UpStr:VaxRfScreenEntryRadius"           value="UpStr:VaxRfScreenFlangeRadius"/>
+  <constant name="UpStr:VaxRfScreenEntryThick"            value="2.5*mm"/>
+  <constant name="UpStr:VaxRfScreenConsLength"            value="10.0*mm"/>
+  <constant name="UpStr:VaxRfScreenExitLength"            value="63.5*mm"/>
+  <constant name="UpStr:VaxRfScreenExitRadius"            value="29.0*mm"/>
+  <constant name="UpStr:VaxRfScreenExitThick"             value="2.0*mm"/>
+
+
+<!-- Vacuum -->
+  <constant name="UpStr:VaxVacuumLength"                  value="190.0*mm"/>
+  <constant name="UpStr:VaxVacuumRadius"                  value="UpStr:VaxRfScreenExitRadius - 0.01*mm"/>
+
+
+<!-- Pipe 1 -->
+  <constant name="UpStr:VaxPipe1Length"                   value="204.0*mm"/>
+  <constant name="UpStr:VaxPipe1Radius"                   value="UpStr:VaxMainBodyHole1Radius"/>
+  <constant name="UpStr:VaxPipe1Thick"                    value="1.5*mm"/>
+  <constant name="UpStr:VaxPipe1HoleRadius"               value="19.6*mm"/>
+  <constant name="UpStr:VaxPipe1HoleOffset"               value="160.0*mm"/>
+
+
+<!-- Pipe 2 -->
+  <constant name="UpStr:VaxPipe2Length"                   value="330.0*mm"/>
+  <constant name="UpStr:VaxPipe2Radius"                   value="UpStr:VaxMainBodyHole2Radius"/>
+  <constant name="UpStr:VaxPipe2Thick"                    value="1.5*mm"/>
+  <constant name="UpStr:VaxPipe2FlangeLength"             value="19.8*mm"/>
+  <constant name="UpStr:VaxPipe2FlangeRadius"             value="UpStr:VaxPipe2Radius + UpStr:VaxPipe2Thick + 0.01*mm"/>
+  <constant name="UpStr:VaxPipe2FlangeThick"              value="75.5*mm - UpStr:VaxPipe2FlangeRadius"/>
+  <constant name="UpStr:VaxPipe2BeltLength"               value="5.0*mm"/>
+  <constant name="UpStr:VaxPipe2BeltPos"                  value="122.0*mm"/>
+
+
+<!-- Pipe 3 -->
+  <constant name="UpStr:VaxPipe3EntryLength"              value="220.0*mm"/>
+  <constant name="UpStr:VaxPipe3ExitLength"               value="120.0*mm"/>
+  <constant name="UpStr:VaxPipe3CutLength"                value="50.0*mm"/>
+  <constant name="UpStr:VaxPipe3Radius"                   value="UpStr:VaxMainBodyHole3Radius"/>
+  <constant name="UpStr:VaxPipe3Thick"                    value="1.5*mm"/>
+  <constant name="UpStr:VaxPipe3FlangeLength"             value="17.0*mm"/>
+  <constant name="UpStr:VaxPipe3FlangeRadius"             value="UpStr:VaxPipe3Radius + UpStr:VaxPipe3Thick + 0.01*mm"/>
+  <constant name="UpStr:VaxPipe3FlangeThick"              value="57.0*mm - UpStr:VaxPipe3FlangeRadius"/>
+
+<!-- Pipe 4 -->
+  <constant name="UpStr:VaxPipe4Length"                   value="158.5*mm"/>
+  <constant name="UpStr:VaxPipe4Radius"                   value="UpStr:VaxMainBodyHole4Radius"/>
+  <constant name="UpStr:VaxPipe4Thick"                    value="1.6*mm"/>
+  <constant name="UpStr:VaxPipe4FlangeLength"             value="13.0*mm"/>
+  <constant name="UpStr:VaxPipe4FlangeRadius"             value="UpStr:VaxPipe4Radius + UpStr:VaxPipe4Thick + 0.01*mm"/>
+  <constant name="UpStr:VaxPipe4FlangeThick"              value="35.0*mm - UpStr:VaxPipe4FlangeRadius"/>
+
+
+<!-- Pipe 5 -->
+  <constant name="UpStr:VaxPipe5Length"                   value="138.5*mm"/>
+  <constant name="UpStr:VaxPipe5Radius"                   value="UpStr:VaxMainBodyHole5Radius"/>
+  <constant name="UpStr:VaxPipe5Thick"                    value="1.0*mm"/>
+  <constant name="UpStr:VaxPipe5FlangeLength"             value="7.0*mm"/>
+  <constant name="UpStr:VaxPipe5FlangeRadius"             value="UpStr:VaxPipe5Radius + UpStr:VaxPipe5Thick + 0.01*mm"/>
+  <constant name="UpStr:VaxPipe5FlangeThick"              value="17.0*mm - UpStr:VaxPipe5FlangeRadius"/>
+
+
+<!-- Pipe 6 -->
+  <constant name="UpStr:VaxPipe6Length"                   value="110.0*mm"/>
+  <constant name="UpStr:VaxPipe6Radius"                   value="UpStr:VaxPipe1HoleRadius"/>
+  <constant name="UpStr:VaxPipe6Thick"                    value="1.6*mm"/>
+  <constant name="UpStr:VaxPipe6FlangeLength"             value="13.0*mm"/>
+  <constant name="UpStr:VaxPipe6FlangeRadius"             value="UpStr:VaxPipe6Radius + UpStr:VaxPipe6Thick + 0.01*mm"/>
+  <constant name="UpStr:VaxPipe6FlangeThick"              value="35.0*mm - UpStr:VaxPipe6FlangeRadius"/>
+
+
+<!-- Pipe 7 -->
+  <constant name="UpStr:VaxPipe7EntryLength"              value="115.0*mm"/>
+  <constant name="UpStr:VaxPipe7ExitLength"               value="110.0*mm"/>
+  <constant name="UpStr:VaxPipe7CutLength"                value="50.0*mm"/>
+  <constant name="UpStr:VaxPipe7Radius"                   value="30.25*mm"/>
+  <constant name="UpStr:VaxPipe7Thick"                    value="1.5*mm"/>
+  <constant name="UpStr:VaxPipe7LidLength"                value="4.0*mm"/>
+  <constant name="UpStr:VaxPipe7LidThick"                 value="UpStr:VaxPipe3Radius + UpStr:VaxPipe3Thick - UpStr:VaxPipe7Radius"/>
+  <constant name="UpStr:VaxPipe7FlangeLength"             value="17.0*mm"/>
+  <constant name="UpStr:VaxPipe7FlangeRadius"             value="UpStr:VaxPipe7Radius + UpStr:VaxPipe7Thick + 0.01*mm"/>
+  <constant name="UpStr:VaxPipe7FlangeThick"              value="57.0*mm - UpStr:VaxPipe7FlangeRadius"/>
+
+
+
+  </define>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-UX84.xml b/compact/components/Pipe/2025-v00.00/Upstream-UX84.xml
new file mode 100644
index 000000000..b3446dd14
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Upstream-UX84.xml
@@ -0,0 +1,46 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--==================================UX84-up================================-->
+<!--===========================================================================-->
+<pipe>
+
+  <!-- UX84 Cylinder of 40 mm radius -->
+  <volume name="lvUX84Cyl" material="Pipe:CuOFE">
+    <shape type="Tube" name ="UpStr:UX84Cylinder"
+           dz="0.5*UpStr:UX84CylLength"
+           rmin="UpStr:UX84CylRadius"
+           rmax="UpStr:UX84CylRadius+UpStr:UX84CylThick"/>
+  </volume>
+  <!-- UpStr:UX84 Flange of 76 mm radius -->
+  <volume name="lvUX84Flange" material="Pipe:Steel316LN">
+    <shape type="Tube" name ="UpStr:UX84Flange"
+           dz="0.5*UpStr:UX84FlangeLength"
+           rmin="UpStr:UX84FlangeRadius"
+           rmax="UpStr:UX84FlangeRadius+UpStr:UX84FlangeThick"/>
+  </volume>
+  <!-- Vacuum in UpStr:UX84Cyl -->
+  <volume name="lvUX84Vacuum" material="Vacuum">
+    <shape type="Tube" name ="UpStr:UX84Vacuum"
+           dz="0.5*UpStr:UX84CylLength"
+           rmax="UpStr:UX84CylRadius"/>
+  </volume>
+  <!-- Whole section: combination of sections -->
+  <volume name="lvUX84">
+    <physvol name="pvUX84Cyl"             volume="lvUX84Cyl"/>
+    <physvol name="pvUX84Vacuum"          volume="lvUX84Vacuum"/>
+    <physvol name="pvUX84Flange"          volume="lvUX84Flange">
+      <position z="UpStr:UX84FlangePosZ"/>
+    </physvol>
+  </volume>
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-VVSGF.xml b/compact/components/Pipe/2025-v00.00/Upstream-VVSGF.xml
new file mode 100644
index 000000000..0fbfd88b5
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Upstream-VVSGF.xml
@@ -0,0 +1,64 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<!--================================== VVSGF ==================================-->
+<!--===========================================================================-->
+<pipe>
+
+  <!-- Main body -->
+  <volume name="lvVVSGFBlock" material="Pipe:Steel316LN" vis="Pipe:Upstream">
+    <shape type="BooleanShape" operation="subtraction" name="VVSGFBlockSub">
+      <shape type="Box" name="VVSGFBlockBox"
+             dx="0.5*UpStr:VVSGFBlockX"
+             dy="0.5*UpStr:VVSGFBlockY"
+             dz="0.5*UpStr:VVSGFBlockZ"/>
+      <shape type="Box" name="VVSGFBlockBoxAir"
+             dx="0.5*(UpStr:VVSGFBlockX - 20.0*mm)"
+             dy="0.5*(UpStr:VVSGFBlockY - 20.0*mm)"
+             dz="0.5*(UpStr:VVSGFBlockZ - 20.0*mm)"/>
+      <shape type="Tube" name="VVSGFBlockHole"
+             dz="0.5*(UpStr:VVSGFBlockZ + 1.0*mm)"
+             rmax="UpStr:VVSGFBlockRad"/>
+      <position y="UpStr:VVSGFHoleY"/>
+    </shape>
+  </volume>
+
+  <!-- Flange -->
+  <volume name="lvVVSGFFlange" material="Pipe:Steel316LN" vis="Pipe:Upstream">
+    <shape type="Tube" name="VVSGFFlangeTubs"
+           dz="0.5*UpStr:VVSGFFlangeZ"
+           rmin="UpStr:VVSGFBlockRad"
+           rmax="UpStr:VVSGFBlockRad + UpStr:VVSGFFlangeThick"/>
+  </volume>
+
+  <!-- Vacuum -->
+  <volume name="lvVVSGFVacuum" material="Vacuum" vis="Pipe:Vacuum">
+    <shape type="Tube" name="VVSGFVacuumTubs"
+           dz="0.5*(UpStr:VVSGFFlangeZ*2 + UpStr:VVSGFBlockZ)"
+           rmax="UpStr:VVSGFBlockRad - 0.01*mm"/>
+  </volume>
+
+  <!-- VVSGF -->
+  <volume name="lvVVSGF" vis="Pipe:Upstream">
+    <physvol name="pvVVSGFVacuum"                 logvol="lvVVSGFVacuum"/>
+    <physvol name="pvVVSGFBlock"                  logvol="lvVVSGFBlock">
+      <position y="-UpStr:VVSGFHoleY"/>
+    </physvol>
+    <physvol name="pvVVSGFFlangeUp"               logvol="lvVVSGFFlange">
+      <position z="-UpStr:VVSGFBlockZ/2 - UpStr:VVSGFFlangeZ/2 - 0.01*mm"/>
+    </physvol>
+    <physvol name="pvVVSGFFlangeUp"             logvol="lvVVSGFFlange">
+      <position z="UpStr:VVSGFBlockZ/2 + UpStr:VVSGFFlangeZ/2 + 0.01*mm"/>
+    </physvol>
+  </volume>
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-Vax.xml b/compact/components/Pipe/2025-v00.00/Upstream-Vax.xml
new file mode 100644
index 000000000..0e596ce09
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Upstream-Vax.xml
@@ -0,0 +1,538 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe                                          -->
+<!--===========================================================================-->
+<pipe>
+
+<!-- Entry window -->
+  <volume name="lvVaxUpStrWindow" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="VaxUpStrWindowUnion">
+      <shape type="Tube" name="VaxUpStrWindowTubs"
+            dz="0.5*UpStr:VaxWindowTubsLenght"
+            rmin="UpStr:VaxWindowFlangeRadius"
+            rmax="UpStr:VaxWindowFlangeRadius + UpStr:VaxWindowThick"/>
+      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrWindowSub">
+        <shape type="ConeSegment" name="VaxUpStrWindowCons"
+              dz="0.5*UpStr:VaxWindowConeLength"
+              rmax1="UpStr:VaxMainBodyRadius - 0.01*mm"
+              rmax2="UpStr:VaxWindowInnerRadius + UpStr:VaxWindowConeEndThick"/>
+        <shape type="Tube" name="VaxUpStrWindowSubTubs1"
+              dz="0.5*(UpStr:VaxWindowConeLength + 1.0*mm)"
+              rmax="UpStr:VaxWindowInnerRadius"/>
+        <shape type="Tube" name="VaxUpStrWindowSubTubs2"
+              dz="0.5*2*UpStr:VaxWindowConeFlangeLength"
+              rmax="UpStr:VaxWindowFlangeRadius"/>
+        <position z="-UpStr:VaxWindowConeLength/2"/>
+        <shape type="Tube" name="VaxUpStrWindowSubTubs3"
+              dz="0.5*2*UpStr:VaxWindowConeEndLength"
+              rmax="UpStr:VaxWindowConeEndRad"/>
+        <position z="UpStr:VaxWindowConeLength/2"/>
+      </shape>
+      <position z="UpStr:VaxWindowTubsLenght/2 + UpStr:VaxWindowConeLength/2 + 0.01*mm"/>
+    </shape>
+  </volume>
+
+<!-- Endcap -->
+  <volume name="lvVaxUpStrEndCap" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="lvVaxUpStrEndCapUnion">
+      <shape type="Tube" name="VaxUpStrEndCapTubs"
+            dz="0.5*UpStr:VaxEndCapTubsLenght"
+            rmin="UpStr:VaxEndCapInnerRadius + 0.01*mm"
+            rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick"/>
+      <shape type="ConeSegment" name="VaxUpStrEndCapCons"
+            dz="0.5*UpStr:VaxEndCapTubsLenght"
+            rmax1="UpStr:VaxEndCapInnerRadius + UpStr:VaxEndCapThick"
+            rmax2="UpStr:VaxMainBodyRadius - 0.01*mm"
+            rmin1="UpStr:VaxEndCapInnerRadius + 0.01*mm"
+            rmin2="UpStr:VaxEndCapInnerRadius + 0.01*mm"/>
+      <position z="-UpStr:VaxEndCapTubsLenght/2 - UpStr:VaxEndCapTubsLenght/2 - 0.01*mm"/>
+    </shape>
+  </volume>
+
+
+<!-- Main Body -->
+  <volume name="lvVaxUpStrMainBody" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="subtraction" name="VaxUpStrMainBodySub">
+      <shape type="Tube" name="VaxUpStrMainBodyTubs"
+            dz="0.5*UpStr:VaxMainBodyLength"
+            rmin="UpStr:VaxMainBodyRadius"
+            rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick"/>
+      <shape type="Tube" name="VaxUpStrMainBodyHole1"
+            dz="0.5*UpStr:VaxMainBodyRadius"
+            rmax="UpStr:VaxMainBodyHole1Radius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="UpStr:VaxMainBodyRadius"/>
+      </transformation>
+      <shape type="Tube" name="VaxUpStrMainBodyHole2"
+            dz="0.5*UpStr:VaxMainBodyRadius"
+            rmax="UpStr:VaxMainBodyHole2Radius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-UpStr:VaxMainBodyRadius"/>
+      </transformation>
+      <shape type="Tube" name="VaxUpStrMainBodyHole3"
+            dz="0.5*UpStr:VaxMainBodyRadius"
+            rmax="UpStr:VaxMainBodyHole3Radius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="UpStr:VaxMainBodyRadius"/>
+      </transformation>
+      <shape type="Tube" name="VaxUpStrMainBodyHole4"
+            dz="0.5*UpStr:VaxMainBodyRadius"
+            rmax="UpStr:VaxMainBodyHole4Radius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="-UpStr:VaxMainBodyRadius" z="-UpStr:VaxMainBodyHole4Offset"/>
+      </transformation>
+      <shape type="Tube" name="VaxUpStrMainBodyHole5"
+            dz="0.5*UpStr:VaxMainBodyRadius"
+            rmax="UpStr:VaxMainBodyHole5Radius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="-UpStr:VaxMainBodyRadius" z="UpStr:VaxMainBodyHole5Offset"/>
+      </transformation>
+    </shape>
+  </volume>
+
+
+<!-- End pipe -->
+  <volume name="lvVaxUpStrEndPipe" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="VaxUpStrEndPipeUnion">
+      <shape type="Tube" name="VaxUpStrEndPipeTubs"
+            dz="0.5*UpStr:VaxEndPipeLength"
+            rmin="UpStr:VaxEndPipeRadius"
+            rmax="UpStr:VaxEndPipeRadius + UpStr:VaxEndPipeThick"/>
+      <shape type="Tube" name="VaxUpStrEndPipeFlangeTubs"
+            dz="0.5*UpStr:VaxEndPipeFlangeLength"
+            rmin="UpStr:VaxEndPipeFlangeRadius"
+            rmax="UpStr:VaxEndPipeFlangeRadius + UpStr:VaxEndPipeFlangeThick"/>
+      <position z="UpStr:VaxEndPipeLength/2 - UpStr:VaxEndPipeFlangeLength/2"/>
+    </shape>
+  </volume>
+
+
+<!-- RF Screen -->
+  <volume name="lvVaxUpStrRfScreen" material="Pipe:CuOFE">
+    <shape type="BooleanShape" operation="union" name="VaxUpStrRfScreenUnion">
+      <shape type="Tube" name="VaxUpStrRfScreenFlangeTubs"
+            dz="0.5*UpStr:VaxRfScreenFlangeLength"
+            rmin="UpStr:VaxRfScreenFlangeRadius"
+            rmax="UpStr:VaxRfScreenFlangeRadius + UpStr:VaxRfScreenFlangeThick"/>
+      <shape type="Tube" name="VaxUpStrRfScreenEntryTubs"
+            dz="0.5*UpStr:VaxRfScreenEntryLength"
+            rmin="UpStr:VaxRfScreenEntryRadius"
+            rmax="UpStr:VaxRfScreenEntryRadius + UpStr:VaxRfScreenEntryThick"/>
+      <position z="UpStr:VaxRfScreenFlangeLength/2 + UpStr:VaxRfScreenEntryLength/2 + 0.01*mm"/>
+      <shape type="ConeSegment" name="VaxUpStrRfScreenCons"
+            dz="0.5*UpStr:VaxRfScreenConsLength"
+            rmin1="UpStr:VaxRfScreenEntryRadius"
+            rmin2="UpStr:VaxRfScreenExitRadius"
+            rmax1="UpStr:VaxRfScreenEntryRadius + UpStr:VaxRfScreenEntryThick"
+            rmax2="UpStr:VaxRfScreenExitRadius + UpStr:VaxRfScreenExitThick"/>
+      <position z="UpStr:VaxRfScreenFlangeLength/2 + UpStr:VaxRfScreenEntryLength + UpStr:VaxRfScreenConsLength/2 + 0.02*mm"/>
+      <shape type="Tube" name="VaxUpStrRfScreenExitTubs"
+            dz="0.5*UpStr:VaxRfScreenExitLength"
+            rmin="UpStr:VaxRfScreenExitRadius"
+            rmax="UpStr:VaxRfScreenExitRadius + UpStr:VaxRfScreenExitThick"/>
+      <position z="UpStr:VaxRfScreenFlangeLength/2 + UpStr:VaxRfScreenEntryLength + UpStr:VaxRfScreenConsLength + UpStr:VaxRfScreenExitLength/2 + 0.03*mm"/>
+    </shape>
+  </volume>
+
+
+<!-- Vacuum -->
+  <volume name="lvVaxUpStrVacuum" material="Vacuum">
+    <shape type="Tube" name="VaxUpStrVacuumTubs"
+          dz="0.5*UpStr:VaxVacuumLength"
+          rmax="UpStr:VaxVacuumRadius"/>
+  </volume>
+
+
+<!-- Pipe1, top pipe -->
+  <volume name="lvVaxUpStrPipe1" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe1Sub">
+      <shape type="Tube" name="VaxUpStrPipe1Tubs"
+            dz="0.5*UpStr:VaxPipe1Length"
+            rmin="UpStr:VaxPipe1Radius"
+            rmax="UpStr:VaxPipe1Radius + UpStr:VaxPipe1Thick"/>
+      <shape type="Tube" name="VaxUpStrPipe1SubTubs"
+            dz="0.5*UpStr:VaxMainBodyLength"
+            rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position z="-UpStr:VaxPipe1Length/2"/>
+      </transformation>
+      <shape type="Tube" name="VaxUpStrPipe1Hole1"
+            dz="0.5*UpStr:VaxPipe1Radius"
+            rmax="UpStr:VaxPipe1HoleRadius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="UpStr:VaxPipe1Radius" z="-UpStr:VaxPipe1Length/2 + UpStr:VaxPipe1HoleOffset"/>
+      </transformation>
+      <shape type="Tube" name="VaxUpStrPipe1Hole2"
+            dz="0.5*UpStr:VaxPipe1Radius"
+            rmax="UpStr:VaxPipe1HoleRadius"/>
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="-UpStr:VaxPipe1Radius" z="-UpStr:VaxPipe1Length/2 + UpStr:VaxPipe1HoleOffset"/>
+      </transformation>
+      <shape type="Tube" name="VaxUpStrPipe1Hole3"
+            dz="0.5*UpStr:VaxPipe1Radius"
+            rmax="UpStr:VaxPipe1HoleRadius"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="UpStr:VaxPipe1Radius" z="-UpStr:VaxPipe1Length/2 + UpStr:VaxPipe1HoleOffset"/>
+      </transformation>
+    </shape>
+  </volume>
+
+
+
+<!-- Pipe2 -->
+  <volume name="lvVaxUpStrPipe2" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe2Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe2Sub">
+        <shape type="Tube" name="VaxUpStrPipe2Tubs"
+              dz="0.5*UpStr:VaxPipe2Length"
+              rmin="UpStr:VaxPipe2Radius"
+              rmax="UpStr:VaxPipe2Radius + UpStr:VaxPipe2Thick"/>
+        <shape type="Tube" name="VaxUpStrPipe2SubTubs"
+              dz="0.5*UpStr:VaxMainBodyLength"
+              rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation x="90.0*degree"/>
+          <position z="-UpStr:VaxPipe2Length/2"/>
+        </transformation>
+      </shape>
+      <shape type="Tube" name="VaxUpStrPipe2FlangeTubs"
+            dz="0.5*UpStr:VaxPipe2FlangeLength"
+            rmin="UpStr:VaxPipe2FlangeRadius"
+            rmax="UpStr:VaxPipe2FlangeRadius + UpStr:VaxPipe2FlangeThick"/>
+      <position z="UpStr:VaxPipe2Length/2 - UpStr:VaxPipe2FlangeLength/2"/>
+      <shape type="Tube" name="VaxUpStrPipe2BeltTubs"
+            dz="0.5*UpStr:VaxPipe2BeltLength"
+            rmin="UpStr:VaxPipe2FlangeRadius"
+            rmax="UpStr:VaxPipe2FlangeRadius + UpStr:VaxPipe2FlangeThick"/>
+      <position z="-UpStr:VaxPipe2Length/2 + UpStr:VaxPipe2BeltPos - UpStr:VaxPipe2BeltLength/2"/>
+    </shape>
+  </volume>
+
+
+<!-- Pipe3 -->
+  <volume name="lvVaxUpStrPipe3" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe3Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe3Sub">
+        <shape type="Tube" name="VaxUpStrPipe3Tubs"
+              dz="0.5*(UpStr:VaxPipe3EntryLength + UpStr:VaxPipe3CutLength)"
+              rmin="UpStr:VaxPipe3Radius"
+              rmax="UpStr:VaxPipe3Radius + UpStr:VaxPipe3Thick"/>
+        <shape type="Tube" name="VaxUpStrPipe3SubTubs"
+              dz="0.5*UpStr:VaxMainBodyLength"
+              rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation y="90.0*degree"/>
+          <position z="-UpStr:VaxPipe3EntryLength/2 - UpStr:VaxPipe3CutLength/2"/>
+        </transformation>
+        <shape type="Box" name="VaxUpStrPipe3SubBox"
+             dx="0.5*150.0*mm"
+             dy="0.5*150.0*mm"
+             dz="0.5*2*UpStr:VaxPipe3CutLength"/>
+        <transformation>
+          <position z="UpStr:VaxPipe3CutLength"/>
+          <rotation/>
+          <position/>
+          <rotation x="45.0*degree"/>
+          <position z="UpStr:VaxPipe3EntryLength/2 - UpStr:VaxPipe3CutLength/2"/>
+        </transformation>
+      </shape>
+      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe3Sub2">
+        <shape type="Tube" name="VaxUpStrPipe3Tubs2"
+              dz="0.5*(UpStr:VaxPipe3ExitLength + UpStr:VaxPipe3CutLength)"
+              rmin="UpStr:VaxPipe3Radius"
+              rmax="UpStr:VaxPipe3Radius + UpStr:VaxPipe3Thick"/>
+        <shape type="Box" name="VaxUpStrPipe3SubBox2"
+             dx="0.5*150.0*mm"
+             dy="0.5*150.0*mm"
+             dz="0.5*2*UpStr:VaxPipe3CutLength"/>
+        <transformation>
+          <position z="-UpStr:VaxPipe3CutLength"/>
+          <rotation/>
+          <position/>
+          <rotation x="-45.0*degree"/>
+          <position z="-UpStr:VaxPipe3ExitLength/2 + UpStr:VaxPipe3CutLength/2"/>
+        </transformation>
+      </shape>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-UpStr:VaxPipe3ExitLength/2 + UpStr:VaxPipe3CutLength/2" z="UpStr:VaxPipe3EntryLength/2 - UpStr:VaxPipe3CutLength/2 + 0.01*mm"/>
+      </transformation>
+      <shape type="Tube" name="VaxUpStrPipe3FlangeTubs"
+            dz="0.5*UpStr:VaxPipe3FlangeLength"
+            rmin="UpStr:VaxPipe3FlangeRadius"
+            rmax="UpStr:VaxPipe3FlangeRadius + UpStr:VaxPipe3FlangeThick"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-UpStr:VaxPipe3ExitLength + UpStr:VaxPipe3FlangeLength/2" z="UpStr:VaxPipe3EntryLength/2 - UpStr:VaxPipe3CutLength/2 + 0.01*mm"/>
+      </transformation>
+    </shape>
+  </volume>
+
+<!-- Pipe4 -->
+  <volume name="lvVaxUpStrPipe4" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe4Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe4Sub">
+        <shape type="Tube" name="VaxUpStrPipe4Tubs"
+              dz="0.5*UpStr:VaxPipe4Length"
+              rmin="UpStr:VaxPipe4Radius"
+              rmax="UpStr:VaxPipe4Radius + UpStr:VaxPipe4Thick"/>
+        <shape type="Tube" name="VaxUpStrPipe4SubTubs"
+              dz="0.5*UpStr:VaxMainBodyLength"
+              rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation y="90.0*degree"/>
+          <position z="-UpStr:VaxPipe4Length/2"/>
+        </transformation>
+      </shape>
+      <shape type="Tube" name="VaxUpStrPipe4FlangeTubs"
+            dz="0.5*UpStr:VaxPipe4FlangeLength"
+            rmin="UpStr:VaxPipe4FlangeRadius"
+            rmax="UpStr:VaxPipe4FlangeRadius + UpStr:VaxPipe4FlangeThick"/>
+      <position z="UpStr:VaxPipe4Length/2 - UpStr:VaxPipe4FlangeLength/2"/>
+    </shape>
+  </volume>
+
+
+<!-- Pipe5 -->
+  <volume name="lvVaxUpStrPipe5" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe5Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe5Sub">
+        <shape type="Tube" name="VaxUpStrPipe5Tubs"
+              dz="0.5*UpStr:VaxPipe5Length"
+              rmin="UpStr:VaxPipe5Radius"
+              rmax="UpStr:VaxPipe5Radius + UpStr:VaxPipe5Thick"/>
+        <shape type="Tube" name="VaxUpStrPipe5SubTubs"
+              dz="0.5*UpStr:VaxMainBodyLength"
+              rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation y="90.0*degree"/>
+          <position z="-UpStr:VaxPipe5Length/2"/>
+        </transformation>
+      </shape>
+      <shape type="Tube" name="VaxUpStrPipe5FlangeTubs"
+            dz="0.5*UpStr:VaxPipe5FlangeLength"
+            rmin="UpStr:VaxPipe5FlangeRadius"
+            rmax="UpStr:VaxPipe5FlangeRadius + UpStr:VaxPipe5FlangeThick"/>
+      <position z="UpStr:VaxPipe5Length/2 - UpStr:VaxPipe5FlangeLength/2"/>
+    </shape>
+  </volume>
+
+
+<!-- Pipe6 -->
+  <volume name="lvVaxUpStrPipe6" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe6Union">
+      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe6Sub">
+        <shape type="Tube" name="VaxUpStrPipe6Tubs"
+              dz="0.5*UpStr:VaxPipe6Length"
+              rmin="UpStr:VaxPipe6Radius"
+              rmax="UpStr:VaxPipe6Radius + 1.6*mm"/>
+        <shape type="Tube" name="VaxUpStrPipe6SubTubs"
+              dz="0.5*UpStr:VaxPipe1Length"
+              rmax="UpStr:VaxPipe1Radius + UpStr:VaxPipe1Thick + 0.01*mm"/>
+        <transformation>
+          <position/>
+          <rotation x="90.0*degree"/>
+          <position z="-UpStr:VaxPipe6Length/2"/>
+        </transformation>
+      </shape>
+      <shape type="Tube" name="VaxUpStrPipe6FlangeTubs"
+            dz="0.5*UpStr:VaxPipe6FlangeLength"
+            rmin="UpStr:VaxPipe6FlangeRadius"
+            rmax="UpStr:VaxPipe6FlangeRadius + UpStr:VaxPipe6FlangeThick"/>
+      <position z="UpStr:VaxPipe6Length/2 - UpStr:VaxPipe6FlangeLength/2"/>
+    </shape>
+  </volume>
+
+
+<!-- Pipe7 -->
+  <volume name="lvVaxUpStrPipe7" material="Pipe:Steel316LN">
+    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe7Union">
+      <shape type="Tube" name="VaxUpStrPipe7Lid"
+            dz="0.5*UpStr:VaxPipe7LidLength"
+            rmin="UpStr:VaxPipe7Radius"
+            rmax="UpStr:VaxPipe7Radius + UpStr:VaxPipe7LidThick"/>
+      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe7Sub">
+        <shape type="Tube" name="VaxUpStrPipe7Tubs"
+              dz="0.5*(UpStr:VaxPipe7EntryLength + UpStr:VaxPipe7CutLength)"
+              rmin="UpStr:VaxPipe7Radius"
+              rmax="UpStr:VaxPipe7Radius + UpStr:VaxPipe7Thick"/>
+        <shape type="Box" name="VaxUpStrPipe7SubBox"
+             dx="0.5*150.0*mm"
+             dy="0.5*150.0*mm"
+             dz="0.5*2*UpStr:VaxPipe7CutLength"/>
+        <transformation>
+          <position z="UpStr:VaxPipe7CutLength"/>
+          <rotation/>
+          <position/>
+          <rotation x="45.0*degree"/>
+          <position z="UpStr:VaxPipe7EntryLength/2 - UpStr:VaxPipe7CutLength/2"/>
+        </transformation>
+      </shape>
+      <position z="UpStr:VaxPipe7EntryLength/2 + UpStr:VaxPipe7CutLength/2 + UpStr:VaxPipe7LidLength/2 + 0.01*mm"/>
+      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe7Sub2">
+        <shape type="Tube" name="VaxUpStrPipe7Tubs2"
+              dz="0.5*(UpStr:VaxPipe7ExitLength + UpStr:VaxPipe7CutLength)"
+              rmin="UpStr:VaxPipe7Radius"
+              rmax="UpStr:VaxPipe7Radius + UpStr:VaxPipe7Thick"/>
+        <shape type="Box" name="VaxUpStrPipe7SubBox2"
+             dx="0.5*150.0*mm"
+             dy="0.5*150.0*mm"
+             dz="0.5*2*UpStr:VaxPipe7CutLength"/>
+        <transformation>
+          <position z="-UpStr:VaxPipe7CutLength"/>
+          <rotation/>
+          <position/>
+          <rotation x="-45.0*degree"/>
+          <position z="-UpStr:VaxPipe7ExitLength/2 + UpStr:VaxPipe7CutLength/2"/>
+        </transformation>
+      </shape>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-UpStr:VaxPipe7ExitLength/2 + UpStr:VaxPipe7CutLength/2" z="UpStr:VaxPipe7EntryLength + UpStr:VaxPipe7LidLength/2 + 0.04*mm"/>
+      </transformation>
+      <shape type="Tube" name="VaxUpStrPipe7FlangeTubs"
+            dz="0.5*UpStr:VaxPipe7FlangeLength"
+            rmin="UpStr:VaxPipe7FlangeRadius"
+            rmax="UpStr:VaxPipe7FlangeRadius + UpStr:VaxPipe7FlangeThick"/>
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-UpStr:VaxPipe7ExitLength + UpStr:VaxPipe7FlangeLength/2" z="UpStr:VaxPipe7EntryLength + UpStr:VaxPipe7LidLength/2 + 0.04*mm"/>
+      </transformation>
+    </shape>
+  </volume>
+
+
+<!-- Complete -->
+  <volume name="lvVaxUpStr">
+    <physvol name="pvVaxUpStrMainBody"
+             volume="lvVaxUpStrMainBody"/>
+    <physvol name="pvVaxUpStrWindow"
+             volume="lvVaxUpStrWindow">
+      <position z="-UpStr:VaxMainBodyLength/2 - UpStr:VaxWindowTubsLenght/2 - 0.01*mm"/>
+    </physvol>
+    <physvol name="pvVaxUpStrRfScreen"
+             volume="lvVaxUpStrRfScreen">
+      <position z="-UpStr:VaxMainBodyLength/2 - UpStr:VaxWindowTubsLenght - 0.01*mm + UpStr:VaxRfScreenFlangeLength/2"/>
+    </physvol>
+    <physvol name="pvVaxUpStrEndCap"
+             volume="lvVaxUpStrEndCap">
+      <position z="UpStr:VaxMainBodyLength/2 + UpStr:VaxEndCapTubsLenght/2 + 0.01*mm"/>
+    </physvol>
+    <physvol name="pvVaxUpStrEndPipe"
+             volume="lvVaxUpStrEndPipe">
+      <position z="UpStr:VaxMainBodyLength/2 - UpStr:VaxEndCapTubsLenght + 0.01*mm + UpStr:VaxEndPipeLength/2"/>
+    </physvol>
+    <physvol name="pvVaxUpStrPipe1"
+             volume="lvVaxUpStrPipe1">
+      <transformation>
+        <position/>
+        <rotation x="-90.0*degree"/>
+        <position y="UpStr:VaxPipe1Length/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvVaxUpStrPipe2"
+             volume="lvVaxUpStrPipe2">
+      <transformation>
+        <position/>
+        <rotation x="90.0*degree"/>
+        <position y="-UpStr:VaxPipe2Length/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvVaxUpStrPipe3"
+             volume="lvVaxUpStrPipe3">
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="UpStr:VaxPipe3EntryLength/2 + UpStr:VaxPipe3CutLength/2 "/>
+      </transformation>
+    </physvol>
+    <physvol name="pvVaxUpStrPipe4"
+             volume="lvVaxUpStrPipe4">
+      <transformation>
+        <position/>
+        <rotation y="-90.0*degree"/>
+        <position x="-UpStr:VaxPipe4Length/2" z="-UpStr:VaxMainBodyHole4Offset"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvVaxUpStrPipe5"
+             volume="lvVaxUpStrPipe5">
+      <transformation>
+        <position/>
+        <rotation y="-90.0*degree"/>
+        <position x="-UpStr:VaxPipe5Length/2" z="UpStr:VaxMainBodyHole5Offset"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvVaxUpStrPipe6a"
+             volume="lvVaxUpStrPipe6">
+      <transformation>
+        <position/>
+        <rotation y="-90.0*degree"/>
+        <position x="-UpStr:VaxPipe6Length/2" y="UpStr:VaxPipe1HoleOffset"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvVaxUpStrPipe6b"
+             volume="lvVaxUpStrPipe6">
+      <transformation>
+        <position/>
+        <rotation y="90.0*degree"/>
+        <position x="UpStr:VaxPipe6Length/2" y="UpStr:VaxPipe1HoleOffset"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvVaxUpStrPipe6c"
+             volume="lvVaxUpStrPipe6">
+      <transformation>
+        <position/>
+        <rotation y="180.0*degree"/>
+        <position y="UpStr:VaxPipe1HoleOffset" z="-UpStr:VaxPipe6Length/2"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvVaxUpStrPipe7"
+             volume="lvVaxUpStrPipe7">
+      <transformation>
+        <position/>
+        <rotation x="-90.0*degree" z="90.0*degree"/>
+        <position y="UpStr:VaxPipe1Length + UpStr:VaxPipe7LidLength/2 + 0.01*mm"/>
+      </transformation>
+    </physvol>
+    <physvol name="pvVaxUpStrVacuum"
+             volume="lvVaxUpStrVacuum">
+      <position z="-UpStr:VaxMainBodyLength/2 - UpStr:VaxWindowTubsLenght - 0.01*mm + UpStr:VaxVacuumLength/2"/>
+    </physvol>
+  </volume>
+
+</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream.xml b/compact/components/Pipe/2025-v00.00/Upstream.xml
new file mode 100644
index 000000000..4bc61f8bc
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/Upstream.xml
@@ -0,0 +1,181 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+
+    <!--==================================================================================-->
+    <!--===================================Bakeout========================================-->
+    <!--==================================================================================-->
+    <detector name="PipeUpstream" type="DD4hep_VolumeAssembly" parent="${PipeUpstream:parent}" vis="Pipe:Vis">
+
+      <!-- Pipe UpStr:UX86Adapter  (LHCb_Pipe_Section_Type_1) -->
+      <volume type="LHCb_Pipe_Section_Type_1" name="lvUX86Adapter">
+	<param name="vis"                value="Pipe:Upstream"/>
+	<param name="Material"           value="Pipe:Steel316LN"/>
+	<param name="Length"             value="UpStr:UX86AdapterPipeZ"/>
+	<param name="Radius"             value="UpStr:UX86AdapterPipeRad"/>
+	<param name="Thick"              value="UpStr:UX86AdapterPipeThick"/>
+	<param name="FlangeUpLength"     value="17.4*mm"/>
+	<param name="FlangeUpThick"      value="57.0*mm - (UpStr:UX86AdapterPipeRad + UpStr:UX86AdapterPipeThick + 0.01*mm)"/>
+	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
+	<param name="FlangeDownLength"   value="19.7*mm"/>
+	<param name="FlangeDownThick"    value="76.0*mm - (UpStr:UX86AdapterPipeRad + UpStr:UX86AdapterPipeThick + 0.01*mm)"/>
+	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
+      </volume>
+
+      <!-- Pipe UpStr:MBXWH  (LHCb_Pipe_Section_Type_1) -->
+      <volume type="LHCb_Pipe_Section_Type_1" name="lvMBXWHPipe">
+	<param name="vis"                value="Pipe:Upstream"/>
+	<param name="Material"           value="Pipe:CuOFE"/>
+	<param name="Length"             value="UpStr:MBXWHPipeLength"/>
+	<param name="Radius"             value="UpStr:MBXWHPipeRadius"/>
+	<param name="Thick"              value="UpStr:MBXWHPipeThick"/>
+	<param name="FlangeUpLength"     value="19.8*mm"/>
+	<param name="FlangeUpThick"      value="76.0*mm - (UpStr:MBXWHPipeRadius + UpStr:MBXWHPipeThick + 0.01*mm)"/>
+	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
+	<param name="FlangeDownLength"   value="17.4*mm"/>
+	<param name="FlangeDownThick"    value="57.0*mm - (UpStr:MBXWHPipeRadius + UpStr:MBXWHPipeThick + 0.01*mm)"/>
+	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
+      </volume>
+
+      <!-- UX85-4, Pipe in UpStr:MBXWS  (LHCb_Pipe_Section_Type_1) -->
+      <volume type="LHCb_Pipe_Section_Type_1" name="lvMBXWSPipe">
+	<param name="vis"                value="Pipe:Upstream"/>
+	<param name="Material"           value="Pipe:CuOFE"/>
+	<param name="Length"             value="UpStr:MBXWSPipeLength"/>
+	<param name="Radius"             value="UpStr:MBXWSPipeRadius"/>
+	<param name="Thick"              value="UpStr:MBXWSPipeThick"/>
+	<param name="FlangeUpLength"     value="17.4*mm"/>
+	<param name="FlangeUpThick"      value="29.0*mm"/>
+	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
+	<param name="FlangeDownLength"   value="19.8*mm"/>
+	<param name="FlangeDownThick"    value="48.0*mm"/>
+	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
+      </volume>
+      <!-- UX85-4, Pipe in VCDA  (LHCb_Pipe_Section_Type_1) -->
+      <volume type="LHCb_Pipe_Section_Type_1" name="lvVCDAPipe">
+	<param name="vis"                value="Pipe:Upstream"/>
+	<param name="Material"           value="Pipe:CuOFE"/>
+	<param name="Length"             value="UpStr:VCDAPipeLength"/>
+	<param name="Radius"             value="UpStr:VCDAPipeRadius"/>
+	<param name="Thick"              value="UpStr:VCDAPipeThick"/>
+	<param name="FlangeUpLength"     value="19.8*mm"/>
+	<param name="FlangeUpThick"      value="76.0*mm - (UpStr:VCDAPipeRadius + UpStr:VCDAPipeThick + 0.01*mm)"/>
+	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
+	<param name="FlangeDownLength"   value="17.4*mm"/>
+	<param name="FlangeDownThick"    value="76.0*mm - (UpStr:VCDAPipeRadius + UpStr:VCDAPipeThick + 0.01*mm)"/>
+	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
+      </volume>
+
+      <!-- UX85-4, Pipe in VCDBU  (LHCb_Pipe_Section_Type_1) -->
+      <volume type="LHCb_Pipe_Section_Type_1" name="lvVCDBUPipe">
+	<param name="vis"                value="Pipe:Upstream"/>
+	<param name="Material"           value="Pipe:CuOFE"/>
+	<param name="Length"             value="UpStr:VCDBUPipeLength"/>
+	<param name="Radius"             value="UpStr:VCDBUPipeRadius"/>
+	<param name="Thick"              value="UpStr:VCDBUPipeThick"/>
+	<param name="FlangeUpLength"     value="19.8*mm"/>
+	<param name="FlangeUpThick"      value="76.0*mm - (UpStr:VCDBUPipeRadius + UpStr:VCDBUPipeThick + 0.01*mm)"/>
+	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
+	<param name="FlangeDownLength"   value="17.4*mm"/>
+	<param name="FlangeDownThick"    value="76.0*mm - (UpStr:VCDBUPipeRadius + UpStr:VCDBUPipeThick + 0.01*mm)"/>
+	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
+      </volume>
+
+      <!-- UX85-4, Pipe in Trans  (LHCb_Pipe_Section_Type_1) -->
+      <volume type="LHCb_Pipe_Section_Type_1" name="lvTransPipe">
+	<param name="vis"                value="Pipe:Upstream"/>
+	<param name="Material"           value="Pipe:CuOFE"/>
+	<param name="Length"             value="UpStr:TransPipeLength"/>
+	<param name="Radius"             value="UpStr:TransPipeRadius"/>
+	<param name="Thick"              value="UpStr:TransPipeThick"/>
+	<param name="FlangeUpLength"     value="19.8*mm"/>
+	<param name="FlangeUpThick"      value="76.0*mm - (UpStr:TransPipeRadius + UpStr:TransPipeThick + 0.01*mm)"/>
+	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
+	<param name="FlangeDownLength"   value="19.8*mm"/>
+	<param name="FlangeDownThick"    value="76.0*mm - (UpStr:TransPipeRadius + UpStr:TransPipeThick + 0.01*mm)"/>
+	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
+      </volume>
+
+      <!-- Pipe segment replacement of VVSSH  (LHCb_Pipe_Section_Type_1)  -->
+      <volume type="LHCb_Pipe_Section_Type_1" name="lvVVSSH">
+	<param name="vis"                value="Pipe:Upstream"/>
+	<param name="Material"           value="Pipe:Steel316LN"/>
+	<param name="Length"             value="UpStr:VVSSHPipeZ"/>
+	<param name="Radius"             value="UpStr:VVSSHPipeRad"/>
+	<param name="Thick"              value="UpStr:VVSSHPipeThick"/>
+	<param name="FlangeLength"       value="19.7*mm"/>
+	<param name="FlangeThick"        value="76.0*mm - (UpStr:VVSSHPipeRad + UpStr:VVSSHPipeThick + 0.01*mm)"/>
+	<param name="FlangeMaterial"     value="Pipe:Steel316LN"/>
+      </volume>
+
+      <include ref="Upstream-UX84.xml"/>
+      <include ref="Upstream-VVSGF.xml"/>
+      <include ref="Upstream-BPMSW.xml"/>
+      <include ref="Upstream-Vax.xml"/>
+
+      <!--==================================================================================-->
+      <!--===================================Final  Assembly================================-->
+      <!--==================================================================================-->
+      <envelope type="Assembly" name="lvPipeUpstream" vis="GreenVis">
+        <physvol name="pvUX84"        volume="lvUX84"/>
+        <physvol name="pvUX86Adapter" volume="lvUX86Adapter">
+          <position z="-327*mm/2 - 180.0*mm - 72.0*mm/2"/>
+        </physvol>
+        <physvol name="pvVVSGF" volume="lvVVSGF">
+          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm/2"/>
+        </physvol>
+        <physvol name="pvPipeInMBXWH" volume="lvMBXWHPipe">
+          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm/2"/>
+        </physvol>
+        <physvol name="pvPipeVCDA" volume="lvVCDAPipe">
+          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm/2"/>
+        </physvol>
+        <physvol name="pvPipeVCDBU" logvol="lvVCDBUPipe">
+          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm/2"/>
+        </physvol>
+        <physvol name="pvTransPipe" logvol="lvTransPipe">
+          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm/2"/>
+        </physvol>
+        <physvol name="pvVVSSH"       volume="lvVVSSH">
+          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm/2"/>
+        </physvol>
+	<physvol name="pvMBXWSUpStrPipe" volume="lvMBXWSPipe">
+	  <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm/2"/>
+	</physvol>
+        <physvol name="pvBPMSW" volume="lvBPMSW">
+          <transformation>
+            <position/>
+            <rotation x="180.0*degree"/>
+            <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm - 17.4*mm/2"/>
+          </transformation>
+
+        </physvol>
+	<physvol name="pvVaxUpStr" volume="lvVaxUpStr">
+	  <transformation>
+            <position/>
+            <rotation y="180.0*degree"/>
+            <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm - 285.0*mm - 180.0*mm - 134.0*mm/2"/>
+	  </transformation>
+	</physvol>
+        <physvol name="pvVVSGFVaxUpStr" volume="lvVVSGF">
+          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm - 285.0*mm - 180.0*mm - 190.0*mm - 75.0*mm/2"/>
+        </physvol>
+      </envelope>
+
+      <position z="-Regions:BeforeMagnetZSize/2 - 327.0*mm/2 - Regions:UpstreamZPos"/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Downstream.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Downstream.xml
new file mode 100644
index 000000000..d1b599f16
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Downstream.xml
@@ -0,0 +1,39 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the VMA Warm Module BJ                                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+    <detector name="VMAAADownstream" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAADownstream:parent}" vis="VMA">
+      <params>
+        <param name="FullZ"            value="180*mm"/>
+        <param name="TransTubeRad"     value="40*mm"/>
+        <param name="TransTubeCylZ"    value="97.2*mm"/>
+        <param name="TransTubeConsRad" value="41*mm"/>
+        <param name="TransTubeConsZ"   value="6.3*mm"/>
+        <param name="EntryUpCylZ"      value="22.2*mm"/>
+        <param name="RfContactRad"     value="40*mm"/>
+        <param name="RfFingers"        value="48"/>
+      </params>
+      <RfContact vis="VMA:Contact">
+       <RfContactMount  material="Pipe:CuOFE"/>
+       <RfContactSingle material="Pipe:CuBe17410"/>
+      </RfContact>
+      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
+      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
+      <debug>
+        <item name="debug" value="VMA:debug"/>
+      </debug>
+      <position z="75.0*mm + 280*mm/2 - 2500.0*mm/2"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-DownstreamVax.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-DownstreamVax.xml
new file mode 100644
index 000000000..e91e60b29
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-DownstreamVax.xml
@@ -0,0 +1,39 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the VMA Warm Module BJ                                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+    <detector name="VMAAADownstreamVax" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAADownstreamVax:parent}" vis="VMA">
+      <params>
+        <param name="FullZ"            value="180*mm"/>
+        <param name="TransTubeRad"     value="40*mm"/>
+        <param name="TransTubeCylZ"    value="97.2*mm"/>
+        <param name="TransTubeConsRad" value="41*mm"/>
+        <param name="TransTubeConsZ"   value="6.3*mm"/>
+        <param name="EntryUpCylZ"      value="22.2*mm"/>
+        <param name="RfContactRad"     value="40*mm"/>
+        <param name="RfFingers"        value="48"/>
+      </params>
+      <RfContact vis="VMA:Contact">
+       <RfContactMount  material="Pipe:CuOFE"/>
+       <RfContactSingle material="Pipe:CuBe17410"/>
+      </RfContact>
+      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
+      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
+      <debug>
+        <item name="debug" value="VMA:debug"/>
+      </debug>
+      <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm + 285.0*mm + 180.0*mm/2 - 2500.0*mm/2"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml
new file mode 100644
index 000000000..43c794555
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml
@@ -0,0 +1,39 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the VMA Warm Module BJ                                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+    <detector name="VMAAAUpstream" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAAUpstream:parent}" vis="VMA">
+      <params>
+        <param name="FullZ"            value="180*mm"/>
+        <param name="TransTubeRad"     value="40*mm"/>
+        <param name="TransTubeCylZ"    value="97.2*mm"/>
+        <param name="TransTubeConsRad" value="41*mm"/>
+        <param name="TransTubeConsZ"   value="6.3*mm"/>
+        <param name="EntryUpCylZ"      value="22.2*mm"/>
+        <param name="RfContactRad"     value="40*mm"/>
+        <param name="RfFingers"        value="48"/>
+      </params>
+      <RfContact vis="VMA:Contact">
+       <RfContactMount  material="Pipe:CuOFE"/>
+       <RfContactSingle material="Pipe:CuBe17410"/>
+      </RfContact>
+      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
+      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
+      <debug>
+        <item name="debug" value="VMA:debug"/>
+      </debug>
+      <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm - 180.0*mm - 7000.0*mm - 180.0*mm/2"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-UpstreamVax.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-UpstreamVax.xml
new file mode 100644
index 000000000..cec09ed31
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-UpstreamVax.xml
@@ -0,0 +1,39 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the VMA Warm Module BJ                                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+    <detector name="VMAAAUpstreamVax" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAAUpstreamVax:parent}" vis="VMA:AA">
+      <params>
+        <param name="FullZ"            value="180*mm"/>
+        <param name="TransTubeRad"     value="40*mm"/>
+        <param name="TransTubeCylZ"    value="97.2*mm"/>
+        <param name="TransTubeConsRad" value="41*mm"/>
+        <param name="TransTubeConsZ"   value="6.3*mm"/>
+        <param name="EntryUpCylZ"      value="22.2*mm"/>
+        <param name="RfContactRad"     value="40*mm"/>
+        <param name="RfFingers"        value="48"/>
+      </params>
+      <RfContact vis="VMA:Contact">
+       <RfContactMount  material="Pipe:CuOFE"/>
+       <RfContactSingle material="Pipe:CuBe17410"/>
+      </RfContact>
+      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
+      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
+      <debug>
+        <item name="debug" value="VMA:debug"/>
+      </debug>
+      <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm - 285.0*mm - 180.0*mm/2"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA.xml
new file mode 100644
index 000000000..84f7917ec
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA.xml
@@ -0,0 +1,39 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the VMA Warm Module BJ                                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+    <detector name="VMAAA" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAA:parent}" vis="VMA">
+      <params>
+        <param name="FullZ"            value="100*mm"/>
+        <param name="TransTubeRad"     value="40*mm"/>
+        <param name="TransTubeCylZ"    value="97.2*mm"/>
+        <param name="TransTubeConsRad" value="41*mm"/>
+        <param name="TransTubeConsZ"   value="6.3*mm"/>
+        <param name="EntryUpCylZ"      value="22.2*mm"/>
+        <param name="RfContactRad"     value="40*mm"/>
+        <param name="RfFingers"        value="48"/>
+      </params>
+      <RfContact vis="VMA:Contact">
+       <RfContactMount  material="Pipe:CuOFE"/>
+       <RfContactSingle material="Pipe:CuBe17410"/>
+      </RfContact>
+      <TransitionTube material="Pipe:CuOFE"      vis="VMA:TransitionTube"/>
+      <Pipe           material="Pipe:Steel316LN" vis="VMA:Pipe"/>
+       <debug>
+        <item name="debug" value="VMA:debug"/>
+      </debug>
+      <position z="UX84FlangeDownPosZ + UX84FlangeDownLength/2 + 180.0*mm/2"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-BJ.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-BJ.xml
new file mode 100644
index 000000000..10e2551e7
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-BJ.xml
@@ -0,0 +1,40 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the VMA Warm Module BJ                                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+    <detector name="VMABJ" type="LHCb_Pipe_VMA_v1_0" parent="${VMABJ:parent}" vis="VMA">
+      <params>
+        <param name="FullZ"            value="280*mm"/>
+        <param name="TransTubeRad"     value="31.5*mm"/>
+        <param name="TransTubeCylZ"    value="197.2*mm"/>
+        <param name="TransTubeConsRad" value="32.5*mm"/>
+        <param name="TransTubeConsZ"   value="6.3*mm"/>
+        <param name="EntryUpCylZ"      value="6.2*mm"/>
+        <param name="RfContactRad"     value="31.5*mm"/>
+        <param name="RfFingers"        value="40"/>
+      </params>
+      <RfContact vis="VMA:Contact">
+       <RfContactMount  material="Pipe:CuOFE"/>
+       <RfContactSingle material="Pipe:CuBe17410"/>
+      </RfContact>
+      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
+      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
+      <Junction       material="Pipe:Steel316LN"  vis="VMA:Junction"/>
+      <debug>
+        <item name="debug" value="VMA:debug"/>
+      </debug>
+      <position z="75.0*mm + 280*mm/2 - 2500.0*mm/2"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml
new file mode 100644
index 000000000..732cb0fe5
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml
@@ -0,0 +1,40 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the VMA Warm Modules                                   -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+    <detector name="VMABKUpstream" type="LHCb_Pipe_VMA_v1_0" parent="${VMABKUpstream:parent}" vis="VMA">
+      <params>
+        <param name="FullZ"            value="280*mm"/>
+        <param name="TransTubeRad"     value="31.5*mm"/>
+        <param name="TransTubeCylZ"    value="162*mm"/>
+        <param name="TransTubeConsRad" value="41.0*mm"/>
+        <param name="TransTubeConsZ"   value="41.5*mm"/>
+        <param name="EntryUpCylZ"      value="22.2*mm"/>
+        <param name="RfContactRad"     value="40*mm"/>
+        <param name="RfFingers"        value="48"/>
+      </params>
+      <RfContact vis="VMA:Contact">
+       <RfContactMount  material="Pipe:CuOFE"/>
+       <RfContactSingle material="Pipe:CuBe17410"/>
+      </RfContact>
+      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
+      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
+      <Junction       material="Pipe:Steel316LN"  vis="VMA:Junction"/>
+      <debug>
+        <item name="debug" value="VMA:debug"/>
+      </debug>
+      <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm/2"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml
new file mode 100644
index 000000000..ea405fc65
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml
@@ -0,0 +1,40 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the VMA Warm Module BJ                                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+    <detector name="VMACAUpstream1" type="LHCb_Pipe_VMA_v1_0" parent="${VMACAUpstream:parent}" vis="VMA">
+      <params>
+        <param name="FullZ"            value="180*mm"/>
+        <param name="TransTubeRad"     value="31.5*mm"/>
+        <param name="TransTubeCylZ"    value="62*mm"/>
+        <param name="TransTubeConsRad" value="41*mm"/>
+        <param name="TransTubeConsZ"   value="41.5*mm"/>
+        <param name="EntryUpCylZ"      value="22.2*mm"/>
+        <param name="RfContactRad"     value="40*mm"/>
+        <param name="RfFingers"        value="48"/>
+      </params>
+      <RfContact vis="VMA:Contact">
+       <RfContactMount  material="Pipe:CuOFE"/>
+       <RfContactSingle material="Pipe:CuBe17410"/>
+      </RfContact>
+      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
+      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
+      <debug>
+        <item name="debug" value="VMA:debug"/>
+      </debug>
+
+      <position z="-327*mm/2 - 180.0*mm/2"/>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml
new file mode 100644
index 000000000..a93a72a39
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml
@@ -0,0 +1,44 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the VMA Warm Module BJ                                 -->
+<!--===========================================================================-->
+<lccdd>
+  <detectors>
+    <detector name="VMACAUpstream2" type="LHCb_Pipe_VMA_v1_0" parent="${VMACAUpstream:parent}" vis="VMA">
+      <params>
+        <param name="FullZ"            value="180*mm"/>
+        <param name="TransTubeRad"     value="31.5*mm"/>
+        <param name="TransTubeCylZ"    value="62*mm"/>
+        <param name="TransTubeConsRad" value="41*mm"/>
+        <param name="TransTubeConsZ"   value="41.5*mm"/>
+        <param name="EntryUpCylZ"      value="22.2*mm"/>
+        <param name="RfContactRad"     value="40*mm"/>
+        <param name="RfFingers"        value="48"/>
+      </params>
+      <RfContact vis="VMA:Contact">
+       <RfContactMount  material="Pipe:CuOFE"/>
+       <RfContactSingle material="Pipe:CuBe17410"/>
+      </RfContact>
+      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
+      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
+      <debug>
+        <item name="debug" value="VMA:debug"/>
+      </debug>
+
+      <transformation>
+        <position/>
+        <rotation rotX="180.0*degree"/>
+        <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm - 180.0*mm/2"/>
+      </transformation>
+    </detector>
+  </detectors>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-Params.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-Params.xml
new file mode 100644
index 000000000..c8502731a
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/VMA/VMA-Params.xml
@@ -0,0 +1,96 @@
+<!--===========================================================================-->
+<!--  LHCb Detector Description                                                -->
+<!--===========================================================================-->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--===========================================================================-->
+<!-- XML description of the Global VMA Warm Module parameters                  -->
+<!--===========================================================================-->
+<lccdd>
+  <define>
+    <comment> RF contact mount global parameters </comment>
+    <constant name="VMA:RfContactThick"               value="3.00*mm"/>
+    <constant name="VMA:RfContactCylZ"                value="14.50*mm"/>
+    <constant name="VMA:RfContactFlangeZ"             value="2.50*mm"/>
+    <constant name="VMA:RfContactFlangeThickRaw"      value="55.8*mm"/>
+
+    <comment> RF contact single arm global parameters </comment>
+    <constant name="VMA:RfContSingleThick"            value="0.10*mm"/>
+    <constant name="VMA:RfContSinglePlateZ"           value="14.00*mm"/>
+    <constant name="VMA:RfContSingleX"                value="3.60*mm"/>
+
+    <constant name="VMA:RfContSingleArmZ"             value="90.80*mm"/>
+    <constant name="VMA:RfContSingleArmAng"           value="4.00*degree"/>
+    <constant name="VMA:RfContSingleEndZ"             value="8.37*mm"/>
+    <constant name="VMA:RfContSingleEndAng"           value="VMA:RfContSingleArmAng + 21*degree"/>
+
+    <comment> Transition tube global parameters </comment>
+    <constant name="VMA:TransTubeThick"               value="2.00*mm"/>
+    <constant name="VMA:TransTubeFlangeInnerThickRaw" value="51.5*mm"/>
+    <constant name="VMA:TransTubeFlangeThickRaw"      value="55.8*mm"/>
+    <constant name="VMA:TransTubeFlangeZ"             value="2.50*mm"/>
+    <constant name="VMA:TransTubeFlangeInnerZ"        value="5.5*mm"/>
+
+    <comment> Pipe global parameters </comment>
+    <constant name="VMA:EntryThick"                   value="1.50*mm"/>
+    <constant name="VMA:EntryRad"                     value="50.00*mm"/>
+    <constant name="VMA:EntryConsZ"                   value="2.80*mm"/>
+    <constant name="VMA:EntryConsRadEnd"              value="52.80*mm"/>
+    <constant name="VMA:EntryDownCylZ"                value="22.20*mm"/>
+
+    <constant name="VMA:BellowZ"                      value="110.00*mm"/>
+    <constant name="VMA:BellowPitch"                  value="4.00*mm"/>
+    <constant name="VMA:BellowThick"                  value="0.20*mm"/>
+    <constant name="VMA:BellowInnerRad"               value="51.50*mm"/>
+    <constant name="VMA:BellowOuterRad"               value="57.00*mm"/>
+    <constant name="VMA:BellowCyl1Z"                  value="50.00*mm"/>
+    <constant name="VMA:BellowCyl2Z"                  value="34.00*mm"/>
+
+    <constant name="VMA:FlangeUpThick"                value="24.50*mm"/>
+    <constant name="VMA:FlangeUpCylZ"                 value="19.80*mm"/>
+    <constant name="VMA:FlangeUpCylRad"               value="51.50*mm"/>
+    <constant name="VMA:FlangeUpCylSubZ"              value="3.80*mm"/>
+    <constant name="VMA:FlangeUpCylSubRad"            value="55.90*mm"/>
+
+    <constant name="VMA:FlangeDownThick"              value="24.50*mm"/>
+    <constant name="VMA:FlangeDownCylZ"               value="19.80*mm"/>
+    <constant name="VMA:FlangeDownCylRad"             value="51.50*mm"/>
+    <constant name="VMA:FlangeDownCylSubZ"            value="3.80*mm"/>
+    <constant name="VMA:FlangeDownCylSubRad"          value="55.90*mm"/>
+
+    <comment> Junction global parameters </comment>
+    <constant name="VMA:PipeCylZ"                     value="115.00*mm"/>
+    <constant name="VMA:PipeCylRad"                   value="50.00*mm"/>
+    <constant name="VMA:PipeCylThick"                 value="1.50*mm"/>
+
+    <constant name="VMA:PipeTopCylZ"                  value="112.0*mm"/>
+    <constant name="VMA:PipeTopCylRad"                value="17.5*mm"/>
+    <constant name="VMA:PipeTopCylThick"              value="VMA:PipeCylThick"/>
+    <constant name="VMA:PipeTopCylPosZ"               value="72.0*mm"/>
+
+    <constant name="VMA:PipeSideCylZ"                 value="125.0*mm"/>
+    <constant name="VMA:PipeSideCylRad"               value="30.0*mm"/>
+    <constant name="VMA:PipeSideCylThick"             value="VMA:PipeCylThick"/>
+    <constant name="VMA:PipeSideCylPosZ"              value="VMA:PipeTopCylPosZ"/>
+
+    <constant name="VMA:FlangeTopCylZ"                value="12.7*mm"/>
+    <constant name="VMA:FlangeTopCylThickRaw"         value="35.0*mm"/>
+
+    <constant name="VMA:FlangeSideCylZ"               value="17.5*mm"/>
+    <constant name="VMA:FlangeSideCylThickRaw"        value="57.0*mm"/>
+    <constant name="VMA:debug"                        value="0"/>
+  </define>
+
+  <display>
+    <vis name="VMA"                alpha="1.0"  r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true"/>
+    <vis name="VMA:Contact"        alpha="1.0"  r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true"/>
+    <vis name="VMA:TransitionTube" alpha="1.0"  r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true"/>
+    <vis name="VMA:Pipe"           alpha="1.0"  r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true"/>
+    <vis name="VMA:Junction"       alpha="1.0"  r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
+  </display>
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/materials.xml b/compact/components/Pipe/2025-v00.00/materials.xml
new file mode 100644
index 000000000..aca60728a
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/materials.xml
@@ -0,0 +1,280 @@
+<lccdd>
+<!--
+    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+
+  <materials>
+    <!-- ### Pipe Aluminium ### -->
+    <element  name="Pipe:Al" formula="Al" Z="13.0">
+      <atom type="A" value="26.98" unit="g/mole"/>
+    </element>
+    <material formula="Pipe:Al" name="Pipe:Aluminum" state="solid" >
+      <D type="density" unit="g/cm3" value="2.699" />
+      <fraction n="1.0" ref="Pipe:Al" />
+    </material>
+
+    <!-- ### Pipe Copper ### -->
+    <element Z="29" formula="Pipe:Cu" name="Pipe:Cu" >
+      <atom type="A" unit="g/mol" value="63.5456" />
+    </element>
+
+    <material formula="Pipe:Cu" name="Pipe:Copper" state="solid" >
+      <RL type="X0" unit="cm" value="1.43558" />
+      <NIL type="lambda" unit="cm" value="15.5141"/>
+      <D type="density" unit="g/cm3" value="8.96"/>
+      <composite n="1" ref="Pipe:Cu"/>
+    </material>
+
+    <!-- ### Pipe Beryllium ### -->
+    <element  name="Pipe:Be" formula="Be" Z="4.0">
+      <atom type="A" value="9.01" unit="g/mole"/>
+    </element>
+
+    <!-- ### Pipe Beryllium ### -->
+    <material name="Pipe:Beryllium">
+      <D name="density" value="1.848" unit="g/cm3"/>
+      <fraction n="1.0" ref="Pipe:Be"/>
+    </material>
+
+    <!-- ### Pipe Aluminium Beryllium Alloy ### -->
+    <material name="Pipe:AlBe">
+      <D name="density" value="2.104" unit="g/cm3"/>
+      <fraction ref="Pipe:Al"    n="0.40"/>
+      <fraction ref="Pipe:Be"    n="0.60"/>
+    </material>
+
+    <!-- ### Pipe Aluminium Copper Alloy ### -->
+    <material name ="Pipe:AlCu">
+      <D name="density" value="2.83" unit="g/cm3"/>
+      <fraction ref="Pipe:Al"    n="0.93"/>
+      <fraction ref="Cu"         n="0.07"/>
+    </material>
+
+    <!-- ### Pipe Steel ### -->
+    <material name ="Pipe:Steel">
+      <D name="density" value="7.87" unit="g/cm3"/>
+      <fraction ref="Fe"    n="1.0"/>
+      <fraction ref="C"     n="0.0"/>
+    </material>
+
+    <!-- ### Pipe Al6061 ### -->
+    <material name ="Pipe:Al6061">
+      <D name="density" value="2.7" unit="g/cm3"/>
+      <fraction ref="Al" n="0.9762"/>
+      <fraction ref="Si" n="0.0070"/>
+      <fraction ref="Fe" n="0.0010"/>
+      <fraction ref="Cu" n="0.0026"/>
+      <fraction ref="Mg" n="0.0012"/>
+      <fraction ref="Mg" n="0.0090"/>
+      <fraction ref="Cr" n="0.0026"/>
+      <fraction ref="Zn" n="0.0001"/>
+      <fraction ref="Ti" n="0.0003"/>
+    </material>
+
+    <!-- ### Pipe Al2219 forging ### -->
+    <material name ="Pipe:Al2219F">
+      <D name="density" value="2.84" unit="g/cm3"/>
+      <fraction ref="Al" n="0.93288"/>
+      <fraction ref="Si" n="0.0006"/>
+      <fraction ref="Fe" n="0.0011"/>
+      <fraction ref="Cu" n="0.0590"/>
+      <fraction ref="Mn" n="0.0029"/>
+      <fraction ref="Mg" n="0.0010"/>
+      <fraction ref="Zr" n="0.0011"/>
+      <fraction ref="Ti" n="0.00052"/>
+      <fraction ref="Zn" n="0.0001"/>
+      <fraction ref="V"  n="0.0008"/>
+    </material>
+
+    <!-- ### Pipe Al2219 standard ### -->
+    <material name ="Pipe:Al2219S">
+      <D name="density" value="2.84" unit="g/cm3"/>
+      <fraction ref="Al" n="0.9168"/>
+      <fraction ref="Si" n="0.0020"/>
+      <fraction ref="Fe" n="0.0030"/>
+      <fraction ref="Cu" n="0.0680"/>
+      <fraction ref="Mn" n="0.0040"/>
+      <fraction ref="Mg" n="0.0002"/>
+      <fraction ref="Zr" n="0.0025"/>
+      <fraction ref="Ti" n="0.0010"/>
+      <fraction ref="Zn" n="0.0010"/>
+      <fraction ref="V"  n="0.0015"/>
+    </material>
+
+    <!-- ### Pipe Be TV56 ### -->
+    <material name ="Pipe:BeTV56">
+      <D name="density" value="1.85" unit="g/cm3"/>
+      <fraction ref="Be" n="0.9780"/>
+      <fraction ref="O"  n="0.0066"/>
+      <fraction ref="C"  n="0.01251"/>
+      <fraction ref="Si" n="0.00026"/>
+      <fraction ref="Fe" n="0.0015"/>
+      <fraction ref="Al" n="0.00018"/>
+      <fraction ref="Ti" n="0.00019"/>
+      <fraction ref="Cr" n="0.00027"/>
+      <fraction ref="Cu" n="0.00013"/>
+      <fraction ref="Mn" n="0.00012"/>
+      <fraction ref="Mg" n="0.00012"/>
+      <fraction ref="Ni" n="0.00012"/>
+    </material>
+
+    <!-- ### Pipe Stainless Steel 316LN ### -->
+    <material name ="Pipe:Steel316LN">
+      <D name="density" value="8.0" unit="g/cm3"/>
+      <fraction ref="Fe" n="0.61195"/>
+      <fraction ref="Cr" n="0.185"/>
+      <fraction ref="Mn" n="0.020"/>
+      <fraction ref="Ni" n="0.140"/>
+      <fraction ref="N"  n="0.002"/>
+      <fraction ref="Mo" n="0.030"/>
+      <fraction ref="P"  n="0.00045"/>
+      <fraction ref="C"  n="0.0003"/>
+      <fraction ref="S"  n="0.0003"/>
+      <fraction ref="Si" n="0.0100"/>
+    </material>
+
+
+    <!-- ### Pipe Aluminium EN AW-6082 ### -->
+    <material name="Pipe:Al6082">
+      <D name="density" value="2.70" unit="g/cm3"/>
+      <fraction ref="Al" n="0.9445"/>
+      <fraction ref="Si" n="0.0130"/>
+      <fraction ref="Fe" n="0.0050"/>
+      <fraction ref="Cu" n="0.0100"/>
+      <fraction ref="Mn" n="0.0100"/>
+      <fraction ref="Mg" n="0.0120"/>
+      <fraction ref="Zr" n="0.0020"/>
+      <fraction ref="Ti" n="0.0010"/>
+      <fraction ref="Cr" n="0.0025"/>
+    </material>
+
+    <!-- ### Pipe Aluminium EN AW-7075 ### -->
+    <material name="Pipe:AW7075">
+      <D name="density" value="2.70" unit="g/cm3"/>
+      <fraction ref="Al" n="0.8865"/>
+      <fraction ref="Si" n="0.004"/>
+      <fraction ref="Fe" n="0.0050"/>
+      <fraction ref="Cu" n="0.0160"/>
+      <fraction ref="Mn" n="0.0030"/>
+      <fraction ref="Mg" n="0.0250"/>
+      <fraction ref="Zr" n="0.0010"/>
+      <fraction ref="Ti" n="0.0010"/>
+      <fraction ref="Cr" n="0.0025"/>
+      <fraction ref="Zn" n="0.056"/>
+    </material>
+
+    <!-- ### Pipe Aerogel for bakeout ### -->
+    <material name="Pipe:BakeOutAerogel">
+      <D type="density" value="0.11" unit="g/cm3"/>
+      <composite ref="Si" n="1" />
+      <composite ref="O"  n="2" />
+    </material>
+
+    <!-- ### Pipe Mount Brass ### -->
+    <material name    = "Pipe:Brass">
+      <D type="density" value="8.53" unit="g/cm3"/>
+      <fraction ref = "Cu" n = "0.70"/>
+      <fraction ref = "Zn"   n = "0.30"/>
+    </material>
+
+    <!-- ### Pipe Mount AW2219 ### -->
+    <material name    = "Pipe:AW2219">
+      <D type="density" value="2.84" unit="g/cm3"/>
+      <fraction ref = "Al" n = "0.9168"/>
+      <fraction ref = "Cu" n = "0.0680"/>
+      <fraction ref = "Fe" n = "0.0030"/>
+      <fraction ref = "Mg" n = "0.0002"/>
+      <fraction ref = "Mn" n = "0.0040"/>
+      <fraction ref = "Si" n = "0.0020"/>
+      <fraction ref = "Ti" n = "0.0010"/>
+      <fraction ref = "V"  n = "0.0015"/>
+      <fraction ref = "Zn" n = "0.0010"/>
+      <fraction ref = "Zr" n = "0.0025"/>
+    </material>
+
+    <!-- ### Cables  FutureFibre ### -->
+
+    <material name="Pipe:CarbonForFibre">
+      <D type="density" value="1.76" unit="g/cm3"/>
+      <composite ref="C" n="1" />
+    </material>
+    <material name="Pipe:CarbonFibreResin">
+      <D type="density" value="1.21" unit="g/cm3"/>
+      <composite ref="C" n="36" />
+      <composite ref="H" n="4" />
+      <composite ref="O" n="10" />
+      <composite ref="N" n="1" />
+    </material>
+
+    <material name="Pipe:FutureFibre">
+      <D type="density" value="1.84" unit="g/cm3"/>
+      <fraction ref="Pipe:CarbonForFibre"   n="0.62" />
+      <fraction ref="Pipe:CarbonFibreResin" n="0.38" />
+    </material>
+
+    <!-- ### Cables  Technora ### -->
+    <material name="Pipe:Technora">
+      <D type="density" value="1.39" unit="g/cm3"/>
+      <composite ref="C"  n="8"/>
+      <composite ref="H"  n="4"/>
+      <composite ref="Cl" n="2"/>
+      <composite ref="O"  n="2"/>
+    </material>
+
+    <!-- ### Pipe Supports Celazole ### -->
+    <material name   ="Pipe:Celazole">
+      <D type="density" value="1.3" unit="g/cm3"/>
+      <composite ref="C" n="20"/>
+      <composite ref="H" n="12"/>
+      <composite ref="N" n="4"/>
+    </material>
+
+    <!-- ### Pipe Supports Titanium small pins ### -->
+    <material name   ="Pipe:PipeTitaniumG5">
+      <D type="density" value="4.42" unit="g/cm3"/>
+      <fraction ref="Al" n="0.06"/>
+      <fraction ref="Fe" n="0.0025"/>
+      <fraction ref="Ti" n="0.8955"/>
+      <fraction ref="V"  n="0.04"/>
+      <fraction ref="O"  n="0.0020"/>
+
+    </material>
+
+    <!-- ### Pipe Supports Sintimid ### -->
+    <material name   ="Pipe:Sintimid">
+      <D type="density" value="1.43" unit="g/cm3"/>
+      <composite ref="C"   n="18"/>
+      <composite ref="O"   n="5"/>
+      <composite ref="N" n="2"/>
+    </material>
+
+    <!--### Pipe Supports Sintimid15G ###-->
+    <material name   ="Pipe:Sintimid15G">
+      <D type="density" value="1.42" unit="g/cm3"/>
+      <fraction ref="Pipe:Sintimid" n="0.85"/>
+      <fraction ref="C"        n="0.15"/>
+    </material>
+
+    <!-- ### Cu OFE ### -->
+    <material name   ="Pipe:CuOFE">
+      <D type="density" value="8.96" unit="g/cm3"/>
+      <fraction ref="Cu" n="1.0"/>
+    </material>
+
+    <!-- ### Cu-Be 17410 ### -->
+    <material name   ="Pipe:CuBe17410">
+      <D type="density" value="8.80" unit="g/cm3"/>
+      <fraction ref="Cu" n="0.99"/>
+      <fraction ref="Be" n="0.004"/>
+      <fraction ref="Co"    n="0.006"/>
+    </material>
+  </materials>
+
+</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/parameters.xml b/compact/components/Pipe/2025-v00.00/parameters.xml
new file mode 100644
index 000000000..4583d592a
--- /dev/null
+++ b/compact/components/Pipe/2025-v00.00/parameters.xml
@@ -0,0 +1,67 @@
+<!--========================================================================== -->
+<!--  LHCb Detector Description                                                -->
+<!--========================================================================== -->
+<!--                                                                           -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!--  All rights reserved.                                                     -->
+<!--                                                                           -->
+<!--   @author  M.Frank                                                        -->
+<!--   @date    14/10/2018                                                     -->
+<!--                                                                           -->
+<!--========================================================================== -->
+<!-- XML description of the Full beam pipe in LHCb                             -->
+<!--========================================================================== -->
+<lccdd>
+  <define>
+    <constant name="PipeUpstream:parent"           value="/world/UpstreamRegion"                 type="string"/>
+    <constant name="PipeBeforeMagnet:parent"       value="/world/BeforeMagnetRegion"             type="string"/>
+    <constant name="PipeBeforeVeloJunction:parent" value="/world/BeforeMagnetRegion"             type="string"/>
+    <constant name="PipeBeforeVelo:parent"         value="/world/BeforeMagnetRegion/BeforeVelo"  type="string"/>
+    <constant name="PipeInVP:parent"               value="/world/BeforeMagnetRegion/VP"          type="string"/>
+    <constant name="PipeInTV:parent"               value="/world/BeforeMagnetRegion/TV"          type="string"/>
+    <constant name="PipeInUT:parent"               value="/world/BeforeMagnetRegion/UT"          type="string"/>
+    <constant name="PipeInUP:parent"               value="/world/BeforeMagnetRegion/UP"          type="string"/>
+    <constant name="PipeInRich1:parent"            value="/world/BeforeMagnetRegion/Rich1"       type="string"/>
+    <constant name="PipeMagnet:parent"             value="/world/MagnetRegion"                   type="string"/>
+    <constant name="PipeAfterMagnetBakeout:parent" value="/world/AfterMagnetRegion"              type="string"/>
+    <constant name="PipeAfterT:parent"             value="/world/AfterMagnetRegion"              type="string"/>
+    <constant name="PipeInT:parent"                value="/world/AfterMagnetRegion/T"            type="string"/>
+    <constant name="PipeDownstream:parent"         value="/world/DownstreamRegion"               type="string"/>
+    <constant name="PipeAfterMuon:parent"          value="/world/DownstreamRegion/AfterMuon"     type="string"/>
+
+    <constant name="VMAAAUpstream:parent"          value="/world/UpstreamRegion/PipeUpstream"    type="string"/>
+    <constant name="VMAAAUpstreamVax:parent"       value="/world/UpstreamRegion/PipeUpstream"    type="string"/>
+    <constant name="VMACAUpstream:parent"          value="/world/UpstreamRegion/PipeUpstream"    type="string"/>
+    <constant name="VMABKUpstream:parent"          value="/world/UpstreamRegion/PipeUpstream"    type="string"/>
+
+    <constant name="VMAAA:parent"                  value="/world/BeforeMagnetRegion/BeforeVelo/PipeBeforeVelo" type="string"/>
+
+    <constant name="VMAAADownstream:parent"        value="/world/DownstreamRegion/AfterMuon/PipeAfterMuon"     type="string"/>
+    <constant name="VMAAADownstreamVax:parent"     value="/world/DownstreamRegion/AfterMuon/PipeAfterMuon"     type="string"/>
+    <constant name="VMABJ:parent"                  value="/world/DownstreamRegion/AfterMuon/PipeAfterMuon"     type="string"/>
+
+  <!-- The following two lines defined in LHCb.xml and hence commented out here -->
+  <!--  <constant name="Rich1:parent"                  value="/world/BeforeMagnetRegion"             type="string"/> -->
+  <!--  <constant name="Rich2:parent"                  value="/world/AfterMagnetRegion"              type="string"/> -->
+
+  </define>
+
+  <display>
+    <vis name="Pipe:Vis"        alpha="0.3" r="0.4" g="0.4" b="0.4" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:Vacuum"     alpha="1"   r="0.4" g="0.4" b="0.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:Bakeout"    alpha="0.4" r="0.0" g="1.0" b="0.1" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:Magnet"     alpha="1"   r="1.0" g="0.1" b="0.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:Upstream"   alpha="1"   r="0.0" g="0.1" b="1.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:Downstream" alpha="1"   r="0.0" g="0.1" b="1.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:AfterMuon"  alpha="1"   r="1.0" g="0.7" b="0.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:Support"    alpha="1"   r="1.0" g="0.1" b="0.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:InVP"       alpha="1"   r="0.5" g="1.0" b="0.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:InUT"       alpha="1"   r="0.0" g="0.1" b="1.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:InUP"       alpha="1"   r="0.0" g="0.1" b="1.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:InRich1"    alpha="1"   r="0.0" g="1.0" b="0.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:InT"        alpha="1.0" r="0.0" g="0.9" b="0.0" showDaughters="true"  visible="true"/>
+    <vis name="Pipe:AfterT"     alpha="1.0" r="0.9" g="0.0" b="0.0" showDaughters="true"  visible="true"/>
+  </display>
+
+  <include ref="./materials.xml"/>
+</lccdd>
-- 
GitLab


From 78fdb8e184dcbcbf1f15b70b3c35b6a08007d6d1 Mon Sep 17 00:00:00 2001
From: Menglin Xu <mexu@cern.ch>
Date: Wed, 5 Mar 2025 14:53:29 +0100
Subject: [PATCH 2/8] As the content in trunk is different from 2024-v00.00,
 create a 2025-v00.00 version for UT

---
 compact/components/UT/2025-v00.00/Module.xml  | 311 ++++++++
 compact/components/UT/2025-v00.00/Sensor.xml  | 128 +++
 compact/components/UT/2025-v00.00/Stave.xml   | 208 +++++
 compact/components/UT/2025-v00.00/UT.xml      |  16 +
 compact/components/UT/2025-v00.00/UTBox.xml   | 131 ++++
 compact/components/UT/2025-v00.00/UTHalf.xml  |  14 +
 .../components/UT/2025-v00.00/UTaULayer.xml   |  41 +
 .../components/UT/2025-v00.00/UTaXLayer.xml   |  41 +
 .../components/UT/2025-v00.00/UTbVLayer.xml   |  41 +
 .../components/UT/2025-v00.00/UTbXLayer.xml   |  42 +
 .../components/UT/2025-v00.00/conditions.xml  |  65 ++
 .../components/UT/2025-v00.00/detector.xml    |  62 ++
 .../components/UT/2025-v00.00/parameters.xml  | 729 ++++++++++++++++++
 13 files changed, 1829 insertions(+)
 create mode 100644 compact/components/UT/2025-v00.00/Module.xml
 create mode 100644 compact/components/UT/2025-v00.00/Sensor.xml
 create mode 100644 compact/components/UT/2025-v00.00/Stave.xml
 create mode 100644 compact/components/UT/2025-v00.00/UT.xml
 create mode 100644 compact/components/UT/2025-v00.00/UTBox.xml
 create mode 100644 compact/components/UT/2025-v00.00/UTHalf.xml
 create mode 100644 compact/components/UT/2025-v00.00/UTaULayer.xml
 create mode 100644 compact/components/UT/2025-v00.00/UTaXLayer.xml
 create mode 100644 compact/components/UT/2025-v00.00/UTbVLayer.xml
 create mode 100644 compact/components/UT/2025-v00.00/UTbXLayer.xml
 create mode 100644 compact/components/UT/2025-v00.00/conditions.xml
 create mode 100644 compact/components/UT/2025-v00.00/detector.xml
 create mode 100644 compact/components/UT/2025-v00.00/parameters.xml

diff --git a/compact/components/UT/2025-v00.00/Module.xml b/compact/components/UT/2025-v00.00/Module.xml
new file mode 100644
index 000000000..e970a9115
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/Module.xml
@@ -0,0 +1,311 @@
+<ut>
+<!--
+    (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+    <!--======Readout ASIC======-->
+    <volume material="UT:UTAsic" name="lvAsic1" vis="UT:Asic">
+        <shape name="utAsic" type="Box" dx="(UTAsicWide)/2" dy="(UTAsicLong)/2" dz="(UTAsicThick)/2"/>
+    </volume>
+    <volume name="lvAsic4">
+        <physvol volume="lvAsic1" name="pvAsicForGroup4_0">
+            <position x="-3/8*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup4_1">
+            <position x="-1/8*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup4_2">
+            <position x="1/8*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup4_3">
+            <position x="3/8*UTSensorSiWide"/>
+        </physvol>
+    </volume>
+    <volume name="lvAsic8">
+        <physvol volume="lvAsic1" name="pvAsicForGroup8_0">
+            <position x="-7/16*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup8_1">
+            <position x="-5/16*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup8_2">
+            <position x="-3/16*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup8_3">
+            <position x="-1/16*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup8_4">
+            <position x="1/16*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup8_5">
+            <position x="3/16*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup8_6">
+            <position x="5/16*UTSensorSiWide"/>
+        </physvol>
+        <physvol volume="lvAsic1" name="pvAsicForGroup8_7">
+            <position x="7/16*UTSensorSiWide"/>
+        </physvol>
+    </volume>
+    <!--====== HybridFlex ======-->
+    <!-- Porting from UTv4r1-materials branch instead of UTV4r2 -->
+    <volume material="UT:HybridFlex4" name="lvModuleFlex4" vis="UT:HybridFlex">
+        <shape name="utHybridFlex4" type="Box" dx="(UTHybridFlex4Wide)/2" dy="(UTHybridFlex4Long)/2" dz="(UTHybridFlex4Thick)/2"/>
+    </volume>
+    <volume material="UT:HybridFlex8" name="lvModuleFlex8" vis="UT:HybridFlex">
+        <shape name="utHybridFlex8" type="Box" dx="(UTHybridFlex8Wide)/2" dy="(UTHybridFlex8Long)/2" dz="(UTHybridFlex8Thick)/2"/>
+    </volume>
+    <!--====== Hysol+Dia glue ======-->
+    <volume material="UT:HysolDia" name="lvHysolA" vis="UT:Invisible">
+        <shape name="utHysolA" type="BooleanShape" operation="subtraction">
+            <shape name="utHysolBoxA1" type="Box" dx="(UTHysolWide)/2" dy="(UTHysolLongA)/2" dz="(UTHysolThick)/2"/>
+            <shape name="utHysolBoxA2" type="Box" dx="(UTHysolCutWide*2)/2" dy="(UTHysolCutLongA*2)/2" dz="(UTHysolThick*2)/2"/>
+            <position x="UTHysolWide/2" y="UTHysolLongA/2"/>
+            <shape name="utHysolBoxA3" type="Box" dx="(UTHysolWide*2)/2" dy="(UTHysolGapWide)/2" dz="(UTHysolThick*2)/2"/>
+            <position y="UTHysolLongA/2-UTSensorLongA-UTHysolGapWide/2"/>
+        </shape>
+    </volume>
+    <volume material="UT:HysolDia" name="lvHysolB" vis="UT:Invisible">
+        <shape name="utHysolB" type="BooleanShape" operation="subtraction">
+            <shape name="utHysolBoxB1" type="Box" dx="(UTHysolWide)/2" dy="(UTHysolLongB)/2" dz="(UTHysolThick)/2"/>
+            <shape name="utHysolBoxB2" type="Box" dx="(UTHysolCutWide*2)/2" dy="(UTHysolCutLongB*2)/2" dz="(UTHysolThick*2)/2"/>
+            <position x="UTHysolWide/2" y="UTHysolLongB/2"/>
+            <shape name="utHysolBoxB3" type="Box" dx="(UTHysolWide*2)/2" dy="(UTHysolGapWide)/2" dz="(UTHysolThick*2)/2"/>
+            <position y="UTHysolLongB/2-UTSensorLongB-UTHysolGapWide/2"/>
+        </shape>
+    </volume>
+    <volume material="UT:HysolDia" name="lvHysolC" vis="UT:Invisible">
+        <shape name="utHysolC" type="BooleanShape" operation="subtraction">
+            <shape name="utHysolBoxC1" type="Box" dx="(UTHysolWide)/2" dy="(UTHysolLongC)/2" dz="(UTHysolThick)/2"/>
+            <shape name="utHysolBoxC2" type="Box" dx="(UTHysolCutWide*2)/2" dy="(UTHysolCutLongC*2)/2" dz="(UTHysolThick*2)/2"/>
+            <position x="UTHysolWide/2" y="UTHysolLongC/2"/>
+            <shape name="utHysolBoxC3" type="Box" dx="(UTHysolWide*2)/2" dy="(UTHysolGapWide)/2" dz="(UTHysolThick*2)/2"/>
+            <position y="UTHysolLongC/2-UTSensorLongC-UTHysolGapWide/2"/>
+        </shape>
+    </volume>
+    <volume material="UT:HysolDia" name="lvHysolD" vis="UT:Invisible">
+        <shape name="utHysolD" type="BooleanShape" operation="subtraction">
+            <shape name="utHysolBoxD1" type="Box" dx="(UTHysolWide)/2" dy="(UTHysolLongD)/2" dz="(UTHysolThick)/2"/>
+            <shape name="utHysolBoxD2" type="Box" dx="(UTHysolCutWide*2)/2" dy="(UTHysolCutLongD*2)/2" dz="(UTHysolThick*2)/2"/>
+            <position x="UTHysolWide/2" y="UTHysolLongD/2"/>
+            <shape name="utHysolBoxD3" type="Box" dx="(UTHysolWide*2)/2" dy="(UTHysolGapWide)/2" dz="(UTHysolThick*2)/2"/>
+            <position y="UTHysolLongD/2-UTSensorLongD-UTHysolGapWide/2"/>
+        </shape>
+    </volume>
+    <!--====== Stiff ======-->
+    <volume material="UT:BoronNitride" name="lvStiffA" vis="UT:Stiffener">
+        <shape name="utStiffA" type="BooleanShape" operation="subtraction">
+            <shape name="utStiffBoxA1" type="Box" dx="(UTStiffWide)/2" dy="(UTStiffLongA)/2" dz="(UTStiffThick)/2"/>
+            <shape name="utStiffBoxA2" type="Box" dx="(UTStiffCutWide*2)/2" dy="(UTStiffCutLongA*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2" y="UTStiffLongA/2"/>
+            <shape name="utStiffBoxA3" type="Box" dx="(UTStiffWide-UTAnchorWide*2-UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position y="-UTStiffLongA/2"/>
+            <shape name="utStiffBoxA4" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2" y="-UTStiffLongA/2"/>
+            <shape name="utStiffBoxA5" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2" y="-UTStiffLongA/2"/>
+
+            <shape name="utStiffCutA1" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2-UTAnchorSide-UTAnchorWide" y="-UTStiffLongA/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutA2" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorSide+UTAnchorWide" y="-UTStiffLongA/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutA3" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2-UTAnchorSide" y="-UTStiffLongA/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutA4" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorSide" y="-UTStiffLongA/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutA5" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2" y="UTStiffLongA/2-UTAnchorLong+1*mm"/>
+            <shape name="utStiffCutA6" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorWide" y="UTStiffLongA/2-UTAnchorLong+1*mm"/>
+        </shape>
+    </volume>
+
+    <volume material="UT:BoronNitride" name="lvStiffB" vis="UT:Stiffener">
+        <shape name="utStiffB" type="BooleanShape" operation="subtraction">
+            <shape name="utStiffBoxB1" type="Box" dx="(UTStiffWide)/2" dy="(UTStiffLongB)/2" dz="(UTStiffThick)/2"/>
+            <shape name="utStiffBoxB2" type="Box" dx="(UTStiffCutWide*2)/2" dy="(UTStiffCutLongB*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2" y="UTStiffLongB/2"/>
+            <shape name="utStiffBoxB3" type="Box" dx="(UTStiffWide-UTAnchorWide*2-UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position y="-UTStiffLongB/2"/>
+            <shape name="utStiffBoxB4" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2" y="-UTStiffLongB/2"/>
+            <shape name="utStiffBoxB5" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2" y="-UTStiffLongB/2"/>
+
+            <shape name="utStiffCutB1" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2-UTAnchorSide-UTAnchorWide" y="-UTStiffLongB/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutB2" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorSide+UTAnchorWide" y="-UTStiffLongB/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutB3" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2-UTAnchorSide" y="-UTStiffLongB/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutB4" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorSide" y="-UTStiffLongB/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutB5" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2" y="UTStiffLongB/2-UTAnchorLong+1*mm"/>
+            <shape name="utStiffCutB6" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorWide" y="UTStiffLongB/2-UTAnchorLong+1*mm"/>
+        </shape>
+    </volume>
+    <volume material="UT:BoronNitride" name="lvStiffC" vis="UT:Stiffener">
+        <shape name="utStiffC" type="BooleanShape" operation="subtraction">
+            <shape name="utStiffBoxC1" type="Box" dx="(UTStiffWide)/2" dy="(UTStiffLongC)/2" dz="(UTStiffThick)/2"/>
+            <shape name="utStiffBoxC2" type="Box" dx="(UTStiffCutWide*2)/2" dy="(UTStiffCutLongC*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2" y="UTStiffLongC/2"/>
+            <shape name="utStiffBoxC3" type="Box" dx="(UTStiffWide-UTAnchorWide*2-UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position y="-UTStiffLongC/2"/>
+            <shape name="utStiffBoxC4" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2" y="-UTStiffLongC/2"/>
+            <shape name="utStiffBoxC5" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2" y="-UTStiffLongC/2"/>
+
+            <shape name="utStiffCutC1" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2-UTAnchorSide-UTAnchorWide" y="-UTStiffLongC/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutC2" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorSide+UTAnchorWide" y="-UTStiffLongC/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutC3" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2-UTAnchorSide" y="-UTStiffLongC/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutC4" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorSide" y="-UTStiffLongC/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutC5" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2" y="UTStiffLongC/2-UTAnchorLong+1*mm"/>
+            <shape name="utStiffCutC6" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorWide" y="UTStiffLongC/2-UTAnchorLong+1*mm"/>
+        </shape>
+    </volume>
+    <volume material="UT:BoronNitride" name="lvStiffD" vis="UT:Stiffener">
+        <shape name="utStiffD" type="BooleanShape" operation="subtraction">
+            <shape name="utStiffBoxD1" type="Box" dx="(UTStiffWide)/2" dy="(UTStiffLongD)/2" dz="(UTStiffThick)/2"/>
+            <shape name="utStiffBoxD2" type="Box" dx="(UTStiffCutWide*2)/2" dy="(UTStiffCutLongD*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2" y="UTStiffLongD/2"/>
+            <shape name="utStiffBoxD3" type="Box" dx="(UTStiffWide-UTAnchorWide*2-UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position y="-UTStiffLongD/2"/>
+            <shape name="utStiffBoxD4" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2" y="-UTStiffLongD/2"/>
+            <shape name="utStiffBoxD5" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2" y="-UTStiffLongD/2"/>
+
+            <shape name="utStiffCutD1" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2-UTAnchorSide-UTAnchorWide" y="-UTStiffLongD/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutD2" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorSide+UTAnchorWide" y="-UTStiffLongD/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutD3" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="UTStiffWide/2-UTAnchorSide" y="-UTStiffLongD/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutD4" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorSide" y="-UTStiffLongD/2+UTAnchorLong-1*mm"/>
+            <shape name="utStiffCutD5" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2" y="UTStiffLongD/2-UTAnchorLong+1*mm"/>
+            <shape name="utStiffCutD6" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
+            <position x="-UTStiffWide/2+UTAnchorWide" y="UTStiffLongD/2-UTAnchorLong+1*mm"/>
+        </shape>
+    </volume>
+    <!--====== Phase change thermal interface material ======-->
+    <volume material="UT:HybridTim" name="lvTimA" vis="UT:Invisible">
+        <shape name="utTimA" type="BooleanShape" operation="subtraction">
+            <shape name="utTimBoxA1" type="Box" dx="(UTTimWide)/2" dy="(UTTimLongA)/2" dz="(UTTimThick)/2"/>
+            <shape name="utTimBoxA2" type="Box" dx="(UTTimCutWide*2)/2" dy="(UTTimCutLongA*2)/2" dz="(UTTimThick*2)/2"/>
+            <position x="UTTimWide/2" y="UTTimLongA/2"/>
+        </shape>
+    </volume>
+
+    <volume material="UT:HybridTim" name="lvTimB" vis="UT:Invisible">
+        <shape name="utTimB" type="BooleanShape" operation="subtraction">
+            <shape name="utTimBoxB1" type="Box" dx="(UTTimWide)/2" dy="(UTTimLongB)/2" dz="(UTTimThick)/2"/>
+            <shape name="utTimBoxB2" type="Box" dx="(UTTimCutWide*2)/2" dy="(UTTimCutLongB*2)/2" dz="(UTTimThick*2)/2"/>
+            <position x="UTTimWide/2" y="UTTimLongB/2"/>
+        </shape>
+    </volume>
+
+    <volume material="UT:HybridTim" name="lvTimC" vis="UT:Invisible">
+        <shape name="utTimC" type="BooleanShape" operation="subtraction">
+            <shape name="utTimBoxC1" type="Box" dx="(UTTimWide)/2" dy="(UTTimLongC)/2" dz="(UTTimThick)/2"/>
+            <shape name="utTimBoxC2" type="Box" dx="(UTTimCutWide*2)/2" dy="(UTTimCutLongC*2)/2" dz="(UTTimThick*2)/2"/>
+            <position x="UTTimWide/2" y="UTTimLongC/2"/>
+        </shape>
+    </volume>
+
+    <volume material="UT:HybridTim" name="lvTimD" vis="UT:Invisible">
+        <shape name="utTimD" type="BooleanShape" operation="subtraction">
+            <shape name="utTimBoxD1" type="Box" dx="(UTTimWide)/2" dy="(UTTimLongD)/2" dz="(UTTimThick)/2"/>
+            <shape name="utTimBoxD2" type="Box" dx="(UTTimCutWide*2)/2" dy="(UTTimCutLongD*2)/2" dz="(UTTimThick*2)/2"/>
+            <position x="UTTimWide/2" y="UTTimLongD/2"/>
+        </shape>
+    </volume>
+    <!--====== Hybrid - SensorGroup + ASIC + HybridFlex + Hysol + Stiffener + Tim (Computed in C++) ======-->
+    <volume name="lvModuleA" vis="UT:Envelope">
+        <physvol volume="lvAsic4" name="pvAsicA">
+            <position y="UTAsicYA" z="UTAsic4Z"/>
+        </physvol>
+        <physvol volume="lvModuleFlex4" name="pvHybridFlexA">
+            <position y="UTHybridFlexYA" z="UTHybridFlex4Z"/>
+        </physvol>
+        <physvol volume="lvHysolA" name="pvHysolA">
+            <position z="UTHysolZ"/>
+        </physvol>
+        <physvol volume="lvStiffA" name="pvStiffA">
+            <position z="UTStiffZ"/>
+        </physvol>
+        <physvol volume="lvTimA" name="pvTimA">
+            <position z="UTTimZ"/>
+        </physvol>
+    </volume>
+
+    <volume name="lvModuleB" vis="UT:Envelope">
+        <physvol volume="lvAsic8" name="pvAsicB">
+            <position y="UTAsicYB" z="UTAsic8Z"/>
+        </physvol>
+        <physvol volume="lvModuleFlex8" name="pvHybridFlexB">
+            <position y="UTHybridFlexYB" z="UTHybridFlex8Z"/>
+        </physvol>
+        <physvol volume="lvHysolB" name="pvHysolB">
+            <position z="UTHysolZ"/>
+        </physvol>
+        <physvol volume="lvStiffB" name="pvStiffB">
+            <position z="UTStiffZ"/>
+        </physvol>
+        <physvol volume="lvTimB" name="pvTimB">
+            <position z="UTTimZ"/>
+        </physvol>
+    </volume>
+
+    <volume name="lvModuleC" vis="UT:Envelope">
+        <physvol volume="lvAsic8" name="pvAsicC">
+            <position y="UTAsicYC" z="UTAsic8Z"/>
+        </physvol>
+        <physvol volume="lvModuleFlex8" name="pvHybridFlexC">
+            <position y="UTHybridFlexYC" z="UTHybridFlex8Z"/>
+        </physvol>
+        <physvol volume="lvHysolC" name="pvHysolC">
+            <position z="UTHysolZ"/>
+        </physvol>
+        <physvol volume="lvStiffC" name="pvStiffC">
+            <position z="UTStiffZ"/>
+        </physvol>
+        <physvol volume="lvTimC" name="pvTimC">
+            <position z="UTTimZ"/>
+        </physvol>
+    </volume>
+
+    <volume name="lvModuleD" vis="UT:Envelope">
+        <physvol volume="lvAsic8" name="pvAsicD">
+            <position y="UTAsicYD" z="UTAsic8Z"/>
+        </physvol>
+        <physvol volume="lvModuleFlex8" name="pvHybridFlexD">
+            <position y="UTHybridFlexYD" z="UTHybridFlex8Z"/>
+        </physvol>
+        <physvol volume="lvHysolD" name="pvHysolD">
+            <position z="UTHysolZ"/>
+        </physvol>
+        <physvol volume="lvStiffD" name="pvStiffD">
+            <position z="UTStiffZ"/>
+        </physvol>
+        <physvol volume="lvTimD" name="pvTimD">
+            <position z="UTTimZ"/>
+        </physvol>
+    </volume>
+</ut>
diff --git a/compact/components/UT/2025-v00.00/Sensor.xml b/compact/components/UT/2025-v00.00/Sensor.xml
new file mode 100644
index 000000000..0edf7f602
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/Sensor.xml
@@ -0,0 +1,128 @@
+<ut>
+<!--
+    (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+    <!--======Metalization Layer======-->
+    <volume material="UT:Aluminium" name="lvMetalLayerA" vis="UT:Sensor">
+        <shape name="utMetalLayerA" type="Box" dx="(UTSensorAlWide)/2" dy="(UTSensorAlLongA)/2" dz="(UTSensorAlThick)/2"/>
+    </volume>
+    <volume material="UT:Aluminium" name="lvMetalLayerB" vis="UT:Sensor">
+        <shape name="utMetalLayerB" type="Box" dx="(UTSensorAlWide)/2" dy="(UTSensorAlLongB)/2" dz="(UTSensorAlThick)/2"/>
+    </volume>
+    <volume material="UT:Aluminium" name="lvMetalLayerC" vis="UT:Sensor">
+        <shape name="utMetalLayerC" type="Box" dx="(UTSensorAlWide)/2" dy="(UTSensorAlLongC)/2" dz="(UTSensorAlThick)/2"/>
+    </volume>
+    <volume material="UT:Aluminium" name="lvMetalLayerD" vis="UT:Sensor">
+        <shape name="utMetalLayerD" type="BooleanShape" operation="subtraction">
+            <shape name="utMetalLayerBox1" type="Box" dx="(UTSensorAlWide)/2" dy="(UTSensorAlLongD)/2" dz="(UTSensorAlThick)/2"/>
+            <shape name="utMetalLayerTub1" type="Tube" dz="(UTSensorAlThick*2)/2" rmax="UTBeamHoleRadius+UTEpsilon"/>
+            <position x="UTSensorAlWide/2-UTSensorOverlapX/2" y="UTSensorAlLongD/2-UTSensorOverlapY0/2"/>
+        </shape>
+    </volume>
+
+    <!--=====GuardRing=====-->
+    <volume material="Silicon" name="lvGuardRingA" vis="UT:Sensor">
+        <shape name="utGuardRingA" type="BooleanShape" operation="subtraction">
+            <shape name="utGuardRingBox11" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongA)/2" dz="(UTSensorGRThickA)/2"/>
+            <shape name="utGuardRingBox12" type="Box" dx="(UTSensorSiWide+UTEpsilon)/2" dy="(UTSensorSiLongA+UTEpsilon)/2" dz="(UTSensorGRThickA*2)/2"/>
+            <position y="UTSensorSiOffsetY"/>
+        </shape>
+    </volume>
+    <volume material="Silicon" name="lvGuardRingB" vis="UT:Sensor">
+        <shape name="utGuardRingB" type="BooleanShape" operation="subtraction">
+            <shape name="utGuardRingBox21" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongB)/2" dz="(UTSensorGRThickB)/2"/>
+            <shape name="utGuardRingBox22" type="Box" dx="(UTSensorSiWide+UTEpsilon)/2" dy="(UTSensorSiLongB+UTEpsilon)/2" dz="(UTSensorGRThickB*2)/2"/>
+            <position y="UTSensorSiOffsetY"/>
+        </shape>
+    </volume>
+    <volume material="Silicon" name="lvGuardRingC" vis="UT:Sensor">
+        <shape name="utGuardRingC" type="BooleanShape" operation="subtraction">
+            <shape name="utGuardRingBox31" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongC)/2" dz="(UTSensorGRThickC)/2"/>
+            <shape name="utGuardRingBox32" type="Box" dx="(UTSensorSiWide+UTEpsilon)/2" dy="(UTSensorSiLongC+UTEpsilon)/2" dz="(UTSensorGRThickC*2)/2"/>
+            <position y="UTSensorSiOffsetY"/>
+        </shape>
+    </volume>
+    <volume material="Silicon" name="lvGuardRingD" vis="UT:Sensor">
+        <shape name="utGuardRingD" type="BooleanShape" operation="union">
+            <shape name="utGuardRingFrame1" type="BooleanShape" operation="subtraction">
+                <shape name="utGuardRingBox41" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongD)/2" dz="(UTSensorGRThickD)/2"/>
+                <shape name="utGuardRingTub41" type="Tube" dz="(UTSensorGRThickD*2)/2" rmax="UTBeamHoleRadius+UTSensorGRWideFar+UTEpsilon"/>
+                <position x="UTSensorWide/2-UTSensorOverlapX/2" y="UTSensorLongD/2-UTSensorOverlapY0/2"/>
+                <shape name="utGuardRingBox42" type="Box" dx="(UTSensorSiWide+UTEpsilon)/2" dy="(UTSensorSiLongC+UTEpsilon)/2" dz="(UTSensorGRThickD*3)/2"/>
+                <position y="UTSensorSiOffsetY"/>
+            </shape>
+
+            <shape name="utGuardRingArc1" type="BooleanShape" operation="intersection">
+                <shape name="utGuardRingBox43" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongD)/2" dz="(UTSensorGRThickD)/2"/>
+                <shape name="utGuardRingTub42" type="Tube" dz="(UTSensorGRThickD*2)/2" rmax="UTBeamHoleRadius+UTSensorGRWideFar" rmin="UTBeamHoleRadius"/>
+                <position x="UTSensorWide/2-UTSensorOverlapX/2" y="UTSensorLongD/2-UTSensorOverlapY0/2"/>
+            </shape>
+        </shape>
+    </volume>
+
+    <!--======Sensor (normal, dual, quad, hole)======-->
+    <volume material="Silicon" name="lvSensorNorm" sensitive="1" vis="UT:Sensor">
+        <shape name="utSensorNorm" type="Box" dx="(UTSensorSiWide)/2" dy="(UTSensorSiLongA)/2" dz="(UTSensorSiThickA)/2"/>
+    </volume>
+    <volume material="Silicon" name="lvSensorDual" sensitive="1" vis="UT:Sensor">
+        <shape name="utSensorDual" type="Box" dx="(UTSensorSiWide/2)/2" dy="(UTSensorSiLongB)/2" dz="(UTSensorSiThickB)/2"/>
+    </volume>
+    <volume material="Silicon" name="lvSensorQuad" sensitive="1" vis="UT:Sensor">
+        <shape name="utSensorQuad" type="Box" dx="(UTSensorSiWide/2)/2" dy="(UTSensorSiLongC)/2" dz="(UTSensorSiThickC)/2"/>
+    </volume>
+    <volume material="Silicon" name="lvSensorHole" sensitive="1" vis="UT:Sensor">
+        <shape name="utSensorHole" type="BooleanShape" operation="subtraction">
+            <shape name="utSensorQuadBox4" type="Box" dx="(UTSensorSiWide/2)/2" dy="(UTSensorSiLongD)/2" dz="(UTSensorSiThickD)/2"/>
+            <shape name="utSensorQuadTub4" type="Tube" dz="(UTSensorSiThickD*2)/2" rmax="UTBeamHoleRadius+UTSensorGRWideSide+UTEpsilon"/>
+            <position x="UTSensorSiWide/4-UTSensorSiOverlapX/2" y="UTSensorSiLongD/2-UTSensorSiOverlapY/2"/>
+        </shape>
+    </volume>
+
+    <!--======Sector (norm, dual, quad, hold)======-->
+    <volume name="lvSectorNorm" vis="UT:Envelope"/>
+    <volume name="lvSectorDual" vis="UT:Envelope"/>
+    <volume name="lvSectorQuad" vis="UT:Envelope"/>
+    <volume material="Air" name="lvSectorHole" vis="UT:Envelope">
+        <shape name="utSectorHole" type="Box" dx="(UTSensorSiWide/2)/2" dy="(UTSensorSiLongD)/2" dz="(UTSensorSiThickD)/2"/>
+    </volume>
+    <!--======Sensor Groups======-->
+    <volume name="lvGroupA" vis="UT:Envelope">
+        <physvol volume="lvMetalLayerA" name="pvMetalLayerA">
+            <position z="UTSensorAlZ"/>
+        </physvol>
+        <physvol volume="lvGuardRingA" name="pvGuardRingA">
+            <position z="UTSensorSiZ"/>
+        </physvol>
+    </volume>
+    <volume name="lvGroupB" vis="UT:Envelope">
+        <physvol volume="lvMetalLayerB" name="pvMetalLayerB">
+            <position z="UTSensorAlZ"/>
+        </physvol>
+        <physvol volume="lvGuardRingB" name="pvGuardRingB">
+            <position z="UTSensorSiZ"/>
+        </physvol>
+    </volume>
+    <volume name="lvGroupC" vis="UT:Envelope">
+        <physvol volume="lvMetalLayerC" name="pvMetalLayerC">
+            <position z="UTSensorAlZ"/>
+        </physvol>
+        <physvol volume="lvGuardRingC" name="pvGuardRingC">
+            <position z="UTSensorSiZ"/>
+        </physvol>
+    </volume>
+    <volume name="lvGroupD" vis="UT:Envelope">
+        <physvol volume="lvMetalLayerD" name="pvMetalLayerD">
+            <position z="UTSensorAlZ"/>
+        </physvol>
+        <physvol volume="lvGuardRingD" name="pvGuardRingD">
+            <position z="UTSensorSiZ"/>
+        </physvol>
+    </volume>
+</ut>
diff --git a/compact/components/UT/2025-v00.00/Stave.xml b/compact/components/UT/2025-v00.00/Stave.xml
new file mode 100644
index 000000000..7bf12c786
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/Stave.xml
@@ -0,0 +1,208 @@
+<ut>
+	<!--
+	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
+
+	This software is distributed under the terms of the GNU General Public
+	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+	In applying this licence, CERN does not waive the privileges and immunities
+	granted to it by virtue of its status as an Intergovernmental Organization
+	or submit itself to any jurisdiction.
+	-->
+	<!-- ========== Stave Geometry ========== -->
+	<!-- ========== MegArray connector ========== -->
+	<volume material="Silicon" name="lvMegArray" vis="UT:Connector">
+		<shape dx="UTMegArrayWide/2" dy="UTMegArrayLong/2" dz="UTMegArrayThick/2" name="utMegArray" type="Box" />
+	</volume>
+	<!-- ========== HV connector ========== -->
+	<volume material="Silicon" name="lvHVConnector" vis="UT:Connector">
+		<shape dx="UTHVConnectorWide/2" dy="UTHVConnectorLong/2" dz="UTHVConnectorThick/2" name="utHVConnector" type="Box" />
+	</volume>
+	<!-- ========== Flex Cable Kapton========== -->
+	<volume material="UT:FlexCable" name="lvCableKaptonL" vis="UT:KaptonCable">
+		<shape dx="UTCableWide/2" dy="UTCableLongL/2" dz="UTCableKaptonThick/2" name="utCableKaptonL" type="Box" />
+	</volume>
+	<volume material="UT:FlexCable" name="lvCableKaptonM" vis="UT:KaptonCable">
+		<shape dx="UTCableWide/2" dy="UTCableLongM/2" dz="UTCableKaptonThick/2" name="utCableKaptonM" type="Box" />
+	</volume>
+	<volume material="UT:FlexCable" name="lvCableKaptonS" vis="UT:KaptonCable">
+		<shape dx="UTCableWide/2" dy="UTCableLongS/2" dz="UTCableKaptonThick/2" name="utCableKaptonS" type="Box" />
+	</volume>
+	<!-- ========== Flex Cable Copper========== -->
+	<volume material="Copper" name="lvCableCuL" vis="UT:KaptonCable">
+		<shape name="utCableCuL" operation="subtraction" type="BooleanShape">
+			<shape dx="UTCableWide/2" dy="UTCableLongL/2" dz="UTCableCuThickL0/2" name="utCableCuBoxL0" type="Box" />
+			<shape dx="UTCableWide" dy="UTCableLongL1" dz="UTCableCuThickL0-UTCableCuThickL1" name="utCableCuBoxL1" type="Box" />
+			<position y="-UTCableLongL/2+UTCableLongL0+UTCableLongL1" z="-UTCableCuThickL0/2" />
+			<shape dx="UTCableWide" dy="UTCableLongL2" dz="UTCableCuThickL0-UTCableCuThickL2" name="utCableCuBoxL2" type="Box" />
+			<position y="-UTCableLongL/2+UTCableLongL0+UTCableLongL1+UTCableLongL2" z="-UTCableCuThickL0/2" />
+			<shape dx="UTCableWide" dy="UTCableLongL3" dz="UTCableCuThickL0-UTCableCuThickL3" name="utCableCuBoxL3" type="Box" />
+			<position y="-UTCableLongL/2+UTCableLongL0+UTCableLongL1+UTCableLongL2+UTCableLongL3" z="-UTCableCuThickL0/2" />
+		</shape>
+	</volume>
+	<volume material="Copper" name="lvCableCuM" vis="UT:KaptonCable">
+		<shape name="utCableCuM" operation="subtraction" type="BooleanShape">
+			<shape dx="UTCableWide/2" dy="UTCableLongM/2" dz="UTCableCuThickM0/2" name="utCableCuBoxM0" type="Box" />
+			<shape dx="UTCableWide" dy="UTCableLongM1" dz="UTCableCuThickM0-UTCableCuThickM1" name="utCableCuBoxM1" type="Box" />
+			<position y="-UTCableLongM/2+UTCableLongM0+UTCableLongM1" z="-UTCableCuThickM0/2" />
+			<shape dx="UTCableWide" dy="UTCableLongM2" dz="UTCableCuThickM0-UTCableCuThickM2" name="utCableCuBoxM2" type="Box" />
+			<position y="-UTCableLongM/2+UTCableLongM0+UTCableLongM1+UTCableLongM2" z="-UTCableCuThickM0/2" />
+			<shape dx="UTCableWide" dy="UTCableLongM3" dz="UTCableCuThickM0-UTCableCuThickM3" name="utCableCuBoxM3" type="Box" />
+			<position y="-UTCableLongM/2+UTCableLongM0+UTCableLongM1+UTCableLongM2+UTCableLongM3" z="-UTCableCuThickM0/2" />
+		</shape>
+	</volume>
+	<volume material="Copper" name="lvCableCuS" vis="UT:KaptonCable">
+		<shape name="utCableCuS" operation="subtraction" type="BooleanShape">
+			<shape dx="UTCableWide/2" dy="UTCableLongS/2" dz="UTCableCuThickS0/2" name="utCableCuBoxS0" type="Box" />
+			<shape dx="UTCableWide" dy="UTCableLongS1" dz="UTCableCuThickS0-UTCableCuThickS1" name="utCableCuBoxS1" type="Box" />
+			<position y="-UTCableLongS/2+UTCableLongS0+UTCableLongS1" z="-UTCableCuThickS0/2" />
+			<shape dx="UTCableWide" dy="UTCableLongS2" dz="UTCableCuThickS0-UTCableCuThickS2" name="utCableCuBoxS2" type="Box" />
+			<position y="-UTCableLongS/2+UTCableLongS0+UTCableLongS1+UTCableLongS2" z="-UTCableCuThickS0/2" />
+		</shape>
+	</volume>
+	<!-- ========== Kapton Cable ========== -->
+	<volume name="lvCableL">
+		<physvol name="pvCableCuL" volume="lvCableCuL">
+			<position z="UTCableKaptonThick/2" />
+		</physvol>
+		<physvol name="pvCableKaptonL" volume="lvCableKaptonL">
+			<position z="-UTCableCuThickL0/2" />
+		</physvol>
+		<physvol name="pvMegArrayL" volume="lvMegArray">
+			<position y="-UTCableLongL/2+UTMegArrayY" z="-1/2*(UTCableCuThickL0+UTMegArrayThick+UTCableKaptonThick)" />
+		</physvol>
+		<physvol name="pvConnectorL" volume="lvHVConnector">
+			<!-- <position x="UTHVConnectorLX" y="-UTCableLongL/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickL0+UTHVConnectorThick+UTCableKaptonThick)" /> -->
+			<position y="-UTCableLongL/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickL0+UTHVConnectorThick+UTCableKaptonThick)" />
+		</physvol>
+	</volume>
+	<volume name="lvCableM">
+		<physvol name="pvCableCuM" volume="lvCableCuM">
+			<position z="UTCableKaptonThick/2" />
+		</physvol>
+		<physvol name="pvCableKaptonM" volume="lvCableKaptonM">
+			<position z="-UTCableCuThickM0/2" />
+		</physvol>
+		<physvol name="pvMegArrayM" volume="lvMegArray">
+			<position y="-UTCableLongM/2+UTMegArrayY" z="-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)" />
+		</physvol>
+		<physvol name="pvConnectorM" volume="lvHVConnector">
+			<position y="-UTCableLongM/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickM0+UTHVConnectorThick+UTCableKaptonThick)" />
+			<!-- <position x="UTHVConnectorMX" y="-UTCableLongM/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickM0+UTHVConnectorThick+UTCableKaptonThick)" /> -->
+		</physvol>
+	</volume>
+	<volume name="lvCableS">
+		<physvol name="pvCableCuS" volume="lvCableCuS">
+			<position z="UTCableKaptonThick/2" />
+		</physvol>
+		<physvol name="pvCableKaptonS" volume="lvCableKaptonS">
+			<position z="-UTCableCuThickS0/2" />
+		</physvol>
+		<physvol name="pvMegArrayS" volume="lvMegArray">
+			<position y="-UTCableLongS/2+UTMegArrayY" z="-1/2*(UTCableCuThickS0+UTMegArrayThick+UTCableKaptonThick)" />
+		</physvol>
+		<physvol name="pvConnectorS" volume="lvHVConnector">
+			<position y="-UTCableLongS/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickS0+UTHVConnectorThick+UTCableKaptonThick)" />
+			<!-- <position x="UTHVConnectorSX" y="-UTCableLongS/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickS0+UTHVConnectorThick+UTCableKaptonThick)" /> -->
+		</physvol>
+	</volume>
+	<!-- ========== Bare Stave ========== -->
+	<volume material="UT:BareStave" name="lvBareStaveA" vis="UT:BareStave">
+		<shape dx="UTBareStaveWide/2" dy="UTBareStaveLong/2" dz="UTBareStaveThick/2" name="utBareStaveA" type="Box" />
+	</volume>
+	<volume material="UT:BareStave" name="lvBareStaveB" vis="UT:BareStave">
+		<shape dx="UTBareStaveWide/2" dy="UTBareStaveLong/2" dz="UTBareStaveThick/2" name="utBareStaveB" type="Box" />
+	</volume>
+	<volume material="UT:BareStave" name="lvBareStaveC" vis="UT:BareStave">
+		<shape name="utBareStaveC" operation="subtraction" type="BooleanShape">
+			<shape dx="UTBareStaveWide/2" dy="UTBareStaveLong/2" dz="UTBareStaveThick/2" name="utBareStaveBox" type="Box" />
+			<shape dz="UTBareStaveThick" name="utBareStaveTub" rmax="UTBeamHoleRadius" type="Tube" />
+			<position x="UTBareStaveWide/2-UTBareStaveEdge-UTSensorOverlapX/2" />
+		</shape>
+	</volume>
+	<!-- ====== Stave A/B/C (Computed in C++) ====== -->
+	<!-- ========== Stave Type A ========== -->
+	<!-- ========== Stave Type A core ========== -->
+	<volume name="lvStaveACore" vis="UT:Envelope">
+		<physvol name="pvBareStaveA" volume="lvBareStaveA" />
+		<physvol name="pvCableA1" volume="lvCableS">
+			<position y="-UTStaveLong/2+UTCableLongS/2" z="-UTStaveCableZ" />
+		</physvol>
+		<physvol name="pvCableA2" volume="lvCableM">
+			<position y="-UTStaveLong/2+UTCableLongM/2" z="UTStaveCableZ" />
+			<rotation y="pi*rad" />
+		</physvol>
+		<physvol name="pvCableA3" volume="lvCableM">
+			<position y="UTStaveLong/2-UTCableLongM/2" z="-UTStaveCableZ" />
+			<rotation z="pi*rad" />
+		</physvol>
+		<physvol name="pvCableA4" volume="lvCableS">
+			<position y="UTStaveLong/2-UTCableLongS/2" z="UTStaveCableZ" />
+			<rotation y="pi*rad" z="pi*rad" />
+		</physvol>
+	</volume>
+	<!-- ========== Stave Type A Front ========== -->
+	<volume name="lvStaveAFront" vis="UT:Envelope"/>
+	<!-- ========== Stave Type A Back ========== -->
+	<volume name="lvStaveABack" vis="UT:Envelope"/>
+	<volume name="lvStaveA" vis="UT:Envelope">
+		<physvol name="pvStaveACore" volume="lvStaveACore">
+		</physvol>
+	</volume>
+	<!-- ========== Stave Type B ========== -->
+	<!-- ========== Stave Type B core ========== -->
+	<volume name="lvStaveBCore" vis="UT:Envelope">
+		<physvol name="pvBareStaveB" volume="lvBareStaveB" />
+		<physvol name="pvCableB1" volume="lvCableS">
+			<position y="-UTStaveLong/2+UTCableLongS/2" z="-UTStaveCableZ" />
+		</physvol>
+		<physvol name="pvCableB2" volume="lvCableM">
+			<position y="-UTStaveLong/2+UTCableLongM/2" z="UTStaveCableZ" />
+			<rotation y="pi*rad" />
+		</physvol>
+		<physvol name="pvCableB3" volume="lvCableM">
+			<position y="UTStaveLong/2-UTCableLongM/2" z="-UTStaveCableZ" />
+			<rotation z="pi*rad" />
+		</physvol>
+		<physvol name="pvCableB4" volume="lvCableS">
+			<position y="UTStaveLong/2-UTCableLongS/2" z="UTStaveCableZ" />
+			<rotation y="pi*rad" z="pi*rad" />
+		</physvol>
+	</volume>
+	<!-- ========== Stave Type B Front ========== -->
+	<volume name="lvStaveBFront" vis="UT:Envelope"/>
+	<!-- ========== Stave Type B Back ========== -->
+	<volume name="lvStaveBBack" vis="UT:Envelope"/>
+	<volume name="lvStaveB" vis="UT:Envelope">
+		<physvol name="pvStaveBCore" volume="lvStaveBCore">
+		</physvol>
+	</volume>
+	<!-- ========== Stave Type C ========== -->
+	<!-- ========== Stave Type C core ========== -->
+	<volume name="lvStaveCCore" vis="UT:Envelope">
+		<physvol name="pvBareStaveC" volume="lvBareStaveC" />
+		<physvol name="pvCableC1" volume="lvCableL">
+			<position y="-UTStaveLong/2+UTCableLongL/2" z="-UTStaveCableZ" />
+		</physvol>
+		<physvol name="pvCableC2" volume="lvCableM">
+			<position y="-UTStaveLong/2+UTCableLongM/2" z="UTStaveCableZ" />
+			<rotation y="pi*rad" />
+		</physvol>
+		<physvol name="pvCableC3" volume="lvCableM">
+			<position y="UTStaveLong/2-UTCableLongM/2" z="-UTStaveCableZ" />
+			<rotation z="pi*rad" />
+		</physvol>
+		<physvol name="pvCableC4" volume="lvCableL">
+			<position y="UTStaveLong/2-UTCableLongL/2" z="UTStaveCableZ" />
+			<rotation y="pi*rad" z="pi*rad" />
+		</physvol>
+	</volume>
+	<!-- ========== Stave Type C Front ========== -->
+	<volume name="lvStaveCFront" vis="UT:Envelope"/>
+	<!-- ========== Stave Type C Back ========== -->
+	<volume name="lvStaveCBack" vis="UT:Envelope"/>
+	<volume name="lvStaveC" vis="UT:Envelope">
+		<physvol name="pvStaveCCore" volume="lvStaveCCore">
+		</physvol>
+	</volume>
+</ut>
diff --git a/compact/components/UT/2025-v00.00/UT.xml b/compact/components/UT/2025-v00.00/UT.xml
new file mode 100644
index 000000000..f17fdeeb6
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/UT.xml
@@ -0,0 +1,16 @@
+
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+<lccdd>
+    <include ref="parameters.xml"/>
+    <include ref="detector.xml"/>
+    <include ref="conditions.xml"/>
+</lccdd>
diff --git a/compact/components/UT/2025-v00.00/UTBox.xml b/compact/components/UT/2025-v00.00/UTBox.xml
new file mode 100644
index 000000000..25e818fe0
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/UTBox.xml
@@ -0,0 +1,131 @@
+<ut>
+	<!--
+	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
+
+	This software is distributed under the terms of the GNU General Public
+	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+	In applying this licence, CERN does not waive the privileges and immunities
+	granted to it by virtue of its status as an Intergovernmental Organization
+	or submit itself to any jurisdiction.
+	-->
+	<!-- UT frame -->
+	<volume name="lvUT" vis="UT:Envelope"/>
+	<volume material="UT:Aluminium" name="lvUTFrame" vis="UT:Frame">
+		<shape name="utFrame" operation="subtraction" type="BooleanShape">
+			<shape dx="UTFrameOuterWide/2" dy="UTFrameOuterLong/2" dz="UTFrameThick/2" name="utFrameBoxOuter" type="Box" />
+			<shape dx="UTFrameInnerWide/2" dy="UTFrameInnerLong/2" dz="UTFrameThick*1.1/2" name="utFrameBoxInner" type="Box" />
+		</shape>
+	</volume>
+	<!-- UT light tight box -->
+	<volume material="UT:BoxWall" name="lvUTBox" vis="UT:Box">
+		<shape name="utBox" operation="subtraction" type="BooleanShape">
+			<shape dx="UTBoxOuterWide/2" dy="UTBoxOuterLong/2" dz="UTBoxOuterThick/2" name="utBoxOuter" type="Box" />
+			<shape dx="UTBoxInnerWide/2" dy="UTBoxInnerLong/2" dz="UTBoxInnerThick/2" name="utBoxInner" type="Box" />
+			<shape dz="UTBoxOuterThick*1.1/2" name="utBoxPipeHole" rmax="UTBoxWallSealOR" type="Tube" />
+		</shape>
+	</volume>
+	<!-- UT box plug -->
+	<volume vis="UT:Airex" material="UT:Airex" name="lvUTBoxPipeAirexRingInner">
+		<shape dz="UTBoxPipeAirexRingInnerThick/2" name="utBoxPipeAirexRingInner" rmax="UTBoxPipeAirexRingInnerOR" rmin="UTBoxPipeAirexRingIR" type="Tube" />
+	</volume>
+	<volume vis="UT:Airex" material="UT:Airex" name="lvUTBoxPipeAirexRingMiddle">
+		<shape dz="UTBoxPipeAirexRingMiddleThick/2" name="utBoxPipeAirexRingMiddle" rmax="UTBoxPipeAirexRingMiddleOR" rmin="UTBoxPipeAirexRingIR" type="Tube" />
+	</volume>
+	<volume vis="UT:Airex" material="UT:Airex" name="lvUTBoxPipeAirexRingOuter">
+		<shape dz="UTBoxPipeAirexRingOuterThick/2" name="utBoxPipeAirexRingOuter" rmax="UTBoxPipeAirexRingOuterOR" rmin="UTBoxPipeAirexRingIR" type="Tube" />
+	</volume>
+	<volume name="lvUTBoxPipeAirexRing">
+		<physvol name="pvUTBoxPipeAirexRingInner" volume="lvUTBoxPipeAirexRingInner">
+			<position z="0.5*(UTBoxPipeAirexRingInnerThick+UTBoxPipeAirexRingMiddleThick)" />
+		</physvol>
+		<physvol name="pvUTBoxPipeAirexRingMiddle" volume="lvUTBoxPipeAirexRingMiddle" />
+		<physvol name="pvUTBoxPipeAirexRingOuter" volume="lvUTBoxPipeAirexRingOuter">
+			<position z="-0.5*(UTBoxPipeAirexRingOuterThick+UTBoxPipeAirexRingMiddleThick)" />
+		</physvol>
+	</volume>
+	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTBoxWallSeal">
+		<shape dz="UTBoxWallSealThick/2" name="utBoxWallSeal" rmax="UTBoxWallSealOR-UTEpsilon" rmin="UTBoxWallSealIR" type="Tube" />
+	</volume>
+	<volume vis="UT:HalfMoon" material="UT:Airex" name="lvUTBoxInternalAirexRing">
+		<shape dz="UTInternalRingThick/2-UTEpsilon" name="utBoxInternalAirexRing" rmax="UTInternalRingOR" rmin="UTInternalRingIR" type="Tube" />
+	</volume>
+	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTBoxInternalSeal">
+		<shape dz="UTInternalSealThick/2" name="utBoxInternalSeal" rmax="UTInternalSealOR" rmin="UTInternalSealIR" type="Tube" />
+	</volume>
+	<volume name="lvUTBoxPlugPiece">
+		<physvol name="pvUTBoxPipeAirexRing" volume="lvUTBoxPipeAirexRing">
+			<position z="3*mm"/>
+		</physvol>
+		<physvol name="pvUTBoxWallSeal" volume="lvUTBoxWallSeal">
+			<position z="3*mm"/>
+		</physvol>
+		<physvol name="pvUTBoxInternalAirexRing" volume="lvUTBoxInternalAirexRing">
+			<position z="0.5*(UTBoxWallDownstreamThick+UTInternalRingThick)" />
+		</physvol>
+		<physvol name="pvUTBoxInternalSeal" volume="lvUTBoxInternalSeal">
+			<position z="0.5*(UTBoxWallDownstreamThick+UTInternalSealThick)" />
+		</physvol>
+	</volume>
+	<volume name="lvUTBoxPlug">
+		<physvol name="pvUTBoxPlug1" volume="lvUTBoxPlugPiece">
+			<position z="0.5*(UTBoxOuterThick-UTPlugThickZ)" />
+			<rotation x="180*degree" />
+		</physvol>
+		<physvol name="pvUTBoxPlug2" volume="lvUTBoxPlugPiece">
+			<position z="-0.5*(UTBoxOuterThick-UTPlugThickZ)" />
+		</physvol>
+	</volume>
+	<!-- End of Stave (EOS) volumes -->
+	<volume material="UT:Steel" name="lvUTaEOS" vis="UT:EOS">
+		<shape dx="(UTEOSWideUTa/2)/2-UTEpsilon" dy="UTEOSLong/2-UTEpsilon" dz="UTEOSThick/2-UTEpsilon" name="utUTaEOS" type="Box" />
+	</volume>
+	<volume material="UT:EOSPigtail" name="lvUTaEOSPigtail" vis="UT:EOS">
+		<shape dx="(UTEOSWideUTa/2)/2-UTEpsilon" dy="UTEOSPigtailLong/2-UTEpsilon" dz="UTEOSPigtailThick/2-UTEpsilon" name="utUTaEOSPigtail" type="Box" />
+	</volume>
+	<volume material="UT:Steel" name="lvUTbEOS" vis="UT:EOS">
+		<shape dx="(UTEOSWideUTb/2)/2-UTEpsilon" dy="UTEOSLong/2-UTEpsilon" dz="UTEOSThick/2-UTEpsilon" name="utUTbEOS" type="Box" />
+	</volume>
+	<volume material="UT:EOSPigtail" name="lvUTbEOSPigtail" vis="UT:EOS">
+		<shape dx="(UTEOSWideUTb/2)/2-UTEpsilon" dy="UTEOSPigtailLong/2-UTEpsilon" dz="UTEOSPigtailThick/2-UTEpsilon" name="utUTbEOSPigtail" type="Box" />
+	</volume>
+	<!-- UT Kapton jacket for electronic insulation -->
+	<volume material="UT:BeamPipeJacket" name="lvUTCylJacket">
+		<shape dz="UTCylJacketLength/2" name="UTCylJacket" rmax="UTCylJacketRadius+UTCylJacketThick" rmin="UTCylJacketRadius" type="Tube" />
+	</volume>
+	<volume material="UT:BeamPipeJacket" name="lvUTConeJacketUpstream">
+		<shape dz="UTConeJacketUpstreamLength/2" name="UTConeJacketUpstream" rmax2="UTConeJacketCutOutRadiusZmin+UTConeJacketThick" rmax1="UTConeJacketRadiusZmin+UTConeJacketThick" rmin2="UTConeJacketCutOutRadiusZmin" rmin1="UTConeJacketRadiusZmin" type="ConeSegment" />
+	</volume>
+	<volume material="UT:BeamPipeJacket" name="lvUTConeJacketDownstream">
+		<shape dz="UTConeJacketDownstreamLength/2" name="UTConeJacketDownstream" rmax2="UTConeJacketRadiusZmax+UTConeJacketThick" rmax1="UTConeJacketCutOutRadiusZmax+UTConeJacketThick" rmin2="UTConeJacketRadiusZmax" rmin1="UTConeJacketCutOutRadiusZmax" type="ConeSegment" />
+	</volume>
+	<volume name="lvUTJacket">
+		<physvol name="pvUTCylJacket" volume="lvUTCylJacket">
+			<position z="UTCylJacketZpos" />
+		</physvol>
+		<physvol name="pvUTConeJacketUpstream" volume="lvUTConeJacketUpstream">
+			<position z="UTConeJacketZposUpstream" />
+		</physvol>
+		<physvol name="pvUTConeJacketDownstream" volume="lvUTConeJacketDownstream">
+			<position z="UTConeJacketZposDownstream" />
+		</physvol>
+	</volume>
+	<volume vis="UT:PipeHeater" material="UT:PipeHeater" name="lvUTPipeHeaterUpstream">
+		<shape dz="UTPipeHeaterUpstreamLength/2" name="UTPipeHeaterUpstream" rmax="UTPipeHeaterUpstreamRadius+UTPipeHeaterUpstreamThick" rmin="UTPipeHeaterUpstreamRadius" type="Tube" />
+	</volume>
+	<volume vis="UT:PipeHeater" material="UT:PipeHeater" name="lvUTPipeHeaterDownstreamInUT">
+		<shape name="utPipeHeaterInUT" operation="subtraction" type="BooleanShape">
+			<shape dz="UTPipeHeaterDownstreamLength/2" name="UTPipeHeaterDownstream" rmax2="UTPipeHeaterDownstreamRadiusZmax+UTPipeHeaterDownstreamThick" rmax1="UTPipeHeaterDownstreamRadiusZmin+UTPipeHeaterDownstreamThick" rmin2="UTPipeHeaterDownstreamRadiusZmax" rmin1="UTPipeHeaterDownstreamRadiusZmin" type="ConeSegment" />
+			<shape rmax="UTPipeHeaterDownstreamRadiusZmax+UTPipeHeaterDownstreamThick+UTEpsilon" dz="(UTPipeHeaterDownstreamLengthInMagnet)/2+UTEpsilon" name="UTPipeHeaterDownstreamInUTSubMagnet" type="Tube" />
+			<position z="UTPipeHeaterDownstreamZmax-(UTPipeHeaterDownstreamLengthInMagnet)/2+UTEpsilon-UTPipeHeaterDownstreamPos-UTSystemZ" />
+		</shape>
+	</volume>
+	<volume name="lvUTPipeHeater">
+		<physvol name="pvUTPipeHeaterUpstream" volume="lvUTPipeHeaterUpstream">
+			<position z="UTPipeHeaterUpstreamPos" />
+		</physvol>
+		<physvol name="pvUTPipeHeaterDownstream" volume="lvUTPipeHeaterDownstreamInUT">
+			<position z="UTPipeHeaterDownstreamPos" />
+		</physvol>
+	</volume>
+</ut>
diff --git a/compact/components/UT/2025-v00.00/UTHalf.xml b/compact/components/UT/2025-v00.00/UTHalf.xml
new file mode 100644
index 000000000..6a0f3b1f6
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/UTHalf.xml
@@ -0,0 +1,14 @@
+<ut>
+	<!--
+	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
+
+	This software is distributed under the terms of the GNU General Public
+	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+	In applying this licence, CERN does not waive the privileges and immunities
+	granted to it by virtue of its status as an Intergovernmental Organization
+	or submit itself to any jurisdiction.
+	-->
+	<volume name="lvUTC" vis="UT:Envelope"/>
+	<volume name="lvUTA" vis="UT:Envelope"/>
+</ut>
diff --git a/compact/components/UT/2025-v00.00/UTaULayer.xml b/compact/components/UT/2025-v00.00/UTaULayer.xml
new file mode 100644
index 000000000..cf80bd603
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/UTaULayer.xml
@@ -0,0 +1,41 @@
+<ut>
+	<!--
+	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
+
+	This software is distributed under the terms of the GNU General Public
+	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+	In applying this licence, CERN does not waive the privileges and immunities
+	granted to it by virtue of its status as an Intergovernmental Organization
+	or submit itself to any jurisdiction.
+	-->
+	<volume name="lvUTaUCsideLayer" vis="UT:Envelope">
+		<physvol name="pvUTaCEOSU1" volume="lvUTaEOS">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTaCEOSU2" volume="lvUTaEOS">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTaCEOSPigtailU1" volume="lvUTaEOSPigtail">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+		<physvol name="pvUTaCEOSPigtailU2" volume="lvUTaEOSPigtail">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+	</volume>
+	<!-- ================================================================= -->
+	<volume name="lvUTaUAsideLayer" vis="UT:Envelope">
+		<physvol name="pvUTaAEOSU1" volume="lvUTaEOS">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTaAEOSU2" volume="lvUTaEOS">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTaAEOSPigtailU1" volume="lvUTaEOSPigtail">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+		<physvol name="pvUTaAEOSPigtailU2" volume="lvUTaEOSPigtail">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+	</volume>
+</ut>
diff --git a/compact/components/UT/2025-v00.00/UTaXLayer.xml b/compact/components/UT/2025-v00.00/UTaXLayer.xml
new file mode 100644
index 000000000..59934dacd
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/UTaXLayer.xml
@@ -0,0 +1,41 @@
+<ut>
+	<!--
+	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
+
+	This software is distributed under the terms of the GNU General Public
+	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+	In applying this licence, CERN does not waive the privileges and immunities
+	granted to it by virtue of its status as an Intergovernmental Organization
+	or submit itself to any jurisdiction.
+	-->
+	<volume name="lvUTaXCsideLayer" vis="UT:Envelope">
+		<physvol name="pvUTaCEOSX1" volume="lvUTaEOS">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTaCEOSX2" volume="lvUTaEOS">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTaCEOSPigtailX1" volume="lvUTaEOSPigtail">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+		<physvol name="pvUTaCEOSPigtailX2" volume="lvUTaEOSPigtail">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+	</volume>
+	<!-- ================================================================= -->
+	<volume name="lvUTaXAsideLayer" vis="UT:Envelope">
+		<physvol name="pvUTaAEOSX1" volume="lvUTaEOS">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTaAEOSX2" volume="lvUTaEOS">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTaAEOSPigtailX1" volume="lvUTaEOSPigtail">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+		<physvol name="pvUTaAEOSPigtailX2" volume="lvUTaEOSPigtail">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+	</volume>
+</ut>
diff --git a/compact/components/UT/2025-v00.00/UTbVLayer.xml b/compact/components/UT/2025-v00.00/UTbVLayer.xml
new file mode 100644
index 000000000..6825d7d96
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/UTbVLayer.xml
@@ -0,0 +1,41 @@
+<ut>
+	<!--
+	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
+
+	This software is distributed under the terms of the GNU General Public
+	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+	In applying this licence, CERN does not waive the privileges and immunities
+	granted to it by virtue of its status as an Intergovernmental Organization
+	or submit itself to any jurisdiction.
+	-->
+	<volume name="lvUTbVCsideLayer" vis="UT:Envelope">
+		<physvol name="pvUTbCEOSV1" volume="lvUTbEOS">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTbCEOSV2" volume="lvUTbEOS">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTbCEOSPigtailV1" volume="lvUTbEOSPigtail">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+		<physvol name="pvUTbCEOSPigtailV2" volume="lvUTbEOSPigtail">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+	</volume>
+	<!-- ================================================================= -->
+	<volume name="lvUTbVAsideLayer" vis="UT:Envelope">
+		<physvol name="pvUTbAEOSV1" volume="lvUTbEOS">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTbAEOSV2" volume="lvUTbEOS">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTbAEOSPigtailV1" volume="lvUTbEOSPigtail">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+		<physvol name="pvUTbAEOSPigtailV2" volume="lvUTbEOSPigtail">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+	</volume>
+</ut>
diff --git a/compact/components/UT/2025-v00.00/UTbXLayer.xml b/compact/components/UT/2025-v00.00/UTbXLayer.xml
new file mode 100644
index 000000000..bf871e6e5
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/UTbXLayer.xml
@@ -0,0 +1,42 @@
+<ut>
+	<!--
+	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
+
+	This software is distributed under the terms of the GNU General Public
+	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+	In applying this licence, CERN does not waive the privileges and immunities
+	granted to it by virtue of its status as an Intergovernmental Organization
+	or submit itself to any jurisdiction.
+	-->
+	<volume name="lvUTbXCsideLayer" vis="UT:Envelope">
+		<physvol name="pvUTbCEOSX1" volume="lvUTbEOS">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTbCEOSX2" volume="lvUTbEOS">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTbCEOSPigtailX1" volume="lvUTbEOSPigtail">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+		<physvol name="pvUTbCEOSPigtailX2" volume="lvUTbEOSPigtail">
+			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+	</volume>
+	<!-- ================================================================= -->
+	<volume name="lvUTbXAsideLayer" vis="UT:Envelope">
+
+		<physvol name="pvUTbAEOSX1" volume="lvUTbEOS">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTbAEOSX2" volume="lvUTbEOS">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
+		</physvol>
+		<physvol name="pvUTbAEOSPigtailX1" volume="lvUTbEOSPigtail">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+		<physvol name="pvUTbAEOSPigtailX2" volume="lvUTbEOSPigtail">
+			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
+		</physvol>
+	</volume>
+</ut>
diff --git a/compact/components/UT/2025-v00.00/conditions.xml b/compact/components/UT/2025-v00.00/conditions.xml
new file mode 100644
index 000000000..0b364ca05
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/conditions.xml
@@ -0,0 +1,65 @@
+<!-- ========================================================================== -->
+<!--  LHCb Detector Description                                                 -->
+<!-- ========================================================================== -->
+<!--                                                                            -->
+<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)  -->
+<!--  All rights reserved.                                                      -->
+<!--                                                                            -->
+<!--   @author  M.Frank                                                         -->
+<!--   @date    14/10/2018                                                      -->
+<!--                                                                            -->
+<!-- ========================================================================== -->
+<lccdd>
+
+  <plugins>
+    <plugin name="LHCb_UT_cond_XML_reader" type="xml">
+
+      <conditions_config prefix="Conditions/UT"/>
+
+      <alignment detector="UT" path="Alignment/Global.yml" name="UTSystem"/>
+      <alignment_pattern path_regex=".*([CA])side" path="Alignment/Global.yml" name="UT${1}side"/>
+      <alignment_pattern path_regex=".*([CA])side/UT(\S\S)" path="Alignment/HalfLayers.yml" name="UT${1}sideUT${2}"/>
+      <alignment_pattern path_regex=".*([CA])side/UT(\S\S)/Stave(\d)" path="Alignment/Staves.yml" name="UT${1}sideUT${2}Stave${3}"/>
+      <alignment_pattern path_regex=".*([CA])side/UT(\S\S)/Stave(\d)/Face(\d)" path="Alignment/Staves.yml" name="UT${1}sideUT${2}Stave${3}Face${4}"/>
+      <alignment_pattern path_regex=".*([CA])side/UT(\S\S)/Stave(\d)/Face(\d)/Module(\d)" path="Alignment/Modules.yml" name="UT${1}sideUT${2}Stave${3}Face${4}Module${5}"/>
+
+      <!-- TELL40 boards to UT (sub)sector mapping -->
+      <conditions path="ReadoutConf.yml">
+        <condition name="ReadoutMap"/>
+      </conditions>
+
+      <!-- simulation conditions made optional -->
+      <conditions path="ChannelInfo/NoiseValues.yml">
+        <condition name="NoiseValues" optional='1'/>
+      </conditions>
+      <conditions path="ChannelInfo/ReadoutSectors.yml">
+        <condition name="ReadoutSectors" optional='1'/>
+      </conditions>
+      <conditions path="ChannelInfo/PedestalValues.yml">
+        <condition name="PedestalValues" optional='1'/>
+      </conditions>
+      <conditions path="ReadoutConf/ClusteringThresholds.yml">
+        <condition name="ClusteringThresholds" optional='1'/>
+      </conditions>
+      <conditions path="HitError.yml">
+        <condition name="HitError" optional='1'/>
+      </conditions>
+
+      <!-- Thresholds for each ASIC -->
+      <conditions path="ChannelInfo/Thresholds.yml">
+        <condition name="Thresholds" optional='1'/>
+      </conditions>
+
+      <!-- Hit limits for each ASIC -->
+      <conditions path="ChannelInfo/HitLimits.yml">
+        <condition name="HitLimits" optional='1'/>
+      </conditions>
+
+      <!-- Parameters of response function for each ASIC -->
+      <conditions path="ChannelInfo/SALTResponse.yml">
+        <condition name="SALTResponse" optional='1'/>
+      </conditions>
+    </plugin>
+  </plugins>
+
+</lccdd>
diff --git a/compact/components/UT/2025-v00.00/detector.xml b/compact/components/UT/2025-v00.00/detector.xml
new file mode 100644
index 000000000..e8f3b38fe
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/detector.xml
@@ -0,0 +1,62 @@
+<!--==========================================================================-->
+<!-- LHCb Detector Description -->
+<!--==========================================================================-->
+<!--  -->
+<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!-- All rights reserved. -->
+<!--  -->
+<!-- @author  H.Wu -->
+<!-- @date    03/05/2021 -->
+<!--  -->
+<!--==========================================================================-->
+<!-- XML description of the UT stations -->
+<!--==========================================================================-->
+
+<lccdd>
+	<define>
+	</define>
+	<detectors>
+		<detector id="UT:ID" name="UT" type="LHCb_UT_v1_0" parent="${UT:parent}" readout="UTHits" vis="UT:Envelope">
+
+			<include ref="../../Pipe/trunk/InUT.xml"/>
+			<include ref="Sensor.xml"/>
+			<include ref="Module.xml"/>
+			<include ref="Stave.xml"/>
+			<include ref="UTBox.xml"/>
+			<include ref="UTaXLayer.xml"/>
+			<include ref="UTaULayer.xml"/>
+			<include ref="UTbVLayer.xml"/>
+			<include ref="UTbXLayer.xml"/>
+			<include ref="UTHalf.xml"/>
+
+			<debug>
+				<item name="debug" value="false"/>
+				<item name="Build_Sides" value="1"/>
+				<item name="Build_Aside" value="1"/>
+				<item name="Build_Aside_UTaX" value="1"/>
+				<item name="Build_Aside_UTaU" value="1"/>
+				<item name="Build_Aside_UTbV" value="1"/>
+				<item name="Build_Aside_UTbX" value="1"/>
+				<item name="Build_Cside" value="1"/>
+				<item name="Build_Cside_UTaX" value="1"/>
+				<item name="Build_Cside_UTaU" value="1"/>
+				<item name="Build_Cside_UTbV" value="1"/>
+				<item name="Build_Cside_UTbX" value="1"/>
+				<item name="Build_Frame" value="1"/>
+				<item name="Build_Jacket" value="1"/>
+				<item name="Build_PipeHeater" value="1"/>
+				<item name="Build_Box" value="1"/>
+				<item name="Build_BoxPlug" value="1"/>
+				<item name="select_volume" value="lvUT"/>
+			</debug>
+
+			<position z="2485*mm" />
+
+		</detector>
+	</detectors>
+	<readouts>
+		<readout name="UTHits">
+			<id>system:8,sensor:1,sector:1,module:3,face:1,stave:4,layer:2,side:1</id>
+		</readout>
+	</readouts>
+</lccdd>
diff --git a/compact/components/UT/2025-v00.00/parameters.xml b/compact/components/UT/2025-v00.00/parameters.xml
new file mode 100644
index 000000000..3c30e6ccb
--- /dev/null
+++ b/compact/components/UT/2025-v00.00/parameters.xml
@@ -0,0 +1,729 @@
+<!-- ========================================================================== -->
+<!-- LHCb Detector Description -->
+<!-- ========================================================================== -->
+<!--  -->
+<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!-- All rights reserved. -->
+<!--  -->
+<!-- @author  M.Frank -->
+<!-- @date    14/10/2018 -->
+<!--  -->
+<!-- ========================================================================== -->
+<!-- XML description of the UT constant definitions -->
+<!-- ========================================================================== -->
+<lccdd>
+	<define>
+		<!-- UT Geometry constants -->
+		<!-- *  Author: Jianchun Wang  * -->
+		<constant name="UTGeomVersion" value="1.1" />
+		<constant name="UTEpsilon" value="0.001*mm" />
+		<!-- ========== UT sensors ========== -->
+    <constant name="UTSensorAPitch" value="0.1875*mm" />
+    <constant name="UTSensorBCDPitch" value="0.0935*mm" />
+		<constant name="UTSensorWide" value="97.5*mm" />
+		<constant name="UTSensorLongA" value="99.5*mm" />
+		<constant name="UTSensorLongB" value="UTSensorLongA" />
+		<constant name="UTSensorSiOverlapY" value="1.8*mm" />
+		<constant name="UTSensorGRWideFar" value="0.8*mm" />
+		<constant name="UTSensorGRWideNear" value="0.8*mm+0.5*mm" />
+		<constant name="UTSensorOverlapY" value="UTSensorSiOverlapY+UTSensorGRWideFar+UTSensorGRWideNear" />
+		<constant name="UTSensorLongC" value="(UTSensorLongA+UTSensorOverlapY)/2" />
+		<constant name="UTSensorLongD" value="UTSensorLongC" />
+		<constant name="UTSensorThick" value="0.320*mm" />
+		<constant name="UTSensorOverlapY0" value="UTSensorSiOverlapY+UTSensorGRWideFar*2" />
+		<constant name="UTSensorSiOverlapX" value="2.0*mm" />
+		<constant name="UTSensorGRWideSide" value="0.8*mm" />
+		<constant name="UTSensorOverlapX" value="UTSensorSiOverlapX+2*UTSensorGRWideSide" />
+		<constant name="UTSensorSiWide" value="UTSensorWide-2*UTSensorGRWideSide" />
+		<constant name="UTSensorSiLongA" value="UTSensorLongA-UTSensorGRWideFar-UTSensorGRWideNear" />
+		<constant name="UTSensorSiLongB" value="UTSensorLongB-UTSensorGRWideFar-UTSensorGRWideNear" />
+		<constant name="UTSensorSiLongC" value="UTSensorLongC-UTSensorGRWideFar-UTSensorGRWideNear" />
+		<constant name="UTSensorSiLongD" value="UTSensorLongD-UTSensorGRWideFar-UTSensorGRWideNear" />
+		<constant name="UTSensorAlThick" value="0.003*mm" />
+		<constant name="UTSensorSiThickA" value="0.320*mm-UTSensorAlThick" />
+		<constant name="UTSensorSiThickB" value="0.250*mm-UTSensorAlThick" />
+		<constant name="UTSensorSiThickC" value="0.250*mm-UTSensorAlThick" />
+		<constant name="UTSensorSiThickD" value="0.250*mm-UTSensorAlThick" />
+		<constant name="UTSensorSiOffsetY" value="(UTSensorGRWideNear-UTSensorGRWideFar)/2" />
+		<constant name="UTSensorGRThickA" value="UTSensorSiThickA" />
+		<constant name="UTSensorGRThickB" value="UTSensorSiThickB" />
+		<constant name="UTSensorGRThickC" value="UTSensorSiThickC" />
+		<constant name="UTSensorGRThickD" value="UTSensorSiThickD" />
+		<constant name="UTSensorAlWide" value="UTSensorWide" />
+		<constant name="UTSensorAlLongA" value="UTSensorLongA" />
+		<constant name="UTSensorAlLongB" value="UTSensorLongB" />
+		<constant name="UTSensorAlLongC" value="UTSensorLongC" />
+		<constant name="UTSensorAlLongD" value="UTSensorLongD" />
+		<constant name="UTSensorAlZ" value="UTSensorThick/2-UTSensorAlThick/2" />
+		<constant name="UTSensorSiZ" value="-UTSensorAlThick/2" />
+		<!-- ========== Hybrid ========== -->
+		<constant name="UTStiffWide" value="UTSensorWide" />
+		<constant name="UTHybridWide" value="UTStiffWide" />
+		<constant name="UTHybridFlex4Long" value="30*mm" />
+		<constant name="UTAnchorLong" value="10*mm" />
+		<constant name="UTHybridFlex4Gap" value="1*mm" />
+		<constant name="UTStiffLongA" value="UTSensorLongA+UTHybridFlex4Gap+UTHybridFlex4Long+UTAnchorLong*2" />
+		<constant name="UTHybridLongA" value="UTStiffLongA" />
+		<constant name="UTHybridFlex8Long" value="30*mm" />
+		<constant name="UTHybridFlex8Gap" value="1*mm" />
+		<constant name="UTStiffLongB" value="UTSensorLongB+UTHybridFlex8Gap+UTHybridFlex8Long+UTAnchorLong*2" />
+		<constant name="UTHybridLongB" value="UTStiffLongB" />
+		<constant name="UTStiffLongC" value="UTSensorLongC+UTHybridFlex8Gap+UTHybridFlex8Long+UTAnchorLong*2" />
+		<constant name="UTHybridLongC" value="UTStiffLongC" />
+		<constant name="UTStiffLongD" value="UTSensorLongD+UTHybridFlex8Gap+UTHybridFlex8Long+UTAnchorLong*2" />
+		<constant name="UTHybridLongD" value="UTStiffLongD" />
+		<constant name="UTSiAsicThick" value="0.320*mm" />
+		<constant name="UTSilverEpoxyThick" value="0.100*mm" />
+		<constant name="UTAsicThick" value="UTSiAsicThick+UTSilverEpoxyThick" />
+		<constant name="UTHybridFlex4Thick" value="0.400*mm" />
+		<constant name="UTHysolThick" value="0.050*mm" />
+		<constant name="UTStiffThick" value="0.500*mm" />
+		<constant name="UTTimThick" value="0.125*mm" />
+		<constant name="UTHybrid4Thick" value="UTTimThick+UTStiffThick+UTHysolThick+UTHybridFlex4Thick+UTAsicThick+4*UTEpsilon" />
+		<constant name="UTHybridFlex8Thick" value="0.400*mm" />
+		<constant name="UTHybrid8Thick" value="UTTimThick+UTStiffThick+UTHysolThick+UTHybridFlex8Thick+UTAsicThick+4*UTEpsilon" />
+		<constant name="UTAsicWide" value="10.9*mm" />
+		<constant name="UTAsicLong" value="4.75*mm" />
+		<constant name="UTAsicThickAve" value="UTAsicThick*UTAsicWide/UTSensorSiWide" />
+		<constant name="UTHybridFlex4Wide" value="UTSensorWide" />
+		<constant name="UTHybridFlex8Wide" value="UTSensorWide" />
+		<constant name="UTHysolWide" value="UTSensorWide" />
+		<constant name="UTHysolLongA" value="UTSensorLongA+UTHybridFlex4Gap+UTHybridFlex4Long" />
+		<constant name="UTHysolLongB" value="UTSensorLongB+UTHybridFlex8Gap+UTHybridFlex8Long" />
+		<constant name="UTHysolLongC" value="UTSensorLongC+UTHybridFlex8Gap+UTHybridFlex8Long" />
+		<constant name="UTHysolLongD" value="UTSensorLongD+UTHybridFlex8Gap+UTHybridFlex8Long" />
+		<constant name="UTStiffLWide" value="10*mm" />
+		<constant name="UTHysolCutWide" value="UTSensorWide-UTStiffLWide" />
+		<constant name="UTHysolCutLongA" value="UTSensorLongA-UTStiffLWide" />
+		<constant name="UTHysolCutLongB" value="UTSensorLongB-UTStiffLWide" />
+		<constant name="UTHysolCutLongC" value="UTSensorLongC-UTStiffLWide" />
+		<constant name="UTHysolCutLongD" value="UTSensorLongD-UTStiffLWide" />
+		<constant name="UTHysolGapWide" value="1*mm" />
+		<constant name="UTStiffCutWide" value="UTSensorWide-UTStiffLWide" />
+		<constant name="UTStiffCutLongA" value="UTSensorLongA-UTStiffLWide+UTAnchorLong" />
+		<constant name="UTStiffCutLongB" value="UTSensorLongB-UTStiffLWide+UTAnchorLong" />
+		<constant name="UTStiffCutLongC" value="UTSensorLongC-UTStiffLWide+UTAnchorLong" />
+		<constant name="UTStiffCutLongD" value="UTSensorLongD-UTStiffLWide+UTAnchorLong" />
+		<constant name="UTAnchorWide" value="10*mm" />
+		<constant name="UTAnchorSide" value="15*mm" />
+		<constant name="UTTimWide" value="UTSensorWide" />
+		<constant name="UTTimLongA" value="UTSensorLongA+UTHybridFlex4Gap+UTHybridFlex4Long" />
+		<constant name="UTTimLongB" value="UTSensorLongB+UTHybridFlex8Gap+UTHybridFlex8Long" />
+		<constant name="UTTimLongC" value="UTSensorLongC+UTHybridFlex8Gap+UTHybridFlex8Long" />
+		<constant name="UTTimLongD" value="UTSensorLongD+UTHybridFlex8Gap+UTHybridFlex8Long" />
+		<constant name="UTTimCutWide" value="UTSensorWide-UTStiffLWide" />
+		<constant name="UTTimCutLongA" value="UTSensorLongA-UTStiffLWide" />
+		<constant name="UTTimCutLongB" value="UTSensorLongB-UTStiffLWide" />
+		<constant name="UTTimCutLongC" value="UTSensorLongC-UTStiffLWide" />
+		<constant name="UTTimCutLongD" value="UTSensorLongD-UTStiffLWide" />
+		<constant name="UTHybridAsicGap" value="2*mm" />
+		<constant name="UTHybridFlex4End" value="UTHybridFlex4Gap+UTHybridFlex4Long" />
+		<constant name="UTTimZ" value="UTHybrid4Thick/2-UTTimThick/2" />
+		<constant name="UTStiffZ" value="UTTimZ-(UTTimThick+UTStiffThick)/2-UTEpsilon" />
+		<constant name="UTHysolZ" value="UTStiffZ-(UTStiffThick+UTHysolThick)/2-UTEpsilon" />
+		<constant name="UTSensorYA" value="UTHybridLongA/2-UTAnchorLong-UTSensorLongA/2" />
+		<constant name="UTSensorYB" value="UTHybridLongA/2-UTAnchorLong-UTSensorLongA/2" />
+		<constant name="UTSensorYC" value="UTHybridLongA/2-UTAnchorLong-UTSensorLongA/2" />
+		<constant name="UTSensorYD" value="UTHybridLongA/2-UTAnchorLong-UTSensorLongA/2" />
+		<constant name="UTSensorZ" value="UTHysolZ-(UTHysolThick+UTSensorThick)/2-UTEpsilon" />
+		<constant name="UTHybridFlexYA" value="UTSensorYA-UTSensorLongA/2-UTHybridFlex4Gap-UTHybridFlex4Long/2" />
+		<constant name="UTHybridFlexYB" value="UTSensorYB-UTSensorLongB/2-UTHybridFlex8Gap-UTHybridFlex8Long/2" />
+		<constant name="UTHybridFlexYC" value="UTSensorYC-UTSensorLongC/2-UTHybridFlex8Gap-UTHybridFlex8Long/2" />
+		<constant name="UTHybridFlexYD" value="UTSensorYD-UTSensorLongD/2-UTHybridFlex8Gap-UTHybridFlex8Long/2" />
+		<constant name="UTHybridFlex4Z" value="UTHysolZ-(UTHysolThick+UTHybridFlex4Thick)/2-UTEpsilon" />
+		<constant name="UTHybridFlex8Z" value="UTHysolZ-(UTHysolThick+UTHybridFlex8Thick)/2-UTEpsilon" />
+		<constant name="UTAsicYA" value="UTSensorYA-UTSensorLongA/2-UTHybridAsicGap-UTAsicLong/2" />
+		<constant name="UTAsicYB" value="UTSensorYB-UTSensorLongB/2-UTHybridAsicGap-UTAsicLong/2" />
+		<constant name="UTAsicYC" value="UTSensorYC-UTSensorLongC/2-UTHybridAsicGap-UTAsicLong/2" />
+		<constant name="UTAsicYD" value="UTSensorYD-UTSensorLongD/2-UTHybridAsicGap-UTAsicLong/2" />
+		<constant name="UTAsic4Z" value="UTHybridFlex4Z-(UTHybridFlex4Thick+UTAsicThick)/2-UTEpsilon" />
+		<constant name="UTAsic8Z" value="UTHybridFlex8Z-(UTHybridFlex8Thick+UTAsicThick)/2-UTEpsilon" />
+		<!-- ========== Stave ========== -->
+		<constant name="UTBareStaveThick" value="3.90*mm" />
+		<constant name="UTCableKaptonThick" value="0.325*mm" />
+		<constant name="UTCableCuThickL0" value="0.037*mm" />
+		<constant name="UTCableThick" value="UTCableKaptonThick+UTCableCuThickL0" />
+		<constant name="UTStaveThick" value="UTBareStaveThick+UTCableThick*2+UTHybrid4Thick*2 + 4*UTEpsilon" />
+		<constant name="UTBareStaveEdge" value="1*mm" />
+		<constant name="UTBareStaveWide" value="UTHybridWide+2*UTBareStaveEdge" />
+		<constant name="UTStaveWide" value="UTBareStaveWide" />
+		<constant name="UTBareStaveEnd" value="15.11*mm" />
+		<constant name="UTBareStaveLong" value="UTSensorLongA*14-UTSensorOverlapY*13+UTHybridFlex4End*2+UTBareStaveEnd*2" />
+		<constant name="UTBareStaveEOSLong" value="111.28*mm" />
+		<constant name="UTStaveLong" value="UTBareStaveLong+2*UTBareStaveEOSLong" />
+		<constant name="UTCableWide" value="UTBareStaveWide" />
+		<constant name="UTCableLongL0" value="UTSensorLongA-UTSensorOverlapY" />
+		<constant name="UTCableLongL1" value="UTSensorLongA*2-UTSensorOverlapY*2" />
+		<constant name="UTCableLongL2" value="UTSensorLongA*2-UTSensorOverlapY*2" />
+		<constant name="UTCableLongL3" value="UTSensorLongA+UTSensorLongC-UTSensorOverlapY*2" />
+		<constant name="UTCableLongL" value="UTCableLongL0+UTCableLongL1+UTCableLongL2+UTCableLongL3" />
+		<constant name="UTCableLongM0" value="UTBareStaveEOSLong" />
+		<constant name="UTCableLongM1" value="UTSensorLongA*2-UTSensorOverlapY*2" />
+		<constant name="UTCableLongM2" value="UTSensorLongA*2-UTSensorOverlapY*2" />
+		<constant name="UTCableLongM3" value="UTSensorLongA*2-UTSensorOverlapY*2" />
+		<constant name="UTCableLongM" value="UTCableLongM0+UTCableLongM1+UTCableLongM2+UTCableLongM3" />
+		<constant name="UTCableLongS0" value="UTBareStaveEOSLong+UTSensorLongA-UTSensorOverlapY" />
+		<constant name="UTCableLongS1" value="UTSensorLongA*2-UTSensorOverlapY*2" />
+		<constant name="UTCableLongS2" value="UTSensorLongA*2-UTSensorOverlapY*2" />
+		<constant name="UTCableLongS" value="UTCableLongS0+UTCableLongS1+UTCableLongS2" />
+		<constant name="UTCableCuThickL1" value="0.032*mm" />
+		<constant name="UTCableCuThickL2" value="0.026*mm" />
+		<constant name="UTCableCuThickL3" value="0.011*mm" />
+		<constant name="UTCableCuThickM0" value="0.037*mm" />
+		<constant name="UTCableCuThickM1" value="0.030*mm" />
+		<constant name="UTCableCuThickM2" value="0.020*mm" />
+		<constant name="UTCableCuThickM3" value="0.010*mm" />
+		<constant name="UTCableCuThickS0" value="0.030*mm" />
+		<constant name="UTCableCuThickS1" value="0.020*mm" />
+		<constant name="UTCableCuThickS2" value="0.010*mm" />
+		<constant name="UTMegArrayWide" value="55*mm" />
+		<constant name="UTMegArrayLong" value="17.5*mm" />
+		<constant name="UTMegArrayThick" value="3*mm" />
+		<constant name="UTMegArrayY" value="40.8*mm" />
+		<constant name="UTHVConnectorWide" value="20*mm" />
+		<constant name="UTHVConnectorLong" value="10*mm" />
+		<constant name="UTHVConnectorThick" value="3*mm" />
+		<constant name="UTHVConnectorLX" value="36*mm" />
+		<constant name="UTHVConnectorMX" value="-36*mm" />
+		<constant name="UTHVConnectorSX" value="36*mm" />
+		<constant name="UTCoolingJointLong" value="30*mm" />
+		<constant name="UTCoolingJointR0" value="2.0*mm" />
+		<constant name="UTCoolingJointR1" value="1.0*mm" />
+		<constant name="UTCoolingJointX" value="-40*mm" />
+		<constant name="UTStaveHybridAStepY" value="UTSensorLongA-UTSensorOverlapY" />
+		<constant name="UTStaveHybridBStepY" value="UTSensorLongB-UTSensorOverlapY" />
+		<constant name="UTStaveHybridCStepY" value="UTSensorLongC-UTSensorOverlapY" />
+		<constant name="UTStaveHybridDStepY" value="UTSensorLongD-UTSensorOverlapY" />
+		<constant name="UTStaveAHybridY0" value="UTHybridLongA/2-UTAnchorLong-UTSensorOverlapY0/2-UTStaveHybridAStepY/2" />
+		<constant name="UTStaveBHybridY0" value="UTHybridLongB/2-UTAnchorLong-UTSensorOverlapY0/2-UTStaveHybridBStepY/2" />
+		<constant name="UTStaveCHybridY0" value="UTHybridLongD/2-UTAnchorLong-UTSensorOverlapY0/2-UTStaveHybridDStepY/2" />
+		<constant name="UTStaveCableZ" value="UTBareStaveThick/2+UTCableThick/2+UTEpsilon" />
+		<constant name="UTStaveHybridZ" value="UTBareStaveThick/2+UTHybrid4Thick/2+UTCableThick+2*UTEpsilon" />
+		<!-- Aluminium frame -->
+		<constant name="UTFrameThick" value="15*mm" />
+		<constant name="UTVirtualBoxWide" value="2586*mm" />
+		<constant name="UTFrameOuterWide" value="UTVirtualBoxWide" />
+		<constant name="UTVirtualBoxLong" value="2628*mm" />
+		<constant name="UTFrameOuterLong" value="UTVirtualBoxLong" />
+		<constant name="UTBoxOuterWide" value="2040*mm" />
+		<constant name="UTFrameInnerWide" value="UTBoxOuterWide" />
+		<constant name="UTBoxOuterLong" value="1960*mm" />
+		<constant name="UTFrameInnerLong" value="UTBoxOuterLong" />
+		<!-- UT light tight box -->
+		<constant name="UTBoxOuterThick" value="430.0*mm" />
+		<constant name="UTBoxWallDownstreamThick" value="20.0*mm" />
+		<constant name="UTBoxInnerThick" value="UTBoxOuterThick-2*UTBoxWallDownstreamThick" />
+		<constant name="UTBoxWallSideThick" value="25.0*mm" />
+		<constant name="UTBoxInnerWide" value="UTBoxOuterWide-2*UTBoxWallSideThick" />
+		<constant name="UTBoxInnerLong" value="UTBoxOuterLong-2*UTBoxWallSideThick" />
+		<!-- UTBoxWallUpstreamThick is thickness of plates on front and back (in Z) in the UT -->
+		<!-- UTBoxWallSideThick is thickness of top, bottom, left, and right plates when looking downstream -->
+		<constant name="UTBeamHoleRadius" value="33.4*mm" />
+		<constant name="UTBoxBeamHoleRadius" value="UTBeamHoleRadius-0.1*mm" />
+		<!-- UT box plug -->
+		<constant name="UTCylJacketThick" value="5.12*mm" />
+		<constant name="UTConeJacketThick" value="UTCylJacketThick" />
+		<constant name="UTPipeHeaterDownstreamThick" value="0.35*mm" />
+		<constant name="UTConeJacketRadiusZmax" value="UX851Cone08ARadiusZmax+UX851Cone08AThick+UTPipeHeaterDownstreamThick+0.01*mm" />
+		<constant name="UTPlugOuterRadius" value="UTConeJacketRadiusZmax + UTConeJacketThick + 57.6*mm" />
+		<constant name="UTPlugInnerRadius" value="UTConeJacketRadiusZmax + UTConeJacketThick" />
+		<constant name="UTPlugThickZ" value="UTBoxWallDownstreamThick" />
+		<constant name="UTInternalRingThick" value="5.0*mm" />
+		<constant name="UTInternalRingIR" value="46.0*mm" />
+		<constant name="UTInternalRingOR" value="80.0*mm" />
+		<constant name="UTInternalSealThick" value="5.0*mm" />
+		<constant name="UTInternalSealIR" value="43.5*mm" />
+		<constant name="UTInternalSealOR" value="46.0*mm" />
+		<constant name="UTBoxPipeAirexRingInnerThick" value="8.0*mm" />
+		<constant name="UTBoxPipeAirexRingMiddleThick" value="10.0*mm" />
+		<constant name="UTBoxPipeAirexRingOuterThick" value="8.0*mm" />
+		<constant name="UTBoxPipeAirexRingIR" value="35.0*mm" />
+		<constant name="UTBoxPipeAirexRingInnerOR" value="43.5*mm" />
+		<constant name="UTBoxPipeAirexRingMiddleOR" value="52.0*mm" />
+		<constant name="UTBoxPipeAirexRingOuterOR" value="43.5*mm" />
+		<constant name="UTBoxWallSealThick" value="10.0*mm" />
+		<constant name="UTBoxWallSealIR" value="UTBoxPipeAirexRingMiddleOR" />
+		<constant name="UTBoxWallSealOR" value="55.0*mm" />
+		<!-- Kapton beam pipe jacket -->
+		<constant name="UTCylJacketLength" value="UX851Cyl07BLenght" />
+		<constant name="UTCylJacketZpos" value="UTCylJacketLength*0.5" />
+		<!-- 230 -->
+		<constant name="UTPipeHeaterUpstreamRadius" value="UX851Cyl07Radius+UX851Cyl07Thick+0.01*mm" />
+		<constant name="UTPipeHeaterUpstreamThick" value="0.35*mm" />
+		<constant name="UTCylJacketRadius" value="UTPipeHeaterUpstreamRadius+UTPipeHeaterUpstreamThick+0.01*mm" />
+		<constant name="UTConeJacketLength" value="UX851Cone08ALenght" />
+		<!-- 200 -->
+		<!-- 27.0009+1+0.01 -->
+		<constant name="UTConeJacketRadiusZmin" value="UX851Cone08ARadiusZmin+UX851Cone08AThick+UTPipeHeaterDownstreamThick+0.01*mm" />
+		<!-- 25+1+0.01 -->
+		<!-- aerogel cutout -->
+		<constant name="UTConeJacketCutOutOffset" value="5*mm" />
+		<constant name="UTLayerDz" value="55*mm" />
+		<constant name="UTStaveDz" value="15*mm" />
+		<constant name="UTConeJacketCutOutLength" value="UTLayerDz+UTStaveDz+UTStaveThick+2*UTConeJacketCutOutOffset" />
+		<constant name="UTSystemZ" value="2485*mm" />
+		<constant name="UTStationDz" value="280*mm" />
+		<constant name="UTConeJacketCutOutPos" value="UTSystemZ+0.5*UTStationDz-0.5*UTLayerDz-0.5*UTStaveDz-0.5*UTStaveThick-UTConeJacketCutOutOffset-UX851Rich1TTSplitZposIP" />
+		<constant name="UTConeJacketCutOutLHCbZmin" value="UX851Rich1TTSplitZposIP+UTConeJacketCutOutPos" />
+		<constant name="UTConeJacketCutOutLHCbZmax" value="UX851Rich1TTSplitZposIP+UTConeJacketCutOutPos+UTConeJacketCutOutLength" />
+		<constant name="UTConeJacketCutOutRadiusZmin" value="UTConeJacketCutOutLHCbZmin*tan(UX851to4Angle)+UX851Cyl07Thick+UTPipeHeaterDownstreamThick+0.01*mm" />
+		<constant name="UTConeJacketCutOutRadiusZmax" value="UTConeJacketCutOutLHCbZmax*tan(UX851to4Angle)+UX851Cyl07Thick+UTPipeHeaterDownstreamThick+0.02*mm" />
+		<constant name="UTConeJacketUpstreamLength" value="UTConeJacketCutOutPos-UTCylJacketLength" />
+		<constant name="UTConeJacketDownstreamLength" value="UTConeJacketLength-UTConeJacketUpstreamLength-UTConeJacketCutOutLength" />
+		<constant name="UTConeJacketZposUpstream" value="UTCylJacketLength+UTConeJacketUpstreamLength*0.5" />
+		<constant name="UTConeJacketZposDownstream" value="UTConeJacketCutOutPos+UTConeJacketCutOutLength+0.5*UTConeJacketDownstreamLength" />
+		<!-- beam pipe heaters -->
+		<constant name="UTPipeHeaterUpstreamLength" value="200.0*mm" />
+		<!-- 25+1+0.01 -->
+		<constant name="UTPipeHeaterUpstreamPos" value="UX851Rich1TTSplitZposIP-UTSystemZ-17.0*mm+0.5*UTPipeHeaterUpstreamLength" />
+		<constant name="UTPipeHeaterDownstreamLength" value="67.0*mm" />
+		<constant name="UTPipeHeaterDownstreamZmin" value="UX851TTMagnetSplitZposIP-UTBoxWallDownstreamThick-5*mm" />
+		<constant name="UTPipeHeaterDownstreamLengthInUT" value="UX851TTMagnetSplitZposIP-UTPipeHeaterDownstreamZmin" />
+		<constant name="UTPipeHeaterDownstreamLengthInMagnet" value="UTPipeHeaterDownstreamLength-UTPipeHeaterDownstreamLengthInUT" />
+		<constant name="UTPipeHeaterDownstreamZmax" value="UTPipeHeaterDownstreamZmin+UTPipeHeaterDownstreamLength" />
+		<constant name="UTPipeHeaterDownstreamRadiusZmin" value="UTPipeHeaterDownstreamZmin*tan(UX851to4Angle)+UX851Cyl07Thick+0.01*mm" />
+		<constant name="UTPipeHeaterDownstreamRadiusZmax" value="UTPipeHeaterDownstreamZmax*tan(UX851to4Angle)+UX851Cyl07Thick+0.01*mm" />
+		<constant name="UTPipeHeaterDownstreamPos" value="UTPipeHeaterDownstreamZmin+0.5*UTPipeHeaterDownstreamLength-UTSystemZ" />
+		<!-- Detector Z positions -->
+		<!-- virtual thickness -->
+		<constant name="UTEOSPigtailThick" value="7.236*mm" />
+		<constant name="UTLayerThick" value="UTStaveThick+UTStaveDz+UTEOSPigtailThick+0.01*mm" />
+		<constant name="UTStationThick" value="UTLayerThick+UTLayerDz+0.01*mm" />
+		<constant name="UTVirtualBoxAWide" value="UTBoxInnerWide" />
+		<constant name="UTVirtualBoxBWide" value="UTBoxInnerWide" />
+		<constant name="UTVirtualHoleRadius" value="UTPlugInnerRadius-0.1*mm" />
+		<!-- Beam pipe hole -->
+		<constant name="UTAngle" value="5.0*degree" />
+		<constant name="UTSinAngle" value="sin(UTAngle)" />
+		<constant name="UTEOSWideUTa" value="16*UTStaveWide+UTSinAngle*UTStaveLong" />
+		<constant name="UTEOSWideUTb" value="18*UTStaveWide+UTSinAngle*UTStaveLong" />
+		<constant name="UTEOSLong" value="46.765*mm" />
+		<constant name="UTEOSThick" value="3.29*mm" />
+		<constant name="UTEOSPigtailLong" value="(UTBoxInnerLong-UTBareStaveLong)/2-UTEOSLong" />
+		<!-- Stereo angle -->
+		<constant name="UTCosAngle" value="cos(UTAngle)" />
+		<!-- Stave positions -->
+		<!--
+		From the center to either side, the design has one instance of 5.5mm
+		overlap, then 2 instances of 4.2mm overlap, and the rest is 3.6mm overlap
+		-->
+		<constant name="UTStaveAOverlap" value="3.600*mm" />
+		<constant name="UTStaveBOverlap" value="4.200*mm" />
+		<constant name="UTStaveCOverlap" value="5.500*mm" />
+		<constant name="UTStaveStep" value="UTStaveWide-UTStaveAOverlap" />
+		<constant name="UTStaveCCorrect" value="(UTStaveCOverlap-UTStaveAOverlap)/2" />
+		<constant name="UTStaveBCorrect" value="UTStaveCCorrect+(UTStaveBOverlap-UTStaveAOverlap)" />
+		<constant name="UTStaveACorrect" value="UTStaveBCorrect+(UTStaveBOverlap-UTStaveAOverlap)" />
+		<!-- U/V layers have different corrections due to stereo angle -->
+		<constant name="UTUVGlobalCorrectX" value="(UTStaveStep/2-UTStaveCCorrect)*(1.0/UTCosAngle-1)" />
+		<constant name="UTUVHoleCorrectX" value="UTStaveStep*(UTSinAngle*UTSinAngle/UTCosAngle)" />
+		<constant name="UTStaveCCorrectUV" value="UTStaveCCorrect-UTUVGlobalCorrectX+UTUVHoleCorrectX" />
+		<constant name="UTStaveBCorrectUV" value="UTStaveBCorrect-UTUVGlobalCorrectX" />
+		<constant name="UTStaveACorrectUV" value="UTStaveACorrect-UTUVGlobalCorrectX" />
+		<constant name="UTStaveCUVPosY" value="UTSinAngle*(UTStaveWide-UTStaveCOverlap)/2" />
+		<constant name="UTaXR1S1CorrectionX" value="-1.9*mm" />
+		<constant name="UTaXR1S2CorrectionX" value="2.1*mm" />
+		<constant name="UTaXR1S3CorrectionX" value="-1.8*mm" />
+		<constant name="UTaXR1S4CorrectionX" value="1.0*mm" />
+		<constant name="UTaXR1S5CorrectionX" value="-1.7*mm" />
+		<constant name="UTaXR1S6CorrectionX" value="0.0*mm" />
+		<constant name="UTaXR2S1CorrectionX" value="-1.0*mm" />
+		<constant name="UTaXR2S2CorrectionX" value="0.*mm" />
+		<constant name="UTaXR2S3CorrectionX" value="0.*mm" />
+		<constant name="UTaXR2S4CorrectionX" value="-0.2*mm" />
+		<constant name="UTaXR3S1CorrectionX" value="1.5*mm" />
+		<constant name="UTaXR3S2CorrectionX" value="-0.6*mm" />
+		<constant name="UTaXR3S3CorrectionX" value="1.7*mm" />
+		<constant name="UTaXR3S4CorrectionX" value="-1.5*mm" />
+		<constant name="UTaXR3S5CorrectionX" value="2.00*mm" />
+		<constant name="UTaXR3S6CorrectionX" value="-2.5*mm" />
+
+		<constant name="UTaUR1S1CorrectionX" value="-1.720*mm" />
+		<constant name="UTaUR1S2CorrectionX" value="2.180*mm" />
+		<constant name="UTaUR1S3CorrectionX" value="-1.620*mm" />
+		<constant name="UTaUR1S4CorrectionX" value="1.180*mm" />
+		<constant name="UTaUR1S5CorrectionX" value="-1.520*mm" />
+		<constant name="UTaUR1S6CorrectionX" value="0.180*mm" />
+		<constant name="UTaUR2S1CorrectionX" value="-0.820*mm" />
+		<constant name="UTaUR2S2CorrectionX" value="-0.552*mm" />
+		<constant name="UTaUR2S3CorrectionX" value="0.552*mm" />
+		<constant name="UTaUR2S4CorrectionX" value="-0.380*mm" />
+		<constant name="UTaUR3S1CorrectionX" value="1.220*mm" />
+		<constant name="UTaUR3S2CorrectionX" value="-0.780*mm" />
+		<constant name="UTaUR3S3CorrectionX" value="1.520*mm" />
+		<constant name="UTaUR3S4CorrectionX" value="-1.780*mm" />
+		<constant name="UTaUR3S5CorrectionX" value="1.720*mm" />
+		<constant name="UTaUR3S6CorrectionX" value="-2.680*mm" />
+
+		<constant name="UTbVR1S1CorrectionX" value="2.680*mm" />
+		<constant name="UTbVR1S2CorrectionX" value="-1.92*mm" />
+		<constant name="UTbVR1S3CorrectionX" value="1.780*mm" />
+		<constant name="UTbVR1S4CorrectionX" value="-1.720*mm" />
+		<constant name="UTbVR1S5CorrectionX" value="0.880*mm" />
+		<constant name="UTbVR1S6CorrectionX" value="-1.520*mm" />
+		<constant name="UTbVR1S7CorrectionX" value="-0.120*mm" />
+		<constant name="UTbVR2S1CorrectionX" value="-0.820*mm" />
+		<constant name="UTbVR2S2CorrectionX" value="-0.552*mm" />
+		<constant name="UTbVR2S3CorrectionX" value="0.552*mm" />
+		<constant name="UTbVR2S4CorrectionX" value="-0.18*mm" />
+		<constant name="UTbVR3S1CorrectionX" value="1.22*mm" />
+		<constant name="UTbVR3S2CorrectionX" value="-0.68*mm" />
+		<constant name="UTbVR3S3CorrectionX" value="1.42*mm" />
+		<constant name="UTbVR3S4CorrectionX" value="-1.58*mm" />
+		<constant name="UTbVR3S5CorrectionX" value="1.52*mm" />
+		<constant name="UTbVR3S6CorrectionX" value="-2.48*mm" />
+		<constant name="UTbVR3S7CorrectionX" value="1.72*mm" />
+
+		<constant name="UTbXR1S1CorrectionX" value="2.4*mm" />
+		<constant name="UTbXR1S2CorrectionX" value="-2.1*mm" />
+		<constant name="UTbXR1S3CorrectionX" value="1.5*mm" />
+		<constant name="UTbXR1S4CorrectionX" value="-1.9*mm" />
+		<constant name="UTbXR1S5CorrectionX" value="0.6*mm" />
+		<constant name="UTbXR1S6CorrectionX" value="-1.7*mm" />
+		<constant name="UTbXR1S7CorrectionX" value="-0.3*mm" />
+		<constant name="UTbXR2S1CorrectionX" value="-1.0*mm" />
+		<constant name="UTbXR2S2CorrectionX" value="0.0*mm" />
+		<constant name="UTbXR2S3CorrectionX" value="0.0*mm" />
+		<constant name="UTbXR2S4CorrectionX" value="0.0*mm" />
+		<constant name="UTbXR3S1CorrectionX" value="1.4*mm" />
+		<constant name="UTbXR3S2CorrectionX" value="-0.4*mm" />
+		<constant name="UTbXR3S3CorrectionX" value="1.6*mm" />
+		<constant name="UTbXR3S4CorrectionX" value="-1.3*mm" />
+		<constant name="UTbXR3S5CorrectionX" value="1.8*mm" />
+		<constant name="UTbXR3S6CorrectionX" value="-2.2*mm" />
+		<constant name="UTbXR3S7CorrectionX" value="1.9*mm" />
+		<!-- A/C side cuts -->
+		<constant name="UTStaveGap" value="UTStaveDz-UTStaveThick" />
+		<constant name="UTSideCutGap" value="10*mm" />
+		<constant name="UTaXSideOverlap" value="UTStaveWide-(UTStaveStep+UTStaveCCorrect)" />
+		<constant name="UTBareLayerThick" value="UTStaveThick+UTStaveDz+0.01*mm" />
+		<constant name="UTaXLayerCut" value="(UTaXSideOverlap+3*UTSideCutGap)*(0.5*(UTLayerThick+UTStaveDz-UTStaveThick)/(UTStaveDz-UTStaveThick))-(0.5*UTaXSideOverlap+2*UTSideCutGap)" />
+		<constant name="UTaXLayerSideLongWidth" value="17/2*UTStaveStep-UTStaveACorrect+1/2*UTStaveWide+2*UTaXLayerCut-1/2*UTaXSideOverlap" />
+		<constant name="UTaXLayerSideShortWidth" value="UTaXLayerSideLongWidth-2*(2*UTaXLayerCut+UTSideCutGap)" />
+		<constant name="UTaULayerSideLongWidth" value="UTaXLayerSideLongWidth" />
+		<constant name="UTaULayerSideShortWidth" value="UTaXLayerSideShortWidth" />
+		<constant name="UTbVLayerSideLongWidth" value="UTaXLayerSideLongWidth" />
+		<constant name="UTbVLayerSideShortWidth" value="UTaXLayerSideShortWidth" />
+		<constant name="UTbXLayerSideLongWidth" value="UTaXLayerSideLongWidth" />
+		<constant name="UTbXLayerSideShortWidth" value="UTaXLayerSideShortWidth" />
+		<constant name="UTLayerSideCorrectedWidth" value="UTaXLayerSideLongWidth-2*UTaXLayerCut" />
+		<constant name="UTLayerSideCorrectedX" value="1/2*UTLayerSideCorrectedWidth*(1-UTCosAngle)" />
+		<constant name="UTLayerSideCorrectedY" value="1/2*UTLayerSideCorrectedWidth*UTSinAngle" />
+	</define>
+	<materials>
+		<!-- Elements (temporary) -->
+		<element Z="13" formula="Al" name="UT:AluminiumElement">
+			<!-- <D type="density" value="2.7" unit="g/cm3" /> -->
+			<atom type="A" unit="g/mol" value="26.98" />
+		</element>
+		<element Z="56" formula="Ba" name="UT:Barium">
+			<D type="density" value="3.51" unit="g/cm3" />
+			<atom type="A" unit="g/mol" value="137.327" />
+		</element>
+		<material density="0.46*g/cm3" name="UT:EPDM">
+			<D type="density" unit="g/cm3" value="0.46" />
+			<composite n="5" ref="Carbon" />
+			<composite n="10" ref="Hydrogen" />
+		</material>
+		<material name="UT:Aluminium">
+			<D type="density" value="2.7" unit="g/cm3" />
+			<fraction n="1.000" ref="UT:AluminiumElement" />
+		</material>
+		<material name="UT:Steel">
+			<!-- Hangyi -->
+			<D type="density" unit="g/cm3" value="7.8" />
+			<fraction n="0.7" ref="Iron" />
+			<fraction n="0.1" ref="Carbon" />
+			<fraction n="0.2" ref="Copper" />
+		</material>
+		<material name="UT:Airex">
+			<D type="density" value="0.06" unit="g/cm3" />
+			<composite n="37" ref="Carbon" />
+			<composite n="24" ref="Hydrogen" />
+			<composite n="6" ref="Oxygen" />
+			<composite n="2" ref="Nitrogen" />
+		</material>
+		<material name="UT:Al2O3">
+			<D type="density" value="3.97" unit="g/cm3" />
+			<composite n="2" ref="UT:Aluminium" />
+			<composite n="3" ref="Oxygen" />
+		</material>
+		<material name="UT:AluminaTrihydrate">
+			<D type="density" value="2.42" unit="g/cm3" />
+			<composite n="1" ref="UT:Aluminium" />
+			<composite n="3" ref="Hydrogen" />
+			<composite n="3" ref="Oxygen" />
+		</material>
+		<material name="UT:AluminiumNitride">
+			<D type="density" value="3.30" unit="g/cm3" />
+			<composite n="1" ref="UT:Aluminium" />
+			<composite n="1" ref="Nitrogen" />
+		</material>
+		<material name="UT:BaTiO3">
+			<D type="density" value="6.02" unit="g/cm3" />
+			<composite n="1" ref="UT:Barium" />
+			<composite n="1" ref="Titanium" />
+			<composite n="3" ref="Oxygen" />
+		</material>
+		<material name="UT:BoronNitride">
+			<D type="density" value="2.29" unit="g/cm3" />
+			<composite n="1" ref="Boron" />
+			<composite n="1" ref="Nitrogen" />
+		</material>
+		<material name="UT:DiamondPowder">
+			<D type="density" value="3.51" unit="g/cm3" />
+			<composite n="1" ref="Carbon" />
+		</material>
+		<material name="UT:Glass">
+			<D type="density" value="2.46" unit="g/cm3" />
+			<composite n="1" ref="Silicon" />
+			<composite n="2" ref="Oxygen" />
+		</material>
+		<material name="UT:Kevlar">
+			<D type="density" value="1.44" unit="g/cm3" />
+			<composite n="2" ref="Nitrogen" />
+			<composite n="10" ref="Hydrogen" />
+			<composite n="14" ref="Carbon" />
+			<composite n="2" ref="Oxygen" />
+		</material>
+		<material name="UT:Polyethylene">
+			<D type="density" value="0.93" unit="g/cm3" />
+			<composite n="2" ref="Carbon" />
+			<composite n="4" ref="Hydrogen" />
+		</material>
+		<material name="UT:Polyurethane">
+			<D type="density" value="1.005" unit="g/cm3" />
+			<composite n="3" ref="Carbon" />
+			<composite n="8" ref="Hydrogen" />
+			<composite n="2" ref="Nitrogen" />
+			<composite n="1" ref="Oxygen" />
+		</material>
+		<material name="UT:PlugFoam">
+			<D type="density" value="0.2" unit="g/cm3" />
+			<fraction n="1.0000" ref="UT:Polyurethane" />
+		</material>
+		<!-- Ethylene Propylene Rubber -->
+		<material name="UT:EPR">
+			<D type="density" value="0.86" unit="g/cm3" />
+			<composite n="6" ref="Carbon" />
+			<composite n="10" ref="Hydrogen" />
+		</material>
+		<material name="UT:SilicaAerogel">
+			<D type="density" value="0.0898" unit="g/cm3" />
+			<composite n="1" ref="Silicon" />
+			<composite n="2" ref="Oxygen" />
+		</material>
+		<material name="UT:TitaniumDioxide">
+			<D type="density" value="4.23" unit="g/cm3" />
+			<composite n="1" ref="Titanium" />
+			<composite n="2" ref="Oxygen" />
+		</material>
+		<material name="UT:RohacellFoam">
+			<D type="density" value="0.051" unit="g/cm3" />
+			<fraction n="0.6084" ref="Carbon" />
+			<fraction n="0.2200" ref="Oxygen" />
+			<fraction n="0.0740" ref="Hydrogen" />
+			<fraction n="0.0960" ref="Nitrogen" />
+			<fraction n="0.0016" ref="Zinc" />
+		</material>
+		<material name="UT:AllcompK9Foam">
+			<D type="density" value="0.200" unit="g/cm3" />
+			<fraction n="1.0000" ref="Carbon" />
+		</material>
+		<!-- Mixtures -->
+		<material name="UT:Epoxy">
+			<D type="density" value="1.3" unit="g/cm3" />
+			<fraction n="0.07" ref="Hydrogen" />
+			<fraction n="0.76" ref="Carbon" />
+			<fraction n="0.17" ref="Oxygen" />
+		</material>
+		<!-- Kapton from wiki/Kapton -->
+		<material name="UT:Kapton">
+			<D type="density" value="1.43" unit="g/cm3" />
+			<composite n="22" ref="Carbon" />
+			<composite n="10" ref="Hydrogen" />
+			<composite n="2" ref="Nitrogen" />
+			<composite n="5" ref="Oxygen" />
+		</material>
+		<material name="UT:CarbonFiber">
+			<D type="density" value="1.72" unit="g/cm3" />
+			<composite n="6" ref="Hydrogen" />
+			<composite n="9" ref="Carbon" />
+			<composite n="2" ref="Oxygen" />
+			<composite n="3" ref="Nitrogen" />
+		</material>
+		<material name="UT:Traces">
+			<D type="density" value="9.023" unit="g/cm3" />
+			<fraction n="0.44" ref="Copper" />
+			<fraction n="0.02" ref="Gold" />
+			<fraction n="0.54" ref="Nickel" />
+		</material>
+		<material name="UT:WireBonds">
+			<D type="density" value="2.7" unit="g/cm3" />
+			<fraction n="1.0" ref="UT:Aluminium" />
+		</material>
+		<material name="UT:EthyleneAlcohol">
+			<D type="density" value="1.1132" unit="g/cm3" />
+			<composite n="6" ref="Hydrogen" />
+			<composite n="2" ref="Carbon" />
+			<composite n="2" ref="Oxygen" />
+		</material>
+		<material name="UT:CoolingFluid">
+			<D type="density" value="1.0684" unit="g/cm3" />
+			<fraction n="0.63" ref="UT:EthyleneAlcohol" />
+			<fraction n="0.37" ref="Water" />
+		</material>
+		<material name="UT:PyrogelXT">
+			<D type="density" value="0.18" unit="g/cm3" />
+			<fraction n="0.48" ref="UT:SilicaAerogel" />
+			<fraction n="0.48" ref="UT:Glass" />
+			<fraction n="0.02" ref="UT:TitaniumDioxide" />
+			<fraction n="0.02" ref="UT:AluminaTrihydrate" />
+		</material>
+		<material name="UT:HysolBN">
+			<D type="density" value="1.342" unit="g/cm3" />
+			<fraction n="0.7692" ref="UT:Epoxy" />
+			<fraction n="0.2308" ref="UT:BoronNitride" />
+		</material>
+		<material name="UT:BareStave">
+			<D type="density" value="0.3823" unit="g/cm3" />
+			<fraction n="0.0383" ref="UT:RohacellFoam" />
+			<fraction n="0.0801" ref="UT:AllcompK9Foam" />
+			<fraction n="0.4614" ref="UT:CarbonFiber" />
+			<fraction n="0.0588" ref="Titanium" />
+			<fraction n="0.0062" ref="UT:Epoxy" />
+			<fraction n="0.0453" ref="UT:CoolingFluid" />
+			<fraction n="0.3099" ref="UT:HysolBN" />
+		</material>
+		<material name="UT:BeamPipeJacket">
+			<D type="density" value="0.209" unit="g/cm3" />
+			<fraction n="0.1601" ref="UT:Kapton" />
+			<fraction n="0.8399" ref="UT:PyrogelXT" />
+		</material>
+		<material name="UT:PipeHeater">
+			<D type="density" value="1.703" unit="g/cm3" />
+			<fraction n="0.1909" ref="Copper" />
+			<fraction n="0.8091" ref="UT:Kapton" />
+		</material>
+		<material name="UT:HybridFlex8">
+			<D type="density" value="1.710" unit="g/cm3" />
+			<fraction n="0.5167" ref="UT:Kapton" />
+			<fraction n="0.4486" ref="Copper" />
+			<fraction n="0.0347" ref="UT:HysolBN" />
+		</material>
+		<material name="UT:EOSPigtail">
+			<D type="density" value="4.279" unit="g/cm3" />
+			<fraction n="0.9282" ref="UT:Steel" />
+			<fraction n="0.0718" ref="UT:HybridFlex8" />
+		</material>
+		<material name="UT:BoxWall">
+			<D type="density" value="0.1038" unit="g/cm3" />
+			<fraction n="0.3471" ref="UT:CarbonFiber" />
+			<fraction n="0.0607" ref="UT:Epoxy" />
+			<fraction n="0.0315" ref="UT:Aluminium" />
+			<fraction n="0.5607" ref="UT:Airex" />
+		</material>
+		<material name="UT:CFPrePreg">
+			<D type="density" value="1.460" unit="g/cm3" />
+			<fraction n="0.53" ref="Carbon" />
+			<fraction n="0.47" ref="UT:Epoxy" />
+		</material>
+		<material name="UT:Resistor">
+			<D type="density" value="4.2768" unit="g/cm3" />
+			<fraction n="0.86" ref="UT:Al2O3" />
+			<fraction n="0.08" ref="Nickel" />
+			<fraction n="0.06" ref="Tin" />
+		</material>
+		<material name="UT:Capacitor">
+			<D type="density" value="6.2480" unit="g/cm3" />
+			<fraction n="0.86" ref="UT:BaTiO3" />
+			<fraction n="0.08" ref="Nickel" />
+			<fraction n="0.06" ref="Tin" />
+		</material>
+		<material name="UT:Dcdc">
+			<D type="density" value="7.4825" unit="g/cm3" />
+			<fraction n="0.0026" ref="Silicon" />
+			<fraction n="0.5186" ref="Gold" />
+			<fraction n="0.2672" ref="UT:Polyethylene" />
+			<fraction n="0.0017" ref="UT:Resistor" />
+			<fraction n="0.2099" ref="UT:Capacitor" />
+		</material>
+		<material name="UT:FlexCable">
+			<D type="density" value="1.8092" unit="g/cm3" />
+			<fraction n="0.5751" ref="UT:Kapton" />
+			<fraction n="0.2681" ref="Copper" />
+			<fraction n="0.1568" ref="UT:HysolBN" />
+		</material>
+		<material name="UT:HybridFilm">
+			<D type="density" value="3.912" unit="g/cm3" />
+			<fraction n="0.5731" ref="UT:Glass" />
+			<fraction n="0.4269" ref="Gold" />
+			<fraction n="0.0000" ref="UT:Epoxy" />
+		</material>
+		<material name="UT:HybridFlex4">
+			<D type="density" value="1.710" unit="g/cm3" />
+			<fraction n="0.7410" ref="UT:Kapton" />
+			<fraction n="0.2243" ref="Copper" />
+			<fraction n="0.0347" ref="UT:HysolBN" />
+		</material>
+		<material name="UT:BoxPlug">
+			<D type="density" value="0.86" unit="g/cm3" />
+			<fraction n="0.9999" ref="UT:EPR" />
+			<fraction n="0.0001" ref="UT:Epoxy" />
+		</material>
+		<material name="UT:HybridTim">
+			<D type="density" value="1.100" unit="g/cm3" />
+			<fraction n="1.0000" ref="UT:Epoxy" />
+		</material>
+		<material name="UT:HysolDia">
+			<D type="density" value="1.310" unit="g/cm3" />
+			<fraction n="0.7692" ref="UT:Epoxy" />
+			<fraction n="0.2308" ref="UT:DiamondPowder" />
+		</material>
+		<material name="UT:SilverEpoxy">
+			<D type="density" value="3.200" unit="g/cm3" />
+			<fraction n="0.9434" ref="UT:Epoxy" />
+			<fraction n="0.0566" ref="Silver" />
+		</material>
+		<material name="UT:Asic">
+			<D type="density" value="2.404" unit="g/cm3" />
+			<fraction n="0.9351" ref="Silicon" />
+			<fraction n="0.0360" ref="Copper" />
+			<fraction n="0.0289" ref="UT:Aluminium" />
+		</material>
+		<material name="UT:UTAsic">
+			<D type="density" value="2.5935" unit="g/cm3" />
+			<fraction n="0.7062" ref="UT:Asic" />
+			<fraction n="0.2938" ref="UT:SilverEpoxy" />
+		</material>
+	</materials>
+	<display>
+		<vis name="DEBUG:RED" alpha="0.5" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true" />
+		<vis name="DEBUG:GREEN" alpha="0.5" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true" />
+		<vis name="DEBUG:BLUE" alpha="0.5" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true" />
+		<vis name="UT:Envelope" alpha="0.0" r="0.5" g="0.5" b="0.5" showDaughters="true" visible="false" />
+		<vis name="UT:Invisible" alpha="0.0" r="1.0" g="1.0" b="1.0" showDaughters="false" visiable="false" />
+		<vis name="UT:Box" alpha="0.1" r="0.95" g="0.95" b="0.95" showDaughters="true" visible="true" />
+		<vis name="UT:Airex" alpha="1.0" r="0.11" g="0.28" b="0.41" showDaughters="false" visible="true" />
+		<vis name="UT:Connector" alpha="1.0" r="0.93" g="0.91" b="0.91" showDaughters="false" visible="true" />
+		<vis name="UT:EPDM" alpha="1.0" r="0.75" g="0.75" b="0.90" showDaughters="false" visible="true" />
+		<vis name="UT:HalfMoon" alpha="1.0" r="0.45" g="0.56" b="0.69" showDaughters="false" visible="true" />
+		<vis name="UT:PipeHeater" alpha="1.0" r="0.36" g="0.79" b="0.79" showDaughters="false" visible="true" />
+		<!-- Silver -->
+		<vis name="UT:Frame" alpha="1.0" r="0.33" g="0.18" b="0.25" showDaughters="true" visible="true" />
+		<vis name="UT:EOS" alpha="1.0" r="0.33" g="0.18" b="0.25" showDaughters="false" visible="true" />
+		<vis name="UT:Jacket" alpha="1.0" r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true" />
+		<vis name="UT:KaptonCable" alpha="1.0" r="0.16" g="0.39" b="0.61" showDaughters="false" visible="true" />
+		<vis name="UT:BareStave" alpha="1.0" r="0.04" g="0.24" b="0.43" showDaughters="false" visible="true" />
+		<vis name="UT:HybridFlex" alpha="1.0" r="0.63" g="0.38" b="0.47" showDaughters="true" visible="true" />
+		<vis name="UT:Asic" alpha="1.0" r="0.71" g="0.74" b="0.76" showDaughters="false" visible="true" />
+		<vis name="UT:Stiffener" alpha="1.0" r="0.58" g="0.74" b="0.88" showDaughters="false" visible="true" />
+		<vis name="UT:Sensor" alpha="1.0" r="0.25" g="0.6" b="0.8" showDaughters="true" visible="true" />
+		<!-- High constrast palette -->
+		<!-- <vis name="UT:BareStave" alpha="1.0" r="0.0" g="0.50" b="0.0" showDaughters="false" visible="true"/> -->
+		<!-- <vis name="UT:HybridFlex" alpha="1.0" r="1.0" g="1.0" b="0.0" showDaughters="true" visible="true"/> -->
+		<!-- <vis name="UT:Asic" alpha="1.0" r="1.0" g="0.0" b="0.0" showDaughters="false" visible="true"/> -->
+		<!-- <vis name="UT:Stiffener" alpha="0.8" r="0.86" g="0.85" b="0.80" showDaughters="false" visible="true"/> -->
+		<!-- <vis name="UT:Sensor" alpha="1.0" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/> -->
+	</display>
+</lccdd>
-- 
GitLab


From 1ee673991f84581dc2598ebf82eb01fa5444c395 Mon Sep 17 00:00:00 2001
From: Menglin Xu <mexu@cern.ch>
Date: Wed, 5 Mar 2025 14:55:26 +0100
Subject: [PATCH 3/8] remove run5 related stuff

---
 compact/components/Pipe/2025-v00.00/parameters.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/compact/components/Pipe/2025-v00.00/parameters.xml b/compact/components/Pipe/2025-v00.00/parameters.xml
index 4583d592a..98b42280a 100644
--- a/compact/components/Pipe/2025-v00.00/parameters.xml
+++ b/compact/components/Pipe/2025-v00.00/parameters.xml
@@ -18,9 +18,7 @@
     <constant name="PipeBeforeVeloJunction:parent" value="/world/BeforeMagnetRegion"             type="string"/>
     <constant name="PipeBeforeVelo:parent"         value="/world/BeforeMagnetRegion/BeforeVelo"  type="string"/>
     <constant name="PipeInVP:parent"               value="/world/BeforeMagnetRegion/VP"          type="string"/>
-    <constant name="PipeInTV:parent"               value="/world/BeforeMagnetRegion/TV"          type="string"/>
     <constant name="PipeInUT:parent"               value="/world/BeforeMagnetRegion/UT"          type="string"/>
-    <constant name="PipeInUP:parent"               value="/world/BeforeMagnetRegion/UP"          type="string"/>
     <constant name="PipeInRich1:parent"            value="/world/BeforeMagnetRegion/Rich1"       type="string"/>
     <constant name="PipeMagnet:parent"             value="/world/MagnetRegion"                   type="string"/>
     <constant name="PipeAfterMagnetBakeout:parent" value="/world/AfterMagnetRegion"              type="string"/>
@@ -57,7 +55,6 @@
     <vis name="Pipe:Support"    alpha="1"   r="1.0" g="0.1" b="0.0" showDaughters="true"  visible="true"/>
     <vis name="Pipe:InVP"       alpha="1"   r="0.5" g="1.0" b="0.0" showDaughters="true"  visible="true"/>
     <vis name="Pipe:InUT"       alpha="1"   r="0.0" g="0.1" b="1.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:InUP"       alpha="1"   r="0.0" g="0.1" b="1.0" showDaughters="true"  visible="true"/>
     <vis name="Pipe:InRich1"    alpha="1"   r="0.0" g="1.0" b="0.0" showDaughters="true"  visible="true"/>
     <vis name="Pipe:InT"        alpha="1.0" r="0.0" g="0.9" b="0.0" showDaughters="true"  visible="true"/>
     <vis name="Pipe:AfterT"     alpha="1.0" r="0.9" g="0.0" b="0.0" showDaughters="true"  visible="true"/>
-- 
GitLab


From c66186f7ae9486f894371aaf9d88fde7f9bd4e9e Mon Sep 17 00:00:00 2001
From: Menglin Xu <mexu@cern.ch>
Date: Wed, 5 Mar 2025 15:31:09 +0100
Subject: [PATCH 4/8] have a fixed 2025 version for SMOG2

---
 .../components/SMOG2/2025-v00.00/SMOG2.xml    | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 compact/components/SMOG2/2025-v00.00/SMOG2.xml

diff --git a/compact/components/SMOG2/2025-v00.00/SMOG2.xml b/compact/components/SMOG2/2025-v00.00/SMOG2.xml
new file mode 100644
index 000000000..b5eff72db
--- /dev/null
+++ b/compact/components/SMOG2/2025-v00.00/SMOG2.xml
@@ -0,0 +1,94 @@
+<!--
+    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+<lccdd>
+
+  <info name="SMOG2" title="SMOG2" author="Marco Santimaria" url="https://cds.cern.ch/record/2673690" status="development" version="$Id: $">
+    <comment>
+      SMOG2 gas storage cell
+    </comment>
+  </info>
+
+  <define>
+    <constant name="SMOG2:tube_rmin" value="5*mm" />
+    <constant name="SMOG2:tube_thickness" value="0.2*mm" />
+    <constant name="SMOG2:tube_length" value="20*cm" />
+    <constant name="SMOG2:supp_rmin" value="13*mm" />
+    <constant name="SMOG2:supp_rmax" value="17*mm" />
+    <constant name="SMOG2:supp_thickness" value="5*mm" />
+    <constant name="SMOG2:supp_dist" value="1*cm" />
+    <constant name="SMOG2:cone_rmax" value="28*mm" />
+    <constant name="SMOG2:cone_length" value="8*cm" />
+    <constant name="SMOG2:ring_dr" value="5*mm" />
+    <constant name="SMOG2:wing_dx" value="48.3*mm" />
+    <constant name="SMOG2:wing_dy" value="1.2*mm" />
+    <constant name="SMOG2:supp_h" value="1*cm" />
+    <constant name="SMOG2:bar_dim" value="1*cm" />
+    <constant name="SMOG2:wing_delta" value="0*mm" />
+    <constant name="SMOG2:delta_z" value="0.1*mm" />
+    <constant name="SMOG2:wfs_length" value="98.5*mm" />
+    <constant name="SMOG2:wfs_down_length" value="3.6*mm" />
+    <constant name="SMOG2:wfs_hole_r" value="2.5*mm" />
+    <constant name="SMOG2:wfs_clear" value="5*mm" />
+    <constant name="SMOG2:opening_shift" value="0.5*mm" />
+    <constant name="SMOG2:h_sub" value="4*cm"/>
+    <constant name="SMOG2:pistS_r" value="1.5*mm"/>
+    <constant name="SMOG2:pistS_length" value="13*mm"/>
+    <constant name="SMOG2:pistB_r" value="7*mm"/>
+    <constant name="SMOG2:pistB_length" value="15*mm"/>
+    <constant name="SMOG2:fixed_tol" value="0*mm"/>
+    <constant name="SMOG2:z_pos" value="VP:RFBoxZPosition - VP:RFBoxTopPlateZSize/2 - VP:RFBoxThick - SMOG2:tube_length/2 - SMOG2:wfs_down_length - 2*SMOG2:wing_dy - 2*mm"/>
+  </define>
+
+  <display>
+    <vis name="SMOG2:CellVis" alpha="0.3" showDaughters="true"  visible="false"/>
+    <vis name="SMOG2:VacuumVis" alpha="1.0" r="0.2" g="0.2" b="0.2" showDaughters="true" visible="true" />
+    <vis name="SMOG2:AlVis" alpha="1.0" r="0.75" g="0.75" b="0.75" showDaughters="true" visible="true" />
+    <vis name="SMOG2:WingVis" alpha="0.6" r="0.16" g="0.30" b="0.75" showDaughters="true" visible="true" />
+    <vis name="SMOG2:WingTVis" alpha="0.6" r="0.31" g="0.44" b="0.85" showDaughters="true" visible="true" />
+    <vis name="SMOG2:RingVis" alpha="1.0" r="0.95" g="0.23" b="0.05" showDaughters="true" visible="true" />
+    <vis name="SMOG2:WFSVis" alpha="1.0" r="1.0" g="0.65" b="0" showDaughters="true" visible="true" />
+    <vis name="SMOG2:SuppVis" alpha="0.2" r="0" g="0.5" b="0" showDaughters="true" visible="true" />
+  </display>
+
+  <detectors>
+
+      <detector id="SMOG2_L:ID" name="SMOG2_L" type="LHCb_SMOG2_Left_v1_0" parent="${SMOG2_L:parent}" vis="CellVis">
+      <tube rmin="SMOG2:tube_rmin" thickness="SMOG2:tube_thickness" length="SMOG2:tube_length"/>
+      <cone rmax="SMOG2:cone_rmax" length="SMOG2:cone_length"/>
+      <box dx="SMOG2:wing_dx" dy="SMOG2:wing_dy" dz="SMOG2:tube_length"/>
+      <position x="SMOG2:opening_shift" y="0*cm" z="SMOG2:z_pos"/>
+      <rotation z="0*degree" y = "0*degree" x="180*degree"/>
+    </detector>
+
+      <detector id="SMOG2_R:ID" name="SMOG2_R" type="LHCb_SMOG2_Right_v1_0" parent="${SMOG2_R:parent}" vis="CellVis">
+      <tube rmin="SMOG2:tube_rmin" thickness="SMOG2:tube_thickness" length="SMOG2:tube_length"/>
+      <cone rmax="SMOG2:cone_rmax" length="SMOG2:cone_length"/>
+      <box dx="SMOG2:wing_dx" dy="SMOG2:wing_dy" dz="SMOG2:tube_length"/>
+      <position x="-SMOG2:opening_shift" y="0*cm" z="SMOG2:z_pos"/>
+      <rotation z="180*degree" y = "0*degree" x="180*degree"/>
+    </detector>
+
+      <detector id="SMOG2_F:ID" name="SMOG2_F" type="LHCb_SMOG2_Fixed_v1_0" parent="${SMOG2_F:parent}" vis="CellVis">
+      <cone rmax="SMOG2:cone_rmax" length="SMOG2:cone_length"/>
+      <box dx="SMOG2:wing_dx" dy="SMOG2:wing_dy" dz="SMOG2:tube_length"/>
+      <position x="0*cm" y="0*cm" z="SMOG2:z_pos - SMOG2:tube_length/2 - SMOG2:cone_length - SMOG2:wing_dy - SMOG2:fixed_tol"/>
+      <rotation z="0*degree" y = "0*degree" x="180*degree"/>
+    </detector>
+
+  </detectors>
+
+  <!--
+  <plugins>
+    <plugin name="LHCb_Align_cond_XML_reader" type="xml"/>
+  </plugins>
+  -->
+
+</lccdd>
-- 
GitLab


From 3567326d1586761aefba66652520f764f62b334f Mon Sep 17 00:00:00 2001
From: Menglin Xu <mexu@cern.ch>
Date: Wed, 5 Mar 2025 15:32:02 +0100
Subject: [PATCH 5/8] remove the UpgradeII part from 2025 Pipe

---
 compact/components/Pipe/2025-v00.00/InTV.xml  | 392 ------------------
 compact/components/Pipe/2025-v00.00/InUP.xml  |  79 ----
 .../components/Pipe/2025-v00.00/PipeTV.xml    |  13 -
 .../components/Pipe/2025-v00.00/PipeUP.xml    |  14 -
 4 files changed, 498 deletions(-)
 delete mode 100644 compact/components/Pipe/2025-v00.00/InTV.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/InUP.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeTV.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeUP.xml

diff --git a/compact/components/Pipe/2025-v00.00/InTV.xml b/compact/components/Pipe/2025-v00.00/InTV.xml
deleted file mode 100644
index 0c88e1539..000000000
--- a/compact/components/Pipe/2025-v00.00/InTV.xml
+++ /dev/null
@@ -1,392 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe inside the TV region                      -->
-<!--===========================================================================-->
-<!--==================================Pipe In  TV=============================-->
-<!--===========================================================================-->
-<lccdd>
-
-  <define>
-    <!-- ****************************************************** -->
-    <!-- * Definition of CuBe pipe sections in velo tank      * -->
-    <!-- * and supports                                       * -->
-    <!-- ****************************************************** -->
-
-    <!-- SPOKE CAP:
-	 - this is the small cap at the end of the spokes which are supposed
-	 to support the wf suppressor end and the punctured CuBe pipe.
-	 Let's start with a simplified conical description, not corresponding
-	 to actual shape.
-	 z_end_wf should correspond here to z_end. If not, adjust.
-	 - see CDD drawings:  ...
-	 - centered to beam axis
-	 - material: aluminium
-	 cone1:  r_in_start=47   r_out_start=57   z_start=-470
-         r_in_end=27   r_out_end=37   z_end=-540 -->
-
-    <constant name="PipeTV:SpokeZ" value="70*mm"/>
-    <constant name="PipeTV:SpokeInnerRPZ" value="47*mm"/>
-    <constant name="PipeTV:SpokeInnerRMZ" value="27*mm"/>
-    <constant name="PipeTV:SpokeOuterRPZ" value="57*mm"/>
-    <constant name="PipeTV:SpokeOuterRMZ" value="37*mm"/>
-
-    <!-- COPPERBERYLLIUM PUNCTURED PIPE:
-	 - this is the CuBe pipe with holes inside the VELO vacuum (upstream of RF Boxes)
-	 - see CDD drawings:
-	 http://www.nikhef.nl/pub/departments/mt/projects/lhcb-vertex/pdf/TVE-LAYOUTS/TVE65.pdf
-	 - centered to beam axis
-	 - material: aluminium
-	 cylinder1: r_in=27     r_out=39
-         z_start=-540     z_end=-550
-	 - material: copper
-	 cylinder2: r_in=27     r_out=27.1
-         z_start=-550     z_end=-729
-	 - material: aluminium
-	 cylinder3: r_in=27     r_out=39
-         z_start=-729     z_end=-739
-	 cylinder2==cylinder3 -->
-
-    <constant name="PipeTV:AlCylinderZ" value="10*mm"/>
-    <constant name="PipeTV:AlCylinderInnerR" value="27*mm"/>
-    <constant name="PipeTV:AlCylinderOuterR" value="39*mm"/>
-    <constant name="PipeTV:CuCylinderZ" value="179*mm"/>
-    <constant name="PipeTV:CuCylinderInnerR" value="27*mm"/>
-    <constant name="PipeTV:CuCylinderOuterR" value="27.1*mm"/>
-    <constant name="PipeTV:Z" value="PipeTV:AlCylinderZ+PipeTV:CuCylinderZ+PipeTV:AlCylinderZ"/>
-
-    <!-- UPSTREAM VELO PIPE JUNCTION:
-	 - this is a series of pieces that connect from the CuBe punctured pipe in the
-	 VELO to the LHC upstream beam pipe bellow connection.
-	 - see CDD drawings: LHBTVV__0084, 0085, 0057 and
-	 http://www.nikhef.nl/pub/departments/mt/projects/lhcb-vertex/pdf/TVE-LAYOUTS/TVE65.pdf
-	 NB: the extra connection flange at z=-760...-800 is not shown in these drawings.
-	 - material: stainless steel
-	 cylinder1: r_in=27     r_out=30
-         z_start=-739     z_end=-800
-	 - material: stainless steel
-	 cylinder2: r_in=30     r_out=39
-         z_start=-739     z_end=-745
-	 - material: stainless steel
-	 cylinder3: r_in=30     r_out=39
-         z_start=-760     z_end=-800
-	 - material: stainless steel
-	 cone1:  r_in_start=27   r_out_start=29   z_start=-800
-         r_in_end=38   r_out_end=40   z_end=-865
-	 - material: stainless steel
-	 cylinder4: r_in=40     r_out=76
-         z_start=-865     z_end=-885 -->
-    <constant name="PipeTV:JunkSteelCyl1Z" value="61*mm"/>
-    <constant name="PipeTV:JunkSteelCyl1InnerR" value="27*mm"/>
-    <constant name="PipeTV:JunkSteelCyl1OuterR" value="30*mm"/>
-
-    <constant name="PipeTV:JunkSteelCyl2Z" value="6*mm"/>
-    <constant name="PipeTV:JunkSteelCyl2InnerR" value="30*mm"/>
-    <constant name="PipeTV:JunkSteelCyl2OuterR" value="39*mm"/>
-
-    <constant name="PipeTV:JunkSteelCyl3Z" value="40*mm"/>
-    <constant name="PipeTV:JunkSteelCyl3InnerR" value="30*mm"/>
-    <constant name="PipeTV:JunkSteelCyl3OuterR" value="39*mm"/>
-
-    <!-- Velo volume ends at -835mm so second half of the cone is moved into Before
-	 Magnet pipe volume. -->
-    <constant name="PipeTV:JunkSteelConeZ" value="35*mm"/>
-    <constant name="PipeTV:JunkSteelConeInnerRPZ" value="27*mm"/>
-    <constant name="PipeTV:JunkSteelConeInnerRMZ" value="(35*(38-27)/65)*mm+27*mm"/>
-    <constant name="PipeTV:JunkSteelConeOuterRPZ" value="29*mm"/>
-    <constant name="PipeTV:JunkSteelConeOuterRMZ" value="(35*(40-29)/65)*mm+29*mm"/>
-
-    <constant name="PipeTV:JunkSteelCyl4Z" value="20*mm"/>
-    <constant name="PipeTV:JunkSteelCyl4InnerR" value="40*mm"/>
-    <constant name="PipeTV:JunkSteelCyl4OuterR" value="76*mm"/>
-
-    <constant name="PipeTV:JunkZ" value="PipeTV:JunkSteelCyl1Z+PipeTV:JunkSteelConeZ"/>
-    <constant name="PipeTV:UpstreamPipeZ" value="PipeTV:SpokeZ+PipeTV:Z+PipeTV:JunkZ"/>
-
-    <!-- The downstream beam pipe sections -->
-    <!-- NB any changes here must be propagated to the subtractions in the gas volumes included in the vacuum tank description -->
-
-    <constant name="PipeTV:ExitWindowHoleZ" value="858.6*mm"/>
-    <constant name="PipeTV:ExitWindowZSize" value="945*mm-PipeTV:ExitWindowHoleZ"/>
-    <constant name="PipeTV:ExitWindow2BellowsZSize" value="55.54*mm"/>
-    <constant name="PipeTV:BellowsStartZ" value="PipeTV:ExitWindowHoleZ+PipeTV:ExitWindow2BellowsZSize"/>
-    <constant name="PipeTV:BellowsInnerRadius" value="34*mm"/>
-    <constant name="PipeTV:BellowsOuterRadius" value="46*mm"/>
-    <constant name="PipeTV:BellowsThickness" value="0.3*mm"/>
-    <constant name="PipeTV:BellowsSpacing" value="2.7*mm"/>
-    <constant name="PipeTV:BellowsZSize" value="8*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing"/>
-    <constant name="PipeTV:DSTubeZToWeld" value="16.56*mm"/>
-    <constant name="PipeTV:DSTube1ZSize" value="PipeTV:DSTubeZToWeld+6*mm"/>
-    <constant name="PipeTV:DSTube1InnerRadius" value="PipeTV:BellowsInnerRadius"/>
-    <constant name="PipeTV:DSTube1Thickness" value="2.5*mm"/>
-    <constant name="PipeTV:DSTube2ZSize" value="2.5*mm"/>
-    <constant name="PipeTV:DSTube2InnerRadius" value="28*mm"/>
-    <constant name="PipeTV:DSTube2Thickness" value="PipeTV:DSTube1InnerRadius-PipeTV:DSTube2InnerRadius"/>
-    <constant name="PipeTV:DSTube3ZSize" value="12*mm"/>
-    <constant name="PipeTV:DSTube3InnerRadius" value="PipeTV:DSTube2InnerRadius"/>
-    <constant name="PipeTV:DSTube3Thickness" value="PipeTV:DSTube1Thickness"/>
-    <constant name="PipeTV:WFSGrooveZSize" value="2.2*mm"/>
-    <constant name="PipeTV:WFSGrooveRSize" value="1*mm"/>
-    <constant name="PipeTV:DSTube4ZSize" value="2.5*mm"/>
-    <constant name="PipeTV:DSTube4InnerRadius" value="27*mm"/>
-    <constant name="PipeTV:DSTube4Thickness" value="1*mm"/>
-    <constant name="PipeTV:BellowsEpsilon" value="0.01*mm"/>
-    <constant name="PipeTV:RadiusChange" value="TV:vTankDownExitWindowHoleR-(PipeTV:BellowsInnerRadius+2*mm)"/>
-  </define>
-
-  <detectors>
-    <detector name="TVUpStreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeInTV:parent}" vis="Pipe:InTV">
-      <!-- ****************************************************** -->
-      <!-- * Definition of CuBe pipe sections in velo tank      * -->
-      <!-- * and supports                                       * -->
-      <!-- ****************************************************** -->
-
-      <!-- SPOKE CAP -->
-      <volume name="lvSpokeCap" material="Pipe:Al" vis="Pipe:InTV">
-	<shape type="ConeSegment" name="SpokeCapCone"
-               dz="0.5*PipeTV:SpokeZ"
-               rmin2="PipeTV:SpokeInnerRPZ"
-               rmin1="PipeTV:SpokeInnerRMZ"
-               rmax2="PipeTV:SpokeOuterRPZ"
-               rmax1="PipeTV:SpokeOuterRMZ"/>
-      </volume>
-
-      <!-- COPPERBERYLLIUM PUNCTURED PIPE -->
-      <volume name="lvPipeAlCylinder" material="Pipe:Al" vis="Pipe:InTV">
-	<shape type="Tube" name="PipeAlCylTubs"
-	       dz="0.5*PipeTV:AlCylinderZ"
-	       rmin="PipeTV:AlCylinderInnerR"
-	       rmax="PipeTV:AlCylinderOuterR"/>
-      </volume>
-      <volume name="lvPipeCuCylinder" material="Pipe:Cu" vis="Pipe:InTV">
-	<shape type="Tube" name="PipeCuCylTubs"
-	       dz="0.5*PipeTV:CuCylinderZ"
-	       rmin="PipeTV:CuCylinderInnerR"
-	       rmax="PipeTV:CuCylinderOuterR"/>
-      </volume>
-
-      <!-- UPSTREAM VELO PIPE JUNCTION -->
-      <volume name="lvPipeJuncCyl1" material="Pipe:Steel316LN" vis="Pipe:InTV">
-	<shape type="Tube" name="PipeTV:JunkSteelCyl1"
-	       dz="0.5*PipeTV:JunkSteelCyl1Z"
-	       rmin="PipeTV:JunkSteelCyl1InnerR"
-	       rmax="PipeTV:JunkSteelCyl1OuterR"/>
-      </volume>
-      <volume name="lvPipeJuncCyl2" material="Pipe:Steel316LN" vis="Pipe:InTV">
-	<shape type="Tube" name="PipeTV:JunkSteelCyl2"
-	       dz="0.5*PipeTV:JunkSteelCyl2Z"
-	       rmin="PipeTV:JunkSteelCyl2InnerR+0.01*mm"
-	       rmax="PipeTV:JunkSteelCyl2OuterR"/>
-      </volume>
-      <volume name="lvPipeJuncCyl3" material="Pipe:Steel316LN" vis="Pipe:InTV">
-	<shape type="Tube" name="PipeTV:JunkSteelCyl3"
-	       dz="0.5*PipeTV:JunkSteelCyl3Z"
-	       rmin="PipeTV:JunkSteelCyl3InnerR+0.01*mm"
-	       rmax="PipeTV:JunkSteelCyl3OuterR"/>
-      </volume>
-      <volume name="lvPipeJuncCone1" material="Pipe:Steel316LN" vis="Pipe:InTV">
-	<shape type="ConeSegment" name="PipeTV:JunkSteelCone"
-	       dz="0.5*PipeTV:JunkSteelConeZ"
-	       rmin2="PipeTV:JunkSteelConeInnerRPZ"
-	       rmin1="PipeTV:JunkSteelConeInnerRMZ"
-	       rmax2="PipeTV:JunkSteelConeOuterRPZ"
-	       rmax1="PipeTV:JunkSteelConeOuterRMZ"/>
-      </volume>
-
-
-      <envelope type="Assembly" name="lvVeloUpStreamPipe" vis="Pipe:InTV">
-	<!-- Spoke cap -->
-	<physvol volume="lvSpokeCap" name="SpokeCap">
-	  <position z="-505*mm"/>
-	</physvol>
-	<!-- CuBe pipe -->
-	<physvol volume="lvPipeAlCylinder" name="PipeAlCyl1">
-	  <position z="-545*mm"/>
-	</physvol>
-	<physvol volume="lvPipeCuCylinder" name="PipeCuCyl">
-	  <position z="-639.5*mm"/>
-	</physvol>
-	<physvol volume="lvPipeAlCylinder" name="PipeAlCyl2">
-	  <position z="-734*mm"/>
-	</physvol>
-	<!-- Pipe junction -->
-	<physvol volume="lvPipeJuncCone1" name="PipeJuncCone1">
-	  <position z="-817.5*mm"/>
-	</physvol>
-	<physvol volume="lvPipeJuncCyl1" name="PipeJuncCyl1">
-	  <position z="-769.5*mm"/>
-	</physvol>
-	<physvol volume="lvPipeJuncCyl2" name="PipeJuncCyl2">
-	  <position z="-742*mm"/>
-	</physvol>
-	<physvol volume="lvPipeJuncCyl3" name="PipeJuncCyl3">
-	  <position z="-780*mm"/>
-	</physvol>
-      </envelope>
-      <position/>
-    </detector>
-
-
-    <detector name="VeloDownStreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeInTV:parent}" vis="Pipe:InTV">
-
-      <!-- Definition of section joining Al exit window with beam pipe -->
-      <volume name="lvExitWindow2Bellows" material="Pipe:Al6061" vis="Pipe:InTV">
-	<shape type="ConeSegment" name="ExitWindow2Bellows"
-	       dz="0.5*PipeTV:ExitWindow2BellowsZSize"
-	       rmin2="PipeTV:BellowsInnerRadius"
-	       rmin1="TV:vTankDownExitWindowHoleR-2*mm"
-	       rmax2="PipeTV:BellowsInnerRadius+2*mm"
-	       rmax1="TV:vTankDownExitWindowHoleR"/>
-      </volume>
-
-      <volume name="lvVelo2Rich1GasEW2B" material="Rich:C4F10" vis="Pipe:InTV">
-	<shape type="BooleanShape" operation="subtraction" name="V2R1GasEW2BSub">
-	  <shape type="Tube" name="V2R1GasEW2BTubs1"
-		 dz="0.5*PipeTV:ExitWindow2BellowsZSize"
-		 rmax="TV:vTankDownExitWindowHoleR"/>
-	  <shape type="ConeSegment" name="V2R1GasEW2BCons1"
-		 dz="0.5*2*PipeTV:ExitWindow2BellowsZSize"
-		 rmin2="0*mm"
-		 rmin1="0*mm"
-		 rmax2="(PipeTV:BellowsInnerRadius+2*mm)-PipeTV:RadiusChange/2"
-		 rmax1="TV:vTankDownExitWindowHoleR+PipeTV:RadiusChange/2"/>
-	</shape>
-      </volume>
-
-      <!-- Definition of the bellows section of the beam pipe -->
-      <volume name="lvBellows" material="Pipe:Al6061" vis="Pipe:InTV">
-	<shape type="Polycone" name="Bellows">
-	  <!-- 1 -->  <zplane z="PipeTV:BellowsStartZ"                                                    rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 2 -->  <zplane z="PipeTV:BellowsStartZ+PipeTV:BellowsThickness"                                   rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 3 -->  <zplane z="PipeTV:BellowsStartZ+PipeTV:BellowsThickness+PipeTV:BellowsEpsilon"                    rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 4 -->  <zplane z="PipeTV:BellowsStartZ+PipeTV:BellowsThickness+PipeTV:BellowsSpacing"                    rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 5 -->  <zplane z="PipeTV:BellowsStartZ+PipeTV:BellowsThickness+PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon"     rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 6 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+PipeTV:BellowsSpacing"                  rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 7 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon"   rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 8 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 9 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 10 --> <zplane z="PipeTV:BellowsStartZ+3*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 11 --> <zplane z="PipeTV:BellowsStartZ+3*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 12 --> <zplane z="PipeTV:BellowsStartZ+3*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 13 --> <zplane z="PipeTV:BellowsStartZ+3*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 14 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 15 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 16 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 17 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 18 --> <zplane z="PipeTV:BellowsStartZ+5*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 19 --> <zplane z="PipeTV:BellowsStartZ+5*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 20 --> <zplane z="PipeTV:BellowsStartZ+5*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 21 --> <zplane z="PipeTV:BellowsStartZ+5*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 22 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 23 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 24 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 25 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 26 --> <zplane z="PipeTV:BellowsStartZ+7*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 27 --> <zplane z="PipeTV:BellowsStartZ+7*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 28 --> <zplane z="PipeTV:BellowsStartZ+7*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsOuterRadius-PipeTV:BellowsThickness" rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 29 --> <zplane z="PipeTV:BellowsStartZ+7*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	  <!-- 30 --> <zplane z="PipeTV:BellowsStartZ+8*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing"                rmin="PipeTV:BellowsInnerRadius"                  rmax="PipeTV:BellowsOuterRadius"/>
-	</shape>
-      </volume>
-
-      <!-- The RICH1 gas sections DS of the exit window -->
-
-      <volume name="lvVelo2Rich1GasBellows" material="Rich:C4F10" vis="Pipe:InTV">
-	<shape type="Polycone" name="V2R1GasBellows">
-	  <!-- 1 -->  <zplane z="PipeTV:BellowsStartZ"                                                    rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
-	  <!-- 6 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+PipeTV:BellowsSpacing"                  rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
-	  <!-- 7 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon"   rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 8 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 9 -->  <zplane z="PipeTV:BellowsStartZ+2*PipeTV:BellowsThickness+2*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
-	  <!-- 14 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
-	  <!-- 15 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+3*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 16 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 17 --> <zplane z="PipeTV:BellowsStartZ+4*PipeTV:BellowsThickness+4*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
-	  <!-- 22 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
-	  <!-- 23 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+5*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 24 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing"                rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsInnerRadius+PipeTV:BellowsThickness"/>
-	  <!-- 25 --> <zplane z="PipeTV:BellowsStartZ+6*PipeTV:BellowsThickness+6*PipeTV:BellowsSpacing+PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
-	  <!-- 30 --> <zplane z="PipeTV:BellowsStartZ+8*PipeTV:BellowsThickness+7*PipeTV:BellowsSpacing-PipeTV:BellowsEpsilon" rmax="TV:vTankDownExitWindowHoleR" rmin="PipeTV:BellowsOuterRadius"/>
-	</shape>
-      </volume>
-
-      <!-- Definition of the tube section of the beam pipe -->
-      <!-- TODO: Looks like the groove for the connection of the wakefield suppressor is in the wrong place?
-           It's DS edge is currently located at 968mm but the wakefield suppressor ends at 954mm -->
-      <volume name="lvDSTubeSection" material="Pipe:Al2219F" vis="Pipe:InTV">
-	<shape type="BooleanShape" operation="union" name="DSTubeUnion">
-	  <shape type="Tube" name="DSTube1"
-		 dz="0.5*PipeTV:DSTube1ZSize"
-		 rmin="PipeTV:DSTube1InnerRadius"
-		 rmax="PipeTV:DSTube1InnerRadius+PipeTV:DSTube1Thickness"/>
-	  <shape type="Tube" name="DSTube2"
-		 dz="0.5*PipeTV:DSTube2ZSize"
-		 rmin="PipeTV:DSTube2InnerRadius"
-		 rmax="PipeTV:DSTube2InnerRadius+PipeTV:DSTube2Thickness"/>
-	  <position z="(PipeTV:DSTube1ZSize-PipeTV:DSTube2ZSize)/2"/>
-	  <shape type="BooleanShape" operation="subtraction" name="DSTube3Sub">
-            <shape type="Tube" name="DSTube3a"
-		   dz="0.5*PipeTV:DSTube3ZSize"
-		   rmin="PipeTV:DSTube3InnerRadius"
-		   rmax="PipeTV:DSTube3InnerRadius+PipeTV:DSTube3Thickness"/>
-            <shape type="Tube" name="DSTube3b"
-		   dz="0.5*PipeTV:WFSGrooveZSize"
-		   rmin="0*mm"
-		   rmax="PipeTV:DSTube3InnerRadius+PipeTV:WFSGrooveRSize"/>
-            <position z="(PipeTV:DSTube3ZSize-PipeTV:WFSGrooveZSize)/2-2*mm"/>
-	  </shape>
-	  <position z="(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)/2"/>
-	</shape>
-      </volume>
-
-      <volume name="lvVelo2Rich1GasDSTube" material="Rich:C4F10" vis="Pipe:InTV">
-	<shape type="BooleanShape" operation="subtraction" name="DSTubeGasSub">
-	  <shape type="Tube" name="DSTubeGas"
-		 dz="0.5*(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)"
-		 rmin="0*mm"
-		 rmax="TV:vTankDownExitWindowHoleR"/>
-	  <shape type="Tube" name="DSTube1Gas"
-		 dz="0.5*2*PipeTV:DSTube1ZSize"
-		 rmin="0*mm"
-		 rmax="PipeTV:DSTube1InnerRadius+PipeTV:DSTube1Thickness"/>
-	  <position z="-(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)/2"/>
-	  <shape type="Tube" name="DSTube3Gas"
-		 dz="0.5*2*PipeTV:DSTube3ZSize"
-		 rmin="0*mm"
-		 rmax="PipeTV:DSTube3InnerRadius+PipeTV:DSTube3Thickness"/>
-	  <position z="(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)/2"/>
-	</shape>
-      </volume>
-
-      <envelope type="Assembly" name="lvVeloDownStreamPipe" vis="Pipe:InTV">
-	<physvol volume="lvExitWindow2Bellows" name="VeloDSPipe1">
-          <position z="PipeTV:ExitWindowHoleZ+PipeTV:ExitWindow2BellowsZSize/2"/>
-	</physvol>
-	<physvol volume="lvVelo2Rich1GasEW2B" name="VeloDSPipe1Gas">
-          <position z="PipeTV:ExitWindowHoleZ+PipeTV:ExitWindow2BellowsZSize/2"/>
-	</physvol>
-
-	<physvol volume="lvBellows" name="VeloDSPipe2">
-	</physvol>
-	<physvol volume="lvVelo2Rich1GasBellows" name="VeloDSPipe2Gas">
-	</physvol>
-	<physvol volume="lvDSTubeSection" name="VeloDSPipe3">
-          <position z="PipeTV:BellowsStartZ+PipeTV:BellowsZSize+(PipeTV:DSTube1ZSize)/2"/>
-	</physvol>
-	<physvol volume="lvVelo2Rich1GasDSTube" name="VeloDSPipe3Gas">
-          <position z="PipeTV:BellowsStartZ+PipeTV:BellowsZSize+(PipeTV:DSTube1ZSize+PipeTV:DSTube3ZSize)/2"/>
-	</physvol>
-      </envelope>
-      <position/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InUP.xml b/compact/components/Pipe/2025-v00.00/InUP.xml
deleted file mode 100644
index 092263950..000000000
--- a/compact/components/Pipe/2025-v00.00/InUP.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe inside the UP region                   -->
-<!--===========================================================================-->
-<!--==================================Pipe In  UP============================-->
-<!--===========================================================================-->
-<lccdd>
-
-  <detectors>
-    <detector name="PipeInUP" type="DD4hep_VolumeAssembly" parent="${PipeInUP:parent}" vis="Pipe:Vis">
-
-      <!-- UX85-1 Cylinder of 50 mm diameter -->
-      <volume name="lvUX851Cyl07B" material="Pipe:BeTV56" vis="Pipe:InUP">
-        <shape type="Tube" name="UX85-1-Cylinder-07B"
-               dz="0.5*UX851Cyl07BLenght"
-               rmin="UX851Cyl07Radius"
-               rmax="UX851Cyl07Radius+UX851Cyl07Thick"/>
-      </volume>
-
-      <!-- UX85-1 Cone 10 mrad                    -->
-      <!-- Stop at end of BeforeMagnet Region     -->
-      <volume name="lvUX851Cone08A" material="Pipe:BeTV56" vis="Pipe:InUP">
-        <shape type="ConeSegment" name="UX85-1-Cone10mrad-08A"
-               dz="0.5*UX851Cone08ALenght"
-               rmin2="UX851Cone08ARadiusZmax"
-               rmin1="UX851Cone08ARadiusZmin"
-               rmax2="UX851Cone08ARadiusZmax+UX851Cone08AThick"
-               rmax1="UX851Cone08ARadiusZmin+UX851Cone08AThick"/>
-      </volume>
-
-      <!-- Vacuum in UX851Cyl07B in UP -->
-      <volume name="lvUX851Vacuum07B" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="Tube" name="UX85-1-Vacuum-07B"
-               dz="0.5*UX851Cyl07BLenght"
-               rmax="UX851Cyl07Radius"/>
-      </volume>
-
-      <!-- Vacuum in UX851Cone08A in UP -->
-      <volume name="lvUX851Vacuum08A" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="ConeSegment" name="UX85-1-Vacuum-08A"
-               dz="0.5*UX851Cone08ALenght"
-               rmax1="UX851Cone08ARadiusZmin"
-               rmax2="UX851Cone08ARadiusZmax"/>
-      </volume>
-
-      <!-- Whole section: combination of sections -->
-      <!-- For the moment assume sections put at 0.0 of this (set with center at 970mm  -->
-      <envelope type="Assembly" name="lvUX851InUP" vis="Pipe:InUP">
-        <!-- Pipes of Al and Be -->
-        <physvol name="pvUX851Cyl07B"            volume="lvUX851Cyl07B">
-          <position z="UX851Cyl07BZpos"/>
-        </physvol>
-
-        <physvol name="pvUX851Cone08A"           volume="lvUX851Cone08A">
-          <position z="UX851Cone08AZpos"/>
-        </physvol>
-
-        <!-- Now the vacuum inside -->
-        <physvol name="pvUX851Vacuum07B"         volume="lvUX851Vacuum07B">
-          <position z="UX851Cyl07BZpos"/>
-        </physvol>
-
-        <physvol name="pvUX851Vacuum08A"         volume="lvUX851Vacuum08A">
-          <position z="UX851Cone08AZpos"/>
-        </physvol>
-      </envelope>
-      <position z="UX851Rich1TTSplitZposIP-UPSystemZ"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeTV.xml b/compact/components/Pipe/2025-v00.00/PipeTV.xml
deleted file mode 100644
index 25d44b6ca..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeTV.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="InTV.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeUP.xml b/compact/components/Pipe/2025-v00.00/PipeUP.xml
deleted file mode 100644
index 1291f86f0..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeUP.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="InUP.xml"/>
-  <include ref="VMA/VMA-AA.xml"/>
-</lccdd>
-- 
GitLab


From b1cb8d3598863678b4a6b196e60ca0f79faae789 Mon Sep 17 00:00:00 2001
From: Menglin Xu <mexu@cern.ch>
Date: Wed, 5 Mar 2025 15:36:03 +0100
Subject: [PATCH 6/8] introduce 2025 geometry version

---
 compact/run3/2025-v00.00/LHCb.xml  |  71 +++++++
 compact/run3/2025-v00.00/checksums | 305 +++++++++++++++++++++++++++++
 compact/run3/2025-v00.00/path.xml  |  30 +++
 3 files changed, 406 insertions(+)
 create mode 100644 compact/run3/2025-v00.00/LHCb.xml
 create mode 100644 compact/run3/2025-v00.00/checksums
 create mode 100644 compact/run3/2025-v00.00/path.xml

diff --git a/compact/run3/2025-v00.00/LHCb.xml b/compact/run3/2025-v00.00/LHCb.xml
new file mode 100644
index 000000000..ea404c898
--- /dev/null
+++ b/compact/run3/2025-v00.00/LHCb.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+<lccdd>
+  <debug>
+    <type name="includes" value="0" />
+    <type name="incguard" value="1" />
+  </debug>
+
+
+  <includes>
+    <file ref="../../components/Materials/trunk/common.xml" />  <!-- We cannot change the location of this file, for some reason, materials must be defined first.-->
+    <file ref="path.xml" />
+    <file ref="${path:Pipe}/PipeCommon.xml" />
+  </includes>
+
+   <!-- Notes
+    - PipeT and PipeAfterT is dependent on PipeAfterMagnet (Pipe/AfterMagnet-Params)
+    - PipeDownstream dependent on PipeAfterMagnet (Pipe/AfterMagnet-Params)
+    - PipeVP dependent on VP (region not created yet)
+    - PipeUT dependent on UT (region not created yet)
+
+    - Everything else can be independently included/excluded
+   -->
+
+   <!-- Upstream Region  -->
+  <include ref="${path:Regions}/Regions.xml"/>
+  <include ref="${path:BlockWall}/BlockWall.xml"/>
+  <include ref="${path:Bcm}/Bcm.xml" />
+  <include ref="${path:MBXW}/MBXW.xml" />
+  <include ref="${path:Pipe}/PipeUpstream.xml" />
+
+  <!-- Before Magnet Region  -->
+  <include ref="${path:Rich}/Rich1/Rich1.xml" />
+  <include ref="${path:VP}/VP.xml" />
+  <include ref="${path:SMOG2}/SMOG2.xml" />
+  <include ref="${path:UT}/UT.xml" />
+  <include ref="${path:Pipe}/PipeBeforeVelo.xml" />
+  <include ref="${path:Pipe}/PipeBeforeMagnet.xml" />
+  <include ref="${path:Pipe}/PipeVP.xml" />
+  <include ref="${path:Pipe}/PipeUT.xml" />
+
+   <!-- Magnet Region  -->
+  <include ref="${path:Magnet}/Magnet.xml" />
+  <include ref="${path:Pipe}/PipeMagnet.xml" />
+
+  <!-- After Magnet Region  -->
+  <include ref="${path:FT}/FT.xml" />
+  <include ref="${path:Rich}/Rich2/Rich2.xml" />
+  <include ref="${path:Pipe}/AfterMagnet-Params.xml" />
+  <include ref="${path:Pipe}/PipeAfterMagnet.xml" />
+  <include ref="${path:Pipe}/PipeT.xml" />
+  <include ref="${path:Pipe}/PipeAfterT.xml" />
+
+  <!-- Downstream Region  -->
+  <include ref="${path:NeutronShielding}/NeutronShielding.xml" />
+  <include ref="${path:Muon}/Muon.xml" />
+  <include ref="${path:ECAL}/ECAL.xml" />
+  <include ref="${path:HCAL}/HCAL.xml" />
+  <include ref="${path:Pipe}/PipeDownstream.xml" />
+  <include ref="${path:Pipe}/PipeAfterMuon.xml" />
+
+</lccdd>
diff --git a/compact/run3/2025-v00.00/checksums b/compact/run3/2025-v00.00/checksums
new file mode 100644
index 000000000..a28c34892
--- /dev/null
+++ b/compact/run3/2025-v00.00/checksums
@@ -0,0 +1,305 @@
+/world_volume: 1321319457
+/world_volume/lvAfterMagnetRegion_3: 2277670334
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1: 3260302501
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWinTubeLock: 2067417882
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWindowPMI: 3918691102
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWindowSkinDns: 3485900457
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWindowSkinUps: 4037348770
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2ExitWinTubeLock: 3986187492
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2ExitWindowPMI: 195078944
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2ExitWindowSkinDns: 1103276053
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2ExitWindowSkinUps: 3491049809
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2GasContWallBot: 1198821645
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2GasContWallSide0: 3135660451
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2GasContWallSide1: 3235731631
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2GasContWallTop: 2423636124
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2GasEnclosure: 3074898539
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShBottom0: 3610807083
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShBottom1: 2580298527
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShFront0: 1591969864
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShFront1: 482340419
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShSideBack0: 2867661293
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShSideBack1: 3129931003
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShSideFront0: 3496764971
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShSideFront1: 818383992
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShTop0: 1437748809
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2MagShTop1: 457637501
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2PhDetGasEncl0: 1136968377
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2PhDetGasEncl1: 4256021224
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2QuartzWindow0: 1754492283
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2QuartzWindow1: 2997471752
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2SuperStrAirBoxBot: 2523286936
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2SuperStrAirBoxTop: 3100796252
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2SuperStrAirTrapLeft: 1881883103
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2SuperStrAirTrapRight: 2121089690
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2Tube: 54753896
+/world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRichSystem: 3165402394
+/world_volume/lvAfterMagnetRegion_3/lvT_0: 3632022552
+/world_volume/lvAfterMagnetRegion_3/lvT_0/lvFT_0: 1275901114
+/world_volume/lvAfterMagnetRegion_3/lvT_0/lvUX853InT_1: 1340003410
+/world_volume/lvAfterMagnetRegion_3/lvUX853AfterT_3: 3367212464
+/world_volume/lvAfterMagnetRegion_3/lvUX853AfterT_3/pvUX853Cone07B: 1963523921
+/world_volume/lvAfterMagnetRegion_3/lvUX853AfterT_3/pvUX853Cone08: 4064389095
+/world_volume/lvAfterMagnetRegion_3/lvUX853AfterT_3/pvUX853Cone09: 4180031139
+/world_volume/lvAfterMagnetRegion_3/lvUX853AfterT_3/pvUX853Cone10: 2716982515
+/world_volume/lvAfterMagnetRegion_3/lvUX853AfterT_3/pvUX853Cone11: 1083477558
+/world_volume/lvAfterMagnetRegion_3/lvUX853AfterT_3/pvUX853Cone12A: 93538018
+/world_volume/lvAfterMagnetRegion_3/lvUX853AfterT_3/pvUX853Vacuum07B: 3775714949
+/world_volume/lvAfterMagnetRegion_3/lvUX85BakeoutAfterMagnet_2: 905232799
+/world_volume/lvAfterMagnetRegion_3/lvUX85SupportsAfterMagnet_4: 3203051945
+/world_volume/lvAfterMagnetRegion_3/lvUX85SupportsAfterMagnet_4/pvUX853AfterMagnetCollar: 2932990174
+/world_volume/lvBeforeMagnetRegion_1: 260016582
+/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0: 969394431
+/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvBcmUp_1: 3863989257
+/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvBlockWallBefMag_0: 2798056924
+/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvPipeSupBefVelo_3: 2820633149
+/world_volume/lvBeforeMagnetRegion_1/lvBeforeVelo_0/lvUX84BeforeVelo_2: 1419984040
+/world_volume/lvBeforeMagnetRegion_1/lvPipeBeforeVelo_4: 3493359229
+/world_volume/lvBeforeMagnetRegion_1/lvPipeBeforeVelo_4/pvPipeJunctionBeforeVelo: 4095198176
+/world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1: 2916638279
+/world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1/pvRich1MgsDnstrUTH0: 2497865400
+/world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1/pvRich1MgsDnstrUTH1: 1334830817
+/world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1/pvRich1SubMaster: 3266574560
+/world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1/pvUX851InRich1AfterSubM: 3629254175
+/world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1/pvUX851InRich1BeforeSubM: 734888376
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3: 733506852
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTA_4: 2513958813
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBoxPlug_2: 1910293213
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBox_1: 980729092
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTC_3: 3900797383
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTFrame_0: 2002155028
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTJacket_5: 2354566694
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTPipeHeater_6: 2769758888
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUX851InUT_7: 31157452
+/world_volume/lvBeforeMagnetRegion_1/lvVP_2: 4239748891
+/world_volume/lvBeforeMagnetRegion_1/lvVP_2/CellFixed_5: 1544849230
+/world_volume/lvBeforeMagnetRegion_1/lvVP_2/lvVeloDownStreamPipe_7: 1791284487
+/world_volume/lvBeforeMagnetRegion_1/lvVP_2/lvVeloUpStreamPipe_6: 1788377084
+/world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvDownstreamWakeFieldConeLeftHalf: 31414666
+/world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvDownstreamWakeFieldConeRightHalf: 1779078356
+/world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvVPMotionLeft: 3647347897
+/world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvVPMotionRight: 1244538161
+/world_volume/lvBeforeMagnetRegion_1/lvVP_2/pvVacTank: 3677441591
+/world_volume/lvDownstreamRegion_4: 523621985
+/world_volume/lvDownstreamRegion_4/lvAfterMuon_0: 3686322452
+/world_volume/lvDownstreamRegion_4/lvAfterMuon_0/lvBcmDown_0: 1172852340
+/world_volume/lvDownstreamRegion_4/lvAfterMuon_0/lvMBXWDown_1: 3391232860
+/world_volume/lvDownstreamRegion_4/lvAfterMuon_0/lvPipeAfterMuon_2: 2185067330
+/world_volume/lvDownstreamRegion_4/lvEcal_3: 2753648103
+/world_volume/lvDownstreamRegion_4/lvEcal_3/pvEcalLeft: 725979840
+/world_volume/lvDownstreamRegion_4/lvEcal_3/pvEcalRight: 4118022736
+/world_volume/lvDownstreamRegion_4/lvHcal_4: 496470235
+/world_volume/lvDownstreamRegion_4/lvHcal_4/pvHcalLeft: 1888658250
+/world_volume/lvDownstreamRegion_4/lvHcal_4/pvHcalRight: 94645271
+/world_volume/lvDownstreamRegion_4/lvMuon_2: 2924469551
+/world_volume/lvDownstreamRegion_4/lvMuon_2/M2: 2379935052
+/world_volume/lvDownstreamRegion_4/lvMuon_2/M3: 619021275
+/world_volume/lvDownstreamRegion_4/lvMuon_2/M4: 2546245617
+/world_volume/lvDownstreamRegion_4/lvMuon_2/M5: 2292535221
+/world_volume/lvDownstreamRegion_4/lvMuon_2/pvMuFilter1: 53250037
+/world_volume/lvDownstreamRegion_4/lvMuon_2/pvMuFilter2: 4225069973
+/world_volume/lvDownstreamRegion_4/lvMuon_2/pvMuFilter3: 2966155801
+/world_volume/lvDownstreamRegion_4/lvMuon_2/pvMuFilter4: 3294592010
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1: 4027999524
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingCoverInnerBack: 1978992369
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingCoverInnerFront: 358843239
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingCoverOuterBack: 2511239634
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingCoverOuterFront: 3703541603
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingPlasticInnerBack: 2357242247
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingPlasticInnerFront: 517389097
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingPlasticOuterBack: 2814044943
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingPlasticOuterFront: 904722849
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingSupportBack: 1828110531
+/world_volume/lvDownstreamRegion_4/lvNeutronShielding_1/pvNeutronShieldingSupportFront: 635909746
+/world_volume/lvDownstreamRegion_4/lvUX85BakeoutDownstream_6: 2348013418
+/world_volume/lvDownstreamRegion_4/lvUX85BakeoutDownstream_6/pvUX854Bakeout: 1222309685
+/world_volume/lvDownstreamRegion_4/lvUX85BakeoutDownstream_6/pvUX854Win05BakeoutMain: 3956889580
+/world_volume/lvDownstreamRegion_4/lvUX85Downstream_5: 2788279593
+/world_volume/lvDownstreamRegion_4/lvUX85Downstream_5/pvUX853Downstream: 1551348191
+/world_volume/lvDownstreamRegion_4/lvUX85Downstream_5/pvUX854: 981709332
+/world_volume/lvDownstreamRegion_4/lvUX85Downstream_5/pvUX85Compensator13100: 3189665751
+/world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_7: 1813034354
+/world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_7/pvUX853CableDownstream01: 297292910
+/world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_7/pvUX853CableDownstream02: 1922276958
+/world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_7/pvUX853CableDownstream03: 3050398352
+/world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_7/pvUX853CableDownstream04: 1641403997
+/world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_7/pvUX853DownstreamCollar: 423381431
+/world_volume/lvDownstreamRegion_4/lvUX85SupportsDownstream_7/pvUX854SlSup: 2423248136
+/world_volume/lvMagnetRegion_2: 3889734649
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0: 1133940338
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Left_Vertical_Part: 1597222043
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/LowerCoil: 610936026
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Lower_Horizontal_Part: 3896950927
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Right_Vertical_Part: 3420298066
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/UpperCoil: 4210492369
+/world_volume/lvMagnetRegion_2/MagnetEnvelope_0/Upper_Horizontal_Part: 259775051
+/world_volume/lvMagnetRegion_2/lvUX85InMagnet_1: 1069516840
+/world_volume/lvMagnetRegion_2/lvUX85InMagnet_1/pvUX851InMagnet: 3246864409
+/world_volume/lvMagnetRegion_2/lvUX85InMagnet_1/pvUX852: 1078125067
+/world_volume/lvMagnetRegion_2/lvUX85InMagnet_1/pvUX853: 404429180
+/world_volume/lvMagnetRegion_2/lvUX85InMagnet_1/pvUX85Bellow6900: 2475414661
+/world_volume/lvMagnetRegion_2/lvUX85InMagnet_1/pvUX85Compensator2800: 1900948079
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2: 3836156423
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX852CollarClipScrew11: 622185963
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX852CollarClipScrew12: 1646870582
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX852CollarClipScrew13: 1543090219
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX852CollarClipScrew21: 1044174859
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX852CollarClipScrew22: 4195258192
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX852CollarClipScrew23: 3220590413
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX852CollarClipScrew31: 3018978178
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX852CollarClipScrew32: 2229465744
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX852CollarClipScrew33: 1728349179
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew11: 437076050
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew12: 134324258
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew124: 369818781
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew13: 3584051442
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew134: 685854155
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew14: 1214661264
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew21: 1147272799
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew22: 2873898290
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew23: 67509485
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew31: 1443704843
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew32: 1449991727
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/lvUX853CollarClipScrew33: 1516937952
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX851Cable01: 3275795876
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX851Cable02: 4168140908
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX851Cable03: 3115562963
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX851Cable04: 2189677083
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX851Collar: 886083607
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852BckAttRod1: 1891455009
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852BckAttRod2: 174855762
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852BckAttRod3: 445160419
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852BckAttRod4: 1616502160
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarAtt-1a: 578479400
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarAtt-1b: 2642331696
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarAtt-2a: 198063893
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarAtt-2b: 3033143821
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarAtt-3a: 2044514021
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarAtt-3b: 3336102909
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarAtt-4a: 1349000408
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarAtt-4b: 4016845248
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarClip1: 3444468277
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarClip2: 545478468
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarForkAttachProngBck-1: 949240534
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarForkAttachProngBck-2: 4166966054
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarForkAttachProngBck-3: 2717395024
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852CollarForkAttachProngBck-4: 4094317424
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FixCollar: 773686131
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCable03BottomLeft: 2133405671
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCable03BottomRight: 3278640586
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCable03TopLeft: 4096562612
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCable03TopRight: 3458647562
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCableHeadBeamPipeEndBck-1: 3457712622
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCableHeadBeamPipeEndBck-2: 4258803906
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCableHeadBeamPipeEndBck-3: 3418320019
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCableHeadBeamPipeEndBck-4: 3453065829
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCableHeadMagnetFaceEndBck-1: 1865243659
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCableHeadMagnetFaceEndBck-2: 2548257232
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCableHeadMagnetFaceEndBck-3: 380234741
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FutureFibreCableHeadMagnetFaceEndBck-4: 4073605749
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FwdAttRod1: 4020705728
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FwdAttRod2: 1834651638
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FwdAttRod3: 2109604423
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852FwdAttRod4: 124732468
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCable04BottomLeft: 479860587
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCable04BottomRight: 1450651390
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCable04TopLeft: 3722472696
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCable04TopRight: 730312261
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCableHeadBeamPipeEndFwd-1: 511727455
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCableHeadBeamPipeEndFwd-2: 790658648
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCableHeadBeamPipeEndFwd-3: 1909072452
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCableHeadBeamPipeEndFwd-4: 1732454854
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCableHeadMagnetFaceEndFwd-1: 1084240982
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCableHeadMagnetFaceEndFwd-2: 206507377
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCableHeadMagnetFaceEndFwd-3: 3214610482
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX852TechnoraCableHeadMagnetFaceEndFwd-4: 970428856
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853BckAttRod1: 1456194977
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853BckAttRod2: 2438892336
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853BckAttRod3: 3799560066
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853BckAttRod4: 3925650451
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarAtt1a: 2369106603
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarAtt1b: 3667110551
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarAtt2a: 990725087
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarAtt2b: 1682178204
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarAtt3a: 1740174412
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarAtt3b: 807332976
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarAtt4a: 736890736
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarAtt4b: 1956990003
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarClip1: 2709161706
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853CollarClip2: 4207457972
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FixCollar: 1690711733
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FixCollarCable05BckBot: 630734772
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FixCollarCable05BckTop: 2759890293
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FixCollarCable06BckHorizLeft: 395929213
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FixCollarCable06BckHorizRight: 2144481840
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FixCollarCable07FwdBot: 3074757007
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FixCollarCable07FwdTop: 2433059837
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FixCollarCable08FwdHorizLeft: 2752421707
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FixCollarCable08FwdHorizRight: 526270459
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FutureCableHeadBeamPipeEndBck-1: 1829203219
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FutureCableHeadBeamPipeEndBck-2: 2675038332
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FutureCableHeadBeamPipeEndBck-3: 3442442877
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FutureCableHeadBeamPipeEndBck-4: 858338988
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FutureCableHeadMagnetFaceEndBck-1: 1907448875
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FutureCableHeadMagnetFaceEndBck-2: 886608399
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FutureCableHeadMagnetFaceEndBck-3: 1902103854
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FutureCableHeadMagnetFaceEndBck-4: 1432372902
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FwdAttRod1: 3875585441
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FwdAttRod2: 3022594931
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FwdAttRod3: 1818044949
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853FwdAttRod4: 3431662672
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853TechnoraCableHeadBeamPipeEndFwd-1: 2451265037
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853TechnoraCableHeadBeamPipeEndFwd-2: 2171581006
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853TechnoraCableHeadBeamPipeEndFwd-3: 2151067724
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853TechnoraCableHeadBeamPipeEndFwd-4: 3048135252
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853TechnoraCableHeadMagnetFaceEndFwd-1: 77138427
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853TechnoraCableHeadMagnetFaceEndFwd-2: 3189264422
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853TechnoraCableHeadMagnetFaceEndFwd-3: 3377132891
+/world_volume/lvMagnetRegion_2/lvUX85SupportsInMagnet_2/pvUX853TechnoraCableHeadMagnetFaceEndFwd-4: 1780429698
+/world_volume/lvUpstreamRegion_0: 236160639
+/world_volume/lvUpstreamRegion_0/lvBlockWallUpStr_0: 3613364959
+/world_volume/lvUpstreamRegion_0/lvBlockWallUpStr_0/pvBlockWallUpstr: 2944089646
+/world_volume/lvUpstreamRegion_0/lvBlockWallUpStr_0/pvBlockWallUpstr2: 1420104363
+/world_volume/lvUpstreamRegion_0/lvBlockWallUpStr_0/pvBlockWallUpstr3: 656382915
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2: 2367615483
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetBetweenCoil_1: 58465780
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetBetweenCoil_2: 298460529
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetCoilDown_3: 3780980730
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetCoilDown_5: 148821644
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetCoilDown_7: 43572825
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetCoilDown_9: 3944425263
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetCoilUp_10: 2302093289
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetCoilUp_4: 2205232956
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetCoilUp_6: 1794299466
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetCoilUp_8: 1622466207
+/world_volume/lvUpstreamRegion_0/lvMBXWSUp_2/lvMagnetYoke_0: 3689842281
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1: 1710455030
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetBetweenCoil_1: 2334682881
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetBetweenCoil_2: 2577291140
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetCoilDown_3: 35014659
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetCoilDown_5: 3952456053
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetCoilDown_7: 3788749216
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetCoilDown_9: 139477206
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetCoilUp_10: 548471177
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetCoilUp_4: 720832860
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetCoilUp_6: 3279220778
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetCoilUp_8: 3375560959
+/world_volume/lvUpstreamRegion_0/lvMBXWUp_1/lvMagnetYoke_0: 1056807736
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3: 187999240
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/lvVMAAAUpstreamVax_12: 1391745217
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/lvVMAAAUpstream_13: 2109191579
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/lvVMABKUpstream_16: 3920028204
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/lvVMACAUpstream1_14: 1549835221
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/lvVMACAUpstream2_15: 1562128573
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvBPMSW: 3824086034
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvMBXWSUpStrPipe: 3431314285
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvPipeInMBXWH: 1945948260
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvPipeVCDA: 2793548850
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvPipeVCDBU: 2433489664
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvTransPipe: 1147087114
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvUX84: 3856938135
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvUX86Adapter: 3860770722
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvVVSGF: 2064005575
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvVVSGFVaxUpStr: 745916197
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvVVSSH: 4080643041
+/world_volume/lvUpstreamRegion_0/lvPipeUpstream_3/pvVaxUpStr: 4105590568
\ No newline at end of file
diff --git a/compact/run3/2025-v00.00/path.xml b/compact/run3/2025-v00.00/path.xml
new file mode 100644
index 000000000..e28756fc2
--- /dev/null
+++ b/compact/run3/2025-v00.00/path.xml
@@ -0,0 +1,30 @@
+<lccdd>
+<!--
+    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+   <define>
+    <constant name="path:BlockWall" value="../../components/BlockWall/2024-v00.00" type="string"/>
+    <constant name="path:Bcm" value="../../components/Bcm/2024-v00.00" type="string"/>
+    <constant name="path:MBXW" value="../../components/MBXW/2024-v00.00" type="string"/>
+    <constant name="path:Pipe" value="../../components/Pipe/2025-v00.00" type="string"/>
+    <constant name="path:Rich" value="../../components/Rich/2025-v00.00" type="string"/>
+    <constant name="path:SMOG2" value="../../components/SMOG2/2025-v00.00" type="string"/>
+    <constant name="path:VP" value="../../components/VP/2025-v00.00" type="string"/>
+    <constant name="path:UT" value="../../components/UT/2025-v00.00" type="string"/>
+    <constant name="path:Magnet" value="../../components/Magnet/2024-v00.00" type="string"/>
+    <constant name="path:FT" value="../../components/FT/2024-v00.00" type="string"/>
+    <constant name="path:NeutronShielding" value="../../components/NeutronShielding/2024-v00.00" type="string"/>
+    <constant name="path:Muon" value="../../components/Muon/2024-v00.00" type="string"/>
+    <constant name="path:ECAL" value="../../components/ECAL/2024-v00.00" type="string"/>
+    <constant name="path:HCAL" value="../../components/HCAL/2024-v00.00" type="string"/>
+    <constant name="path:Regions" value="../../components/Regions/2024-v00.00" type="string"/>
+    <constant name="path:Materials" value="../../components/Materials/2024-v00.00" type="string"/>
+  </define>
+</lccdd>
-- 
GitLab


From 8948a4a794fbd0892a0afc124fbaa193e5b68ae2 Mon Sep 17 00:00:00 2001
From: Menglin Xu <mexu@cern.ch>
Date: Wed, 12 Mar 2025 17:27:49 +0100
Subject: [PATCH 7/8] revert introduce 2024 version for UT, SMOG2 and Pipe

---
 .../Pipe/2025-v00.00/AfterMagnet-Bakeout.xml  |   35 -
 .../Pipe/2025-v00.00/AfterMagnet-Params.xml   |  162 -
 .../Pipe/2025-v00.00/AfterMuon-BPMSW.xml      |  188 --
 .../Pipe/2025-v00.00/AfterMuon-Params.xml     |  194 --
 .../Pipe/2025-v00.00/AfterMuon-VVSGF.xml      |   64 -
 .../Pipe/2025-v00.00/AfterMuon-Vax.xml        |  522 ----
 .../components/Pipe/2025-v00.00/AfterMuon.xml |   78 -
 .../Pipe/2025-v00.00/AfterT-Support.xml       |   40 -
 .../components/Pipe/2025-v00.00/AfterT.xml    |  116 -
 .../Pipe/2025-v00.00/BeforeMagnet.xml         |   94 -
 .../Pipe/2025-v00.00/BeforeVelo-Support.xml   |  579 ----
 .../Pipe/2025-v00.00/BeforeVelo.xml           |   69 -
 .../Pipe/2025-v00.00/DebugDummies.xml         |   61 -
 .../Pipe/2025-v00.00/Downstream-Bakeout.xml   |   94 -
 .../2025-v00.00/Downstream-BakeoutParams.xml  |  107 -
 .../2025-v00.00/Downstream-Compensator.xml    |  228 --
 .../2025-v00.00/Downstream-PipeParams.xml     |  438 ---
 .../Pipe/2025-v00.00/Downstream-Support.xml   |  559 ----
 .../2025-v00.00/Downstream-SupportParams.xml  |  129 -
 .../Pipe/2025-v00.00/Downstream-UX853.xml     |  124 -
 .../Pipe/2025-v00.00/Downstream-UX854.xml     |  619 ----
 .../Pipe/2025-v00.00/Downstream.xml           |   46 -
 .../Pipe/2025-v00.00/InRich1-Params.xml       |   75 -
 .../components/Pipe/2025-v00.00/InRich1.xml   |  234 --
 compact/components/Pipe/2025-v00.00/InT.xml   |   77 -
 compact/components/Pipe/2025-v00.00/InUT.xml  |   79 -
 compact/components/Pipe/2025-v00.00/InVP.xml  |  383 ---
 .../Pipe/2025-v00.00/Magnet-Bellows.xml       |  187 --
 .../Pipe/2025-v00.00/Magnet-Compensator.xml   |  232 --
 .../Pipe/2025-v00.00/Magnet-PipeParams.xml    |  625 ----
 .../Pipe/2025-v00.00/Magnet-Support.xml       | 2769 -----------------
 .../Pipe/2025-v00.00/Magnet-SupportParams.xml |  814 -----
 .../Pipe/2025-v00.00/Magnet-UX851.xml         |  118 -
 .../Pipe/2025-v00.00/Magnet-UX852.xml         |  196 --
 .../Pipe/2025-v00.00/Magnet-UX853.xml         |  118 -
 .../components/Pipe/2025-v00.00/Magnet.xml    |   83 -
 .../Pipe/2025-v00.00/PipeAfterMagnet.xml      |   14 -
 .../Pipe/2025-v00.00/PipeAfterMuon.xml        |   17 -
 .../Pipe/2025-v00.00/PipeAfterT.xml           |   14 -
 .../2025-v00.00/PipeBeforeMagGeomParams.xml   |  208 --
 .../Pipe/2025-v00.00/PipeBeforeMagnet.xml     |   13 -
 .../Pipe/2025-v00.00/PipeBeforeVelo.xml       |   14 -
 .../Pipe/2025-v00.00/PipeCommon.xml           |   17 -
 .../Pipe/2025-v00.00/PipeDownstream.xml       |   21 -
 .../Pipe/2025-v00.00/PipeGeomParams.xml       |   83 -
 .../Pipe/2025-v00.00/PipeMagnet.xml           |   16 -
 compact/components/Pipe/2025-v00.00/PipeT.xml |   13 -
 .../components/Pipe/2025-v00.00/PipeUT.xml    |   14 -
 .../Pipe/2025-v00.00/PipeUpstream.xml         |   19 -
 .../components/Pipe/2025-v00.00/PipeVP.xml    |   13 -
 .../Pipe/2025-v00.00/Upstream-BPMSW.xml       |  192 --
 .../Pipe/2025-v00.00/Upstream-Params.xml      |  236 --
 .../Pipe/2025-v00.00/Upstream-UX84.xml        |   46 -
 .../Pipe/2025-v00.00/Upstream-VVSGF.xml       |   64 -
 .../Pipe/2025-v00.00/Upstream-Vax.xml         |  538 ----
 .../components/Pipe/2025-v00.00/Upstream.xml  |  181 --
 .../2025-v00.00/VMA/VMA-AA-Downstream.xml     |   39 -
 .../2025-v00.00/VMA/VMA-AA-DownstreamVax.xml  |   39 -
 .../Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml  |   39 -
 .../2025-v00.00/VMA/VMA-AA-UpstreamVax.xml    |   39 -
 .../Pipe/2025-v00.00/VMA/VMA-AA.xml           |   39 -
 .../Pipe/2025-v00.00/VMA/VMA-BJ.xml           |   40 -
 .../Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml  |   40 -
 .../Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml |   40 -
 .../Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml |   44 -
 .../Pipe/2025-v00.00/VMA/VMA-Params.xml       |   96 -
 .../components/Pipe/2025-v00.00/materials.xml |  280 --
 .../Pipe/2025-v00.00/parameters.xml           |   64 -
 .../components/SMOG2/2025-v00.00/SMOG2.xml    |   94 -
 compact/components/UT/2025-v00.00/Module.xml  |  311 --
 compact/components/UT/2025-v00.00/Sensor.xml  |  128 -
 compact/components/UT/2025-v00.00/Stave.xml   |  208 --
 compact/components/UT/2025-v00.00/UT.xml      |   16 -
 compact/components/UT/2025-v00.00/UTBox.xml   |  131 -
 compact/components/UT/2025-v00.00/UTHalf.xml  |   14 -
 .../components/UT/2025-v00.00/UTaULayer.xml   |   41 -
 .../components/UT/2025-v00.00/UTaXLayer.xml   |   41 -
 .../components/UT/2025-v00.00/UTbVLayer.xml   |   41 -
 .../components/UT/2025-v00.00/UTbXLayer.xml   |   42 -
 .../components/UT/2025-v00.00/conditions.xml  |   65 -
 .../components/UT/2025-v00.00/detector.xml    |   62 -
 .../components/UT/2025-v00.00/parameters.xml  |  729 -----
 82 files changed, 14991 deletions(-)
 delete mode 100644 compact/components/Pipe/2025-v00.00/AfterMagnet-Bakeout.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/AfterMagnet-Params.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon-BPMSW.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon-Params.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon-VVSGF.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon-Vax.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/AfterMuon.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/AfterT-Support.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/AfterT.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/BeforeMagnet.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/BeforeVelo-Support.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/BeforeVelo.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/DebugDummies.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Downstream-Bakeout.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Downstream-BakeoutParams.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Downstream-Compensator.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Downstream-PipeParams.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Downstream-Support.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Downstream-SupportParams.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Downstream-UX853.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Downstream-UX854.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Downstream.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/InRich1-Params.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/InRich1.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/InT.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/InUT.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/InVP.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Magnet-Bellows.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Magnet-Compensator.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Magnet-PipeParams.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Magnet-Support.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Magnet-SupportParams.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Magnet-UX851.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Magnet-UX852.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Magnet-UX853.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Magnet.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeAfterMagnet.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeAfterMuon.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeAfterT.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeBeforeMagGeomParams.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeBeforeMagnet.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeBeforeVelo.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeCommon.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeDownstream.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeGeomParams.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeMagnet.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeT.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeUT.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeUpstream.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/PipeVP.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Upstream-BPMSW.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Upstream-Params.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Upstream-UX84.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Upstream-VVSGF.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Upstream-Vax.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/Upstream.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Downstream.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA-DownstreamVax.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA-UpstreamVax.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-AA.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-BJ.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/VMA/VMA-Params.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/materials.xml
 delete mode 100644 compact/components/Pipe/2025-v00.00/parameters.xml
 delete mode 100644 compact/components/SMOG2/2025-v00.00/SMOG2.xml
 delete mode 100644 compact/components/UT/2025-v00.00/Module.xml
 delete mode 100644 compact/components/UT/2025-v00.00/Sensor.xml
 delete mode 100644 compact/components/UT/2025-v00.00/Stave.xml
 delete mode 100644 compact/components/UT/2025-v00.00/UT.xml
 delete mode 100644 compact/components/UT/2025-v00.00/UTBox.xml
 delete mode 100644 compact/components/UT/2025-v00.00/UTHalf.xml
 delete mode 100644 compact/components/UT/2025-v00.00/UTaULayer.xml
 delete mode 100644 compact/components/UT/2025-v00.00/UTaXLayer.xml
 delete mode 100644 compact/components/UT/2025-v00.00/UTbVLayer.xml
 delete mode 100644 compact/components/UT/2025-v00.00/UTbXLayer.xml
 delete mode 100644 compact/components/UT/2025-v00.00/conditions.xml
 delete mode 100644 compact/components/UT/2025-v00.00/detector.xml
 delete mode 100644 compact/components/UT/2025-v00.00/parameters.xml

diff --git a/compact/components/Pipe/2025-v00.00/AfterMagnet-Bakeout.xml b/compact/components/Pipe/2025-v00.00/AfterMagnet-Bakeout.xml
deleted file mode 100644
index 7009c85a5..000000000
--- a/compact/components/Pipe/2025-v00.00/AfterMagnet-Bakeout.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--========================================================================== -->
-<!--  LHCb Detector Description                                                -->
-<!--========================================================================== -->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--========================================================================== -->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--========================================================================== -->
-<lccdd>
-
-  <detectors>
-    <!--==================================================================================-->
-    <!--==================================Bakeout ========================================-->
-    <!--==================================================================================-->
-    <detector name="PipeAfterMagnetBakeout" type="DD4hep_VolumeAssembly" parent="${PipeAfterMagnetBakeout:parent}" vis="Pipe:Vis">
-      <envelope name="lvUX85BakeoutAfterMagnet" material="Pipe:BakeOutAerogel">
-        <shape type="ConeSegment" name="UX85-3-Bakeout-Rich2"
-              dz="UX853BakeoutRich2Lenght/2"
-              rmin1="UX853BakeoutRich2RadiusZmin"
-              rmin2="UX853BakeoutRich2RadiusZmax"
-              rmax1="UX853BakeoutRich2RadiusZmin + UX853BakeoutRich2Thick"
-              rmax2="UX853BakeoutRich2RadiusZmax + UX853BakeoutRich2Thick"/>
-
-      </envelope>
-      <position z="(UX853BakeoutRich2StartIP + 0.5*UX853BakeoutRich2Lenght) - Regions:AfterMagnetZPos"/>
-      <nodebug/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMagnet-Params.xml b/compact/components/Pipe/2025-v00.00/AfterMagnet-Params.xml
deleted file mode 100644
index adf1f8785..000000000
--- a/compact/components/Pipe/2025-v00.00/AfterMagnet-Params.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-
-  <!-- ****************************************************************** -->
-  <!-- *  BeamPipe in AfterMagnet geometry parameters                   * -->
-  <!-- *                                                                * -->
-  <!-- *  Date: 2006-03-16                                              * -->
-  <!-- *  Author: Gloria Corti                                          * -->
-  <!-- *                                                                * -->
-  <!-- *  This section of the beam pipe extend from z=7620mm to 11900mm * -->
-  <!-- *                                                                * -->
-  <!-- ****************************************************************** -->
-
-  <!-- ***************************************************************** -->
-  <!-- * UX85-3 AfterMagnet in T                                       * -->
-  <!-- ***************************************************************** -->
-  <!-- Start at beginning of at T, stops at end of T                     -->
-
-  <define>
-    <!-- UX85-3 Cone 10 mrad of Beryllium 1.6 mm thick - Split Magnet/T -->
-    <constant name="UX853Cone05BLenght"
-              value="UX853ZStartIP + UX853Flange01Cone02Lenght + UX853Cone0304Lenght +
-                     UX853Cone05Lenght - UX853MagnetTSplitZposIP"/>
-
-    <constant name="UX853Cone05BRadiusZmin"
-              value="UX853MagnetTSplitZposIP*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone05BRadiusZmax"
-              value="(UX853MagnetTSplitZposIP + UX853Cone05BLenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX853Cone05BThick"       value="1.60*mm"/>
-    <constant name="UX853Cone05BZpos"        value="0.5*UX853Cone05BLenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 1.7 mm thick -->
-    <constant name="UX853Cone06Lenght"       value="400.00*mm"/>
-    <constant name="UX853Cone06RadiusZmin"   value="UX853Cone05BRadiusZmax"/>
-    <constant name="UX853Cone06RadiusZmax"
-              value="(UX853MagnetTSplitZposIP + UX853Cone05BLenght + UX853Cone06Lenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX853Cone06Thick"        value="1.70*mm"/>
-    <constant name="UX853Cone06Zpos"
-              value="UX853Cone05BLenght + 0.5*UX853Cone06Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 1.9 mm thick - Split T/Rich2 -->
-    <constant name="UX853Cone07Lenght"       value="800.00*mm"/>
-
-    <constant name="UX853Cone07ALenght"
-              value="UX853TRich2SplitZposIP - UX853ZStartIP - UX853Flange01Cone02Lenght -
-                     UX853Cone0304Lenght - UX853Cone05Lenght - UX853Cone06Lenght"/>
-    <constant name="UX853Cone07ARadiusZmin"  value="UX853Cone06RadiusZmax"/>
-    <constant name="UX853Cone07ARadiusZmax"
-              value="(UX853MagnetTSplitZposIP + UX853Cone05BLenght + UX853Cone06Lenght +
-                     UX853Cone07ALenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone07AThick"       value="1.90*mm"/>
-    <constant name="UX853Cone07AZpos"
-              value="UX853Cone05BLenght + UX853Cone06Lenght + 0.5*UX853Cone07ALenght"/>
-
-    <!-- UX85-3 in T and Vacuum inside for whole of it -->
-    <constant name="UX853InTLenght"
-              value="UX853Cone05BLenght + UX853Cone06Lenght + UX853Cone07ALenght"/>
-
-    <!-- ***************************************************************** -->
-    <!-- * UX85-3 AfterMagnet after T                                    * -->
-    <!-- ***************************************************************** -->
-    <!-- Starts at end of T, ends with end of AfterMagnet                  -->
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 1.9 mm thick - Split T/Rich2 -->
-    <constant name="UX853Cone07BLenght"
-              value="UX853Cone07Lenght - UX853Cone07ALenght"/>
-    <constant name="UX853Cone07BRadiusZmin"  value="UX853Cone07ARadiusZmax"/>
-    <constant name="UX853Cone07BRadiusZmax"
-              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone07BThick"       value="1.90*mm"/>
-    <constant name="UX853Cone07BZpos"        value="0.5*UX853Cone07BLenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 2.0 mm thick -->
-    <constant name="UX853Cone08Lenght"       value="800.00*mm"/>
-    <constant name="UX853Cone08RadiusZmin"   value="UX853Cone07BRadiusZmax"/>
-    <constant name="UX853Cone08RadiusZmax"
-              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX853Cone08Thick"       value="2.00*mm"/>
-    <constant name="UX853Cone08Zpos"
-              value="UX853Cone07BLenght + 0.5*UX853Cone08Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 2.1 mm thick -->
-    <constant name="UX853Cone09Lenght"      value="400.00*mm"/>
-    <constant name="UX853Cone09RadiusZmin"  value="UX853Cone08RadiusZmax"/>
-    <constant name="UX853Cone09RadiusZmax"
-              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght +
-                     UX853Cone09Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone09Thick"       value="2.10*mm"/>
-    <constant name="UX853Cone09Zpos"
-              value="UX853Cone07BLenght + UX853Cone08Lenght + 0.5*UX853Cone09Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 2.3 mm thick -->
-    <constant name="UX853Cone10Lenght"      value="800.00*mm"/>
-    <constant name="UX853Cone10RadiusZmin"  value="UX853Cone09RadiusZmax"/>
-    <constant name="UX853Cone10RadiusZmax"
-              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght +
-                     UX853Cone09Lenght + UX853Cone10Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone10Thick"       value="2.30*mm"/>
-    <constant name="UX853Cone10Zpos"
-              value="UX853Cone07BLenght + UX853Cone08Lenght + UX853Cone09Lenght +
-                     0.5*UX853Cone10Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 2.4 mm thick -->
-    <constant name="UX853Cone11Lenght"
-              value="UX853Cone11Cone14Lenght + UX853Cone15Flange17Lenght -
-                     UX853ConeSupportFromEnd - UX853Cone12Lenght"/>
-    <constant name="UX853Cone11RadiusZmin"  value="UX853Cone10RadiusZmax"/>
-    <constant name="UX853Cone11RadiusZmax"
-              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght +
-                     UX853Cone09Lenght + UX853Cone10Lenght + UX853Cone11Lenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX853Cone11Thick"       value="2.40*mm"/>
-    <constant name="UX853Cone11Zpos"
-              value="UX853Cone07BLenght + UX853Cone08Lenght + UX853Cone09Lenght +
-                     UX853Cone10Lenght + 0.5*UX853Cone11Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium cylindrical part for support -->
-    <!-- Split Rich2/Downstream                                        -->
-    <constant name="UX853Cone12ALenght"
-              value="UX853Rich2DownSplitZposIP - UX853TRich2SplitZposIP -
-                     UX853Cone07BLenght - UX853Cone08Lenght - UX853Cone09Lenght -
-                     UX853Cone10Lenght - UX853Cone11Lenght"/>
-    <constant name="UX853Cone12ARadiusZmin"  value="UX853Cone11RadiusZmax"/>
-    <constant name="UX853Cone12ARadiusZmax"
-              value="(UX853TRich2SplitZposIP + UX853Cone07BLenght + UX853Cone08Lenght +
-                     UX853Cone09Lenght + UX853Cone10Lenght + UX853Cone11Lenght +
-                     UX853Cone12ALenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone12AOuterRadius" value="122.10*mm"/>
-    <constant name="UX853Cone12AZpos"
-              value="UX853Cone07BLenght + UX853Cone08Lenght + UX853Cone09Lenght +
-                     UX853Cone10Lenght + UX853Cone11Lenght + 0.5*UX853Cone12ALenght"/>
-
-    <!-- UX85-3 after T and Vacuum inside for whole of it -->
-    <constant name="UX853AfterTLenght"
-              value="UX853Cone07BLenght + UX853Cone08Lenght + UX853Cone09Lenght +
-                     UX853Cone10Lenght + UX853Cone11Lenght + UX853Cone12ALenght"/>
-
-    <!-- Bakeout equipment -->
-    <constant  name="UX853BakeoutRich2DeltaPipeInner"  value="2.40*mm + 0.10*mm"/>
-    <constant  name="UX853BakeoutRich2RadiusZmin"
-               value="UX853BakeoutRich2StartIP*tan(UX851to4Angle) +
-                      UX853BakeoutRich2DeltaPipeInner"/>
-    <constant  name="UX853BakeoutRich2RadiusZmax"
-               value="(UX853BakeoutRich2StartIP + UX853BakeoutRich2Lenght)*
-                      tan(UX851to4Angle) + UX853BakeoutRich2DeltaPipeInner"/>
-    <constant  name="UX853BakeoutRich2Thick"           value="10.00*mm"/>
-
-  </define>
-
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon-BPMSW.xml b/compact/components/Pipe/2025-v00.00/AfterMuon-BPMSW.xml
deleted file mode 100644
index 46dd36050..000000000
--- a/compact/components/Pipe/2025-v00.00/AfterMuon-BPMSW.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--==================================  BPMSW  ================================-->
-<!--===========================================================================-->
-<pipe>
-  <!-- 1/8th of middle section -->
-  <volume name="lvDownStrBPMSWMidSect" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="subtraction" name="DownStrBPMSWMidSectSub">
-      <shape type="Tube" name="DownStrBPMSWMidSectTubs"
-             dz="DownStr:BPMSWMidSectLength/2"
-             rmin="DownStr:BPMSWMidSectRadius"
-             rmax="DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick"
-             startPhiAngle="44.9*degree"
-             deltaPhiAngle="89.8*degree"/>
-      <shape type="Box" name="DownStrBPMSWMidSectTopCut"
-             dx="(DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick)/2"
-             dy="(DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick)/2"
-             dz="(DownStr:BPMSWMidSectLength+1.0*mm)/2"/>
-      <position y="DownStr:BPMSWMidSectTopCutOffset + DownStr:BPMSWMidSectRadius/2 + DownStr:BPMSWMidSectThick/2"/>
-      <shape type="Tube" name="DownStrBPMSWMidSectHoleTubs"
-             dz="(DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick)/2"
-             rmax="DownStr:BPMSWMidSectHoleRadius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="DownStr:BPMSWMidSectRadius + DownStr:BPMSWMidSectThick/2" z="-DownStr:BPMSWMidSectHolePosZ"/>
-      </transformation>
-      <shape type="Tube" name="DownStrBPMSWMidSectEdgeTubs"
-             dz="DownStr:BPMSWMidSectEdgeDepth"
-             rmax="DownStr:BPMSWMidSectEdgeRadius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="DownStr:BPMSWMidSectTopCutOffset" z="-DownStr:BPMSWMidSectHolePosZ"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <!-- Upstream Flange -->
-  <volume name="lvDownStrBPMSWFlangeUp" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="Tube" name="DownStrBPMSWFlangeUpTubs"
-           dz="DownStr:BPMSWFlangeUpLength/2"
-           rmin="DownStr:BPMSWFlangeUpRadius"
-           rmax="DownStr:BPMSWFlangeUpRadius + DownStr:BPMSWFlangeUpThick"/>
-  </volume>
-
-  <!-- Downstream Flange -->
-  <volume name="lvDownStrBPMSWFlangeDown" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="Tube" name="DownStrBPMSWFlangeDownTubs"
-           dz="DownStr:BPMSWFlangeDownLength/2"
-           rmin="DownStr:BPMSWFlangeDownRadius"
-           rmax="DownStr:BPMSWFlangeDownRadius + DownStr:BPMSWFlangeDownThick"/>
-  </volume>
-
-  <!-- Entry tube -->
-  <volume name="lvDownStrBPMSWEntry" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="Tube" name="DownStrBPMSWEntryTubs"
-           dz="DownStr:BPMSWEntryLength/2"
-           rmin="DownStr:BPMSWEntryRadius"
-           rmax="DownStr:BPMSWEntryRadius + DownStr:BPMSWEntryThick"/>
-  </volume>
-
-  <!-- Exit Tube -->
-  <volume name="lvDownStrBPMSWExit" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="Tube" name="DownStrBPMSWExitTubs"
-           dz="DownStr:BPMSWExitLength/2"
-           rmin="DownStr:BPMSWExitRadius"
-           rmax="DownStr:BPMSWExitRadius + DownStr:BPMSWExitThick"/>
-  </volume>
-
-  <!-- Plug -->
-  <volume name="lvDownStrBPMSWPlug" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="lvDownStrBPMSWPlugUnion">
-      <shape type="Tube" name="lvDownStrBPMSWPlugFlange"
-             dz="0.5*DownStr:BPMSWPlugFlangeLength"
-             rmax="DownStr:BPMSWPlugFlangeRadius"/>
-      <shape type="Tube" name="lvDownStrBPMSWPlugPin"
-             dz="0.5*DownStr:BPMSWPlugPinLength"
-             rmax="DownStr:BPMSWPlugPinRadius"/>
-    </shape>
-  </volume>
-
-  <!-- Vacuum -->
-  <volume name="lvDownStrBPMSWVacuum" material="Vacuum" vis="Pipe:Vacuum">
-    <shape type="Tube" name="DownStrBPMSWVacuumTubs"
-           dz="0.5*DownStr:BPMSWVacuumLength"
-           rmax="DownStr:BPMSWFlangeUpRadius - 0.01*mm"/>
-  </volume>
-
-  <!-- 1/8th of middle section with plug -->
-  <volume name="lvDownStrBPMSWMidSectAss" vis="Pipe:AfterMuon">
-    <physvol name="pvDownStrBPMSWMidSect"                logvol="lvDownStrBPMSWMidSect"/>
-    <physvol name="pvDownStrBPMSWPlug"                   logvol="lvDownStrBPMSWPlug">
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="DownStr:BPMSWMidSectTopCutOffset + DownStr:BPMSWPlugFlangeLength/2" z="-DownStr:BPMSWMidSectHolePosZ"/>
-      </transformation>
-    </physvol>
-  </volume>
-
-  <!-- Assembly of body -->
-  <volume name="lvDownStrBPMSWBody" vis="Pipe:AfterMuon">
-    <physvol name="pvDownStrBPMSWFlangeUp"              logvol="lvDownStrBPMSWFlangeUp"/>
-    <physvol name="pvDownStrBPMSWEntry"                 logvol="lvDownStrBPMSWEntry">
-      <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength/2"/>
-    </physvol>
-    <physvol name="pvDownStrBPMSWMidSect0A"             logvol="lvDownStrBPMSWMidSectAss">
-      <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength/2"/>
-    </physvol>
-    <physvol name="pvDownStrBPMSWMidSect1A"             logvol="lvDownStrBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation z="90.0*degree"/>
-        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrBPMSWMidSect2A"             logvol="lvDownStrBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation z="180.0*degree"/>
-        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrBPMSWMidSect3A"             logvol="lvDownStrBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation z="270.0*degree"/>
-        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrBPMSWMidSect0B"             logvol="lvDownStrBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree"/>
-        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength + DownStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrBPMSWMidSect1B"             logvol="lvDownStrBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree" z="90.0*degree"/>
-        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength + DownStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrBPMSWMidSect2B"             logvol="lvDownStrBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree" z="180.0*degree"/>
-        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength + DownStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrBPMSWMidSect3B"             logvol="lvDownStrBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree" z="270.0*degree"/>
-        <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength + DownStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrBPMSWExit"                  logvol="lvDownStrBPMSWExit">
-      <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength*2 + DownStr:BPMSWExitLength/2"/>
-    </physvol>
-    <physvol name="pvDownStrBPMSWFlangeDown"
-             logvol="lvDownStrBPMSWFlangeDown">
-      <position z="DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength*2 + DownStr:BPMSWExitLength + DownStr:BPMSWFlangeDownLength/2"/>
-    </physvol>
-  </volume>
-
-  <!-- DownStrBPMSW -->
-  <volume name="lvDownStrBPMSW" vis="Pipe:AfterMuon">
-    <physvol name="pvDownStrBPMSWBody"                 logvol="lvDownStrBPMSWBody"/>
-    <physvol name="pvDownStrBPMSWVacuum"               logvol="lvDownStrBPMSWVacuum">
-      <position z="-DownStr:BPMSWFlangeUpLength/2 + DownStr:BPMSWVacuumLength/2"/>
-    </physvol>
-  </volume>
-
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon-Params.xml b/compact/components/Pipe/2025-v00.00/AfterMuon-Params.xml
deleted file mode 100644
index c1375e79f..000000000
--- a/compact/components/Pipe/2025-v00.00/AfterMuon-Params.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-
-  <define>
-    <!--=====================================Pipe segment replacement of VVSSH (LHCb_Pipe_Section_Type_1)  -->
-    <constant name="DownStr:VVSSHPipeZ"                 value= "80.0*mm + 15.0*mm"/> <!-- 15mm to make pipe complete -->
-    <constant name="DownStr:VVSSHPipeRad"               value= "30.0*mm"/>
-    <constant name="DownStr:VVSSHPipeThick"             value= "1.5*mm"/>
-
-    <!--=====================================Parameters for pipe in MBXWS (LHCb_Pipe_Section_Type_1)  -->
-    <constant name="DownStr:MBXWSPipeLength"            value=  "1275.0*mm"/>
-    <constant name="DownStr:MBXWSPipeRadius"            value=  "26.0*mm"/>
-    <constant name="DownStr:MBXWSPipeThick"             value=  "2.0*mm"/>
-
-    <!--=====================================Parameters for VVSGF  -->
-    <constant name="DownStr:VVSGFBlockX"                value= "160.0*mm"/>
-    <constant name="DownStr:VVSGFBlockY"                value= "480.0*mm"/>
-    <constant name="DownStr:VVSGFBlockZ"                value= "55.0*mm"/>
-    <constant name="DownStr:VVSGFHoleY"                 value= "0.0*mm"/>
-    <constant name="DownStr:VVSGFFlangeZ"               value= "10.0*mm - 0.01*mm"/>
-    <constant name="DownStr:VVSGFBlockRad"              value= "31.5*mm"/>
-    <constant name="DownStr:VVSGFFlangeThick"           value= "100.0*mm - DownStr:VVSGFBlockRad"/>
-
-    <!--=====================================Parameters for BPMSWDownStr -->
-    <constant name="DownStr:BPMSWMidSectLength"         value=  "90.0*mm"/>
-    <constant name="DownStr:BPMSWMidSectRadius"         value=  "34.5*mm"/>
-    <constant name="DownStr:BPMSWMidSectThick"          value=  "56.5*mm - DownStr:BPMSWMidSectRadius"/>
-    <constant name="DownStr:BPMSWMidSectTopCutOffset"   value=  "47.9*mm"/>
-    <constant name="DownStr:BPMSWMidSectHoleRadius"     value=  "8.5*mm"/>
-    <constant name="DownStr:BPMSWMidSectHolePosZ"       value=  "15.0*mm"/>
-    <constant name="DownStr:BPMSWMidSectEdgeDepth"      value=  "4.0*mm"/>
-    <constant name="DownStr:BPMSWMidSectEdgeRadius"     value=  "28.0*mm"/>
-
-    <constant name="DownStr:BPMSWFlangeUpLength"        value=  "17.4*mm"/>
-    <constant name="DownStr:BPMSWFlangeUpRadius"        value=  "30.0*mm"/>
-    <constant name="DownStr:BPMSWFlangeUpThick"         value=  "57.0*mm - DownStr:BPMSWFlangeUpRadius"/>
-
-    <constant name="DownStr:BPMSWFlangeDownLength"      value=  "19.7*mm"/>
-    <constant name="DownStr:BPMSWFlangeDownRadius"      value=  "DownStr:BPMSWFlangeUpRadius"/>
-    <constant name="DownStr:BPMSWFlangeDownThick"       value=  "76.0*mm - DownStr:BPMSWFlangeDownRadius"/>
-
-    <constant name="DownStr:BPMSWEntryLength"           value=  "33.3*mm"/>
-    <constant name="DownStr:BPMSWEntryRadius"           value=  "DownStr:BPMSWFlangeUpRadius"/>
-    <constant name="DownStr:BPMSWEntryThick"            value=  "4.5*mm"/>
-
-    <constant name="DownStr:BPMSWExitLength"            value=  "34.6*mm"/>
-    <constant name="DownStr:BPMSWExitRadius"            value=  "DownStr:BPMSWFlangeUpRadius"/>
-    <constant name="DownStr:BPMSWExitThick"             value=  "51.5*mm - DownStr:BPMSWExitRadius"/>
-
-    <constant name="DownStr:BPMSWPlugFlangeLength"      value=  "11.0*mm"/>
-    <constant name="DownStr:BPMSWPlugFlangeRadius"      value=  "26.0*mm"/>
-    <constant name="DownStr:BPMSWPlugPinLength"         value=  "13.4*mm*2 + DownStr:BPMSWPlugFlangeLength"/>
-    <constant name="DownStr:BPMSWPlugPinRadius"         value=  "7.5*mm"/>
-
-    <constant name="DownStr:BPMSWVacuumLength"          value=  "DownStr:BPMSWFlangeUpLength + DownStr:BPMSWEntryLength + DownStr:BPMSWMidSectLength*2 + DownStr:BPMSWExitLength + DownStr:BPMSWFlangeDownLength"/>
-
-    <!--=====================================VaxDown  -->
-    <!-- Main -->
-    <constant name="DownStr:VaxMainBodyLength"               value="126.0*mm - 0.02*mm"/>
-    <constant name="DownStr:VaxMainBodyRadius"               value="100.0*mm"/>
-    <constant name="DownStr:VaxMainBodyThick"                value="2.0*mm"/>
-    <constant name="DownStr:VaxMainBodyHole1Radius"          value="50.0*mm"/>
-    <constant name="DownStr:VaxMainBodyHole2Radius"          value="50.0*mm"/>
-    <constant name="DownStr:VaxMainBodyHole3Radius"          value="30.25*mm"/>
-    <constant name="DownStr:VaxMainBodyHole4Radius"          value="19.6*mm"/>
-    <constant name="DownStr:VaxMainBodyHole5Radius"          value="8.5*mm"/>
-    <constant name="DownStr:VaxMainBodyHole4Offset"          value="30.0*mm"/>
-    <constant name="DownStr:VaxMainBodyHole5Offset"          value="45.0*mm"/>
-
-
-    <!-- Entry Window -->
-    <constant name="DownStr:VaxWindowTubsLenght"             value="4.0*mm"/>
-    <constant name="DownStr:VaxWindowFlangeRadius"           value="50.0*mm"/>
-    <constant name="DownStr:VaxWindowFlangeLength"           value="10.0*mm"/>
-    <constant name="DownStr:VaxWindowInnerRadius"            value="37.5*mm"/>
-    <constant name="DownStr:VaxWindowThick"                  value="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick - DownStr:VaxWindowFlangeRadius"/>
-    <constant name="DownStr:VaxWindowConeLength"             value="21.0*mm"/>
-    <constant name="DownStr:VaxWindowConeEndThick"           value="DownStr:VaxMainBodyRadius - DownStr:VaxWindowConeLength - DownStr:VaxWindowInnerRadius"/>
-    <constant name="DownStr:VaxWindowConeFlangeLength"       value="DownStr:VaxWindowFlangeLength - DownStr:VaxWindowTubsLenght"/>
-    <constant name="DownStr:VaxWindowConeEndLength"          value="5.0*mm"/>
-    <constant name="DownStr:VaxWindowConeEndRad"             value="59.0*mm"/>
-
-
-    <!-- End Pipe -->
-    <constant name="DownStr:VaxEndPipeLength"                value="64.0*mm"/>
-    <constant name="DownStr:VaxEndPipeRadius"                value="32.5*mm"/>
-    <constant name="DownStr:VaxEndPipeThick"                 value="2.0*mm"/>
-    <constant name="DownStr:VaxEndPipeFlangeLength"          value="17.5*mm"/>
-    <constant name="DownStr:VaxEndPipeFlangeRadius"          value="DownStr:VaxEndPipeRadius + DownStr:VaxEndPipeThick + 0.01*mm"/>
-    <constant name="DownStr:VaxEndPipeFlangeThick"           value="63.5*mm - DownStr:VaxEndPipeFlangeRadius"/>
-
-
-    <!-- End Cap -->
-    <constant name="DownStr:VaxEndCapTubsLenght"             value="DownStr:VaxWindowTubsLenght"/>
-    <constant name="DownStr:VaxEndCapInnerRadius"            value="DownStr:VaxEndPipeRadius + DownStr:VaxEndPipeThick + 0.01*mm"/>
-    <constant name="DownStr:VaxEndCapThick"                  value="DownStr:VaxMainBodyRadius - DownStr:VaxEndCapTubsLenght - DownStr:VaxEndCapInnerRadius"/>
-
-
-    <!-- RF screen -->
-    <constant name="DownStr:VaxRfScreenFlangeLength"         value="8.0*mm"/>
-    <constant name="DownStr:VaxRfScreenFlangeRadius"         value="31.5*mm"/>
-    <constant name="DownStr:VaxRfScreenFlangeThick"          value="49.0*mm - DownStr:VaxRfScreenFlangeRadius"/>
-    <constant name="DownStr:VaxRfScreenEntryLength"          value="101.0*mm"/>
-    <constant name="DownStr:VaxRfScreenEntryRadius"          value="DownStr:VaxRfScreenFlangeRadius"/>
-    <constant name="DownStr:VaxRfScreenEntryThick"           value="2.5*mm"/>
-    <constant name="DownStr:VaxRfScreenConsLength"           value="10.0*mm"/>
-    <constant name="DownStr:VaxRfScreenExitLength"           value="63.5*mm"/>
-    <constant name="DownStr:VaxRfScreenExitRadius"           value="29.0*mm"/>
-    <constant name="DownStr:VaxRfScreenExitThick"            value="2.0*mm"/>
-
-
-    <!-- Vacuum -->
-    <constant name="DownStr:VaxVacuumLength"                 value="190.0*mm"/>
-    <constant name="DownStr:VaxVacuumRadius"                 value="DownStr:VaxRfScreenExitRadius - 0.01*mm"/>
-
-
-    <!-- Pipe 1 -->
-    <constant name="DownStr:VaxPipe1Length"                  value="204.0*mm"/>
-    <constant name="DownStr:VaxPipe1Radius"                  value="DownStr:VaxMainBodyHole1Radius"/>
-    <constant name="DownStr:VaxPipe1Thick"                   value="1.5*mm"/>
-    <constant name="DownStr:VaxPipe1HoleRadius"              value="19.6*mm"/>
-    <constant name="DownStr:VaxPipe1HoleOffset"              value="160.0*mm"/>
-
-
-    <!-- Pipe 2 -->
-    <constant name="DownStr:VaxPipe2Length"                  value="330.0*mm"/>
-    <constant name="DownStr:VaxPipe2Radius"                  value="DownStr:VaxMainBodyHole2Radius"/>
-    <constant name="DownStr:VaxPipe2Thick"                   value="1.5*mm"/>
-    <constant name="DownStr:VaxPipe2FlangeLength"            value="19.8*mm"/>
-    <constant name="DownStr:VaxPipe2FlangeRadius"            value="DownStr:VaxPipe2Radius + DownStr:VaxPipe2Thick + 0.01*mm"/>
-    <constant name="DownStr:VaxPipe2FlangeThick"             value="75.5*mm - DownStr:VaxPipe2FlangeRadius"/>
-    <constant name="DownStr:VaxPipe2BeltLength"              value="5.0*mm"/>
-    <constant name="DownStr:VaxPipe2BeltPos"                 value="122.0*mm"/>
-
-    <!-- Pipe 3 -->
-    <constant name="DownStr:VaxPipe3EntryLength"             value="220.0*mm"/>
-    <constant name="DownStr:VaxPipe3ExitLength"              value="120.0*mm"/>
-    <constant name="DownStr:VaxPipe3CutLength"               value="50.0*mm"/>
-    <constant name="DownStr:VaxPipe3Radius"                  value="DownStr:VaxMainBodyHole3Radius"/>
-    <constant name="DownStr:VaxPipe3Thick"                   value="1.5*mm"/>
-    <constant name="DownStr:VaxPipe3FlangeLength"            value="17.0*mm"/>
-    <constant name="DownStr:VaxPipe3FlangeRadius"            value="DownStr:VaxPipe3Radius + DownStr:VaxPipe3Thick + 0.01*mm"/>
-    <constant name="DownStr:VaxPipe3FlangeThick"             value="57.0*mm - DownStr:VaxPipe3FlangeRadius"/>
-
-    <!-- Pipe 4 -->
-    <constant name="DownStr:VaxPipe4Length"                  value="158.5*mm"/>
-    <constant name="DownStr:VaxPipe4Radius"                  value="DownStr:VaxMainBodyHole4Radius"/>
-    <constant name="DownStr:VaxPipe4Thick"                   value="1.6*mm"/>
-    <constant name="DownStr:VaxPipe4FlangeLength"            value="13.0*mm"/>
-    <constant name="DownStr:VaxPipe4FlangeRadius"            value="DownStr:VaxPipe4Radius + DownStr:VaxPipe4Thick + 0.01*mm"/>
-    <constant name="DownStr:VaxPipe4FlangeThick"             value="35.0*mm - DownStr:VaxPipe4FlangeRadius"/>
-
-    <!-- Pipe 5 -->
-    <constant name="DownStr:VaxPipe5Length"                  value="138.5*mm"/>
-    <constant name="DownStr:VaxPipe5Radius"                  value="DownStr:VaxMainBodyHole5Radius"/>
-    <constant name="DownStr:VaxPipe5Thick"                   value="1.0*mm"/>
-    <constant name="DownStr:VaxPipe5FlangeLength"            value="7.0*mm"/>
-    <constant name="DownStr:VaxPipe5FlangeRadius"            value="DownStr:VaxPipe5Radius + DownStr:VaxPipe5Thick + 0.01*mm"/>
-    <constant name="DownStr:VaxPipe5FlangeThick"             value="17.0*mm - DownStr:VaxPipe5FlangeRadius"/>
-
-    <!-- Pipe 6 -->
-    <constant name="DownStr:VaxPipe6Length"                  value="110.0*mm"/>
-    <constant name="DownStr:VaxPipe6Radius"                  value="DownStr:VaxPipe1HoleRadius"/>
-    <constant name="DownStr:VaxPipe6Thick"                   value="1.6*mm"/>
-    <constant name="DownStr:VaxPipe6FlangeLength"            value="13.0*mm"/>
-    <constant name="DownStr:VaxPipe6FlangeRadius"            value="DownStr:VaxPipe6Radius + DownStr:VaxPipe6Thick + 0.01*mm"/>
-    <constant name="DownStr:VaxPipe6FlangeThick"             value="35.0*mm - DownStr:VaxPipe6FlangeRadius"/>
-
-    <!-- Pipe 7 -->
-    <constant name="DownStr:VaxPipe7EntryLength"             value="115.0*mm"/>
-    <constant name="DownStr:VaxPipe7ExitLength"              value="110.0*mm"/>
-    <constant name="DownStr:VaxPipe7CutLength"               value="50.0*mm"/>
-    <constant name="DownStr:VaxPipe7Radius"                  value="30.25*mm"/>
-    <constant name="DownStr:VaxPipe7Thick"                   value="1.5*mm"/>
-    <constant name="DownStr:VaxPipe7LidLength"               value="4.0*mm"/>
-    <constant name="DownStr:VaxPipe7LidThick"                value="DownStr:VaxPipe3Radius + DownStr:VaxPipe3Thick - DownStr:VaxPipe7Radius"/>
-    <constant name="DownStr:VaxPipe7FlangeLength"            value="17.0*mm"/>
-    <constant name="DownStr:VaxPipe7FlangeRadius"            value="DownStr:VaxPipe7Radius + DownStr:VaxPipe7Thick + 0.01*mm"/>
-    <constant name="DownStr:VaxPipe7FlangeThick"             value="57.0*mm - DownStr:VaxPipe7FlangeRadius"/>
-  </define>
-
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon-VVSGF.xml b/compact/components/Pipe/2025-v00.00/AfterMuon-VVSGF.xml
deleted file mode 100644
index 48cf5f4c9..000000000
--- a/compact/components/Pipe/2025-v00.00/AfterMuon-VVSGF.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--================================== VVSGF ==================================-->
-<!--===========================================================================-->
-<pipe>
-
-  <!-- Main body -->
-  <volume name="lvVVSGFBlock" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="subtraction" name="VVSGFBlockSub">
-      <shape type="Box" name="VVSGFBlockBox"
-             dx="0.5*DownStr:VVSGFBlockX"
-             dy="0.5*DownStr:VVSGFBlockY"
-             dz="0.5*DownStr:VVSGFBlockZ"/>
-      <shape type="Box" name="VVSGFBlockBoxAir"
-             dx="0.5*(DownStr:VVSGFBlockX - 20.0*mm)"
-             dy="0.5*(DownStr:VVSGFBlockY - 20.0*mm)"
-             dz="0.5*(DownStr:VVSGFBlockZ - 20.0*mm)"/>
-      <shape type="Tube" name="VVSGFBlockHole"
-             dz="0.5*(DownStr:VVSGFBlockZ + 1.0*mm)"
-             rmax="DownStr:VVSGFBlockRad"/>
-      <position y="DownStr:VVSGFHoleY"/>
-    </shape>
-  </volume>
-
-  <!-- Flange -->
-  <volume name="lvVVSGFFlange" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="Tube" name="VVSGFFlangeTubs"
-           dz="0.5*DownStr:VVSGFFlangeZ"
-           rmin="DownStr:VVSGFBlockRad"
-           rmax="DownStr:VVSGFBlockRad + DownStr:VVSGFFlangeThick"/>
-  </volume>
-
-  <!-- Vacuum -->
-  <volume name="lvVVSGFVacuum" material="Vacuum" vis="Pipe:Vacuum">
-    <shape type="Tube" name="VVSGFVacuumTubs"
-           dz="0.5*(DownStr:VVSGFFlangeZ*2 + DownStr:VVSGFBlockZ)"
-           rmax="DownStr:VVSGFBlockRad - 0.01*mm"/>
-  </volume>
-
-  <!-- VVSGF -->
-  <volume name="lvVVSGF" vis="Pipe:AfterMuon">
-    <physvol name="pvVVSGFVacuum"                 logvol="lvVVSGFVacuum"/>
-    <physvol name="pvVVSGFBlock"                  logvol="lvVVSGFBlock">
-      <position y="-DownStr:VVSGFHoleY"/>
-    </physvol>
-    <physvol name="pvVVSGFFlangeUp"               logvol="lvVVSGFFlange">
-      <position z="-DownStr:VVSGFBlockZ/2 - DownStr:VVSGFFlangeZ/2 - 0.01*mm"/>
-    </physvol>
-    <physvol name="pvVVSGFFlangeDown"             logvol="lvVVSGFFlange">
-      <position z="DownStr:VVSGFBlockZ/2 + DownStr:VVSGFFlangeZ/2 + 0.01*mm"/>
-    </physvol>
-  </volume>
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon-Vax.xml b/compact/components/Pipe/2025-v00.00/AfterMuon-Vax.xml
deleted file mode 100644
index 029d09ea8..000000000
--- a/compact/components/Pipe/2025-v00.00/AfterMuon-Vax.xml
+++ /dev/null
@@ -1,522 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--================================== VaxDownStrPipe =========================-->
-<!--===========================================================================-->
-<pipe>
-  <!-- Entry window -->
-
-  <volume name="lvDownStrVaxWindow" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="VaxDownStrWindowUnion">
-      <shape type="Tube" name="VaxDownStrWindowTubs"
-             dz="DownStr:VaxWindowTubsLenght/2"
-             rmin="DownStr:VaxWindowFlangeRadius"
-             rmax="DownStr:VaxWindowFlangeRadius + DownStr:VaxWindowThick"/>
-      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrWindowSub">
-        <shape type="ConeSegment" name="VaxDownStrWindowCons"
-              dz="DownStr:VaxWindowConeLength/2"
-              rmax1="DownStr:VaxMainBodyRadius - 0.01*mm"
-              rmax2="DownStr:VaxWindowInnerRadius + DownStr:VaxWindowConeEndThick"/>
-        <shape type="Tube" name="VaxDownStrWindowSubTubs1"
-               dz="0.5*(DownStr:VaxWindowConeLength + 1.0*mm)"
-               rmax="DownStr:VaxWindowInnerRadius"/>
-        <shape type="Tube" name="VaxDownStrWindowSubTubs2"
-               dz="DownStr:VaxWindowConeFlangeLength"
-               rmax="DownStr:VaxWindowFlangeRadius"/>
-        <position z="-DownStr:VaxWindowConeLength/2"/>
-        <shape type="Tube" name="VaxDownStrWindowSubTubs3"
-               dz="DownStr:VaxWindowConeEndLength"
-               rmax="DownStr:VaxWindowConeEndRad"/>
-        <position z="DownStr:VaxWindowConeLength/2"/>
-      </shape>
-      <position z="DownStr:VaxWindowTubsLenght/2 + DownStr:VaxWindowConeLength/2 + 0.01*mm"/>
-    </shape>
-  </volume>
-
-
-  <!-- Endcap -->
-  <volume name="lvDownStrVaxEndCap" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="lvDownStrVaxEndCapUnion">
-      <shape type="Tube" name="VaxDownStrEndCapTubs"
-             dz="0.5*DownStr:VaxEndCapTubsLenght"
-             rmin="DownStr:VaxEndCapInnerRadius + 0.01*mm"
-             rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick"/>
-      <shape type="ConeSegment" name="VaxDownStrEndCapCons"
-            dz="0.5*DownStr:VaxEndCapTubsLenght"
-            rmax1="DownStr:VaxEndCapInnerRadius + DownStr:VaxEndCapThick"
-            rmax2="DownStr:VaxMainBodyRadius - 0.01*mm"
-            rmin1="DownStr:VaxEndCapInnerRadius + 0.01*mm"
-            rmin2="DownStr:VaxEndCapInnerRadius + 0.01*mm"/>
-      <position z="-DownStr:VaxEndCapTubsLenght/2 - DownStr:VaxEndCapTubsLenght/2 - 0.01*mm"/>
-    </shape>
-  </volume>
-
-
-  <!-- Main Body -->
-  <volume name="lvDownStrVaxMainBody" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="subtraction" name="VaxDownStrMainBodySub">
-      <shape type="Tube" name="VaxDownStrMainBodyTubs"
-             dz="0.5*DownStr:VaxMainBodyLength"
-             rmin="DownStr:VaxMainBodyRadius"
-             rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick"/>
-      <shape type="Tube" name="VaxDownStrMainBodyHole1"
-             dz="0.5*DownStr:VaxMainBodyRadius"
-             rmax="DownStr:VaxMainBodyHole1Radius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="DownStr:VaxMainBodyRadius"/>
-      </transformation>
-      <shape type="Tube" name="VaxDownStrMainBodyHole2"
-             dz="0.5*DownStr:VaxMainBodyRadius"
-             rmax="DownStr:VaxMainBodyHole2Radius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-DownStr:VaxMainBodyRadius"/>
-      </transformation>
-      <shape type="Tube" name="VaxDownStrMainBodyHole3"
-             dz="0.5*DownStr:VaxMainBodyRadius"
-             rmax="DownStr:VaxMainBodyHole3Radius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="DownStr:VaxMainBodyRadius"/>
-      </transformation>
-      <shape type="Tube" name="VaxDownStrMainBodyHole4"
-             dz="0.5*DownStr:VaxMainBodyRadius"
-             rmax="DownStr:VaxMainBodyHole4Radius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="-DownStr:VaxMainBodyRadius" z="-DownStr:VaxMainBodyHole4Offset"/>
-      </transformation>
-      <shape type="Tube" name="VaxDownStrMainBodyHole5"
-             dz="0.5*DownStr:VaxMainBodyRadius"
-             rmax="DownStr:VaxMainBodyHole5Radius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="-DownStr:VaxMainBodyRadius" z="DownStr:VaxMainBodyHole5Offset"/>
-      </transformation>
-    </shape>
-  </volume>
-
-
-  <!-- End pipe -->
-  <volume name="lvDownStrVaxEndPipe" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="VaxDownStrEndPipeUnion">
-      <shape type="Tube" name="VaxDownStrEndPipeTubs"
-             dz="0.5*DownStr:VaxEndPipeLength"
-             rmin="DownStr:VaxEndPipeRadius"
-             rmax="DownStr:VaxEndPipeRadius + DownStr:VaxEndPipeThick"/>
-      <shape type="Tube" name="VaxDownStrEndPipeFlangeTubs"
-             dz="0.5*DownStr:VaxEndPipeFlangeLength"
-             rmin="DownStr:VaxEndPipeFlangeRadius"
-             rmax="DownStr:VaxEndPipeFlangeRadius + DownStr:VaxEndPipeFlangeThick"/>
-      <position z="DownStr:VaxEndPipeLength/2 - DownStr:VaxEndPipeFlangeLength/2"/>
-    </shape>
-  </volume>
-
-
-  <!-- RF Screen -->
-  <volume name="lvDownStrVaxRfScreen" material="Pipe:CuOFE" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="VaxDownStrRfScreenUnion">
-      <shape type="Tube" name="VaxDownStrRfScreenFlangeTubs"
-             dz="0.5*DownStr:VaxRfScreenFlangeLength"
-             rmin="DownStr:VaxRfScreenFlangeRadius"
-             rmax="DownStr:VaxRfScreenFlangeRadius + DownStr:VaxRfScreenFlangeThick"/>
-      <shape type="Tube" name="VaxDownStrRfScreenEntryTubs"
-             dz="0.5*DownStr:VaxRfScreenEntryLength"
-             rmin="DownStr:VaxRfScreenEntryRadius"
-             rmax="DownStr:VaxRfScreenEntryRadius + DownStr:VaxRfScreenEntryThick"/>
-      <position z="DownStr:VaxRfScreenFlangeLength/2 + DownStr:VaxRfScreenEntryLength/2 + 0.01*mm"/>
-      <shape type="ConeSegment" name="VaxDownStrRfScreenCons"
-            dz="0.5*DownStr:VaxRfScreenConsLength"
-            rmin1="DownStr:VaxRfScreenEntryRadius"
-            rmin2="DownStr:VaxRfScreenExitRadius"
-            rmax1="DownStr:VaxRfScreenEntryRadius + DownStr:VaxRfScreenEntryThick"
-            rmax2="DownStr:VaxRfScreenExitRadius + DownStr:VaxRfScreenExitThick"/>
-      <position z="DownStr:VaxRfScreenFlangeLength/2 + DownStr:VaxRfScreenEntryLength + DownStr:VaxRfScreenConsLength/2 + 0.02*mm"/>
-      <shape type="Tube" name="VaxDownStrRfScreenExitTubs"
-             dz="0.5*DownStr:VaxRfScreenExitLength"
-             rmin="DownStr:VaxRfScreenExitRadius"
-             rmax="DownStr:VaxRfScreenExitRadius + DownStr:VaxRfScreenExitThick"/>
-      <position z="DownStr:VaxRfScreenFlangeLength/2 + DownStr:VaxRfScreenEntryLength + DownStr:VaxRfScreenConsLength + DownStr:VaxRfScreenExitLength/2 + 0.03*mm"/>
-    </shape>
-  </volume>
-
-
-  <!-- Vacuum -->
-  <volume name="lvDownStrVaxVacuum" material="Vacuum" vis="Pipe:Vacuum">
-    <shape type="Tube" name="VaxDownStrVacuumTubs"
-           dz="0.5*DownStr:VaxVacuumLength"
-           rmax="DownStr:VaxVacuumRadius"/>
-  </volume>
-
-
-  <!-- Pipe1, top pipe -->
-  <volume name="lvDownStrVaxPipe1" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe1Sub">
-      <shape type="Tube" name="VaxDownStrPipe1Tubs"
-             dz="0.5*DownStr:VaxPipe1Length"
-             rmin="DownStr:VaxPipe1Radius"
-             rmax="DownStr:VaxPipe1Radius + DownStr:VaxPipe1Thick"/>
-      <shape type="Tube" name="VaxDownStrPipe1SubTubs"
-             dz="0.5*DownStr:VaxMainBodyLength"
-             rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position z="-DownStr:VaxPipe1Length/2"/>
-      </transformation>
-      <shape type="Tube" name="VaxDownStrPipe1Hole1"
-             dz="0.5*DownStr:VaxPipe1Radius"
-             rmax="DownStr:VaxPipe1HoleRadius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="DownStr:VaxPipe1Radius" z="-DownStr:VaxPipe1Length/2 + DownStr:VaxPipe1HoleOffset"/>
-      </transformation>
-      <shape type="Tube" name="VaxDownStrPipe1Hole2"
-             dz="0.5*DownStr:VaxPipe1Radius"
-             rmax="DownStr:VaxPipe1HoleRadius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="-DownStr:VaxPipe1Radius" z="-DownStr:VaxPipe1Length/2 + DownStr:VaxPipe1HoleOffset"/>
-      </transformation>
-      <shape type="Tube" name="VaxDownStrPipe1Hole3"
-             dz="0.5*DownStr:VaxPipe1Radius"
-             rmax="DownStr:VaxPipe1HoleRadius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="DownStr:VaxPipe1Radius" z="-DownStr:VaxPipe1Length/2 + DownStr:VaxPipe1HoleOffset"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <!-- Pipe2 -->
-  <volume name="lvDownStrVaxPipe2" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe2Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe2Sub">
-        <shape type="Tube" name="DownStr:VaxPipe2Tubs"
-               dz="0.5*DownStr:VaxPipe2Length"
-               rmin="DownStr:VaxPipe2Radius"
-               rmax="DownStr:VaxPipe2Radius + DownStr:VaxPipe2Thick"/>
-        <shape type="Tube" name="DownStr:VaxPipe2SubTubs"
-               dz="0.5*DownStr:VaxMainBodyLength"
-               rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation x="90.0*degree"/>
-          <position z="-DownStr:VaxPipe2Length/2"/>
-        </transformation>
-      </shape>
-      <shape type="Tube" name="VaxDownStrPipe2FlangeTubs"
-             dz="0.5*DownStr:VaxPipe2FlangeLength"
-             rmin="DownStr:VaxPipe2FlangeRadius"
-             rmax="DownStr:VaxPipe2FlangeRadius + DownStr:VaxPipe2FlangeThick"/>
-      <position z="DownStr:VaxPipe2Length/2 - DownStr:VaxPipe2FlangeLength/2"/>
-      <shape type="Tube" name="VaxDownStrPipe2BeltTubs"
-             dz="0.5*DownStr:VaxPipe2BeltLength"
-             rmin="DownStr:VaxPipe2FlangeRadius"
-             rmax="DownStr:VaxPipe2FlangeRadius + DownStr:VaxPipe2FlangeThick"/>
-      <position z="-DownStr:VaxPipe2Length/2 + DownStr:VaxPipe2BeltPos - DownStr:VaxPipe2BeltLength/2"/>
-    </shape>
-  </volume>
-
-  <!-- Pipe3 -->
-  <volume name="lvDownStrVaxPipe3" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe3Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe3Sub">
-        <shape type="Tube" name="VaxDownStrPipe3Tubs"
-               dz="0.5*DownStr:VaxPipe3EntryLength + DownStr:VaxPipe3CutLength"
-               rmin="DownStr:VaxPipe3Radius"
-               rmax="DownStr:VaxPipe3Radius + DownStr:VaxPipe3Thick"/>
-        <shape type="Tube" name="DownStr:VaxPipe3SubTubs"
-               dz="0.5*DownStr:VaxMainBodyLength"
-               rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation y="90.0*degree"/>
-          <position z="-DownStr:VaxPipe3EntryLength/2 - DownStr:VaxPipe3CutLength/2"/>
-        </transformation>
-        <shape type="Box" name="VaxDownStrPipe3SubBox"
-               dx="0.5*150.0*mm"
-               dy="0.5*150.0*mm"
-               dz="0.5*2*DownStr:VaxPipe3CutLength"/>
-        <transformation>
-          <position z="DownStr:VaxPipe3CutLength"/>
-          <rotation/>
-          <position/>
-          <rotation x="45.0*degree"/>
-          <position z="DownStr:VaxPipe3EntryLength/2 - DownStr:VaxPipe3CutLength/2"/>
-        </transformation>
-      </shape>
-      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe3Sub2">
-        <shape type="Tube" name="VaxDownStrPipe3Tubs2"
-               dz="0.5*DownStr:VaxPipe3ExitLength + DownStr:VaxPipe3CutLength"
-               rmin="DownStr:VaxPipe3Radius"
-               rmax="DownStr:VaxPipe3Radius + DownStr:VaxPipe3Thick"/>
-        <shape type="Box" name="VaxDownStrPipe3SubBox2"
-               dx="0.5*150.0*mm"
-               dy="0.5*150.0*mm"
-               dz="0.5*2*DownStr:VaxPipe3CutLength"/>
-        <transformation>
-          <position z="-DownStr:VaxPipe3CutLength"/>
-          <rotation/>
-          <position/>
-          <rotation x="-45.0*degree"/>
-          <position z="-DownStr:VaxPipe3ExitLength/2 + DownStr:VaxPipe3CutLength/2"/>
-        </transformation>
-      </shape>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-DownStr:VaxPipe3ExitLength/2 + DownStr:VaxPipe3CutLength/2" z="DownStr:VaxPipe3EntryLength/2 - DownStr:VaxPipe3CutLength/2 + 0.01*mm"/>
-      </transformation>
-      <shape type="Tube" name="VaxDownStrPipe3FlangeTubs"
-             dz="0.5*DownStr:VaxPipe3FlangeLength"
-             rmin="DownStr:VaxPipe3FlangeRadius"
-             rmax="DownStr:VaxPipe3FlangeRadius + DownStr:VaxPipe3FlangeThick"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-DownStr:VaxPipe3ExitLength + DownStr:VaxPipe3FlangeLength/2" z="DownStr:VaxPipe3EntryLength/2 - DownStr:VaxPipe3CutLength/2 + 0.01*mm"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <!-- Pipe4 -->
-  <volume name="lvDownStrVaxPipe4" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe4Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe4Sub">
-        <shape type="Tube" name="VaxDownStrPipe4Tubs"
-               dz="0.5*DownStr:VaxPipe4Length"
-               rmin="DownStr:VaxPipe4Radius"
-               rmax="DownStr:VaxPipe4Radius + DownStr:VaxPipe4Thick"/>
-        <shape type="Tube" name="VaxDownStrPipe4SubTubs"
-               dz="0.5*DownStr:VaxMainBodyLength"
-               rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation y="90.0*degree"/>
-          <position z="-DownStr:VaxPipe4Length/2"/>
-        </transformation>
-      </shape>
-      <shape type="Tube" name="VaxDownStrPipe4FlangeTubs"
-             dz="0.5*DownStr:VaxPipe4FlangeLength"
-             rmin="DownStr:VaxPipe4FlangeRadius"
-             rmax="DownStr:VaxPipe4FlangeRadius + DownStr:VaxPipe4FlangeThick"/>
-      <position z="DownStr:VaxPipe4Length/2 - DownStr:VaxPipe4FlangeLength/2"/>
-    </shape>
-  </volume>
-
-
-  <!-- Pipe5 -->
-  <volume name="lvDownStrVaxPipe5" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe5Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe5Sub">
-        <shape type="Tube" name="DownStr:VaxPipe5Tubs"
-               dz="0.5*DownStr:VaxPipe5Length"
-               rmin="DownStr:VaxPipe5Radius"
-               rmax="DownStr:VaxPipe5Radius + DownStr:VaxPipe5Thick"/>
-        <shape type="Tube" name="VaxDownStrPipe5SubTubs"
-               dz="0.5*DownStr:VaxMainBodyLength"
-               rmax="DownStr:VaxMainBodyRadius + DownStr:VaxMainBodyThick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation y="90.0*degree"/>
-          <position z="-DownStr:VaxPipe5Length/2"/>
-        </transformation>
-      </shape>
-      <shape type="Tube" name="VaxDownStrPipe5FlangeTubs"
-             dz="0.5*DownStr:VaxPipe5FlangeLength"
-             rmin="DownStr:VaxPipe5FlangeRadius"
-             rmax="DownStr:VaxPipe5FlangeRadius + DownStr:VaxPipe5FlangeThick"/>
-      <position z="DownStr:VaxPipe5Length/2 - DownStr:VaxPipe5FlangeLength/2"/>
-    </shape>
-  </volume>
-
-
-  <!-- Pipe6 -->
-  <volume name="lvDownStrVaxPipe6" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe6Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe6Sub">
-        <shape type="Tube" name="VaxDownStrPipe6Tubs"
-               dz="0.5*DownStr:VaxPipe6Length"
-               rmin="DownStr:VaxPipe6Radius"
-               rmax="DownStr:VaxPipe6Radius + 1.6*mm"/>
-        <shape type="Tube" name="VaxDownStrPipe6SubTubs"
-               dz="0.5*DownStr:VaxPipe1Length"
-               rmax="DownStr:VaxPipe1Radius + DownStr:VaxPipe1Thick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation x="90.0*degree"/>
-          <position z="-DownStr:VaxPipe6Length/2"/>
-        </transformation>
-      </shape>
-      <shape type="Tube" name="VaxDownStrPipe6FlangeTubs"
-             dz="0.5*DownStr:VaxPipe6FlangeLength"
-             rmin="DownStr:VaxPipe6FlangeRadius"
-             rmax="DownStr:VaxPipe6FlangeRadius + DownStr:VaxPipe6FlangeThick"/>
-      <position z="DownStr:VaxPipe6Length/2 - DownStr:VaxPipe6FlangeLength/2"/>
-    </shape>
-  </volume>
-
-
-  <!-- Pipe7 -->
-  <volume name="lvDownStrVaxPipe7" material="Pipe:Steel316LN" vis="Pipe:AfterMuon">
-    <shape type="BooleanShape" operation="union" name="VaxDownStrPipe7Union">
-      <shape type="Tube" name="VaxDownStrPipe7Lid"
-             dz="0.5*DownStr:VaxPipe7LidLength"
-             rmin="DownStr:VaxPipe7Radius"
-             rmax="DownStr:VaxPipe7Radius + DownStr:VaxPipe7LidThick"/>
-      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe7Sub">
-        <shape type="Tube" name="VaxDownStrPipe7Tubs"
-               dz="0.5*DownStr:VaxPipe7EntryLength + DownStr:VaxPipe7CutLength"
-               rmin="DownStr:VaxPipe7Radius"
-               rmax="DownStr:VaxPipe7Radius + DownStr:VaxPipe7Thick"/>
-        <shape type="Box" name="VaxDownStrPipe7SubBox"
-               dx="0.5*150.0*mm"
-               dy="0.5*150.0*mm"
-               dz="0.5*2*DownStr:VaxPipe7CutLength"/>
-        <transformation>
-          <position z="DownStr:VaxPipe7CutLength"/>
-          <rotation/>
-          <position/>
-          <rotation x="45.0*degree"/>
-          <position z="DownStr:VaxPipe7EntryLength/2 - DownStr:VaxPipe7CutLength/2"/>
-        </transformation>
-      </shape>
-      <position z="DownStr:VaxPipe7EntryLength/2 + DownStr:VaxPipe7CutLength/2 + DownStr:VaxPipe7LidLength/2 + 0.01*mm"/>
-      <shape type="BooleanShape" operation="subtraction" name="VaxDownStrPipe7Sub2">
-        <shape type="Tube" name="VaxDownStrPipe7Tubs2"
-               dz="0.5*DownStr:VaxPipe7ExitLength + DownStr:VaxPipe7CutLength"
-               rmin="DownStr:VaxPipe7Radius"
-               rmax="DownStr:VaxPipe7Radius + DownStr:VaxPipe7Thick"/>
-        <shape type="Box" name="VaxDownStrPipe7SubBox2"
-               dx="0.5*150.0*mm"
-               dy="0.5*150.0*mm"
-               dz="0.5*2*DownStr:VaxPipe7CutLength"/>
-        <transformation>
-          <position z="-DownStr:VaxPipe7CutLength"/>
-          <rotation/>
-          <position/>
-          <rotation x="-45.0*degree"/>
-          <position z="-DownStr:VaxPipe7ExitLength/2 + DownStr:VaxPipe7CutLength/2"/>
-        </transformation>
-      </shape>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-DownStr:VaxPipe7ExitLength/2 + DownStr:VaxPipe7CutLength/2" z="DownStr:VaxPipe7EntryLength + DownStr:VaxPipe7LidLength/2 + 0.04*mm"/>
-      </transformation>
-      <shape type="Tube" name="DownStr:VaxPipe7FlangeTubs"
-             dz="0.5*DownStr:VaxPipe7FlangeLength"
-             rmin="DownStr:VaxPipe7FlangeRadius"
-             rmax="DownStr:VaxPipe7FlangeRadius + DownStr:VaxPipe7FlangeThick"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-DownStr:VaxPipe7ExitLength + DownStr:VaxPipe7FlangeLength/2" z="DownStr:VaxPipe7EntryLength + DownStr:VaxPipe7LidLength/2 + 0.04*mm"/>
-      </transformation>
-    </shape>
-  </volume>
-
-
-  <!-- Complete -->
-  <volume name="lvDownStrVax" vis="Pipe:AfterMuon">
-    <physvol name="pvDownStrVaxMainBody"          logvol="lvDownStrVaxMainBody"/>
-    <physvol name="pvDownStrVaxWindow"            logvol="lvDownStrVaxWindow">
-      <position z="-DownStr:VaxMainBodyLength/2 - DownStr:VaxWindowTubsLenght/2 - 0.01*mm"/>
-    </physvol>
-    <physvol name="pvDownStrVaxRfScreen"          logvol="lvDownStrVaxRfScreen">
-      <position z="-DownStr:VaxMainBodyLength/2 - DownStr:VaxWindowTubsLenght - 0.01*mm + DownStr:VaxRfScreenFlangeLength/2"/>
-    </physvol>
-    <physvol name="pvDownStrVaxEndCap"            logvol="lvDownStrVaxEndCap">
-      <position z="DownStr:VaxMainBodyLength/2 + DownStr:VaxEndCapTubsLenght/2 + 0.01*mm"/>
-    </physvol>
-    <physvol name="pvDownStrVaxEndPipe"           logvol="lvDownStrVaxEndPipe">
-      <position z="DownStr:VaxMainBodyLength/2 - DownStr:VaxEndCapTubsLenght + 0.01*mm + DownStr:VaxEndPipeLength/2"/>
-    </physvol>
-    <physvol name="pvDownStrVaxPipe1"             logvol="lvDownStrVaxPipe1">
-      <transformation>
-        <position/>
-        <rotation x="-90.0*degree"/>
-        <position y="DownStr:VaxPipe1Length/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrVaxPipe2"             logvol="lvDownStrVaxPipe2">
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-DownStr:VaxPipe2Length/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrVaxPipe3"             logvol="lvDownStrVaxPipe3">
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="DownStr:VaxPipe3EntryLength/2 + DownStr:VaxPipe3CutLength/2 "/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrVaxPipe4"             logvol="lvDownStrVaxPipe4">
-      <transformation>
-        <position/>
-        <rotation y="-90.0*degree"/>
-        <position x="-DownStr:VaxPipe4Length/2" z="-DownStr:VaxMainBodyHole4Offset"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrVaxPipe5"             logvol="lvDownStrVaxPipe5">
-      <transformation>
-        <position/>
-        <rotation y="-90.0*degree"/>
-        <position x="-DownStr:VaxPipe5Length/2" z="DownStr:VaxMainBodyHole5Offset"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrVaxPipe6a"            logvol="lvDownStrVaxPipe6">
-      <transformation>
-        <position/>
-        <rotation y="-90.0*degree"/>
-        <position x="-DownStr:VaxPipe6Length/2" y="DownStr:VaxPipe1HoleOffset"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrVaxPipe6b"            logvol="lvDownStrVaxPipe6">
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="DownStr:VaxPipe6Length/2" y="DownStr:VaxPipe1HoleOffset"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrVaxPipe6c"            logvol="lvDownStrVaxPipe6">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree"/>
-        <position y="DownStr:VaxPipe1HoleOffset" z="-DownStr:VaxPipe6Length/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrVaxPipe7"             logvol="lvDownStrVaxPipe7">
-      <transformation>
-        <position/>
-        <rotation x="-90.0*degree" z="90.0*degree"/>
-        <position y="DownStr:VaxPipe1Length + DownStr:VaxPipe7LidLength/2 + 0.01*mm"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvDownStrVaxVacuum"             logvol="lvDownStrVaxVacuum">
-      <position z="-DownStr:VaxMainBodyLength/2 - DownStr:VaxWindowTubsLenght - 0.01*mm + DownStr:VaxVacuumLength/2"/>
-    </physvol>
-  </volume>
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/AfterMuon.xml b/compact/components/Pipe/2025-v00.00/AfterMuon.xml
deleted file mode 100644
index 023a40010..000000000
--- a/compact/components/Pipe/2025-v00.00/AfterMuon.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-
-  <detectors>
-    <detector name="PipeAfterMuon" type="DD4hep_VolumeAssembly" parent="${PipeAfterMuon:parent}" vis="Pipe:Vis">
-
-      <!-- Pipe segment replacement of VVSSH  (LHCb_Pipe_Section_Type_1) -->
-      <volume type="LHCb_Pipe_Section_Type_1" name="lvVVSSH">
-	<param name="vis"                value="Pipe:AfterMuon"/>
-	<param name="Material"           value="Pipe:Steel316LN"/>
-	<param name="Length"             value="DownStr:VVSSHPipeZ"/>
-	<param name="Radius"             value="DownStr:VVSSHPipeRad"/>
-	<param name="Thick"              value="DownStr:VVSSHPipeThick"/>
-	<param name="FlangeLength"       value="19.7*mm"/>
-	<param name="FlangeThick"        value="76.0*mm - (DownStr:VVSSHPipeRad + DownStr:VVSSHPipeThick + 0.01*mm)"/>
-	<param name="FlangeMaterial"     value="Pipe:Steel316LN"/>
-      </volume>
-
-      <!-- Pipe in DownStr:MBXWS  (LHCb_Pipe_Section_Type_1)  -->
-      <volume type="LHCb_Pipe_Section_Type_1" name="lvMBXWSPipe">
-	<param name="vis"                value="Pipe:AfterMuon"/>
-	<param name="Material"           value="Pipe:CuOFE"/>
-	<param name="Length"             value="DownStr:MBXWSPipeLength"/>
-	<param name="Radius"             value="DownStr:MBXWSPipeRadius"/>
-	<param name="Thick"              value="DownStr:MBXWSPipeThick"/>
-	<param name="FlangeUpLength"     value="19.8*mm"/>
-	<param name="FlangeUpThick"      value="48.0*mm"/>
-	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
-	<param name="FlangeDownLength"   value="17.4*mm"/>
-	<param name="FlangeDownThick"    value="29.0*mm"/>
-	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
-      </volume>
-      <include ref="AfterMuon-VVSGF.xml"/>
-      <include ref="AfterMuon-BPMSW.xml"/>
-      <include ref="AfterMuon-Vax.xml"/>
-
-      <!--==================================================================================-->
-      <!--===================================Final  Assembly================================-->
-      <!--==================================================================================-->
-      <envelope type="Assembly" name="lvPipeAfterMuon" vis="Pipe:AfterMuon">
-	<physvol name="pvVVSGF"		  volume="lvVVSGF">
-	  <position z="75.0*mm/2 - 2500.0*mm/2"/>
-	  <rotation z="-30.0*degree"/>
-	</physvol>
-	<physvol name="pvVVSSH"		  volume="lvVVSSH">
-	  <position z="75.0*mm + 280*mm + 80.0*mm/2 - 2500.0*mm/2"/>
-	</physvol>
-	<physvol name="pvMBXWSPipe"       volume="lvMBXWSPipe">
-	  <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm/2 - 2500.0*mm/2"/>
-	</physvol>
-	<physvol name="pvBPMSWDownStr"	  volume="lvDownStrBPMSW">
-	  <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm + 17.4*mm/2 - 2500.0*mm/2"/>
-	</physvol>
-	<physvol name="pvVaxDownStr" 	  volume="lvDownStrVax">
-	  <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm + 285.0*mm + 180.0*mm + 67.0*mm - 2500.0*mm/2"/>
-	</physvol>
-	<physvol name="pvVVSGF2"	  volume="lvVVSGF">
-	  <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm + 285.0*mm + 180.0*mm + 190.0*mm + 75.0*mm/2 - 2500.0*mm/2"/>
-	</physvol>
-      </envelope>
-
-      <position z="- Regions:AfterMuonHoleZSize/2"/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterT-Support.xml b/compact/components/Pipe/2025-v00.00/AfterT-Support.xml
deleted file mode 100644
index 2d3d8d05a..000000000
--- a/compact/components/Pipe/2025-v00.00/AfterT-Support.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--========================================================================== -->
-<!--  LHCb Detector Description                                                -->
-<!--========================================================================== -->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--========================================================================== -->
-<!-- XML description of the Pipe support after the T area                      -->
-<!--========================================================================== -->
-<lccdd>
-  <detectors>
-
-    <!-- =================================Supports =========================== -->
-    <!-- Pipe support between Rich2 and M1 (part in Rich2)                     -->
-    <!-- ===================================================================== -->
-    <detector name="PipeSupportAfterT" type="DD4hep_VolumeAssembly" parent="${PipeAfterT:parent}" vis="Pipe:Vis">
-      <!-- UX85-3 Support: Spacer and Collar togheter, sectioning due to regions -->
-      <volume name="lvUX853AfterMagnetCollar" material="Pipe:Al6082" vis="Pipe:AfterT">
-        <shape type="Tube" name="UX85-3-Collar-A"
-              dz="UX853CollarRich2Size/2"
-              rmin="UX853CollarInnerRadius"
-              rmax="UX853CollarOuterRadius"/>
-      </volume>
-
-      <!-- UX85-3 Support -->
-      <envelope type="Assembly" name="lvUX85SupportsAfterMagnet" vis="Pipe:AfterT">
-        <physvol name ="pvUX853AfterMagnetCollar"  volume="lvUX853AfterMagnetCollar" vis="Pipe:AfterT">
-          <position z="- 0.5*UX853CollarRich2Size"/>
-        </physvol>
-      </envelope>
-      <position z="UX853Rich2DownSplitZposIP - Regions:AfterMagnetZPos"/>
-      <nodebug/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/AfterT.xml b/compact/components/Pipe/2025-v00.00/AfterT.xml
deleted file mode 100644
index dc58f13da..000000000
--- a/compact/components/Pipe/2025-v00.00/AfterT.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--========================================================================== -->
-<!--  LHCb Detector Description                                                -->
-<!--========================================================================== -->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--========================================================================== -->
-<!-- XML description of the Beam Pipe after T                                  -->
-<!--========================================================================== -->
-<lccdd>
-
-  <detectors>
-    <!--==================================================================================-->
-    <!--==================================PiperAfter T====================================-->
-    <!--==================================================================================-->
-    <detector name="PipeAfterT" type="DD4hep_VolumeAssembly" parent="${PipeAfterT:parent}" vis="Pipe:Vis">
-      <!-- UX85-3 Cone 10 mrad of Beryllium 1.9 mm thick - Split T/Rich2 -->
-      <volume name="lvUX853Cone07B" material="Pipe:BeTV56" vis="Pipe:AfterT">
-        <shape type="ConeSegment" name="UX85-3-Cone10mrad-07B"
-              dz="UX853Cone07BLenght/2"
-              rmin2="UX853Cone07BRadiusZmax"
-              rmin1="UX853Cone07BRadiusZmin"
-              rmax2="UX853Cone07BRadiusZmax + UX853Cone07BThick"
-              rmax1="UX853Cone07BRadiusZmin + UX853Cone07BThick"/>
-      </volume>
-      <!-- UX85-3 Cone 10 mrad of Beryllium 2.0 mm thick -->
-      <volume name="lvUX853Cone08" material="Pipe:BeTV56" vis="Pipe:AfterT">
-        <shape type="ConeSegment" name="UX85-3-Cone10mrad-08"
-              dz="UX853Cone08Lenght/2"
-              rmin2="UX853Cone08RadiusZmax"
-              rmin1="UX853Cone08RadiusZmin"
-              rmax2="UX853Cone08RadiusZmax + UX853Cone08Thick"
-              rmax1="UX853Cone08RadiusZmin + UX853Cone08Thick"/>
-      </volume>
-      <!-- UX85-3 Cone 10 mrad of Beryllium 2.1 mm thick -->
-      <volume name="lvUX853Cone09" material="Pipe:BeTV56" vis="Pipe:AfterT">
-        <shape type="ConeSegment" name="UX85-3-Cone10mrad-09"
-              dz="UX853Cone09Lenght/2"
-              rmin2="UX853Cone09RadiusZmax"
-              rmin1="UX853Cone09RadiusZmin"
-              rmax2="UX853Cone09RadiusZmax + UX853Cone09Thick"
-              rmax1="UX853Cone09RadiusZmin + UX853Cone09Thick"/>
-      </volume>
-      <!-- UX85-3 Cone 10 mrad of Beryllium 2.3 mm thick -->
-      <volume name="lvUX853Cone10" material="Pipe:BeTV56" vis="Pipe:AfterT">
-        <shape type="ConeSegment" name="UX85-3-Cone10mrad-10"
-              dz="UX853Cone10Lenght/2"
-              rmin2="UX853Cone10RadiusZmax"
-              rmin1="UX853Cone10RadiusZmin"
-              rmax2="UX853Cone10RadiusZmax + UX853Cone10Thick"
-              rmax1="UX853Cone10RadiusZmin + UX853Cone10Thick"/>
-      </volume>
-      <!-- UX85-3 Cone 10 mrad of Beryllium 2.4 mm thick -->
-      <volume name="lvUX853Cone11" material="Pipe:BeTV56" vis="Pipe:AfterT">
-        <shape type="ConeSegment" name="UX85-3-Cone10mrad-11"
-              dz="UX853Cone11Lenght/2"
-              rmin2="UX853Cone11RadiusZmax"
-              rmin1="UX853Cone11RadiusZmin"
-              rmax2="UX853Cone11RadiusZmax + UX853Cone11Thick"
-              rmax1="UX853Cone11RadiusZmin + UX853Cone11Thick"/>
-      </volume>
-      <!-- UX85-3 Cone 10 mrad of Beryllium cylindrical part for support -->
-      <!-- Split Rich2/Downstream                                        -->
-      <volume name="lvUX853Cone12A" material="Pipe:BeTV56" vis="Pipe:AfterT">
-        <shape type="ConeSegment" name="UX85-3-Cone10mrad-12A"
-              dz="UX853Cone12ALenght/2"
-              rmin2="UX853Cone12ARadiusZmax"
-              rmin1="UX853Cone12ARadiusZmin"
-              rmax2="UX853Cone12AOuterRadius"
-              rmax1="UX853Cone12AOuterRadius"/>
-      </volume>
-      <!-- Vacuum in UX85-3 in whole AfterT lenght -->
-      <volume name="lvUX853Vacuum07B" material="Vacuum" vis="Pipe:AfterT">
-        <shape type="ConeSegment" name="UX85-3-Vacuum-07B"
-              dz="UX853AfterTLenght/2"
-              rmax1="UX853Cone07BRadiusZmin"
-              rmax2="UX853Cone12ARadiusZmax"/>
-      </volume>
-
-      <!-- Whole section: combination of sections -->
-      <envelope type="Assembly" name="lvUX853AfterT" vis="Pipe:AfterT">
-        <!-- Pipe of Be -->
-        <physvol name="pvUX853Cone07B" volume="lvUX853Cone07B">
-          <position z="UX853Cone07BZpos"/>
-        </physvol>
-        <physvol name="pvUX853Cone08" volume="lvUX853Cone08">
-          <position z="UX853Cone08Zpos"/>
-        </physvol>
-        <physvol name="pvUX853Cone09" volume="lvUX853Cone09">
-          <position z="UX853Cone09Zpos"/>
-        </physvol>
-        <physvol name="pvUX853Cone10" volume="lvUX853Cone10">
-          <position z="UX853Cone10Zpos"/>
-        </physvol>
-        <physvol name="pvUX853Cone11" volume="lvUX853Cone11">
-          <position z="UX853Cone11Zpos"/>
-        </physvol>
-        <physvol name="pvUX853Cone12A" volume="lvUX853Cone12A">
-          <position z="UX853Cone12AZpos"/>
-        </physvol>
-        <!-- Now the vacuum inside -->
-        <physvol name="pvUX853Vacuum07B" volume="lvUX853Vacuum07B">
-          <position z="0.5*UX853AfterTLenght"/>
-        </physvol>
-      </envelope>
-      <!-- Pipe log volume center AfterT is at split between T and Rich2 -->
-      <position z="UX853TRich2SplitZposIP - Regions:AfterMagnetZPos"/>
-      <nodebug/>
-    </detector>
-  </detectors>
-
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/BeforeMagnet.xml b/compact/components/Pipe/2025-v00.00/BeforeMagnet.xml
deleted file mode 100644
index 824dce210..000000000
--- a/compact/components/Pipe/2025-v00.00/BeforeMagnet.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Pipe in the BeforeMagnetRegion area                -->
-<!--===========================================================================-->
-<lccdd>
-  <define>
-    <constant name="Pipe:JuncSteelCyl4Z" value="20*mm"/>
-    <constant name="Pipe:JuncSteelCyl4InnerR" value="40*mm"/>
-    <constant name="Pipe:JuncSteelCyl4OuterR" value="76*mm"/>
-  </define>
-
-
-  <detectors>
-    <!--=================================Supports==============================-->
-    <!-- Beam pipe in the BeforeMagnet region                                  -->
-    <!--=======================================================================-->
-    <detector name="PipeBeforeMagnet" type="DD4hep_VolumeAssembly" parent="${PipeBeforeMagnet:parent}" vis="Pipe:Vis">
-
-      <!-- Whole section: combination of sections -->
-      <volume name="lvPipeJunctionBeforeVeloSteel" vis="Pipe:BeforeMagnet" material="Pipe:Steel316LN">
-        <shape type="BooleanShape" operation="union" name="PipeJuncB4VeloSteelUnion">
-          <shape type="Tube" name="Pipe:JuncSteelCyl4"
-                 dz="0.5*Pipe:JuncSteelCyl4Z"
-                 rmin="Pipe:JuncSteelCyl4InnerR"
-                 rmax="Pipe:JuncSteelCyl4OuterR"/>
-          <shape type="ConeSegment" name="JuncSteelCone"
-                 dz="0.5*30*mm"
-                 rmin2="(35*(38-27)/65)*mm+27*mm"
-                 rmin1="38*mm"
-                 rmax2="(35*(40-29)/65)*mm+29*mm"
-                 rmax1="Pipe:JuncSteelCyl4InnerR + 0.01*mm"/>
-          <position z="Pipe:JuncSteelCyl4Z/2+30*mm/2"/>
-        </shape>
-      </volume>
-
-      <volume name="lvPipeJunctionBeforeVeloVacuum" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="BooleanShape" operation="union" name="PipeJuncB4VeloVacuumUnion">
-          <shape type="Tube" name="JuncVacuumCyl4"
-                 dz="0.5*Pipe:JuncSteelCyl4Z"
-                 rmax="Pipe:JuncSteelCyl4InnerR"
-                 rmin="0*mm"/>
-          <shape type="ConeSegment" name="JuncVacuumCone"
-                 dz="0.5*30*mm"
-                 rmin2="0*mm"
-                 rmin1="0*mm"
-                 rmax2="(35*(38-27)/65)*mm+27*mm"
-                 rmax1="(35*(40-29)/65)*mm+29*mm"/>
-          <position z="Pipe:JuncSteelCyl4Z/2+30*mm/2"/>
-        </shape>
-      </volume>
-
-      <!-- This is a temporay volume to join velo to upstream beam pipe -->
-      <volume name="lvPipeJunctionBeforeVeloCuPipe" material="Copper" vis="Pipe:BeforeMagnet">
-        <shape type="Tube" name="JuncCuPipe"
-               dz="0.5*14*mm"      rmin="39.9*mm"       rmax="40*mm"/>
-      </volume>
-      <volume name="lvPipeJunctionBeforeVeloVacuumPipe" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="Tube" name="JuncVacPipe"
-               dz="0.5*14*mm"      rmin="0*mm"          rmax="39.9*mm"/>
-      </volume>
-      <!-- Assembly volume  -->
-      <volume name="lvPipeJunctionBeforeVelo" vis="Pipe:BeforeMagnet">
-        <physvol name="pvPipeJunctionB4VeloSteel"       volume="lvPipeJunctionBeforeVeloSteel" >
-        </physvol>
-        <physvol name="pvPipeJunctionB4VeloVacuum"      volume="lvPipeJunctionBeforeVeloVacuum" >
-        </physvol>
-        <physvol name="pvPipeJunctionB4VeloCuPipe"      volume="lvPipeJunctionBeforeVeloCuPipe" >
-          <position z="-Pipe:JuncSteelCyl4Z/2-14*mm/2"/>
-        </physvol>
-        <physvol name="pvPipeJunctionB4VeloVacPipe"     volume="lvPipeJunctionBeforeVeloVacuumPipe" >
-          <position z="-Pipe:JuncSteelCyl4Z/2-14*mm/2"/>
-        </physvol>
-      </volume>
-
-      <envelope type="Assembly" name="lvPipeBeforeVelo" vis="Pipe:BeforeMagnet">
-        <physvol name="pvPipeJunctionBeforeVelo"       volume="lvPipeJunctionBeforeVelo" >
-          <position z="-885*mm+20*mm/2"/>
-        </physvol>
-      </envelope>
-
-      <comment> Pipe position before in the region  </comment>
-      <position/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/BeforeVelo-Support.xml b/compact/components/Pipe/2025-v00.00/BeforeVelo-Support.xml
deleted file mode 100644
index 073abee57..000000000
--- a/compact/components/Pipe/2025-v00.00/BeforeVelo-Support.xml
+++ /dev/null
@@ -1,579 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Pipe in the BeforeMagnetRegion area                -->
-<!--===========================================================================-->
-<lccdd>
-
-  <detectors>
-    <detector name="PipeBeforeVeloSupFix" type="DD4hep_VolumeAssembly" parent="${PipeBeforeVelo:parent}" vis="Pipe:Vis">
-
-      <!-- Fixed Pipe Support -->
-
-      <!-- Large plate -->
-      <volume name="lvPipeSupBefVeloRec1" material="Pipe:Al6082" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="subtraction" name="PipeSupBefVeloRec1Sub">
-	  <shape type="Box" name="PipeSupBefVeloRec1"
-		 dx="0.5*PipeSupBefVeloRec1X"
-		 dy="0.5*PipeSupBefVeloRec1Y"
-		 dz="0.5*PipeSupBefVeloRec1Z"/>
-	  <shape type="Tube" name="PipeSupBefVeloRec1Hole"
-		 dz="0.5*PipeSupBefVeloRec1Z+0.2*mm"
-		 rmin="0.0*mm"
-		 rmax="PipeSupBefVeloRec1HoleRad"/>
-	</shape>
-      </volume>
-
-      <!-- Small plate -->
-      <volume name="lvPipeSupBefVeloRec2" material="Pipe:Al6082" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="subtraction" name="PipeSupBefVeloRec2Sub">
-	  <shape type="Box" name="PipeSupBefVeloRec2"
-		 dx="0.5*PipeSupBefVeloRec2X"
-		 dy="0.5*PipeSupBefVeloRec2Y"
-		 dz="0.5*PipeSupBefVeloRec2Z"/>
-	  <shape type="Tube" name="PipeSupBefVeloRec2Hole"
-		 dz="0.5*PipeSupBefVeloRec2Z+0.2*mm"
-		 rmin="0.0*mm"
-		 rmax="PipeSupBefVeloRec2HoleRad"/>
-	</shape>
-      </volume>
-      <envelope type="Assembly"  name="lvPipeSupBefVelo" vis="Pipe:BeforeVelo">
-	<physvol name="pvPipeSupBefVeloRec1"             volume="lvPipeSupBefVeloRec1">
-	</physvol>
-	<physvol name="pvPipeSupBefVeloRec2"             volume="lvPipeSupBefVeloRec2">
-	  <position z="PipeSupBefVeloRec1Z/2 + PipeSupBefVeloRec2Z/2"/>
-	</physvol>
-      </envelope>
-
-      <comment> Pipe position in the region  </comment>
-      <position z="-2164.5*mm + Regions:BeforeMagnetZSize/2 - Regions:BeforeVeloZSize/2"/>
-
-    </detector>
-
-<comment>
-What is this ? Looks like a VMA warm module ....
-
-    <detector name="PipeBeforeVeloSupMobile" type="DD4hep_VolumeAssembly" parent="${PipeBeforeVelo:parent}" vis="Pipe:Vis">
-
-      <!-- End pieces of bellows -->
-      <volume name="lvMobSupEntryUp" material="Pipe:Steel316LN" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="union" name="MobSupEntryUpSub">
-	  <shape type="Tube" name="MobSupEntryUpCyl"
-		 dz="0.5*MobSupEntryUpCylZ"
-		 rmin="MobSupEntryRad"
-		 rmax="MobSupEntryRad+MobSupEntryThick"/>
-
-	  <shape type="ConeSegment" name="MobSupEntryUpCons"
-		 dz="0.5*MobSupEntryConsZ"
-		 rmin1="MobSupEntryRad"
-		 rmin2="MobSupEntryConsRadEnd"
-		 rmax1="MobSupEntryRad+MobSupEntryThick"
-		 rmax2="MobSupEntryConsRadEnd+MobSupEntryThick"/>
-	  <position z="MobSupEntryUpCylZ/2+MobSupEntryConsZ/2"/>
-	</shape>
-      </volume>
-
-      <volume name="lvMobSupEntryDown" material="Pipe:Steel316LN" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="union" name="MobSupEntryDownSub">
-	  <shape type="Tube" name="MobSupEntryDownCyl"
-		 dz="0.5*MobSupEntryDownCylZ"
-		 rmin="MobSupEntryRad"
-		 rmax="MobSupEntryRad+MobSupEntryThick"/>
-
-	  <shape type="ConeSegment" name="MobSupEntryDownCons"
-		 dz="0.5*MobSupEntryConsZ"
-		 rmin2="MobSupEntryRad"
-		 rmin1="MobSupEntryConsRadEnd"
-		 rmax2="MobSupEntryRad+MobSupEntryThick"
-		 rmax1="MobSupEntryConsRadEnd+MobSupEntryThick"/>
-	  <position z="-MobSupEntryDownCylZ/2-MobSupEntryConsZ/2"/>
-	</shape>
-      </volume>
-
-      <!-- Bellows -->
-      <volume name="lvMobSupBellow" material="Pipe:Steel316LN" vis="Pipe:Support">
-	<shape type="Polycone" name="MobSupBellowPolyCone">
-	  <zplane z="-MobSupBellowZ/2"
-		  rmin="MobSupEntryConsRadEnd"
-		  rmax="MobSupEntryConsRadEnd+MobSupBellowThick"/>
-	  <zplane z="-MobSupBellowZ/2+MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch/2-MobSupBellowZ/2-MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch/2-MobSupBellowZ/2+MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*2/2-MobSupBellowZ/2-MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*2/2-MobSupBellowZ/2+MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*3/2-MobSupBellowZ/2-MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*3/2-MobSupBellowZ/2+MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*4/2-MobSupBellowZ/2-MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*4/2-MobSupBellowZ/2+MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*5/2-MobSupBellowZ/2-MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*5/2-MobSupBellowZ/2+MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*5/2-MobSupBellowZ/2+MobSupBellowCyl1Z-MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*5/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*6/2-MobSupBellowZ/2+MobSupBellowCyl1Z-MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*6/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*7/2-MobSupBellowZ/2+MobSupBellowCyl1Z-MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*7/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*8/2-MobSupBellowZ/2+MobSupBellowCyl1Z-MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*8/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*8/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*8/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*9/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*9/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*10/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*10/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*11/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*11/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*12/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
-		  rmin="MobSupBellowOuterRad"
-		  rmax="MobSupBellowOuterRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*12/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z+MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-
-	  <zplane z="MobSupBellowPitch*13/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z-MobSupBellowThick"
-		  rmin="MobSupBellowInnerRad"
-		  rmax="MobSupBellowInnerRad+MobSupBellowThick"/>
-	  <zplane z="MobSupBellowPitch*13/2-MobSupBellowZ/2+MobSupBellowCyl1Z+MobSupBellowCyl2Z"
-		  rmin="MobSupEntryConsRadEnd"
-		  rmax="MobSupEntryConsRadEnd+MobSupBellowThick"/>
-	</shape>
-      </volume>
-
-
-      <!-- Upstream Flange -->
-      <volume name="lvMobSupFlangeUp" material="Pipe:Steel316LN" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="subtraction" name="MobSupFlangeUpSub">
-	  <shape type="Tube" name="MobSupFlangeUpCyl"
-		 dz="0.5*MobSupFlangeUpCylZ"
-		 rmin="MobSupFlangeUpCylRad"
-		 rmax="MobSupFlangeUpCylRad+MobSupFlangeUpThick"/>
-	  <shape type="Tube" name="MobSupFlangeUpCylSub"
-		 dz="0.5*MobSupFlangeUpCylSubZ"
-		 rmin="0.0*mm"
-		 rmax="MobSupFlangeUpCylSubRad"/>
-	  <position z="MobSupFlangeUpCylSubZ/2-MobSupFlangeUpCylZ/2"/>
-	</shape>
-
-      </volume>
-
-      <!-- Downstream Flange -->
-      <volume name="lvMobSupFlangeDown" material="Pipe:Steel316LN" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="subtraction" name="MobSupFlangeDownSub">
-	  <shape type="Tube" name="MobSupFlangeDownCyl"
-		 dz="0.5*MobSupFlangeDownCylZ"
-		 rmin="MobSupFlangeDownCylRad"
-		 rmax="MobSupFlangeDownCylRad+MobSupFlangeDownThick"/>
-	  <shape type="Tube" name="MobSupFlangeDownCylSub"
-		 dz="0.5*MobSupFlangeDownCylSubZ+0.02*mm"
-		 rmin="0.0*mm"
-		 rmax="MobSupFlangeDownCylSubRad"/>
-	  <position z="-MobSupFlangeDownCylSubZ/2+MobSupFlangeDownCylZ/2+0.01*mm"/>
-	</shape>
-      </volume>
-
-      <!-- Transition tube and mount -->
-      <volume name="lvMobSupTransTubeComplete" vis="Pipe:Support">
-	<physvol name="pvMobSupTransTube"
-		 volume="lvMobSupTransTube">
-	</physvol>
-	<physvol name="pvMobSupTransTubeFlange"
-		 volume="lvMobSupTransTubeFlange">
-	  <position z="-MobSupTransTubeCylZ/2+MobSupTransTubeFlangeZ/2"/>
-	</physvol>
-      </volume>
-
-      <!-- Transition Tube -->
-      <volume name="lvMobSupTransTube" material="Pipe:CuOFE" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="union" name="TransTubeUnion">
-	  <shape type="Tube" name="TransTubeCyl"
-		 dz="0.5*MobSupTransTubeCylZ"
-		 rmin="MobSupTransTubeRad"
-		 rmax="MobSupTransTubeRad+MobSupTransTubeThick"/>
-	  <shape type="ConeSegment" name="TransTubeCons"
-		 dz="0.5*MobSupTransTubeConsZ"
-		 rmin1="MobSupTransTubeRad"
-		 rmin2="MobSupTransTubeConsRad"
-		 rmax1="MobSupTransTubeRad+MobSupTransTubeThick"
-		 rmax2="MobSupTransTubeConsRad+MobSupTransTubeThick"/>
-	  <position z="MobSupTransTubeCylZ/2-MobSupTransTubeConsZ/2"/>
-	</shape>
-      </volume>
-
-      <!-- Transition mount -->
-      <volume name="lvMobSupTransTubeFlange" material="Pipe:CuOFE" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="union" name="TransTubeFlangeUnion">
-	  <shape type="Tube" name="TransTubeFlange"
-		 dz="0.5*MobSupTransTubeFlangeZ"
-		 rmin="MobSupTransTubeRad+MobSupTransTubeThick+MobSupTransTubeFlangeInnerThick+0.01*mm"
-		 rmax="MobSupTransTubeRad+MobSupTransTubeThick+MobSupTransTubeFlangeInnerThick+MobSupTransTubeFlangeThick"/>
-	  <shape type="Tube" name="TransTubeFlangeLedge"
-		 dz="0.5*MobSupTransTubeFlangeInnerZ"
-		 rmin="MobSupTransTubeRad+MobSupTransTubeThick"
-		 rmax="MobSupTransTubeRad+MobSupTransTubeThick+MobSupTransTubeFlangeInnerThick"/>
-	  <position z="MobSupTransTubeFlangeInnerZ/2-MobSupTransTubeFlangeZ/2"/>
-	</shape>
-      </volume>
-
-      <!-- RF Contact ring -->
-      <volume name="lvMobSupRfContactRing" vis="Pipe:Support">
-	<physvol name="pvMobSupRfContact1"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="0*360*degree / 48 + 90*degree"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact2"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="1*360*degree / 48 + 90*degree"/>
-	  <rotation z="1*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact3"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="2*360*degree / 48 + 90*degree"/>
-	  <rotation z="2*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact4"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="3*360*degree / 48 + 90*degree"/>
-	  <rotation z="3*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact5"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="4*360*degree / 48 + 90*degree"/>
-	  <rotation z="4*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact6"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="5*360*degree / 48 + 90*degree"/>
-	  <rotation z="5*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact7"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="6*360*degree / 48 + 90*degree"/>
-	  <rotation z="6*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact8"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="7*360*degree / 48 + 90*degree"/>
-	  <rotation z="7*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact9"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="8*360*degree / 48 + 90*degree"/>
-	  <rotation z="8*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact10"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="9*360*degree / 48 + 90*degree"/>
-	  <rotation z="9*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact11"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="10*360*degree / 48 + 90*degree"/>
-	  <rotation z="10*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact12"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="11*360*degree / 48 + 90*degree"/>
-	  <rotation z="11*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact13"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="12*360*degree / 48 + 90*degree"/>
-	  <rotation z="12*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact14"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="13*360*degree / 48 + 90*degree"/>
-	  <rotation z="13*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact15"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="14*360*degree / 48 + 90*degree"/>
-	  <rotation z="14*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact16"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="15*360*degree / 48 + 90*degree"/>
-	  <rotation z="15*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact17"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="16*360*degree / 48 + 90*degree"/>
-	  <rotation z="16*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact18"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="17*360*degree / 48 + 90*degree"/>
-	  <rotation z="17*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact19"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="18*360*degree / 48 + 90*degree"/>
-	  <rotation z="18*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact20"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="19*360*degree / 48 + 90*degree"/>
-	  <rotation z="19*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact21"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="20*360*degree / 48 + 90*degree"/>
-	  <rotation z="20*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact22"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="21*360*degree / 48 + 90*degree"/>
-	  <rotation z="21*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact23"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="22*360*degree / 48 + 90*degree"/>
-	  <rotation z="22*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact24"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="23*360*degree / 48 + 90*degree"/>
-	  <rotation z="23*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact25"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="24*360*degree / 48 + 90*degree"/>
-	  <rotation z="24*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact26"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="25*360*degree / 48 + 90*degree"/>
-	  <rotation z="25*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact27"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="26*360*degree / 48 + 90*degree"/>
-	  <rotation z="26*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact28"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="27*360*degree / 48 + 90*degree"/>
-	  <rotation z="27*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact29"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="28*360*degree / 48 + 90*degree"/>
-	  <rotation z="28*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact30"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="29*360*degree / 48 + 90*degree"/>
-	  <rotation z="29*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact31"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="30*360*degree / 48 + 90*degree"/>
-	  <rotation z="30*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact32"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="31*360*degree / 48 + 90*degree"/>
-	  <rotation z="31*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact33"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="32*360*degree / 48 + 90*degree"/>
-	  <rotation z="32*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact34"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="33*360*degree / 48 + 90*degree"/>
-	  <rotation z="33*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact35"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="34*360*degree / 48 + 90*degree"/>
-	  <rotation z="34*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact36"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="35*360*degree / 48 + 90*degree"/>
-	  <rotation z="35*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact37"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="36*360*degree / 48 + 90*degree"/>
-	  <rotation z="36*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact38"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="37*360*degree / 48 + 90*degree"/>
-	  <rotation z="37*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact39"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="38*360*degree / 48 + 90*degree"/>
-	  <rotation z="38*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact40"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="39*360*degree / 48 + 90*degree"/>
-	  <rotation z="39*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact41"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="40*360*degree / 48 + 90*degree"/>
-	  <rotation z="40*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact42"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="41*360*degree / 48 + 90*degree"/>
-	  <rotation z="41*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact43"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="42*360*degree / 48 + 90*degree"/>
-	  <rotation z="42*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact44"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ  phi="43*360*degree / 48 + 90*degree"/>
-	  <rotation z="43*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact45"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ phi="44*360*degree / 48 + 90*degree"/>
-	  <rotation z="44*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact46"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ phi="45*360*degree / 48 + 90*degree"/>
-	  <rotation z="45*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact47"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ phi="46*360*degree / 48 + 90*degree"/>
-	  <rotation z="46*360*degree / 48"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact48"		 volume="lvMobSupRfContSingle">
-	  <positionRPhiZ phi="47*360*degree / 48 + 90*degree"/>
-	  <rotation z="47*360*degree / 48"/>
-	</physvol>
-      </volume>
-
-      <!-- RF contact mount -->
-      <volume name="lvMobSupRfContMount" material="Pipe:CuOFE" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="union" name="MobSupRfContUnion">
-	  <shape type="Tube" name="MobSupRfContCyl"
-		 dz="0.5*MobSupRfContactCylZ"
-		 rmin="MobSupRfContactRad"
-		 rmax="MobSupRfContactRad+MobSupRfContactThick"/>
-	  <shape type="Tube" name="MobSupRfContactFlange"
-		 dz="0.5*MobSupRfContactFlangeZ"
-		 rmin="MobSupRfContactRad+MobSupRfContactThick+0.01*mm"
-		 rmax="MobSupRfContactRad+MobSupRfContactThick+MobSupRfContactFlangeThick"/>
-	  <position z="MobSupRfContactCylZ/2-MobSupRfContactFlangeZ/2"/>
-	</shape>
-      </volume>
-
-      <!-- RF single contact -->
-      <volume name="lvMobSupRfContSingle" material="Pipe:CuBe17410" vis="Pipe:Support">
-	<shape type="BooleanShape" operation="union" name="MobSupRfContSingleUnion">
-	  <shape type="Tube" name="MobSupRfContSinglePlate"
-		 dz="0.5*MobSupRfContSinglePlateZ"
-		 rmin="MobSupRfContactRad - MobSupRfContSingleThick"
-		 rmax="MobSupRfContactRad"
-		 startPhiAngle="-360*degree / 96 + 90*degree"
-		 deltaPhiAngle="360*degree / 48"/>
-	  <shape type="Box" name="MobSupRfContSingleArm"
-		 dx="0.5*MobSupRfContSingleX"
-		 dy="0.5*MobSupRfContSingleThick"
-		 dz="0.5*MobSupRfContSingleArmZ"/>
-	  <position y="MobSupRfContSingleArmPosY" z="MobSupRfContSingleArmPosZ"/>
-	  <rotation x="MobSupRfContSingleArmAng"/>
-	  <shape type="Box" name="MobSupRfContSingleEnd"
-		 dx="0.5*MobSupRfContSingleX"
-		 dy="0.5*MobSupRfContSingleThick"
-		 dz="0.5*MobSupRfContSingleEndZ"/>
-	  <position y="MobSupRfContSingleEndPosY" z="MobSupRfContSingleEndPosZ"/>
-	  <rotation x="MobSupRfContSingleEndAng"/>
-	</shape>
-      </volume>
-
-      <!-- RF Contact -->
-      <volume name="lvMobSupRfContact" vis="Pipe:Support">
-	<physvol name="pvMobSupRfContMount"		 volume="lvMobSupRfContMount">
-	</physvol>
-	<physvol name="pvMobSupRfContactRing"		 volume="lvMobSupRfContactRing">
-	  <position z="MobSupRfContactCylZ/2-MobSupRfContSinglePlateZ/2-1*mm"/>
-	</physvol>
-      </volume>
-
-      <!-- Vacuum -->
-      <volume name="lvMobSupVacuum" material="Vacuum" vis="Pipe:Vacuum">
-	<shape type="Tube" name="MobSupVacuumCyl"
-               dz="0.5*MobSupFullZ"
-               rmin="0.0*mm"
-               rmax="MobSupVacuumRad"/>
-      </volume>
-
-      <!-- Mobile Support -->
-      <envelope type="Assembly"  name="lvPipeMobileSupport" vis="Pipe:BeforeVelo">
-	<physvol name="pvMobSupEntryUp"             volume="lvMobSupEntryUp">
-	  <position z="MobSupEntryUpPosZ"/>
-	</physvol>
-	<physvol name="pvMobSupFlangeUp"            volume="lvMobSupFlangeUp">
-	  <position z="MobSupFlangeUpPosZ"/>
-	</physvol>
-
-	<physvol name="pvMobSupTransTubeComplete"   volume="lvMobSupTransTubeComplete">
-	  <position z="MobSupTransTubePosZ"/>
-	</physvol>
-	<physvol name="pvMobSupBellow"              volume="lvMobSupBellow">
-	  <position z="MobSupBellowPosZ"/>
-	</physvol>
-	<physvol name="pvMobSupRfContact"           volume="lvMobSupRfContact">
-	  <position z="MobSupRfContactPosZ"/>
-	</physvol>
-
-	<physvol name="pvMobSupEntryDown"           volume="lvMobSupEntryDown">
-	  <position z="MobSupEntryDownPosZ"/>
-	</physvol>
-	<physvol name="pvMobSupFlangeDown"          volume="lvMobSupFlangeDown">
-	  <position z="MobSupFlangeDownPosZ"/>
-	</physvol>
-	<physvol name="pvMobSupVacuum"              volume="lvMobSupVacuum"/>
-      </envelope>
-
-      <comment> Pipe position in the region  </comment>
-      <position z="-2164.5*mm + BeforeMagnetZSize/2 - BeforeVeloZSize/2"/>
-
-    </detector>
-</comment>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/BeforeVelo.xml b/compact/components/Pipe/2025-v00.00/BeforeVelo.xml
deleted file mode 100644
index 5bfc5ecb8..000000000
--- a/compact/components/Pipe/2025-v00.00/BeforeVelo.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Pipe in the BeforeMagnetRegion area                -->
-<!--===========================================================================-->
-<lccdd>
-
-  <detectors>
-    <detector name="PipeBeforeVelo" type="DD4hep_VolumeAssembly" parent="${PipeBeforeVelo:parent}" vis="Pipe:Vis">
-      <!-- ************************************************************** -->
-      <!-- * BEAM PIPE                                                  * -->
-      <!-- * Sections in BeforeMagnetRegion                             * -->
-      <!-- *   from z=-2700 mm to z=-1079 mm                        * -->
-      <!-- *                                                            * -->
-      <!-- * UX85-1 in TT                                               * -->
-      <!-- *                                                            * -->
-      <!-- * Author: Magnus Lieng                                       * -->
-      <!-- *                                                            * -->
-      <!-- * Consists of:                                               * -->
-      <!-- *     - cylindrical section of 41 mm diameter                * -->
-      <!-- *     - cylindrical section of 76 mm diameter                * -->
-      <!-- *   and corresponding vaccum sections                        * -->
-      <!-- ************************************************************** -->
-
-      <include ref="BeforeVelo-Support.xml"/>
-
-      <!-- UX84 Cylinder of 40 mm radius -->
-      <volume name="lvUX842Cyl" vis="Pipe:BeforeVelo" material="Pipe:CuOFE">
-        <shape type="Tube" name="shape-UX84-2-Cylinder"
-               dz="0.5*UX842CylLength"         rmin="UX842CylRadius"      rmax="UX842CylRadius+UX842CylThick"/>
-      </volume>
-      <!-- Vacuum in UX84Cyl -->
-      <volume name="lvUX842Vacuum" vis="Pipe:Vacuum" material="Vacuum">
-        <shape type="Tube" name="shape-UX84-2-Vacuum"
-               dz="0.5*UX842CylLength"         rmax="UX842CylRadius"/>
-      </volume>
-      <!-- UX84 Flange of 76 mm radius -->
-      <volume name="lvUX84FlangeDown" vis="Pipe:BeforeVelo" material="Pipe:Steel316LN">
-        <shape type="Tube" name="shape-UX84-FlangeDown"
-              dz="0.5*UX84FlangeDownLength"
-              rmin="UX84FlangeDownRadius"
-              rmax="UX84FlangeDownRadius+UX84FlangeDownThick"/>
-      </volume>
-      <!-- Whole section: combination of sections -->
-      <envelope type="Assembly" name="lvUX84BeforeVelo" vis="Pipe:BeforeVelo">
-        <!-- Pipes of Cu -->
-        <physvol name="pvUX842Cyl"              volume="lvUX842Cyl"/>
-        <!-- Now the vacuum inside -->
-        <physvol name="pvUX842Vacuum"           volume="lvUX842Vacuum"/>
-        <!-- Flange of Steel -->
-        <physvol name="pvUX84FlangeDown"        volume="lvUX84FlangeDown">
-          <position z="UX84FlangeDownPosZ"/>
-        </physvol>
-      </envelope>
-
-      <comment> Pipe position in the region  </comment>
-      <position z="-1889.5*mm + Regions:BeforeMagnetZSize/2 - Regions:BeforeVeloZSize/2"/>
-
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/DebugDummies.xml b/compact/components/Pipe/2025-v00.00/DebugDummies.xml
deleted file mode 100644
index 54e03ddf6..000000000
--- a/compact/components/Pipe/2025-v00.00/DebugDummies.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<lccdd>
-  <define>
-    <!-- UT Geometry parameters -->
-    <constant name="UTFrameOuterWidth"    value="2586*mm"/>
-    <constant name="UTFrameOuterHeight"   value="2628*mm"/>
-    <constant name="UTBoxOuterThickness"  value="430.0*mm"/>
-    <constant name="UTSystemZ"            value="2485*mm"/>
-    <constant name="Rich1MasterXSize" value="2.50*m" />
-    <constant name="Rich1MasterYSize" value="5.0*m" />
-    <constant name="Rich1MasterZSize" value="2.30*m" />
-  </define>
-
-  <!-- Positions imported from BeforeMagnet/geometry.xml  -->
-  <detectors>
-    <!-- Dummy VP to support VP beampipe   -->
-    <detector name="VP" type="DD4hep_VolumeAssembly" parent="${VP:parent}" vis="LightGrey">
-      <envelope name="lvVP" vis="LightGrey" material="Air">
-        <shape type="BooleanShape" operation="union" name="VeloUnion">
-          <shape type="Tube" name="VeloTubs1"
-                 dz="VP:VeloZ/2"
-                 rmax="VP:VeloRad"/>
-          <shape type="Tube" name="VeloTubs2"
-                 dz="VP:VeloDSEndDeltaZ/2"
-                 rmax="VP:VeloRad"/>
-          <position z="VP:VeloDSEndStartZ+VP:VeloDSEndDeltaZ/2"/>
-          <shape type="Tube" name="VeloTubs3"
-                 dz="(VP:VeloEWFlangeZExcess+2*mm)/2"
-                 rmax="VP:vTankDownEWFlangeOR+2*mm"
-                 rmin="VP:vTankDownEWFlangeIR-2*mm"/>
-          <position z="VP:VeloDSEndStartZ+VP:VeloDSEndDeltaZ+(VP:VeloEWFlangeZExcess+2*mm)/2"/>
-        </shape>
-      </envelope>
-      <position z="0*mm"/>
-    </detector>
-    <!-- Dummy UT to support UT beampipe   -->
-    <detector name="UT" type="DD4hep_VolumeAssembly" parent="${UT:parent}" vis="LightGrey">
-      <envelope type="Box" vis="LightGrey" material="Air"
-                dx="UTFrameOuterWidth/2" dy="UTFrameOuterHeight/2" dz="UTBoxOuterThickness/2"/>
-      <position z="2495*mm"/>
-    </detector>
-    <!-- Dummy Rich1 to support Rich1 beampipe   -->
-    <detector name="Rich1" type="DD4hep_VolumeAssembly" parent="${Rich1:parent}" vis="LightGrey">
-      <envelope name="lvRich1Master" type="Box" vis="LightGrey" material="Air"
-                dx="Rich1MasterXSize/2" dy="Rich1MasterYSize/2" dz="Rich1MasterZSize/2"/>
-      <position z="1500*mm"/>
-    </detector>
-
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-Bakeout.xml b/compact/components/Pipe/2025-v00.00/Downstream-Bakeout.xml
deleted file mode 100644
index 25423beb5..000000000
--- a/compact/components/Pipe/2025-v00.00/Downstream-Bakeout.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--=============================Downstream bakeout============================-->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-
-    <!--==================================================================================-->
-    <!--===================================Bakeout========================================-->
-    <!--==================================================================================-->
-    <detector name="DownstreamPipeBakeout" type="DD4hep_VolumeAssembly" parent="${PipeDownstream:parent}" vis="Pipe:Vis">
-
-      <!-- UX85-4 bakeout -->
-      <volume name="lvUX854Bakeout" material="Pipe:BakeOutAerogel" vis="Pipe:Bakeout">
-	<shape type="ConeSegment" name="UX85-4-Bakeout-Downstream"
-               dz="0.5*UX854BakeoutLenght"
-               rmin1="UX854BakeoutRadiusZmin"
-               rmin2="UX854BakeoutRadiusZmax"
-               rmax1="UX854BakeoutRadiusZmin + UX854BakeoutThick"
-               rmax2="UX854BakeoutRadiusZmax + UX854BakeoutThick"/>
-
-      </volume>
-
-      <!-- UX85-4 Win05 bakeout -->
-      <volume name="lvUX854Win05BakeoutMain" material="Pipe:BakeOutAerogel" vis="Pipe:Bakeout">
-	<shape type="BooleanShape" operation="subtraction" name="UX854Win05BakeoutSub">
-	  <shape type="ConeSegment" name="UX85-4-WindowBakeout15degree-05"
-		 dz="0.5*UX854Win05BakeoutLenght"
-		 rmin1="UX854Win05BakeoutRadiusZmin"
-		 rmin2="UX854Win05BakeoutRadiusZmax"
-		 rmax1="UX854Win05BakeoutRadiusZmin + UX854Win05BakeoutThick"
-		 rmax2="UX854Win05BakeoutRadiusZmax + UX854Win05BakeoutThick"/>
-	  <shape type="Tube" name="UX85-4-Win05Bakeout-Hole-1"
-		 dz="0.5*UX854Win05BakeoutHole1Length"
-		 rmax="UX854Win05BakeoutHole1Radius"/>
-	  <transformation>
-	    <position z="UX854Win05BakeoutHole1PosZ"/>
-	    <rotation x="UX854Win05BakeoutHole1RotX"/>
-	    <position/>
-	    <rotation z="UX854Win05BakeoutHole1RotZ"/>
-	    <posRPhiZ r="UX854Win05BakeoutHole1PosR" phi="UX854Win05BakeoutHole1PosPhi"/>
-	  </transformation>
-	  <shape type="Tube" name="UX85-4-Win05Bakeout-Hole-2"
-		 dz="0.5*UX854Win05BakeoutHole2Length"
-		 rmax="UX854Win05BakeoutHole2Radius"/>
-	  <transformation>
-	    <position/>
-	    <rotation x="UX854Win05BakeoutHole2RotX"/>
-	    <position y="UX854Win05BakeoutHole2PosY" z="UX854Win05BakeoutHole2PosZ"/>
-	  </transformation>
-	  <shape type="Tube" name="UX85-4-Win05Bakeout-Hole-3"
-		 dz="0.5*UX854Win05BakeoutHole3Length"
-		 rmax="UX854Win05BakeoutHole3Radius"/>
-	  <transformation>
-	    <position/>
-	    <rotation y="UX854Win05BakeoutHole3RotY"/>
-	    <position x="UX854Win05BakeoutHole3PosX" z="UX854Win05BakeoutHole3PosZ"/>
-	  </transformation>
-	  <shape type="Tube" name="UX85-4-Win05Bakeout-Hole-4"
-		 dz="0.5*UX854Win05BakeoutHole4Length"
-		 rmax="UX854Win05BakeoutHole4Radius"/>
-	  <transformation>
-	    <position/>
-	    <rotation y="UX854Win05BakeoutHole4RotY"/>
-	    <position x="UX854Win05BakeoutHole4PosX" z="UX854Win05BakeoutHole4PosZ"/>
-	  </transformation>
-	</shape>
-      </volume>
-
-      <envelope type="Assembly" name="lvUX85BakeoutDownstream" vis="Pipe:Vis">
-	<physvol name="pvUX854Bakeout"              volume="lvUX854Bakeout">
-	  <position z="UX854BakeoutZPos"/>
-	</physvol>
-	<physvol name="pvUX854Win05BakeoutMain"    volume="lvUX854Win05BakeoutMain">
-	  <position z="UX854Win05BakeoutZpos"/>
-	</physvol>
-      </envelope>
-      <position z="UX853Rich2DownSplitZposIP - Regions:DownstreamZPos"/>
-      <nodebug/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-BakeoutParams.xml b/compact/components/Pipe/2025-v00.00/Downstream-BakeoutParams.xml
deleted file mode 100644
index 8a2782d51..000000000
--- a/compact/components/Pipe/2025-v00.00/Downstream-BakeoutParams.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-
-  <define>
-
-
-    <!-- ***************************************************************** -->
-    <!-- *  BeamPipe bakeout geometry parameters                         * -->
-    <!-- *                                                               * -->
-    <!-- *  Date: 2006-03-20                                             * -->
-    <!-- *  Author: Gloria Corti                                         * -->
-    <!-- *  Modified by Daria Savrina, Oct. 2008 to include bakeout      * -->
-    <!-- *  around the end window and switch off part under M1, ECAL     * -->
-    <!-- *  as installed                                                 * -->
-    <!-- *                                                               * -->
-    <!-- ***************************************************************** -->
-
-
-    <!-- UX85-4 bakeout -->
-    <constant  name="UX854BakeoutStartIP"
-               value="UX854ZStartIP + UX854Flange01Lenght"/>
-    <constant  name="UX854BakeoutLenght"
-               value="UX854Cone02Lenght + UX854Cone03Lenght + UX854Cone04Lenght"/>
-    <constant  name="UX854BakeoutDeltaPipeInner"      value="4.00*mm + 0.10*mm"/>
-    <constant  name="UX854BakeoutRadiusZmin"
-               value="UX854BakeoutStartIP * tan(UX851to4Angle)
-                      + UX854BakeoutDeltaPipeInner"/>
-    <constant  name="UX854BakeoutRadiusZmax"
-               value="(UX854BakeoutStartIP + UX854BakeoutLenght)*
-                      tan(UX851to4Angle) + UX854BakeoutDeltaPipeInner"/>
-    <constant  name="UX854BakeoutThick"               value="10.00*mm"/>
-    <constant  name="UX854BakeoutZPos"
-               value="UX853DownstreamLenght + UX85C13100Lenght + UX854Flange01Lenght + 0.5*UX854BakeoutLenght"/>
-
-    <!-- UX85-4 Win05 bakeout -->
-    <constant name="UX854Win05BakeoutLenght"        value="599.00*mm"/>
-    <constant name="UX854Win05BakeoutRadiusZmin"    value="UX854Win05RadiusZmin + UX854Win05Thick"/>
-    <constant name="UX854Win05BakeoutRadiusZmax"    value="UX854Win05RadiusZmax + UX854Win05Thick"/>
-    <constant name="UX854Win05BakeoutThick"         value="10.00*mm"/>
-    <constant name="UX854Win05BakeoutZpos"
-              value="UX853DownstreamLenght + UX85C13100Lenght + UX854Flange01Lenght + UX854BakeoutLenght + 0.5*UX854Win05BakeoutLenght"/>
-
-    <constant name="UX854Win05BakeoutHole1Length"   value="300.0*mm"/>
-    <constant name="UX854Win05BakeoutHole1Radius"   value="19.0*mm + UX854Win05Pipe1Thick"/>
-    <constant name="UX854Win05BakeoutHole1PosZ"     value="-119.0*mm"/>
-    <constant name="UX854Win05BakeoutHole1RotX"     value="-15.0*degree"/>
-    <constant name="UX854Win05BakeoutHole1RotZ"     value="45.0*degree"/>
-    <constant name="UX854Win05BakeoutHole1PosR"     value="145.3*mm"/>
-    <constant name="UX854Win05BakeoutHole1PosPhi"   value="135.0*degree"/>
-
-    <constant name="UX854Win05BakeoutHole2Length"   value="100.0*mm"/>
-    <constant name="UX854Win05BakeoutHole2Radius"   value="31.75*mm + UX854Win05Pipe2Thick"/>
-    <constant name="UX854Win05BakeoutHole2RotX"     value="90.0*degree"/>
-    <constant name="UX854Win05BakeoutHole2PosY"     value="95.0*mm"/>
-    <constant name="UX854Win05BakeoutHole2PosZ"     value="69.0*mm"/>
-
-    <constant name="UX854Win05BakeoutHole3Length"   value="300.0*mm"/>
-    <constant name="UX854Win05BakeoutHole3Radius"   value="30.0*mm + UX854Win05Pipe3Thick"/>
-    <constant name="UX854Win05BakeoutHole3RotY"     value="-20.0*degree"/>
-    <constant name="UX854Win05BakeoutHole3PosX"     value="-122.0*mm"/>
-    <constant name="UX854Win05BakeoutHole3PosZ"     value="-32.76*mm"/>
-
-    <constant name="UX854Win05BakeoutHole4Length"   value="200.0*mm"/>
-    <constant name="UX854Win05BakeoutHole4Radius"   value="9.5*mm + UX854Win05Pipe4Thick"/>
-    <constant name="UX854Win05BakeoutHole4RotY"     value="45.0*degree"/>
-    <constant name="UX854Win05BakeoutHole4PosX"     value="64.0*mm"/>
-    <constant name="UX854Win05BakeoutHole4PosZ"     value="191.6*mm"/>
-
-    <constant name="UX854Win05BakeoutPipeExtra"     value="50.0*mm"/> <!-- To accomodate cuts -->
-
-    <constant name="UX854Win05BakeoutPipe1BasicLength"   value="226.7*mm"/>
-    <constant name="UX854Win05BakeoutPipe1Length"   value="UX854Win05BakeoutPipe1BasicLength + UX854Win05BakeoutPipeExtra"/>
-    <constant name="UX854Win05BakeoutPipe1Thick"    value="10.0*mm"/>
-
-    <constant name="UX854Win05BakeoutPipe2CutLength" value="UX854Win05BakeoutHole2Radius*2"/>
-    <constant name="UX854Win05BakeoutPipe2BasicLength" value="135.0*mm"/>
-    <constant name="UX854Win05BakeoutPipe2Length"   value="UX854Win05BakeoutPipe2BasicLength + UX854Win05BakeoutPipeExtra
-							   + UX854Win05BakeoutPipe2CutLength"/>
-    <constant name="UX854Win05BakeoutPipe2Thick"    value="10.0*mm"/>
-    <constant name="UX854Win05BakeoutPipe2ExtendBasicLength" value="142.5*mm"/>
-    <constant name="UX854Win05BakeoutPipe2ExtendLength" value="UX854Win05BakeoutPipe2ExtendBasicLength + UX854Win05BakeoutPipe2CutLength"/>
-
-    <constant name="UX854Win05BakeoutPipe3BasicLength"   value="79.5*mm"/>
-    <constant name="UX854Win05BakeoutPipe3Length"   value="UX854Win05BakeoutPipe3BasicLength + UX854Win05BakeoutPipeExtra"/> <!--"182.0*mm"/>-->
-    <constant name="UX854Win05BakeoutPipe3Thick"    value="2.0*mm"/>
-    <constant name="UX854Win05BakeoutPipe3ExtendLength" value="50.5*mm"/>
-    <constant name="UX854Win05BakeoutPipe3Rad"      value="17.0*mm + UX854Win05Pipe3Thick"/>
-
-    <constant name="UX854Win05BakeoutPipe4BasicLength"   value="31.5*mm"/>
-    <constant name="UX854Win05BakeoutPipe4Length"   value="UX854Win05BakeoutPipe4BasicLength + UX854Win05BakeoutPipeExtra"/>
-    <constant name="UX854Win05BakeoutPipe4Thick"    value="10.0*mm"/>
-
-  </define>
-
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-Compensator.xml b/compact/components/Pipe/2025-v00.00/Downstream-Compensator.xml
deleted file mode 100644
index 4e0236e75..000000000
--- a/compact/components/Pipe/2025-v00.00/Downstream-Compensator.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--==================================UX853====================================-->
-<!--===========================================================================-->
-<pipe>
-  <!-- Compensator at 2800 - Flange -->
-  <volume name="lvUX85C13100Flange01" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-C13100-Flange-01"
-           dz="0.5*UX85C13100Flange01Lenght"
-           rmin1="UX85C13100Flange01RadiusZmin"
-           rmin2="UX85C13100Flange01RadiusZmax"
-           rmax1="UX85C13100Flange01OuterRadius"
-           rmax2="UX85C13100Flange01OuterRadius"/>
-  </volume>
-  <!-- Compensator at 2800 cone of 10 mrad -->
-  <volume name="lvUX85C13100Cone02" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-C13100-Cone10mrad-02"
-           dz="0.5*UX85C13100Cone02Lenght"
-           rmin1="UX85C13100Cone02RadiusZmin"
-           rmin2="UX85C13100Cone02RadiusZmax"
-           rmax1="UX85C13100Cone02RadiusZmin + UX85C13100Cone02Thick"
-           rmax2="UX85C13100Cone02RadiusZmax + UX85C13100Cone02Thick"/>
-  </volume>
-  <!-- Compensator at 2800 connection to bellow -->
-  <volume name="lvUX85C13100BellowCnct03" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-C13100-Connection-03"
-           dz="0.5*UX85C13100BellowCnct03Lenght"
-           rmin1="UX85C13100BellowCnct03RadiusZmin"
-           rmin2="UX85C13100BellowCnct03RadiusZmax"
-           rmax1="UX85C13100BellowCnct03RadiusZmin + UX85C13100BellowCnct03Thick"
-           rmax2="UX85C13100BellowCnct03RadiusZmax + UX85C13100BellowCnct03Thick"/>
-  </volume>
-
-  <volume name="lvUX85C13100BellowBase" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Polycone" name="UX85-C13100-BellowBase-04">
-      <zplane z="-0.5*UX85C13100BellowLenght"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLenght + UX85C13100BellowWallThick"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLenght + UX85C13100BellowWallThick"
-              rmin="UX85C13100BellowOuterRadius - UX85C13100BellowWallThick"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLenght + UX85C13100BellowWallThick +
-                 UX85C13100BellowStep"
-              rmin="UX85C13100BellowOuterRadius - UX85C13100BellowWallThick"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLenght + UX85C13100BellowWallThick +
-                 UX85C13100BellowStep"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLenght + 2*UX85C13100BellowWallThick +
-                 UX85C13100BellowStep"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLenght + 2*UX85C13100BellowWallThick +
-                 UX85C13100BellowStep"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowInnerRadius + UX85C13100BellowWallThick "/>
-      <zplane z="-0.5*UX85C13100BellowLenght + 2*UX85C13100BellowWallThick +
-                 2*UX85C13100BellowStep"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowInnerRadius + UX85C13100BellowWallThick "/>
-    </shape>
-  </volume>
-
-  <volume name="lvUX85C13100BellowLast" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Polycone" name="UX85-C13100-BellowLast-04">
-      <zplane z="-0.5*UX85C13100BellowLastLenght"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLastLenght + UX85C13100BellowWallThick"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLastLenght + UX85C13100BellowWallThick"
-              rmin="UX85C13100BellowOuterRadius - UX85C13100BellowWallThick"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLastLenght + UX85C13100BellowWallThick +
-                 UX85C13100BellowStep"
-              rmin="UX85C13100BellowOuterRadius - UX85C13100BellowWallThick"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLastLenght + UX85C13100BellowWallThick +
-                 UX85C13100BellowStep"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C13100BellowLastLenght + 2*UX85C13100BellowWallThick +
-                 UX85C13100BellowStep"
-              rmin="UX85C13100BellowInnerRadius"
-              rmax="UX85C13100BellowOuterRadius"/>
-    </shape>
-  </volume>
-
-  <!-- Compensator at 2800 Bellow -->
-  <volume name="lvUX85C13100Bellow" vis="Pipe:Downstream">
-    <paramphysvol number="UX85C13100BellowNConv-1">
-      <physvol name="pvUX85C13100BellowBase"           volume="lvUX85C13100BellowBase"/>
-      <position z="UX85C13100BellowPitch"/>
-    </paramphysvol>
-    <physvol name="pvUX85C13100BellowLast"             volume="lvUX85C13100BellowLast">
-      <position z="-0.5*UX85C13100BellowLenght +
-                   (UX85C13100BellowNConv-1)*UX85C13100BellowPitch +
-                   0.5*UX85C13100BellowLastLenght"/>
-    </physvol>
-  </volume>
-
-
-  <!-- Compensator at 13100 connection to bellow -->
-  <volume name="lvUX85C13100BellowCnct05" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-C13100-Connection-05"
-           dz="0.5*UX85C13100BellowCnct05Lenght"
-           rmin1="UX85C13100BellowCnct05RadiusZmin"
-           rmin2="UX85C13100BellowCnct05RadiusZmax"
-           rmax1="UX85C13100BellowCnct05RadiusZmin + UX85C13100BellowCnct05Thick"
-           rmax2="UX85C13100BellowCnct05RadiusZmax + UX85C13100BellowCnct05Thick"/>
-  </volume>
-
-  <!-- Compensator at 13100 cone of 10 mrad -->
-  <volume name="lvUX85C13100Cone06" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-C13100-Cone10mrad-06"
-           dz="0.5*UX85C13100Cone06Lenght"
-           rmin1="UX85C13100Cone06RadiusZmin"
-           rmin2="UX85C13100Cone06RadiusZmax"
-           rmax1="UX85C13100Cone06RadiusZmin + UX85C13100Cone06Thick"
-           rmax2="UX85C13100Cone06RadiusZmax + UX85C13100Cone06Thick"/>
-  </volume>
-
-  <!-- Compensator at 13100 connection to bellow -->
-  <volume name="lvUX85C13100BellowCnct07" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-C13100-Connection-07"
-           dz="0.5*UX85C13100BellowCnct07Lenght"
-           rmin1="UX85C13100BellowCnct07RadiusZmin"
-           rmin2="UX85C13100BellowCnct07RadiusZmax"
-           rmax1="UX85C13100BellowCnct07RadiusZmin + UX85C13100BellowCnct07Thick"
-           rmax2="UX85C13100BellowCnct07RadiusZmax + UX85C13100BellowCnct07Thick"/>
-  </volume>
-
-  <!-- Compensator at 13100 connection to bellow -->
-  <volume name="lvUX85C13100BellowCnct09" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-C13100-Connection-09"
-           dz="0.5*UX85C13100BellowCnct09Lenght"
-           rmin1="UX85C13100BellowCnct09RadiusZmin"
-           rmin2="UX85C13100BellowCnct09RadiusZmax"
-           rmax1="UX85C13100BellowCnct09RadiusZmin + UX85C13100BellowCnct09Thick"
-           rmax2="UX85C13100BellowCnct09RadiusZmax + UX85C13100BellowCnct09Thick"/>
-  </volume>
-
-  <!-- Compensator at 13100 cone of 10 mrad -->
-  <volume name="lvUX85C13100Cone10" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-C13100-Cone10mrad-10"
-           dz="0.5*UX85C13100Cone10Lenght"
-           rmin1="UX85C13100Cone10RadiusZmin"
-           rmin2="UX85C13100Cone10RadiusZmax"
-           rmax1="UX85C13100Cone10RadiusZmin + UX85C13100Cone10Thick"
-           rmax2="UX85C13100Cone10RadiusZmax + UX85C13100Cone10Thick"/>
-  </volume>
-
-  <!-- Compensator at 13100 Flange -->
-  <volume name="lvUX85C13100Flange11" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-C13100-Flange-11"
-           dz="0.5*UX85C13100Flange11Lenght"
-           rmin1="UX85C13100Flange11RadiusZmin"
-           rmin2="UX85C13100Flange11RadiusZmax"
-           rmax1="UX85C13100Flange11OuterRadius"
-           rmax2="UX85C13100Flange11OuterRadius"/>
-  </volume>
-
-  <!-- Vacuum in UX85 Compensator 13100 -->
-  <volume name="lvUX85C13100Vacuum01" material="Vacuum" vis="Pipe:Vacuum">
-    <shape type="ConeSegment" name="UX85-C13100-Vacuum-01"
-           dz="0.5*UX85C13100Vacuum01Lenght"
-           rmax1="UX85C13100Flange01RadiusZmin"
-           rmax2="UX85C13100Flange11RadiusZmax"/>
-  </volume>
-
-  <!-- Compensator -->
-  <volume name="lvUX85Compensator13100" vis="Pipe:Downstream">
-    <physvol name="pvUX85C13100Flange01"          volume="lvUX85C13100Flange01">
-      <position z="UX85C13100Flange01Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100Cone02"            volume="lvUX85C13100Cone02">
-      <position z="UX85C13100Cone02Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100BellowCnct03"      volume="lvUX85C13100BellowCnct03">
-      <position z="UX85C13100BellowCnct03Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100Bellow04"          volume="lvUX85C13100Bellow">
-      <position z="UX85C13100Bellow04Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100BellowCnct05"      volume="lvUX85C13100BellowCnct05">
-      <position z="UX85C13100BellowCnct05Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100Cone06"            volume="lvUX85C13100Cone06">
-      <position z="UX85C13100Cone06Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100BellowCnct07"      volume="lvUX85C13100BellowCnct07">
-      <position z="UX85C13100BellowCnct07Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100Bellow08"          volume="lvUX85C13100Bellow">
-      <position z="UX85C13100Bellow08Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100BellowCnct09"      volume="lvUX85C13100BellowCnct09">
-      <position z="UX85C13100BellowCnct09Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100Cone10"            volume="lvUX85C13100Cone10">
-      <position z="UX85C13100Cone10Zpos"/>
-    </physvol>
-    <physvol name="pvUX85C13100Flange11"          volume="lvUX85C13100Flange11">
-      <position z="UX85C13100Flange11Zpos"/>
-    </physvol>
-    <!-- Now the vacuum inside -->
-    <physvol name="pvUX85C13100Vacuum01"          volume="lvUX85C13100Vacuum01">
-      <position z="0.5*UX85C13100Vacuum01Lenght"/>
-    </physvol>
-  </volume>
-
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-PipeParams.xml b/compact/components/Pipe/2025-v00.00/Downstream-PipeParams.xml
deleted file mode 100644
index a533ee861..000000000
--- a/compact/components/Pipe/2025-v00.00/Downstream-PipeParams.xml
+++ /dev/null
@@ -1,438 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-
-  <define>
-    <!-- UX85-3 Cone 10 mrad of Beryllium cylindrical part for support -->
-    <!-- Split Rich2/Downstream                                        -->
-    <constant name="UX853Cone12BLenght"
-              value="(UX85C13100ZStartIP - UX853ConeSupportFromEnd) -
-                     UX853Rich2DownSplitZposIP"/>
-    <constant name="UX853Cone12BRadiusZmin"
-              value="UX853Rich2DownSplitZposIP * tan(UX851to4Angle)"/>
-    <constant name="UX853Cone12BRadiusZmax"
-              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX853Cone12BOuterRadius" value="122.10*mm"/>
-    <constant name="UX853Cone12BZpos"
-              value="0.5*UX853Cone12BLenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 2.4 mm thick -->
-    <constant name="UX853Cone14Lenght"      value= "5.00*mm"/>
-
-    <constant name="UX853Cone13Lenght"
-              value="UX853ConeSupportFromEnd - UX853Cone15Flange17Lenght -
-                     UX853Cone14Lenght"/>
-    <constant name="UX853Cone13RadiusZmin"  value="UX853Cone12ARadiusZmax"/>
-    <constant name="UX853Cone13RadiusZmax"
-              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
-                     UX853Cone13Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone13Thick"       value="2.40*mm"/>
-    <constant name="UX853Cone13Zpos"
-              value="UX853Cone12BLenght + 0.5*UX853Cone13Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 3.5 mm thick for welding -->
-    <constant name="UX853Cone14RadiusZmin"  value="UX853Cone13RadiusZmax"/>
-    <constant name="UX853Cone14RadiusZmax"
-              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
-                     UX853Cone13Lenght + UX853Cone14Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone14Thick"       value="3.50*mm"/>
-    <constant name="UX853Cone14Zpos"
-              value="UX853Cone12BLenght + UX853Cone13Lenght + 0.5*UX853Cone14Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Aluminium 3.5 mm thick -->
-    <constant name="UX853Cone16Lenght"      value="16.00*mm"/>
-    <constant name="UX853Flange17Lenght"    value="48.00*mm"/>
-
-    <constant name="UX853Cone15Lenght"
-              value="UX853Cone15Flange17Lenght - UX853Flange17Lenght - UX853Cone16Lenght"/>
-    <constant name="UX853Cone15RadiusZmin"  value="UX853Cone14RadiusZmax"/>
-    <constant name="UX853Cone15RadiusZmax"
-              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
-                     UX853Cone13Lenght + UX853Cone14Lenght + UX853Cone15Lenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX853Cone15Thick"       value="3.50*mm"/>
-    <constant name="UX853Cone15Zpos"
-              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
-                     0.5*UX853Cone15Lenght"/>
-
-    <!-- UX85-3 Step 10 mrad of Aluminium for welding to flange -->
-    <constant name="UX853Cone16RadiusZmin"  value="UX853Cone15RadiusZmax"/>
-    <constant name="UX853Cone16RadiusZmax"
-              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
-                     UX853Cone13Lenght + UX853Cone14Lenght + UX853Cone15Lenght +
-                     UX853Cone16Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone16OuterRadius" value="139.85*mm"/>
-    <constant name="UX853Cone16Zpos"
-              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
-                     UX853Cone15Lenght + 0.5*UX853Cone16Lenght"/>
-
-    <!-- UX85-3 Bimetallic Flange - Aluminium -->
-    <constant name="UX853Flange17BLenght"   value="10.00*mm"/>
-    <constant name="UX853Flange17ALenght"
-              value="UX853Flange17Lenght - UX853Flange17BLenght"/>
-
-    <constant name="UX853Flange17ARadiusZmin"  value="UX853Cone16RadiusZmax"/>
-    <constant name="UX853Flange17ARadiusZmax"
-              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
-                     UX853Cone13Lenght + UX853Cone14Lenght + UX853Cone15Lenght +
-                     UX853Cone16Lenght + UX853Flange17ALenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Flange17AOuterRadius" value="162.50*mm"/>
-    <constant name="UX853Flange17AZpos"
-              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
-                     UX853Cone15Lenght + UX853Cone16Lenght + 0.5*UX853Flange17ALenght"/>
-
-    <!-- UX85-3 Bimetallic Flange - St.Steel -->
-    <constant name="UX853Flange17BRadiusZmin"  value="UX853Flange17ARadiusZmax"/>
-    <constant name="UX853Flange17BRadiusZmax"
-              value="(UX853Rich2DownSplitZposIP + UX853Cone12BLenght +
-                     UX853Cone13Lenght + UX853Cone14Lenght + UX853Cone15Lenght +
-                     UX853Cone16Lenght + UX853Flange17Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Flange17BOuterRadius" value="UX853Flange17AOuterRadius"/>
-    <constant name="UX853Flange17BZpos"
-              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
-                     UX853Cone15Lenght + UX853Cone16Lenght + UX853Flange17ALenght +
-                     0.5*UX853Flange17BLenght"/>
-
-    <!-- UX85-3 Downstream and Vacuum inside for whole of it -->
-    <constant name="UX853DownstreamLenght"
-              value="UX853Cone12BLenght + UX853Cone13Lenght + UX853Cone14Lenght +
-                     UX853Cone15Lenght + UX853Cone16Lenght + UX853Flange17Lenght"/>
-
-    <!-- ***************************************************************** -->
-    <!-- Compensator at 13100mm (UX85-3 shorter by 5mm i.e. at 13095mm   * -->
-    <!-- ***************************************************************** -->
-    <!-- Compensator at 13100 Flange -->
-    <constant name="UX85C13100Flange01Lenght"      value="26.00*mm"/>
-    <constant name="UX85C13100Flange01RadiusZmin"
-              value="UX85C13100ZStartIP * tan(UX851to4Angle)"/>
-    <constant name="UX85C13100Flange01RadiusZmax"
-              value="(UX85C13100ZStartIP + UX85C13100Flange01Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX85C13100Flange01OuterRadius" value="UX853Flange17AOuterRadius"/>
-    <constant name="UX85C13100Flange01Zpos"        value="0.5*UX85C13100Flange01Lenght"/>
-
-    <!-- Compensator at 13100 cone of 10 mrad -->
-    <constant name="UX85C13100Cone02Lenght"
-              value="110.00*mm - UX85C13100Flange01Lenght"/>
-    <constant name="UX85C13100Cone02RadiusZmin"    value="UX85C13100Flange01RadiusZmax"/>
-    <constant name="UX85C13100Cone02RadiusZmax"
-              value="(UX85C13100ZStartIP + UX85C13100Flange01Lenght + UX85C13100Cone02Lenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX85C13100Cone02Thick"         value="3.00*mm"/>
-    <constant name="UX85C13100Cone02Zpos"
-              value="UX85C13100Flange01Lenght + 0.5*UX85C13100Cone02Lenght"/>
-
-    <!-- Compensator at 13100 connection to bellow -->
-    <constant name="UX85C13100BellowCnct03Lenght"     value="40.00*mm"/>
-    <constant name="UX85C13100BellowCnct03RadiusZmin" value="UX85C13100Cone02RadiusZmax"/>
-    <constant name="UX85C13100BellowCnct03RadiusZmax" value="144.00*mm"/>
-    <constant name="UX85C13100BellowCnct03Thick"      value="3.00*mm"/>
-    <constant name="UX85C13100BellowCnct03Zpos"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     0.5*UX85C13100BellowCnct03Lenght"/>
-
-    <!-- Compensator at 13100 Bellow -->
-    <!-- Pitch different then drawing to take into account pre-expantion 0.5*(10+5)*mm    -->
-    <!-- to keep non periodic number compensate in drift tube by 0.5mm                    -->
-    <constant name="UX85C13100BellowNConv"        value="10"/>
-    <constant name="UX85C13100BellowWallThick"    value="0.40*mm"/>
-    <constant name="UX85C13100BellowStep"         value="10.45*mm"/>
-
-    <constant name="UX85C13100BellowPitch"
-              value="2*(UX85C13100BellowWallThick + UX85C13100BellowStep)"/>
-
-    <constant name="UX85C13100BellowLastLenght"
-              value="2*UX85C13100BellowWallThick + UX85C13100BellowStep"/>
-
-    <constant name="UX85C13100BellowInnerRadius"  value="144.00*mm"/>
-    <constant name="UX85C13100BellowOuterRadius"  value="166.00*mm"/>
-
-    <constant name="UX85C13100BellowLenght"
-              value="(UX85C13100BellowNConv - 1)*UX85C13100BellowPitch +
-                     UX85C13100BellowLastLenght"/>
-    <constant name="UX85C13100Bellow04Zpos"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + 0.5*UX85C13100BellowLenght"/>
-
-    <!-- Compensator at 13100 connection to bellow -->
-    <constant name="UX85C13100BellowCnct05Lenght"      value="40.00*mm"/>
-    <constant name="UX85C13100BellowCnct05RadiusZmin"
-              value="UX85C13100BellowCnct03RadiusZmax"/>
-    <constant name="UX85C13100BellowCnct05RadiusZmax"  value="134.90*mm"/>
-    <constant name="UX85C13100BellowCnct05Thick"       value= "3.00*mm"/>
-    <constant name="UX85C13100BellowCnct05Zpos"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     0.5*UX85C13100BellowCnct05Lenght"/>
-
-    <!-- Compensator at 13100 cone of 10 mrad, lenght compensate for approx in bellow step -->
-    <constant name="UX85C13100Cone06Lenght"            value="526.90*mm"/>
-    <constant name="UX85C13100Cone06RadiusZmin"
-              value="UX85C13100BellowCnct05RadiusZmax"/>
-    <constant name="UX85C13100Cone06RadiusZmax"        value="140.15*mm"/>
-    <constant name="UX85C13100Cone06Thick"             value= "3.00*mm"/>
-    <constant name="UX85C13100Cone06Zpos"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct05Lenght + 0.5*UX85C13100Cone06Lenght"/>
-
-    <!-- Compensator at 13100 connection to bellow -->
-    <constant name="UX85C13100BellowCnct07Lenght"      value="25.00*mm"/>
-    <constant name="UX85C13100BellowCnct07RadiusZmin"
-              value="UX85C13100Cone06RadiusZmax"/>
-    <constant name="UX85C13100BellowCnct07RadiusZmax"  value="144.00*mm"/>
-    <constant name="UX85C13100BellowCnct07Thick"       value= "3.00*mm"/>
-    <constant name="UX85C13100BellowCnct07Zpos"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
-                     0.5*UX85C13100BellowCnct07Lenght"/>
-
-    <!-- Compensator at 13100 Bellow -->
-    <constant name="UX85C13100Bellow08Zpos"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
-                     UX85C13100BellowCnct07Lenght + 0.5*UX85C13100BellowLenght"/>
-
-    <!-- Compensator at 13100 connection to bellow -->
-    <constant name="UX85C13100BellowCnct09Lenght"       value="30.00*mm"/>
-    <constant name="UX85C13100BellowCnct09RadiusZmin"
-              value="UX85C13100BellowCnct07RadiusZmax"/>
-    <constant name="UX85C13100BellowCnct09RadiusZmax"
-              value="(UX85C13100ZStartIP + UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
-                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct09Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX85C13100BellowCnct09Thick"        value=" 3.00*mm"/>
-    <constant name="UX85C13100BellowCnct09Zpos"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
-                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
-                     0.5*UX85C13100BellowCnct09Lenght"/>
-
-    <!-- Compensator at 13100 cone of 10 mrad -->
-    <constant name="UX85C13100Flange11Lenght"    value="26.00*mm"/>
-
-    <constant name="UX85C13100Cone10Lenght"
-              value="120.00*mm - UX85C13100Flange11Lenght"/>
-    <constant name="UX85C13100Cone10RadiusZmin"
-              value="UX85C13100BellowCnct09RadiusZmax"/>
-    <constant name="UX85C13100Cone10RadiusZmax"
-              value="(UX85C13100ZStartIP + UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
-                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct09Lenght + UX85C13100Cone10Lenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX85C13100Cone10Thick"        value=" 3.00*mm"/>
-    <constant name="UX85C13100Cone10Zpos"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
-                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct09Lenght + 0.5*UX85C13100Cone10Lenght"/>
-
-    <!-- Compensator at 13100 Flange -->
-    <constant name="UX85C13100Flange11RadiusZmin"  value="UX85C13100Cone10RadiusZmin"/>
-    <constant name="UX85C13100Flange11RadiusZmax"  value="144.00*mm"/>
-    <constant name="UX85C13100Flange11OuterRadius" value="177.50*mm"/>
-    <constant name="UX85C13100Flange11Zpos"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
-                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct09Lenght + UX85C13100Cone10Lenght +
-                     0.5*UX85C13100Flange11Lenght"/>
-
-    <!-- Compensator at 13100 -->
-    <constant name="UX85C13100Lenght"
-              value="UX85C13100Flange01Lenght + UX85C13100Cone02Lenght +
-                     UX85C13100BellowCnct03Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct05Lenght + UX85C13100Cone06Lenght +
-                     UX85C13100BellowCnct07Lenght + UX85C13100BellowLenght +
-                     UX85C13100BellowCnct09Lenght + UX85C13100Cone10Lenght +
-                     UX85C13100Flange11Lenght"/>
-
-    <!-- Vacuum sections overlapping all the mechanical sections above -->
-    <!-- only segmentation due to shape or regions (ignore bellows)    -->
-    <constant name="UX85C13100Vacuum01Lenght"
-              value="UX85C13100Lenght"/>
-
-    <!-- ***************************************************************** -->
-    <!-- * UX85-4 Parameters                                             * -->
-    <!-- ***************************************************************** -->
-    <!-- UX85-4 Flange  -->
-    <constant name="UX854Flange01Lenght"         value="28.50*mm"/>
-    <constant name="UX854Flange01RadiusZmin"  value="UX85C13100Flange11RadiusZmax"/>
-    <constant name="UX854Flange01RadiusZmax"
-              value="(UX854ZStartIP + UX854Flange01Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX854Flange01OuterRadius" value="UX85C13100Flange11OuterRadius"/>
-    <constant name="UX854Flange01Zpos"        value="0.5*UX854Flange01Lenght"/>
-
-    <!-- UX85-4 Cone 10 mrad St.Steel 4 mm thick -->
-    <constant name="UX854Cone02Lenght"
-              value="2337.00*mm - (UX854Flange01Lenght - 13.00*mm)"/>
-    <constant name="UX854Cone02RadiusZmin"    value="UX854Flange01RadiusZmax"/>
-    <constant name="UX854Cone02RadiusZmax"
-              value="(UX854ZStartIP + UX854Flange01Lenght + UX854Cone02Lenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX854Cone02Thick"         value="4.00*mm"/>
-    <constant name="UX854Cone02Zpos"
-              value="UX854Flange01Lenght + 0.5*UX854Cone02Lenght"/>
-
-    <!-- UX85-4 Support flange around pipe -->
-    <constant name="UX854SupportFlangeFromStart"   value="1126.99*mm"/>
-
-    <constant name="UX854SupportFlangeLenght"      value=  "7.00*mm"/>
-    <constant name="UX854SupportFlangeRadiusZmin"
-              value="(UX854ZStartIP + UX854SupportFlangeFromStart)*tan(UX851to4Angle)"/>
-    <constant name="UX854SupportFlangeRadiusZmax"
-              value="(UX854ZStartIP + UX854SupportFlangeFromStart +
-                     UX854SupportFlangeLenght)*tan(UX851to4Angle)"/>
-    <constant name="UX854SupportFlangeOuterRadius" value="164.25*mm"/>
-    <constant name="UX854SupportFlangeZpos"
-              value="UX854SupportFlangeFromStart + 0.5*UX854SupportFlangeLenght"/>
-
-    <!-- UX85-4 Cone 10 mrad St.Steel 4 mm thick -->
-    <constant name="UX854Cone03Lenght"        value="2305.00*mm"/>
-    <constant name="UX854Cone03RadiusZmin"    value="UX854Cone02RadiusZmax"/>
-    <constant name="UX854Cone03RadiusZmax"
-              value="(UX854ZStartIP + UX854Flange01Lenght + UX854Cone02Lenght +
-                     UX854Cone03Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX854Cone03Thick"         value="4.00*mm"/>
-    <constant name="UX854Cone03Zpos"
-              value="UX854Flange01Lenght + UX854Cone02Lenght + 0.5*UX854Cone03Lenght"/>
-
-    <!-- UX85-4 Cone 10 mrad St.Steel connection to window thick -->
-    <constant name="UX854Cone04Lenght"        value="23.50*mm"/>
-    <constant name="UX854Cone04RadiusZmin"    value="UX854Cone03RadiusZmax"/>
-    <constant name="UX854Cone04RadiusZmax"    value="190.50*mm"/>
-    <constant name="UX854Cone04Thick"         value="4.00*mm"/>
-    <constant name="UX854Cone04Zpos"
-              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
-                     0.5*UX854Cone04Lenght"/>
-
-    <!-- UX85-4 Window -15 degree St.Steel 3 mm thick -->
-    <constant name="UX854Win05Lenght"        value="599.00*mm"/>
-    <constant name="UX854Win05RadiusZmin"    value="UX854Cone04RadiusZmax"/>
-    <constant name="UX854Win05RadiusZmax"    value="30.00*mm"/>
-    <constant name="UX854Win05Thick"         value= "3.00*mm"/>
-    <constant name="UX854Win05Zpos"
-              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
-                     UX854Cone04Lenght + 0.5*UX854Win05Lenght"/>
-
-    <constant name="UX854Win05Hole1Length"   value="300.0*mm"/>
-    <constant name="UX854Win05Hole1Radius"   value="19.0*mm"/>
-    <constant name="UX854Win05Hole1PosZ"     value="-119.0*mm"/>
-    <constant name="UX854Win05Hole1RotX"     value="-15.0*degree"/>
-    <constant name="UX854Win05Hole1RotZ"     value="45.0*degree"/>
-    <constant name="UX854Win05Hole1PosR"     value="145.3*mm"/>
-    <constant name="UX854Win05Hole1PosPhi"   value="135.0*degree"/>
-
-    <constant name="UX854Win05Hole2Length"   value="100.0*mm"/>
-    <constant name="UX854Win05Hole2Radius"   value="31.75*mm"/>
-    <constant name="UX854Win05Hole2RotX"     value="90.0*degree"/>
-    <constant name="UX854Win05Hole2PosY"     value="95.0*mm"/>
-    <constant name="UX854Win05Hole2PosZ"     value="69.0*mm"/>
-
-    <constant name="UX854Win05Hole3Length"   value="300.0*mm"/>
-    <constant name="UX854Win05Hole3Radius"   value="30.0*mm"/>
-    <constant name="UX854Win05Hole3RotY"     value="-20.0*degree"/>
-    <constant name="UX854Win05Hole3PosX"     value="-122.0*mm"/>
-    <constant name="UX854Win05Hole3PosZ"     value="-32.76*mm"/>
-
-    <constant name="UX854Win05Hole4Length"   value="200.0*mm"/>
-    <constant name="UX854Win05Hole4Radius"   value="9.5*mm"/>
-    <constant name="UX854Win05Hole4RotY"     value="45.0*degree"/>
-    <constant name="UX854Win05Hole4PosX"     value="64.0*mm"/>
-    <constant name="UX854Win05Hole4PosZ"     value="191.6*mm"/>
-
-    <constant name="UX854Win05PipeExtra"     value="50.0*mm"/> <!-- To accomodate cuts -->
-
-    <constant name="UX854Win05Pipe1BasicLength"   value="226.7*mm"/>
-    <constant name="UX854Win05Pipe1Length"   value="UX854Win05Pipe1BasicLength + UX854Win05PipeExtra"/>
-    <constant name="UX854Win05Pipe1Thick"    value="2.0*mm"/>
-    <constant name="UX854Win05Pipe1FlangeRad" value="35.0*mm"/>
-    <constant name="UX854Win05Pipe1FlangeThick" value="12.7*mm"/>
-
-    <constant name="UX854Win05Pipe2CutLength" value="UX854Win05Hole2Radius*2"/>
-    <constant name="UX854Win05Pipe2BasicLength" value="135.0*mm"/>
-    <constant name="UX854Win05Pipe2Length"   value="UX854Win05Pipe2BasicLength + UX854Win05PipeExtra + UX854Win05Pipe2CutLength"/>
-    <constant name="UX854Win05Pipe2Thick"    value="2.0*mm"/>
-    <constant name="UX854Win05Pipe2ExtendBasicLength" value="142.5*mm"/>
-    <constant name="UX854Win05Pipe2ExtendLength" value="UX854Win05Pipe2ExtendBasicLength + UX854Win05Pipe2CutLength"/>
-    <constant name="UX854Win05Pipe2FlangeRad" value="57.0*mm"/>
-    <constant name="UX854Win05Pipe2FlangeThick" value="17.3*mm"/>
-
-    <constant name="UX854Win05Pipe3BasicLength"   value="79.5*mm"/>
-    <constant name="UX854Win05Pipe3Length"   value="UX854Win05Pipe3BasicLength + UX854Win05PipeExtra"/> <!--"182.0*mm"/>-->
-    <constant name="UX854Win05Pipe3Thick"    value="2.0*mm"/>
-    <constant name="UX854Win05Pipe3ExtendLength" value="50.5*mm"/>
-    <constant name="UX854Win05Pipe3Rad"      value="17.0*mm"/>
-    <constant name="UX854Win05Pipe3FlangeRad"      value="35.0*mm"/>
-    <constant name="UX854Win05Pipe3FlangeThick"    value="12.7*mm"/>
-
-    <constant name="UX854Win05Pipe4BasicLength"   value="31.5*mm"/>
-    <constant name="UX854Win05Pipe4Length"   value="UX854Win05Pipe4BasicLength + UX854Win05PipeExtra"/>
-    <constant name="UX854Win05Pipe4Thick"    value="2.0*mm"/>
-    <constant name="UX854Win05Pipe4FlangeRad"      value="17.0*mm"/>
-    <constant name="UX854Win05Pipe4FlangeThick"    value="7.0*mm"/>
-
-    <!-- UX85-4 Cylinder 3 mm thick -->
-    <constant name="UX854Cyl06Flange08Lenght"   value="52.50*mm"/>
-    <constant name="UX854Flange08Lenght"        value="19.70*mm"/>
-    <constant name="UX854Cyl07Lenght"
-              value="5.00*mm + 25.00*mm - (UX854Flange08Lenght- 8.00*mm)"/>
-
-    <constant name="UX854Cyl06Lenght"
-              value="UX854Cyl06Flange08Lenght - UX854Flange08Lenght - UX854Cyl07Lenght"/>
-    <constant name="UX854Cyl06InnerRadius"   value="UX854Win05RadiusZmax"/>
-    <constant name="UX854Cyl06Thick"         value="3.00*mm"/>
-    <constant name="UX854Cyl06Zpos"
-              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
-                     UX854Cone04Lenght + UX854Win05Lenght + 0.5*UX854Cyl06Lenght"/>
-
-    <!-- UX85-4 Cylinder 1.5 mm thick -->
-    <constant name="UX854Cyl07InnerRadius"   value="UX854Cyl06InnerRadius"/>
-    <constant name="UX854Cyl07OuterRadius"   value="31.50*mm"/>
-    <constant name="UX854Cyl07Zpos"
-              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
-                     UX854Cone04Lenght + UX854Win05Lenght + UX854Cyl06Lenght +
-                     0.5*UX854Cyl07Lenght"/>
-
-    <!-- UX85-4 Cylinder Flange -->
-    <constant name="UX854Flange08InnerRadius"   value="UX854Cyl06InnerRadius"/>
-    <constant name="UX854Flange08OuterRadius"   value="76.00*mm"/>
-    <constant name="UX854Flange08Zpos"
-              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
-                     UX854Cone04Lenght + UX854Win05Lenght + UX854Cyl06Lenght +
-                     UX854Cyl07Lenght + 0.5*UX854Flange08Lenght "/>
-
-    <!-- Corresponding vacuum sections segmentation due to shape -->
-    <!-- Vacuum in 10 mrad, in window, in cilinder -->
-    <constant name="UX854Vacuum01Lenght"
-              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
-                     UX854Cone04Lenght"/>
-    <constant name="UX854Vacuum05Lenght"    value="UX854Win05Lenght"/>
-    <constant name="UX854Vacuum06Lenght"    value="UX854Cyl06Flange08Lenght"/>
-
-    <!-- Whole UX85-4 -->
-    <constant name="UX854Lenght"
-              value="UX854Flange01Lenght + UX854Cone02Lenght + UX854Cone03Lenght +
-                     UX854Cone04Lenght + UX854Win05Lenght + UX854Cyl06Flange08Lenght"/>
-  </define>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-Support.xml b/compact/components/Pipe/2025-v00.00/Downstream-Support.xml
deleted file mode 100644
index 2d53baa43..000000000
--- a/compact/components/Pipe/2025-v00.00/Downstream-Support.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--=============================Downstream support============================-->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-
-    <!--==================================================================================-->
-    <!--===================================Bakeout========================================-->
-    <!--==================================================================================-->
-    <detector name="DownstreamPipeSupport" type="DD4hep_VolumeAssembly" parent="${PipeDownstream:parent}" vis="Pipe:Vis">
-      <!-- Foot upper plate -->
-      <volume name="lvUX854SlSupFootTop" material="Pipe:Steel316LN" vis="Pipe:Support">
-        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupFootTopSub">
-          <shape type="Box" name="UX854SlSupFootTopBox"
-                 dx="0.5*UX854SlSupFootTopX"
-                 dy="0.5*UX854SlSupFootTopY"
-                 dz="0.5*UX854SlSupFootTopThick"/>
-
-          <shape type="Tube" name="UX854SlSupFootTopCentralHole"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
-                 rmax="UX854SlSupFootTopCentralHoleRad"/>
-
-          <shape type="Tube" name="UX854SlSupFootTopHole1A"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
-                 rmax="UX854SlSupFootTopHoleRad"/>
-          <position x="UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY + UX854SlSupFootTopHoleOffset"/>
-          <shape type="Tube" name="UX854SlSupFootTopHole1B"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
-                 rmax="UX854SlSupFootTopHoleRad"/>
-          <position x="UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY - UX854SlSupFootTopHoleOffset"/>
-          <shape type="Box" name="UX854SlSupFootHoleBox1"
-                 dx="0.5*UX854SlSupFootTopHoleWidth"
-                 dy="0.5*UX854SlSupFootTopHoleLength"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"/>
-          <position x="UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY"/>
-
-          <shape type="Tube" name="UX854SlSupFootTopHole2A"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
-                 rmax="UX854SlSupFootTopHoleRad"/>
-          <position x="UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY - UX854SlSupFootTopHoleOffset"/>
-          <shape type="Tube" name="UX854SlSupFootTopHole2B"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
-                 rmax="UX854SlSupFootTopHoleRad"/>
-          <position x="UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY + UX854SlSupFootTopHoleOffset"/>
-          <shape type="Box" name="UX854SlSupFootHoleBox2"
-                 dx="0.5*UX854SlSupFootTopHoleWidth"
-                 dy="0.5*UX854SlSupFootTopHoleLength"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"/>
-          <position x="UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY"/>
-
-          <shape type="Tube" name="UX854SlSupFootTopHole3A"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
-                 rmax="UX854SlSupFootTopHoleRad"/>
-          <position x="-UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY - UX854SlSupFootTopHoleOffset"/>
-          <shape type="Tube" name="UX854SlSupFootTopHole3B"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
-                 rmax="UX854SlSupFootTopHoleRad"/>
-          <position x="-UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY + UX854SlSupFootTopHoleOffset"/>
-          <shape type="Box" name="UX854SlSupFootHoleBox3"
-                 dx="0.5*UX854SlSupFootTopHoleWidth"
-                 dy="0.5*UX854SlSupFootTopHoleLength"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"/>
-          <position x="-UX854SlSupFootTopHolePosX" y="-UX854SlSupFootTopHolePosY"/>
-
-          <shape type="Tube" name="UX854SlSupFootTopHole4A"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
-                 rmax="UX854SlSupFootTopHoleRad"/>
-          <position x="-UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY + UX854SlSupFootTopHoleOffset"/>
-          <shape type="Tube" name="UX854SlSupFootTopHole4B"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"
-                 rmax="UX854SlSupFootTopHoleRad"/>
-          <position x="-UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY - UX854SlSupFootTopHoleOffset"/>
-          <shape type="Box" name="UX854SlSupFootHoleBox4"
-                 dx="0.5*UX854SlSupFootTopHoleWidth"
-                 dy="0.5*UX854SlSupFootTopHoleLength"
-                 dz="0.5*(UX854SlSupFootTopThick + 1.0*mm)"/>
-          <position x="-UX854SlSupFootTopHolePosX" y="UX854SlSupFootTopHolePosY"/>
-        </shape>
-
-      </volume>
-
-      <!-- Tube for foot -->
-      <volume name="lvUX854SlSupFootTube" material="Pipe:Steel" vis="Pipe:Support">
-        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupFootTubeSub">
-          <shape type="Box" name="UX854SlSupFootTubeBox"
-                 dx="0.5*UX854SlSupFootTubeWidth"
-                 dy="0.5*UX854SlSupFootTubeWidth"
-                 dz="0.5*UX854SlSupFootTubeLength"/>
-          <shape type="Box" name="UX854SlSupFootTubeInnerBox"
-                 dx="0.5*UX854SlSupFootTubeWidth - UX854SlSupFootTubeThick*2"
-                 dy="0.5*UX854SlSupFootTubeWidth - UX854SlSupFootTubeThick*2"
-                 dz="0.5*(UX854SlSupFootTubeLength + 1.0*mm)"/>
-        </shape>
-      </volume>
-
-      <!-- Foot base plate -->
-      <volume name="lvUX854SlSupFootBase" material="Pipe:Steel" vis="Pipe:Support">
-        <shape type="Box" name="UX854SlSupFootBaseBox"
-               dx="0.5*UX854SlSupFootBaseX"
-               dy="0.5*UX854SlSupFootBaseY"
-               dz="0.5*UX854SlSupFootBaseThick"/>
-      </volume>
-
-      <!-- Foot shim -->
-      <volume name="lvUX854SlSupFootShim" material="Pipe:Steel" vis="Pipe:Support">
-        <shape type="Box" name="UX854SlSupFootShimBox"
-               dx="0.5*UX854SlSupFootShimWidth"
-               dy="0.5*UX854SlSupFootShimWidth"
-               dz="0.5*UX854SlSupFootShimThick"/>
-      </volume>
-
-      <!-- Base -->
-      <volume name="lvUX854SlSupFoot" vis="Pipe:Support">
-        <physvol name="pvUX854SlSupFootTop"                   volume="lvUX854SlSupFootTop"/>
-        <physvol name="pvUX854SlSupFootTube"                  volume="lvUX854SlSupFootTube">
-          <position z="UX854SlSupFootTubePosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupFootBase"                  volume="lvUX854SlSupFootBase">
-          <position z="UX854SlSupFootBasePosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupFootShim1"                 volume="lvUX854SlSupFootShim">
-          <position x="UX854SlSupFootShimPosX" y="UX854SlSupFootShimPosY" z="UX854SlSupFootShimPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupFootShim2"                 volume="lvUX854SlSupFootShim">
-          <position x="UX854SlSupFootShimPosX" y="-UX854SlSupFootShimPosY" z="UX854SlSupFootShimPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupFootShim3"                 volume="lvUX854SlSupFootShim">
-          <position x="-UX854SlSupFootShimPosX" y="-UX854SlSupFootShimPosY" z="UX854SlSupFootShimPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupFootShim4"                 volume="lvUX854SlSupFootShim">
-          <position x="-UX854SlSupFootShimPosX" y="UX854SlSupFootShimPosY" z="UX854SlSupFootShimPosZ"/>
-        </physvol>
-
-      </volume>
-
-
-      <!-- Rod -->
-      <volume name="lvUX854SlSupRod" material="Pipe:Steel" vis="Pipe:Support">
-        <shape type="Tube" name="Ux854SlSupRodTubs"
-               dz="0.5*UX854SlSupRodLength"
-               rmax="UX854SlSupRodRad"/>
-      </volume>
-
-      <!-- Washer -->
-      <volume name="lvUX854SlSupWasher" material="Pipe:Steel" vis="Pipe:Support">
-        <shape type="Tube" name="Ux854SlSupWasherTubs"
-               dz="0.5*UX854SlSupWasherLenght"
-               rmax="UX854SlSupWasherRad + UX854SlSupWasherThick"
-               rmin="UX854SlSupWasherThick"/>
-      </volume>
-
-      <!-- Nut -->
-      <volume name="lvUX854SlSupNut" material="Pipe:Steel" vis="Pipe:Support">
-        <shape type="Tube" name="Ux854SlSupNutTubs"
-               dz="0.5*UX854SlSupNutLength"
-               rmax="UX854SlSupNutRad + UX854SlSupNutThick"
-               rmin="UX854SlSupNutRad"/>
-      </volume>
-
-      <!-- Assebled rod -->
-      <volume name="lvUX854SlSupRodAss" vis="Pipe:Support">
-        <physvol name="pvUX854SlSupRod"                 volume="lvUX854SlSupRod"/>
-        <physvol name="pvUX854SlSupNut1"                volume="lvUX854SlSupNut">
-          <position z="UX854SlSupRodAssNut1PosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupNut2"                volume="lvUX854SlSupNut">
-          <position z="UX854SlSupRodAssNut2PosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupWasher1"             volume="lvUX854SlSupWasher">
-          <position z="UX854SlSupRodAssWasher1PosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupWasher2"             volume="lvUX854SlSupWasher">
-          <position z="UX854SlSupRodAssWasher2PosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupNut3"                volume="lvUX854SlSupNut">
-          <position z="UX854SlSupRodAssNut3PosZ"/>
-        </physvol>
-      </volume>
-
-
-      <!-- Top Plate -->
-      <volume name="lvUX854SlSupTop" material="Pipe:Steel316LN" vis="Pipe:Support">
-        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupTopSub">
-          <shape type="Box" name="UX854SlSupTopBox"
-                 dx="0.5*UX854SlSupTopX"
-                 dy="0.5*UX854SlSupTopY"
-                 dz="0.5*UX854SlSupTopThick"/>
-
-          <shape type="Tube" name="UX854SlSupTopHoleA"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleCentRad"/>
-          <position x="UX854SlSupTopHoleCentOffset"/>
-          <shape type="Tube" name="UX854SlSupTopHoleB"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleCentRad"/>
-          <position x="-UX854SlSupTopHoleCentOffset"/>
-          <shape type="Box" name="UX854SlSupHoleBox"
-                 dx="0.5*UX854SlSupTopHoleCentLength"
-                 dy="0.5*UX854SlSupTopHoleCentWidth"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"/>
-
-          <shape type="Tube" name="UX854SlSupTopHole1"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleRad"/>
-          <position x="UX854SlSupTopHolePosX" y="UX854SlSupTopHolePosY"/>
-          <shape type="Tube" name="UX854SlSupTopHole2"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleRad"/>
-          <position x="UX854SlSupTopHolePosX" y="-UX854SlSupTopHolePosY"/>
-          <shape type="Tube" name="UX854SlSupTopHole3"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleRad"/>
-          <position x="-UX854SlSupTopHolePosX" y="-UX854SlSupTopHolePosY"/>
-          <shape type="Tube" name="UX854SlSupTopHole4"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleRad"/>
-          <position x="-UX854SlSupTopHolePosX" y="UX854SlSupTopHolePosY"/>
-
-          <shape type="Tube" name="UX854SlSupTopHoleInner1"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleInnerRad"/>
-          <position x="UX854SlSupTopHoleInnerPosX" y="UX854SlSupTopHoleInnerPosY"/>
-          <shape type="Tube" name="UX854SlSupTopHoleInner2"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleInnerRad"/>
-          <position x="UX854SlSupTopHoleInnerPosX" y="-UX854SlSupTopHoleInnerPosY"/>
-          <shape type="Tube" name="UX854SlSupTopHoleInner3"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleInnerRad"/>
-          <position x="-UX854SlSupTopHoleInnerPosX" y="-UX854SlSupTopHoleInnerPosY"/>
-          <shape type="Tube" name="UX854SlSupTopHoleInner4"
-                 dz="0.5*(UX854SlSupTopThick + 1.0*mm)"
-                 rmax="UX854SlSupTopHoleInnerRad"/>
-          <position x="-UX854SlSupTopHoleInnerPosX" y="UX854SlSupTopHoleInnerPosY"/>
-
-        </shape>
-      </volume>
-
-      <!-- Rail main plate-->
-      <volume name="lvUX854SlSupRailBase" material="Pipe:Steel316LN" vis="Pipe:Support">
-        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupRailBaseSub">
-          <shape type="Box" name="UX854SlSupRailBaseBox"
-                 dx="0.5*UX854SlSupRailBaseX"
-                 dy="0.5*UX854SlSupRailBaseY"
-                 dz="0.5*UX854SlSupRailBaseThick"/>
-
-          <shape type="Tube" name="UX854SlSupRailBaseCentralHole"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
-                 rmax="UX854SlSupRailBaseCentralHoleRad"/>
-
-          <shape type="Tube" name="UX854SlSupRailBaseHole1A"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
-                 rmax="UX854SlSupRailBaseHoleRad"/>
-          <position x="UX854SlSupRailBaseHolePosX + UX854SlSupRailBaseHoleOffset" y="UX854SlSupRailBaseHolePosY"/>
-          <shape type="Tube" name="UX854SlSupRailBaseHole1B"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
-                 rmax="UX854SlSupRailBaseHoleRad"/>
-          <position x="UX854SlSupRailBaseHolePosX - UX854SlSupRailBaseHoleOffset" y="UX854SlSupRailBaseHolePosY"/>
-          <shape type="Box" name="UX854SlSupRailBaseHoleBox1"
-                 dx="0.5*UX854SlSupRailBaseHoleLength"
-                 dy="0.5*UX854SlSupRailBaseHoleWidth"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"/>
-          <position x="UX854SlSupRailBaseHolePosX" y="UX854SlSupRailBaseHolePosY"/>
-
-          <shape type="Tube" name="UX854SlSupRailBaseHole2A"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
-                 rmax="UX854SlSupRailBaseHoleRad"/>
-          <position x="UX854SlSupRailBaseHolePosX + UX854SlSupRailBaseHoleOffset" y="-UX854SlSupRailBaseHolePosY"/>
-          <shape type="Tube" name="UX854SlSupRailBaseHole2B"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
-                 rmax="UX854SlSupRailBaseHoleRad"/>
-          <position x="UX854SlSupRailBaseHolePosX - UX854SlSupRailBaseHoleOffset" y="-UX854SlSupRailBaseHolePosY"/>
-          <shape type="Box" name="UX854SlSupRailBaseHoleBox2"
-                 dx="0.5*UX854SlSupRailBaseHoleLength"
-                 dy="0.5*UX854SlSupRailBaseHoleWidth"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"/>
-          <position x="UX854SlSupRailBaseHolePosX" y="-UX854SlSupRailBaseHolePosY"/>
-
-          <shape type="Tube" name="UX854SlSupRailBaseHole3A"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
-                 rmax="UX854SlSupRailBaseHoleRad"/>
-          <position x="-UX854SlSupRailBaseHolePosX - UX854SlSupRailBaseHoleOffset" y="-UX854SlSupRailBaseHolePosY"/>
-          <shape type="Tube" name="UX854SlSupRailBaseHole3B"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
-                 rmax="UX854SlSupRailBaseHoleRad"/>
-          <position x="-UX854SlSupRailBaseHolePosX + UX854SlSupRailBaseHoleOffset" y="-UX854SlSupRailBaseHolePosY"/>
-          <shape type="Box" name="UX854SlSupRailBaseHoleBox3"
-                 dx="0.5*UX854SlSupRailBaseHoleLength"
-                 dy="0.5*UX854SlSupRailBaseHoleWidth"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"/>
-          <position x="-UX854SlSupRailBaseHolePosX" y="-UX854SlSupRailBaseHolePosY"/>
-
-          <shape type="Tube" name="UX854SlSupRailBaseHole4A"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
-                 rmax="UX854SlSupRailBaseHoleRad"/>
-          <position x="-UX854SlSupRailBaseHolePosX - UX854SlSupRailBaseHoleOffset" y="UX854SlSupRailBaseHolePosY"/>
-          <shape type="Tube" name="UX854SlSupRailBaseHole4B"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"
-                 rmax="UX854SlSupRailBaseHoleRad"/>
-          <position x="-UX854SlSupRailBaseHolePosX + UX854SlSupRailBaseHoleOffset" y="UX854SlSupRailBaseHolePosY"/>
-          <shape type="Box" name="UX854SlSupRailBaseHoleBox4"
-                 dx="0.5*UX854SlSupRailBaseHoleLength"
-                 dy="0.5*UX854SlSupRailBaseHoleWidth"
-                 dz="0.5*(UX854SlSupRailBaseThick + 1.0*mm)"/>
-          <position x="-UX854SlSupRailBaseHolePosX" y="UX854SlSupRailBaseHolePosY"/>
-        </shape>
-      </volume>
-
-      <!-- Rail block -->
-      <volume name="lvUX854SlSupRailBlock" material="Pipe:Steel316LN" vis="Pipe:Support">
-        <shape type="Box" name="UX854SlSupRailBlockBox"
-               dx="0.5*UX854SlSupRailBlockLength"
-               dy="0.5*UX854SlSupRailBlockWidth"
-               dz="0.5*UX854SlSupRailBlockHeight"/>
-      </volume>
-
-      <!-- Rail -->
-      <volume name="lvUX854SlSupRail" vis="Pipe:Support">
-        <physvol name="pvUX854SlSupRailBase"                 volume="lvUX854SlSupRailBase"/>
-        <physvol name="pvUX854SlSupRailBlock1"               volume="lvUX854SlSupRailBlock">
-          <position y="UX854SlSupRailPosY" z="UX854SlSupRailPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRailBlock2"               volume="lvUX854SlSupRailBlock">
-          <position y="-UX854SlSupRailPosY" z="UX854SlSupRailPosZ"/>
-        </physvol>
-      </volume>
-
-      <!-- Rail Screw -->
-      <volume name="lvUX854SlSupRailScrew" material="Pipe:Steel" vis="Pipe:Support">
-        <shape type="BooleanShape" operation="union" name="UX854SlSupRailScrewUnion">
-          <shape type="Tube" name="UX854SlSupRailScrewHeadTubs"
-                 dz="0.5*UX854SlSupRailScrewHeadLength"
-                 rmax="UX854SlSupRailScrewHeadRad"/>
-          <shape type="Tube" name="UX854SlSupRailScrewTubs"
-                 dz="0.5*UX854SlSupRailScrewLength"
-                 rmax="UX854SlSupRailScrewRad"/>
-          <position z="-UX854SlSupRailScrewLength/2 - UX854SlSupRailScrewHeadLength/2 - 0.01*mm"/>
-        </shape>
-      </volume>
-
-      <!-- Rail Rod -->
-      <volume name="lvUX854SlSupRailRod" material="Pipe:Steel" vis="Pipe:Support">
-        <shape type="Tube" name="UX854SlSupRailRodTubs"
-               dz="0.5*UX854SlSupRailRodLength"
-               rmax="UX854SlSupRailRodRad"/>
-      </volume>
-
-      <!-- Rail Cover -->
-      <volume name="lvUX854SlSupRailCover" material="Pipe:Brass" vis="Pipe:Support">
-        <shape type="Box" name="UX854SlSupRailCoverBox"
-               dx="0.5*UX854SlSupRailCoverLength"
-               dy="0.5*UX854SlSupRailCoverThick"
-               dz="0.5*UX854SlSupRailCoverWidth"/>
-      </volume>
-
-      <!-- Rail assebled -->
-      <volume name="lvUX854SlSupRailAssem" vis="Pipe:Support">
-        <physvol name="pvUX854SlSupRail"                 volume="lvUX854SlSupRail"/>
-        <physvol name="pvUX854SlSupRailCover1"           volume="lvUX854SlSupRailCover">
-          <position y="UX854SlSupRailCoverPosY" z="UX854SlSupRailCoverPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRailCover2"           volume="lvUX854SlSupRailCover">
-          <position y="-UX854SlSupRailCoverPosY" z="UX854SlSupRailCoverPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRailRod"              volume="lvUX854SlSupRailRod">
-          <position z="UX854SlSupRailRodPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRailNut1"             volume="lvUX854SlSupNut">
-          <position z="UX854SlSupRailNut1PosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRailNut2"             volume="lvUX854SlSupNut">
-          <position z="UX854SlSupRailNut2PosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRailScrew1"           volume="lvUX854SlSupRailScrew">
-          <position x="UX854SlSupRailScrewPosX" y="UX854SlSupRailScrewPosY" z="UX854SlSupRailScrewPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRailScrew2"           volume="lvUX854SlSupRailScrew">
-          <position x="UX854SlSupRailScrewPosX" y="-UX854SlSupRailScrewPosY" z="UX854SlSupRailScrewPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRailScrew3"           volume="lvUX854SlSupRailScrew">
-          <position x="-UX854SlSupRailScrewPosX" y="-UX854SlSupRailScrewPosY" z="UX854SlSupRailScrewPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRailScrew4"           volume="lvUX854SlSupRailScrew">
-          <position x="-UX854SlSupRailScrewPosX" y="UX854SlSupRailScrewPosY" z="UX854SlSupRailScrewPosZ"/>
-        </physvol>
-
-      </volume>
-
-      <!-- Trolley main plate -->
-      <volume name="lvUX854SlSupTrolleyPlate" material="Pipe:Steel316LN" vis="Pipe:Support">
-        <shape type="BooleanShape" operation="subtraction" name="UX854SlSupTrolleyPlateSub">
-          <shape type="Box" name="UX854SlSupTrolleyPlateBox"
-                 dx="0.5*UX854SlSupTrolleyPlateLength"
-                 dy="0.5*UX854SlSupTrolleyPlateHeight"
-                 dz="0.5*UX854SlSupTrolleyPlateWidth"/>
-
-          <shape type="Tube" name="UX854SlSupTrolleyPlateHole"
-                 dz="0.5*(UX854SlSupTrolleyPlateWidth + 1.0*mm)"
-                 rmax="UX854SlSupTrolleyPlateHoleRad"/>
-          <position y="-UX854SlSupTrolleyPlateHolePosY"/>
-
-          <shape type="Box" name="UX854SlSupTrolleyPlateScrape1"
-                 dx="0.5*UX854SlSupTrolleyPlateLength"
-                 dy="0.5*UX854SlSupTrolleyPlateHeight"
-                 dz="0.5*(UX854SlSupTrolleyPlateWidth + 1.0*mm)"/>
-          <position x="UX854SlSupTrolleyPlateCutPosX" y="-UX854SlSupTrolleyPlateCutPosY"/>
-          <shape type="Box" name="UX854SlSupTrolleyPlateScrape2"
-                 dx="0.5*UX854SlSupTrolleyPlateLength"
-                 dy="0.5*UX854SlSupTrolleyPlateHeight"
-                 dz="0.5*(UX854SlSupTrolleyPlateWidth + 1.0*mm)"/>
-          <position x="-UX854SlSupTrolleyPlateCutPosX" y="-UX854SlSupTrolleyPlateCutPosY"/>
-        </shape>
-      </volume>
-
-      <!-- Trolley Pin -->
-      <volume name="lvUX854SlSupTrolleyPin" material="Pipe:Steel316LN" vis="Pipe:Support">
-        <shape type="Tube" name="Ux854SlSupTrolleyPinTubs"
-               dz="0.5*UX854SlSupTrolleyPinLength"
-               rmax="UX854SlSupTrolleyPinRad"/>
-      </volume>
-
-      <!-- Trolley wheel -->
-      <volume name="lvUX854SlSupTrolleyWheel" material="Pipe:Steel" vis="Pipe:Support">
-        <shape type="Tube" name="Ux854SlSupTrolleyWheelTubs"
-               dz="0.5*UX854SlSupTrolleyWheelWidth"
-               rmax="UX854SlSupTrolleyWheelRad + UX854SlSupTrolleyWheelThick"
-               rmin="UX854SlSupTrolleyWheelRad"/>
-      </volume>
-
-      <!-- Trolley -->
-      <volume name="lvUX854SlSupTrolley" vis="Pipe:Support">
-        <physvol name="pvUX854SlSupTrolleyPlate"                 volume="lvUX854SlSupTrolleyPlate"/>
-        <physvol name="pvUX854SlSupTrolleyPin"                   volume="lvUX854SlSupTrolleyPin">
-          <position y="-UX854SlSupTrolleyHolePosY"/>
-        </physvol>
-        <physvol name="pvUX854SlSupTrolleyWheel1"                volume="lvUX854SlSupTrolleyWheel">
-          <position y="-UX854SlSupTrolleyHolePosY" z="UX854SlSupTrolleyWheelPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupTrolleyWheel2"                volume="lvUX854SlSupTrolleyWheel">
-          <position y="-UX854SlSupTrolleyHolePosY" z="-UX854SlSupTrolleyWheelPosZ"/>
-        </physvol>
-      </volume>
-
-      <!-- Rail and trolley assebly -->
-      <volume name="lvUX854SlSupRailTroll" vis="Pipe:Support">
-        <physvol name="pvUX854SlSupRailAssem"                    volume="lvUX854SlSupRailAssem"/>
-        <physvol name="pvUX854SlSupTrolley"                      volume="lvUX854SlSupTrolley">
-          <position z="UX854SlSupRailTrollPosZ"/>
-          <rotation x="90.0*degree"/>
-        </physvol>
-      </volume>
-
-      <!-- Sliding support -->
-      <volume name="lvUX854SlSupLow" vis="Pipe:Support">
-        <physvol name="pvUX854SlSupTop"                          volume="lvUX854SlSupTop"/>
-        <physvol name="pvUX854SlSupRodAss1"                      volume="lvUX854SlSupRodAss">
-          <position x="UX854SlSupRodAssPosX" y="UX854SlSupRodAssPosY" z="-UX854SlSupRodAssPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRodAss2"                      volume="lvUX854SlSupRodAss">
-          <position x="UX854SlSupRodAssPosX" y="-UX854SlSupRodAssPosY" z="-UX854SlSupRodAssPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRodAss3"                      volume="lvUX854SlSupRodAss">
-          <position x="-UX854SlSupRodAssPosX" y="-UX854SlSupRodAssPosY" z="-UX854SlSupRodAssPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupRodAss4"                      volume="lvUX854SlSupRodAss">
-          <position x="-UX854SlSupRodAssPosX" y="UX854SlSupRodAssPosY" z="-UX854SlSupRodAssPosZ"/>
-        </physvol>
-        <physvol name="pvUX854SlSupFoot"                         volume="lvUX854SlSupFoot">
-          <position z="-UX854SlSupFootPosZ"/>
-        </physvol>
-      </volume>
-
-      <volume name="lvUX854SlSup" vis="Pipe:Support">
-        <physvol name="pvUX854SlSupRailTroll"                    volume="lvUX854SlSupRailTroll"/>
-        <physvol name="pvUX854SlSupLow"                          volume="lvUX854SlSupLow">
-          <position z="-UX854SlSupLowPosZ"/>
-        </physvol>
-      </volume>
-
-
-      <!-- UX85-3 Support: Spacer and Collar togheter, sectioning due to regions -->
-      <volume name="lvUX853CollarDownstream" material="Pipe:Al6082" vis="Pipe:Support">
-        <shape type="Tube" name="UX85-3-Collar-B"
-               dz="0.5*UX853CollarDownstreamSize"
-               rmin="UX853CollarInnerRadius"
-               rmax="UX853CollarOuterRadius"/>
-      </volume>
-
-      <!-- UX85-3 Support: Cables -->
-      <volume name="lvUX853CableDownstream" material="Pipe:Steel316LN" vis="Pipe:Support">
-        <shape type="Tube" name="UX85-3-Cable-Downstream"
-               dz="0.5*UX853CableDownstreamLenght"
-               rmax="UX853CableDownstreamRadius"/>
-      </volume>
-
-
-      <envelope type="Assembly" name="lvUX85SupportsDownstream" vis="Pipe:Support">
-        <!-- UX85-3 Support -->
-        <physvol name="pvUX853DownstreamCollar"                  volume="lvUX853CollarDownstream">
-          <position z="0.5*UX853CollarDownstreamSize"/>
-        </physvol>
-
-        <physvol name="pvUX853CableDownstream01"                 volume="lvUX853CableDownstream">
-          <transformation>
-            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
-            <rotation x="90.0*degree" y="0.0*degree" z="0.0*degree"/>
-            <position x="0.0*mm" y="UX853CableDownstreamXYpos" z="UX853CableDownstreamZpos"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853CableDownstream02"                 volume="lvUX853CableDownstream">
-          <transformation>
-            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
-            <rotation x="90.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <position x="UX853CableDownstreamXYpos" y="0.0*mm" z="UX853CableDownstreamZpos"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853CableDownstream03"                 volume="lvUX853CableDownstream">
-          <transformation>
-            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
-            <rotation x="90.0*degree" y="0.0*degree" z="0.0*degree"/>
-            <position x="0.0*mm" y="-UX853CableDownstreamXYpos" z="UX853CableDownstreamZpos"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853CableDownstream04"                 volume="lvUX853CableDownstream">
-          <transformation>
-            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
-            <rotation x="90.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <position x="-UX853CableDownstreamXYpos" y="0.0*mm" z="UX853CableDownstreamZpos"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX854SlSup"                             volume="lvUX854SlSup">
-          <transformation>
-            <position/>
-            <rotation x="-90.0*degree" z="90.0*degree"/>
-            <position y="-100.0*mm - 44.22*mm" z="7663.0*mm"/>
-          </transformation>
-        </physvol>
-      </envelope>
-      <position z="UX853Rich2DownSplitZposIP - Regions:DownstreamZPos"/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-SupportParams.xml b/compact/components/Pipe/2025-v00.00/Downstream-SupportParams.xml
deleted file mode 100644
index ec87b5b17..000000000
--- a/compact/components/Pipe/2025-v00.00/Downstream-SupportParams.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe downstream support                       -->
-<!--===========================================================================-->
-<lccdd>
-
-  <define>
-
-    <constant name="UX854SlSupRodLength" value="154.0*mm"/>
-    <constant name="UX854SlSupRailBaseThick" value="15.0*mm"/>
-    <constant name="UX854SlSupFootBaseY" value="230.0*mm"/>
-    <constant name="UX854SlSupFootBaseX" value="220.0*mm"/>
-    <constant name="UX854SlSupRailBaseHoleOffset" value="10.0*mm"/>
-    <constant name="UX854SlSupTrolleyWheelThick" value="8.0*mm"/>
-    <constant name="UX854SlSupTopHoleInnerRad" value="4.0*mm + 0.01*mm"/>
-    <constant name="UX854SlSupFootTopHoleOffset" value="15.0*mm"/>
-    <constant name="UX854SlSupFootTopThick" value="15.0*mm"/>
-    <constant name="UX854SlSupTopHolePosY" value="80.0*mm"/>
-    <constant name="UX854SlSupTopHolePosX" value="90.0*mm"/>
-    <constant name="UX854SlSupFootTubeLength" value="157.0*mm"/>
-    <constant name="UX854SlSupFootTubeThick" value="4.5*mm"/>
-    <constant name="UX854SlSupFootShimWidth" value="50.0*mm"/>
-    <constant name="UX854SlSupTopHoleCentRad" value="6.5*mm"/>
-    <constant name="UX854SlSupTrolleyPlateCutPosY" value="6.5*mm"/>
-    <constant name="UX854SlSupTopHoleInnerPosY" value="66.0*mm"/>
-    <constant name="UX854SlSupTopHoleCentOffset" value="12.0*mm"/>
-    <constant name="UX854SlSupRailCoverWidth" value="5.0*mm"/>
-    <constant name="UX854SlSupTrolleyPlateHeight" value="30.7*mm"/>
-    <constant name="UX854SlSupTopThick" value="15.0*mm"/>
-    <constant name="UX854SlSupWasherThick" value="6.0*mm"/>
-    <constant name="UX854SlSupTopX" value="220.0*mm"/>
-    <constant name="UX854SlSupTopY" value="200.0*mm"/>
-    <constant name="UX854SlSupFootTopHolePosY" value="80.0*mm"/>
-    <constant name="UX854SlSupTrolleyPinLength" value="83.5*mm"/>
-    <constant name="UX854SlSupFootShimThick" value="10.0*mm"/>
-    <constant name="UX854SlSupNutLength" value="10.0*mm"/>
-    <constant name="UX854SlSupRailCoverThick" value="19.9*mm"/>
-    <constant name="UX854SlSupRodRad" value="6.0*mm"/>
-    <constant name="UX854SlSupTrolleyPlateHolePosY" value="5.35*mm"/>
-    <constant name="UX854SlSupRailBlockHeight" value="28.2*mm"/>
-    <constant name="UX854SlSupLowSeparation" value="80.0*mm"/>
-    <constant name="UX854SlSupTrolleyPlateWidth" value="68.0*mm"/>
-    <constant name="UX854SlSupRailBaseY" value="152.0*mm"/>
-    <constant name="UX854SlSupRailBaseX" value="120.0*mm"/>
-    <constant name="UX854SlSupNutThick" value="4.0*mm"/>
-    <constant name="UX854SlSupRailBaseHoleRad" value="4.5*mm"/>
-    <constant name="UX854SlSupRailScrewHeadLength" value="7.0*mm"/>
-    <constant name="UX854SlSupRailPosY" value="49.0*mm"/>
-    <constant name="UX854SlSupTrolleyPinRad" value="6.0*mm"/>
-    <constant name="UX854SlSupWasherLenght" value="7.0*mm"/>
-    <constant name="UX854SlSupRailBlockWidth" value="11.75*mm"/>
-    <constant name="UX854SlSupTrolleyWheelWidth" value="8.0*mm"/>
-    <constant name="UX854SlSupFootTopCentralHoleRad" value="28.0*mm"/>
-    <constant name="UX854SlSupFootBaseThick" value="20.0*mm"/>
-    <constant name="UX854SlSupFootTubeWidth" value="110.0*mm"/>
-    <constant name="UX854SlSupFootTopX" value="220.0*mm"/>
-    <constant name="UX854SlSupFootTopY" value="230.0*mm"/>
-    <constant name="UX854SlSupTrolleyPlateBlockLength" value="30.0*mm"/>
-    <constant name="UX854SlSupTopHoleInnerPosX" value="30.0*mm"/>
-    <constant name="UX854SlSupFootTopHoleRad" value="6.5*mm"/>
-    <constant name="UX854SlSupRailRodLength" value="70.0*mm"/>
-    <constant name="UX854SlSupRailBaseHolePosX" value="30.0*mm"/>
-    <constant name="UX854SlSupRailBaseHolePosY" value="66.0*mm"/>
-    <constant name="UX854SlSupFootTopHolePosX" value="90.0*mm"/>
-    <constant name="UX854SlSupRailScrewHeadRad" value="7.0*mm"/>
-    <constant name="UX854SlSupRailBaseHoleLength" value="UX854SlSupRailBaseHoleOffset*2 + 0.1*mm"/>
-    <constant name="UX854SlSupRailScrewRad" value="UX854SlSupTopHoleInnerRad - 0.01*mm"/>
-    <constant name="UX854SlSupFootTopHoleLength" value="UX854SlSupFootTopHoleOffset*2 + 0.1*mm"/>
-    <constant name="UX854SlSupRodAssPosY" value="UX854SlSupTopHolePosY"/>
-    <constant name="UX854SlSupRodAssPosX" value="UX854SlSupTopHolePosX"/>
-    <constant name="UX854SlSupFootTubePosZ" value="-UX854SlSupFootTopThick/2 - UX854SlSupFootTubeLength/2 - 0.01*mm"/>
-    <constant name="UX854SlSupFootShimPosX" value="UX854SlSupFootBaseX/2 - UX854SlSupFootShimWidth/2"/>
-    <constant name="UX854SlSupFootShimPosY" value="UX854SlSupFootBaseY/2 - UX854SlSupFootShimWidth/2"/>
-    <constant name="UX854SlSupTopHoleCentWidth" value="UX854SlSupTopHoleCentRad*2"/>
-    <constant name="UX854SlSupTopHoleCentLength" value="UX854SlSupTopHoleCentOffset*2 + 0.1*mm"/>
-    <constant name="UX854SlSupRailScrewLength" value="UX854SlSupTopThick + UX854SlSupRailBaseThick"/>
-    <constant name="UX854SlSupLowPosZ" value="UX854SlSupTopThick + 0.01*mm"/>
-    <constant name="UX854SlSupRodAssPosZ" value="UX854SlSupRodLength/2 - UX854SlSupTopThick/2"/>
-    <constant name="UX854SlSupRodAssNut1PosZ" value="UX854SlSupRodLength/2 - UX854SlSupNutLength/2 - UX854SlSupTopThick - 0.01*mm"/>
-    <constant name="UX854SlSupRailNut1PosZ" value="-UX854SlSupRailBaseThick/2 - UX854SlSupFootTopThick - UX854SlSupNutLength/2 - 5.0*mm"/>
-    <constant name="UX854SlSupWasherRad" value="UX854SlSupRodRad + 0.01*mm"/>
-    <constant name="UX854SlSupNutRad" value="UX854SlSupRodRad + 0.01*mm"/>
-    <constant name="UX854SlSupRailRodRad" value="UX854SlSupRodRad"/>
-    <constant name="UX854SlSupTopHoleRad" value="UX854SlSupRodRad + 0.01*mm"/>
-    <constant name="UX854SlSupTrolleyHolePosY" value="UX854SlSupTrolleyPlateHolePosY"/>
-    <constant name="UX854SlSupRailPosZ" value="UX854SlSupRailBaseThick/2 + UX854SlSupRailBlockHeight/2 + 0.01*mm"/>
-    <constant name="UX854SlSupFootPosZ" value="UX854SlSupLowSeparation + UX854SlSupTopThick/2 + UX854SlSupFootTopThick/2"/>
-    <constant name="UX854SlSupTrolleyPlateLength" value="UX854SlSupRailBaseX"/>
-    <constant name="UX854SlSupRailBlockLength" value="UX854SlSupRailBaseX"/>
-    <constant name="UX854SlSupRailBaseHoleWidth" value="UX854SlSupRailBaseHoleRad*2"/>
-    <constant name="UX854SlSupRailScrewPosZ" value="UX854SlSupTopThick/2 + UX854SlSupRailScrewHeadLength/2 + 0.01*mm"/>
-    <constant name="UX854SlSupTrolleyWheelRad" value="UX854SlSupTrolleyPinRad + 0.01*mm"/>
-    <constant name="UX854SlSupTrolleyPlateHoleRad" value="UX854SlSupTrolleyPinRad + 0.01*mm"/>
-    <constant name="UX854SlSupRailCoverPosY" value="UX854SlSupRailPosY + UX854SlSupRailBlockWidth/2 - UX854SlSupRailCoverThick/2"/>
-    <constant name="UX854SlSupTrolleyWheelPosZ" value="UX854SlSupTrolleyPlateWidth/2 + UX854SlSupTrolleyWheelWidth/2 + 0.01*mm"/>
-    <constant name="UX854SlSupFootTopHoleWidth" value="UX854SlSupFootTopHoleRad*2"/>
-    <constant name="UX854SlSupRailRodPosZ" value="UX854SlSupRailBaseThick/2 - UX854SlSupRailRodLength/2"/>
-    <constant name="UX854SlSupRailScrewPosX" value="UX854SlSupRailBaseHolePosX"/>
-    <constant name="UX854SlSupRailScrewPosY" value="UX854SlSupRailBaseHolePosY"/>
-    <constant name="UX854SlSupFootBasePosZ" value="UX854SlSupFootTubePosZ - UX854SlSupFootTubeLength/2 - UX854SlSupFootBaseThick/2 - 0.01*mm"/>
-    <constant name="UX854SlSupRodAssWasher1PosZ" value="UX854SlSupRodAssNut1PosZ + UX854SlSupNutLength/2 - UX854SlSupLowSeparation + UX854SlSupWasherLenght/2 + 0.01*mm"/>
-    <constant name="UX854SlSupRailNut2PosZ" value="UX854SlSupRailNut1PosZ - UX854SlSupNutLength - 0.01*mm"/>
-    <constant name="UX854SlSupRailBaseCentralHoleRad" value="UX854SlSupRailRodRad + 0.01*mm"/>
-    <constant name="UX854SlSupRailCoverPosZ" value="UX854SlSupRailPosZ + UX854SlSupRailBlockHeight/2 + UX854SlSupRailCoverWidth/2 + 0.01*mm "/>
-    <constant name="UX854SlSupTrolleyPlateCutPosX" value="UX854SlSupTrolleyPlateLength/2 + UX854SlSupTrolleyPlateBlockLength/2 "/>
-    <constant name="UX854SlSupRailCoverLength" value="UX854SlSupRailBlockLength"/>
-    <constant name="UX854SlSupRailTrollPosZ" value="UX854SlSupRailBaseThick/2 + UX854SlSupTrolleyPlateHolePosY + UX854SlSupTrolleyWheelRad + UX854SlSupTrolleyWheelThick + 0.01*mm"/>
-    <constant name="UX854SlSupFootShimPosZ" value="UX854SlSupFootBasePosZ - UX854SlSupFootBaseThick/2 - UX854SlSupFootShimThick/2 - 0.01*mm"/>
-    <constant name="UX854SlSupRodAssWasher2PosZ" value="UX854SlSupRodAssWasher1PosZ - UX854SlSupFootTopThick - UX854SlSupWasherLenght - 0.02*mm"/>
-    <constant name="UX854SlSupRodAssNut2PosZ" value="UX854SlSupRodAssWasher1PosZ + UX854SlSupNutLength/2 + UX854SlSupWasherLenght/2 + 0.01*mm"/>
-    <constant name="UX854SlSupRodAssNut3PosZ" value="UX854SlSupRodAssWasher2PosZ - UX854SlSupWasherLenght/2 - UX854SlSupNutLength/2 -0.01*mm"/>
-    <constant name="UX853CollarDownstreamSize"    value="UX853CollarSize - UX853CollarRich2Size"/>
-
-    <constant name="UX853CableDownstreamLenght"   value="3700.00*mm"/>
-    <constant name="UX853CableDownstreamRadius"   value="2.50*mm"/>
-    <constant name="UX853CableDownstreamZpos"     value="UX853CableZposIP - UX853Rich2DownSplitZposIP"/>
-    <constant name="UX853CableDownstreamXYpos"    value="(UX853CollarOuterRadius + 0.5*UX853CableDownstreamLenght)"/>
-  </define>
-
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-UX853.xml b/compact/components/Pipe/2025-v00.00/Downstream-UX853.xml
deleted file mode 100644
index cad14fd08..000000000
--- a/compact/components/Pipe/2025-v00.00/Downstream-UX853.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--==================================UX853====================================-->
-<!--===========================================================================-->
-<pipe>
-  <!-- UX85-3 Cone 10 mrad of Beryllium cylindrical part for support -->
-  <!-- Split Rich2/Downstream                                        -->
-  <volume name="lvUX853Cone12B" material="Pipe:BeTV56" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-3-Cone10mrad-12B"
-           dz="0.5*UX853Cone12BLenght"
-           rmin2="UX853Cone12BRadiusZmax"
-           rmin1="UX853Cone12BRadiusZmin"
-           rmax2="UX853Cone12BOuterRadius"
-           rmax1="UX853Cone12BOuterRadius"/>
-  </volume>
-
-  <!-- UX85-3 Cone 10 mrad of Beryllium 2.4 mm thick -->
-  <volume name="lvUX853Cone13" material="Pipe:BeTV56" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-3-Cone10mrad-13"
-           dz="0.5*UX853Cone13Lenght"
-           rmin2="UX853Cone13RadiusZmax"
-           rmin1="UX853Cone13RadiusZmin"
-           rmax2="UX853Cone13RadiusZmax + UX853Cone13Thick"
-           rmax1="UX853Cone13RadiusZmin + UX853Cone13Thick"/>
-  </volume>
-
-  <!-- UX85-3 Cone 10 mrad of Beryllium 3.5 mm thick for welding -->
-  <volume name="lvUX853Cone14" material="Pipe:BeTV56" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-3-Cone10mrad-14"
-           dz="0.5*UX853Cone14Lenght"
-           rmin2="UX853Cone14RadiusZmax"
-           rmin1="UX853Cone14RadiusZmin"
-           rmax2="UX853Cone14RadiusZmax + UX853Cone14Thick"
-           rmax1="UX853Cone14RadiusZmin + UX853Cone14Thick"/>
-  </volume>
-
-  <!-- UX85-3 Cone 10 mrad of Aluminium 3.5 mm thick -->
-  <volume name="lvUX853Cone15" material="Pipe:Al2219F" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-3-Cone10mrad-15"
-           dz="0.5*UX853Cone15Lenght"
-           rmin2="UX853Cone15RadiusZmax"
-           rmin1="UX853Cone15RadiusZmin"
-           rmax2="UX853Cone15RadiusZmax + UX853Cone15Thick"
-           rmax1="UX853Cone15RadiusZmin + UX853Cone15Thick"/>
-  </volume>
-
-  <!-- UX85-3 Step 10 mrad of Aluminium for welding to flange -->
-  <volume name="lvUX853Cone16" material="Pipe:Al2219F" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-3-Cone10mrad-16"
-           dz="0.5*UX853Cone16Lenght"
-           rmin2="UX853Cone16RadiusZmax"
-           rmin1="UX853Cone16RadiusZmin"
-           rmax2="UX853Cone16OuterRadius"
-           rmax1="UX853Cone16OuterRadius"/>
-  </volume>
-
-  <!-- UX85-3 Bimetallic Flange - Aluminium -->
-  <volume name="lvUX853Flange17A" material="Pipe:Al2219F" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-3-Flange-17A"
-           dz="0.5*UX853Flange17ALenght"
-           rmin2="UX853Flange17ARadiusZmax"
-           rmin1="UX853Flange17ARadiusZmin"
-           rmax2="UX853Flange17AOuterRadius"
-           rmax1="UX853Flange17AOuterRadius"/>
-  </volume>
-
-  <!-- UX85-3 Bimetallic Flange - St.Steel -->
-  <volume name="lvUX853Flange17B" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-3-Flange-17B"
-           dz="0.5*UX853Flange17BLenght"
-           rmin2="UX853Flange17BRadiusZmax"
-           rmin1="UX853Flange17BRadiusZmin"
-           rmax2="UX853Flange17BOuterRadius"
-           rmax1="UX853Flange17BOuterRadius"/>
-  </volume>
-
-  <!-- Vacuum inside whole of it -->
-  <volume name="lvUX853Vacuum12B" material="Vacuum" vis="Pipe:Vacuum">
-    <shape type="ConeSegment" name="UX85-3-Vacuum-12B"
-           dz="0.5*UX853DownstreamLenght"
-           rmax1="UX853Cone12BRadiusZmin"
-           rmax2="UX853Flange17BRadiusZmax"/>
-  </volume>
-
-  <volume name="lvUX853Downstream" vis="Pipe:Downstream">
-    <physvol name="pvUX853Cone12B"               logvol="lvUX853Cone12B">
-      <position z="UX853Cone12BZpos"/>
-    </physvol>
-    <physvol name="pvUX853Cone13"                logvol="lvUX853Cone13">
-      <position z="UX853Cone13Zpos"/>
-    </physvol>
-    <physvol name="pvUX853Cone14"                logvol="lvUX853Cone14">
-      <position z="UX853Cone14Zpos"/>
-    </physvol>
-    <physvol name="pvUX853Cone15"                logvol="lvUX853Cone15">
-      <position z="UX853Cone15Zpos"/>
-    </physvol>
-    <physvol name="pvUX853Cone16"                logvol="lvUX853Cone16">
-      <position z="UX853Cone16Zpos"/>
-    </physvol>
-    <physvol name="pvUX853Flange17A"             logvol="lvUX853Flange17A">
-      <position z="UX853Flange17AZpos"/>
-    </physvol>
-    <physvol name="pvUX853Flange17B"             logvol="lvUX853Flange17B">
-      <position z="UX853Flange17BZpos"/>
-    </physvol>
-    <!-- Now the vacuum inside -->
-    <physvol name="pvUX853Vacuum12B"             logvol="lvUX853Vacuum12B">
-      <position z="0.5*UX853DownstreamLenght"/>
-    </physvol>
-  </volume>
-
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream-UX854.xml b/compact/components/Pipe/2025-v00.00/Downstream-UX854.xml
deleted file mode 100644
index f359dc76a..000000000
--- a/compact/components/Pipe/2025-v00.00/Downstream-UX854.xml
+++ /dev/null
@@ -1,619 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--==================================UX853====================================-->
-<!--===========================================================================-->
-<pipe>
-
-  <!-- UX85-4 Flange  -->
-  <volume name="lvUX854Flange01" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-4-Flange01"
-           dz="0.5*UX854Flange01Lenght"
-           rmin1="UX854Flange01RadiusZmin"
-           rmin2="UX854Flange01RadiusZmax"
-           rmax1="UX854Flange01OuterRadius"
-           rmax2="UX854Flange01OuterRadius"/>
-  </volume>
-
-  <!-- UX85-4 Cone 10 mrad St.Steel 4 mm thick -->
-  <volume name="lvUX854Cone02" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-4-Cone10mrad-02"
-           dz="0.5*UX854Cone02Lenght"
-           rmin1="UX854Cone02RadiusZmin"
-           rmin2="UX854Cone02RadiusZmax"
-           rmax1="UX854Cone02RadiusZmin + UX854Cone02Thick"
-           rmax2="UX854Cone02RadiusZmax + UX854Cone02Thick"/>
-  </volume>
-
-  <!-- UX85-4 Support flange around pipe -->
-  <volume name="lvUX854SupportFlange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-4-SupportFlange"
-           dz="0.5*UX854SupportFlangeLenght"
-           rmin1="UX854SupportFlangeRadiusZmin"
-           rmin2="UX854SupportFlangeRadiusZmax"
-           rmax1="UX854SupportFlangeOuterRadius"
-           rmax2="UX854SupportFlangeOuterRadius"/>
-  </volume>
-
-  <!-- UX85-4 Cone 10 mrad St.Steel 4 mm thick -->
-  <volume name="lvUX854Cone03" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-4-Cone10mrad-03"
-           dz="0.5*UX854Cone03Lenght"
-           rmin1="UX854Cone03RadiusZmin"
-           rmin2="UX854Cone03RadiusZmax"
-           rmax1="UX854Cone03RadiusZmin + UX854Cone03Thick"
-           rmax2="UX854Cone03RadiusZmax + UX854Cone03Thick"/>
-  </volume>
-
-  <!-- UX85-4 Cone 10 mrad St.Steel connection to window thick -->
-  <volume name="lvUX854Cone04" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-4-Cone10mrad-04"
-           dz="0.5*UX854Cone04Lenght"
-           rmin1="UX854Cone04RadiusZmin"
-           rmin2="UX854Cone04RadiusZmax"
-           rmax1="UX854Cone04RadiusZmin + UX854Cone04Thick"
-           rmax2="UX854Cone04RadiusZmax + UX854Cone04Thick"/>
-  </volume>
-
-  <!-- UX85-4 Window -15 degree St.Steel 3 mm thick -->
-  <volume name="lvUX854Win05Cone" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Sub">
-      <shape type="ConeSegment" name="UX85-4-Window15degree-05"
-             dz="0.5*UX854Win05Lenght"
-             rmin1="UX854Win05RadiusZmin"
-             rmin2="UX854Win05RadiusZmax"
-             rmax1="UX854Win05RadiusZmin + UX854Win05Thick"
-             rmax2="UX854Win05RadiusZmax + UX854Win05Thick"/>
-      <shape type="Tube" name="UX85-4-Win05-Hole-1"
-             dz="0.5*UX854Win05Hole1Length"
-             rmax="UX854Win05Hole1Radius"/>
-      <transformation>
-        <position z="UX854Win05Hole1PosZ"/>
-        <rotation x="UX854Win05Hole1RotX"/>
-        <position/>
-        <rotation z="UX854Win05Hole1RotZ"/>
-        <posRPhiZ r="UX854Win05Hole1PosR" phi="UX854Win05Hole1PosPhi"/>
-      </transformation>
-      <shape type="Tube" name="UX85-4-Win05-Hole-2"
-             dz="0.5*UX854Win05Hole2Length"
-             rmax="UX854Win05Hole2Radius"/>
-      <transformation>
-        <position/>
-        <rotation x="UX854Win05Hole2RotX"/>
-        <position y="UX854Win05Hole2PosY" z="UX854Win05Hole2PosZ"/>
-      </transformation>
-      <shape type="Tube" name="UX85-4-Win05-Hole-3"
-             dz="0.5*UX854Win05Hole3Length"
-             rmax="UX854Win05Hole3Radius"/>
-      <transformation>
-        <position/>
-        <rotation y="UX854Win05Hole3RotY"/>
-        <position x="UX854Win05Hole3PosX" z="UX854Win05Hole3PosZ"/>
-      </transformation>
-      <shape type="Tube" name="UX85-4-Win05-Hole-4"
-             dz="0.5*UX854Win05Hole4Length"
-             rmax="UX854Win05Hole4Radius"/>
-      <transformation>
-        <position/>
-        <rotation y="UX854Win05Hole4RotY"/>
-        <position x="UX854Win05Hole4PosX" z="UX854Win05Hole4PosZ"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <!-- UX85-4 Window, Pipe for hole 1 -->
-  <volume name="lvUX854Win05Pipe1" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe1Sub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-1"
-             dz="0.5*UX854Win05Pipe1Length"
-             rmin="UX854Win05Hole1Radius"
-             rmax="UX854Win05Hole1Radius+UX854Win05Pipe1Thick"/>
-      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-1-Cut"
-             dz="0.5*UX854Win05Lenght"
-             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
-             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
-      <transformation>
-        <position y="UX854Win05Hole1PosR" z="-UX854Win05Hole1PosZ"/>
-        <rotation/>
-        <position/>
-        <rotation x="UX854Win05Hole1RotX"/>
-        <position z="-UX854Win05Pipe1Length/2 + UX854Win05PipeExtra"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe1Vac" material="Vacuum" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe1VacSub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-1Vac"
-             dz="0.5*UX854Win05Pipe1Length"
-             rmax="UX854Win05Hole1Radius-0.01*mm"/>
-      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-1Vac-Cut"
-             dz="0.5*UX854Win05Lenght"
-             rmax1="UX854Win05RadiusZmin + 0.01*mm"
-             rmax2="UX854Win05RadiusZmax + 0.01*mm"/>
-      <transformation>
-        <position y="UX854Win05Hole1PosR" z="-UX854Win05Hole1PosZ"/>
-        <rotation/>
-        <position/>
-        <rotation x="UX854Win05Hole1RotX"/>
-        <position z="-UX854Win05Pipe1Length/2 + UX854Win05PipeExtra"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe1Flange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX854Win05Pipe1Flange"
-           dz="0.5*UX854Win05Pipe1FlangeThick"
-           rmin="UX854Win05Hole1Radius + UX854Win05Pipe1Thick + 0.01*mm"
-           rmax="UX854Win05Pipe1FlangeRad"/>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe1Lid" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX854Win05Pipe1Lid"
-           dz="0.5*UX854Win05Pipe1FlangeThick"
-           rmax="UX854Win05Pipe1FlangeRad"/>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe1Ass" vis="Pipe:Downstream">
-    <physvol name="pvUX854Win05Pipe1"             volume="lvUX854Win05Pipe1"/>
-    <physvol name="pvUX854Win05Pipe1Vac"          volume="lvUX854Win05Pipe1Vac"/>
-    <physvol name="pvUX854Win05Pipe1Flange"       volume="lvUX854Win05Pipe1Flange">
-      <position z="UX854Win05Pipe1Length/2 - UX854Win05Pipe1FlangeThick/2"/>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe1Lid"          volume="lvUX854Win05Pipe1Lid">
-      <position z="UX854Win05Pipe1Length/2 + UX854Win05Pipe1FlangeThick - UX854Win05Pipe1FlangeThick/2"/>
-    </physvol>
-  </volume>
-
-  <!-- UX85-4 Window, Pipe for hole 2 -->
-  <volume name="lvUX854Win05Pipe2" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe2Sub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-2"
-             dz="0.5*UX854Win05Pipe2Length"
-             rmin="UX854Win05Hole2Radius"
-             rmax="UX854Win05Hole2Radius+UX854Win05Pipe2Thick"/>
-      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-2-Cut"
-             dz="0.5*UX854Win05Lenght"
-             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
-             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
-      <transformation>
-        <position y="-UX854Win05Hole2PosY" z="-UX854Win05Hole2PosZ"/>
-        <rotation/>
-        <position/>
-        <rotation x="UX854Win05Hole2RotX"/>
-        <position z="-UX854Win05Pipe2Length/2 + UX854Win05PipeExtra"/>
-      </transformation>
-      <shape type="Box" name="UX85-4-Win05-Pipe-2-Cut2"
-             dx="0.5*UX854Win05Hole2Radius*4"
-             dy="0.5*UX854Win05Hole2Radius*10"
-             dz="0.5*UX854Win05Hole2Radius*4"/>
-      <transformation>
-        <position z="UX854Win05Hole2Radius*2"/>
-        <rotation/>
-        <position/>
-        <rotation x="45.0*degree"/>
-        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe2Vac" material="Vacuum" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe2VacSub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-2Vac"
-             dz="0.5*UX854Win05Pipe2Length"
-             rmax="UX854Win05Hole2Radius-0.01*mm"/>
-      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-2Vac-Cut"
-             dz="0.5*UX854Win05Lenght"
-             rmax1="UX854Win05RadiusZmin + 0.01*mm"
-             rmax2="UX854Win05RadiusZmax + 0.01*mm"/>
-      <transformation>
-        <position y="-UX854Win05Hole2PosY" z="-UX854Win05Hole2PosZ"/>
-        <rotation/>
-        <position/>
-        <rotation x="UX854Win05Hole2RotX"/>
-        <position z="-UX854Win05Pipe2Length/2 + UX854Win05PipeExtra"/>
-      </transformation>
-      <shape type="Box" name="UX85-4-Win05-Pipe-2Vac-Cut2"
-             dx="0.5*UX854Win05Hole2Radius*4"
-             dy="0.5*UX854Win05Hole2Radius*10"
-             dz="0.5*UX854Win05Hole2Radius*4"/>
-      <transformation>
-        <position z="UX854Win05Hole2Radius*2"/>
-        <rotation/>
-        <position/>
-        <rotation x="45.0*degree"/>
-        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe2Extend" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe2ExtendSub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-2Ext"
-             dz="0.5*UX854Win05Pipe2ExtendLength"
-             rmin="UX854Win05Hole2Radius"
-             rmax="UX854Win05Hole2Radius+UX854Win05Pipe2Thick"/>
-      <shape type="Box" name="UX85-4-Win05-Pipe-2Ext-Cut"
-             dx="0.5*UX854Win05Hole2Radius*4"
-             dy="0.5*UX854Win05Hole2Radius*10"
-             dz="0.5*UX854Win05Hole2Radius*4"/>
-      <transformation>
-        <position z="UX854Win05Hole2Radius*2"/>
-        <rotation/>
-        <position/>
-        <rotation x="45.0*degree"/>
-        <position z="UX854Win05Pipe2ExtendLength/2 - UX854Win05Pipe2CutLength"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe2ExtendVac" material="Vacuum" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe2ExtendVacSub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-2ExtVac"
-             dz="0.5*UX854Win05Pipe2ExtendLength"
-             rmax="UX854Win05Hole2Radius-0.01*mm"/>
-      <shape type="Box" name="UX85-4-Win05-Pipe-2ExtVac-Cut"
-             dx="0.5*UX854Win05Hole2Radius*4"
-             dy="0.5*UX854Win05Hole2Radius*10"
-             dz="0.5*UX854Win05Hole2Radius*4"/>
-      <transformation>
-        <position z="UX854Win05Hole2Radius*2"/>
-        <rotation/>
-        <position/>
-        <rotation x="45.0*degree"/>
-        <position z="UX854Win05Pipe2ExtendLength/2 - UX854Win05Pipe2CutLength"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe2Flange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX854Win05Pipe2Flange"
-           dz="0.5*UX854Win05Pipe2FlangeThick"
-           rmin="UX854Win05Hole2Radius + UX854Win05Pipe3Thick + 0.01*mm"
-           rmax="UX854Win05Pipe2FlangeRad"/>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe2Lid" material="Pipe:Steel316LN">
-    <shape type="Tube" name="UX854Win05Pipe2Lid"
-           dz="0.5*UX854Win05Pipe2FlangeThick"
-           rmax="UX854Win05Pipe2FlangeRad"/>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe2Ass" vis="Pipe:Downstream">
-    <physvol name="pvUX854Win05Pipe2"                volume="lvUX854Win05Pipe2"/>
-    <physvol name="pvUX854Win05Pipe2Vac"             volume="lvUX854Win05Pipe2Vac"/>
-    <physvol name="pvUX854Win05Pipe2Extend"          volume="lvUX854Win05Pipe2Extend">
-      <transformation>
-        <position/>
-        <rotation x="-90.0*degree" z="180.0*degree"/>
-        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength + 0.01*mm" y="-UX854Win05Pipe2ExtendLength/2 + UX854Win05Pipe2CutLength - 0.01*mm"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe2ExtendVac"       volume="lvUX854Win05Pipe2ExtendVac">
-      <transformation>
-        <position/>
-        <rotation x="-90.0*degree" z="180.0*degree"/>
-        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength + 0.01*mm" y="-UX854Win05Pipe2ExtendLength/2 + UX854Win05Pipe2CutLength - 0.01*mm"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe2Flange"          volume="lvUX854Win05Pipe2Flange">
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength + 0.01*mm" y="-UX854Win05Pipe2ExtendBasicLength - 0.01*mm + UX854Win05Pipe2FlangeThick/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe2Lid"             volume="lvUX854Win05Pipe2Lid">
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position z="UX854Win05Pipe2Length/2 - UX854Win05Pipe2CutLength + 0.01*mm" y="-UX854Win05Pipe2ExtendBasicLength - 0.01*mm - UX854Win05Pipe2FlangeThick + UX854Win05Pipe2FlangeThick/2"/>
-      </transformation>
-    </physvol>
-  </volume>
-
-  <!-- UX85-4 Window, Pipe for hole 3 -->
-  <volume name="lvUX854Win05Pipe3" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe3Sub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-3"
-             dz="0.5*UX854Win05Pipe3Length"
-             rmin="UX854Win05Hole3Radius"
-             rmax="UX854Win05Hole3Radius+UX854Win05Pipe3Thick"/>
-      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-3-Cut"
-             dz="0.5*UX854Win05Lenght"
-             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
-             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
-      <transformation>
-        <position y="UX854Win05Hole3PosX" z="-UX854Win05Hole3PosZ"/>
-        <rotation/>
-        <position/>
-        <rotation x="-UX854Win05Hole3RotY"/>
-        <position z="-UX854Win05Pipe3Length/2 + UX854Win05PipeExtra"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe3Vac" material="Vacuum" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe3VacSub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-3Vac"
-             dz="0.5*UX854Win05Pipe3Length"
-             rmax="UX854Win05Hole3Radius-0.01*mm"/>
-      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-3Vac-Cut"
-             dz="0.5*UX854Win05Lenght"
-             rmax1="UX854Win05RadiusZmin + 0.01*mm"
-             rmax2="UX854Win05RadiusZmax + 0.01*mm"/>
-      <transformation>
-        <position y="UX854Win05Hole3PosX" z="-UX854Win05Hole3PosZ"/>
-        <rotation/>
-        <position/>
-        <rotation x="-UX854Win05Hole3RotY"/>
-        <position z="-UX854Win05Pipe3Length/2 + UX854Win05PipeExtra"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe3Extend" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="union" name="UX854Win05Pipe3ExtendUnion">
-      <shape type="Tube" name="UX854Win05Pipe3ExtendPlate"
-             dz="0.5*UX854Win05Pipe3Thick"
-             rmin="UX854Win05Pipe3Rad"
-             rmax="UX854Win05Hole3Radius + UX854Win05Pipe3Thick"/>
-      <shape type="Tube" name="UX854Win05Pipe3ExtendTubs"
-             dz="0.5*(UX854Win05Pipe3ExtendLength - UX854Win05Pipe3Thick)"
-             rmin="UX854Win05Pipe3Rad"
-             rmax="UX854Win05Pipe3Rad + UX854Win05Pipe3Thick"/>
-      <position z="UX854Win05Pipe3ExtendLength/2 + 0.01*mm"/>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe3ExtendVac" material="Vacuum" vis="Pipe:Vacuum">
-    <shape type="Tube" name="UX854Win05Pipe3ExtendVacTubs"
-           dz="0.5*UX854Win05Pipe3ExtendLength"
-           rmax="UX854Win05Pipe3Rad - 0.01*mm"/>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe3Flange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX854Win05Pipe3Flange"
-           dz="0.5*UX854Win05Pipe3FlangeThick"
-           rmin="UX854Win05Pipe3Rad + UX854Win05Pipe3Thick + 0.01*mm"
-           rmax="UX854Win05Pipe3FlangeRad"/>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe3Lid" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX854Win05Pipe3Lid"
-           dz="0.5*UX854Win05Pipe3FlangeThick"
-           rmax="UX854Win05Pipe3FlangeRad"/>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe3Ass" vis="Pipe:Downstream">
-    <physvol name="pvUX854Win05Pipe3"             volume="lvUX854Win05Pipe3"/>
-    <physvol name="pvUX854Win05Pipe3Vac"          volume="lvUX854Win05Pipe3Vac"/>
-    <physvol name="pvUX854Win05Pipe3Extend"       volume="lvUX854Win05Pipe3Extend">
-      <position z="UX854Win05Pipe3Length/2 + UX854Win05Pipe3Thick/2 + 0.01*mm"/>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe3ExtendVac"    volume="lvUX854Win05Pipe3ExtendVac">
-      <position z="UX854Win05Pipe3Length/2 + UX854Win05Pipe3ExtendLength/2 + 0.01*mm"/>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe3Flange"       volume="lvUX854Win05Pipe3Flange">
-      <position z="UX854Win05Pipe3Length/2 + UX854Win05Pipe3ExtendLength - UX854Win05Pipe3FlangeThick/2"/>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe3Lid"          volume="lvUX854Win05Pipe3Lid">
-      <position z="UX854Win05Pipe3Length/2 + UX854Win05Pipe3ExtendLength + UX854Win05Pipe3FlangeThick - UX854Win05Pipe3FlangeThick/2"/>
-    </physvol>
-  </volume>
-
-  <!-- UX85-4 Window, Pipe for hole 4 -->
-  <volume name="lvUX854Win05Pipe4" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe4Sub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-4"
-             dz="0.5*UX854Win05Pipe4Length"
-             rmin="UX854Win05Hole4Radius"
-             rmax="UX854Win05Hole4Radius+UX854Win05Pipe4Thick"/>
-      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-4-Cut"
-             dz="0.5*UX854Win05Lenght"
-             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
-             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
-      <transformation>
-        <position y="UX854Win05Hole4PosX" z="-UX854Win05Hole4PosZ"/>
-        <rotation/>
-        <position/>
-        <rotation x="-UX854Win05Hole4RotY"/>
-        <position z="-UX854Win05Pipe4Length/2 + UX854Win05PipeExtra"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe4Vac" material="Vacuum" vis="Pipe:Vacuum">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05Pipe4VacSub">
-      <shape type="Tube" name="UX85-4-Win05-Pipe-4Vac"
-             dz="0.5*UX854Win05Pipe4Length"
-             rmax="UX854Win05Hole4Radius - 0.01*mm"/>
-      <shape type="ConeSegment" name="UX85-4-Win05-Pipe-4Vac-Cut"
-             dz="0.5*UX854Win05Lenght"
-             rmax1="UX854Win05RadiusZmin + 0.01*mm"
-             rmax2="UX854Win05RadiusZmax + 0.01*mm"/>
-      <transformation>
-        <position y="UX854Win05Hole4PosX" z="-UX854Win05Hole4PosZ"/>
-        <rotation/>
-        <position/>
-        <rotation x="-UX854Win05Hole4RotY"/>
-        <position z="-UX854Win05Pipe4Length/2 + UX854Win05PipeExtra"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe4Flange" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX854Win05Pipe4Flange"
-           dz="0.5*UX854Win05Pipe4FlangeThick"
-           rmin="UX854Win05Hole4Radius + UX854Win05Pipe4Thick + 0.01*mm"
-           rmax="UX854Win05Pipe4FlangeRad"/>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe4Lid" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX854Win05Pipe4Lid"
-           dz="0.5*UX854Win05Pipe4FlangeThick"
-           rmax="UX854Win05Pipe4FlangeRad"/>
-  </volume>
-
-  <volume name="lvUX854Win05Pipe4Ass" vis="Pipe:Downstream">
-    <physvol name="pvUX854Win05Pipe4"             volume="lvUX854Win05Pipe4"/>
-    <physvol name="pvUX854Win05Pipe4Vac"          volume="lvUX854Win05Pipe4Vac"/>
-    <physvol name="pvUX854Win05Pipe4Flange"       volume="lvUX854Win05Pipe4Flange">
-      <position z="UX854Win05Pipe4Length/2 - UX854Win05Pipe4FlangeThick/2"/>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe4Lid"          volume="lvUX854Win05Pipe4Lid">
-      <position z="UX854Win05Pipe4Length/2 - UX854Win05Pipe4FlangeThick/2 + UX854Win05Pipe4FlangeThick"/>
-    </physvol>
-  </volume>
-
-  <!-- UX85-4 Window, Mount -->
-  <volume name="lvUX854Win05Mount" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="BooleanShape" operation="subtraction" name="UX854Win05MountSub">
-      <shape type="Box" name="UX85-4-Win05-Mount"
-             dx="0.5*66.0*mm"                dy="0.5*100.0*mm"             dz="0.5*120.0*mm"/>
-      <shape type="ConeSegment" name="UX85-4-Win05-Mount-Cut"
-             dz="0.5*UX854Win05Lenght"
-             rmax1="UX854Win05RadiusZmin + UX854Win05Thick + 0.01*mm"
-             rmax2="UX854Win05RadiusZmax + UX854Win05Thick + 0.01*mm"/>
-      <position y="100.0*mm/2" z="-599.0*mm/2+54.4*mm+120.0*mm/2"/>
-      <shape type="Box" name="UX85-4-Win05-Mount-Cut2"
-             dx="0.5*(66.0*mm-4.0*mm)"       dy="0.5*(100.0*mm-4.0*mm)"    dz="0.5*(120.0*mm+4.0*mm)"/>
-    </shape>
-  </volume>
-
-
-  <!-- UX85-4 Window, With pipes -->
-  <volume name="lvUX854Win05" vis="Pipe:Downstream">
-    <physvol name="pvUX854Win05Main"          volume="lvUX854Win05Cone"/>
-    <physvol name="pvUX854Win05Pipe1Ass"      volume="lvUX854Win05Pipe1Ass">
-      <transformation>
-        <position z="-UX854Win05PipeExtra + UX854Win05Pipe1Length/2"/>
-        <rotation/>
-        <position z="UX854Win05Hole1PosZ"/>
-        <rotation x="UX854Win05Hole1RotX" z="180.0*degree"/>
-        <position/>
-        <rotation z="UX854Win05Hole1RotZ"/>
-        <posRPhiZ r="UX854Win05Hole1PosR" phi="UX854Win05Hole1PosPhi"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe2Ass"      volume="lvUX854Win05Pipe2Ass">
-      <transformation>
-        <position z="-UX854Win05PipeExtra + UX854Win05Pipe2Length/2"/>
-        <rotation/>
-        <position/>
-        <rotation x="-UX854Win05Hole2RotX"/>
-        <position y="UX854Win05Hole2PosY" z="UX854Win05Hole2PosZ"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe3Ass"      volume="lvUX854Win05Pipe3Ass">
-      <transformation>
-        <position z="-UX854Win05PipeExtra + UX854Win05Pipe3Length/2"/>
-        <rotation/>
-        <position/>
-        <rotation y="UX854Win05Hole3RotY" z="90.0*degree"/>
-        <position x="UX854Win05Hole3PosX" z="UX854Win05Hole3PosZ"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvUX854Win05Pipe4Ass"      volume="lvUX854Win05Pipe4Ass">
-      <transformation>
-        <position z="-UX854Win05PipeExtra + UX854Win05Pipe4Length/2"/>
-        <rotation/>
-        <position/>
-        <rotation y="UX854Win05Hole4RotY" z="90.0*degree"/>
-        <position x="UX854Win05Hole4PosX" z="UX854Win05Hole4PosZ"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvUX854Win05Mount"         volume="lvUX854Win05Mount">
-      <position y="-100.0*mm/2" z="599.0*mm/2-54.4*mm-120.0*mm/2"/>
-    </physvol>
-  </volume>
-
-
-  <!-- UX85-4 Cylinder 3 mm thick -->
-  <volume name="lvUX854Cyl06" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX85-4-Cylinder-06"
-           dz="0.5*UX854Cyl06Lenght"          rmin="UX854Cyl06InnerRadius"      rmax="UX854Cyl06InnerRadius + UX854Cyl06Thick"/>
-  </volume>
-
-  <!-- UX85-4 Cylinder 1.5 mm thick -->
-  <volume name="lvUX854Cyl07" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX85-4-Cylinder-07"
-           dz="0.5*UX854Cyl07Lenght"          rmin="UX854Cyl07InnerRadius"      rmax="UX854Cyl07OuterRadius"/>
-  </volume>
-
-  <!-- UX85-4 Flange -->
-  <volume name="lvUX854Flange08" material="Pipe:Steel316LN" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX85-4-Flange08"
-           dz="0.5*UX854Flange08Lenght"       rmin="UX854Flange08InnerRadius"   rmax="UX854Flange08OuterRadius"/>
-  </volume>
-
-  <!-- Vacuum in 10 mrad -->
-  <volume name="lvUX854Vacuum01" material="Vacuum" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-4-Vacuum-01"
-           dz="0.5*UX854Vacuum01Lenght"       rmax1="UX854Flange01RadiusZmin"   rmax2="UX854Cone04RadiusZmax"/>
-  </volume>
-
-  <!-- Vacuum in -15 degree window -->
-  <volume name="lvUX854Vacuum05" material="Vacuum" vis="Pipe:Downstream">
-    <shape type="ConeSegment" name="UX85-4-Vacuum-05"
-           dz="0.5*UX854Vacuum05Lenght"       rmax1="UX854Win05RadiusZmin"     rmax2="UX854Win05RadiusZmax"/>
-  </volume>
-
-  <!-- Vacuum in cylinders -->
-  <volume name="lvUX854Vacuum06" material="Vacuum" vis="Pipe:Downstream">
-    <shape type="Tube" name="UX85-4-Vacuum-06"
-           dz="0.5*UX854Vacuum06Lenght"       rmax="UX854Cyl06InnerRadius"/>
-  </volume>
-
-  <!-- UX85-4 Pipes St.Steel -->
-  <volume name="lvUX854" vis="Pipe:Downstream">
-    <physvol name="pvUX854Flange01"           volume="lvUX854Flange01">
-      <position z="UX854Flange01Zpos"/>
-    </physvol>
-    <physvol name="pvUX854Cone02"             volume="lvUX854Cone02">
-      <position z="UX854Cone02Zpos"/>
-    </physvol>
-    <physvol name="pvUX854SupportFlange"      volume="lvUX854SupportFlange">
-      <position z="UX854SupportFlangeZpos"/>
-    </physvol>
-    <physvol name="pvUX854Cone03"             volume="lvUX854Cone03">
-      <position z="UX854Cone03Zpos"/>
-    </physvol>
-    <physvol name="pvUX854Cone04"             volume="lvUX854Cone04">
-      <position z="UX854Cone04Zpos"/>
-    </physvol>
-    <physvol name="pvUX854Win05"              volume="lvUX854Win05">
-      <position z="UX854Win05Zpos"/>
-    </physvol>
-    <physvol name="pvUX854Cyl06"              volume="lvUX854Cyl06">
-      <position z="UX854Cyl06Zpos"/>
-    </physvol>
-    <physvol name="pvUX854Cyl07"              volume="lvUX854Cyl07">
-      <position z="UX854Cyl07Zpos"/>
-    </physvol>
-    <physvol name="pvUX854Flange08"           volume="lvUX854Flange08">
-      <position z="UX854Flange08Zpos"/>
-    </physvol>
-    <physvol name="pvUX854Vacuum01"           volume="lvUX854Vacuum01">
-      <position z="0.5*UX854Vacuum01Lenght"/>
-    </physvol>
-    <physvol name="pvUX854Vacuum05"           volume="lvUX854Vacuum05">
-      <position z="UX854Vacuum01Lenght + 0.5*UX854Vacuum05Lenght"/>
-    </physvol>
-    <physvol name="pvUX854Vacuum06"
-             volume="lvUX854Vacuum06">
-      <position z="UX854Vacuum01Lenght + UX854Vacuum05Lenght+ 0.5*UX854Vacuum06Lenght"/>
-    </physvol>
-
-  </volume>
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Downstream.xml b/compact/components/Pipe/2025-v00.00/Downstream.xml
deleted file mode 100644
index 1beb42a19..000000000
--- a/compact/components/Pipe/2025-v00.00/Downstream.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-
-    <!--==================================================================================-->
-    <!--===================================Bakeout========================================-->
-    <!--==================================================================================-->
-    <detector name="DownstreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeDownstream:parent}" vis="Pipe:Vis">
-
-      <include ref="Downstream-UX853.xml"/>
-      <include ref="Downstream-UX854.xml"/>
-      <include ref="Downstream-Compensator.xml"/>
-
-      <!--==================================================================================-->
-      <!--===================================Final  Assembly================================-->
-      <!--==================================================================================-->
-      <envelope type="Assembly" name="lvUX85Downstream" vis="GreenVis">
-        <physvol name="pvUX853Downstream"      volume="lvUX853Downstream">
-          <position z="0*mm"/>
-        </physvol>
-        <physvol name="pvUX85Compensator13100" volume="lvUX85Compensator13100">
-          <position z="UX853DownstreamLenght"/>
-        </physvol>
-        <physvol name="pvUX854"                volume="lvUX854">
-          <position z="UX853DownstreamLenght + UX85C13100Lenght"/>
-        </physvol>
-      </envelope>
-      <position z="UX853Rich2DownSplitZposIP - Regions:DownstreamZPos"/>
-
-      <nodebug/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InRich1-Params.xml b/compact/components/Pipe/2025-v00.00/InRich1-Params.xml
deleted file mode 100644
index 095a883ed..000000000
--- a/compact/components/Pipe/2025-v00.00/InRich1-Params.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-
-  <define>
-    <!-- this file contains the geometry parameters for Rich1 BeamPipe -->
-
-    <constant name="Rh1BeamPipeThickness" value="UX851Cyl04Thick"/>
-    <constant name="Rh1BeamPipeUpsAssemblyLHCbZ" value="UX851ZStartIP"/>
-    <constant name="Rh1BeamPipeConeUpsAddtionalLargeZSize" value="300.0*mm"/>
-    <constant name="Rh1BeamPipeHoleRadialTolerence" value="1.0*mm"/>
-    <constant name="Rh1BeamPipeDnstFlangeRadialThickness" value="9.75*mm"/>
-    <constant name="Rh1BeamPipeDnstFlangeInnerRad" value="UX851Rich1FlangeRadiusZMax"/>
-    <constant name="Rh1BeamPipeConeInnerRad2" value="UX851Cone05BRadiusZmax"/>
-    <constant name="Rh1SubMasterHoleZSizeAfterMagSh" value="Rh1SubMasterDnstrZLim-Rh1MagShMainPartDnsZLim"/>
-    <constant name="Rh1BeamPipeConeDnsAddtionalLargeZSize" value="300.0*mm"/>
-    <constant name="Rh1BeamPipeCylBeginInLHCbZ" value="UX851Rich1SplitZminIP"/>
-    <constant name="Rh1SubMasterHoleRadiusAfterMagSh" value="UX851Cone05BRadiusZmax+2.0*mm"/>
-    <constant name="Rh1BeamPipeAssemblyInSubMasterLHCbZ" value="UX851ZStartIP"/>
-    <constant name="Rh1BeamPipeCylInnerRad" value="UX851Cyl04Radius"/>
-    <constant name="Rh1BeamPipeCylEndInLHCbZ" value="1080.0*mm"/>
-    <constant name="Rh1BeamPipeDnstFlangeZBeginInLHCb" value="UX851Rich1FlangeOffsetIP"/>
-    <constant name="Rh1BeamPipeHoleZTolerence" value="0.1*mm"/>
-    <constant name="Rh1BeamPipeDnsAssemblyLHCbZ" value="UX851ZStartIP"/>
-    <constant name="Rh1BeamPipeDnstFlangeZSize" value="UX851Rich1Flange1Length"/>
-    <constant name="Rh1BeamPipeConeEndInLHCbZ" value="2210.0*mm"/>
-    <constant name="Rh1BeamPipeUpsAssemblyRMZ" value="Rh1BeamPipeUpsAssemblyLHCbZ-Rich1MasterZ"/>
-    <constant name="Rh1BeamPipeDnstFlangeOuterRad" value="Rh1BeamPipeDnstFlangeInnerRad+Rh1BeamPipeDnstFlangeRadialThickness"/>
-    <constant name="Rh1BeamPipeConeOuterRad2" value="Rh1BeamPipeConeInnerRad2+Rh1BeamPipeThickness"/>
-    <constant name="Rh1SubMasterHoleZLocationAfterMagSh" value="Rh1MagShMainPartDnsZLim+0.5*Rh1SubMasterHoleZSizeAfterMagSh-Rh1SubMasterZ-Rich1MasterZ"/>
-    <constant name="Rh1BeamPipeExtendedConeZShift" value="0.5*(Rh1BeamPipeConeDnsAddtionalLargeZSize-Rh1BeamPipeConeUpsAddtionalLargeZSize)"/>
-    <constant name="Rh1BeamPipeAssemblyZ" value="Rh1BeamPipeAssemblyInSubMasterLHCbZ-Rich1MasterZ-Rh1SubMasterZ"/>
-    <constant name="Rh1BeamPipeConeInnerRad1" value="Rh1BeamPipeCylInnerRad"/>
-    <constant name="Rh1BeamPipeCylOuterRad" value="Rh1BeamPipeCylInnerRad+Rh1BeamPipeThickness"/>
-    <constant name="Rh1BeamPipeConeBeginInLHCbZ" value="Rh1BeamPipeCylEndInLHCbZ"/>
-    <constant name="Rh1BeamPipeCylZSize" value="Rh1BeamPipeCylEndInLHCbZ-Rh1BeamPipeCylBeginInLHCbZ"/>
-    <constant name="Rh1BeamPipeDnsAssemblyRMZ" value="Rh1BeamPipeDnsAssemblyLHCbZ-Rich1MasterZ"/>
-    <constant name="Rh1BeamPipeDnstFlangeHoleZSize" value="Rh1BeamPipeDnstFlangeZSize+2.0*Rh1BeamPipeHoleZTolerence"/>
-    <constant name="Rh1BeamPipeDnstFlangeZInLHCb" value="Rh1BeamPipeDnstFlangeZBeginInLHCb+0.5*Rh1BeamPipeDnstFlangeZSize"/>
-    <constant name="Rh1BeamPipeDnstFlangeHoleOuterRad" value="Rh1BeamPipeDnstFlangeOuterRad+Rh1BeamPipeHoleRadialTolerence"/>
-    <constant name="Rh1BeamPipeConeHoleOuterRad2" value="Rh1BeamPipeConeOuterRad2+Rh1BeamPipeHoleRadialTolerence"/>
-    <constant name="Rh1BeamPipeConeOuterRad1" value="Rh1BeamPipeConeInnerRad1+Rh1BeamPipeThickness"/>
-    <constant name="Rh1BeamPipeCylHoleOuterRad" value="Rh1BeamPipeCylOuterRad+Rh1BeamPipeHoleRadialTolerence"/>
-    <constant name="Rh1BeamPipeConeBeginInRh1SubMasterZ" value="Rh1BeamPipeConeBeginInLHCbZ-Rich1MasterZ-Rh1SubMasterZ"/>
-    <constant name="Rh1BeamPipeConeZSize" value="Rh1BeamPipeConeEndInLHCbZ-Rh1BeamPipeConeBeginInLHCbZ"/>
-    <constant name="Rh1BeamPipeDnstFlangeRMZ" value="Rh1BeamPipeDnstFlangeZInLHCb-Rich1MasterZ"/>
-    <constant name="Rh1BeamPipeConeHoleOuterRad1" value="Rh1BeamPipeConeOuterRad1+Rh1BeamPipeHoleRadialTolerence"/>
-    <constant name="Rh1BeamPipeConeSlope" value="(Rh1BeamPipeConeOuterRad2-Rh1BeamPipeConeOuterRad1)/Rh1BeamPipeConeZSize"/>
-    <constant name="Rh1BeamPipeExtendedConeHoleZSize" value="Rh1BeamPipeConeZSize+Rh1BeamPipeConeUpsAddtionalLargeZSize+Rh1BeamPipeConeDnsAddtionalLargeZSize"/>
-    <constant name="Rh1BeamPipeConeRMZ" value="Rh1BeamPipeConeBeginInLHCbZ+(0.5*Rh1BeamPipeConeZSize)-Rich1MasterZ"/>
-    <constant name="Rh1BeamPipeDnstFlangeZ" value="Rh1BeamPipeDnstFlangeRMZ-Rh1SubMasterZ"/>
-    <constant name="Rh1BeamPipeExtendedConeHoleOuterRad1" value="Rh1BeamPipeConeHoleOuterRad1-(Rh1BeamPipeConeUpsAddtionalLargeZSize*Rh1BeamPipeConeSlope)"/>
-    <constant name="Rh1BeamPipeExtendedConeHoleOuterRad2" value="Rh1BeamPipeConeHoleOuterRad2+(Rh1BeamPipeConeDnsAddtionalLargeZSize*Rh1BeamPipeConeSlope)"/>
-    <constant name="Rh1Mirror1BeamPipeConeZSize" value="Rh1BeamPipeExtendedConeHoleZSize"/>
-    <constant name="Rh1BeamPipeExtendedConeHoleRMZ" value="Rh1BeamPipeConeRMZ+Rh1BeamPipeExtendedConeZShift"/>
-    <constant name="Rh1BeamPipeConeZ" value="Rh1BeamPipeConeRMZ-Rh1SubMasterZ"/>
-    <!--parameter name="Rh1Mirror1BeamPipeConeOuterRad1" value="Rh1BeamPipeExtendedConeHoleOuterRad1+Rh1Mirror1BeamPipeHoleRadialTolerance" /-->
-    <!--parameter name="Rh1Mirror1BeamPipeConeOuterRad2" value="Rh1BeamPipeExtendedConeHoleOuterRad2+Rh1Mirror1BeamPipeHoleRadialTolerance" /-->
-    <constant name="Rh1BeamPipeExtendedConeHoleZ" value="Rh1BeamPipeExtendedConeHoleRMZ-Rh1SubMasterZ"/>
-    <!--parameter name="Rh1Mirror1BeamPipeConeX" value="Rh1BeamPipeExtendedConeHoleZ-Rh1Mirror1CCZ-Rh1MirrorSingleADiagDeltaZ" /-->
-
-  </define>
-
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InRich1.xml b/compact/components/Pipe/2025-v00.00/InRich1.xml
deleted file mode 100644
index 0eb7099ae..000000000
--- a/compact/components/Pipe/2025-v00.00/InRich1.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe inside the UT region                     -->
-<!--===========================================================================-->
-<!--==================================Pipe In  UT=============================-->
-<!--===========================================================================-->
-<lccdd>
-
-      <!-- UX85-1 Step to 54 mm diameter (after RF connection in Velo2Rich1 -->
-      <volume name="lvUX851Cyl01" material="Pipe:Al2219F" vis="Pipe:InRich1">
-        <shape type="Tube" name="UX85-1-Cylinder-01"
-              dz="0.5*UX851Cyl01Lenght"
-              rmin="UX851Cyl01Radius"
-              rmax="UX851Cyl01Radius+UX851Cyl01Thick"/>
-      </volume>
-
-      <!-- UX85-1 Cylinder 54 mm diamater Aluminium -->
-      <volume name="lvUX851Cyl02" material="Pipe:Al2219F" vis="Pipe:InRich1">
-        <shape type="Tube" name="UX85-1-Cylinder-02"
-              dz="0.5*UX851Cyl02Lenght"
-              rmin="UX851Cyl02Radius"
-              rmax="UX851Cyl02Radius+UX851Cyl02Thick"/>
-      </volume>
-
-      <!-- UX85-1 Cylinder 54 mm diamater Beryllium - RICH1SubMaster split -->
-      <volume name="lvUX851Cyl03A" material="Pipe:BeTV56" vis="Pipe:InRich1">
-        <shape type="Tube" name="UX85-1-Cylinder-03A"
-              dz="0.5*UX851Cyl03ALenght"
-              rmin="UX851Cyl03Radius"
-              rmax="UX851Cyl03Radius+UX851Cyl03Thick"/>
-      </volume>
-      <volume name="lvUX851Cyl03B" material="Pipe:BeTV56" vis="Pipe:InRich1">
-        <shape type="Tube" name="UX85-1-Cylinder-03B"
-              dz="0.5*UX851Cyl03BLenght"
-              rmin="UX851Cyl03Radius"
-              rmax="UX851Cyl03Radius+UX851Cyl03Thick"/>
-      </volume>
-
-      <!-- UX85-1 Cylinder 54 mm diamater Beryllium -->
-      <volume name="lvUX851Cyl04" material="Pipe:BeTV56" vis="Pipe:InRich1">
-        <shape type="Tube" name="UX85-1-Cylinder-04"
-              dz="0.5*UX851Cyl04Lenght"
-              rmin="UX851Cyl04Radius"
-              rmax="UX851Cyl04Radius+UX851Cyl04Thick"/>
-      </volume>
-
-      <!-- UX85-1 Cone 25 mrad - RICH1SubMaster split -->
-      <volume name="lvUX851Cone05A" material="Pipe:BeTV56" vis="Pipe:InRich1">
-        <shape type="ConeSegment" name="UX85-1-Cone25mrad-05A"
-              dz="0.5*UX851Cone05ALenght"
-              rmin2="UX851Cone05ARadiusZmax"
-              rmin1="UX851Cone05ARadiusZmin"
-              rmax2="UX851Cone05ARadiusZmax+UX851Cone05Thick"
-              rmax1="UX851Cone05ARadiusZmin+UX851Cone05Thick"/>
-      </volume>
-      <volume name="lvUX851Cone05B" material="Pipe:BeTV56" vis="Pipe:InRich1">
-        <shape type="ConeSegment" name="UX85-1-Cone25mrad-05B"
-              dz="0.5*UX851Cone05BLenght"
-              rmin2="UX851Cone05BRadiusZmax"
-              rmin1="UX851Cone05BRadiusZmin"
-              rmax2="UX851Cone05BRadiusZmax+UX851Cone05Thick"
-              rmax1="UX851Cone05BRadiusZmin+UX851Cone05Thick"/>
-      </volume>
-
-      <!-- UX85-1 Flange to seal to RICH1 - Around beam pipe -->
-      <!-- 10 microns is added to avoid intersections        -->
-      <volume name="lvUX851Rich1Flange" material="Pipe:BeTV56" vis="Pipe:InRich1">
-        <shape type="ConeSegment" name="UX85-1-Rich1Flange"
-              dz="0.5*UX851Rich1Flange1Length"
-              rmin2="UX851Rich1FlangeRadiusZMax+0.10*mm"
-              rmin1="UX851Rich1FlangeRadiusZmin+0.10*mm"
-              rmax2="UX851Rich1FlangeOuterRadius"
-              rmax1="UX851Rich1FlangeOuterRadius"/>
-      </volume>
-
-      <!-- UX85-1 Window of -37 degree at end of 25 mrad cone -->
-      <volume name="lvUX851Win06" material="Pipe:BeTV56" vis="Pipe:InRich1">
-        <shape type="ConeSegment" name="UX85-1-Window37degree-06"
-              dz="0.5*UX851Win06Lenght"
-              rmin2="UX851Win06RadiusZmax"
-              rmin1="UX851Win06RadiusZmin"
-              rmax2="UX851Win06RadiusZmax+UX851Win06Thick"
-              rmax1="UX851Win06RadiusZmin+UX851Win06Thick"/>
-      </volume>
-
-      <!-- UX85-1 Cylinder of 50 mm diameter -->
-      <volume name="lvUX851Cyl07A" material="Pipe:BeTV56" vis="Pipe:InRich1">
-        <shape type="Tube" name="UX85-1-Cylinder-07A"
-              dz="0.5*UX851Cyl07ALenght"
-              rmin="UX851Cyl07Radius"
-              rmax="UX851Cyl07Radius+UX851Cyl07Thick"/>
-      </volume>
-
-      <!-- Vacuum in UX851Cyl01, UX851Cyl02, UX851Cyl03A in Rich1 Master -->
-      <volume name="lvUX851Vacuum01" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="Tube" name="UX85-1-Vacuum-01"
-              dz="0.5*UX85Vacuum01Lenght"
-              rmax="UX851Cyl01Radius"/>
-      </volume>
-
-      <!-- Vacuum in UX851Cyl03B, UX851Cyl04 in Rich1 SubMaster -->
-      <volume name="lvUX851Vacuum03B" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="Tube" name="UX85-1-Vacuum-03B"
-              dz="0.5*UX85Vacuum03BLenght"
-              rmax="UX851Cyl03Radius"/>
-      </volume>
-
-      <!-- Vacuum in UX851Cone05A in Rich1 SubMaster -->
-      <volume name="lvUX851Vacuum05A" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="ConeSegment" name="UX85-1-Vacuum-05A"
-              dz="0.5*UX851Cone05ALenght"
-              rmax1="UX851Cone05ARadiusZmin"
-              rmax2="UX851Cone05ARadiusZmax"/>
-      </volume>
-
-      <!-- Vacuum in UX851Cone05B in Rich1 Master -->
-      <volume name="lvUX851Vacuum05B" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="ConeSegment" name="UX85-1-Vacuum-05B"
-              dz="0.5*UX851Cone05BLenght"
-              rmax1="UX851Cone05BRadiusZmin"
-              rmax2="UX851Cone05BRadiusZmax"/>
-      </volume>
-
-      <!-- Vacuum in UX851Win06 in Rich1 Master -->
-      <volume name="lvUX851Vacuum06" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="ConeSegment" name="UX85-1-Vacuum-06"
-              dz="0.5*UX851Win06Lenght"
-              rmax1="UX851Win06RadiusZmin"
-              rmax2="UX851Win06RadiusZmax"/>
-      </volume>
-
-      <!-- Vacuum in UX851Cyl07A in Rich1 Master -->
-      <volume name="lvUX851Vacuum07A" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="Tube" name="UX85-1-Vacuum-07A"
-              dz="0.5*UX851Cyl07ALenght"
-              rmax="UX851Cyl07Radius"/>
-      </volume>
-
-      <!-- Before SubMaster -->
-      <volume name="lvUX851InRich1BeforeSubM" vis="Pipe:InRich1">
-        <!-- Pipes of Al and Be -->
-        <physvol name="pvUX851Cyl01"                 volume="lvUX851Cyl01">
-          <position z="UX851Cyl01Zpos"/>
-        </physvol>
-        <physvol name="pvUX851Cyl02"                 volume="lvUX851Cyl02">
-          <position z="UX851Cyl02Zpos"/>
-        </physvol>
-        <physvol name="pvUX851Cyl03A"                volume="lvUX851Cyl03A">
-          <position z="UX851Cyl03AZpos"/>
-        </physvol>
-        <!-- Now the vacuum inside -->
-        <physvol name="pvUX851Vacuum01"              volume="lvUX851Vacuum01">
-          <position z="0.5*UX85Vacuum01Lenght"/>
-        </physvol>
-
-      </volume>
-
-      <!-- In SubMaster -->
-      <volume name="lvUX851InRich1SubMaster" vis="Pipe:InRich1">
-        <physvol name="pvUX851Cyl03B"                volume="lvUX851Cyl03B">
-          <position z="UX851Cyl03BZpos"/>
-        </physvol>
-        <physvol name="pvUX851Cyl04"                 volume="lvUX851Cyl04">
-          <position z="UX851Cyl04Zpos"/>
-        </physvol>
-        <physvol name="pvUX851Cone05A"               volume="lvUX851Cone05A">
-          <position z="UX851Cone05AZpos"/>
-        </physvol>
-
-        <!-- Now the vacuum inside -->
-        <physvol name="pvUX851Vacuum03B"             volume="lvUX851Vacuum03B">
-          <position z="UX85Vacuum01Lenght+0.5*UX85Vacuum03BLenght"/>
-        </physvol>
-        <physvol name="pvUX851Rich1Flange"           volume="lvUX851Rich1Flange">
-          <position z="UX851Rich1FlangeZpos"/>
-        </physvol>
-        <physvol name="pvUX851Vacuum05A"             volume="lvUX851Vacuum05A">
-          <position z="UX85Vacuum01Lenght+UX85Vacuum03BLenght+0.5*UX851Cone05ALenght"/>
-        </physvol>
-
-      </volume>
-
-      <!-- After SubMaster -->
-      <volume name="lvUX851InRich1AfterSubM" vis="Pipe:InRich1">
-        <physvol name="pvUX851Cone05B"               volume="lvUX851Cone05B">
-          <position z="UX851Cone05BZpos"/>
-        </physvol>
-        <physvol name="pvUX851Win06"                 volume="lvUX851Win06">
-          <position z="UX851Win06Zpos"/>
-        </physvol>
-        <physvol name="pvUX851Cyl07A"                volume="lvUX851Cyl07A">
-          <position z="UX851Cyl07AZpos"/>
-        </physvol>
-        <!-- Now the vacuum inside -->
-        <physvol name="pvUX851Vacuum05B"             volume="lvUX851Vacuum05B">
-          <position z="UX85Vacuum01Lenght+UX85Vacuum03BLenght+UX851Cone05ALenght+
-                       0.5*UX851Cone05BLenght"/>
-        </physvol>
-        <physvol name="pvUX851Vacuum06"              volume="lvUX851Vacuum06">
-          <position z="UX85Vacuum01Lenght+UX85Vacuum03BLenght+UX851Cone05ALenght+
-                       UX851Cone05BLenght+0.5*UX851Win06Lenght"/>
-        </physvol>
-        <physvol name="pvUX851Vacuum07A"             volume="lvUX851Vacuum07A">
-          <position z="UX85Vacuum01Lenght+UX85Vacuum03BLenght+UX851Cone05ALenght+
-                       UX851Cone05BLenght+UX851Win06Lenght+0.5*UX851Cyl07ALenght"/>
-        </physvol>
-      </volume>
-
-      <envelope type="Assembly" name="lvPipeInRich1" vis="Pipe:InRich1">
-        <!--    Begin Rich1MasterBeamPipe
-                This is the part upstream of rich1 submaster
-                and downstream of rich1submaster -->
-        <physvol name="pvUX851InRich1BeforeSubM"      volume="lvUX851InRich1BeforeSubM" >
-          <position z="Rh1BeamPipeUpsAssemblyRMZ"/>
-        </physvol>
-        <physvol name="pvUX851InRich1AfterSubM"       volume="lvUX851InRich1AfterSubM" >
-          <position z="Rh1BeamPipeDnsAssemblyRMZ"/>
-        </physvol>
-        <!-- This is the part inside of rich1 submaster  -->
-        <physvol name="pvUX851InRich1SubMaster"       volume="lvUX851InRich1SubMaster" >
-          <position z="Rh1BeamPipeAssemblyZ"/>
-        </physvol>
-      </envelope>
-      <position/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InT.xml b/compact/components/Pipe/2025-v00.00/InT.xml
deleted file mode 100644
index 511c69b7b..000000000
--- a/compact/components/Pipe/2025-v00.00/InT.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe inside the T region                      -->
-<!--===========================================================================-->
-<!--================================== Pipe In   T=============================-->
-<!--===========================================================================-->
-<lccdd>
-
-  <detectors>
-    <detector name="PipeInT" type="DD4hep_VolumeAssembly" parent="${PipeInT:parent}" vis="Pipe:Vis">
-      <!-- UX85-3 Cone 10 mrad of Beryllium 1.6 mm thick - Split Magnet/T -->
-      <volume name="lvUX853Cone05B" material="Pipe:BeTV56" vis="Pipe:InT">
-        <shape type="ConeSegment" name="UX85-3-Cone10mrad-05B"
-               dz="UX853Cone05BLenght/2"
-               rmin2="UX853Cone05BRadiusZmax"
-               rmin1="UX853Cone05BRadiusZmin"
-               rmax2="UX853Cone05BRadiusZmax + UX853Cone05BThick"
-               rmax1="UX853Cone05BRadiusZmin + UX853Cone05BThick"/>
-      </volume>
-      <!-- UX85-3 Cone 10 mrad of Beryllium 1.7 mm thick -->
-      <volume name="lvUX853Cone06" material="Pipe:BeTV56" vis="Pipe:InT">
-        <shape type="ConeSegment" name="UX85-3-Cone10mrad-06"
-               dz="UX853Cone06Lenght/2"
-               rmin2="UX853Cone06RadiusZmax"
-               rmin1="UX853Cone06RadiusZmin"
-               rmax2="UX853Cone06RadiusZmax + UX853Cone06Thick"
-               rmax1="UX853Cone06RadiusZmin + UX853Cone06Thick"/>
-      </volume>
-      <!-- UX85-3 Cone 10 mrad of Beryllium 1.9 mm thick - Split T/Rich2 -->
-      <volume name="lvUX853Cone07A" material="Pipe:BeTV56" vis="Pipe:InT">
-        <shape type="ConeSegment" name="UX85-3-Cone10mrad-07A"
-               dz="UX853Cone07ALenght/2"
-               rmin2="UX853Cone07ARadiusZmax"
-               rmin1="UX853Cone07ARadiusZmin"
-               rmax2="UX853Cone07ARadiusZmax + UX853Cone07AThick"
-               rmax1="UX853Cone07ARadiusZmin + UX853Cone07AThick"/>
-      </volume>
-      <!-- Vacuum in UX85-3 in T whole lenght -->
-      <volume name="lvUX853Vacuum05B" material="Vacuum" vis="Pipe:InT">
-        <shape type="ConeSegment" name="UX85-3-Vacuum-05B"
-               dz="UX853InTLenght/2"
-               rmax1="UX853Cone05BRadiusZmin"
-               rmax2="UX853Cone07ARadiusZmax"/>
-      </volume>
-
-      <!-- For the moment assume sections put at 0.0 of this (set with center at split  -->
-      <envelope type="Assembly" name="lvUX853InT" vis="Pipe:InT">
-        <!-- Pipe of Be -->
-        <physvol name="pvUX853Cone05B"           volume="lvUX853Cone05B">
-          <position z="UX853Cone05BZpos"/>
-        </physvol>
-        <physvol name="pvUX853Cone06"            volume="lvUX853Cone06">
-          <position z="UX853Cone06Zpos"/>
-        </physvol>
-        <physvol name="pvUX853Cone07A"           volume="lvUX853Cone07A">
-          <position z="UX853Cone07AZpos"/>
-        </physvol>
-        <!-- Now the vacuum inside -->
-        <physvol name="pvUX853Vacuum05B"         volume="lvUX853Vacuum05B">
-          <position z="0.5*UX853InTLenght"/>
-        </physvol>
-
-      </envelope>
-        <position z="UX853MagnetTSplitZposIP - Regions:TZPos"/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InUT.xml b/compact/components/Pipe/2025-v00.00/InUT.xml
deleted file mode 100644
index 38fe79cf2..000000000
--- a/compact/components/Pipe/2025-v00.00/InUT.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe inside the UT region                     -->
-<!--===========================================================================-->
-<!--==================================Pipe In  UT=============================-->
-<!--===========================================================================-->
-<lccdd>
-
-  <detectors>
-    <detector name="PipeInUT" type="DD4hep_VolumeAssembly" parent="${PipeInUT:parent}" vis="Pipe:Vis">
-
-      <!-- UX85-1 Cylinder of 50 mm diameter -->
-      <volume name="lvUX851Cyl07B" material="Pipe:BeTV56" vis="Pipe:InUT">
-        <shape type="Tube" name="UX85-1-Cylinder-07B"
-               dz="0.5*UX851Cyl07BLenght"
-               rmin="UX851Cyl07Radius"
-               rmax="UX851Cyl07Radius+UX851Cyl07Thick"/>
-      </volume>
-
-      <!-- UX85-1 Cone 10 mrad                    -->
-      <!-- Stop at end of BeforeMagnet Region     -->
-      <volume name="lvUX851Cone08A" material="Pipe:BeTV56" vis="Pipe:InUT">
-        <shape type="ConeSegment" name="UX85-1-Cone10mrad-08A"
-               dz="0.5*UX851Cone08ALenght"
-               rmin2="UX851Cone08ARadiusZmax"
-               rmin1="UX851Cone08ARadiusZmin"
-               rmax2="UX851Cone08ARadiusZmax+UX851Cone08AThick"
-               rmax1="UX851Cone08ARadiusZmin+UX851Cone08AThick"/>
-      </volume>
-
-      <!-- Vacuum in UX851Cyl07B in UT -->
-      <volume name="lvUX851Vacuum07B" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="Tube" name="UX85-1-Vacuum-07B"
-               dz="0.5*UX851Cyl07BLenght"
-               rmax="UX851Cyl07Radius"/>
-      </volume>
-
-      <!-- Vacuum in UX851Cone08A in UT -->
-      <volume name="lvUX851Vacuum08A" material="Vacuum" vis="Pipe:Vacuum">
-        <shape type="ConeSegment" name="UX85-1-Vacuum-08A"
-               dz="0.5*UX851Cone08ALenght"
-               rmax1="UX851Cone08ARadiusZmin"
-               rmax2="UX851Cone08ARadiusZmax"/>
-      </volume>
-
-      <!-- Whole section: combination of sections -->
-      <!-- For the moment assume sections put at 0.0 of this (set with center at 970mm  -->
-      <envelope type="Assembly" name="lvUX851InUT" vis="Pipe:InUT">
-        <!-- Pipes of Al and Be -->
-        <physvol name="pvUX851Cyl07B"            volume="lvUX851Cyl07B">
-          <position z="UX851Cyl07BZpos"/>
-        </physvol>
-
-        <physvol name="pvUX851Cone08A"           volume="lvUX851Cone08A">
-          <position z="UX851Cone08AZpos"/>
-        </physvol>
-
-        <!-- Now the vacuum inside -->
-        <physvol name="pvUX851Vacuum07B"         volume="lvUX851Vacuum07B">
-          <position z="UX851Cyl07BZpos"/>
-        </physvol>
-
-        <physvol name="pvUX851Vacuum08A"         volume="lvUX851Vacuum08A">
-          <position z="UX851Cone08AZpos"/>
-        </physvol>
-      </envelope>
-      <position z="UX851Rich1TTSplitZposIP-UTSystemZ"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/InVP.xml b/compact/components/Pipe/2025-v00.00/InVP.xml
deleted file mode 100644
index c112267bb..000000000
--- a/compact/components/Pipe/2025-v00.00/InVP.xml
+++ /dev/null
@@ -1,383 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe inside the VP region                      -->
-<!--===========================================================================-->
-<!--==================================Pipe In  VP=============================-->
-<!--===========================================================================-->
-<lccdd>
-
-  <define>
-    <!-- ****************************************************** -->
-    <!-- * Definition of CuBe pipe sections in velo tank      * -->
-    <!-- * and supports                                       * -->
-    <!-- ****************************************************** -->
-
-    <!-- SPOKE CAP:
-	 - this is the small cap at the end of the spokes which are supposed
-	 to support the wf suppressor end and the punctured CuBe pipe.
-	 Let's start with a simplified conical description, not corresponding
-	 to actual shape.
-	 z_end_wf should correspond here to z_end. If not, adjust.
-	 - see CDD drawings:  ...
-	 - centered to beam axis
-	 - material: aluminium
-	 cone1:  r_in_start=47   r_out_start=57   z_start=-470
-         r_in_end=27   r_out_end=37   z_end=-540 -->
-
-    <constant name="PipeVP:SpokeZ" value="70*mm"/>
-    <constant name="PipeVP:SpokeInnerRPZ" value="47*mm"/>
-    <constant name="PipeVP:SpokeInnerRMZ" value="27*mm"/>
-    <constant name="PipeVP:SpokeOuterRPZ" value="57*mm"/>
-    <constant name="PipeVP:SpokeOuterRMZ" value="37*mm"/>
-
-    <!-- COPPERBERYLLIUM PUNCTURED PIPE:
-	 - this is the CuBe pipe with holes inside the VELO vacuum (upstream of RF Boxes)
-	 - see CDD drawings:
-	 http://www.nikhef.nl/pub/departments/mt/projects/lhcb-vertex/pdf/TVE-LAYOUTS/TVE65.pdf
-	 - centered to beam axis
-	 - material: aluminium
-	 cylinder1: r_in=27     r_out=39
-         z_start=-540     z_end=-550
-	 - material: copper
-	 cylinder2: r_in=27     r_out=27.1
-         z_start=-550     z_end=-729
-	 - material: aluminium
-	 cylinder3: r_in=27     r_out=39
-         z_start=-729     z_end=-739
-	 cylinder2==cylinder3 -->
-
-    <constant name="PipeVP:AlCylinderZ" value="10*mm"/>
-    <constant name="PipeVP:AlCylinderInnerR" value="27*mm"/>
-    <constant name="PipeVP:AlCylinderOuterR" value="39*mm"/>
-    <constant name="PipeVP:CuCylinderZ" value="2*mm"/>
-    <constant name="PipeVP:CuCylinderInnerR" value="27*mm"/>
-    <constant name="PipeVP:CuCylinderOuterR" value="27.1*mm"/>
-    <constant name="PipeVP:Z" value="PipeVP:AlCylinderZ+PipeVP:CuCylinderZ+PipeVP:AlCylinderZ"/>
-
-    <!-- UPSTREAM VELO PIPE JUNCTION:
-	 - this is a series of pieces that connect from the CuBe punctured pipe in the
-	 VELO to the LHC upstream beam pipe bellow connection.
-	 - see CDD drawings: LHBTVV__0084, 0085, 0057 and
-	 http://www.nikhef.nl/pub/departments/mt/projects/lhcb-vertex/pdf/TVE-LAYOUTS/TVE65.pdf
-	 NB: the extra connection flange at z=-760...-800 is not shown in these drawings.
-	 - material: stainless steel
-	 cylinder1: r_in=27     r_out=30
-         z_start=-739     z_end=-800
-	 - material: stainless steel
-	 cylinder2: r_in=30     r_out=39
-         z_start=-739     z_end=-745
-	 - material: stainless steel
-	 cylinder3: r_in=30     r_out=39
-         z_start=-760     z_end=-800
-	 - material: stainless steel
-	 cone1:  r_in_start=27   r_out_start=29   z_start=-800
-         r_in_end=38   r_out_end=40   z_end=-865
-	 - material: stainless steel
-	 cylinder4: r_in=40     r_out=76
-         z_start=-865     z_end=-885 -->
-    <constant name="PipeVP:JunkSteelCyl1Z" value="61*mm"/>
-    <constant name="PipeVP:JunkSteelCyl1InnerR" value="27*mm"/>
-    <constant name="PipeVP:JunkSteelCyl1OuterR" value="30*mm"/>
-
-    <constant name="PipeVP:JunkSteelCyl2Z" value="6*mm"/>
-    <constant name="PipeVP:JunkSteelCyl2InnerR" value="30*mm"/>
-    <constant name="PipeVP:JunkSteelCyl2OuterR" value="39*mm"/>
-
-    <constant name="PipeVP:JunkSteelCyl3Z" value="40*mm"/>
-    <constant name="PipeVP:JunkSteelCyl3InnerR" value="30*mm"/>
-    <constant name="PipeVP:JunkSteelCyl3OuterR" value="39*mm"/>
-
-    <!-- Velo volume ends at -835mm so second half of the cone is moved into Before
-	 Magnet pipe volume. -->
-    <constant name="PipeVP:JunkSteelConeZ" value="35*mm"/>
-    <constant name="PipeVP:JunkSteelConeInnerRPZ" value="27*mm"/>
-    <constant name="PipeVP:JunkSteelConeInnerRMZ" value="(35*(38-27)/65)*mm+27*mm"/>
-    <constant name="PipeVP:JunkSteelConeOuterRPZ" value="29*mm"/>
-    <constant name="PipeVP:JunkSteelConeOuterRMZ" value="(35*(40-29)/65)*mm+29*mm"/>
-
-    <constant name="PipeVP:JunkSteelCyl4Z" value="20*mm"/>
-    <constant name="PipeVP:JunkSteelCyl4InnerR" value="40*mm"/>
-    <constant name="PipeVP:JunkSteelCyl4OuterR" value="76*mm"/>
-
-    <constant name="PipeVP:JunkZ" value="PipeVP:JunkSteelCyl1Z+PipeVP:JunkSteelConeZ"/>
-    <constant name="PipeVP:UpstreamPipeZ" value="PipeVP:SpokeZ+PipeVP:Z+PipeVP:JunkZ"/>
-
-    <!-- The downstream beam pipe sections -->
-    <!-- NB any changes here must be propagated to the subtractions in the gas volumes included in the vacuum tank description -->
-
-    <constant name="PipeVP:ExitWindowHoleZ" value="858.6*mm"/>
-    <constant name="PipeVP:ExitWindowZSize" value="945*mm-PipeVP:ExitWindowHoleZ"/>
-    <constant name="PipeVP:ExitWindow2BellowsZSize" value="55.54*mm"/>
-    <constant name="PipeVP:BellowsStartZ" value="PipeVP:ExitWindowHoleZ+PipeVP:ExitWindow2BellowsZSize"/>
-    <constant name="PipeVP:BellowsInnerRadius" value="34*mm"/>
-    <constant name="PipeVP:BellowsOuterRadius" value="46*mm"/>
-    <constant name="PipeVP:BellowsThickness" value="0.3*mm"/>
-    <constant name="PipeVP:BellowsSpacing" value="2.7*mm"/>
-    <constant name="PipeVP:BellowsZSize" value="8*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing"/>
-    <constant name="PipeVP:DSTubeZToWeld" value="16.56*mm"/>
-    <constant name="PipeVP:DSTube1ZSize" value="PipeVP:DSTubeZToWeld+6*mm"/>
-    <constant name="PipeVP:DSTube1InnerRadius" value="PipeVP:BellowsInnerRadius"/>
-    <constant name="PipeVP:DSTube1Thickness" value="2.5*mm"/>
-    <constant name="PipeVP:DSTube2ZSize" value="2.5*mm"/>
-    <constant name="PipeVP:DSTube2InnerRadius" value="29.5*mm"/>
-    <constant name="PipeVP:DSTube2Thickness" value="PipeVP:DSTube1InnerRadius-PipeVP:DSTube2InnerRadius"/>
-    <constant name="PipeVP:DSTube3ZSize" value="12*mm"/>
-    <constant name="PipeVP:DSTube3InnerRadius" value="PipeVP:DSTube2InnerRadius"/>
-    <constant name="PipeVP:DSTube3Thickness" value="PipeVP:DSTube1Thickness"/>
-    <constant name="PipeVP:WFSGrooveZSize" value="2.2*mm"/>
-    <constant name="PipeVP:WFSGrooveRSize" value="1.5*mm"/>
-    <constant name="PipeVP:DSTube4ZSize" value="2.5*mm"/>
-    <constant name="PipeVP:DSTube4InnerRadius" value="27*mm"/>
-    <constant name="PipeVP:DSTube4Thickness" value="1*mm"/>
-    <constant name="PipeVP:BellowsEpsilon" value="0.01*mm"/>
-    <constant name="PipeVP:RadiusChange" value="VP:vTankDownExitWindowHoleR-(PipeVP:BellowsInnerRadius+2*mm)"/>
-  </define>
-
-  <detectors>
-    <detector name="VPUpStreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeInVP:parent}" vis="Pipe:InVP">
-      <!-- ****************************************************** -->
-      <!-- * Definition of CuBe pipe sections in velo tank      * -->
-      <!-- * and supports                                       * -->
-      <!-- ****************************************************** -->
-
-      <!-- SPOKE CAP -->
-      <volume name="lvSpokeCap" material="Pipe:Al" vis="Pipe:InVP">
-	<shape type="ConeSegment" name="SpokeCapCone"
-               dz="0.5*PipeVP:SpokeZ"
-               rmin2="PipeVP:SpokeInnerRPZ"
-               rmin1="PipeVP:SpokeInnerRMZ"
-               rmax2="PipeVP:SpokeOuterRPZ"
-               rmax1="PipeVP:SpokeOuterRMZ"/>
-      </volume>
-
-      <!-- COPPERBERYLLIUM PUNCTURED PIPE -->
-      <volume name="lvPipeAlCylinder" material="Pipe:Al" vis="Pipe:InVP">
-	<shape type="Tube" name="PipeAlCylTubs"
-	       dz="0.5*PipeVP:AlCylinderZ"
-	       rmin="PipeVP:AlCylinderInnerR"
-	       rmax="PipeVP:AlCylinderOuterR"/>
-      </volume>
-      <volume name="lvPipeCuCylinder" material="Pipe:Cu" vis="Pipe:InVP">
-	<shape type="Tube" name="PipeCuCylTubs"
-	       dz="0.5*PipeVP:CuCylinderZ"
-	       rmin="PipeVP:CuCylinderInnerR"
-	       rmax="PipeVP:CuCylinderOuterR"/>
-      </volume>
-
-      <!-- UPSTREAM VELO PIPE JUNCTION -->
-      <volume name="lvPipeJuncCyl1" material="Pipe:Steel316LN" vis="Pipe:InVP">
-	<shape type="Tube" name="PipeVP:JunkSteelCyl1"
-	       dz="0.5*PipeVP:JunkSteelCyl1Z"
-	       rmin="PipeVP:JunkSteelCyl1InnerR"
-	       rmax="PipeVP:JunkSteelCyl1OuterR"/>
-      </volume>
-      <volume name="lvPipeJuncCyl2" material="Pipe:Steel316LN" vis="Pipe:InVP">
-	<shape type="Tube" name="PipeVP:JunkSteelCyl2"
-	       dz="0.5*PipeVP:JunkSteelCyl2Z"
-	       rmin="PipeVP:JunkSteelCyl2InnerR+0.01*mm"
-	       rmax="PipeVP:JunkSteelCyl2OuterR"/>
-      </volume>
-      <volume name="lvPipeJuncCyl3" material="Pipe:Steel316LN" vis="Pipe:InVP">
-	<shape type="Tube" name="PipeVP:JunkSteelCyl3"
-	       dz="0.5*PipeVP:JunkSteelCyl3Z"
-	       rmin="PipeVP:JunkSteelCyl3InnerR+0.01*mm"
-	       rmax="PipeVP:JunkSteelCyl3OuterR"/>
-      </volume>
-      <volume name="lvPipeJuncCone1" material="Pipe:Steel316LN" vis="Pipe:InVP">
-	<shape type="ConeSegment" name="PipeVP:JunkSteelCone"
-	       dz="0.5*PipeVP:JunkSteelConeZ"
-	       rmin2="PipeVP:JunkSteelConeInnerRPZ"
-	       rmin1="PipeVP:JunkSteelConeInnerRMZ"
-	       rmax2="PipeVP:JunkSteelConeOuterRPZ"
-	       rmax1="PipeVP:JunkSteelConeOuterRMZ"/>
-      </volume>
-
-
-      <envelope type="Assembly" name="lvVeloUpStreamPipe" vis="Pipe:InVP">
-	<!-- Spoke cap -->
-	<!-- waiting for the drawing by the Vacuum group -->
-	<!-- CuBe pipe -->
-	<!-- waiting for the drawing by the Vacuum group -->
-	<physvol volume="lvPipeCuCylinder" name="PipeCuCyl">
-	  <position z="-728*mm"/>
-	</physvol>
-	<physvol volume="lvPipeAlCylinder" name="PipeAlCyl2">
-	  <position z="-734*mm"/>
-	</physvol>
-	<!-- Pipe junction -->
-	<physvol volume="lvPipeJuncCone1" name="PipeJuncCone1">
-	  <position z="-817.5*mm"/>
-	</physvol>
-	<physvol volume="lvPipeJuncCyl1" name="PipeJuncCyl1">
-	  <position z="-769.5*mm"/>
-	</physvol>
-	<physvol volume="lvPipeJuncCyl2" name="PipeJuncCyl2">
-	  <position z="-742*mm"/>
-	</physvol>
-	<physvol volume="lvPipeJuncCyl3" name="PipeJuncCyl3">
-	  <position z="-780*mm"/>
-	</physvol>
-      </envelope>
-      <position/>
-    </detector>
-
-
-    <detector name="VeloDownStreamPipe" type="DD4hep_VolumeAssembly" parent="${PipeInVP:parent}" vis="Pipe:InVP">
-
-      <!-- Definition of section joining Al exit window with beam pipe -->
-      <volume name="lvExitWindow2Bellows" material="Pipe:Al6061" vis="Pipe:InVP">
-	<shape type="ConeSegment" name="ExitWindow2Bellows"
-	       dz="0.5*PipeVP:ExitWindow2BellowsZSize"
-	       rmin2="PipeVP:BellowsInnerRadius"
-	       rmin1="VP:vTankDownExitWindowHoleR-2*mm"
-	       rmax2="PipeVP:BellowsInnerRadius+2*mm"
-	       rmax1="VP:vTankDownExitWindowHoleR"/>
-      </volume>
-
-      <volume name="lvVelo2Rich1GasEW2B" material="Rich:C4F10" vis="Pipe:InVP">
-	<shape type="BooleanShape" operation="subtraction" name="V2R1GasEW2BSub">
-	  <shape type="Tube" name="V2R1GasEW2BTubs1"
-		 dz="0.5*PipeVP:ExitWindow2BellowsZSize"
-		 rmax="VP:vTankDownExitWindowHoleR"/>
-	  <shape type="ConeSegment" name="V2R1GasEW2BCons1"
-		 dz="PipeVP:ExitWindow2BellowsZSize"
-		 rmin2="0*mm"
-		 rmax2="PipeVP:BellowsInnerRadius + 2*mm - PipeVP:RadiusChange/2 + VP:Epsilon"
-		 rmin1="0*mm"
-		 rmax1="VP:vTankDownExitWindowHoleR + PipeVP:RadiusChange/2 + VP:Epsilon"/>
-	</shape>
-      </volume>
-
-      <!-- Definition of the bellows section of the beam pipe -->
-      <volume name="lvBellows" material="Pipe:Al6061" vis="Pipe:InVP">
-	<shape type="Polycone" name="Bellows">
-	  <!-- 1 -->  <zplane z="PipeVP:BellowsStartZ"                                                    rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 2 -->  <zplane z="PipeVP:BellowsStartZ+PipeVP:BellowsThickness"                                   rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 3 -->  <zplane z="PipeVP:BellowsStartZ+PipeVP:BellowsThickness+PipeVP:BellowsEpsilon"                    rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 4 -->  <zplane z="PipeVP:BellowsStartZ+PipeVP:BellowsThickness+PipeVP:BellowsSpacing"                    rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 5 -->  <zplane z="PipeVP:BellowsStartZ+PipeVP:BellowsThickness+PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon"     rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 6 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+PipeVP:BellowsSpacing"                  rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 7 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon"   rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 8 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 9 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 10 --> <zplane z="PipeVP:BellowsStartZ+3*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 11 --> <zplane z="PipeVP:BellowsStartZ+3*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 12 --> <zplane z="PipeVP:BellowsStartZ+3*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 13 --> <zplane z="PipeVP:BellowsStartZ+3*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 14 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 15 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 16 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 17 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 18 --> <zplane z="PipeVP:BellowsStartZ+5*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 19 --> <zplane z="PipeVP:BellowsStartZ+5*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 20 --> <zplane z="PipeVP:BellowsStartZ+5*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 21 --> <zplane z="PipeVP:BellowsStartZ+5*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 22 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 23 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 24 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 25 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 26 --> <zplane z="PipeVP:BellowsStartZ+7*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 27 --> <zplane z="PipeVP:BellowsStartZ+7*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 28 --> <zplane z="PipeVP:BellowsStartZ+7*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsOuterRadius-PipeVP:BellowsThickness" rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 29 --> <zplane z="PipeVP:BellowsStartZ+7*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	  <!-- 30 --> <zplane z="PipeVP:BellowsStartZ+8*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing"                rmin="PipeVP:BellowsInnerRadius"                  rmax="PipeVP:BellowsOuterRadius"/>
-	</shape>
-      </volume>
-
-      <!-- The RICH1 gas sections DS of the exit window -->
-
-      <volume name="lvVelo2Rich1GasBellows" material="Rich:C4F10" vis="Pipe:InVP">
-	<shape type="Polycone" name="V2R1GasBellows">
-	  <!-- 1 -->  <zplane z="PipeVP:BellowsStartZ"                                                    rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
-	  <!-- 6 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+PipeVP:BellowsSpacing"                  rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
-	  <!-- 7 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon"   rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 8 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 9 -->  <zplane z="PipeVP:BellowsStartZ+2*PipeVP:BellowsThickness+2*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
-	  <!-- 14 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
-	  <!-- 15 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+3*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 16 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 17 --> <zplane z="PipeVP:BellowsStartZ+4*PipeVP:BellowsThickness+4*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
-	  <!-- 22 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
-	  <!-- 23 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+5*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 24 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing"                rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsInnerRadius+PipeVP:BellowsThickness"/>
-	  <!-- 25 --> <zplane z="PipeVP:BellowsStartZ+6*PipeVP:BellowsThickness+6*PipeVP:BellowsSpacing+PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
-	  <!-- 30 --> <zplane z="PipeVP:BellowsStartZ+8*PipeVP:BellowsThickness+7*PipeVP:BellowsSpacing-PipeVP:BellowsEpsilon" rmax="VP:vTankDownExitWindowHoleR" rmin="PipeVP:BellowsOuterRadius"/>
-	</shape>
-      </volume>
-
-      <!-- Definition of the tube section of the beam pipe -->
-      <!-- TODO: Looks like the groove for the connection of the wakefield suppressor is in the wrong place?
-           It's DS edge is currently located at 968mm but the wakefield suppressor ends at 954mm -->
-      <volume name="lvDSTubeSection" material="Pipe:Al2219F" vis="Pipe:InVP">
-	<shape type="BooleanShape" operation="union" name="DSTubeUnion">
-	  <shape type="Tube" name="DSTube1"
-		 dz="0.5*PipeVP:DSTube1ZSize"
-		 rmin="PipeVP:DSTube1InnerRadius"
-		 rmax="PipeVP:DSTube1InnerRadius+PipeVP:DSTube1Thickness"/>
-	  <shape type="Tube" name="DSTube2"
-		 dz="0.5*PipeVP:DSTube2ZSize"
-		 rmin="PipeVP:DSTube2InnerRadius"
-		 rmax="PipeVP:DSTube2InnerRadius+PipeVP:DSTube2Thickness"/>
-	  <position z="(PipeVP:DSTube1ZSize-PipeVP:DSTube2ZSize)/2"/>
-	  <shape type="BooleanShape" operation="subtraction" name="DSTube3Sub">
-            <shape type="Tube" name="DSTube3a"
-		   dz="0.5*PipeVP:DSTube3ZSize"
-		   rmin="PipeVP:DSTube3InnerRadius"
-		   rmax="PipeVP:DSTube3InnerRadius+PipeVP:DSTube3Thickness"/>
-            <shape type="Tube" name="DSTube3b"
-		   dz="0.5*PipeVP:WFSGrooveZSize"
-		   rmin="0*mm"
-		   rmax="PipeVP:DSTube3InnerRadius+PipeVP:WFSGrooveRSize"/>
-            <position z="(PipeVP:DSTube3ZSize-PipeVP:WFSGrooveZSize)/2-1*mm"/>
-	  </shape>
-	  <position z="(PipeVP:DSTube1ZSize+PipeVP:DSTube3ZSize)/2"/>
-	</shape>
-      </volume>
-
-      <volume name="lvVelo2Rich1GasDSTube" material="Rich:C4F10" vis="Pipe:InVP">
-	<shape type="BooleanShape" operation="subtraction" name="DSTubeGasSub">
-	  <shape type="Tube" name="DSTubeGas"
-		 dz="0.5*(PipeVP:DSTube1ZSize+PipeVP:DSTube3ZSize)"
-		 rmin="PipeVP:DSTube1InnerRadius+PipeVP:DSTube1Thickness+VP:Epsilon"
-		 rmax="VP:vTankDownExitWindowHoleR"/>
-	  <shape type="Tube" name="DSTube3Gas"
-		 dz="PipeVP:DSTube3ZSize"
-		 rmin="0*mm"
-		 rmax="PipeVP:DSTube3InnerRadius+PipeVP:DSTube3Thickness+VP:Epsilon"/>
-	  <position z="(PipeVP:DSTube1ZSize+PipeVP:DSTube3ZSize)/2"/>
-	</shape>
-      </volume>
-
-      <envelope type="Assembly" name="lvVeloDownStreamPipe" vis="Pipe:InVP">
-	<physvol volume="lvExitWindow2Bellows" name="VeloDSPipe1">
-          <position z="PipeVP:ExitWindowHoleZ+PipeVP:ExitWindow2BellowsZSize/2"/>
-	</physvol>
-	<physvol volume="lvVelo2Rich1GasEW2B" name="VeloDSPipe1Gas">
-          <position z="PipeVP:ExitWindowHoleZ+PipeVP:ExitWindow2BellowsZSize/2"/>
-	</physvol>
-
-	<physvol volume="lvBellows" name="VeloDSPipe2">
-	</physvol>
-	<physvol volume="lvVelo2Rich1GasBellows" name="VeloDSPipe2Gas">
-	</physvol>
-	<physvol volume="lvDSTubeSection" name="VeloDSPipe3">
-          <position z="PipeVP:BellowsStartZ+PipeVP:BellowsZSize+(PipeVP:DSTube1ZSize)/2"/>
-	</physvol>
-	<physvol volume="lvVelo2Rich1GasDSTube" name="VeloDSPipe3Gas">
-          <position z="PipeVP:BellowsStartZ+PipeVP:BellowsZSize+(PipeVP:DSTube1ZSize+PipeVP:DSTube3ZSize)/2"/>
-	</physvol>
-      </envelope>
-      <position/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-Bellows.xml b/compact/components/Pipe/2025-v00.00/Magnet-Bellows.xml
deleted file mode 100644
index 166572d2b..000000000
--- a/compact/components/Pipe/2025-v00.00/Magnet-Bellows.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<pipe>
-
-  <!-- Bellow at 6900 - Flange -->
-  <volume name="lvUX85B6900Flange01" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Tube" name="UX85-B6900-Flange-01"
-           dz="0.5*UX85B6900Flange01Lenght"
-           rmin="UX85B6900Flange01InnerRadius"
-           rmax="UX85B6900Flange01OuterRadius"/>
-  </volume>
-
-  <!-- Bellow at 6900 cylinder (almost cone 10 mrad)  -->
-  <volume name="lvUX85B6900Cyl02" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Tube" name="UX85-B6900-Cylinder-02"
-           dz="0.5*UX85B6900Cyl02Lenght"
-           rmin="UX85B6900Cyl02InnerRadius"
-           rmax="UX85B6900Cyl02OuterRadius"/>
-  </volume>
-
-  <!-- Bellow at 6900 rib around cone -->
-  <volume name="lvUX85B6900Rib03" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Tube" name="UX85-B6900-Rib-03"
-           dz="0.5*UX85B6900Rib03Lenght"
-           rmin="UX85B6900Rib03InnerRadius"
-           rmax="UX85B6900Rib03OuterRadius"/>
-  </volume>
-
-  <volume name="lvUX85B6900BellowBase" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Polycone" name="UX85-B6900-BellowBase-04">
-      <zplane z="-0.5*UX85B6900BellowLenght"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLenght + UX85B6900BellowWallThick"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLenght + UX85B6900BellowWallThick"
-              rmin="UX85B6900BellowOuterRadius - UX85B6900BellowWallThick"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLenght + UX85B6900BellowWallThick +
-                 UX85B6900BellowStep"
-              rmin="UX85B6900BellowOuterRadius - UX85B6900BellowWallThick"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLenght + UX85B6900BellowWallThick +
-                 UX85B6900BellowStep"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLenght + 2*UX85B6900BellowWallThick +
-                 UX85B6900BellowStep"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLenght + 2*UX85B6900BellowWallThick +
-                 UX85B6900BellowStep"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowInnerRadius + UX85B6900BellowWallThick "/>
-      <zplane z="-0.5*UX85B6900BellowLenght + 2*UX85B6900BellowWallThick +
-                 2*UX85B6900BellowStep"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowInnerRadius + UX85B6900BellowWallThick "/>
-    </shape>
-  </volume>
-
-  <volume name="lvUX85B6900BellowLast" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Polycone" name="UX85-B6900-BellowLast-04">
-      <zplane z="-0.5*UX85B6900BellowLastLenght"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLastLenght + UX85B6900BellowWallThick"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLastLenght + UX85B6900BellowWallThick"
-              rmin="UX85B6900BellowOuterRadius - UX85B6900BellowWallThick"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLastLenght + UX85B6900BellowWallThick +
-                 UX85B6900BellowStep"
-              rmin="UX85B6900BellowOuterRadius - UX85B6900BellowWallThick"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLastLenght + UX85B6900BellowWallThick +
-                 UX85B6900BellowStep"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowOuterRadius"/>
-      <zplane z="-0.5*UX85B6900BellowLastLenght + 2*UX85B6900BellowWallThick +
-                 UX85B6900BellowStep"
-              rmin="UX85B6900BellowInnerRadius"
-              rmax="UX85B6900BellowOuterRadius"/>
-    </shape>
-  </volume>
-  <!-- Bellow at 6900 Bellow -->
-  <volume name="lvUX85B6900Bellow">
-    <paramphysvol number="UX85B6900BellowNConv-1">
-      <physvol name="pvUX85B6900BellowBase" volume="lvUX85B6900BellowBase"/>
-      <position z="UX85B6900BellowPitch"/>
-    </paramphysvol>
-    <physvol name="pvUX85B6900BellowLast"   volume="lvUX85B6900BellowLast">
-      <position z="-0.5*UX85B6900BellowLenght +
-                   (UX85B6900BellowNConv-1)*UX85B6900BellowPitch +
-                   0.5*UX85B6900BellowLastLenght"/>
-    </physvol>
-  </volume>
-
-
-  <!-- Bellow at 6900 rib around cone -->
-  <volume name="lvUX85B6900Rib05" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Tube" name="UX85-B6900-Rib-05"
-           dz="0.5*UX85B6900Rib05Lenght"
-           rmin="UX85B6900Rib05InnerRadius"
-           rmax="UX85B6900Rib05OuterRadius"/>
-  </volume>
-  <!-- Bellow at 6900 cylinder (almost cone 10 mrad)  -->
-  <volume name="lvUX85B6900Cyl06" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Tube" name="UX85-B6900-Cylinder-06"
-           dz="0.5*UX85B6900Cyl06Lenght"
-           rmin="UX85B6900Cyl06InnerRadius"
-           rmax="UX85B6900Cyl06OuterRadius"/>
-  </volume>
-  <!-- Bellow at 6900 Flange -->
-  <volume name="lvUX85B6900Flange07" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Tube" name="UX85-B6900-Flange-07"
-           dz="0.5*UX85B6900Flange07Lenght"
-           rmin="UX85B6900Flange07InnerRadius"
-           rmax="UX85B6900Flange07OuterRadius"/>
-  </volume>
-  <!-- Vacuum in Bellow 6900 series of cylinders -->
-  <volume name="lvUX85B6900Vacuum01" vis="Pipe:Magnet" material="Vacuum">
-    <shape type="Tube" name="UX85-B6900-Vacuum-01"
-           dz="0.5*UX85B6900Vacuum01Lenght"
-           rmax="UX85B6900Flange01InnerRadius"/>
-  </volume>
-  <volume name="lvUX85B6900Vacuum04" vis="Pipe:Magnet" material="Vacuum">
-    <shape type="Tube" name="UX85-B6900-Vacuum-04"
-           dz="0.5*UX85B6900Vacuum04Lenght"
-           rmax="UX85B6900BellowInnerRadius"/>
-  </volume>
-  <volume name="lvUX85B6900Vacuum06" vis="Pipe:Magnet" material="Vacuum">
-    <shape type="Tube" name="UX85-B6900-Vacuum-06"
-           dz="0.5*UX85B6900Vacuum06Lenght"
-           rmax="UX85B6900Cyl06InnerRadius"/>
-  </volume>
-
-
-  <!-- Bellow Section -->
-  <volume name="lvUX85Bellow6900" vis="Pipe:Magnet">
-    <physvol name="pvUX85B6900Flange01"              volume="lvUX85B6900Flange01">
-      <position z="UX85B6900Flange01Zpos"/>
-    </physvol>
-    <physvol name="pvUX85B6900Cyl02"                 volume="lvUX85B6900Cyl02">
-      <position z="UX85B6900Cyl02Zpos"/>
-    </physvol>
-    <physvol name="pvUX85B6900Rib03"                 volume="lvUX85B6900Rib03">
-      <position z="UX85B6900Rib03Zpos"/>
-    </physvol>
-    <physvol name="pvUX85B6900Bellow04"              volume="lvUX85B6900Bellow">
-      <position z="UX85B6900Bellow04Zpos"/>
-    </physvol>
-    <physvol name="pvUX85B6900Rib05"                 volume="lvUX85B6900Rib05">
-      <position z="UX85B6900Rib05Zpos"/>
-    </physvol>
-    <physvol name="pvUX85B6900Cyl06"                 volume="lvUX85B6900Cyl06">
-      <position z="UX85B6900Cyl06Zpos"/>
-    </physvol>
-    <physvol name="pvUX85B6900Flange07"              volume="lvUX85B6900Flange07">
-      <position z="UX85B6900Flange07Zpos"/>
-    </physvol>
-    <!-- Now the vacuum inside -->
-    <physvol name="pvUX85B6900Vacuum01"             volume="lvUX85B6900Vacuum01">
-      <position z="UX85B6900Vacuum01Zpos"/>
-    </physvol>
-    <physvol name="pvUX85B6900Vacuum04"             volume="lvUX85B6900Vacuum04">
-      <position z="UX85B6900Vacuum04Zpos"/>
-    </physvol>
-    <physvol name="pvUX85B6900Vacuum06"             volume="lvUX85B6900Vacuum06">
-      <position z="UX85B6900Vacuum06Zpos"/>
-    </physvol>
-  </volume>
-
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-Compensator.xml b/compact/components/Pipe/2025-v00.00/Magnet-Compensator.xml
deleted file mode 100644
index 6d034ced3..000000000
--- a/compact/components/Pipe/2025-v00.00/Magnet-Compensator.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe compensator in the magnet region         -->
-<!--===========================================================================-->
-<pipe>
-
-  <!-- Compensator at 2800 - Flange -->
-  <volume name="lvUX85C2800Flange01" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="ConeSegment" name="UX85-C2800-Flange-01"
-           dz="0.5*UX85C2800Flange01Lenght"
-           rmin1="UX85C2800Flange01RadiusZmin"
-           rmin2="UX85C2800Flange01RadiusZmax"
-           rmax1="UX85C2800Flange01OuterRadius"
-           rmax2="UX85C2800Flange01OuterRadius"/>
-  </volume>
-
-  <!-- Compensator at 2800 cone of 10 mrad -->
-  <volume name="lvUX85C2800Cone02" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="ConeSegment" name="UX85-C2800-Cone10mrad-02"
-           dz="0.5*UX85C2800Cone02Lenght"
-           rmin1="UX85C2800Cone02RadiusZmin"
-           rmin2="UX85C2800Cone02RadiusZmax"
-           rmax1="UX85C2800Cone02OuterRadius"
-           rmax2="UX85C2800Cone02OuterRadius"/>
-  </volume>
-
-  <!-- Compensator at 2800 connection to bellow -->
-  <volume name="lvUX85C2800BellowCnct03" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="ConeSegment" name="UX85-C2800-Connection-03"
-           dz="0.5*UX85C2800BellowCnct03Lenght"
-           rmin1="UX85C2800BellowCnct03RadiusZmin"
-           rmin2="UX85C2800BellowCnct03RadiusZmax"
-           rmax1="UX85C2800BellowCnct03RadiusZmin + UX85C2800BellowCnct03Thick"
-           rmax2="UX85C2800BellowCnct03RadiusZmax + UX85C2800BellowCnct03Thick"/>
-  </volume>
-
-  <volume name="lvUX85C2800BellowBase" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Polycone" name="UX85-C2800-BellowBase-04">
-      <zplane z="-0.5*UX85C2800BellowCRLength"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowCRLength + UX85C2800BellowWallThick"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowCRLength + UX85C2800BellowWallThick"
-              rmin="UX85C2800BellowOuterRadius - UX85C2800BellowWallThick"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowCRLength + UX85C2800BellowWallThick +
-                 UX85C2800BellowStep"
-              rmin="UX85C2800BellowOuterRadius - UX85C2800BellowWallThick"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowCRLength + UX85C2800BellowWallThick +
-                 UX85C2800BellowStep"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowCRLength + 2*UX85C2800BellowWallThick +
-                 UX85C2800BellowStep"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowCRLength + 2*UX85C2800BellowWallThick +
-                 UX85C2800BellowStep"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowInnerRadius + UX85C2800BellowWallThick "/>
-      <zplane z="-0.5*UX85C2800BellowCRLength + 2*UX85C2800BellowWallThick +
-                 2*UX85C2800BellowStep"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowInnerRadius + UX85C2800BellowWallThick "/>
-    </shape>
-  </volume>
-
-  <volume name="lvUX85C2800BellowLast" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="Polycone" name="UX85-C2800-BellowLast-04">
-      <zplane z="-0.5*UX85C2800BellowLastLenght"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowLastLenght + UX85C2800BellowWallThick"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowLastLenght + UX85C2800BellowWallThick"
-              rmin="UX85C2800BellowOuterRadius - UX85C2800BellowWallThick"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowLastLenght + UX85C2800BellowWallThick +
-                 UX85C2800BellowStep"
-              rmin="UX85C2800BellowOuterRadius - UX85C2800BellowWallThick"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowLastLenght + UX85C2800BellowWallThick +
-                 UX85C2800BellowStep"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowOuterRadius"/>
-      <zplane z="-0.5*UX85C2800BellowLastLenght + 2*UX85C2800BellowWallThick +
-                 UX85C2800BellowStep"
-              rmin="UX85C2800BellowInnerRadius"
-              rmax="UX85C2800BellowOuterRadius"/>
-    </shape>
-  </volume>
-
-  <!-- Compensator at 2800 Bellow -->
-  <volume name="lvUX85C2800BellowCR">
-    <paramphysvol number="UX85C2800BellowNConvCR-1">
-      <physvol name="pvUX85C2800BellowBaseCR"           volume="lvUX85C2800BellowBase"/>
-      <position z="UX85C2800BellowPitch"/>
-    </paramphysvol>
-    <physvol name="pvUX85C2800BellowLastCR"             volume="lvUX85C2800BellowLast">
-      <position z="-0.5*(UX85C2800BellowCRLength +
-                   (UX85C2800BellowNConvCR-1)*UX85C2800BellowPitch +
-                   0.5*UX85C2800BellowLastLenght)"/>
-    </physvol>
-  </volume>
-
-
-  <!-- Compensator at 2800 connection to bellow -->
-  <volume name="lvUX85C2800BellowCnct05" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="ConeSegment" name="UX85-C2800-Connection-05"
-           dz="0.5*UX85C2800BellowCnct05Lenght"
-           rmin1="UX85C2800BellowCnct05RadiusZmin"
-           rmin2="UX85C2800BellowCnct05RadiusZmax"
-           rmax1="UX85C2800BellowCnct05RadiusZmin + UX85C2800BellowCnct05Thick"
-           rmax2="UX85C2800BellowCnct05RadiusZmax + UX85C2800BellowCnct05Thick"/>
-  </volume>
-
-  <!-- Compensator at 2800 cone of 10 mrad -->
-  <volume name="lvUX85C2800Cone06" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="ConeSegment" name="UX85-C2800-Cone10mrad-06"
-           dz="0.5*UX85C2800Cone06Length"
-           rmin1="UX85C2800Cone06RadiusZmin"
-           rmin2="UX85C2800Cone06RadiusZmax"
-           rmax1="UX85C2800Cone06RadiusZmin + UX85C2800Cone06Thick"
-           rmax2="UX85C2800Cone06RadiusZmax + UX85C2800Cone06Thick"/>
-  </volume>
-
-  <!-- Compensator at 2800 cone of 10 mrad, slightly thicker-->
-  <volume name="lvUX85C2800Cone07" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="ConeSegment" name="UX85-C2800-Cone10mrad-07"
-           dz="0.5*UX85C2800Cone07Length"
-           rmin1="UX85C2800Cone07RadiusZmin"
-           rmin2="UX85C2800Cone07RadiusZmax"
-           rmax1="UX85C2800Cone07OuterRadius"
-           rmax2="UX85C2800Cone07OuterRadius"/>
-  </volume>
-
-
-  <!-- Compensator at 2800 connection to bellow -->
-
-  <!-- Compensator at 2800 cone of 10 mrad -->
-  <volume name="lvUX85C2800Cone11" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="ConeSegment" name="UX85-C2800-Cone10mrad-11"
-           dz="0.5*UX85C2800Cone11Lenght"
-           rmin1="UX85C2800Cone11RadiusZmin"
-           rmin2="UX85C2800Cone11RadiusZmax"
-           rmax1="UX85C2800Cone11OuterRadius"
-           rmax2="UX85C2800Cone11OuterRadius"/>
-  </volume>
-
-  <!-- Compensator at 2800 Flange -->
-  <volume name="lvUX85C2800Flange12" vis="Pipe:Magnet" material="Pipe:Al2219F">
-    <shape type="ConeSegment" name="UX85-C2800-Flange-12"
-           dz="0.5*UX85C2800Flange12Lenght"
-           rmin1="UX85C2800Flange12RadiusZmin"
-           rmin2="UX85C2800Flange12RadiusZmax"
-           rmax1="UX85C2800Flange12OuterRadius"
-           rmax2="UX85C2800Flange12OuterRadius"/>
-  </volume>
-
-  <!-- Vacuum in UX85Compensator2800 -->
-  <volume name="lvUX85C2800Vacuum01" vis="Pipe:Magnet" material="Vacuum">
-    <shape type="ConeSegment" name="UX85-C2800-Vacuum-01"
-           dz="0.5*UX85C2800Vacuum01Lenght"
-           rmax1="UX85C2800Flange01RadiusZmin"
-           rmax2="UX85C2800Flange12RadiusZmax"/>
-  </volume>
-
-  <!-- Compensator -->
-  <volume name="lvUX85Compensator2800">
-    <!--     <shape type="Tube" name="UX85Compensator2800-Cylinder"
-         dz="0.5*UX85C2800Lenght"
-         rmax="46.00*mm+1.0*mm"/>
-    -->
-
-    <physvol name="pvUX85C2800Flange01"             volume="lvUX85C2800Flange01">
-      <position z="UX85C2800Flange01Zpos"/>
-    </physvol>
-
-    <physvol name="pvUX85C2800Cone02"               volume="lvUX85C2800Cone02">
-      <position z="UX85C2800Cone02Zpos"/>
-    </physvol>
-
-    <physvol name="pvUX85C2800BellowCnct03"         volume="lvUX85C2800BellowCnct03">
-      <position z="UX85C2800BellowCnct03Zpos"/>
-    </physvol>
-
-    <physvol name="pvUX85C2800BellowCR04"           volume="lvUX85C2800BellowCR">
-      <position z="UX85C2800Bellow04Zpos"/>
-    </physvol>
-
-    <physvol name="pvUX85C2800BellowCnct05"         volume="lvUX85C2800BellowCnct05">
-      <position z="UX85C2800BellowCnct05Zpos"/>
-    </physvol>
-
-    <physvol name="pvUX85C2800Cone06"               volume="lvUX85C2800Cone06">
-      <position z="UX85C2800Cone06Zpos"/>
-    </physvol>
-
-    <physvol name="pvUX85C2800Cone07"               volume="lvUX85C2800Cone07">
-      <position z="UX85C2800Cone07Zpos"/>
-    </physvol>
-
-
-    <physvol name="pvUX85C2800Cone11"               volume="lvUX85C2800Cone11">
-      <position z="UX85C2800Cone11Zpos"/>
-    </physvol>
-
-    <physvol name="pvUX85C2800Flange12"             volume="lvUX85C2800Flange12">
-      <position z="UX85C2800Flange12Zpos"/>
-    </physvol>
-
-    <!-- Now the vacuum inside -->
-    <physvol name="pvUX85C2800Vacuum01"             volume="lvUX85C2800Vacuum01">
-      <position z="0.5*UX85C2800Vacuum01Lenght"/>
-    </physvol>
-
-  </volume>
-
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-PipeParams.xml b/compact/components/Pipe/2025-v00.00/Magnet-PipeParams.xml
deleted file mode 100644
index 8808e034a..000000000
--- a/compact/components/Pipe/2025-v00.00/Magnet-PipeParams.xml
+++ /dev/null
@@ -1,625 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout in the Magnet                    -->
-<!--===========================================================================-->
-<lccdd>
-  <define>
-
-    <!-- ***************************************************************** -->
-    <!-- * UX85-1 Parameters                                             * -->
-    <!-- ***************************************************************** -->
-    <!-- UX85-1 Cone 10 mrad of Beryllium 1mm thick   -->
-    <!-- Start at end of BeforeMagnet Region          -->
-    <constant name="UX851Cone09Lenght"      value="5.00*mm"/>
-    <constant name="UX851Cone10Lenght"      value="36.00*mm"/>
-    <constant name="UX851Flange11Lenght"    value="12.8*mm"/>
-
-    <constant name="UX851Cone08BLenght"
-              value="UX85C2800ZStartIP - UX851TTMagnetSplitZposIP -
-                     UX851Cone09Lenght - UX851Cone10Lenght - UX851Flange11Lenght"/>
-    <!--  value="UX851Cone08Lenght - UX851Cone08ALenght - UX851Cone09Lenght"/ -->
-
-    <constant name="UX851Cone08BThick"      value="1.00*mm"/>
-    <constant name="UX851Cone08BRadiusZmin"
-              value="UX851TTMagnetSplitZposIP*tan(UX851to4Angle)"/>
-    <constant name="UX851Cone08BRadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851Cone08BLenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX851Cone08BZpos" value="0.5*UX851Cone08BLenght"/>
-
-    <!-- UX85-1 Cone 10 mrad of Beryllium 1.5mm thick for welding  -->
-    <constant name="UX851Cone09Thick"      value="1.50*mm"/>
-    <constant name="UX851Cone09RadiusZmin" value="UX851Cone08BRadiusZmax"/>
-    <constant name="UX851Cone09RadiusZmax" value="27.50*mm"/>
-    <constant name="UX851Cone09Zpos"
-              value="UX851Cone08BLenght + 0.5*UX851Cone09Lenght"/>
-
-    <!-- UX85-1 Cone 10 mrad of Alumimium 1.5mm thick for flange  -->
-    <constant name="UX851Cone10Thick"      value="1.50*mm"/>
-    <constant name="UX851Cone10RadiusZmin" value="UX851Cone09RadiusZmax"/>
-    <constant name="UX851Cone10RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851Cone08BLenght +
-                     UX851Cone09Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX851Cone10Zpos"
-              value="UX851Cone08BLenght + UX851Cone09Lenght +
-                     0.5*UX851Cone10Lenght"/>
-
-    <!-- UX85-1 Flange  -->
-    <constant name="UX851Flange11RadiusZmin"  value="UX851Cone10RadiusZmax"/>
-    <constant name="UX851Flange11RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851Cone08BLenght +
-                     UX851Cone09Lenght + UX851Cone10Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX851Flange11OuterRadius" value="43.00*mm"/>
-    <constant name="UX851Flange11Zpos"
-              value="UX851Cone08BLenght + UX851Cone09Lenght+
-                     UX851Cone10Lenght + 0.5*UX851Flange11Lenght"/>
-
-    <!-- UX851InMagnet -->
-    <constant name="UX851InMagnetLenght"
-              value="UX851Cone08BLenght + UX851Cone09Lenght + UX851Cone10Lenght +
-                     UX851Flange11Lenght"/>
-
-    <!-- Vacuum sections overlapping all the mechanical sections above -->
-    <!-- only segmentation due to shape or regions                     -->
-    <constant name="UX851Vacuum08BLenght"  value="UX851InMagnetLenght"/>
-
-    <!-- ***************************************************************** -->
-    <!-- * Compensator Parameters                                        * -->
-    <!-- ***************************************************************** -->
-    <!-- Compensator at 2800 Flange -->
-    <constant name="UX85C2800Flange01Lenght"   value="14.00*mm"/>
-    <constant name="UX85C2800Flange01RadiusZmin"
-              value="UX851Flange11RadiusZmax"/>
-    <constant name="UX85C2800Flange01RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Flange01Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX85C2800Flange01OuterRadius" value="43.00*mm"/>
-    <constant name="UX85C2800Flange01Zpos"
-              value="0.5*UX85C2800Flange01Lenght"/>
-
-    <!-- Compensator at 2800 cone of 10 mrad -->
-    <constant name="UX85C2800Cone02Lenght"
-              value="42.35*mm - UX85C2800Flange01Lenght"/>
-    <constant name="UX85C2800Cone02RadiusZmin"
-              value="UX85C2800Flange01RadiusZmax"/>
-    <constant name="UX85C2800Cone02RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Flange01Lenght + UX85C2800Cone02Lenght)
-                     *tan(UX851to4Angle)"/>
-    <constant name="UX85C2800Cone02OuterRadius"  value="30.50*mm"/>
-    <constant name="UX85C2800Cone02Zpos"
-              value="UX85C2800Flange01Lenght + 0.5*UX85C2800Cone02Lenght"/>
-
-    <!-- Compensator at 2800 connection to bellow -->
-    <constant name="UX85C2800BellowCnct03Lenght"     value="16.85*mm"/>
-    <constant name="UX85C2800BellowCnct03RadiusZmin"
-              value="UX85C2800Cone02RadiusZmax+1.0*mm"/>
-    <constant name="UX85C2800BellowCnct03RadiusZmax"
-              value="UX85C2800BellowCnct03RadiusZmin +UX85C2800BellowCnct03Lenght*tan(UX851to4Angle)"/>
-
-    <!--
-	<constant name="UX85C2800BellowCnct03RadiusZmin"
-        value="UX85C2800Cone02RadiusZmax"/>
-	<constant name="UX85C2800BellowCnct03RadiusZmax"
-        value="UX85C2800BellowCnct03RadiusZmin +
-        UX85C2800BellowCnct03Lenght*tan(15*degree)"/>
-
-<constant name="UX85C2800BellowCnct03Thick"      value="2.00*mm"/>
-    -->
-    <constant name="UX85C2800BellowCnct03Thick"      value="1.00*mm"/>
-    <constant name="UX85C2800BellowCnct03Zpos"
-              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
-                     0.5*UX85C2800BellowCnct03Lenght"/>
-
-    <!-- Compensator at 2800 Bellow -->
-    <!-- Pitch different then drawing to take into account pre-expantion 2.5*mm    -->
-    <!--  of which 1 mm in connection to bellow afterward to avoid periodic lenght -->
-
-
-    <!-- modified value from June 2015 -->
-    <constant name="UX85C2800BellowNConvCR"      value="13"/>
-
-    <constant name="UX85C2800BellowWallThick"  value="0.40*mm"/>
-    <constant name="UX85C2800BellowStep"       value="2.80*mm"/>
-
-    <constant name="UX85C2800BellowPitch"
-              value="2*(UX85C2800BellowWallThick + UX85C2800BellowStep)"/>
-
-    <constant name="UX85C2800BellowLastLenght"
-              value="2*UX85C2800BellowWallThick + UX85C2800BellowStep"/>
-
-
-
-    <!-- Modified in June 2015 -->
-    <!--
-	<constant name="UX85C2800BellowInnerRadius"  value="34.00*mm"/>
-	<constant name="UX85C2800BellowOuterRadius"  value="46.00*mm"/>
-    -->
-    <constant name="UX85C2800BellowOuterRadius"  value="(79.40/2.0)*mm"/>
-    <constant name="UX85C2800BellowGrooveSize"   value="(6+3.4)*mm"/>
-
-
-    <constant name="UX85C2800BellowInnerRadius"  value="UX85C2800BellowOuterRadius-UX85C2800BellowGrooveSize"/>
-
-    <!-- modified value from June 2015 -->
-    <constant name="UX85C2800BellowCRLength"
-              value="(UX85C2800BellowNConvCR - 1)*UX85C2800BellowPitch +
-                     UX85C2800BellowLastLenght"/>
-
-    <constant name="UX85C2800Bellow04Zpos"
-              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
-                     UX85C2800BellowCnct03Lenght + 0.5*UX85C2800BellowCRLength"/>
-
-    <!-- Compensator at 2800 connection to bellow -->
-    <!--  adding 1 mm for bellow pre-expansion    -->
-    <constant name="UX85C2800BellowCnct05Lenght"      value="14.95*mm"/>
-    <constant name="UX85C2800BellowCnct05RadiusZmin"
-              value="UX85C2800BellowCnct03RadiusZmax"/>
-    <constant name="UX85C2800BellowCnct05RadiusZmax"  value="29.00*mm"/>
-
-    <!--
-	<constant name="UX85C2800BellowCnct05RadiusZmin"
-        value="UX85C2800BellowCnct03RadiusZmax"/>
-	<constant name="UX85C2800BellowCnct05RadiusZmax"  value="29.22*mm"/>
-	<constant name="UX85C2800BellowCnct05Thick"       value=" 2.00*mm"/>
-    -->
-
-    <constant name="UX85C2800BellowCnct05Thick"       value=" 1.00*mm"/>
-    <constant name="UX85C2800BellowCnct05Zpos"
-              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
-                     0.5*UX85C2800BellowCnct05Lenght"/>
-
-    <!-- Compensator at 2800 cone of 10 mrad -->
-    <!-- modified value in Jne 2015 -->
-    <!-- old value to be removed -->
-    <!--  <constant name="UX85C2800Cone06Lenght"       value="175.25*mm"/> -->
-    <!-- end old value to be removed -->
-
-    <constant name="UX85C2800Cone06LengthIncreaseinLS1" value="29.23*mm"/>
-
-    <constant name="UX85C2800Cone06Length"       value="175.25*mm + UX85C2800Cone06LengthIncreaseinLS1"/>
-    <constant name="UX85C2800Cone06RadiusZmin"
-              value="UX85C2800BellowCnct05RadiusZmax"/>
-    <!--
-	<constant name="UX85C2800Cone06RadiusZmax"   value="30.95*mm"/>
-    -->
-    <!--  Modified in June 2015  -->
-
-    <constant name="UX85C2800Cone06RadiusZmax"   value="31.24*mm"/>
-
-    <constant name="UX85C2800Cone06Thick"        value= "2.00*mm"/>
-    <constant name="UX85C2800Cone06Zpos"
-              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
-                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
-                     UX85C2800BellowCnct05Lenght + 0.5*UX85C2800Cone06Length"/>
-
-    <!-- Compensator at 2800 cone of 10 mrad, slightly thicker -->
-
-    <!-- modified label from June 2015 -->
-
-    <constant name="UX85C2800Cone07Length"       value="10.59*mm"/>
-
-
-    <constant name="UX85C2800Cone07RadiusZmin"
-              value="UX85C2800Cone06RadiusZmax"/>
-    <!--
-	<constant name="UX85C2800Cone07RadiusZmax"   value="31.06*mm"/>
-	<constant name="UX85C2800Cone07OuterRadius"  value="33.25*mm"/>
-    -->
-    <!-- modified in June 2015 -->
-    <constant name="UX85C2800Cone07RadiusZmax"   value="31.35*mm"/>
-    <constant name="UX85C2800Cone07OuterRadius"  value="33.54*mm"/>
-
-    <constant name="UX85C2800Cone07Zpos"
-              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
-                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
-                     UX85C2800BellowCnct05Lenght + UX85C2800Cone06Length +
-                     0.5*UX85C2800Cone07Length"/>
-
-    <!-- Compensator at 2800 connection to bellow -->
-
-
-    <!-- Compensator at 2800 cone of 10 mrad -->
-    <constant name="UX85C2800Flange12Lenght"    value="14.00*mm"/>
-
-    <constant name="UX85C2800Cone11Lenght"
-              value="54.38*mm - UX85C2800Flange12Lenght"/>
-
-    <!-- modified in June 2015 -->
-
-    <constant name="UX85C2800Cone11RadiusZmin" value="UX85C2800Cone07RadiusZmax"/>
-
-    <constant name="UX85C2800Cone11RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP +  UX85C2800Cone07Zpos +
-                     UX85C2800Cone11Lenght)*tan(UX851to4Angle)"/>
-
-    <constant name="UX85C2800Cone11OuterRadius" value="34.25* mm"/>
-
-    <constant name="UX85C2800Cone11Zpos"
-              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
-                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
-                     UX85C2800BellowCnct05Lenght + UX85C2800Cone06Length +
-                     UX85C2800Cone07Length + 0.5*UX85C2800Cone11Lenght"/>
-
-    <!-- Compensator at 2800 Flange -->
-    <constant name="UX85C2800Flange12RadiusZmin"
-              value="UX85C2800Cone11RadiusZmin"/>
-    <constant name="UX85C2800Flange12RadiusZmax"  value="32.18*mm"/>
-    <constant name="UX85C2800Flange12OuterRadius" value="47.00*mm"/>
-    <constant name="UX85C2800Flange12Zpos"
-              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
-                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
-                     UX85C2800BellowCnct05Lenght + UX85C2800Cone06Length +
-                     UX85C2800Cone07Length + UX85C2800Cone11Lenght + 0.5*UX85C2800Flange12Lenght"/>
-
-    <!-- Compensator at 2800 -->
-    <constant name="UX85C2800Lenght"
-              value="UX85C2800Flange01Lenght + UX85C2800Cone02Lenght +
-                     UX85C2800BellowCnct03Lenght + UX85C2800BellowCRLength +
-                     UX85C2800BellowCnct05Lenght + UX85C2800Cone06Length +
-                     UX85C2800Cone07Length +
-                     UX85C2800Cone11Lenght + UX85C2800Flange12Lenght"/>
-
-    <!-- Vacuum sections overlapping all the mechanical sections above -->
-    <!-- only segmentation due to shape or regions (ignore bellows)    -->
-    <constant name="UX85C2800Vacuum01Lenght"
-              value="UX85C2800Lenght"/>
-
-    <!-- ***************************************************************** -->
-    <!-- * UX85-2 Parameters                                             * -->
-    <!-- ***************************************************************** -->
-    <!-- UX85-2 Flange  -->
-    <constant name="UX852Flange01Lenght"      value="14.00*mm"/>
-    <constant name="UX852Flange01RadiusZmin"  value="32.25*mm"/>
-    <constant name="UX852Flange01RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght )*tan(UX851to4Angle)"/>
-    <constant name="UX852Flange01OuterRadius" value="47.00*mm"/>
-    <constant name="UX852Flange01Zpos"        value="0.5*UX852Flange01Lenght"/>
-
-    <!-- UX85-2 Cone 10 mrad of Alumimium 1.5mm thick for flange  -->
-    <constant name="UX852Cone02Lenght"      value="50.00*mm - UX852Flange01Lenght"/>
-    <constant name="UX852Cone02RadiusZmin"  value="UX852Flange01RadiusZmax"/>
-    <constant name="UX852Cone02RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght)
-                     *tan(UX851to4Angle)"/>
-    <constant name="UX852Cone02Thick"       value="1.50*mm"/>
-    <constant name="UX852Cone02Zpos"
-              value="UX852Flange01Lenght + 0.5*UX852Cone02Lenght"/>
-
-    <!-- UX85-2 Cone 10 mrad of Beryllium 1.0mm thick -->
-    <constant name="UX852Cone03Lenght"      value="738.20*mm"/>
-    <constant name="UX852Cone03RadiusZmin"  value="UX852Cone02RadiusZmax"/>
-    <constant name="UX852Cone03RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
-                     UX852Cone03Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX852Cone03Thick"       value="1.00*mm"/>
-    <constant name="UX852Cone03Zpos"
-              value="UX852Flange01Lenght + UX852Cone02Lenght + 0.5*UX852Cone03Lenght"/>
-
-    <!-- UX85-2 Cone 10 mrad of Beryllium section for support A  -->
-    <constant name="UX852Cone04ALenght"      value="5.00*mm"/>
-    <constant name="UX852Cone04ARadiusZmin"  value="UX852Cone03RadiusZmax"/>
-    <constant name="UX852Cone04ARadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
-                     UX852Cone03Lenght + UX852Cone04ALenght)
-                     *tan(UX851to4Angle)"/>
-    <constant name="UX852Cone04AThick"       value="1.00*mm"/>
-
-    <!-- UX85-2 Cone 10 mrad of Beryllium section for support B - cylindrical on outside -->
-    <constant name="UX852Cone04BLenght"      value="19.00*mm"/>
-    <constant name="UX852Cone04BRadiusZmin"  value="UX852Cone04ARadiusZmax"/>
-    <constant name="UX852Cone04BRadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
-                     UX852Cone03Lenght + UX852Cone04ALenght + UX852Cone04BLenght)
-                     *tan(UX851to4Angle)"/>
-    <constant name="UX852Cone04BOuterRadius" value="42.50*mm"/>
-
-    <!-- UX85-2 Cone 10 mrad of Beryllium section for support C -->
-    <constant name="UX852Cone04CLenght"      value="5.00*mm"/>
-    <constant name="UX852Cone04CRadiusZmin"  value="UX852Cone04BRadiusZmax"/>
-    <constant name="UX852Cone04CRadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
-                     UX852Cone03Lenght + UX852Cone04ALenght + UX852Cone04BLenght +
-                     UX852Cone04CLenght)*tan(UX851to4Angle)"/>
-    <constant name="UX852Cone04CThick"       value="1.00*mm"/>
-
-    <!-- UX85-2 Cone 10 mrad of Beryllium section for support - flange surrounds B section -->
-    <constant name="UX852Cone04RibLenght"       value="6.00*mm"/>
-    <constant name="UX852Cone04RibInnerRadius"  value="UX852Cone04BOuterRadius"/>
-    <constant name="UX852Cone04RibOuterRadius"  value="48.50*mm"/>
-
-    <!-- UX85-2 Cone 10 mrad of Beryllium section for support - whole -->
-    <constant name="UX852Cone04Lenght"
-              value="UX852Cone04ALenght + UX852Cone04BLenght + UX852Cone04CLenght"/>
-    <constant name="UX852Cone04Zpos"
-              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
-                     0.5*UX852Cone04Lenght"/>
-
-    <!-- UX85-2 Cone 10 mrad of Beryllium 1.0 mm thick -->
-    <constant name="UX852Cone05Lenght"      value="784.00*mm"/>
-    <constant name="UX852Cone05RadiusZmin"  value="UX852Cone04CRadiusZmax"/>
-    <constant name="UX852Cone05RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
-                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght)
-                     *tan(UX851to4Angle)"/>
-    <constant name="UX852Cone05Thick"       value="1.00*mm"/>
-    <constant name="UX852Cone05Zpos"
-              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
-                     UX852Cone04Lenght + 0.5*UX852Cone05Lenght"/>
-
-    <!-- UX85-2 Cone 10 mrad of Beryllium 1.1 mm thick -->
-    <constant name="UX852Cone06Lenght"      value="800.00*mm"/>
-    <constant name="UX852Cone06RadiusZmin"  value="UX852Cone05RadiusZmax"/>
-    <constant name="UX852Cone06RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
-                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght +
-                     UX852Cone06Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX852Cone06Thick"       value="1.10*mm"/>
-    <constant name="UX852Cone06Zpos"
-              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
-                     UX852Cone04Lenght + UX852Cone05Lenght + 0.5*UX852Cone06Lenght"/>
-
-    <!-- UX85-2 Cone 10 mrad of Beryllium 1.3 mm thick -->
-    <constant name="UX852Cone07Lenght"      value="1247.00*mm"/>
-    <constant name="UX852Cone07RadiusZmin"  value="UX852Cone06RadiusZmax"/>
-    <constant name="UX852Cone07RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
-                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght +
-                     UX852Cone06Lenght + UX852Cone07Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX852Cone07Thick"       value="1.30*mm"/>
-    <constant name="UX852Cone07Zpos"
-              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
-                     UX852Cone04Lenght + UX852Cone05Lenght + UX852Cone06Lenght +
-                     0.5*UX852Cone07Lenght"/>
-
-    <!-- UX85-2 Cone 10 mrad of Aluminum 2.0 mm thick -->
-    <constant name="UX852Cone08Lenght"      value="9.00*mm"/>
-    <constant name="UX852Cone08RadiusZmin"  value="UX852Cone07RadiusZmax"/>
-    <constant name="UX852Cone08RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
-                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght +
-                     UX852Cone06Lenght + UX852Cone07Lenght + UX852Cone08Lenght)
-                     *tan(UX851to4Angle)"/>
-    <constant name="UX852Cone08Thick"       value="2.00*mm"/>
-    <constant name="UX852Cone08Zpos"
-              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
-                     UX852Cone04Lenght + UX852Cone05Lenght + UX852Cone06Lenght +
-                     UX852Cone07Lenght + 0.5*UX852Cone08Lenght"/>
-
-    <!-- UX85-2 Flange -->
-    <constant name="UX852Flange09Lenght"      value="20.00*mm"/>
-    <constant name="UX852Flange09RadiusZmin"  value="UX852Cone08RadiusZmax"/>
-    <constant name="UX852Flange09RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Flange01Lenght + UX852Cone02Lenght +
-                     UX852Cone03Lenght + UX852Cone04Lenght + UX852Cone05Lenght +
-                     UX852Cone06Lenght + UX852Cone07Lenght + UX852Cone08Lenght +
-                     UX852Flange09Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX852Flange09OuterRadius"  value="88.95*mm"/>
-    <constant name="UX852Flange09Zpos"
-              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
-                     UX852Cone04Lenght + UX852Cone05Lenght + UX852Cone06Lenght +
-                     UX852Cone07Lenght + UX852Cone08Lenght + 0.5*UX852Flange09Lenght"/>
-
-    <!-- UX85-2 (whole in magnet) -->
-    <constant name="UX852Lenght"
-              value="UX852Flange01Lenght + UX852Cone02Lenght + UX852Cone03Lenght +
-                     UX852Cone04Lenght + UX852Cone05Lenght + UX852Cone06Lenght +
-                     UX852Cone07Lenght + UX852Cone08Lenght + UX852Flange09Lenght"/>
-
-    <!-- Vacuum sections overlapping all the mechanical sections above -->
-    <!-- only segmentation due to shape or regions                     -->
-    <constant name="UX852Vacuum01Lenght"  value="UX852Lenght"/>
-
-    <!-- ***************************************************************** -->
-    <!-- * Bellow Section Parameters                                     * -->
-    <!-- ***************************************************************** -->
-    <!-- Bellow at 6900 - Flange -->
-    <constant name="UX85B6900Flange01Lenght"       value="20.00*mm"/>
-    <constant name="UX85B6900Flange01InnerRadius"  value="69.60*mm"/>
-    <constant name="UX85B6900Flange01OuterRadius"  value="88.95*mm"/>
-    <constant name="UX85B6900Flange01Zpos"
-              value="0.5*UX85B6900Flange01Lenght"/>
-
-    <!-- Bellow at 6900 cylinder (almost cone 10 mrad) -->
-    <!-- Make it 1.5*mm/2 longer to compensate for pre-expansion 5mm that cannot all be -->
-    <!-- accounted in bellow step.                                                      -->
-    <constant name="UX85B6900Cyl02Lenght"        value="7.00*mm + 16.00*mm + 0.75*mm"/>
-    <constant name="UX85B6900Cyl02InnerRadius"   value="69.60*mm"/>
-    <constant name="UX85B6900Cyl02OuterRadius"   value="71.60*mm"/>
-    <constant name="UX85B6900Cyl02Zpos"
-              value="UX85B6900Flange01Lenght + 0.5*UX85B6900Cyl02Lenght"/>
-
-    <!-- Bellow at 6900 rib around cone -->
-    <constant name="UX85B6900Rib03Lenght"       value="2.00*mm"/>
-    <constant name="UX85B6900Rib03InnerRadius"  value="UX85B6900Cyl02OuterRadius"/>
-    <constant name="UX85B6900Rib03OuterRadius"  value="73.50*mm"/>
-    <constant name="UX85B6900Rib03Zpos"
-              value="UX85B6900Flange01Lenght + 7.00*mm + 6.00*mm + 0.5*UX85B6900Rib03Lenght"/>
-
-    <!-- Bellow at 6900 Bellow -->
-    <!-- Pre-expansion is 5*mm but make it a little more to be equally distributed on steps -->
-    <!-- anyway there would be 2 extra half convolutions...                                 -->
-    <constant name="UX85B6900BellowNConv"       value="7"/>
-    <constant name="UX85B6900BellowWallThick"   value="0.50*mm"/>
-    <constant name="UX85B6900BellowStep"        value="4.50*mm"/>
-
-    <constant name="UX85B6900BellowPitch"
-              value="2*(UX85B6900BellowWallThick + UX85B6900BellowStep)"/>
-
-    <constant name="UX85B6900BellowLastLenght"
-              value="2*UX85B6900BellowWallThick + UX85B6900BellowStep"/>
-
-    <constant name="UX85B6900BellowInnerRadius"  value="71.00*mm"/>
-    <constant name="UX85B6900BellowOuterRadius"  value="90.00*mm"/>
-
-    <constant name="UX85B6900BellowLenght"
-              value="(UX85B6900BellowNConv - 1)*UX85B6900BellowPitch +
-                     UX85B6900BellowLastLenght"/>
-
-    <constant name="UX85B6900Bellow04Zpos"
-              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght +
-                     0.5*UX85B6900BellowLenght"/>
-
-    <!-- Bellow at 6900 rib around cone -->
-    <constant name="UX85B6900Cyl06Lenght"       value="7.00*mm + 16.00*mm + 0.75*mm"/>
-    <constant name="UX85B6900Cyl06OuterRadius"  value="72.50*mm"/>
-
-    <constant name="UX85B6900Rib05Lenght"       value="2.00*mm"/>
-    <constant name="UX85B6900Rib05InnerRadius"  value="UX85B6900Cyl06OuterRadius"/>
-    <constant name="UX85B6900Rib05OuterRadius"  value="74.50*mm"/>
-    <constant name="UX85B6900Rib05Zpos"
-              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght + UX85B6900BellowLenght +
-                     UX85B6900Cyl06Lenght - 7.00*mm - 6.0*mm - 0.5*UX85B6900Rib05Lenght"/>
-
-    <!-- Bellow at 6900 cylinder (almost cone 10 mrad) -->
-    <constant name="UX85B6900Cyl06InnerRadius"   value="70.50*mm"/>
-    <constant name="UX85B6900Cyl06Zpos"
-              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght + UX85B6900BellowLenght +
-                     0.5*UX85B6900Cyl06Lenght"/>
-
-    <!-- Bellow at 6900 - Flange -->
-    <constant name="UX85B6900Flange07Lenght"       value="20.00*mm"/>
-    <constant name="UX85B6900Flange07InnerRadius"  value="70.50*mm"/>
-    <constant name="UX85B6900Flange07OuterRadius"  value="88.95*mm"/>
-    <constant name="UX85B6900Flange07Zpos"
-              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght + UX85B6900BellowLenght +
-                     UX85B6900Cyl06Lenght + 0.5*UX85B6900Flange07Lenght"/>
-
-    <!-- Whole bellow lenght -->
-    <constant name="UX85B6900Lenght"
-              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght + UX85B6900BellowLenght +
-                     UX85B6900Cyl06Lenght + UX85B6900Flange07Lenght"/>
-
-    <!-- Vacuum section overlapping the Flange and cylinder -->
-    <constant name="UX85B6900Vacuum01Lenght"
-              value="UX85B6900Flange01Lenght + UX85B6900Cyl02Lenght"/>
-    <constant name="UX85B6900Vacuum01Zpos"
-              value="0.5*UX85B6900Vacuum01Lenght"/>
-
-    <!-- Vacuum section overlapping the bellow -->
-    <constant name="UX85B6900Vacuum04Lenght"
-              value="UX85B6900BellowLenght"/>
-    <constant name="UX85B6900Vacuum04Zpos"
-              value="UX85B6900Vacuum01Lenght + 0.5*UX85B6900Vacuum04Lenght"/>
-
-    <!-- Vacuum section overlapping the Flange and cylinder -->
-    <constant name="UX85B6900Vacuum06Lenght"
-              value="UX85B6900Cyl06Lenght + UX85B6900Flange07Lenght"/>
-    <constant name="UX85B6900Vacuum06Zpos"
-              value="UX85B6900Vacuum01Lenght + UX85B6900BellowLenght +
-                     0.5*UX85B6900Vacuum06Lenght"/>
-
-    <!-- ***************************************************************** -->
-    <!-- * UX85-3 Parameters                                             * -->
-    <!-- ***************************************************************** -->
-    <!-- UX85-3 Flange  -->
-    <constant name="UX853Flange01Lenght"      value="20.00*mm"/>
-    <constant name="UX853Flange01RadiusZmin"  value="70.50*mm"/>
-    <constant name="UX853Flange01RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Lenght + UX85B6900Lenght +
-                     UX853Flange01Lenght )*tan(UX851to4Angle)"/>
-    <constant name="UX853Flange01OuterRadius" value="89.00*mm"/>
-    <constant name="UX853Flange01Zpos"        value="0.5*UX853Flange01Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Alumimium ~2-2.4*mm thick for flange  -->
-    <constant name="UX853Cone02Lenght"
-              value="UX853Flange01Cone02Lenght - UX853Flange01Lenght"/>
-    <constant name="UX853Cone02RadiusZmin"    value="UX853Flange01RadiusZmax"/>
-    <constant name="UX853Cone02RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Lenght + UX85B6900Lenght +
-                     UX853Flange01Lenght + UX853Cone02Lenght)*
-                     tan(UX851to4Angle)"/>
-    <constant name="UX853Cone02OuterRadius" value="73.10*mm"/>
-    <constant name="UX853Cone02Zpos"
-              value="UX853Flange01Lenght + 0.5*UX853Cone02Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium ~2*mm thick for welding and -->
-    <!-- support flange  -->
-    <constant name="UX853Cone03FlangeLenght"  value="2.50*mm"/>
-
-    <constant name="UX853Cone03Lenght"
-              value="50.00*mm + UX853Cone03FlangeLenght + 8.00*mm"/>
-    <constant name="UX853Cone03RadiusZmin"    value="UX853Cone02RadiusZmax"/>
-    <constant name="UX853Cone03RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Lenght + UX85B6900Lenght +
-                     UX853Flange01Lenght + UX853Cone02Lenght +
-                     UX853Cone03Lenght )*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone03OuterRadius" value="73.10*mm"/>
-    <constant name="UX853Cone03Zpos"
-              value="UX853Flange01Lenght + UX853Cone02Lenght +
-                     0.5*UX853Cone03Lenght"/>
-
-    <!-- UX85-3 little flange for support, surrounds Cone03 -->
-    <constant name="UX853Cone03FlangeInnerRadius"  value="UX853Cone03OuterRadius"/>
-    <constant name="UX853Cone03FlangeOuterRadius"  value="80.30*mm"/>
-    <constant name="UX853Cone03FlangeZpos"
-              value="UX853Flange01Lenght + UX853Cone02Lenght + 50.00*mm +
-                     0.5*UX853Cone03FlangeLenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 1.4 mm thick -->
-    <constant name="UX853Cone04Lenght"
-              value="UX853Cone0304Lenght - UX853Cone03Lenght"/>
-    <constant name="UX853Cone04RadiusZmin"    value="UX853Cone03RadiusZmax"/>
-    <constant name="UX853Cone04RadiusZmax"
-              value="(UX851TTMagnetSplitZposIP + UX851InMagnetLenght +
-                     UX85C2800Lenght + UX852Lenght + UX85B6900Lenght +
-                     UX853Flange01Lenght + UX853Cone02Lenght +
-                     UX853Cone03Lenght + UX853Cone04Lenght)*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone04Thick"         value="1.4*mm"/>
-    <constant name="UX853Cone04Zpos"
-              value="UX853Flange01Lenght + UX853Cone02Lenght + UX853Cone03Lenght +
-                     0.5*UX853Cone04Lenght"/>
-
-    <!-- UX85-3 Cone 10 mrad of Beryllium 1.6 mm thick - Split Magnet/AfterMagnet -->
-    <constant name="UX853Cone05ALenght"
-              value="UX853MagnetTSplitZposIP - UX853ZStartIP - UX853Flange01Lenght -
-                     UX853Cone02Lenght - UX853Cone03Lenght - UX853Cone04Lenght"/>
-
-    <constant name="UX853Cone05ARadiusZmin"    value="UX853Cone04RadiusZmax"/>
-    <constant name="UX853Cone05ARadiusZmax"
-              value="UX853MagnetTSplitZposIP*tan(UX851to4Angle)"/>
-    <constant name="UX853Cone05AThick"         value="1.6*mm"/>
-    <constant name="UX853Cone05AZpos"
-              value="UX853Flange01Lenght + UX853Cone02Lenght + UX853Cone03Lenght +
-                     UX853Cone04Lenght + 0.5*UX853Cone05ALenght"/>
-
-    <!-- UX85-3 InMagnet -->
-    <constant name="UX853InMagnetLenght"
-              value="UX853Flange01Lenght + UX853Cone02Lenght + UX853Cone03Lenght +
-                     UX853Cone04Lenght + UX853Cone05ALenght"/>
-
-    <!-- Vacuum sections overlapping all the mechanical sections above -->
-    <!-- only segmentation due to regions                              -->
-    <constant name="UX853Vacuum01Lenght"  value="UX853InMagnetLenght"/>
-
-    <!-- ***************************************************************** -->
-    <!-- * General Parameters                                            * -->
-    <!-- ***************************************************************** -->
-    <!-- UX85InMagnet -->
-    <constant name="UX85InMagnetLenght"
-              value="UX851InMagnetLenght + UX85C2800Lenght + UX852Lenght + UX85B6900Lenght"/>
-  </define>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-Support.xml b/compact/components/Pipe/2025-v00.00/Magnet-Support.xml
deleted file mode 100644
index 8cd5a33eb..000000000
--- a/compact/components/Pipe/2025-v00.00/Magnet-Support.xml
+++ /dev/null
@@ -1,2769 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-
-  <materials>
-    <!-- ### Pipe Supports Titanium small pins ### -->
-    <material name    = "Pipe:TitaniumG5">
-      <D name="density" value="4.42" unit="g/cm3"/>
-      <fraction ref = "Al" n="0.06"/>
-      <fraction ref = "Fe" n="0.0025"/>
-      <fraction ref = "Ti" n="0.8955"/>
-      <fraction ref = "V"  n="0.04"/>
-      <fraction ref = "O"  n="0.0020"/>
-    </material>
-  </materials>
-
-  <detectors>
-    <detector name="PipeMagnet-Support" type="DD4hep_VolumeAssembly" parent="${PipeMagnet:parent}" vis="Pipe:Vis">
-      <position z="-0.5*Regions:MagnetRegionZSize"/>
-      <!-- *************************************************************************** -->
-      <!-- * UX85-1 Support                                                          * -->
-      <!-- *************************************************************************** -->
-      <!-- UX85-1 Support: Collar -->
-      <volume name="lvUX851Collar" material="Pipe:Al2219F">
-        <shape type="Tube" name="UX85-1-Collar"
-               dz="0.5*UX851CollarLenght"
-               rmin="UX851CollarRadius"
-               rmax="UX851CollarRadius+UX851CollarThick"/>
-      </volume>
-
-      <!-- UX85-1 Support: Cables -->
-      <volume name="lvUX851Cable" material="Pipe:Steel316LN">
-        <shape type="Tube" name="UX85-1-Cable"
-               dz="0.5*UX851CableLenght"
-               rmax="UX851CableRadius"/>
-      </volume>
-
-      <!-- *************************************************************************** -->
-      <!-- UX85-2 Fixed Point                                                          -->
-      <!-- *************************************************************************** -->
-      <volume name="lvUX852InnerRing" material="Pipe:Beryllium">
-        <shape type="Tube" name="UX85-2-InnerRing"
-               dz="0.5*UX852FixCollarRingLength"
-               rmin="UX852FixCollarRingInnerRad"
-               rmax="UX852FixCollarRingOuterRad"/>
-      </volume>
-
-      <volume name="lvUX852BigRingSect1" material="Pipe:Beryllium">
-        <shape type="Tube" name="UX85-2-BigRingSect1"
-               dz="0.5*UX852FixCollarLength"
-               rmin="UX852FixCollarInnerRad"
-               rmax="UX852FixCollarAttOuterRad"
-               deltaPhiAngle="UX852FixCollarSect1DelthaAngle"/>
-      </volume>
-
-      <volume name="lvUX852BigRingSect2" material="Pipe:Beryllium">
-        <shape type="BooleanShape" operation="subtraction" name="UX852Sect2Sub">
-          <shape type="Tube" name="UX85-2-BigRingSect2"
-                 dz="0.5*UX852FixCollarLength"
-                 rmin="UX852FixCollarInnerRad"
-                 rmax="UX852FixCollarAttOuterRad"
-                 startPhiAngle="UX852FixCollarSect1DelthaAngle"
-                 deltaPhiAngle="UX852FixCollarSect2DelthaAngle"/>
-          <shape type="Box" name="UX85-2-BigRingSect2-Slope"
-                 dx="0.5*UX852BigRingSect2SlopeXsize"
-                 dy="0.5*UX852BigRingSect2SlopeYsize"
-                 dz="0.5*(UX852FixCollarLength+0.5*mm)"/>
-          <transformation>
-            <position/>
-            <rotation z="UX852BigRingSect2SlopeZrot"/>
-            <position/>
-            <rotation/>
-            <positionRPhiZ r="0.5*(UX852FixCollarAttOuterRad+UX852FixCollarOuterRad+UX852BigRingSect2SlopeYsize)" phi="UX852BigRingSect2SlopePhipos"/>
-          </transformation>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852BigRingSect3" material="Pipe:Beryllium">
-        <shape type="BooleanShape" operation="subtraction" name="UX852Sect3Sub">
-          <shape type="Tube" name="UX85-2-BigRingSect3"
-                 dz="0.5*UX852FixCollarLength"
-                 rmin="UX852FixCollarInnerRad"
-                 rmax="UX852FixCollarOuterRad"
-                 startPhiAngle="UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle"
-                 deltaPhiAngle="UX852FixCollarSect3DelthaAngle"/>
-          <shape type="Tube" name="UX852BigRingTransHole1"
-                 dz="0.5*UX852FixCollarHoleSect3Length"
-                 rmax="UX852FixCollarHoleSect3Rad"/>
-          <transformation>
-            <positionRPhiZ/>
-            <rotation y="90*degree"/>
-            <positionRPhiZ r="UX852FixCollarHoleSect3Rpos" phi="UX852FixCollarHoleSect3Phipos"/>
-            <rotation z="45*degree-UX852FixCollarSect1Rot"/>
-          </transformation>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852BigRingSect4" material="Pipe:Beryllium">
-        <shape type="BooleanShape" operation="subtraction" name="UX852Sect4Sub">
-          <shape type="Tube" name="UX85-2-BigRingSect4"
-                 dz="0.5*UX852FixCollarLength"
-                 rmin="UX852FixCollarInnerRad"
-                 rmax="UX852FixCollarAttOuterRad"
-                 startPhiAngle="UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle + UX852FixCollarSect3DelthaAngle"
-                 deltaPhiAngle="UX852FixCollarSect2DelthaAngle"/>
-          <shape type="Box" name="UX85-2-BigRingSect4-Slope"
-                 dx="0.5*UX852BigRingSect2SlopeXsize"
-                 dy="0.5*UX852BigRingSect2SlopeYsize"
-                 dz="0.5*(UX852FixCollarLength+0.5*mm)"/>
-          <transformation>
-            <position/>
-            <rotation z="UX852BigRingSect2SlopeZrot - 5*degree"/>
-            <position/>
-            <rotation/>
-            <positionRPhiZ r="0.5*(UX852FixCollarAttOuterRad+UX852FixCollarOuterRad+UX852BigRingSect2SlopeYsize)" phi="UX852BigRingSect4SlopePhipos"/>
-          </transformation>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852BigRingQuarter">
-        <physvol name="pvUX852BigRingSect1"                 volume="lvUX852BigRingSect1">
-        </physvol>
-        <physvol name="pvUX852BigRingSect2"                 volume="lvUX852BigRingSect2">
-        </physvol>
-        <physvol name="pvUX852BigRingSect3"                 volume="lvUX852BigRingSect3">
-        </physvol>
-        <physvol name="pvUX852BigRingSect4"                 volume="lvUX852BigRingSect4">
-        </physvol>
-      </volume>
-
-      <!-- UX825 Fix Collar -->
-      <volume name="lvUX852FixCollar">
-        <physvol name="pvUX852InnerRing"                 volume="lvUX852InnerRing">
-          <position z="UX852FixCollarZpos"/>
-        </physvol>
-
-        <physvol name="pvUX852BigRingQuarter1"           volume="lvUX852BigRingQuarter">
-          <position z="UX852FixCollarZpos"/>
-          <rotation z="UX852FixCollarSect1Rot"/>
-        </physvol>
-
-        <physvol name="pvUX852BigRingQuarter2"           volume="lvUX852BigRingQuarter">
-          <position z="UX852FixCollarZpos"/>
-          <rotation z="UX852FixCollarSect1Rot+UX852FixCollarQuarterRot"/>
-        </physvol>
-
-        <physvol name="pvUX852BigRingQuarter3"           volume="lvUX852BigRingQuarter">
-          <position z="UX852FixCollarZpos"/>
-          <rotation z="UX852FixCollarSect1Rot+2*UX852FixCollarQuarterRot"/>
-        </physvol>
-
-        <physvol name="pvUX852BigRingQuarter4"           volume="lvUX852BigRingQuarter">
-          <position z="UX852FixCollarZpos"/>
-          <rotation z="UX852FixCollarSect1Rot+3*UX852FixCollarQuarterRot"/>
-        </physvol>
-      </volume>
-
-      <!-- Attachments -->
-      <volume name="lvUX852CollarAtt" material="Pipe:Beryllium">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-2-CollarAttMainSub">
-          <shape type="Box" name="UX85-2-CollarAttMain"
-                 dx="0.5*UX852CollarAttMainPartXsize"
-                 dy="0.5*UX852CollarAttMainPartYsize"
-                 dz="0.5*UX852CollarAttMainPartZsize"/>
-          <shape type="Box" name="UX85-2-CollarAttMainSub1"
-                 dx="0.5*UX852CollarAttMainPartXsize"
-                 dy="0.5*UX852CollarAttMainPartYsize+100*mm"
-                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"/>
-          <transformation>
-            <positionRPhiZ r="UX852CollarAttSlope1RPos"/>
-            <rotation z="UX852CollarAttSlope1YRot"/>
-            <position/>
-            <rotation y="180*degree"/>
-            <positionRPhiZ/>
-          </transformation>
-          <shape type="Box" name="UX85-2-CollarAttMainSub2"
-                 dx="0.5*UX852CollarAttMainPartXsize"
-                 dy="0.5*UX852CollarAttMainPartYsize"
-                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"/>
-          <transformation>
-            <positionRPhiZ r="UX852CollarAttSlope2RPos"/>
-            <rotation/>
-            <position y="UX852CollarAttSlope2ZPos"/>
-            <rotation/>
-            <positionRPhiZ/>
-          </transformation>
-          <shape type="Box" name="UX85-2-CollarAttMainSub3"
-                 dx="0.5*UX852CollarAttMainPartXsize"
-                 dy="0.5*(UX852CollarAttMainPartYsize-5*mm)"
-                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"/>
-          <transformation>
-            <positionRPhiZ r="UX852CollarAttSlope3RPos"/>
-            <rotation z="UX852CollarAttSlope3YRot"/>
-            <position/>
-            <rotation/>
-            <positionRPhiZ/>
-          </transformation>
-          <shape type="Tube" name="UX85-2-CollarAttMain-Hole1"
-                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
-                 rmax="UX852CollarAttMainHole1Rad"/>
-          <transformation>
-            <positionRPhiZ r="UX852CollarAttMainHole1RadPos"/>
-            <rotation/>
-            <position/>
-            <position y="UX852CollarAttMainHole1ZPos"/>
-            <rotation y="180*degree"/>
-            <positionRPhiZ/>
-          </transformation>
-          <shape type="Tube" name="UX85-2-CollarAttMain-Hole2"
-                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
-                 rmax="UX852CollarAttMainHole2Rad"/>
-          <transformation>
-            <positionRPhiZ r="UX852CollarAttMainHole2RadPos"/>
-            <rotation/>
-            <position y="UX852CollarAttMainHole2ZPos"/>
-            <rotation/>
-            <positionRPhiZ/>
-          </transformation>
-          <shape type="Tube" name="UX85-2-CollarAttMain-RoundEdge1"
-                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
-                 rmin="UX852CollarAttMainPartEdge1InnerRad"
-                 rmax="UX852CollarAttMainPartEdge1InnerRad+10*mm"
-                 startPhiAngle="UX852CollarAttMainPartEdge1StartPhi"
-                 deltaPhiAngle="UX852CollarAttMainPartEdge1DeltaPhi"/>
-          <transformation>
-            <positionRPhiZ r="UX852CollarAttMainHole1RadPos"/>
-            <rotation/>
-            <position y="UX852CollarAttMainHole1ZPos"/>
-            <rotation y="180*degree"/>
-            <positionRPhiZ/>
-          </transformation>
-          <shape type="Tube" name="UX85-2-CollarAttMain-RoundEdge2"
-                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
-                 rmin="UX852CollarAttMainPartEdge2InnerRad"
-                 rmax="UX852CollarAttMainPartEdge2InnerRad+10*mm"
-                 startPhiAngle="UX852CollarAttMainPartEdge2StartPhi"
-                 deltaPhiAngle="UX852CollarAttMainPartEdge2DeltaPhi"/>
-          <transformation>
-            <positionRPhiZ r="UX852CollarAttMainHole2RadPos"/>
-            <rotation/>
-            <position y="UX852CollarAttMainHole2ZPos"/>
-            <rotation/>
-            <positionRPhiZ/>
-          </transformation>
-          <shape type="Tube" name="UX85-2-CollarAttMain-RoundEdge2b"
-                 dz="0.5*(UX852CollarAttMainPartZsize+0.5*mm)"
-                 rmin="UX852CollarAttMainPartEdge2InnerRad"
-                 rmax="UX852CollarAttMainPartEdge2InnerRad+10*mm"
-                 startPhiAngle="UX852CollarAttMainPartEdge2bStartPhi"
-                 deltaPhiAngle="UX852CollarAttMainPartEdge2bDeltaPhi"/>
-          <transformation>
-            <positionRPhiZ r="UX852CollarAttMainHole2RadPos"/>
-            <rotation/>
-            <position y="UX852CollarAttMainHole2ZPos"/>
-            <rotation/>
-            <positionRPhiZ/>
-          </transformation>
-        </shape>
-      </volume>
-
-      <!-- Cable attachments -->
-      <!-- New Cable attachment from 2015 June -->
-      <volume name="lvUX852CollarForkAttachProngCyl" material="Pipe:AW7075">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-2-CollarForkAttachProngSub" >
-          <shape type="Tube" name="UX85-2-CollarForkAttachCyl"
-                 dz="0.5*UX852CollarForkAttachProngThickness"
-                 rmax="UX852CollarForkAttachProngOuterRadius"
-                 rmin="UX852CollarForkAttachProngInnerRadius"/>
-          <shape type="Box" name="UX85-2-CollarForkAttachProngSubBox"
-                 dx="0.5*UX852CollarForkAttachProngSubBoxLargeXSize"
-                 dy="0.5*UX852CollarForkAttachProngSubBoxLargeYSize"
-                 dz="0.5*UX852CollarForkAttachProngSubBoxLargeZSize"/>
-          <position  y="UX852CollarForkAttachProngSubBoxShiftY"/>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852CollarForkAttachProngTrap" material="Pipe:AW7075">
-        <shape type="Trapezoid" name="UX85-2-CollarForkAttachTrd"
-               z="0.5*UX852CollarForkAttachProngTrapZSize"
-               x1="0.5*UX852CollarForkAttachProngTrapX1Size"
-               x2="0.5*UX852CollarForkAttachProngTrapX2Size"
-               y1="0.5*UX852CollarForkAttachProngTrapY1Size"
-               y2="0.5*UX852CollarForkAttachProngTrapY2Size"/>
-      </volume>
-      <volume name="lvUX852CollarForkAttachProngBox" material="Pipe:AW7075">
-        <shape type="Box" name="UX85-2-CollarForkAttachBox"
-               dx="0.5*UX852CollarForkAttachProngBoxXSize"
-               dy="0.5*UX852CollarForkAttachProngBoxYSize"
-               dz="0.5*UX852CollarForkAttachProngBoxZSize"/>
-      </volume>
-
-      <volume name="lvUX852CollarForkAttachStemTrap" material="Pipe:AW7075">
-        <shape type="BooleanShape" operation="subtraction" name="UX852CollarForkAttachStemSub" >
-          <shape type="Trapezoid" name="UX852CollarForkAttachTrd"
-                 z="0.5*UX852CollarForkAttachStemTrapZSize"
-                 x1="0.5*UX852CollarForkAttachStemTrapX1Size"
-                 x2="0.5*UX852CollarForkAttachStemTrapX2Size"
-                 y1="0.5*UX852CollarForkAttachStemTrapY1Size"
-                 y2="0.5*UX852CollarForkAttachStemTrapY2Size"/>
-
-          <shape type="BooleanShape" operation="subtraction" name="UX852CollarForkAttachStemCylSub" >
-            <shape type="Tube" name="UX852CollarStemLargeCylSub"
-                   dz="0.5*UX852CollarForkAttachStemLargeCylZSize"
-                   rmax="UX852CollarForkAttachStemLargeCylRadius"
-                   startPhiAngle="UX852CollarForkAttachStemCylStartPhi"
-                   deltaPhiAngle="UX852CollarForkAttachStemCylDeltaPhi"/>
-            <shape type="Tube" name="UX852CollarStemCylSub"
-                   dz="0.5*UX852CollarForkAttachStemCylZSize"
-                   rmax="UX852CollarForkAttachStemCylRadius"/>
-            <position/>
-          </shape>
-          <position z="UX852CollarForkAttachStemCylCenterZFromTrapCenter"/>
-          <rotation  x="UX852CollarForkAttachStemCylRotX"/>
-
-          <shape type="Tube"  name="UX852CollarForkStemCylHoleSub"
-                 dz="0.5*UX852CollarForkAttachStemHoleLargeZSize"
-                 rmax="UX852CollarForkAttachStemHoleRadius"/>
-          <position  z="UX852CollarForkAttachStemCylCenterZFromTrapCenter"/>
-          <rotation  x="UX852CollarForkAttachStemCylRotX"/>
-
-          <shape type="Trapezoid" name="UX852CollarForkStemTrdholeSub"
-                 z="0.5*UX852CollarForkStemTrdholeLargeZSize"
-                 x1="0.5*UX852CollarForkStemTrdholeX1Size"
-                 x2="0.5*UX852CollarForkStemTrdholeX2Size"
-                 y1="0.5*UX852CollarForkStemTrdholeY1LargeSize"
-                 y2="0.5*UX852CollarForkStemTrdholeY2LargeSize"/>
-          <position z="UX852CollarForkStemTrdholeZPos"/>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852CollarForkAttachProng" >
-        <physvol name="pvUX852CollarForkAttachProngCylUps"                 volume="lvUX852CollarForkAttachProngCyl" >
-          <position z="UX852CollarForkAttachProngUpsPosZ"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarForkAttachProngCylDns"                 volume="lvUX852CollarForkAttachProngCyl" >
-          <position z="UX852CollarForkAttachProngDnsPosZ"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarForkAttachProngTrapUps"                volume="lvUX852CollarForkAttachProngTrap" >
-          <position y="UX852CollarForkAttachProngTrapPosY"
-                    z="UX852CollarForkAttachProngTrapUpsPosZ"/>
-          <rotation x="UX852CollarForkAttachProngTrapRotX"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarForkAttachProngTrapDns"                volume="lvUX852CollarForkAttachProngTrap" >
-          <position y="UX852CollarForkAttachProngTrapPosY"
-                    z="UX852CollarForkAttachProngTrapDnsPosZ"/>
-          <rotation x="UX852CollarForkAttachProngTrapRotX"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarForkAttachProngBoxUps"                 volume="lvUX852CollarForkAttachProngBox" >
-          <position y="UX852CollarForkAttachProngBoxYPos"
-                    z="UX852CollarForkAttachProngBoxUpsPosZ"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarForkAttachProngBoxDns"                 volume="lvUX852CollarForkAttachProngBox" >
-          <position y="UX852CollarForkAttachProngBoxYPos"
-                    z="UX852CollarForkAttachProngBoxDnsPosZ"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarForkAttachStemTrap"                    volume="lvUX852CollarForkAttachStemTrap" >
-          <transformation>
-            <position/>
-            <rotation x="UX852CollarForkStemRotX"/>
-            <position y="UX852CollarForkStemPosY"/>
-            <rotation y="UX852CollarForkStemRotY"/>
-          </transformation>
-        </physvol>
-
-      </volume>
-
-
-      <volume name="lvUX852TechnoraCableHeadTypeACyl"  material="Pipe:Celazole">
-        <shape type="Tube" name="UX85-2-TechnoraCableHeadTypeATub"
-               dz="0.5*UX852TechnoraCableHeadThickness"
-               rmax="UX852TechnoraCableHeadTypeAOuterRadius"
-               rmin="UX852TechnoraCableHeadInnerRadius"/>
-      </volume>
-
-      <volume name="lvUX852TechnoraCableHeadTypeBCyl"  material="Pipe:Celazole">
-        <shape type="Tube" name="UX85-2-TechnoraCableHeadTypeBTub"
-               dz="0.5*UX852TechnoraCableHeadThickness"
-               rmax="UX853TechnoraCableHeadTypeBOuterRadius"
-               rmin="UX852TechnoraCableHeadInnerRadius"/>
-      </volume>
-
-      <volume name="lvUX852TechnoraCableHeadDemiCable" material="Pipe:Technora">
-        <shape type="Tube" name="UX85-2-TechnoraCableHeadDemiCableTub"
-               dz="0.5*UX852TechnoraCableHeadDemiCableLength"
-               rmax="UX852TechnoraCableHeadDemiCableRadius"/>
-      </volume>
-
-      <volume name="lvUX852TechnoraCableHeadTypeAWithoutPin" >
-        <physvol name="pvUX852TechnoraCableHeadCylTypeAWithoutPin"       volume="lvUX852TechnoraCableHeadTypeACyl"/>
-        <physvol name="pvUX852TechnoraCableHeadDemiCableSideATypeAWithoutPin"
-                 volume="lvUX852TechnoraCableHeadDemiCable" >
-          <position x="UX852TechnoraCableHeadDemiCableSideAPosX"
-                    y="UX852TechnoraCableHeadDemiCableSidePosY"/>
-          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
-        </physvol>
-        <physvol name="pvUX852TechnoraCableHeadDemiCableSideBTypeAWithoutPin"
-                 volume="lvUX852TechnoraCableHeadDemiCable" >
-          <position x="UX852TechnoraCableHeadDemiCableSideBPosX"
-                    y="UX852TechnoraCableHeadDemiCableSidePosY"/>
-          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
-        </physvol>
-
-      </volume>
-
-      <volume name="lvUX852TechnoraCableHeadTypeBWithoutPin" >
-        <physvol name="pvUX852TechnoraCableHeadCylTypeBWithoutPin"       volume="lvUX852TechnoraCableHeadTypeBCyl"/>
-        <physvol name="pvUX852TechnoraCableHeadDemiCableSideATypeBWithoutPin"
-                 volume="lvUX852TechnoraCableHeadDemiCable" >
-          <position x="UX852TechnoraCableHeadDemiCableSideAPosX"
-                    y="UX852TechnoraCableHeadDemiCableSidePosY"/>
-          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
-        </physvol>
-        <physvol name="pvUX852TechnoraCableHeadDemiCableSideBTypeBWithoutPin"
-                 volume="lvUX852TechnoraCableHeadDemiCable" >
-          <position x="UX852TechnoraCableHeadDemiCableSideBPosX"
-                    y="UX852TechnoraCableHeadDemiCableSidePosY"/>
-          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
-        </physvol>
-      </volume>
-
-      <volume name="lvUX852FutureFibreCableHeadOuterCyl"  material="Pipe:Celazole">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-2-FutureFibreCableHeadTubSub" >
-          <shape type="Tube" name="UX85-2-FutureFibreCableHeadTub"
-                 dz="0.5*UX852CableHeadBasicThickness"
-                 rmax="UX852CableHeadOuterRadius"
-                 rmin="UX852CableHeadOuterPartInnerRadius"/>
-
-          <shape type="Tube" name="UX85-2-FutureFibreCableHeadSubTub"
-                 dz="0.5*UX852CableHeadHoleLargeZSize"
-                 rmax="UX852CableHeadOuterHoleOuterRadius"
-                 startPhiAngle="UX852CableHeadOuterHoleBeginPhi"
-                 deltaPhiAngle="UX852CableHeadOuterHoleDeltaPhi"/>
-          <position/>
-        </shape>
-      </volume>
-
-
-      <volume name="lvUX852FutureFibreCableHeadFittingBoreSph" material="Pipe:Celazole">
-        <shape type="BooleanShape" operation="subtraction" name="UX852FutureFibreCableHeadFittingBoreSphSub">
-          <sphere name="UX852FutureFibreCableHeadFittingBoreSph"
-                  rmax="UX852CableHeadSphereRadius"/>
-          <shape type="Tube" name="UX852FutureFibreCableHeadTubsSub"
-                 rmax="UX852CableHeadInnerRadius"
-                 dz="0.5*UX852CableHeadHoleLargeZSize"/>
-          <position/>
-        </shape>
-      </volume>
-
-
-      <!-- start  place holder. not used -->
-      <!--
-          <volume name="lvUX852FutureFibreCableHeadCentralPinCyl" material="Pipe:Celazole">
-
-<shape type="Tube" name="UX852CableHeadCentralPinTub"
-dz="0.5*UX852CableHeadCentralPinThickness"
-rmax="UX852CableHeadCentralPinRadius"/>
-
-</volume>
-      -->
-      <!-- end  place holder. not used -->
-
-      <volume name="lvUX852FutureFibreCableHeadDemiCableCylSideA" material="Pipe:FutureFibre">
-        <shape type="BooleanShape" operation="subtraction" name="UX852FutureFibreCableHeadDemiCableSubSideA" >
-          <shape type="Tube" name="UX852FutureFibreCableHeadDemiCableTubSideA"
-                 dz="0.5*UX852CableHeadDemiCableLength"
-                 rmax="UX852CableHeadDemiCableRadius"/>
-          <shape type="Box" name="UX852FutureFibreCableHeadDemiCableBoxSubSideA"
-                 dx="0.5*UX852CableHeadDemiCableSubBoxLargeXSize"
-                 dy="0.5*UX852CableHeadDemiCableSubBoxLargeYSize"
-                 dz="0.5*UX852CableHeadDemiCableSubBoxLargeZSize"/>
-          <position z="UX852CableHeadDemiCableSubBoxPosZ"/>
-          <rotation y="UX852CableHeadDemiCableSubBoxTilt"/>
-          <shape type="Box" name="UX852FutureFibreCableHeadDemiCableBoxSubFarEndSideA"
-                 dx="0.5*UX852CableHeadDemiCableSubBoxLargeXSize"
-                 dy="0.5*UX852CableHeadDemiCableSubBoxLargeYSize"
-                 dz="0.5*UX852CableHeadDemiCableSubBoxLargeZSize"/>
-          <position z="UX852CableHeadDemiCableSubBoxFarEndPosZ"/>
-          <rotation y="-UX852CableHeadDemiCableSubBoxTilt"/>
-        </shape>
-      </volume>
-      <volume name="lvUX852FutureFibreCableHeadDemiCableCylSideB" material="Pipe:FutureFibre">
-        <shape type="BooleanShape" operation="subtraction" name="UX852FutureFibreCableHeadDemiCableSubSideB" >
-          <shape type="Tube" name="UX852FutureFibreCableHeadDemiCableTubSideB"
-                 dz="0.5*UX852CableHeadDemiCableLength"
-                 rmax="UX852CableHeadDemiCableRadius"/>
-          <shape type="Box" name="UX852FutureFibreCableHeadDemiCableBoxSubSideB"
-                 dx="0.5*UX852CableHeadDemiCableSubBoxLargeXSize"
-                 dy="0.5*UX852CableHeadDemiCableSubBoxLargeYSize"
-                 dz="0.5*UX852CableHeadDemiCableSubBoxLargeZSize"/>
-          <position z="UX852CableHeadDemiCableSubBoxPosZ"/>
-          <rotation y="-UX852CableHeadDemiCableSubBoxTilt"/>
-
-          <shape type="Box" name="UX852FutureFibreCableHeadDemiCableBoxSubFarEndSideB"
-                 dx="0.5*UX852CableHeadDemiCableSubBoxLargeXSize"
-                 dy="0.5*UX852CableHeadDemiCableSubBoxLargeYSize"
-                 dz="0.5*UX852CableHeadDemiCableSubBoxLargeZSize"/>
-          <position z="UX852CableHeadDemiCableSubBoxFarEndPosZ"/>
-          <rotation y="UX852CableHeadDemiCableSubBoxTilt"/>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852FutureFibreCableHeadWithoutPin">
-        <physvol name="pvUX852FutureFibreCableHeadOuterCylWithoutPin"        volume="lvUX852FutureFibreCableHeadOuterCyl"/>
-        <physvol name="pvUX852FutureFibreCableHeadFittingBoreSphWithoutPin"  volume="lvUX852FutureFibreCableHeadFittingBoreSph"/>
-        <physvol name="pvUX852FutureFibreCableHeadDemiCableCylSideAWithoutPin"
-                 volume="lvUX852FutureFibreCableHeadDemiCableCylSideA" >
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadDemiCableSideBRotX"/>
-
-            <position x="UX852CableHeadDemiCableSideAPosX"
-                      y="UX852CableHeadDemiCablePosY"/>
-            <rotation z="UX852CableHeadDemiCableTiltAngle"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCableHeadDemiCableCylSideBWithoutPin"
-                 volume="lvUX852FutureFibreCableHeadDemiCableCylSideB" >
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadDemiCableSideBRotX"/>
-            <position x="UX852CableHeadDemiCableSideBPosX"
-                      y="UX852CableHeadDemiCablePosY"/>
-            <rotation z="-UX852CableHeadDemiCableTiltAngle"/>
-          </transformation>
-
-        </physvol>
-      </volume>
-
-
-      <!-- End Cable attachment from 2015 June -->
-
-      <!-- UX852 Cables from 2015 -->
-
-      <!-- UX852 backward -->
-      <volume name="lvUX852FutureFibreCable03" material="Pipe:FutureFibre">
-        <shape type="Tube" name="UX85-2-FutureFibre-Cable-03-Tub"
-               dz="0.5*UX852FutureFibreCable03ReducedLength"
-               rmax="UX852FutureFibreCable03Radius"/>
-      </volume>
-
-      <!-- UX852 Forward -->
-      <volume name="lvUX852TechnoraCable04" material="Pipe:Technora">
-        <shape type="Tube" name="UX85-2-Technora-Cable-04-Tub"
-               dz="0.5*UX852TechnoraCable04ReducedLength"
-               rmax="UX852TechnoraCable04Radius"/>
-      </volume>
-
-      <!-- UX853 Backward  Vertical -->
-      <volume name="lvUX853FutureFibreCable05"  material="Pipe:FutureFibre">
-        <shape type="Tube" name="UX85-3-FutureFibre-Cable-05-Tub"
-               dz="0.5*UX853FutureFibreCable05ReducedLength"
-               rmax="UX853FutureFibreCable05Radius"/>
-      </volume>
-
-
-      <!-- UX853 Backward  Horizontal -->
-      <volume name="lvUX853FutureFibreCable06"  material="Pipe:FutureFibre">
-        <shape type="Tube" name="UX85-3-FutureFibre-Cable-06-Tub"
-               dz="0.5*UX853FutureFibreCable06ReducedLength"
-               rmax="UX853FutureFibreCable06Radius"/>
-      </volume>
-
-
-
-      <!-- UX853 Forward Vertical -->
-      <volume name="lvUX853TechnoraCable07"  material="Pipe:Technora">
-        <shape type="Tube" name="UX85-3-Technora-Cable-07-Tub"
-               dz="0.5*UX853TechnoraCable07ReducedLength"
-               rmax="UX853TechnoraCable07Radius"/>
-      </volume>
-
-      <!-- UX853 Forward Horizontal -->
-      <volume name="lvUX853TechnoraCable08"  material="Pipe:Technora">
-        <shape type="Tube" name="UX85-3-Technora-Cable-08-Tub"
-               dz="0.5*UX853TechnoraCable08ReducedLength"
-               rmax="UX853TechnoraCable08Radius"/>
-      </volume>
-
-      <!-- End UX852 Cables from 2015 -->
-      <volume name="lvUX852FwdAttRod" material="Pipe:Al6082">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-2-FwdAttRodSub">
-          <shape type="Tube" name="UX85-2-FwdAttRod"
-                 dz="0.5*UX852FwdCableAttRodLength"
-                 rmax="UX852FwdCableAttRodHeadRad"
-                 rmin="UX852FwdCableAttRodInnerHoleRad"/>
-          <shape type="Tube" name="UX85-2-FwdAttRod-CutLeft"
-                 dz="0.5*UX852FwdCableAttRodCutLength"
-                 rmin="UX852FwdCableAttRodCutRad"
-                 rmax="UX852FwdCableAttRodRad + 10.00*mm"/>
-          <position z="0.5*(UX852FwdCableAttRodLength + UX852FwdCableAttRodCutLength) - UX852FwdCableAttRodCutZpos"/>
-          <rotation/>
-
-          <shape type="Tube" name="UX85-2-FwdAttRod-MainPart"
-                 dz="0.5*UX852FwdCableAttRodManPartLargeLength"
-                 rmax="UX852FwdCableAttRodRad + 10*mm"
-                 rmin="UX852FwdCableAttRodRad"/>
-
-          <position z="UX852FwdCableAttRodManPartPosZ"/>
-          <rotation/>
-
-        </shape>
-      </volume>
-
-      <volume name="lvUX852BckAttRod" material="Pipe:Al6082">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-2-BckAttRodSub">
-          <shape type="Tube" name="UX85-2-BckAttRod"
-                 dz="0.5*UX852BckCableAttRodLength"
-                 rmax="UX852BckCableAttRodHeadRad"
-                 rmin="UX852BckCableAttRodInnerHoleRad"/>
-          <shape type="Tube" name="UX85-2-BckAttRod-CutLeft"
-                 dz="0.5*UX852BckCableAttRodCutLength"
-                 rmin="UX852BckCableAttRodCutRad"
-                 rmax="UX852BckCableAttRodRad + 10.00*mm"/>
-
-          <position z="0.5*(UX852BckCableAttRodLength + UX852BckCableAttRodCutLength) - UX852BckCableAttRodCutZpos"/>
-          <rotation/>
-
-
-          <shape type="Tube" name="UX85-2-BckAttRod-MainPart"
-                 dz="0.5*UX852BckCableAttRodManPartLargeLength"
-                 rmax="UX852BckCableAttRodRad + 10*mm"
-                 rmin="UX852BckCableAttRodRad"/>
-
-          <position z="UX852BckCableAttRodManPartPosZ"/>
-          <rotation/>
-
-
-        </shape>
-      </volume>
-
-      <volume name="lvUX852BckFAAttRod" material="Pipe:Al6082">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-2-BckFAAttRodSub">
-          <shape type="Tube" name="UX85-2-BckFAAttRod"
-                 dz="0.5*UX852BckFACableAttRodLength"
-                 rmax="UX852BckFACableAttRodHeadRad"
-                 rmin="UX852BckFACableAttRodInnerHoleRad"/>
-          <shape type="Tube" name="UX85-2-BckFAAttRod-CutLeft"
-                 dz="0.5*UX852BckFACableAttRodCutLength"
-                 rmin="UX852BckFACableAttRodCutRad"
-                 rmax="UX852BckFACableAttRodRad + 10.00*mm"/>
-
-          <position z="0.5*(UX852BckFACableAttRodLength + UX852BckFACableAttRodCutLength) - UX852BckFACableAttRodCutZpos"/>
-          <rotation/>
-          <shape type="Tube" name="UX85-2-BckFAAttRod-MainPart"
-                 dz="0.5*UX852BckFACableAttRodManPartLargeLength"
-                 rmax="UX852BckFACableAttRodRad + 10*mm"
-                 rmin="UX852BckFACableAttRodRad"/>
-
-          <position z="UX852BckFACableAttRodManPartPosZ"/>
-          <rotation/>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852TechnoraCableHeadTypeA" >
-        <physvol name="pvUX852TechnoraCableHeadCylTypeA"                 volume="lvUX852TechnoraCableHeadTypeACyl"/>
-        <physvol name="pvUX852TechnoraCableHeadCentralPinCylTypeA"       volume="lvUX852BckFAAttRod"/>
-        <physvol name="pvUX852TechnoraCableHeadDemiCableSideATypeA"      volume="lvUX852TechnoraCableHeadDemiCable" >
-          <position x="UX852TechnoraCableHeadDemiCableSideAPosX"         y="UX852TechnoraCableHeadDemiCableSidePosY"/>
-          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
-        </physvol>
-        <physvol name="pvUX852TechnoraCableHeadDemiCableSideBTypeA"      volume="lvUX852TechnoraCableHeadDemiCable" >
-          <position x="UX852TechnoraCableHeadDemiCableSideBPosX"         y="UX852TechnoraCableHeadDemiCableSidePosY"/>
-          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
-        </physvol>
-      </volume>
-
-      <volume name="lvUX852TechnoraCableHeadTypeB" >
-        <physvol name="pvUX852TechnoraCableHeadTypeBCyl"                 volume="lvUX852TechnoraCableHeadTypeBCyl"/>
-        <physvol name="pvUX852TechnoraCableHeadCentralPinCylTypeB"       volume="lvUX852BckFAAttRod"/>
-        <physvol name="pvUX852TechnoraCableHeadDemiCableSideATypeB"      volume="lvUX852TechnoraCableHeadDemiCable" >
-          <position x="UX852TechnoraCableHeadDemiCableSideAPosX"         y="UX852TechnoraCableHeadDemiCableSidePosY"/>
-          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCableHeadDemiCableSideBTypeB"      volume="lvUX852TechnoraCableHeadDemiCable" >
-          <position x="UX852TechnoraCableHeadDemiCableSideBPosX"         y="UX852TechnoraCableHeadDemiCableSidePosY"/>
-          <rotation x="UX852TechnoraCableHeadDemiCableRotX"/>
-        </physvol>
-      </volume>
-
-      <volume name="lvUX852FutureFibreCableHead">
-        <physvol name="pvUX852FutureFibreCableHeadOuterCyl"                 volume="lvUX852FutureFibreCableHeadOuterCyl"/>
-        <physvol name="pvUX852FutureFibreCableHeadFittingBoreSph"           volume="lvUX852FutureFibreCableHeadFittingBoreSph"/>
-        <physvol name="pvUX852FutureFibreCableHeadCentralPinCyl"            volume="lvUX852BckFAAttRod"/>
-        <physvol name="pvUX852FutureFibreCableHeadDemiCableCylSideA"        volume="lvUX852FutureFibreCableHeadDemiCableCylSideA">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadDemiCableSideBRotX"/>
-            <position x="UX852CableHeadDemiCableSideAPosX"
-                      y="UX852CableHeadDemiCablePosY"/>
-            <rotation z="UX852CableHeadDemiCableTiltAngle"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCableHeadDemiCableCylSideB"        volume="lvUX852FutureFibreCableHeadDemiCableCylSideB">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadDemiCableSideBRotX"/>
-            <position x="UX852CableHeadDemiCableSideBPosX"                  y="UX852CableHeadDemiCablePosY"/>
-            <rotation z="-UX852CableHeadDemiCableTiltAngle"/>
-          </transformation>
-        </physvol>
-      </volume>
-
-
-      <!-- UX852 Collar Clips -->
-      <!-- Now for the collar clips from June 2015 -->
-      <volume name="lvUX852CollarClipSmallSectSF" material="Pipe:Celazole">
-        <shape type="BooleanShape" operation="subtraction" name="ClipSmallSectSubSF">
-          <shape type="Tube" name="UX85-2-CollarClipSmallSectSF"
-                 dz="0.5*UX852CollarClipRing1Length"
-                 rmin="UX852CollarClipRing1InnerRad"
-                 rmax="UX852CollarClipRing1OuterRad"
-                 deltaPhiAngle="UX852CollarClipSFDeltaPhi-0.5*UX852CollarGapSFDeltaPhi"
-                 startPhiAngle="UX852CollarClipSFStartPhi"/>
-          <shape type="Tube" name="UX85-2-CollarClipSmallHole1SF"
-                 dz="0.5*UX852CollarClipHolesLength"
-                 rmax="UX852CollarClipHolesRad"/>
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="-1.0*UX852CollarClipHolesSFDeltaPhi"/>
-          <shape type="Tube" name="UX85-2-CollarClipSmallHole2SF"
-                 dz="0.5*UX852CollarClipHolesLength"
-                 rmax="UX852CollarClipHolesRad"/>
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="0.0*rad"/>
-          <shape type="Tube" name="UX85-2-CollarClipSmallHole3SF"
-                 dz="0.5*UX852CollarClipHolesLength"
-                 rmax="UX852CollarClipHolesRad"/>
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="1.0*UX852CollarClipHolesSFDeltaPhi"/>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852CollarClipBigSectSF" material="Pipe:Celazole">
-        <shape type="BooleanShape" operation="subtraction" name="ClipBigSectSubSF">
-          <shape type="Tube" name="UX85-2-CollarClipBigSectSF"
-                 dz="0.5*UX852CollarClipRing2Length"
-                 rmin="UX852CollarClipRing2InnerRad"
-                 rmax="UX852CollarClipRing2OuterRad"
-                 deltaPhiAngle="UX852CollarClipSFDeltaPhi-0.5*UX852CollarGapSFDeltaPhi"
-                 startPhiAngle="UX852CollarClipSFStartPhi"/>
-
-          <shape type="Tube" name="UX85-2-CollarClipBigHole1SF"
-                 dz="0.5*UX852CollarClipHolesLength"
-                 rmax="UX852CollarClipHolesRad"/>
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="-1.0*UX852CollarClipHolesSFDeltaPhi"/>
-
-          <shape type="Tube" name="UX85-2-CollarClipBigHole2SF"
-                 dz="0.5*UX852CollarClipHolesLength"
-                 rmax="UX852CollarClipHolesRad"/>
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="0.0*rad"/>
-
-          <shape type="Tube" name="UX85-2-CollarClipBigHole3SF"
-                 dz="0.5*UX852CollarClipHolesLength"
-                 rmax="UX852CollarClipHolesRad"/>
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="1.0*UX852CollarClipHolesSFDeltaPhi"/>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852CollarClipScrew"  material="Pipe:TitaniumG5" >
-        <shape type="BooleanShape" operation="subtraction" name="UX852CollarClipScrewSubSF" >
-          <shape type="Tube" name="UX852CollarClipScrewSFTubs"
-                 dz="0.5*UX852CollarClipHoleScrewLength"
-                 rmax="UX852CollarClipHoleScrewHeadRad"/>
-          <shape type="Tube" name="UX852CollarClipScrewSFSubtractTubs"
-                 dz="0.5*UX852CollarClipHoleScrewSubLargeLength"
-                 rmin="UX852CollarClipHoleScrewRad"
-                 rmax="UX852CollarClipHoleScrewSubLargeRadius"/>
-          <position z="UX852CollarClipHoleScrewSubPosZ"/>
-        </shape>
-      </volume>
-
-      <volume name="lvUX852CollarClip">
-        <physvol name="pvUX852CollarClipSmallSect1SF"                 volume="lvUX852CollarClipSmallSectSF">
-          <position z="- 0.5*UX852CollarClipRing1Length "/>
-          <rotation z="UX852CollarClipSFPosStartPhi"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarClipSmallSect2SF"                 volume="lvUX852CollarClipSmallSectSF">
-          <position z="- 0.5*UX852CollarClipRing1Length"/>
-          <rotation z="UX852CollarClipSFPosStartPhi+ UX852CollarClipSFDeltaPhi"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarClipSmallSect3SF"                 volume="lvUX852CollarClipSmallSectSF">
-          <position z="- 0.5*UX852CollarClipRing1Length"/>
-          <rotation z="UX852CollarClipSFPosStartPhi+  2*UX852CollarClipSFDeltaPhi"/>
-        </physvol>
-
-
-        <physvol name="pvUX852CollarClipBigSect1SF"                   volume="lvUX852CollarClipBigSectSF">
-          <position z="- UX852CollarClipRing1Length - 0.5*UX852CollarClipRing2Length"/>
-          <rotation z="UX852CollarClipSFPosStartPhi"/>
-        </physvol>
-
-
-        <physvol name="pvUX852CollarClipBigSect2SF"                   volume="lvUX852CollarClipBigSectSF">
-          <position z="- UX852CollarClipRing1Length - 0.5*UX852CollarClipRing2Length"/>
-          <rotation z="UX852CollarClipSFPosStartPhi + UX852CollarClipSFDeltaPhi"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarClipBigSect3SF"                   volume="lvUX852CollarClipBigSectSF">
-          <position z="- UX852CollarClipRing1Length - 0.5*UX852CollarClipRing2Length"/>
-          <rotation z="UX852CollarClipSFPosStartPhi + 2*UX852CollarClipSFDeltaPhi"/>
-        </physvol>
-      </volume>
-
-      <!-- UX852Cables -->
-      <!--
-          <volume name="lvUX852FixCollarCable03" material="Pipe:Steel316LN">
-          <shape type="Tube" name="UX85-2-FixCollar-Cable-03"
-          dz="0.5*UX852FixCollarCable03Lenght"
-          rmax="UX852FixCollarCable03Radius"/>
-          </volume>
-
-<volume name="lvUX852FixCollarCable04" material="Pipe:Steel316LN">
-<shape type="Tube" name="UX85-3-FixCollar-Cable-04"
-dz="0.5*UX852FixCollarCable04Lenght"
-rmax="UX852FixCollarCable04Radius"/>
-</volume>
-
-<volume name="lvUX852FixCollarCable08" material="Pipe:Steel316LN">
-<shape type="Tube" name="UX85-2-FixCollar-Cable-08"
-dz="0.5*UX852FixCollarCable08Lenght"
-rmax="UX852FixCollarCable08Radius"/>
-</volume>
-      -->
-
-      <!-- *************************************************************************** -->
-      <!-- UX85-3 Fixed Point                                                          -->
-      <!-- *************************************************************************** -->
-      <volume name="lvUX853BigRingQuarter" material="Pipe:Beryllium">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-3-BigRingQuarter-Sub">
-          <shape type="Tube" name="UX853BigRingQuarter"
-                 dz="0.5*UX853FixCollarLength"
-                 rmin="UX853FixCollarInnerRad"
-                 rmax="UX853FixCollarAttOuterRad"
-                 deltaPhiAngle="UX853FixCollarDeltaPhi"
-                 startPhiAngle="UX853FixCollarPhiStart"/>
-          <shape type="Box" name="UX85-3-BigRingQuarter-Slope"
-                 dx="0.5*UX853BigRingQuarterSlopeXsize"
-                 dy="0.5*UX853BigRingQuarterSlopeYsize"
-                 dz="0.5*(UX853FixCollarLength+0.5*mm)"/>
-          <transformation>
-            <position/>
-            <rotation z="UX853BigRingQuarterSlopeZrot"/>
-            <position/>
-            <rotation/>
-            <positionRPhiZ r="0.5*(UX853FixCollarAttOuterRad+UX853FixCollarOuterRad+UX853BigRingQuarterSlopeYsize)-4.5*mm" phi="UX853BigRingQuarterSlopePhipos"/>
-          </transformation>
-          <shape type="Box" name="UX85-3-BigRingQuarter-Slope2"
-                 dx="0.5*UX853BigRingQuarterSlopeXsize"
-                 dy="0.5*UX853BigRingQuarterSlopeYsize"
-                 dz="0.5*(UX853FixCollarLength+0.5*mm)"/>
-          <transformation>
-            <position/>
-            <rotation z="UX853BigRingQuarterSlopeZrot+5*degree"/>
-            <position/>
-            <rotation/>
-            <positionRPhiZ r="0.5*(UX853FixCollarAttOuterRad+UX853FixCollarOuterRad+UX853BigRingQuarterSlopeYsize)-9.5*mm" phi="UX853BigRingQuarterSlope2Phipos"/>
-          </transformation>
-          <shape type="Tube" name="UX853BigRingCircleCut1"
-                 dz="0.5*(UX853FixCollarLength + 0.5*mm)"
-                 rmin="UX853FixCollarOuterRad"
-                 rmax="UX853FixCollarAttOuterRad + 5*mm"
-                 startPhiAngle="UX853FixCollarPhiStart - 1*degree"
-                 deltaPhiAngle="0.25*UX853FixCollarCircleCutDeltaPhi + 1*degree"/>
-          <shape type="Tube" name="UX853BigRingCircleCut2"
-                 dz="0.5*(UX853FixCollarLength + 0.5*mm)"
-                 rmin="UX853FixCollarOuterRad"
-                 rmax="UX853FixCollarAttOuterRad + 5*mm"
-                 startPhiAngle="UX853FixCollarPhiStart +UX853FixCollarDeltaPhi - 0.75*UX853FixCollarCircleCutDeltaPhi "
-                 deltaPhiAngle="0.75*UX853FixCollarCircleCutDeltaPhi + 1*degree"/>
-          <shape type="Tube" name="UX853BigRingTransHole1"
-                 dz="0.5*UX853FixCollarTransHoleLength"
-                 rmax="UX853FixCollarTransHoleRad"/>
-          <transformation>
-            <position/>
-            <rotation x="90*degree"/>
-            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos"/>
-            <rotation z="45*degree"/>
-          </transformation>
-          <shape type="Tube" name="UX853BigRingTransHole2a"
-                 dz="0.5*UX853FixCollarTransHoleLength"
-                 rmax="UX853FixCollarTransHoleRad"/>
-          <transformation>
-            <position/>
-            <rotation x="90*degree"/>
-            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos+7*degree"/>
-            <rotation z="45*degree+7*degree"/>
-          </transformation>
-          <shape type="Box" name="UX853BigRingTransHole2b"
-                 dz="0.5*UX853FixCollarTransHoleLength"
-                 dx="0.5*2*UX853FixCollarTransHoleRad"
-                 dy="0.5*2*UX853FixCollarTransHoleRad"/>
-          <transformation>
-            <position/>
-            <rotation x="90*degree"/>
-            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos+9.5*degree"/>
-            <rotation z="45*degree+9.5*degree"/>
-          </transformation>
-          <shape type="Tube" name="UX853BigRingTransHole2c"
-                 dz="0.5*UX853FixCollarTransHoleLength"
-                 rmax="UX853FixCollarTransHoleRad"/>
-          <transformation>
-            <position/>
-            <rotation x="90*degree"/>
-            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos+13*degree"/>
-            <rotation z="45*degree+13*degree"/>
-          </transformation>
-          <shape type="Tube" name="UX853BigRingTransHole2d"
-                 dz="0.5*UX853FixCollarTransHoleLength"
-                 rmax="UX853FixCollarTransHoleRad"/>
-          <transformation>
-            <position/>
-            <rotation x="90*degree"/>
-            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarPhiStart+1*degree"/>
-            <rotation z="90*degree+45*degree+13*degree"/>
-          </transformation>
-          <shape type="Tube" name="UX853BigRingTransHole3a"
-                 dz="0.5*UX853FixCollarTransHoleLength"
-                 rmax="UX853FixCollarTransHoleRad"/>
-          <transformation>
-            <position/>
-            <rotation x="90*degree"/>
-            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos-7*degree"/>
-            <rotation z="45*degree-7*degree"/>
-          </transformation>
-          <shape type="Box" name="UX853BigRingTransHole3b"
-                 dz="0.5*UX853FixCollarTransHoleLength"
-                 dx="0.5*2*UX853FixCollarTransHoleRad"
-                 dy="0.5*2*UX853FixCollarTransHoleRad"/>
-          <transformation>
-            <position/>
-            <rotation x="90*degree"/>
-            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos-9.5*degree"/>
-            <rotation z="45*degree-9.5*degree"/>
-          </transformation>
-          <shape type="Tube" name="UX853BigRingTransHole3c"
-                 dz="0.5*UX853FixCollarTransHoleLength"
-                 rmax="UX853FixCollarTransHoleRad"/>
-          <transformation>
-            <position/>
-            <rotation x="90*degree"/>
-            <positionRPhiZ r="UX853FixCollarTransHoleRpos" phi="UX853FixCollarTransHolePhipos-13*degree"/>
-            <rotation z="45*degree-13*degree"/>
-          </transformation>
-        </shape>
-      </volume>
-
-      <volume name="lvUX853InnerRing" material="Pipe:Beryllium">
-        <shape type="Tube" name="UX85-3-InnerRing"
-               dz="0.5*UX853FixCollarRingLength"
-               rmin="UX853FixCollarRingInnerRad"
-               rmax="UX853FixCollarRingOuterRad"/>
-      </volume>
-
-      <!-- UX853 Fix Collar -->
-      <volume name="lvUX853FixCollar">
-        <physvol name="pvUX853InnerRing"                       volume="lvUX853InnerRing">
-          <position z="UX853FixCollarZpos"/>
-        </physvol>
-
-        <physvol name="pvUX853BigRingQuarter1"                 volume="lvUX853BigRingQuarter">
-          <position z="UX853FixCollarZpos"/>
-          <rotation/>
-        </physvol>
-
-        <physvol name="pvUX853BigRingQuarter2"                 volume="lvUX853BigRingQuarter">
-          <position z="UX853FixCollarZpos"/>
-          <rotation z="UX853FixCollarQuarterRot"/>
-        </physvol>
-
-        <physvol name="pvUX853BigRingQuarter3"                 volume="lvUX853BigRingQuarter">
-          <position z="UX853FixCollarZpos"/>
-          <rotation z="2*UX853FixCollarQuarterRot"/>
-        </physvol>
-
-        <physvol name="pvUX853BigRingQuarter4"                 volume="lvUX853BigRingQuarter">
-          <position z="UX853FixCollarZpos"/>
-          <rotation z="3*UX853FixCollarQuarterRot"/>
-        </physvol>
-      </volume>
-
-      <!-- UX853 Collar Clips -->
-      <volume name="lvUX853CollarClipSmallSectSF" material="Pipe:Celazole">
-        <shape type="BooleanShape" operation="subtraction" name="UX853ClipSmallSectSubSF">
-          <shape type="Tube" name="UX85-3-CollarClipSmallSect"
-                 dz="0.5*UX853CollarClipRing1Length"
-                 rmin="UX853CollarClipRing1InnerRad"
-                 rmax="UX853CollarClipRing1OuterRad"
-                 deltaPhiAngle="UX853CollarClipSFDeltaPhi-0.5*UX853CollarGapSFDeltaPhi"
-                 startPhiAngle="UX853CollarClipSFStartPhi"/>
-          <shape type="Tube" name="UX85-3-CollarClipSmallHole1SF"
-                 dz="0.5*UX853CollarClipHolesLength"
-                 rmax="UX853CollarClipHolesRad"/>
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="-1.5*UX853CollarClipHolesDeltaPhiSF"/>
-          <shape type="Tube" name="UX85-3-CollarClipSmallHole2SF"
-                 dz="0.5*UX853CollarClipHolesLength"
-                 rmax="UX853CollarClipHolesRad"/>
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="-0.5*UX853CollarClipHolesDeltaPhiSF"/>
-          <shape type="Tube" name="UX85-3-CollarClipSmallHole3SF"
-                 dz="0.5*UX853CollarClipHolesLength"
-                 rmax="UX853CollarClipHolesRad"/>
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="0.5*UX853CollarClipHolesDeltaPhiSF"/>
-          <shape type="Tube" name="UX85-3-CollarClipSmallHole4"
-                 dz="0.5*UX853CollarClipHolesLength"
-                 rmax="UX853CollarClipHolesRad"/>
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="1.5*UX853CollarClipHolesDeltaPhiSF"/>
-        </shape>
-      </volume>
-
-      <volume name="lvUX853CollarClipBigSectSF" material="Pipe:Celazole">
-        <shape type="BooleanShape" operation="subtraction" name="UX853ClipBigSectSubSF">
-          <shape type="Tube" name="UX85-3-CollarClipBigSect"
-                 dz="0.5*UX853CollarClipRing2Length"
-                 rmin="UX853CollarClipRing2InnerRad"
-                 rmax="UX853CollarClipRing2OuterRad"
-                 deltaPhiAngle="UX853CollarClipSFDeltaPhi-0.5*UX853CollarGapSFDeltaPhi"
-                 startPhiAngle="UX853CollarClipSFStartPhi"/>
-
-          <shape type="Tube" name="UX85-3-CollarClipBigHole1SF"
-                 dz="0.5*UX853CollarClipHolesLength"
-                 rmax="UX853CollarClipHolesRad"/>
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="-1.5*UX853CollarClipHolesDeltaPhiSF"/>
-
-          <shape type="Tube" name="UX85-3-CollarClipBigHole2SF"
-                 dz="0.5*UX853CollarClipHolesLength"
-                 rmax="UX853CollarClipHolesRad"/>
-          <positionRPhiZ   r="UX853CollarClipHolesRpos"
-                           phi="-0.5*UX853CollarClipHolesDeltaPhiSF"/>
-
-          <shape type="Tube" name="UX85-3-CollarClipBigHole3SF"
-                 dz="0.5*UX853CollarClipHolesLength"
-                 rmax="UX853CollarClipHolesRad"/>
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="0.5*UX853CollarClipHolesDeltaPhiSF"/>
-          <shape type="Tube" name="UX85-3-CollarClipBigHole4SF"
-                 dz="0.5*UX853CollarClipHolesLength"
-                 rmax="UX853CollarClipHolesRad"/>
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="1.5*UX853CollarClipHolesDeltaPhiSF"/>
-
-        </shape>
-      </volume>
-
-      <volume name="lvUX853CollarClipScrew"  material="Pipe:TitaniumG5" >
-        <shape type="BooleanShape" operation="subtraction" name="UX853CollarClipScrewSubSF" >
-          <shape type="Tube" name="UX853CollarClipScrewSFTubs"
-                 dz="0.5*UX853CollarClipHoleScrewLength"
-                 rmax="UX853CollarClipHoleScrewHeadRad"/>
-          <shape type="Tube" name="UX853CollarClipScrewSFSubtractTubs"
-                 dz="0.5*UX853CollarClipHoleScrewSubLargeLength"
-                 rmin="UX853CollarClipHoleScrewRad"
-                 rmax="UX853CollarClipHoleScrewSubLargeRadius"/>
-          <position z="UX853CollarClipHoleScrewSubPosZ"/>
-        </shape>
-      </volume>
-
-      <volume name="lvUX853CollarClip">
-        <physvol name="pvUX853CollarClipSmallSect1SF"                 volume="lvUX853CollarClipSmallSectSF">
-          <position z="- 0.5*UX853CollarClipRing1Length"/>
-          <rotation z="UX853CollarClipHolesDeltaPhiSF"/>
-        </physvol>
-        <physvol name="pvUX853CollarClipSmallSect2SF"                 volume="lvUX853CollarClipSmallSectSF">
-          <position z="- 0.5*UX853CollarClipRing1Length"/>
-          <rotation z="UX853CollarClipSFDeltaPhi+UX853CollarClipHolesDeltaPhiSF"/>
-        </physvol>
-        <physvol name="pvUX853CollarClipSmallSect3SF"                 volume="lvUX853CollarClipSmallSectSF">
-          <position z="- 0.5*UX853CollarClipRing1Length"/>
-          <rotation z="2*UX853CollarClipSFDeltaPhi+UX853CollarClipHolesDeltaPhiSF"/>
-        </physvol>
-        <physvol name="pvUX853CollarClipBigSect1SF"                   volume="lvUX853CollarClipBigSectSF">
-          <position z="- UX853CollarClipRing1Length - 0.5*UX853CollarClipRing2Length"/>
-          <rotation z="UX853CollarClipHolesDeltaPhiSF"/>
-        </physvol>
-        <physvol name="pvUX853CollarClipBigSect2SF"                   volume="lvUX853CollarClipBigSectSF">
-          <position z="- UX853CollarClipRing1Length - 0.5*UX853CollarClipRing2Length"/>
-          <rotation z="UX853CollarClipSFDeltaPhi+UX853CollarClipHolesDeltaPhiSF"/>
-        </physvol>
-        <physvol name="pvUX853CollarClipBigSect3SF"                   volume="lvUX853CollarClipBigSectSF">
-          <position z="- UX853CollarClipRing1Length - 0.5*UX853CollarClipRing2Length"/>
-          <rotation z="2*UX853CollarClipSFDeltaPhi+UX853CollarClipHolesDeltaPhiSF"/>
-        </physvol>
-      </volume>
-
-      <!-- UX85-3 Cable Attacments -->
-      <!-- In the Collar Part -->
-      <volume name="lvUX853CollarAtt" material="Pipe:Beryllium">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-3-CollarAttMainSub">
-          <shape type="Box" name="UX85-3-CollarAttMain"
-                 dx="0.5*UX853CollarAttMainPartXsize"
-                 dy="0.5*UX853CollarAttMainPartYsize"
-                 dz="0.5*UX853CollarAttMainPartZsize"/>
-          <shape type="Box" name="UX85-3-CollarAttMainSub1"
-                 dx="0.5*UX853CollarAttMainPartXsize"
-                 dy="0.5*(UX853CollarAttMainPartYsize+200*mm)"
-                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"/>
-          <transformation>
-            <positionRPhiZ r="UX853CollarAttSlope1RPos"/>
-            <rotation/>
-            <position y="UX853CollarAttSlope1Zpos"/>
-            <rotation y="0*degree" z="UX853CollarAttSlope1YRot"/>
-            <position/>
-          </transformation>
-          <shape type="Box" name="UX85-3-CollarAttMainSub2"
-                 dx="0.5*UX853CollarAttMainPartXsize"
-                 dy="0.5*UX853CollarAttMainPartYsize"
-                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"/>
-          <transformation>
-            <positionRPhiZ r="UX853CollarAttSlope2RPos"/>
-            <rotation/>
-            <position/>
-            <rotation z="UX853CollarAttSlope2YRot"/>
-            <position y="UX853CollarAttSlope2ZPos"/>
-          </transformation>
-          <shape type="Tube" name="UX85-3-CollarAttMain-Hole1"
-                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"
-                 rmax="UX853CollarAttMainHole1Rad"/>
-          <transformation>
-            <positionRPhiZ r="UX853CollarAttMainHole1RadPos"/>
-            <rotation/>
-            <position/>
-            <position y="UX853CollarAttMainHole1ZPos"/>
-            <rotation y="180*degree"/>
-            <position/>
-          </transformation>
-          <shape type="Tube" name="UX85-3-CollarAttMain-Hole2"
-                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"
-                 rmax="UX853CollarAttMainHole2Rad"/>
-          <transformation>
-            <positionRPhiZ r="UX853CollarAttMainHole2RadPos"/>
-            <rotation/>
-            <position y="UX853CollarAttMainHole2ZPos"/>
-          </transformation>
-          <shape type="Tube" name="UX85-3-CollarAttMain-RoundEdge1"
-                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"
-                 rmin="UX853CollarAttMainPartEdge1InnerRad"
-                 rmax="UX853CollarAttMainPartEdge1InnerRad+10*mm"
-                 startPhiAngle="UX853CollarAttMainPartEdge1StartPhi"
-                 deltaPhiAngle="UX853CollarAttMainPartEdge1DeltaPhi"/>
-          <transformation>
-            <positionRPhiZ r="UX853CollarAttMainHole1RadPos"/>
-            <rotation/>
-            <position y="UX853CollarAttMainHole1ZPos"/>
-            <rotation y="180*degree"/>
-          </transformation>
-          <shape type="Tube" name="UX85-3-CollarAttMain-RoundEdge2"
-                 dz="0.5*(UX853CollarAttMainPartZsize+0.5*mm)"
-                 rmin="UX853CollarAttMainPartEdge2InnerRad"
-                 rmax="UX853CollarAttMainPartEdge2InnerRad+10*mm"
-                 startPhiAngle="UX853CollarAttMainPartEdge2StartPhi"
-                 deltaPhiAngle="UX853CollarAttMainPartEdge2DeltaPhi"/>
-          <transformation>
-            <positionRPhiZ r="UX853CollarAttMainHole2RadPos"/>
-            <rotation/>
-            <position y="UX853CollarAttMainHole2ZPos"/>
-          </transformation>
-        </shape>
-      </volume>
-
-      <!-- Forward Cable Att -->
-      <volume name="lvUX853FwdCableAtt" material="Pipe:AW2219">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-3-FwdCableAttMain-Sub">
-          <shape type="Tube" name="UX85-3-FwdCableAttMain"
-                 dz="0.5*UX853FwdCableAttMainLength"
-                 rmax="UX853FwdCableAttMainRad"/>
-          <shape type="Tube" name="UX85-3-FwdCableAttMainLongHole"
-                 dz="0.5*UX853FwdCableAttLongHoleLength"
-                 rmax="UX853FwdCableAttLongHoleRad"/>
-          <transformation>
-            <position z="0.5*(UX853FwdCableAttMainLength - UX853FwdCableAttLongHoleLength) + 1.00*mm"/>
-          </transformation>
-          <shape type="Box" name="UX85-3-FwdCableAttMainCut1-Left"
-                 dx="0.5*UX853FwdCableAttCut1SizeX"
-                 dy="0.5*UX853FwdCableAttCut1SizeY"
-                 dz="0.5*UX853FwdCableAttCut1SizeZ"/>
-          <transformation>
-            <position z="0.5*(-UX853FwdCableAttMainLength + UX853FwdCableAttCut1SizeZ) - 1.00*mm"
-                      x="UX853FwdCableAttMainRad - 0.5*UX853FwdCableAttCut1SizeX"/>
-          </transformation>
-          <shape type="Box" name="UX85-3-FwdCableAttMainCut1-Right"
-                 dx="0.5*UX853FwdCableAttCut1SizeX"
-                 dy="0.5*UX853FwdCableAttCut1SizeY"
-                 dz="0.5*UX853FwdCableAttCut1SizeZ"/>
-          <transformation>
-            <position z="0.5*(-UX853FwdCableAttMainLength + UX853FwdCableAttCut1SizeZ) - 1.00*mm"
-                      x="-UX853FwdCableAttMainRad + 0.5*UX853FwdCableAttCut1SizeX"/>
-          </transformation>
-          <shape type="Box" name="UX85-3-FwdCableAttMainCut2-Left"
-                 dx="0.5*UX853FwdCableAttCut2SizeX"
-                 dy="0.5*UX853FwdCableAttCut2SizeY"
-                 dz="0.5*UX853FwdCableAttCut2SizeZ"/>
-          <transformation>
-            <position z="0.5*(UX853FwdCableAttMainLength - UX853FwdCableAttCut2SizeZ) - UX853FwdCableAttCut2posZ"
-                      x="UX853FwdCableAttMainRad - 0.5*UX853FwdCableAttCut2SizeX"/>
-          </transformation>
-          <shape type="Box" name="UX85-3-FwdCableAttMainCut2-Right"
-                 dx="0.5*UX853FwdCableAttCut2SizeX"
-                 dy="0.5*UX853FwdCableAttCut2SizeY"
-                 dz="0.5*UX853FwdCableAttCut2SizeZ"/>
-          <transformation>
-            <position z="0.5*(UX853FwdCableAttMainLength - UX853FwdCableAttCut2SizeZ) - UX853FwdCableAttCut2posZ"
-                      x="-UX853FwdCableAttMainRad + 0.5*UX853FwdCableAttCut2SizeX"/>
-          </transformation>
-          <shape type="Tube" name="UX85-3-FwdCableAttMainHole"
-                 dz="0.5*2*UX853FwdCableAttMainRad"
-                 rmax="UX853FwdCableAttRingInnerRad"/>
-          <transformation>
-            <position/>
-            <rotation y="90*degree"/>
-            <position z="- 0.5*UX853FwdCableAttMainLength + UX853FwdCableAttRingOuterRad"/>
-          </transformation>
-          <shape type="Tube" name="UX85-3-FwdCableAttMainRing"
-                 dz="0.5*2*UX853FwdCableAttMainRad"
-                 rmin="UX853FwdCableAttRingOuterRad"
-                 rmax="UX853FwdCableAttRingOuterRad + 10.00*mm"
-                 deltaPhiAngle="UX853FwdCableAttRingDeltaAng"
-                 startPhiAngle="-0.5*UX853FwdCableAttRingDeltaAng"/>
-          <transformation>
-            <position/>
-            <rotation y="90*degree"/>
-            <position z="-0.5*UX853FwdCableAttMainLength + UX853FwdCableAttRingOuterRad"/>
-          </transformation>
-        </shape>
-      </volume>
-
-      <volume name="lvUX853FwdAttRod" material="Pipe:Al6082">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-3-FwdAttRodSub">
-          <shape type="Tube" name="UX85-3-FwdAttRod"
-                 dz="0.5*UX853FwdCableAttRodLength"
-                 rmax="UX853FwdCableAttRodHeadRad"
-                 rmin="UX853FwdCableAttRodInnerHoleRad"/>
-          <shape type="Tube" name="UX85-3-FwdAttRod-CutLeft"
-                 dz="0.5*UX853FwdCableAttRodCutLength"
-                 rmin="UX853FwdCableAttRodCutRad"
-                 rmax="UX853FwdCableAttRodRad + 10.00*mm"/>
-          <position z="0.5*(UX853FwdCableAttRodLength + UX853FwdCableAttRodCutLength) - UX853FwdCableAttRodCutZpos"/>
-          <rotation/>
-
-          <shape type="Tube" name="UX85-3-FwdAttRod-MainPart"
-                 dz="0.5*UX853FwdCableAttRodManPartLargeLength"
-                 rmax="UX853FwdCableAttRodRad + 10*mm"
-                 rmin="UX853FwdCableAttRodRad"/>
-
-          <position z="UX853FwdCableAttRodManPartPosZ"/>
-          <rotation/>
-
-        </shape>
-      </volume>
-
-      <!-- Backward Cable Att -->
-      <volume name="lvUX853BckAttRod" material="Pipe:Al6082">
-        <shape type="BooleanShape" operation="subtraction" name="UX85-3-BckAttRodSub">
-          <shape type="Tube" name="UX85-3-BckAttRod"
-                 dz="0.5*UX853BckCableAttRodLength"
-                 rmax="UX853BckCableAttRodHeadRad"
-                 rmin="UX853BckCableAttRodInnerHoleRad"/>
-          <shape type="Tube" name="UX85-3-BckAttRod-CutLeft"
-                 dz="0.5*UX853BckCableAttRodCutLength"
-                 rmin="UX853BckCableAttRodCutRad"
-                 rmax="UX853BckCableAttRodRad + 10.00*mm"/>
-
-          <position z="0.5*(UX853BckCableAttRodLength + UX853BckCableAttRodCutLength) - UX853BckCableAttRodCutZpos"/>
-          <rotation/>
-
-
-          <shape type="Tube" name="UX85-3-BckAttRod-MainPart"
-                 dz="0.5*UX853BckCableAttRodManPartLargeLength"
-                 rmax="UX853BckCableAttRodRad + 10*mm"
-                 rmin="UX853BckCableAttRodRad"/>
-
-          <position z="UX853BckCableAttRodManPartPosZ"/>
-          <rotation/>
-
-
-        </shape>
-      </volume>
-
-      <envelope type="Assembly" name="lvUX85SupportsInMagnet" vis="Pipe:Magnet">
-        <!-- UX85-1 Support -->
-        <physvol name="pvUX851Collar"                 volume="lvUX851Collar">
-          <position z="UX851CollarZpos"/>
-        </physvol>
-
-        <physvol name="pvUX851Cable01"                volume="lvUX851Cable">
-          <transformation>
-            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
-            <rotation x="90.0*degree" y="UX851CablePhiAngle" z="0.0*degree"/>
-            <position x="-UX851CableXYpos" y="UX851CableXYpos" z="UX851CableZpos"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX851Cable02"                volume="lvUX851Cable">
-          <transformation>
-            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
-            <rotation x="90.0*degree" y="-UX851CablePhiAngle" z="0.0*degree"/>
-            <position x="UX851CableXYpos" y="UX851CableXYpos" z="UX851CableZpos"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX851Cable03"                volume="lvUX851Cable">
-          <transformation>
-            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
-            <rotation x="90.0*degree" y="UX851CablePhiAngle" z="0.0*degree"/>
-            <position x="UX851CableXYpos" y="-UX851CableXYpos" z="UX851CableZpos"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX851Cable04"                 volume="lvUX851Cable">
-          <transformation>
-            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
-            <rotation x="90.0*degree" y="-UX851CablePhiAngle"
-                      z="0.0*degree"/>
-            <position x="-UX851CableXYpos" y="-UX851CableXYpos" z="UX851CableZpos"/>
-          </transformation>
-        </physvol>
-
-        <!-- UX85-2 Fixed point -->
-        <physvol name="pvUX852FixCollar"               volume="lvUX852FixCollar">
-          <transformation>
-            <position/>
-            <rotation z="UX852FixCollarZrot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852CollarClip1"             volume="lvUX852CollarClip">
-          <position z="UX852FixCollarZpos"/>
-        </physvol>
-
-        <physvol name="pvUX852CollarClip2"             volume="lvUX852CollarClip">
-          <transformation>
-            <position/>
-            <rotation y="180*degree"/>
-            <position z="UX852FixCollarZpos"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="lvUX852CollarClipScrew11"       volume="lvUX852CollarClipScrew">
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="UX852CollarClipSFPosStartPhi-UX852CollarClipHolesSFDeltaPhi"
-                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
-        </physvol>
-
-        <physvol name="lvUX852CollarClipScrew12"       volume="lvUX852CollarClipScrew">
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="UX852CollarClipSFPosStartPhi"
-                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX852CollarClipScrew13"       volume="lvUX852CollarClipScrew">
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="UX852CollarClipSFPosStartPhi+UX852CollarClipHolesSFDeltaPhi"
-                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
-
-        </physvol>
-
-        <physvol name="lvUX852CollarClipScrew21"       volume="lvUX852CollarClipScrew">
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="UX852CollarClipSFPosStartPhi+ UX852CollarClipSFDeltaPhi-UX852CollarClipHolesSFDeltaPhi"
-                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
-        </physvol>
-
-        <physvol name="lvUX852CollarClipScrew22"       volume="lvUX852CollarClipScrew">
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="UX852CollarClipSFPosStartPhi+ UX852CollarClipSFDeltaPhi"
-                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX852CollarClipScrew23"       volume="lvUX852CollarClipScrew">
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="UX852CollarClipSFPosStartPhi+ UX852CollarClipSFDeltaPhi +UX852CollarClipHolesSFDeltaPhi"
-                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
-        </physvol>
-
-
-        <physvol name="lvUX852CollarClipScrew31"        volume="lvUX852CollarClipScrew">
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="UX852CollarClipSFPosStartPhi+2* UX852CollarClipSFDeltaPhi-UX852CollarClipHolesSFDeltaPhi"
-                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
-        </physvol>
-
-        <physvol name="lvUX852CollarClipScrew32"        volume="lvUX852CollarClipScrew">
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="UX852CollarClipSFPosStartPhi+ 2* UX852CollarClipSFDeltaPhi"
-                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX852CollarClipScrew33"        volume="lvUX852CollarClipScrew">
-          <positionRPhiZ r="UX852CollarClipHolesRpos"
-                         phi="UX852CollarClipSFPosStartPhi+2* UX852CollarClipSFDeltaPhi +UX852CollarClipHolesSFDeltaPhi"
-                         z="UX852FixCollarZpos+UX852CollarClipHoleScrewPosZ"/>
-
-        </physvol>
-
-
-
-        <physvol name="pvUX852CollarAtt-1a"             volume="lvUX852CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree"                     y="45*degree"/>
-            <positionRPhiZ z="UX852FixCollarZpos"
-                           r="UX852CollarAttMainPartRPos"
-                           phi="UX852FixCollarZrot-0.5*UX852FixCollarSect1DelthaAngle+UX852CollarAttMainPartPhiShift"/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX852CollarAtt-1b"              volume="lvUX852CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree"                      y="45*degree"/>
-            <positionRPhiZ z="UX852FixCollarZpos"
-                           r="UX852CollarAttMainPartRPos"
-                           phi="UX852FixCollarZrot+0.5*UX852FixCollarSect1DelthaAngle-UX852CollarAttMainPartPhiShift"/>
-            <rotation/>
-            <position/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX852CollarAtt-2a"              volume="lvUX852CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree"                      y="135*degree"/>
-            <positionRPhiZ z="UX852FixCollarZpos"
-                           r="UX852CollarAttMainPartRPos"
-                           phi="UX852FixCollarZrot-0.5*UX852FixCollarSect1DelthaAngle+UX852FixCollarQuarterRot+UX852CollarAttMainPartPhiShift"/>
-            <rotation/>
-            <position/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX852CollarAtt-2b"              volume="lvUX852CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree"                      y="135*degree"/>
-            <positionRPhiZ z="UX852FixCollarZpos"
-                           r="UX852CollarAttMainPartRPos"
-                           phi="UX852FixCollarZrot+0.5*UX852FixCollarSect1DelthaAngle+UX852FixCollarQuarterRot-UX852CollarAttMainPartPhiShift"/>
-            <rotation/>
-            <position/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX852CollarAtt-3a"              volume="lvUX852CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree"                      y="225*degree"/>
-            <positionRPhiZ z="UX852FixCollarZpos"
-                           r="UX852CollarAttMainPartRPos"
-                           phi="UX852FixCollarZrot-0.5*UX852FixCollarSect1DelthaAngle+2*UX852FixCollarQuarterRot+UX852CollarAttMainPartPhiShift"/>
-            <rotation/>
-            <position/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX852CollarAtt-3b"              volume="lvUX852CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree"                      y="225*degree"/>
-            <positionRPhiZ z="UX852FixCollarZpos"
-                           r="UX852CollarAttMainPartRPos"
-                           phi="UX852FixCollarZrot+0.5*UX852FixCollarSect1DelthaAngle+2*UX852FixCollarQuarterRot-UX852CollarAttMainPartPhiShift"/>
-            <rotation/>
-            <position/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX852CollarAtt-4a"               volume="lvUX852CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree"                       y="315*degree"/>
-            <positionRPhiZ z="UX852FixCollarZpos"
-                           r="UX852CollarAttMainPartRPos"
-                           phi="UX852FixCollarZrot-0.5*UX852FixCollarSect1DelthaAngle+3*UX852FixCollarQuarterRot+UX852CollarAttMainPartPhiShift"/>
-            <rotation/>
-            <position/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX852CollarAtt-4b"               volume="lvUX852CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree"                       y="315*degree"/>
-            <positionRPhiZ z="UX852FixCollarZpos"
-                           r="UX852CollarAttMainPartRPos"
-                           phi="UX852FixCollarZrot+0.5*UX852FixCollarSect1DelthaAngle+3*UX852FixCollarQuarterRot-UX852CollarAttMainPartPhiShift"/>
-            <rotation/>
-            <position/>
-          </transformation>
-        </physvol>
-
-        <!--  Now placing the new back collar attachments modifications in June 2015 at UX852 -->
-        <physvol name="pvUX852CollarForkAttachProngBck-1" volume="lvUX852CollarForkAttachProng">
-          <transformation>
-            <position/>
-            <rotation x="UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation x="-UX852FutureFibreCable03XRot"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
-                           r="UX852BckCollarForkAttachRpos"
-                           phi="UX852FixCollarZrot"/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852CollarForkAttachProngBck-2" volume="lvUX852CollarForkAttachProng">
-          <transformation>
-            <position/>
-            <rotation x="UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation x="UX852FutureFibreCable03XRot"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
-                           r="UX852BckCollarForkAttachRpos"
-                           phi="UX852FixCollarZrot +UX852FixCollarQuarterRot "/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence - UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852CollarForkAttachProngBck-3" volume="lvUX852CollarForkAttachProng">
-          <transformation>
-            <position/>
-            <rotation x="UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation x="-UX852FutureFibreCable03XRot"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-
-            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
-                           r="UX852BckCollarForkAttachRpos"
-                           phi="UX852FixCollarZrot + 2*UX852FixCollarQuarterRot "/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence - 2*UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852CollarForkAttachProngBck-4" volume="lvUX852CollarForkAttachProng">
-          <transformation>
-            <position/>
-            <rotation x="UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation x="UX852FutureFibreCable03XRot"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-
-            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
-                           r="UX852BckCollarForkAttachRpos"
-                           phi="UX852FixCollarZrot + 3*UX852FixCollarQuarterRot "/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence - 3*UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <!-- Now placing the cable heads in UX852 Bck in June 2015 -->
-        <physvol name="pvUX852FutureFibreCableHeadBeamPipeEndBck-1"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation x="UX852FutureFibreCable03XRot"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
-                           r="UX852BckCollarForkAttachRpos"
-                           phi="UX852BckCollarForkAttachPhiPos"/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCableHeadMagnetFaceEndBck-1"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="-UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation x="UX852FutureFibreCable03XRot"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachMagnetFaceZpos"
-                           r="UX852BckCollarForkAttachMagnetFaceRpos"
-                           phi="UX852BckCollarForkAttachMagnetFacePhiPos"/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCableHeadBeamPipeEndBck-2"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation x="-UX852FutureFibreCable03XRot"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
-                           r="UX852BckCollarForkAttachRpos"
-                           phi="UX852BckCollarForkAttachPhiPos+ UX852FixCollarQuarterRot"/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCableHeadMagnetFaceEndBck-2"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="-UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation x="-UX852FutureFibreCable03XRot"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachMagnetFaceZpos"
-                           r="UX852BckCollarForkAttachMagnetFaceRpos"
-                           phi="UX852BckCollarForkAttachMagnetFacePhiPos+ UX852FixCollarQuarterRot"/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- UX852FixCollarQuarterRot-UX852FutureFibreCableHeadPhiPosTolerence"/>
-          </transformation>
-        </physvol>
-
-
-        <physvol name="pvUX852FutureFibreCableHeadBeamPipeEndBck-3"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation x="UX852FutureFibreCable03XRot"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
-                           r="UX852BckCollarForkAttachRpos"
-                           phi="UX852BckCollarForkAttachPhiPos+ 2.0*UX852FixCollarQuarterRot"/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- 2.0*UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCableHeadMagnetFaceEndBck-3"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="-UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation x="UX852FutureFibreCable03XRot"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachMagnetFaceZpos"
-                           r="UX852BckCollarForkAttachMagnetFaceRpos"
-                           phi="UX852BckCollarForkAttachMagnetFacePhiPos+ 2*UX852FixCollarQuarterRot"/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- 2*UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCableHeadBeamPipeEndBck-4"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation x="-UX852FutureFibreCable03XRot"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachZpos"
-                           r="UX852BckCollarForkAttachRpos"
-                           phi="UX852BckCollarForkAttachPhiPos+ 3.0*UX852FixCollarQuarterRot"/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- 3.0*UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCableHeadMagnetFaceEndBck-4"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="-UX852BckCollarForkAttachRotX"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation x="-UX852FutureFibreCable03XRot"/>
-            <positionRPhiZ z="UX852BckCollarForkAttachMagnetFaceZpos"
-                           r="UX852BckCollarForkAttachMagnetFaceRpos"
-                           phi="UX852BckCollarForkAttachMagnetFacePhiPos+ 3*UX852FixCollarQuarterRot"/>
-            <rotation z="UX852FutureFibreCableHeadCommonRotZWithBckTolerence- 3*UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <!-- Now placing the cable heads in UX852 fwd -->
-        <physvol name="pvUX852TechnoraCableHeadBeamPipeEndFwd-1"
-                 volume="lvUX852TechnoraCableHeadTypeAWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation x="-UX852TechnoraCable04XRot"/>
-            <positionRPhiZ z="UX852TechnoraCable04ZShift"
-                           r="UX852TechnoraCable04RShift"
-                           phi="UX852FwdTechnoraCableHeadPhiPos"/>
-            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCableHeadMagnetFaceEndFwd-1"
-                 volume="lvUX852TechnoraCableHeadTypeA">
-
-          <transformation>
-            <position/>
-            <rotation x="-1.0*UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation x="-UX852TechnoraCable04XRot"/>
-            <positionRPhiZ z="UX852FwdCableHeadMagnetFaceZpos"
-                           r="UX852FwdCableHeadMagnetFaceRpos"
-                           phi="UX852FwdCableHeadMagnetFacePhiPos"/>
-            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCableHeadBeamPipeEndFwd-2"
-                 volume="lvUX852TechnoraCableHeadTypeAWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation x="UX852TechnoraCable04XRot"/>
-            <positionRPhiZ z="UX852TechnoraCable04ZShift"
-                           r="UX852TechnoraCable04RShift"
-                           phi="UX852FwdTechnoraCableHeadPhiPos +  UX852FixCollarQuarterRot"/>
-            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence - UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-
-
-        <physvol name="pvUX852TechnoraCableHeadMagnetFaceEndFwd-2"
-                 volume="lvUX852TechnoraCableHeadTypeA">
-
-          <transformation>
-            <position/>
-            <rotation x="-1.0*UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation x="UX852TechnoraCable04XRot"/>
-            <positionRPhiZ z="UX852FwdCableHeadMagnetFaceZpos"
-                           r="UX852FwdCableHeadMagnetFaceRpos"
-                           phi="UX852FwdCableHeadMagnetFacePhiPos+  UX852FixCollarQuarterRot"/>
-            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence- UX852FixCollarQuarterRot-UX852TechnoraCableHeadPhiPosTolerence "/>
-
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCableHeadBeamPipeEndFwd-3"
-                 volume="lvUX852TechnoraCableHeadTypeAWithoutPin">
-
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation x="-UX852TechnoraCable04XRot"/>
-            <positionRPhiZ z="UX852TechnoraCable04ZShift"
-                           r="UX852TechnoraCable04RShift"
-                           phi="UX852FwdTechnoraCableHeadPhiPos+  2*UX852FixCollarQuarterRot"/>
-            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence - 2*UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCableHeadMagnetFaceEndFwd-3"
-                 volume="lvUX852TechnoraCableHeadTypeA">
-          <transformation>
-            <position/>
-            <rotation x="-1.0*UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation x="-UX852TechnoraCable04XRot"/>
-            <positionRPhiZ z="UX852FwdCableHeadMagnetFaceZpos"
-                           r="UX852FwdCableHeadMagnetFaceRpos"
-                           phi="UX852FwdCableHeadMagnetFacePhiPos+  2*UX852FixCollarQuarterRot"/>
-            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence- 2*UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCableHeadBeamPipeEndFwd-4"
-                 volume="lvUX852TechnoraCableHeadTypeAWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation x="UX852TechnoraCable04XRot"/>
-            <positionRPhiZ z="UX852TechnoraCable04ZShift"
-                           r="UX852TechnoraCable04RShift"
-                           phi="UX852FwdTechnoraCableHeadPhiPos+  3*UX852FixCollarQuarterRot"/>
-            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence- 3*UX852FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCableHeadMagnetFaceEndFwd-4"
-                 volume="lvUX852TechnoraCableHeadTypeA">
-          <transformation>
-            <position/>
-            <rotation x="-1.0*UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation x="UX852TechnoraCable04XRot"/>
-            <positionRPhiZ z="UX852FwdCableHeadMagnetFaceZpos"
-                           r="UX852FwdCableHeadMagnetFaceRpos"
-                           phi="UX852FwdCableHeadMagnetFacePhiPos+  3*UX852FixCollarQuarterRot"/>
-            <rotation z="UX852TechnoraCableHeadCommonRotZWithTolerence- 3*UX852FixCollarQuarterRot"/>
-
-          </transformation>
-        </physvol>
-
-        <!-- Now placing the cables in UX852 Bck -->
-        <physvol name="pvUX852FutureFibreCable03BottomLeft"
-                 volume="lvUX852FutureFibreCable03">
-          <transformation>
-            <position/>
-            <rotation x="UX852FutureFibreCable03XRot"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation z="UX852FutureFibreCable03ZRot"/>
-            <positionRPhiZ r="UX852FutureFibreCable03RPos"
-                           z="UX852FutureFibreCable03ZPos"
-                           phi="-UX852FutureFibreCable03ZRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCable03TopLeft"
-                 volume="lvUX852FutureFibreCable03">
-          <transformation>
-            <position/>
-            <rotation x="-UX852FutureFibreCable03XRot"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation z="UX852FutureFibreCable03ZRot - 90.0 *degree "/>
-            <positionRPhiZ r="UX852FutureFibreCable03RPos"
-                           z="UX852FutureFibreCable03ZPos"
-                           phi="UX852FutureFibreCable03ZRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCable03TopRight"
-                 volume="lvUX852FutureFibreCable03">
-          <transformation>
-            <position/>
-            <rotation x="UX852FutureFibreCable03XRot"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation z="UX852FutureFibreCable03ZRot - 180.0 *degree "/>
-            <positionRPhiZ r="UX852FutureFibreCable03RPos"
-                           z="UX852FutureFibreCable03ZPos"
-                           phi="-UX852FutureFibreCable03PhiPos - UX852FutureFibreCable03PhiPosTolerence + 180*degree"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FutureFibreCable03BottomRight"
-                 volume="lvUX852FutureFibreCable03">
-          <transformation>
-            <position/>
-            <rotation x="-UX852FutureFibreCable03XRot"/>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position/>
-            <rotation z="UX852FutureFibreCable03ZRot + 90.0 *degree "/>
-            <positionRPhiZ r="UX852FutureFibreCable03RPos"
-                           z="UX852FutureFibreCable03ZPos"
-                           phi="-UX852FutureFibreCable03PhiPos - UX852FutureFibreCable03PhiPosTolerence  -90*degree"/>
-          </transformation>
-        </physvol>
-
-        <!-- Now placing the cables in UX852 fwd -->
-        <physvol name="pvUX852TechnoraCable04BottomLeft"
-                 volume="lvUX852TechnoraCable04">
-          <transformation>
-            <position/>
-            <rotation x="UX852TechnoraCable04XRot"/>
-            <position/>
-            <rotation z="UX852TechnoraCable04ZRot"/>
-            <positionRPhiZ r="UX852TechnoraCable04RPos"
-                           z="UX852TechnoraCable04ZPos"
-                           phi="-UX852TechnoraCable04ZRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCable04TopLeft"
-                 volume="lvUX852TechnoraCable04">
-          <transformation>
-            <position/>
-            <rotation x="-UX852TechnoraCable04XRot"/>
-            <position/>
-            <rotation z="UX852TechnoraCable04ZRot - 90.0 *degree "/>
-            <positionRPhiZ r="UX852TechnoraCable04RPos"
-                           z="UX852TechnoraCable04ZPos"
-                           phi="UX852TechnoraCable04ZRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCable04TopRight"
-                 volume="lvUX852TechnoraCable04">
-          <transformation>
-            <position/>
-            <rotation x="UX852TechnoraCable04XRot"/>
-            <position/>
-            <rotation z="UX852TechnoraCable04ZRot - 180.0 *degree "/>
-            <positionRPhiZ r="UX852TechnoraCable04RPos"
-                           z="UX852TechnoraCable04ZPos"
-                           phi="-UX852TechnoraCable04PhiPos - UX852TechnoraCable04PhiPosTolerence + 180*degree"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852TechnoraCable04BottomRight"
-                 volume="lvUX852TechnoraCable04">
-          <transformation>
-            <position/>
-            <rotation x="-UX852TechnoraCable04XRot"/>
-            <position/>
-            <rotation z="UX852TechnoraCable04ZRot + 90.0 *degree "/>
-            <positionRPhiZ r="UX852TechnoraCable04RPos"
-                           z="UX852TechnoraCable04ZPos"
-                           phi="-UX852TechnoraCable04PhiPos - UX852TechnoraCable04PhiPosTolerence  -90*degree"/>
-          </transformation>
-        </physvol>
-
-        <!-- End modifications in June 2015 for UX852 -->
-        <physvol name="pvUX852FwdAttRod1"
-                 volume="lvUX852FwdAttRod">
-          <transformation>
-            <position/>
-            <rotation x="UX852FixCollarCable03XRot" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX852FwdCableAttRodZpos"
-                           r="UX852FwdCableAttRodRpos"
-                           phi="UX852FixCollarZrot"/>
-            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 40.2*degree"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FwdAttRod2"
-                 volume="lvUX852FwdAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX852FwdCableAttRodZpos"
-                           r="UX852FwdCableAttRodRpos"
-                           phi="UX852FixCollarZrot+UX852FixCollarQuarterRot"/>
-            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - UX852FixCollarQuarterRot-40.2*degree"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FwdAttRod3"
-                 volume="lvUX852FwdAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX852FwdCableAttRodZpos"
-                           r="UX852FwdCableAttRodRpos"
-                           phi="UX852FixCollarZrot+2*UX852FixCollarQuarterRot"/>
-            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 2*UX852FixCollarQuarterRot -40.2*degree"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852FwdAttRod4"
-                 volume="lvUX852FwdAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX852FwdCableAttRodZpos"
-                           r="UX852FwdCableAttRodRpos"
-                           phi="UX852FixCollarZrot+3*UX852FixCollarQuarterRot"/>
-            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 3*UX852FixCollarQuarterRot -40.2*degree"/>
-          </transformation>
-        </physvol>
-
-
-        <physvol name="pvUX852BckAttRod1"
-                 volume="lvUX852BckAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX852BckCableAttRodZpos"
-                           r="UX852BckCableAttRodRpos"
-                           phi="UX852FixCollarZrot"/>
-            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot -40.2*degree"/> <!--- UX852FixCollarZrot-0.2*degree"/>-->
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852BckAttRod2"
-                 volume="lvUX852BckAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX852BckCableAttRodZpos"
-                           r="UX852BckCableAttRodRpos"
-                           phi="UX852FixCollarZrot+UX852FixCollarQuarterRot"/>
-            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - UX852FixCollarQuarterRot -40.2*degree"/> <!-- - UX852FixCollarZrot-0.2*degree"/>-->
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852BckAttRod3"
-                 volume="lvUX852BckAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX852BckCableAttRodZpos"
-                           r="UX852BckCableAttRodRpos"
-                           phi="UX852FixCollarZrot+2*UX852FixCollarQuarterRot"/>
-            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 2*UX852FixCollarQuarterRot - 40.2*degree"/> <!-- - UX852FixCollarZrot-0.2*degree"/>-->
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX852BckAttRod4"
-                 volume="lvUX852BckAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX852BckCableAttRodZpos"
-                           r="UX852BckCableAttRodRpos"
-                           phi="UX852FixCollarZrot+3*UX852FixCollarQuarterRot"/>
-            <rotation z="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 3*UX852FixCollarQuarterRot -40.2*degree"/> <!-- - UX852FixCollarZrot -0.2*degree"/>-->
-          </transformation>
-        </physvol>
-
-
-        <!-- UX85-3 Fixed point -->
-        <physvol name="pvUX853FixCollar"
-                 volume="lvUX853FixCollar">
-        </physvol>
-
-        <physvol name="pvUX853CollarClip1"
-                 volume="lvUX853CollarClip">
-          <position z="UX853FixCollarZpos"/>
-        </physvol>
-
-
-
-
-        <physvol name="pvUX853CollarClip2"
-                 volume="lvUX853CollarClip">
-          <transformation>
-            <position x="0.0*mm" y="0.0*mm" z="0.0*mm"/>
-            <rotation x="180*degree"/>
-            <position z="UX853FixCollarZpos"/>
-          </transformation>
-        </physvol>
-
-
-
-        <physvol name="lvUX853CollarClipScrew11"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF-1.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX853CollarClipScrew12"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF-0.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX853CollarClipScrew13"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+0.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX853CollarClipScrew14"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+1.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-
-        <physvol name="lvUX853CollarClipScrew21"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+UX853CollarClipSFDeltaPhi-1.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX853CollarClipScrew22"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+UX853CollarClipSFDeltaPhi-0.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX853CollarClipScrew23"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+UX853CollarClipSFDeltaPhi+0.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX853CollarClipScrew124"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+UX853CollarClipSFDeltaPhi+1.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-
-        <physvol name="lvUX853CollarClipScrew31"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+2*UX853CollarClipSFDeltaPhi-1.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX853CollarClipScrew32"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+2*UX853CollarClipSFDeltaPhi-0.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX853CollarClipScrew33"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+2*UX853CollarClipSFDeltaPhi+0.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-        <physvol name="lvUX853CollarClipScrew134"
-                 volume="lvUX853CollarClipScrew">
-          <positionRPhiZ r="UX853CollarClipHolesRpos"
-                         phi="UX853CollarClipHolesDeltaPhiSF+2*UX853CollarClipSFDeltaPhi+1.5*UX853CollarClipHolesDeltaPhiSF"
-                         z="UX853FixCollarZpos+UX853CollarClipHoleScrewPosZ"/>
-        </physvol>
-
-
-        <physvol name="pvUX853CollarAtt1a"
-                 volume="lvUX853CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree" y="90*degree"/>
-            <positionRPhiZ z="UX853CollarAttMainPartZPos"
-                           r="UX853CollarAttMainPartRPos"
-                           phi="UX853FixCollarPhiStart+34*degree-UX853CollarAttMainPartPhiShift"/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX853CollarAtt1b"
-                 volume="lvUX853CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree" y="90*degree"/>
-            <positionRPhiZ z="UX853CollarAttMainPartZPos"
-                           r="UX853CollarAttMainPartRPos"
-                           phi="UX853FixCollarPhiStart+34*degree+UX853CollarAttMainPartPhiShift"/>
-          </transformation>
-        </physvol>
-
-
-        <physvol name="pvUX853CollarAtt2a"
-                 volume="lvUX853CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree" y="180*degree"/>
-            <positionRPhiZ z="UX853CollarAttMainPartZPos"
-                           r="UX853CollarAttMainPartRPos"
-                           phi="UX853FixCollarPhiStart+UX853FixCollarQuarterRot+34*degree-UX853CollarAttMainPartPhiShift"/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX853CollarAtt2b"
-                 volume="lvUX853CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree" y="180*degree"/>
-            <positionRPhiZ z="UX853CollarAttMainPartZPos"
-                           r="UX853CollarAttMainPartRPos"
-                           phi="UX853FixCollarPhiStart+UX853FixCollarQuarterRot+34*degree+UX853CollarAttMainPartPhiShift"/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX853CollarAtt3a"
-                 volume="lvUX853CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree" y="270*degree"/>
-            <positionRPhiZ z="UX853CollarAttMainPartZPos"
-                           r="UX853CollarAttMainPartRPos"
-                           phi="UX853FixCollarPhiStart+2*UX853FixCollarQuarterRot+34*degree-UX853CollarAttMainPartPhiShift"/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX853CollarAtt3b"
-                 volume="lvUX853CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree" y="270*degree"/>
-            <positionRPhiZ z="UX853CollarAttMainPartZPos"
-                           r="UX853CollarAttMainPartRPos"
-                           phi="UX853FixCollarPhiStart+2*UX853FixCollarQuarterRot+34*degree+UX853CollarAttMainPartPhiShift"/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX853CollarAtt4a"
-                 volume="lvUX853CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree" y="0*degree"/>
-            <positionRPhiZ z="UX853CollarAttMainPartZPos"
-                           r="UX853CollarAttMainPartRPos"
-                           phi="UX853FixCollarPhiStart+3*UX853FixCollarQuarterRot+34*degree-UX853CollarAttMainPartPhiShift"/>
-          </transformation>
-        </physvol>
-        <physvol name="pvUX853CollarAtt4b"
-                 volume="lvUX853CollarAtt">
-          <transformation>
-            <position/>
-            <rotation x="90*degree" y="0*degree"/>
-            <positionRPhiZ z="UX853CollarAttMainPartZPos"
-                           r="UX853CollarAttMainPartRPos"
-                           phi="UX853FixCollarPhiStart+3*UX853FixCollarQuarterRot+34*degree+UX853CollarAttMainPartPhiShift"/>
-          </transformation>
-        </physvol>
-
-
-        <!-- Now placing the new Cable head in UX853 from June 2015 -->
-
-
-        <physvol name="pvUX853FutureCableHeadBeamPipeEndBck-1"
-                 volume="lvUX852FutureFibreCableHeadWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation y="180.0*degree"  x="UX853FixCollarCableBckTheta"/>
-            <positionRPhiZ z="UX853BckCableHeadZpos"
-                           r="UX853BckCableHeadRpos"
-                           phi="UX853BckCableHeadCommonPhipos"/>
-
-          </transformation>
-
-        </physvol>
-
-        <physvol name="pvUX853FutureCableHeadMagnetFaceEndBck-1"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="-UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-
-            <position/>
-            <rotation y="180.0*degree"  x="UX853FixCollarCableBckTheta"/>
-
-            <positionRPhiZ z="UX853BckCable05HeadMagnetFaceZpos"
-                           r="UX853BckCable05HeadMagnetFaceRpos"
-                           phi="UX853BckCable05HeadMagnetFaceCommonPhipos"/>
-
-          </transformation>
-
-        </physvol>
-
-        <physvol name="pvUX853FutureCableHeadBeamPipeEndBck-2"
-                 volume="lvUX852FutureFibreCableHeadWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90.0*degree"/>
-
-            <position/>
-            <rotation y="180*degree"/>
-
-            <position/>
-            <rotation z="UX853FixCollarCableBckPlaneRotZHorizRight"/>
-            <positionRPhiZ z="UX853BckCableHeadZpos"
-                           r="UX853BckCableHeadRpos"
-                           phi="UX853BckCableHeadCommonPhipos +UX853FixCollarQuarterRot"/>
-
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizRight"
-                     angle="-UX853FixCollarCableBckTheta"/>
-
-          </transformation>
-
-        </physvol>
-
-        <physvol name="pvUX853FutureCableHeadMagnetFaceEndBck-2"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="-UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90.0*degree"/>
-
-            <position/>
-            <rotation y="180*degree"/>
-
-            <position/>
-            <rotation z="UX853FixCollarCableBckPlaneRotZHorizRight"/>
-            <positionRPhiZ z="UX853BckCable06HeadMagnetFaceZpos"
-                           r="UX853BckCable06HeadMagnetFaceRpos"
-                           phi="UX853BckCable06HeadMagnetFaceCommonPhipos +UX853FixCollarQuarterRot"/>
-
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizRight"
-                     angle="-UX853FixCollarCableBckTheta"/>
-
-          </transformation>
-
-        </physvol>
-
-
-
-
-        <physvol name="pvUX853FutureCableHeadBeamPipeEndBck-3"
-                 volume="lvUX852FutureFibreCableHeadWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-
-            <position/>
-            <rotation z="90.0*degree"/>
-
-            <position/>
-            <rotation y="180.0*degree"  x="-UX853FixCollarCableBckTheta"/>
-            <positionRPhiZ z="UX853BckCableHeadZpos"
-                           r="UX853BckCableHeadRpos"
-                           phi="UX853BckCableHeadCommonPhipos + 2*UX853FixCollarQuarterRot "/>
-
-          </transformation>
-
-        </physvol>
-
-        <physvol name="pvUX853FutureCableHeadMagnetFaceEndBck-3"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="-UX852CableHeadHRotX"/>
-
-            <position/>
-            <rotation z="90.0*degree"/>
-
-            <position/>
-            <rotation y="180.0*degree"  x="-UX853FixCollarCableBckTheta"/>
-            <positionRPhiZ z="UX853BckCable05HeadMagnetFaceZpos"
-                           r="UX853BckCable05HeadMagnetFaceRpos"
-                           phi="UX853BckCable05HeadMagnetFaceCommonPhipos + 2*UX853FixCollarQuarterRot "/>
-
-          </transformation>
-
-        </physvol>
-
-
-        <physvol name="pvUX853FutureCableHeadBeamPipeEndBck-4"
-                 volume="lvUX852FutureFibreCableHeadWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90.0*degree"/>
-
-            <position/>
-            <rotation y="180*degree"/>
-
-            <position/>
-            <rotation z="UX853FixCollarCableBckPlaneRotZHorizLeft"/>
-            <positionRPhiZ z="UX853BckCableHeadZpos"
-                           r="UX853BckCableHeadRpos"
-                           phi="UX853BckCableHeadCommonPhipos + 3*UX853FixCollarQuarterRot"/>
-
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizLeft"
-                     angle="-UX853FixCollarCableBckTheta"/>
-
-          </transformation>
-
-        </physvol>
-
-        <physvol name="pvUX853FutureCableHeadMagnetFaceEndBck-4"
-                 volume="lvUX852FutureFibreCableHead">
-          <transformation>
-            <position/>
-            <rotation x="-UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90.0*degree"/>
-
-            <position/>
-            <rotation y="180*degree"/>
-
-            <position/>
-            <rotation z="UX853FixCollarCableBckPlaneRotZHorizLeft"/>
-            <positionRPhiZ z="UX853BckCable06HeadMagnetFaceZpos"
-                           r="UX853BckCable06HeadMagnetFaceRpos"
-                           phi="UX853BckCableHeadCommonPhipos + 3*UX853FixCollarQuarterRot"/>
-
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizLeft"
-                     angle="-UX853FixCollarCableBckTheta"/>
-
-          </transformation>
-
-        </physvol>
-
-        <physvol name="pvUX853TechnoraCableHeadBeamPipeEndFwd-1"
-                 volume="lvUX852TechnoraCableHeadTypeBWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation  x="-UX853FixCollarCableFwdTheta"
-                       z="UX853FixCollarCableFwdPlaneRotZTopVertical"/>
-            <positionRPhiZ z="UX853FwdCableHeadZpos"
-                           r="UX853FwdCableHeadRpos"
-                           phi="UX853FwdCableHeadCommonPhipos"/>
-
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853TechnoraCableHeadMagnetFaceEndFwd-1"
-                 volume="lvUX852TechnoraCableHeadTypeB">
-          <transformation>
-            <position/>
-            <rotation x="-UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation  x="-UX853FixCollarCableFwdTheta"
-                       z="UX853FixCollarCableFwdPlaneRotZTopVertical"/>
-            <positionRPhiZ z="UX853FwdCable07HeadMagnetFaceZpos"
-                           r="UX853FwdCable07HeadMagnetFaceRpos"
-                           phi="UX853FwdCable07HeadMagnetFaceCommonPhipos"/>
-
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853TechnoraCableHeadBeamPipeEndFwd-2"
-                 volume="lvUX852TechnoraCableHeadTypeBWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation  z="UX853FixCollarCableFwdPlaneRotZHorizRight"/>
-            <positionRPhiZ z="UX853FwdCableHeadZpos"
-                           r="UX853FwdCableHeadRpos"
-                           phi="UX853FwdCableHeadCommonPhipos+UX853FixCollarQuarterRot"/>
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizRight"
-                     angle="-UX853FixCollarCableFwdTheta"/>
-
-          </transformation>
-        </physvol>
-        <physvol name="pvUX853TechnoraCableHeadMagnetFaceEndFwd-2"
-                 volume="lvUX852TechnoraCableHeadTypeB">
-          <transformation>
-            <position/>
-            <rotation x="-UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation z="UX853FixCollarCableFwdPlaneRotZHorizRight"/>
-            <positionRPhiZ z="UX853FwdCable08HeadMagnetFaceZpos"
-                           r="UX853FwdCable08HeadMagnetFaceRpos"
-                           phi="UX853FwdCable08HeadMagnetFaceCommonPhipos+UX853FixCollarQuarterRot "/>
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizRight"
-                     angle="-UX853FixCollarCableFwdTheta"/>
-
-          </transformation>
-        </physvol>
-
-
-
-
-        <physvol name="pvUX853TechnoraCableHeadBeamPipeEndFwd-3"
-                 volume="lvUX852TechnoraCableHeadTypeBWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation  x="UX853FixCollarCableFwdTheta"
-                       z="UX853FixCollarCableFwdPlaneRotZBotVertical"/>
-            <positionRPhiZ z="UX853FwdCableHeadZpos"
-                           r="UX853FwdCableHeadRpos"
-                           phi="UX853FwdCableHeadCommonPhipos + 2*UX853FixCollarQuarterRot"/>
-
-          </transformation>
-        </physvol>
-
-
-
-
-        <physvol name="pvUX853TechnoraCableHeadMagnetFaceEndFwd-3"
-                 volume="lvUX852TechnoraCableHeadTypeB">
-          <transformation>
-            <position/>
-            <rotation x="-UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation  x="UX853FixCollarCableFwdTheta"
-                       z="UX853FixCollarCableFwdPlaneRotZBotVertical"/>
-            <positionRPhiZ z="UX853FwdCable07HeadMagnetFaceZpos"
-                           r="UX853FwdCable07HeadMagnetFaceRpos"
-                           phi="UX853FwdCable07HeadMagnetFaceCommonPhipos + 2*UX853FixCollarQuarterRot"/>
-
-          </transformation>
-        </physvol>
-
-
-        <physvol name="pvUX853TechnoraCableHeadBeamPipeEndFwd-4"
-                 volume="lvUX852TechnoraCableHeadTypeBWithoutPin">
-          <transformation>
-            <position/>
-            <rotation x="UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation  z="UX853FixCollarCableFwdPlaneRotZHorizLeft"/>
-            <positionRPhiZ z="UX853FwdCableHeadZpos"
-                           r="UX853FwdCableHeadRpos"
-                           phi="UX853FwdCableHeadCommonPhipos+3*UX853FixCollarQuarterRot"/>
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizLeft"
-                     angle="-UX853FixCollarCableFwdTheta"/>
-
-          </transformation>
-        </physvol>
-
-
-        <physvol name="pvUX853TechnoraCableHeadMagnetFaceEndFwd-4" volume="lvUX852TechnoraCableHeadTypeB">
-          <transformation>
-            <position/>
-            <rotation x="-UX852CableHeadHRotX"/>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation z="UX853FixCollarCableFwdPlaneRotZHorizLeft"/>
-            <positionRPhiZ z="UX853FwdCable08HeadMagnetFaceZpos"
-                           r="UX853FwdCable08HeadMagnetFaceRpos"
-                           phi="UX853FwdCable08HeadMagnetFaceCommonPhipos+ 3*UX853FixCollarQuarterRot "/>
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizLeft"
-                     angle="-UX853FixCollarCableFwdTheta"/>
-          </transformation>
-        </physvol>
-
-        <!-- End placing the new Cable head in UX853 from June 2015 -->
-        <!-- Now place the cables in UX853 from June 2015 -->
-        <!-- Now placing the backward cables in UX853 from June 2015 -->
-        <physvol name="pvUX853FixCollarCable05BckTop"        volume="lvUX853FutureFibreCable05">
-          <transformation>
-            <position/>
-            <rotation y="180.0*degree"  x="UX853FixCollarCableBckTheta"/>
-            <positionRPhiZ z="UX853BckCable05ZPos"
-                           r="UX853BckCable05RPos"
-                           phi="UX853BckCableHeadCommonPhipos"/>
-
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FixCollarCable06BckHorizRight" volume="lvUX853FutureFibreCable06">
-          <transformation>
-            <position/>
-            <rotation z="90.0*degree"/>
-
-            <position/>
-            <rotation z="UX853FixCollarCableBckPlaneRotZHorizRight"/>
-            <positionRPhiZ z="UX853BckCable06ZPos"
-                           r="UX853BckCable06RPos"
-                           phi="UX853BckCableHeadCommonPhipos +UX853FixCollarQuarterRot"/>
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizRight"
-                     angle="-UX853FixCollarCableBckTheta"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FixCollarCable05BckBot"       volume="lvUX853FutureFibreCable05">
-          <transformation>
-            <position/>
-            <rotation y="180.0*degree"  x="-UX853FixCollarCableBckTheta"/>
-            <positionRPhiZ z="UX853BckCable05ZPos"
-                           r="UX853BckCable05RPos"
-                           phi="UX853BckCableHeadCommonPhipos+ 2*UX853FixCollarQuarterRot"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FixCollarCable06BckHorizLeft"  volume="lvUX853FutureFibreCable06">
-          <transformation>
-            <position/>
-            <rotation z="90.0*degree"/>
-            <position/>
-            <rotation z="UX853FixCollarCableBckPlaneRotZHorizLeft"/>
-            <positionRPhiZ z="UX853BckCable06ZPos"
-                           r="UX853BckCable06RPos"
-                           phi="UX853BckCableHeadCommonPhipos +3* UX853FixCollarQuarterRot"/>
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizLeft"
-                     angle="-UX853FixCollarCableBckTheta"/>
-          </transformation>
-        </physvol>
-
-        <!-- Now placing the forward cables in UX853 from June 2015 -->
-        <physvol name="pvUX853FixCollarCable07FwdTop"        volume="lvUX853TechnoraCable07">
-          <transformation>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation  x="-UX853FixCollarCableFwdTheta"
-                       z="UX853FixCollarCableFwdPlaneRotZTopVertical"/>
-
-            <positionRPhiZ z="UX853FwdCable07ZPos"
-                           r="UX853FwdCable07RPos"
-                           phi="UX853FwdCableHeadCommonPhipos"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FixCollarCable08FwdHorizRight" volume="lvUX853TechnoraCable08">
-          <transformation>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation z="UX853FixCollarCableFwdPlaneRotZHorizRight"/>
-            <positionRPhiZ z="UX853FwdCable08ZPos"
-                           r="UX853FwdCable08RPos"
-                           phi="UX853FwdCableHeadCommonPhipos+ UX853FixCollarQuarterRot "/>
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizRight"
-                     angle="-UX853FixCollarCableFwdTheta"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FixCollarCable07FwdBot"        volume="lvUX853TechnoraCable07">
-          <transformation>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation  x="UX853FixCollarCableFwdTheta"
-                       z="UX853FixCollarCableFwdPlaneRotZBotVertical"/>
-            <positionRPhiZ z="UX853FwdCable07ZPos"
-                           r="UX853FwdCable07RPos"
-                           phi="UX853FwdCableHeadCommonPhipos + 2*UX853FixCollarQuarterRot "/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FixCollarCable08FwdHorizLeft"  volume="lvUX853TechnoraCable08">
-
-          <transformation>
-            <position/>
-            <rotation z="90*degree"/>
-            <position/>
-            <rotation z="UX853FixCollarCableFwdPlaneRotZHorizLeft"/>
-            <positionRPhiZ z="UX853FwdCable08ZPos"
-                           r="UX853FwdCable08RPos"
-                           phi="UX853FwdCableHeadCommonPhipos+ 3*UX853FixCollarQuarterRot "/>
-            <rotAxis axTheta="90.0*degree"
-                     axPhi="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizLeft"
-                     angle="-UX853FixCollarCableFwdTheta"/>
-          </transformation>
-        </physvol>
-
-        <!-- End  placing the cables in UX853 from June 2015 -->
-        <physvol name="pvUX853BckAttRod1"                    volume="lvUX853BckAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="180.0*degree"/>
-            <positionRPhiZ z="UX853BckCableAttRodZpos"
-                           r="UX853BckCableAttRodRpos"
-                           phi="UX853FixCollarPhiStart+34*degree"/>
-            <rotation z="-(UX853FixCollarPhiStart+34*degree+UX853FixCollarQuarterRot)"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853BckAttRod2"                 volume="lvUX853BckAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX853BckCableAttRodZpos"
-                           r="UX853BckCableAttRodRpos"
-                           phi="UX853FixCollarPhiStart+34*degree+UX853FixCollarQuarterRot"/>
-            <rotation z="-(UX853FixCollarPhiStart+34*degree+2*UX853FixCollarQuarterRot)"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853BckAttRod3"                 volume="lvUX853BckAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX853BckCableAttRodZpos"
-                           r="UX853BckCableAttRodRpos"
-                           phi="UX853FixCollarPhiStart+34*degree+2*UX853FixCollarQuarterRot"/>
-            <rotation z="-(UX853FixCollarPhiStart+34*degree+3*UX853FixCollarQuarterRot)"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853BckAttRod4"                 volume="lvUX853BckAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX853BckCableAttRodZpos"
-                           r="UX853BckCableAttRodRpos"
-                           phi="UX853FixCollarPhiStart+34*degree+3*UX853FixCollarQuarterRot"/>
-            <rotation z="-(UX853FixCollarPhiStart+34*degree+4*UX853FixCollarQuarterRot)"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FwdAttRod1"                 volume="lvUX853FwdAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX853FwdCableAttRodZpos"
-                           r="UX853FwdCableAttRodRpos"
-                           phi="UX853FixCollarPhiStart+34*degree"/>
-            <rotation z="-(UX853FixCollarPhiStart+34*degree+UX853FixCollarQuarterRot)"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FwdAttRod2"                 volume="lvUX853FwdAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX853FwdCableAttRodZpos"
-                           r="UX853FwdCableAttRodRpos"
-                           phi="UX853FixCollarPhiStart+34*degree+UX853FixCollarQuarterRot"/>
-            <rotation z="-(UX853FixCollarPhiStart+34*degree+2*UX853FixCollarQuarterRot)"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FwdAttRod3"                 volume="lvUX853FwdAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX853FwdCableAttRodZpos"
-                           r="UX853FwdCableAttRodRpos"
-                           phi="UX853FixCollarPhiStart+34*degree+2*UX853FixCollarQuarterRot"/>
-            <rotation z="-(UX853FixCollarPhiStart+34*degree+3*UX853FixCollarQuarterRot)"/>
-          </transformation>
-        </physvol>
-
-        <physvol name="pvUX853FwdAttRod4"                 volume="lvUX853FwdAttRod">
-          <transformation>
-            <position/>
-            <rotation x="0.0*degree" y="90.0*degree" z="0.0*degree"/>
-            <positionRPhiZ z="UX853FwdCableAttRodZpos"
-                           r="UX853FwdCableAttRodRpos"
-                           phi="UX853FixCollarPhiStart+34*degree+3*UX853FixCollarQuarterRot"/>
-            <rotation z="-(UX853FixCollarPhiStart+34*degree+4*UX853FixCollarQuarterRot)"/>
-          </transformation>
-        </physvol>
-      </envelope>
-
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-SupportParams.xml b/compact/components/Pipe/2025-v00.00/Magnet-SupportParams.xml
deleted file mode 100644
index af7a3d164..000000000
--- a/compact/components/Pipe/2025-v00.00/Magnet-SupportParams.xml
+++ /dev/null
@@ -1,814 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout in the Magnet                    -->
-<!--===========================================================================-->
-<lccdd>
-  <define>
-
-    <!-- ***************************************************************** -->
-    <!-- *  BeamPipe Supports geometry parameters                        * -->
-    <!-- *                                                               * -->
-    <!-- *  Date: 2006-03-02                                             * -->
-    <!-- *  Author: Gloria Corti                                         * -->
-    <!-- *  Modified by Daria Savrina, Oct. 2008 to adapt supports as    * -->
-    <!-- *  installed                                                    * -->
-    <!-- * Modified by Jimmy McCarthy May 2012  to adapt supports as     * -->
-    <!-- * installed during 2012 LSD                                     * -->
-    <!-- * Modified by Sajan Easo in June 2015 for the new supports      * -->
-    <!-- *                                                               * -->
-    <!-- ***************************************************************** -->
-
-    <!-- ***************************************************************** -->
-    <!-- * UX85-1 Support                                                * -->
-    <!-- ***************************************************************** -->
-    <!-- UX85-1 Support: Collar -->
-    <constant name="UX851CollarLenght" value="30.00*mm"/>
-    <constant name="UX851CollarRadius" value="43.00*mm"/>
-    <constant name="UX851CollarThick" value="4.00*mm"/>
-    <constant name="UX851CollarZpos" value="2798.80*mm - 0.5*Regions:BeforeMagnetZSize - 0.5*UX851CollarLenght "/>
-
-    <!-- UX85-1 Support: Cables -->
-    <constant name="UX851CableRadius" value="1.00*mm"/>
-    <constant name="UX851CableLenght" value="1000.00*mm"/>
-    <constant name="UX851CablePhiAngle" value="45.0*degree"/>
-    <constant name="UX851CableZpos" value="2780.00*mm - 0.5*Regions:BeforeMagnetZSize"/>
-    <constant name="UX851CableXYpos" value="(UX851CollarRadius + UX851CollarThick + 0.5*UX851CableLenght) * sin(UX851CablePhiAngle)"/>
-
-    <!-- ***************************************************************** -->
-    <!-- * UX85-2 Fixed Point                                            * -->
-    <!-- ***************************************************************** -->
-    <!-- UX85-2 Fixed Point: Collar before/after rib and around -->
-    <constant name="UX852FixCollarLenght" value="24.00*mm"/>
-
-    <!-- UX85-2 Fixed Point: Collar -->
-    <!-- Inner ring -->
-    <constant name="UX852FixCollarRingInnerRad" value="55.50*mm"/>
-    <constant name="UX852FixCollarRingOuterRad" value="57.50*mm"/>
-    <constant name="UX852FixCollarRingLength" value="6.00*mm"/>
-    <constant name="UX852FixCollarZpos" value="4025.50*mm - 0.5*Regions:BeforeMagnetZSize"/>
-    <constant name="UX852FixCollarZrot" value="45.00*degree"/>
-
-    <!-- Big ring -->
-    <constant name="UX852FixCollarInnerRad" value="57.50*mm"/>
-    <constant name="UX852FixCollarOuterRad" value="64.50*mm"/>
-    <constant name="UX852FixCollarLength" value="12.00*mm"/>
-    <constant name="UX852FixCollarCutAngl" value="45*degree"/>
-    <constant name="UX852FixCollarQuarterRot" value="90*degree"/>
-    <constant name="UX852FixCollarAttOuterRad" value="77.50*mm"/>
-
-    <!-- For the first type of sections -->
-    <constant name="UX852FixCollarSect1DelthaAngle" value="14.8*degree"/>
-    <constant name="UX852FixCollarSect1Rot" value="-7.4*degree"/>
-    <!-- For the second type of sections -->
-    <constant name="UX852FixCollarSect2DelthaAngle" value="15.1*degree"/>
-    <constant name="UX852FixCollarSect2Rot" value="(UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle)*0.5"/>
-    <!-- For the third type of sections -->
-    <constant name="UX852FixCollarSect3DelthaAngle" value="45*degree"/>
-    <constant name="UX852FixCollarSect3Rot" value="(UX852FixCollarSect1DelthaAngle + UX852FixCollarSect3DelthaAngle)*0.5 + UX852FixCollarSect2DelthaAngle"/>
-
-    <!--Ring Cut cut for the slope -->
-    <constant name="UX852BigRingSect2SlopeXsize" value="40*mm"/>
-    <constant name="UX852BigRingSect2SlopeYsize" value="20*mm"/>
-    <constant name="UX852BigRingSect2SlopeZrot" value="145*degree"/>
-    <constant name="UX852BigRingSect2SlopePhipos" value="UX852FixCollarSect1DelthaAngle + 0.5*UX852FixCollarSect2DelthaAngle"/>
-    <constant name="UX852BigRingSect4SlopePhipos" value="UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle + UX852FixCollarSect3DelthaAngle + 0.5*UX852FixCollarSect2DelthaAngle"/>
-
-    <!-- Transverse hole -->
-    <constant name="UX852FixCollarHoleSect3Rad" value="4.00*mm"/>
-    <constant name="UX852FixCollarHoleSect3Length" value="0.5*(UX852FixCollarOuterRad-UX852FixCollarInnerRad)"/>
-    <constant name="UX852FixCollarHoleSect3Rpos" value="UX852FixCollarOuterRad-0.5*UX852FixCollarHoleSect3Length"/>
-    <constant name="UX852FixCollarHoleSect3Phipos" value="UX852FixCollarSect1DelthaAngle + UX852FixCollarSect2DelthaAngle+0.5*UX852FixCollarSect3DelthaAngle"/>
-
-    <!-- Collar clips -->
-    <!-- begin remove in future -->
-    <constant name="UX852CollarClipDeltaPhi" value="120.00*degree - 0.20*degree"/>
-    <constant name="UX852CollarGapDeltaPhi" value="0.20*degree"/>
-    <!-- end remove in future-->
-    <constant name="UX852CollarGapSFDeltaPhi" value="0.20*degree"/>
-    <constant name="UX852CollarClipSFDeltaPhi" value="120.00*degree"/>
-    <constant name="UX852CollarClipSFStartPhi" value="-0.5*UX852CollarClipSFDeltaPhi+0.5*UX852CollarGapSFDeltaPhi"/>
-    <constant name="UX852CollarClipSFPosStartPhi" value="90.0*degree"/>
-
-    <!-- Ring one -->
-    <constant name="UX852CollarClipRing1Length" value="2.90*mm"/>
-    <constant name="UX852CollarClipRing1InnerRad" value="48.50*mm"/>
-    <constant name="UX852CollarClipRing1OuterRad" value="55.50*mm"/>
-    <!-- Ring two -->
-    <constant name="UX852CollarClipRing2Length" value="0.5*UX852FixCollarLength - UX852CollarClipRing1Length"/>
-    <constant name="UX852CollarClipRing2InnerRad" value="43.50*mm"/>
-    <constant name="UX852CollarClipRing2OuterRad" value="57.50*mm"/>
-
-    <!-- The following from LHCVC8B-0161_VAA  in June 2015 -->
-    <constant name="UX852CollarClipHolesLength" value="45.00*mm"/>
-    <constant name="UX852CollarClipHolesRad" value="1.75*mm"/>
-    <constant name="UX852CollarClipHolesSFDeltaPhi" value="40*degree"/>
-    <constant name="UX852CollarClipHolesRpos" value="52.50*mm"/>
-
-    <!-- The following in June2015 from type M3 in iso4762 -->
-    <constant name="UX852CollarClipHoleScrewHeadLength" value="3.0*mm"/>
-    <constant name="UX852CollarClipHoleScrewLengthTolerence" value="0.2*mm"/>
-    <constant name="UX852CollarClipHoleScrewLength" value="18.5*mm"/>
-    <constant name="UX852CollarClipHoleScrewRad" value="1.25*mm"/>
-    <constant name="UX852CollarClipHoleScrewHeadRad" value="2.75*mm"/>
-    <constant name="UX852CollarClipHoleScrewSubLargeLength" value="50.0*mm"/>
-    <constant name="UX852CollarClipHoleScrewSubLargeRadius" value="10.0*mm"/>
-    <constant name="UX852CollarClipHoleScrewSubPosZ" value="0.5*(UX852CollarClipHoleScrewSubLargeLength-UX852CollarClipHoleScrewLength) + UX852CollarClipHoleScrewHeadLength "/>
-    <constant name="UX852CollarClipHoleScrewPosZ" value="0.5*UX852CollarClipHoleScrewLength-0.5*UX852FixCollarLength-UX852CollarClipHoleScrewHeadLength-UX852CollarClipHoleScrewLengthTolerence"/>
-
-    <!-- Cable attachments -->
-
-    <!-- Collar part -->
-    <constant name="UX852CollarAttMainPartXsize" value="32.0*mm"/>
-    <constant name="UX852CollarAttMainPartYsize" value="47.0*mm"/>
-    <constant name="UX852CollarAttMainPartZsize" value="5.50*mm"/>
-    <constant name="UX852CollarAttMainPartRPos" value="59.5*mm+0.5*UX852CollarAttMainPartXsize+2*mm"/>
-    <constant name="UX852CollarAttMainPartPhiShift" value="1.0*degree"/>
-
-    <!--Holes -->
-    <constant name="UX852CollarAttMainHole1RadTolerence" value="0.3*mm"/>
-    <constant name="UX852CollarAttMainHole1Rad" value="5*mm+UX852CollarAttMainHole1RadTolerence"/>
-    <constant name="UX852CollarAttMainHole1RadPos" value="-(67.5*mm-UX852FixCollarInnerRad-0.5*UX852CollarAttMainPartXsize-2*mm)"/>
-    <constant name="UX852CollarAttMainHole1ZPos" value="19.0*mm+UX852CollarClipRing1Length-0.5*UX852FixCollarLength"/>
-    <constant name="UX852CollarAttMainHole2RadTolerence" value="0.3*mm"/>
-    <constant name="UX852CollarAttMainHole2Rad" value="4*mm+UX852CollarAttMainHole2RadTolerence"/>
-    <constant name="UX852CollarAttMainHole2RadPos" value="80.314*mm-UX852FixCollarInnerRad-0.5*UX852CollarAttMainPartXsize-2*mm"/>
-    <constant name="UX852CollarAttMainHole2ZPos" value="-8.7*mm-0.5*UX852FixCollarLength"/>
-
-    <!--Rounded edges -->
-    <constant name="UX852CollarAttMainPartEdge1InnerRad" value="8.0*mm"/>
-    <constant name="UX852CollarAttMainPartEdge2InnerRad" value="9.0*mm"/>
-    <constant name="UX852CollarAttMainPartEdge1DeltaPhi" value="180*degree"/>
-    <constant name="UX852CollarAttMainPartEdge1StartPhi" value="0*degree"/>
-    <constant name="UX852CollarAttMainPartEdge2StartPhi" value="225*degree"/>
-    <constant name="UX852CollarAttMainPartEdge2DeltaPhi" value="135*degree"/>
-    <constant name="UX852CollarAttMainPartEdge2bStartPhi" value="0*degree"/>
-    <constant name="UX852CollarAttMainPartEdge2bDeltaPhi" value="45*degree"/>
-
-    <!--Slope 1-->
-    <constant name="UX852CollarAttSlope1RPos" value="UX852CollarAttMainPartXsize+18*mm"/>
-    <constant name="UX852CollarAttSlope1YRot" value="90*degree+40*degree"/>
-    <!--Slope 2-->
-    <constant name="UX852CollarAttSlope2RPos" value="16*mm"/>
-    <constant name="UX852CollarAttSlope2ZPos" value="UX852CollarAttMainHole1ZPos+0.5*UX852CollarAttMainPartYsize-19*mm+UX852FixCollarRingLength+3*mm"/>
-    <!--Slope 3-->
-    <constant name="UX852CollarAttSlope3RPos" value="25*mm"/>
-    <constant name="UX852CollarAttSlope3YRot" value="38*degree"/>
-
-
-    <!-- UX85-2 Fixed Point: Backward Cables, 3.0 mm diameter position-->
-    <constant name="UX852FixCollarCable03Radius" value="1.50*mm"/>
-    <constant name="UX852FixCollarCable03ZRot" value="45.00*degree"/>
-    <constant name="UX852FixCollarCable03XRot" value="45.00*degree"/>
-    <constant name="UX852FixCollarCable03Lenght" value="2050.00*mm"/>
-    <constant name="UX852FixCollarCableTolerence" value="2.00*mm"/>
-
-    <!-- Forward cable attachements -->
-    <constant name="UX852FwdCableAttMainRad" value="9.00*mm"/>
-    <constant name="UX852FwdCableAttRingOuterRad" value="7.00*mm"/>
-    <constant name="UX852FwdCableAttMainLength" value="48.00*mm+UX852FwdCableAttRingOuterRad"/>
-    <constant name="UX852FwdCableAttRingInnerRad" value="2.50*mm"/>
-    <constant name="UX852FwdCableAttRingDeltaAng" value="200*degree"/>
-    <constant name="UX852FwdCableAttCut1SizeX" value="5.50*mm"/>
-    <constant name="UX852FwdCableAttCut1SizeY" value="2*UX852FwdCableAttMainRad"/>
-    <constant name="UX852FwdCableAttCut1SizeZ" value="13.00*mm+UX852FwdCableAttRingOuterRad"/>
-    <constant name="UX852FwdCableAttCut2SizeX" value="2.50*mm"/>
-    <constant name="UX852FwdCableAttCut2SizeY" value="2*UX852FwdCableAttMainRad"/>
-    <constant name="UX852FwdCableAttCut2SizeZ" value="10.00*mm"/>
-    <constant name="UX852FwdCableAttCut2posZ" value="23.00*mm"/>
-    <constant name="UX852FwdCableAttHoleRad" value="UX852FwdCableAttRingInnerRad"/>
-    <constant name="UX852FwdCableAttLongHoleRad" value="4.00*mm"/>
-    <constant name="UX852FwdCableAttLongHoleLength" value="27.00*mm"/>
-    <constant name="UX852FwdCableAttRpos" value="-UX852CollarAttMainHole1RadPos+UX852CollarAttMainPartRPos+0.5*UX852FwdCableAttMainLength*sin(UX852FixCollarCable03XRot) - 0.5*UX852CollarAttMainHole1Rad-0.5*UX852FwdCableAttRingOuterRad+1*mm"/>
-    <constant name="UX852FwdCableAttZpos" value="UX852CollarAttMainHole1ZPos+UX852FixCollarZpos+0.5*UX852FwdCableAttMainLength*cos(UX852FixCollarCable03XRot) - 0.5*UX852CollarAttMainHole1Rad-0.5*UX852FwdCableAttRingOuterRad+1*mm"/>
-
-    <!-- UX85-2 Fixed Point: Backward Cables, 3.0 mm diameter RPhiZ-->
-    <constant name="UX852FixCollarCable03PhiPos" value="UX852FixCollarCable03ZRot"/>
-    <constant name="UX852FixCollarCable03RPos" value="UX852FwdCableAttRpos+0.5*UX852FixCollarCable03Lenght*sin(UX852FixCollarCable03ZRot)+UX852FixCollarCableTolerence"/>
-    <constant name="UX852FixCollarCable03ZPos" value="UX852FwdCableAttZpos+0.5*UX852FixCollarCable03Lenght*cos(UX852FixCollarCable03ZRot)+UX852FixCollarCableTolerence"/>
-
-    <!-- UX85-2 Fixed Point: Forward Rods, 8.0 mm poisition-->
-    <constant name="UX852FixCollarCable08Radius" value="4.00*mm"/>
-    <constant name="UX852FixCollarCable08Lenght" value="2418.00*mm"/>
-    <constant name="UX852FixCollarCable08XRot" value="67.5*degree"/>
-    <constant name="UX852FixCollarCable08ZRot" value="45.00*degree"/>
-
-     <!-- UX85-2 Fixed Point: Forward Cables, 4.0 mm diameter poisition-->
-    <constant name="UX852FixCollarCable04Radius" value="2.00*mm"/>
-    <constant name="UX852FixCollarCable04Lenght" value="1440.00*mm"/>
-    <constant name="UX852FixCollarCable04XRot" value="45.00*degree"/>
-    <constant name="UX852FixCollarCable04ZRot" value="45.00*degree"/>
-
-    <!-- Backward cable attachements -->
-    <constant name="UX852BckCableAttMainRad" value="9.00*mm"/>
-    <constant name="UX852BckCableAttRingOuterRad" value="7.50*mm"/>
-    <constant name="UX852BckCableAttMainLength" value="48.00*mm+UX852BckCableAttRingOuterRad"/>
-    <constant name="UX852BckCableAttRingInnerRad" value="3.00*mm"/>
-    <constant name="UX852BckCableAttRingDeltaAng" value="200*degree"/>
-    <constant name="UX852BckCableAttCut1SizeX" value="5.50*mm"/>
-    <constant name="UX852BckCableAttCut1SizeY" value="2*UX852BckCableAttMainRad"/>
-    <constant name="UX852BckCableAttCut1SizeZ" value="14.00*mm+UX852BckCableAttRingOuterRad"/>
-    <constant name="UX852BckCableAttCut2SizeX" value="2.50*mm"/>
-    <constant name="UX852BckCableAttCut2SizeY" value="2*UX852BckCableAttMainRad"/>
-    <constant name="UX852BckCableAttCut2SizeZ" value="10.00*mm"/>
-    <constant name="UX852BckCableAttCut2posZ" value="22.00*mm"/>
-    <constant name="UX852BckCableAttHoleRad" value="UX852BckCableAttRingInnerRad"/>
-    <constant name="UX852BckCableAttLongHoleRad" value="4.00*mm"/>
-    <constant name="UX852BckCableAttLongHoleLength" value="27.00*mm"/>
-    <constant name="UX852BckCableAtt08Rpos" value="UX852CollarAttMainHole2RadPos+UX852CollarAttMainPartRPos+0.5*UX852FwdCableAttMainLength*sin(UX852FixCollarCable08XRot) - 0.5*UX852CollarAttMainHole2Rad-0.5*UX852BckCableAttRingOuterRad-1*mm"/>
-    <constant name="UX852BckCableAtt08Zpos" value="UX852CollarAttMainHole2ZPos+UX852FixCollarZpos-0.5*UX852FwdCableAttMainLength*cos(UX852FixCollarCable08XRot) + 0.5*UX852CollarAttMainHole2Rad+0.5*UX852BckCableAttRingOuterRad-3*mm"/>
-    <constant name="UX852BckCableAtt04Rpos" value="UX852CollarAttMainHole2RadPos+UX852CollarAttMainPartRPos+0.5*UX852FwdCableAttMainLength*sin(UX852FixCollarCable04XRot) - 0.5*UX852CollarAttMainHole2Rad-0.5*UX852BckCableAttRingOuterRad-1*mm"/>
-    <constant name="UX852BckCableAtt04Zpos" value="UX852CollarAttMainHole2ZPos+UX852FixCollarZpos-0.5*UX852FwdCableAttMainLength*cos(UX852FixCollarCable04XRot) + 0.5*UX852CollarAttMainHole2Rad+0.5*UX852BckCableAttRingOuterRad-3*mm"/>
-
-     <!-- UX85-2 Fixed Point: Forward Rods, 8.0 mm RPhiZ-->
-    <constant name="UX852FixCollarCable08RPos" value="UX852BckCableAtt08Rpos+0.5*UX852FixCollarCable08Lenght*sin(UX852FixCollarCable08XRot)+UX852FixCollarCableTolerence"/>
-    <constant name="UX852FixCollarCable08ZPos" value="UX852BckCableAtt08Zpos-0.5*UX852FixCollarCable08Lenght*cos(UX852FixCollarCable08XRot)-UX852FixCollarCableTolerence"/>
-    <constant name="UX852FixCollarCable08PhiPos" value="UX852FixCollarCable08ZRot"/>
-
-     <!-- UX85-2 Fixed Point: Forward Cables, 4.0 mm diameter RPhiZ-->
-    <constant name="UX852FixCollarCable04PhiPos" value="UX852FixCollarCable04ZRot"/>
-    <constant name="UX852FixCollarCable04RPos" value="UX852BckCableAtt04Rpos+0.5*UX852FixCollarCable04Lenght*sin(UX852FixCollarCable04XRot)+UX852FixCollarCableTolerence"/>
-    <constant name="UX852FixCollarCable04ZPos" value="UX852BckCableAtt04Zpos-0.5*UX852FixCollarCable04Lenght*cos(UX852FixCollarCable04XRot)-UX852FixCollarCableTolerence"/>
-
-    <!-- Forward rod Modified in June 2015 from LHCBVC8B-167-B -->
-    <constant name="UX852FwdCableAttRodRad" value="5.00*mm"/>
-    <constant name="UX852FwdCableAttRodLength" value="28.10*mm"/>
-    <constant name="UX852FwdCableAttRodCutRad" value="4.80*mm"/>
-    <constant name="UX852FwdCableAttRodCutLength" value="1.10*mm"/>
-    <constant name="UX852FwdCableAttRodCutZpos" value="3.60*mm"/>
-    <constant name="UX852FwdCableAttRodInnerHoleRad" value="4.0*mm"/>
-    <constant name="UX852FwdCableAttRodHeadLength" value="1.5*mm"/>
-    <constant name="UX852FwdCableAttRodHeadRad" value="6.5*mm"/>
-    <constant name="UX852FwdCableAttRodManPartLargeLength" value="50.0*mm"/>
-    <constant name="UX852FwdCableAttRodManPartPosZ" value="-0.5*UX852FwdCableAttRodLength+0.5*UX852FwdCableAttRodManPartLargeLength+UX852FwdCableAttRodHeadLength"/>
-    <constant name="UX852FwdCableAttRodZpos" value="UX852CollarAttMainHole1ZPos+UX852FixCollarZpos"/>
-    <constant name="UX852FwdCableAttRodRpos" value="-UX852CollarAttMainHole1RadPos+UX852CollarAttMainPartRPos"/>
-
-    <!-- Backward rod Modified in June 2015 from LHCVC8B-164-B -->
-    <constant name="UX852BckCableAttRodRad" value="4.00*mm"/>
-    <constant name="UX852BckCableAttRodLength" value="28.10*mm"/>
-    <constant name="UX852BckCableAttRodCutRad" value="3.8*mm"/>
-    <constant name="UX852BckCableAttRodCutLength" value="1.10*mm"/>
-    <constant name="UX852BckCableAttRodCutZpos" value="3.60*mm"/>
-    <constant name="UX852BckCableAttRodInnerHoleRad" value="2.0*mm"/>
-    <constant name="UX852BckCableAttRodHeadLength" value="1.5*mm"/>
-    <constant name="UX852BckCableAttRodHeadRad" value="5.5*mm"/>
-    <constant name="UX852BckCableAttRodManPartLargeLength" value="50.0*mm"/>
-    <constant name="UX852BckCableAttRodManPartPosZ" value="-0.5*UX852BckCableAttRodLength+0.5*UX852BckCableAttRodManPartLargeLength+UX852BckCableAttRodHeadLength"/>
-    <constant name="UX852BckCableAttRodZpos" value="UX852CollarAttMainHole2ZPos+UX852FixCollarZpos"/>
-    <constant name="UX852BckCableAttRodRpos" value="UX852CollarAttMainHole2RadPos+UX852CollarAttMainPartRPos"/>
-
-    <!-- Backward rod at the prongs of the collar fork attach Modified in June 2015 from LHCVC8B-164-C -->
-    <constant name="UX852BckFACableAttRodRad" value="4.00*mm"/>
-    <constant name="UX852BckFACableAttRodLength" value="30.10*mm"/>
-    <constant name="UX852BckFACableAttRodCutRad" value="3.8*mm"/>
-    <constant name="UX852BckFACableAttRodCutLength" value="1.10*mm"/>
-    <constant name="UX852BckFACableAttRodCutZpos" value="3.60*mm"/>
-    <constant name="UX852BckFACableAttRodInnerHoleRad" value="2.0*mm"/>
-    <constant name="UX852BckFACableAttRodHeadLength" value="1.5*mm"/>
-    <constant name="UX852BckFACableAttRodHeadRad" value="5.5*mm"/>
-    <constant name="UX852BckFACableAttRodManPartLargeLength" value="50.0*mm"/>
-    <constant name="UX852BckFACableAttRodManPartPosZ" value="-0.5*UX852BckFACableAttRodLength+0.5*UX852BckFACableAttRodManPartLargeLength+UX852BckFACableAttRodHeadLength"/>
-
-    <!-- Begin Beampipe cable support modifications in Magnet from 2015 -->
-    <!-- The cable attachment to the collar is from the edms drawing in lhcvc8b_0194_v0 and lhcbvc0177_v0 Each of the two prongs for this CollarForkAttach are
-     setp as cylinder-box, trapizoid and a box .
-     The central part is setup as a trap-trap-(cylinder-cylinder) - cylinder(for the hole) -->
-    <!-- UX85-2 Collar attachment for cables - New from June 2015 -->
-    <!-- Now for the collar attachment in the shape of a two pronged fork near the beampipe in the magnet -->
-    <constant name="UX852CollarForkAttachProngOuterRadius" value="10.0*mm"/>
-    <constant name="UX852CollarForkAttachProngRadiusTolerence" value="0.2*mm"/>
-
-    <constant name="UX852CollarForkAttachProngInnerRadius" value="4.0*mm+UX852CollarForkAttachProngRadiusTolerence"/>
-    <constant name="UX852CollarForkAttachProngThickness" value="5.0*mm"/>
-    <constant name="UX852CollarForkAttachProngSubBoxLargeXSize" value="200.*mm"/>
-    <constant name="UX852CollarForkAttachProngSubBoxLargeYSize" value="200.*mm"/>
-    <constant name="UX852CollarForkAttachProngSubBoxLargeZSize" value="200.*mm"/>
-    <constant name="UX852CollarForkAttachProngSubBoxShiftLocalY" value="4.2*mm"/>
-    <constant name="UX852CollarForkAttachProngSubBoxShiftY" value="-UX852CollarForkAttachProngSubBoxShiftLocalY - 0.5*UX852CollarForkAttachProngSubBoxLargeYSize"/>
-    <constant name="UX852CollarForkAttachProngShiftZ" value="7.0*mm + 0.5*UX852CollarForkAttachProngThickness"/>
-    <constant name="UX852CollarForkAttachProngUpsPosZ" value="-1.0*UX852CollarForkAttachProngShiftZ"/>
-    <constant name="UX852CollarForkAttachProngDnsPosZ" value="UX852CollarForkAttachProngShiftZ"/>
-    <constant name="UX852CollarForkAttachProngTrapX1Size" value="8.0*mm"/>
-    <constant name="UX852CollarForkAttachProngTrapY1Size" value="UX852CollarForkAttachProngThickness"/>
-    <constant name="UX852CollarForkAttachProngTrapX2Size" value="18.0*mm"/>
-    <constant name="UX852CollarForkAttachProngTrapY2Size" value="UX852CollarForkAttachProngThickness"/>
-    <constant name="UX852CollarForkAttachProngTrapZSize" value="12.24*mm"/>
-    <constant name="UX852CollarForkAttachProngTrapRotX" value="(-1.0*pi/2.0)*rad"/>
-    <constant name="UX852CollarForkAttachProngTrapPosY" value="-1.0*(UX852CollarForkAttachProngSubBoxShiftLocalY+0.5*UX852CollarForkAttachProngTrapZSize)"/>
-    <constant name="UX852CollarForkAttachProngTrapUpsPosZ" value="UX852CollarForkAttachProngUpsPosZ"/>
-    <constant name="UX852CollarForkAttachProngTrapDnsPosZ" value="UX852CollarForkAttachProngDnsPosZ"/>
-
-    <constant name="UX852CollarForkAttachProngBoxXSize" value="UX852CollarForkAttachProngTrapX1Size"/>
-    <constant name="UX852CollarForkAttachProngBoxZSize" value="UX852CollarForkAttachProngThickness"/>
-    <constant name="UX852CollarForkAttachProngBoxYSize" value="5.0*mm"/>
-    <constant name="UX852CollarForkAttachProngBoxYPos" value="UX852CollarForkAttachProngTrapPosY-0.5*(UX852CollarForkAttachProngTrapZSize+UX852CollarForkAttachProngBoxYSize-0.1*mm)"/>
-    <constant name="UX852CollarForkAttachProngBoxUpsPosZ" value="UX852CollarForkAttachProngUpsPosZ"/>
-    <constant name="UX852CollarForkAttachProngBoxDnsPosZ" value="UX852CollarForkAttachProngDnsPosZ"/>
-
-    <constant name="UX852CollarForkAttachStemTrapX1Size" value="13.5*mm"/>
-    <constant name="UX852CollarForkAttachStemTrapX2Size" value="24.0*mm"/>
-    <constant name="UX852CollarForkAttachStemTrapY1Size" value="UX852CollarForkAttachProngTrapX1Size"/>
-    <constant name="UX852CollarForkAttachStemTrapY2Size" value="UX852CollarForkAttachProngTrapX1Size"/>
-    <constant name="UX852CollarForkAttachStemTrapZSize" value="24.56*mm"/>
-    <constant name="UX852CollarForkAttachStemLargeCylRadius" value="50.0*mm"/>
-    <constant name="UX852CollarForkAttachStemLargeCylZSize" value="50.0*mm"/>
-
-    <constant name="UX852CollarForkAttachStemCylStartPhi" value="pi*(1.0+ ((18.0/2.0)/180.0) )*rad"/>
-    <constant name="UX852CollarForkAttachStemCylDeltaPhi" value="pi*(1.0- (18.0/180.0) )*rad"/>
-
-    <constant name="UX852CollarForkAttachStemCylRadius" value="9.0*mm"/>
-    <constant name="UX852CollarForkAttachStemCylZSize" value="UX852CollarForkAttachProngTrapX1Size"/>
-    <constant name="UX852CollarForkAttachStemCylCenterZFromTrapCenter" value="-0.5*UX852CollarForkAttachStemTrapZSize + UX852CollarForkAttachStemCylRadius+2.0*mm "/>
-    <constant name="UX852CollarForkAttachStemCylRotX" value="(pi/2)*rad"/>
-    <constant name="UX852CollarForkAttachStemHoleRadiusTolerence" value="0.3*mm"/>
-    <constant name="UX852CollarForkAttachStemHoleRadius" value="4.0*mm+UX852CollarForkAttachStemHoleRadiusTolerence"/>
-    <constant name="UX852CollarForkAttachStemHoleLargeZSize" value="50.0*mm"/>
-    <constant name="UX852CollarForkStemTrdholeX1Size" value="8.0*mm"/>
-    <constant name="UX852CollarForkStemTrdholeX2Size" value="115.0*mm"/>
-    <constant name="UX852CollarForkStemTrdholeY1LargeSize" value="100.0*mm"/>
-    <constant name="UX852CollarForkStemTrdholeY2LargeSize" value="100.0*mm"/>
-    <constant name="UX852CollarForkStemTrdholeLargeZSize" value="100.0*mm"/>
-    <constant name="UX852CollarForkStemTrdholeZPos" value="UX852CollarForkAttachStemCylCenterZFromTrapCenter+8.0*mm+0.5*UX852CollarForkStemTrdholeLargeZSize"/>
-    <constant name="UX852CollarForkStemRotX" value="-(pi/2.0)*rad"/>
-    <constant name="UX852CollarForkStemRotY" value="(pi/2.0)*rad"/>
-    <constant name="UX852CollarForkStemPosY" value="-35.0*mm-UX852CollarForkAttachStemCylCenterZFromTrapCenter"/>
-    <constant name="UX852CollarForkAttachLengthProtrusion" value="35.0*mm"/>
-
-    <!--  Now for the Cable head near the beam pipe -->
-    <!--  Using dimensions from Document with label "S2F Collar -1_HMC" and ID  8045A-13-C-SF2-1 and filename Assembly_S2F_1. Similar document  Assembly_S2F_2 for the second cable   -->
-    <constant name="UX852CableHeadOuterRadius" value="(28.5/2.0)*mm"/>
-    <constant name="UX852CableHeadInnerRadiusTolerence" value="0.2*mm"/>
-    <constant name="UX852CableHeadInnerRadius" value="(12/2.0)*mm +UX852CableHeadInnerRadiusTolerence"/>
-    <constant name="UX852CableHeadSphereRadius" value="9.4*mm"/>
-    <constant name="UX852CableHeadOuterPartInnerRadius" value="UX852CableHeadSphereRadius+0.2*mm"/>
-    <constant name="UX852CableHeadHoleLargeZSize" value="100.0*mm"/>
-
-    <constant name="UX852CableHeadOuterHoleOuterRadius" value="UX852CableHeadOuterRadius-1.5*mm"/>
-    <constant name="UX852CableHeadOuterHoleBeginPhi" value="60*degree"/>
-    <constant name="UX852CableHeadOuterHoleDeltaPhi" value="60*degree"/>
-
-    <constant name="UX852CableHeadBasicThickness" value="11.5*mm"/>
-
-    <constant name="UX852CableHeadCentralPinRadius" value="3.8*mm"/>
-    <constant name="UX852CableHeadCentralPinThickness" value="19.0*mm"/>
-
-    <constant name="UX852CableHeadDemiCableRadius" value="1.5*mm"/>
-    <constant name="UX852CableHeadDemiCableLength" value="50.0*mm"/>
-    <constant name="UX852CableHeadDemiCableTiltAngle" value="0.22*rad"/>
-    <constant name="UX852CableHeadDemiCableSubBoxLargeXSize" value="100*mm"/>
-    <constant name="UX852CableHeadDemiCableSubBoxLargeYSize" value="100*mm"/>
-    <constant name="UX852CableHeadDemiCableSubBoxLargeZSize" value="100*mm"/>
-    <constant name="UX852CableHeadDemiCableSubBoxTilt" value="3.0*UX852CableHeadDemiCableTiltAngle"/>
-    <constant name="UX852CableHeadDemiCableSubBoxPosZ" value="-0.5*(UX852CableHeadDemiCableSubBoxLargeZSize+UX852CableHeadDemiCableLength)+2.2*mm"/>
-    <constant name="UX852CableHeadDemiCableSubBoxFarEndPosZ" value="0.5*(UX852CableHeadDemiCableSubBoxLargeZSize+UX852CableHeadDemiCableLength)+12.0*mm"/>
-    <constant name="UX852CableHeadDemiCablePosY" value="0.4*UX852CableHeadDemiCableLength"/>
-    <constant name="UX852CableHeadDemiCableSideARotX" value="-(pi/2.0)*rad"/>
-    <constant name="UX852CableHeadDemiCableSideAPosX" value="0.5*UX852CableHeadDemiCableLength*sin(UX852CableHeadDemiCableTiltAngle)+UX852CableHeadDemiCableRadius*1.5"/>
-    <constant name="UX852CableHeadDemiCableSideBRotX" value="UX852CableHeadDemiCableSideARotX"/>
-    <constant name="UX852CableHeadDemiCableSideBPosX" value="-1.0*UX852CableHeadDemiCableSideAPosX"/>
-
-    <constant name="UX852CableHeadLengthReductionValue" value="2.0*UX852CableHeadDemiCableLength*cos(UX852CableHeadDemiCableTiltAngle)"/>
-    <constant name="UX852CableHeadLengthReductionValueTolerence" value="4.0*mm"/>
-
-    <!-- Begin Technora CableHead from June 2015 -->
-    <constant name="UX852TechnoraCableHeadTypeAOuterRadius" value="(17.5/2.0)*mm"/>
-    <constant name="UX853TechnoraCableHeadTypeBOuterRadius" value="(16.0/2.0)*mm"/>
-
-    <constant name="UX852TechnoraCableHeadInnerRadiusTolerence" value="0.2*mm"/>
-    <constant name="UX852TechnoraCableHeadInnerRadius" value="(10.0/2.0)*mm+UX852TechnoraCableHeadInnerRadiusTolerence"/>
-    <constant name="UX852TechnoraCableHeadThickness" value="10.8*mm"/>
-    <constant name="UX852TechnoraCableHeadDemiCableLength" value="16*mm"/>
-    <constant name="UX852TechnoraCableHeadDemiCableRadius" value="2.5*mm"/>
-    <constant name="UX852TechnoraCableHeadDemiCableLengthTolerence" value="0.3*mm"/>
-    <constant name="UX852TechnoraCableHeadDemiCableRadiusTolerence" value="0.15*mm"/>
-    <constant name="UX852TechnoraCableHeadDemiCableSidePosY" value="UX852TechnoraCableHeadTypeAOuterRadius+0.5*UX852TechnoraCableHeadDemiCableLength+UX852TechnoraCableHeadDemiCableLengthTolerence"/>
-    <constant name="UX852TechnoraCableHeadDemiCableSideAPosX" value="-UX852TechnoraCableHeadDemiCableRadius-UX852TechnoraCableHeadDemiCableRadiusTolerence"/>
-    <constant name="UX852TechnoraCableHeadDemiCableSideBPosX" value="-1.0*UX852TechnoraCableHeadDemiCableSideAPosX"/>
-    <constant name="UX852TechnoraCableHeadDemiCableRotX" value="(pi/2.0)*rad"/>
-
-    <constant name="UX852TechnoraCableHeadLengthReductionValue" value="2.0*(UX852TechnoraCableHeadDemiCableLength+ UX852TechnoraCableHeadTypeAOuterRadius+UX852TechnoraCableHeadDemiCableLengthTolerence)"/>
-    <constant name="UX852TechnoraCableHeadLengthReductionValueTolerence" value="1.0*mm"/>
-
-    <!-- End Technora Cable Head from June 2015 -->
-
-    <!-- Begin FutureFibre cables from June 2015 -->
-
-    <!-- UX85-2 Fixed Point: FutureFibre Backward Cables, 6.8 mm diameter-->
-    <constant name="UX852FutureFibreCable03Radius" value="2.25*mm"/>
-    <constant name="UX852FutureFibreCable03ZRot" value="45.00*degree"/>
-    <constant name="UX852FutureFibreCable03XRot" value="67.50*degree"/>
-    <constant name="UX852FutureFibreCable03Length" value="1290.0*mm"/>
-
-    <constant name="UX852FutureFibreCable03ReducedLength" value="UX852FutureFibreCable03Length - UX852CableHeadLengthReductionValue"/>
-    <constant name="UX852FutureFibreCableTolerence" value="1.00*mm"/>
-
-    <constant name="UX852FutureFibreCable03PhiPos" value="UX852FutureFibreCable03ZRot"/>
-
-    <constant name="UX852BckCollarForkAttachRpos" value="UX852CollarAttMainHole2RadPos+UX852CollarAttMainPartRPos+ UX852CollarForkAttachLengthProtrusion*sin(UX852FutureFibreCable03XRot)"/>
-    <constant name="UX852BckCollarForkAttachZpos" value="UX852CollarAttMainHole2ZPos+UX852FixCollarZpos-UX852CollarForkAttachLengthProtrusion*cos(UX852FutureFibreCable03XRot)"/>
-    <constant name="UX852FutureFibreCable03RPos" value="UX852BckCollarForkAttachRpos+(0.5*UX852FutureFibreCable03Length-UX852CableHeadLengthReductionValueTolerence)*sin(UX852FutureFibreCable03XRot)+UX852FutureFibreCableTolerence-2.0*mm"/>
-    <constant name="UX852FutureFibreCable03ZPos" value="UX852BckCollarForkAttachZpos-(0.5*UX852FutureFibreCable03Length-UX852CableHeadLengthReductionValueTolerence)*cos(UX852FutureFibreCable03XRot)+UX852FutureFibreCableTolerence"/>
-    <constant name="UX852FutureFibreCable03PhiPosTolerence" value="-0.01*degree"/>
-
-    <!-- UX85-2 Fixed Point: Technora Forward Cables, 4.5 mm diameter-->
-
-    <constant name="UX852TechnoraCable04Radius" value="2.25*mm"/>
-    <constant name="UX852TechnoraCable04Length" value="3360.00*mm"/>
-
-    <constant name="UX852TechnoraCable04XRot" value="45.00*degree"/>
-    <constant name="UX852TechnoraCable04ZRot" value="UX852FixCollarZrot"/>
-    <constant name="UX852TechnoraCable04ReducedLength" value="UX852TechnoraCable04Length - UX852TechnoraCableHeadLengthReductionValue"/>
-    <constant name="UX852TechnoraCableTolerence" value="1.00*mm"/>
-
-    <constant name="UX852TechnoraCable04RShift" value="-UX852CollarAttMainHole1RadPos+UX852CollarAttMainPartRPos"/>
-    <constant name="UX852TechnoraCable04ZShift" value="UX852CollarAttMainHole1ZPos+UX852FixCollarZpos"/>
-    <constant name="UX852FwdTechnoraCableHeadPhiPos" value="UX852FixCollarZrot-0.05*degree"/>
-    <constant name="UX852TechnoraCableHeadPhiPosTolerence" value="-0.025*degree"/>
-
-    <constant name="UX852TechnoraCable04PhiPos" value="UX852TechnoraCable04ZRot"/>
-    <constant name="UX852TechnoraCable04PhiPosTolerence" value="-0.01*degree"/>
-    <constant name="UX852TechnoraCable04RPos" value="UX852TechnoraCable04RShift+(0.5*UX852TechnoraCable04Length-UX852TechnoraCableHeadLengthReductionValueTolerence)*sin(UX852TechnoraCable04XRot)+UX852TechnoraCableTolerence"/>
-    <constant name="UX852TechnoraCable04ZPos" value="UX852TechnoraCable04ZShift+(0.5*UX852TechnoraCable04Length-UX852TechnoraCableHeadLengthReductionValueTolerence)*cos(UX852TechnoraCable04XRot)+UX852TechnoraCableTolerence"/>
-
-    <!-- UX85-3 Fixed Point: FutureFibre Backward Vertical Cable, 6.8 mm diameter-->
-    <constant name="UX853FutureFibreCable05Radius" value="3.4*mm"/>
-    <constant name="UX853FutureFibreCable05Length" value="2590.0*mm"/>
-    <constant name="UX853FutureFibreCable05ReducedLength" value="UX853FutureFibreCable05Length - UX852CableHeadLengthReductionValue"/>
-
-    <!-- UX85-3 Fixed Point: FutureFibre Backward Horizontal Cable, 6.8 mm diameter-->
-    <constant name="UX853FutureFibreCable06Radius" value="3.4*mm"/>
-    <constant name="UX853FutureFibreCable06Length" value="1710.0*mm"/>
-    <constant name="UX853FutureFibreCable06ReducedLength" value="UX853FutureFibreCable06Length - UX852CableHeadLengthReductionValue"/>
-
-    <!-- UX85-3 Fixed Point: Technora Forward Vertical Cable, 4.5 mm diameter-->
-    <constant name="UX853TechnoraCable07Radius" value="2.25*mm"/>
-    <constant name="UX853TechnoraCable07Length" value="2080.0*mm"/>
-    <constant name="UX853TechnoraCable07ReducedLength" value="UX853TechnoraCable07Length - UX852TechnoraCableHeadLengthReductionValue"/>
-
-    <!-- UX85-3 Fixed Point: Technora Forward Horizontal Cable, 4.5 mm diameter-->
-    <constant name="UX853TechnoraCable08Radius" value="2.25*mm"/>
-    <constant name="UX853TechnoraCable08Length" value="1690.0*mm"/>
-    <constant name="UX853TechnoraCable08ReducedLength" value="UX853TechnoraCable08Length - UX852TechnoraCableHeadLengthReductionValue"/>
-
-    <!-- Now to position the cable heads for the Future fibre cable -->
-    <constant name="UX852CableHeadHRotX" value="(pi/2)*rad"/>
-
-    <constant name="UX852FwdCableHeadMagnetFaceRpos" value="UX852TechnoraCable04RPos+ (0.5*UX852TechnoraCable04Length-UX852CableHeadLengthReductionValueTolerence+4.5*mm)*sin(UX852TechnoraCable04XRot)"/>
-    <constant name="UX852FwdCableHeadMagnetFaceZpos" value="UX852TechnoraCable04ZPos+ (0.5*UX852TechnoraCable04Length-UX852CableHeadLengthReductionValueTolerence+4.5*mm)*cos(UX852TechnoraCable04XRot) "/>
-    <constant name="UX852FwdCableHeadMagnetFacePhiPos" value="UX852FixCollarZrot-0.05*degree"/>
-
-    <constant name="UX852FutureFibreCableHeadCommonRotZ" value="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 40.2*degree"/>
-    <constant name="UX852TechnoraCableHeadCommonRotZ" value="-UX852FixCollarSect1DelthaAngle - UX852FixCollarSect1Rot - 40.2*degree"/>
-
-    <constant name="UX852TechnoraCableHeadCommonRotZWithTolerence" value="UX852TechnoraCableHeadCommonRotZ + 1.2*degree"/>
-    <constant name="UX852FutureFibreCableHeadCommonRotZWithBckTolerence" value="UX852FutureFibreCableHeadCommonRotZ+2.7*degree"/>
-
-    <constant name="UX852FutureFibreCableHeadPhiPosTolerence" value="-0.025*degree"/>
-
-    <constant name="UX852BckCollarForkAttachPhiPos" value="UX852FixCollarZrot-0.05*degree"/>
-    <constant name="UX852BckCollarForkAttachRotX" value="(pi/2)*rad"/>
-
-    <constant name="UX852BckCollarForkAttachMagnetFaceRpos" value="UX852FutureFibreCable03RPos+ (0.5*UX852FutureFibreCable03Length-UX852CableHeadLengthReductionValueTolerence+1.0*mm)*sin(UX852FutureFibreCable03XRot)"/>
-    <constant name="UX852BckCollarForkAttachMagnetFaceZpos" value="UX852FutureFibreCable03ZPos- (0.5*UX852FutureFibreCable03Length-UX852CableHeadLengthReductionValueTolerence)*cos(UX852FutureFibreCable03XRot) "/>
-    <constant name="UX852BckCollarForkAttachMagnetFacePhiPos" value="UX852FixCollarZrot-0.05*degree"/>
-
-    <!-- End FutureFibre cables from June 2015 -->
-
-    <!-- End Beampipe cable support modifications in Magnet from June 2015 -->
-
-    <!-- ***************************************************************** -->
-    <!-- * UX85-3 Fixed Point                                            * -->
-    <!-- ***************************************************************** -->
-    <!-- UX85-3 Fixed Point: Collar before/after rib and around -->
-
-    <constant name="UX853FixCollarLenght" value="40.00*mm"/>
-    <constant name="UX853FixCollarRibLenght" value="8.00*mm"/>
-    <constant name="UX853FixCollarBeforeRibLenght" value="0.5*(UX853FixCollarLenght - UX853FixCollarRibLenght)"/>
-    <constant name="UX853FixCollarInnerRadius" value="35.5*mm"/>
-    <constant name="UX853FixCollarRibInnerRadius" value="81.30*mm"/>
-    <constant name="UX853FixCollarOuterRadius" value="133.00*mm"/>
-    <constant name="UX853FixCollarZpos" value="7150.00*mm - 0.5*Regions:BeforeMagnetZSize"/>
-
-    <!-- Inner ring -->
-    <constant name="UX853FixCollarRingInnerRad" value="90.50*mm"/>
-    <constant name="UX853FixCollarRingOuterRad" value="93.50*mm"/>
-    <constant name="UX853FixCollarInnerRad" value="UX853FixCollarRingOuterRad"/>
-    <constant name="UX853FixCollarRingLength" value="12.00*mm"/>
-
-    <!-- Big ring -->
-    <constant name="UX853FixCollarOuterRad" value="103.00*mm"/>
-    <constant name="UX853FixCollarAttOuterRad" value="119.50*mm"/>
-    <constant name="UX853FixCollarLength" value="25.00*mm"/>
-    <constant name="UX853FixCollarQuarterRot" value="90*degree"/>
-    <constant name="UX853FixCollarDeltaPhi" value="90*degree"/>
-    <constant name="UX853FixCollarPhiStart" value="(90-34)*degree"/>
-
-    <!--Big Ring Cuts -->
-    <constant name="UX853FixCollarCircleCutDeltaPhi" value="50*degree"/>
-    <constant name="UX853BigRingQuarterSlope2Phipos" value="UX853FixCollarPhiStart + UX853FixCollarDeltaPhi - 0.75*UX853FixCollarCircleCutDeltaPhi-5*degree"/>
-    <constant name="UX853BigRingQuarterSlopePhipos" value="UX853FixCollarPhiStart+0.25*UX853FixCollarCircleCutDeltaPhi"/>
-    <constant name="UX853BigRingQuarterSlopeZrot" value="130*degree"/>
-    <constant name="UX853BigRingQuarterSlopeXsize" value="30*mm"/>
-    <constant name="UX853BigRingQuarterSlopeYsize" value="50*mm"/>
-
-    <!-- Big transverse holes in it -->
-    <constant name="UX853FixCollarTransHoleRad" value="5.00*mm"/>
-    <constant name="UX853FixCollarTransHoleLength" value="0.5*(UX853FixCollarOuterRad-UX853FixCollarInnerRad)"/>
-    <constant name="UX853FixCollarTransHoleRpos" value="UX853FixCollarOuterRad-0.5*UX853FixCollarTransHoleLength"/>
-    <constant name="UX853FixCollarTransHolePhipos" value="UX853FixCollarPhiStart+34*degree+45*degree"/>
-
-    <!-- Collar clips -->
-    <!--begin to remove in future -->
-    <constant name="UX853CollarClipDeltaPhi" value="120.00*degree - 0.20*degree"/>
-    <constant name="UX853CollarGapDeltaPhi" value="0.20*degree"/>
-    <!-- end to remove in fuutre -->
-
-    <constant name="UX853CollarClipSFDeltaPhi" value="120.00*degree"/>
-    <constant name="UX853CollarGapSFDeltaPhi" value="0.20*degree"/>
-    <constant name="UX853CollarClipSFStartPhi" value="-0.5*UX853CollarClipSFDeltaPhi+ 0.5*UX853CollarGapSFDeltaPhi"/>
-
-    <constant name="UX853CollarClipHoleRing12TotalLength" value="14.5*mm"/>
-
-    <!-- Ring one -->
-    <constant name="UX853CollarClipRing1Length" value="2.90*mm"/>
-    <constant name="UX853CollarClipRing1InnerRad" value="80.30*mm"/>
-    <constant name="UX853CollarClipRing1OuterRad" value="90.50*mm"/>
-
-    <!-- Ring two -->
-    <constant name="UX853CollarClipRing2Length" value="UX853CollarClipHoleRing12TotalLength - UX853CollarClipRing1Length"/>
-    <constant name="UX853CollarClipRing2InnerRad" value="75.30*mm"/>
-    <constant name="UX853CollarClipRing2OuterRad" value="93.50*mm"/>
-
-    <!-- Holes -->
-    <constant name="UX853CollarClipHolesLength" value="17.00*mm"/>
-    <constant name="UX853CollarClipHolesRad" value="2.25*mm"/>
-    <constant name="UX853CollarClipHolesRpos" value="86.00*mm"/>
-    <constant name="UX853CollarClipHolesDeltaPhiSF" value="30*degree"/>
-    <constant name="UX853CollarClipHoleDoubleRingTotalLength" value="2*UX853CollarClipHoleRing12TotalLength"/>
-
-    <!-- The following in June2015 from type M6 in iso4762 -->
-    <constant name="UX853CollarClipHoleScrewHeadLength" value="4.0*mm"/>
-    <constant name="UX853CollarClipHoleScrewLengthTolerence" value="0.2*mm"/>
-    <constant name="UX853CollarClipHoleScrewLength" value="37.5*mm"/>
-    <constant name="UX853CollarClipHoleScrewRad" value="1.5*mm"/>
-    <constant name="UX853CollarClipHoleScrewHeadRad" value="3.5*mm"/>
-    <constant name="UX853CollarClipHoleScrewSubLargeLength" value="50.0*mm"/>
-    <constant name="UX853CollarClipHoleScrewSubLargeRadius" value="10.0*mm"/>
-    <constant name="UX853CollarClipHoleScrewSubPosZ" value="0.5*(UX853CollarClipHoleScrewSubLargeLength-UX853CollarClipHoleScrewLength) + UX853CollarClipHoleScrewHeadLength "/>
-    <constant name="UX853CollarClipHoleScrewPosZ" value="0.5*UX853CollarClipHoleScrewLength-0.5*UX853CollarClipHoleDoubleRingTotalLength-UX853CollarClipHoleScrewHeadLength-UX853CollarClipHoleScrewLengthTolerence"/>
-
-    <!-- Cable Attachments -->
-    <!-- Collar part -->
-
-    <!--Rounded edges -->
-    <constant name="UX853CollarAttMainPartEdge1InnerRad" value="12.0*mm"/>
-    <constant name="UX853CollarAttMainPartEdge1DeltaPhi" value="90*degree"/>
-    <constant name="UX853CollarAttMainPartEdge1StartPhi" value="270*degree"/>
-    <constant name="UX853CollarAttMainPartEdge2InnerRad" value="10.0*mm"/>
-    <constant name="UX853CollarAttMainPartEdge2StartPhi" value="45*degree"/>
-    <constant name="UX853CollarAttMainPartEdge2DeltaPhi" value="90*degree"/>
-    <constant name="UX853CollarAttMainPartEdge2bStartPhi" value="0*degree"/>
-    <constant name="UX853CollarAttMainPartEdge2bDeltaPhi" value="45*degree"/>
-
-    <constant name="UX853CollarAttMainPartXsize" value="40.0*mm"/>
-    <constant name="UX853CollarAttMainPartYsize" value="52.0*mm"/>
-    <constant name="UX853CollarAttMainPartZsize" value="8.0*mm"/>
-    <constant name="UX853CollarAttMainPartRPos" value="97*mm+0.5*UX853CollarAttMainPartXsize"/>
-    <constant name="UX853CollarAttMainPartZPos" value="UX853FixCollarZpos - 0.5*UX853CollarAttMainPartYsize + 0.5*UX853FixCollarLength + UX853CollarAttMainPartEdge2InnerRad-1.5*mm"/>
-    <constant name="UX853CollarAttMainPartPhiShift" value="5.5*degree"/>
-
-    <!--Holes -->
-    <constant name="UX853CollarAttMainHoleRadTolerence" value="0.2*mm"/>
-    <constant name="UX853CollarAttMainHole1Rad" value="6*mm+ UX853CollarAttMainHoleRadTolerence"/>
-    <constant name="UX853CollarAttMainHole1RadPos" value="-(109*mm-UX853FixCollarInnerRad-0.5*UX853CollarAttMainPartXsize-3*mm)"/>
-    <constant name="UX853CollarAttMainHole1ZPos" value="-29.5*mm+0.5*UX852FixCollarLength+0.5*UX853CollarAttMainPartYsize-0.5*UX853FixCollarLength-3*mm"/>
-    <constant name="UX853CollarAttMainHole2Rad" value="5*mm + UX853CollarAttMainHoleRadTolerence"/>
-    <constant name="UX853CollarAttMainHole2RadPos" value="128*mm-UX853FixCollarInnerRad-0.5*UX853CollarAttMainPartXsize-3*mm"/>
-    <constant name="UX853CollarAttMainHole2ZPos" value="1.6*mm+0.5*UX853FixCollarLength+0.5*UX853CollarAttMainPartYsize-0.5*UX853FixCollarLength - UX853CollarAttMainPartEdge2InnerRad -3*mm"/>
-
-    <!--Slope 1-->
-    <constant name="UX853CollarAttSlope1RPos" value="0.5*UX853CollarAttMainPartXsize+8*mm"/>
-    <constant name="UX853CollarAttSlope1YRot" value="-90*degree+9.7*degree"/>
-    <constant name="UX853CollarAttSlope1Zpos" value="0.5*UX853CollarAttMainPartYsize+UX853CollarAttMainPartXsize+3*mm"/>
-    <!--Slope 2-->
-    <constant name="UX853CollarAttSlope2RPos" value="0.5*UX853CollarAttMainPartXsize+13*mm"/>
-    <constant name="UX853CollarAttSlope2ZPos" value="0*mm"/>
-    <constant name="UX853CollarAttSlope2YRot" value="-90*degree+61.8*degree"/>
-    <!-- Collar part -->
-    <constant name="UX853CollarAttMainPartRad" value="16.00*mm"/>
-    <constant name="UX853CollarAttMainPartLength" value="66.00*mm"/>
-    <!-- Holes in it -->
-    <constant name="UX853CollarAttMainBigHoleLength" value="40.00*mm"/>
-    <constant name="UX853CollarAttMainBigHoleRad" value="6.00*mm"/>
-    <constant name="UX853CollarAttMainBigHoleZpos" value="23.00*mm"/>
-    <constant name="UX853CollarAttMainBigHoleYpos" value="-2.70*mm"/>
-    <constant name="UX853CollarAttMainSmallHoleLength" value="20.00*mm"/>
-    <constant name="UX853CollarAttMainSmallHoleRad" value="0.20*mm"/>
-    <constant name="UX853CollarAttMainSmallHoleZpos1" value="10.00*mm - UX853CollarAttMainPartLength*0.5"/>
-    <constant name="UX853CollarAttMainSmallHoleZpos2" value="30.00*mm - UX853CollarAttMainPartLength*0.5"/>
-    <constant name="UX853CollarAttMainSmallHoleYpos" value="UX853CollarAttMainPartRad - 0.5*UX853CollarAttMainSmallHoleLength"/>
-    <constant name="UX853CollarAttMainBoxHoleZsize" value="UX853CollarAttMainPartLength - 41.50*mm"/>
-    <constant name="UX853CollarAttMainBoxHoleYsize" value="40.00*mm"/>
-    <constant name="UX853CollarAttMainBoxHoleXsize" value="14.00*mm"/>
-    <constant name="UX853CollarAttMainBoxHoleZpos" value="0.5*(UX853CollarAttMainPartLength - UX853CollarAttMainBoxHoleZsize)"/>
-    <!-- Circle -->
-    <constant name="UX853CollarAttCircleRad" value="20.00*mm"/>
-    <constant name="UX853CollarAttCircleLength" value="3.00*mm"/>
-    <constant name="UX853CollarAttCircleZpos" value="-0.5*(UX853CollarAttMainPartLength + UX853CollarAttCircleLength)"/>
-    <!-- Cut in it -->
-    <constant name="UX853CollarAttCircleCutBoxZsize" value="2.50*mm"/>
-    <constant name="UX853CollarAttCircleCutBoxYsize" value="40.00*mm"/>
-    <constant name="UX853CollarAttCircleCutBoxXsize" value="12.00*mm"/>
-    <!-- Plate -->
-    <constant name="UX853CollarAttPlateZsize" value="15.00*mm"/>
-    <constant name="UX853CollarAttPlateYsize1" value="13.40*mm"/>
-    <constant name="UX853CollarAttPlateXsize1" value="8.00*mm"/>
-    <constant name="UX853CollarAttPlateYsize2" value="43.60*mm"/>
-    <constant name="UX853CollarAttPlateXsize2" value="8.00*mm"/>
-    <constant name="UX853CollarAttPlateZpos" value="-0.5*(UX853CollarAttMainPartLength + UX853CollarAttPlateZsize) - UX853CollarAttCircleLength"/>
-    <constant name="UX853CollarAttPlateYpos" value="-0.5*UX853CollarAttPlateYsize1"/>
-    <constant name="UX853CollarAttPlateXpos" value="0.5*(UX853CollarAttCircleCutBoxXsize + UX853CollarAttPlateXsize1)"/>
-    <constant name="UX853CollarAttPlateCutZsize" value="18.00*mm"/>
-    <constant name="UX853CollarAttPlateCutYsize" value="18.00*mm"/>
-    <constant name="UX853CollarAttPlateCutXsize" value="10.00*mm"/>
-    <constant name="UX853CollarAttPlateCutZpos" value="UX853CollarAttPlateZpos"/>
-    <constant name="UX853CollarAttPlateCutYpos" value="0.5*(UX853CollarAttPlateCutYsize + UX853CollarAttPlateYsize1)"/>
-    <constant name="UX853CollarAttPlateCutXpos" value="UX853CollarAttPlateXpos"/>
-    <!-- Hole in it -->
-    <constant name="UX853CollarAttTrdHoleRad" value="4.00*mm"/>
-    <constant name="UX853CollarAttTrdHoleLength" value="40.00*mm"/>
-    <constant name="UX853CollarAttTrdHoleZpos" value="-3.00*mm"/>
-    <constant name="UX853CollarAttTrdHoleYpos" value="1.60*mm"/>
-
-    <!-- UX85-3 Fixed Point: Backward Cables, 3.0 mm diameter-->
-    <constant name="UX853FixCollarCable03Radius" value="1.50*mm"/>
-    <constant name="UX853FixCollarCable03Lenght" value="3127.00*mm"/>
-    <constant name="UX853FixCollarCable03Theta" value="79.1*degree"/>
-
-    <!--  Some of the following may be obsolete and be removed -->
-    <!-- Forward cable part -->
-    <constant name="UX853FwdCableAttMainRad" value="9.00*mm"/>
-    <constant name="UX853FwdCableAttMainLength" value="57.50*mm"/>
-    <constant name="UX853FwdCableAttRingOuterRad" value="9.50*mm"/>
-    <constant name="UX853FwdCableAttRingInnerRad" value="4.00*mm"/>
-    <constant name="UX853FwdCableAttRingDeltaAng" value="143*degree"/>
-    <constant name="UX853FwdCableAttCut1SizeX" value="3.00*mm"/>
-    <constant name="UX853FwdCableAttCut1SizeY" value="2*UX853FwdCableAttMainRad"/>
-    <constant name="UX853FwdCableAttCut1SizeZ" value="13.00*mm+UX853FwdCableAttRingOuterRad"/>
-    <constant name="UX853FwdCableAttCut2SizeX" value="2.50*mm"/>
-    <constant name="UX853FwdCableAttCut2SizeY" value="2*UX853FwdCableAttMainRad"/>
-    <constant name="UX853FwdCableAttCut2SizeZ" value="10.00*mm"/>
-    <constant name="UX853FwdCableAttCut2posZ" value="23.00*mm"/>
-    <constant name="UX853FwdCableAttHoleRad" value="UX853FwdCableAttRingInnerRad"/>
-    <constant name="UX853FwdCableAttLongHoleRad" value="4.00*mm"/>
-    <constant name="UX853FwdCableAttLongHoleLength" value="27.00*mm"/>
-    <constant name="UX853FwdCableAttZpos" value="UX853CollarAttMainPartZPos+UX853CollarAttMainHole2ZPos+0.5*UX853FwdCableAttMainLength*cos(UX853FixCollarCable03Theta)-2*mm"/>
-    <constant name="UX853FwdCableAttRpos" value="UX853CollarAttMainHole2RadPos+UX853CollarAttMainPartRPos+0.5*UX853FwdCableAttMainLength*sin(UX853FixCollarCable03Theta) -0.5*UX853CollarAttMainHole2Rad-0.5*UX853FwdCableAttRingOuterRad-3*mm"/>
-
-    <!-- end  Some the parts  may be obsolete and be removed in future -->
-
-    <!-- Forward rod -->
-
-    <!-- Forward rod at UX853 Modified in June 2015 from LHCBVC8B-167-A -->
-    <constant name="UX853FwdCableAttRodRad" value="5.00*mm"/>
-    <constant name="UX853FwdCableAttRodLength" value="36.10*mm"/>
-    <constant name="UX853FwdCableAttRodCutRad" value="4.80*mm"/>
-    <constant name="UX853FwdCableAttRodCutLength" value="1.10*mm"/>
-    <constant name="UX853FwdCableAttRodCutZpos" value="3.60*mm"/>
-    <constant name="UX853FwdCableAttRodInnerHoleRad" value="4.0*mm"/>
-    <constant name="UX853FwdCableAttRodHeadLength" value="1.5*mm"/>
-    <constant name="UX853FwdCableAttRodHeadRad" value="6.5*mm"/>
-    <constant name="UX853FwdCableAttRodManPartLargeLength" value="50.0*mm"/>
-    <constant name="UX853FwdCableAttRodManPartPosZ" value="-0.5*UX853FwdCableAttRodLength+0.5*UX853FwdCableAttRodManPartLargeLength+UX853FwdCableAttRodHeadLength"/>
-
-    <constant name="UX853FwdCableAttRodZpos" value="UX853CollarAttMainPartZPos+UX853CollarAttMainHole2ZPos"/>
-    <constant name="UX853FwdCableAttRodRpos" value="UX853CollarAttMainHole2RadPos+UX853CollarAttMainPartRPos"/>
-
-     <!-- UX85-3 Fixed Point: Forward Rods, 8.0 mm -->
-    <constant name="UX853FixCollarCable08Radius" value="4.00*mm"/>
-    <constant name="UX853FixCollarCable08Lenght" value="3200.00*mm"/>
-    <constant name="UX853FixCollarCable08Theta" value="45.00*degree"/>
-
-    <!-- Backward cable part -->
-    <constant name="UX853BckCableAttMainRad" value="10.00*mm"/>
-    <constant name="UX853BckCableAttMainLength" value="62.00*mm"/>
-    <constant name="UX853BckCableAttRingOuterRad" value="14.00*mm"/>
-    <constant name="UX853BckCableAttRingInnerRad" value="6.00*mm"/>
-    <constant name="UX853BckCableAttRingDeltaAng" value="89*degree"/>
-    <constant name="UX853BckCableAttCut1SizeX" value="3.00*mm"/>
-    <constant name="UX853BckCableAttCut1SizeY" value="2*UX853BckCableAttMainRad"/>
-    <constant name="UX853BckCableAttCut1SizeZ" value="18*mm+UX853BckCableAttRingOuterRad"/>
-    <constant name="UX853BckCableAttCut2SizeX" value="2.00*mm"/>
-    <constant name="UX853BckCableAttCut2SizeY" value="2*UX853BckCableAttMainRad"/>
-    <constant name="UX853BckCableAttCut2SizeZ" value="10.00*mm"/>
-    <constant name="UX853BckCableAttCut2posZ" value="18.00*mm"/>
-    <constant name="UX853BckCableAttHoleRad" value="UX853BckCableAttRingInnerRad"/>
-    <constant name="UX853BckCableAttLongHoleRad" value="4.00*mm"/>
-    <constant name="UX853BckCableAttLongHoleLength" value="34.00*mm"/>
-    <constant name="UX853BckCableAttZpos" value="UX853CollarAttMainPartZPos+UX853CollarAttMainHole1ZPos-0.5*UX853BckCableAttMainLength*cos(UX853FixCollarCable08Theta) +0.5*UX853CollarAttMainHole1Rad+0.5*UX853BckCableAttRingOuterRad"/>
-    <constant name="UX853BckCableAttRpos" value="-UX853CollarAttMainHole1RadPos+UX853CollarAttMainPartRPos+0.5*UX853BckCableAttMainLength*sin(UX853FixCollarCable08Theta) -0.5*UX853CollarAttMainHole1Rad-0.5*UX853BckCableAttRingOuterRad"/>
-
-    <!-- Backward rod -->
-    <!-- Backward rod at UX853 Modified in June 2015 from LHCVC8B-164-A -->
-
-    <constant name="UX853BckCableAttRodRad" value="6.00*mm"/>
-    <constant name="UX853BckCableAttRodLength" value="36.10*mm"/>
-    <constant name="UX853BckCableAttRodCutRad" value="5.75*mm"/>
-    <constant name="UX853BckCableAttRodCutLength" value="1.10*mm"/>
-    <constant name="UX853BckCableAttRodCutZpos" value="3.60*mm"/>
-    <constant name="UX853BckCableAttRodInnerHoleRad" value="3.0*mm"/>
-    <constant name="UX853BckCableAttRodHeadLength" value="1.5*mm"/>
-    <constant name="UX853BckCableAttRodHeadRad" value="7.5*mm"/>
-    <constant name="UX853BckCableAttRodManPartLargeLength" value="50.0*mm"/>
-    <constant name="UX853BckCableAttRodManPartPosZ" value="-0.5*UX853BckCableAttRodLength+0.5*UX853BckCableAttRodManPartLargeLength+UX853BckCableAttRodHeadLength"/>
-
-    <constant name="UX853BckCableAttRodZpos" value="UX853CollarAttMainPartZPos+UX853CollarAttMainHole1ZPos"/>
-    <constant name="UX853BckCableAttRodRpos" value="-UX853CollarAttMainHole1RadPos+UX853CollarAttMainPartRPos"/>
-
-    <!-- Now to place the Collar attachment in UX 853 from June 2015 -->
-    <!-- begin test param added March 27 ,2006  SE
-     Modified June 16, 2015  SE  for the new cables at UX853
-     The cable heads are labelled  as one looks from the interaction point along the positive Z axis.
-     The labels 1,2,3,4 are for Vertical, right horiz, bottom, left horiz respectively.-->
-
-    <!-- End place the Collar attachment in UX 853 from June 2015 -->
-
-    <constant name="UX853FixCollarCableFwdTheta" value="79.1*degree"/>
-    <constant name="UX853FixCollarCableBckTheta" value="45.00*degree"/>
-    <constant name="UX853FixCollarCablePlaneAbsRotZ" value="90*degree"/>
-    <constant name="UX853FixCollarCableFwdPlaneRotZTopVertical" value="90.0*degree+UX853FixCollarCablePlaneAbsRotZ"/>
-    <constant name="UX853FixCollarCableFwdPlaneRotZBotVertical" value="270*degree+UX853FixCollarCablePlaneAbsRotZ"/>
-
-    <constant name="UX853FixCollarCableFwdPlaneRotZHorizRight" value="UX853FixCollarCablePlaneAbsRotZ"/>
-    <constant name="UX853FixCollarCableFwdPlaneRotZHorizLeft" value="180*degree+UX853FixCollarCablePlaneAbsRotZ"/>
-
-    <constant name="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizRight" value="UX853FixCollarCableFwdPlaneRotZHorizRight"/>
-    <constant name="UX853FixCollarCableFwdSpPlaneRotPhiAxisHorizLeft" value="UX853FixCollarCableFwdPlaneRotZHorizLeft"/>
-
-    <constant name="UX853FwdCableHeadZpos" value="UX853FwdCableAttRodZpos"/>
-    <constant name="UX853FwdCableHeadRpos" value="UX853FwdCableAttRodRpos"/>
-    <constant name="UX853FwdCableHeadCommonPhipos" value="UX853FixCollarPhiStart+34*degree"/>
-
-    <constant name="UX853BckCableHeadZpos" value="UX853BckCableAttRodZpos"/>
-    <constant name="UX853BckCableHeadRpos" value="UX853BckCableAttRodRpos"/>
-    <constant name="UX853BckCableHeadCommonPhipos" value="UX853FixCollarPhiStart+34*degree"/>
-
-    <constant name="UX853FixCollarCableBckPlaneRotZHorizRight" value="UX853FixCollarCablePlaneAbsRotZ"/>
-    <constant name="UX853FixCollarCableBckPlaneRotZHorizLeft" value="UX853FixCollarCablePlaneAbsRotZ"/>
-    <constant name="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizRight" value="UX853FixCollarCableBckPlaneRotZHorizRight+ 180*degree "/>
-    <constant name="UX853FixCollarCableBckSpPlaneRotPhiAxisHorizLeft" value="UX853FixCollarCableBckPlaneRotZHorizLeft"/>
-
-    <!-- Now Place cables in UX853 -->
-    <constant name="UX853BckCable05ZPos" value="UX853BckCableHeadZpos - (0.5*UX853FutureFibreCable05Length -UX852CableHeadLengthReductionValueTolerence)*cos(UX853FixCollarCableBckTheta)+UX852FutureFibreCableTolerence"/>
-    <constant name="UX853BckCable05RPos" value="UX853BckCableHeadRpos + (0.5*UX853FutureFibreCable05Length -UX852CableHeadLengthReductionValueTolerence)*sin(UX853FixCollarCableBckTheta)+UX852FutureFibreCableTolerence"/>
-
-    <constant name="UX853BckCable05HeadMagnetFaceZpos" value="UX853BckCable05ZPos - (0.5*UX853FutureFibreCable05Length - UX852CableHeadLengthReductionValueTolerence +4.5*mm) * cos(UX853FixCollarCableBckTheta)"/>
-    <constant name="UX853BckCable05HeadMagnetFaceRpos" value="UX853BckCable05RPos + (0.5*UX853FutureFibreCable05Length - UX852CableHeadLengthReductionValueTolerence +4.5*mm)*sin(UX853FixCollarCableBckTheta)"/>
-    <constant name="UX853BckCable05HeadMagnetFaceCommonPhipos" value="UX853BckCableHeadCommonPhipos"/>
-
-    <constant name="UX853BckCable06ZPos" value="UX853BckCableHeadZpos - (0.5*UX853FutureFibreCable06Length -UX852CableHeadLengthReductionValueTolerence)*cos(UX853FixCollarCableBckTheta)+UX852FutureFibreCableTolerence"/>
-    <constant name="UX853BckCable06RPos" value="UX853BckCableHeadRpos + (0.5*UX853FutureFibreCable06Length -UX852CableHeadLengthReductionValueTolerence)*sin(UX853FixCollarCableBckTheta)+UX852FutureFibreCableTolerence"/>
-
-    <constant name="UX853BckCable06HeadMagnetFaceZpos" value="UX853BckCable06ZPos - (0.5*UX853FutureFibreCable06Length - UX852CableHeadLengthReductionValueTolerence +4.5*mm) * cos(UX853FixCollarCableBckTheta)"/>
-    <constant name="UX853BckCable06HeadMagnetFaceRpos" value="UX853BckCable06RPos + (0.5*UX853FutureFibreCable06Length - UX852CableHeadLengthReductionValueTolerence +4.5*mm)*sin(UX853FixCollarCableBckTheta)"/>
-    <constant name="UX853BckCable06HeadMagnetFaceCommonPhipos" value="UX853BckCableHeadCommonPhipos"/>
-
-    <constant name="UX853FwdCable07ZPos" value="UX853FwdCableHeadZpos + (0.5*UX853TechnoraCable07Length -UX852TechnoraCableHeadLengthReductionValueTolerence)*cos(UX853FixCollarCableFwdTheta)+UX852TechnoraCableTolerence"/>
-    <constant name="UX853FwdCable07RPos" value="UX853FwdCableHeadRpos + (0.5*UX853TechnoraCable07Length -UX852TechnoraCableHeadLengthReductionValueTolerence)*sin(UX853FixCollarCableFwdTheta)+UX852TechnoraCableTolerence"/>
-
-    <constant name="UX853FwdCable07HeadMagnetFaceZpos" value="UX853FwdCable07ZPos + (0.5*UX853TechnoraCable07Length - UX852TechnoraCableHeadLengthReductionValueTolerence+4.5*mm) * cos(UX853FixCollarCableFwdTheta)"/>
-    <constant name="UX853FwdCable07HeadMagnetFaceRpos" value="UX853FwdCable07RPos + (0.5*UX853TechnoraCable07Length - UX852CableHeadLengthReductionValueTolerence+4.5*mm)*sin(UX853FixCollarCableFwdTheta)"/>
-    <constant name="UX853FwdCable07HeadMagnetFaceCommonPhipos" value="UX853FwdCableHeadCommonPhipos"/>
-
-    <constant name="UX853FwdCable08ZPos" value="UX853FwdCableHeadZpos + (0.5*UX853TechnoraCable08Length -UX852TechnoraCableHeadLengthReductionValueTolerence)*cos(UX853FixCollarCableFwdTheta)+UX852TechnoraCableTolerence"/>
-    <constant name="UX853FwdCable08RPos" value="UX853FwdCableHeadRpos + (0.5*UX853TechnoraCable08Length -UX852TechnoraCableHeadLengthReductionValueTolerence)*sin(UX853FixCollarCableFwdTheta)+UX852TechnoraCableTolerence"/>
-
-    <constant name="UX853FwdCable08HeadMagnetFaceZpos" value="UX853FwdCable08ZPos + (0.5*UX853TechnoraCable08Length - UX852TechnoraCableHeadLengthReductionValueTolerence+4.5*mm) * cos(UX853FixCollarCableFwdTheta)"/>
-    <constant name="UX853FwdCable08HeadMagnetFaceRpos" value="UX853FwdCable08RPos + (0.5*UX853TechnoraCable08Length - UX852CableHeadLengthReductionValueTolerence+4.5*mm)*sin(UX853FixCollarCableFwdTheta)"/>
-    <constant name="UX853FwdCable08HeadMagnetFaceCommonPhipos" value="UX853FwdCableHeadCommonPhipos"/>
-
-    <!-- End place Cables in UX 853 -->
-    <!-- begin test param added March 27 ,2006  SE
-     Modified June 16, 2015  SE  for the new cables at UX853
-
-     the cable08 is backward pointing cable and cable 03 is forward pointing cable
-     wrt the Z axis.
-     The cables are labelled  as one looks from the interaction point along the positive Z axis.
-     TopLeft , TopRight BottomLeft, Bottom Right  -->
-
-    <constant name="UX853FixCollarCableRadialTolerence" value="2.0*mm"/>
-    <constant name="UX853FixCollarCable08ZTolerence" value="5.0*mm"/>
-    <constant name="UX853FixCollarCable03ZTolerence" value="2.0*mm"/>
-
-
-  </define>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-UX851.xml b/compact/components/Pipe/2025-v00.00/Magnet-UX851.xml
deleted file mode 100644
index ce2d80526..000000000
--- a/compact/components/Pipe/2025-v00.00/Magnet-UX851.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<pipe>
-
-  <!-- ************************************************************** -->
-  <!-- * BEAM PIPE                                                  * -->
-  <!-- * Sections in MagnetRegion                                   * -->
-  <!-- *   from z=2270 mm to z=7620 mm                          * -->
-  <!-- *                                                            * -->
-  <!-- * UX85-1, Compensator at 2800mm, UX85-2, Bellow connection   * -->
-  <!-- * at 6900 and UX85-3                                         * -->
-  <!-- *                                                            * -->
-  <!-- * Author: Gloria Corti                                       * -->
-  <!-- *                                                            * -->
-  <!-- * Consists of                                                * -->
-  <!-- *   UX85-1:                                                  * -->
-  <!-- *     - conical sections of 10 mrad of different thickness   * -->
-  <!-- *       and materials                                        * -->
-  <!-- *     - flange                                               * -->
-  <!-- *   and corresponding vaccum conical sections                * -->
-  <!-- ************************************************************** -->
-
-  <!-- UX85-1 Cone 10 mrad of Beryllium 1mm thick   -->
-  <!-- Start at end of BeforeMagnet Region          -->
-  <!-- <volume vis="UT:PipeHeater" material="UT:PipeHeater" name="lvUTPipeHeaterDownstreamInMagnet">
-		<shape name="utPipeHeaterInUT" operation="subtraction" type="BooleanShape">
-			<shape dz="UTPipeHeaterDownstreamLength/2" name="UTPipeHeaterDownstream" rmax2="UTPipeHeaterDownstreamRadiusZmax+UTPipeHeaterDownstreamThick" rmax1="UTPipeHeaterDownstreamRadiusZmin+UTPipeHeaterDownstreamThick" rmin2="UTPipeHeaterDownstreamRadiusZmax" rmin1="UTPipeHeaterDownstreamRadiusZmin" type="ConeSegment" />
-			<shape rmax="UTPipeHeaterDownstreamRadiusZmax+UTPipeHeaterDownstreamThick+UTEpsilon" dz="UTPipeHeaterDownstreamLengthInUT/2+UTEpsilon" name="UTPipeHeaterDownstreamInUTSubMagnet" type="Tube" />
-			<position z="UTPipeHeaterDownstreamZmin+UTPipeHeaterDownstreamLengthInUT/2-UTPipeHeaterDownstreamPos-UTSystemZ-UTEpsilon" />
-		</shape>
-	</volume> -->
-
-  <volume name="lvUX851Cone08B" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-1-Cone10mrad-08B"
-           dz="0.5*UX851Cone08BLenght"
-           rmin1="UX851Cone08BRadiusZmin"
-           rmin2="UX851Cone08BRadiusZmax"
-           rmax1="UX851Cone08BRadiusZmin+UX851Cone08BThick"
-           rmax2="UX851Cone08BRadiusZmax+UX851Cone08BThick"/>
-  </volume>
-
-  <!-- UX85-1 Cone 10 mrad of Beryllium 1.5mm thick for welding  -->
-  <volume name="lvUX851Cone09" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-1-Cone10mrad-09"
-           dz="0.5*UX851Cone09Lenght"
-           rmin1="UX851Cone09RadiusZmin"
-           rmin2="UX851Cone09RadiusZmax"
-           rmax1="UX851Cone09RadiusZmin+UX851Cone09Thick"
-           rmax2="UX851Cone09RadiusZmax+UX851Cone09Thick"/>
-  </volume>
-
-  <!-- UX85-1 Cone 10 mrad of Alumimium 1.5mm thick for flange  -->
-  <volume name="lvUX851Cone10" material="Pipe:Al2219F" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-1-Cone10mrad-10"
-           dz="0.5*UX851Cone10Lenght"
-           rmin1="UX851Cone10RadiusZmin"
-           rmin2="UX851Cone10RadiusZmax"
-           rmax1="UX851Cone10RadiusZmin+UX851Cone10Thick"
-           rmax2="UX851Cone10RadiusZmax+UX851Cone10Thick"/>
-  </volume>
-
-  <!-- UX85-1 Flange  -->
-  <volume name="lvUX851Flange11" material="Pipe:Al2219F" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-1-Flange11"
-           dz="0.5*UX851Flange11Lenght"
-           rmin1="UX851Flange11RadiusZmin"
-           rmin2="UX851Flange11RadiusZmax"
-           rmax1="UX851Flange11OuterRadius"
-           rmax2="UX851Flange11OuterRadius"/>
-  </volume>
-
-  <!-- Vacuum in UX851InMagnet -->
-  <volume name="lvUX851Vacuum08B" material="Vacuum" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-1-Vacuum-08B"
-           dz="0.5*UX851Vacuum08BLenght"
-           rmax1="UX851Cone08BRadiusZmin"
-           rmax2="UX851Flange11RadiusZmax"/>
-  </volume>
-
-  <volume name="lvUX851InMagnet" vis="Pipe:Magnet">
-    <!-- <physvol name="pvUTPipeHeaterDownstreamInMagnet" volume="lvUTPipeHeaterDownstreamInMagnet">
-      <position z="UTPipeHeaterDownstreamLengthInMagnet-UTPipeHeaterDownstreamLength/2"/>
-    </physvol> -->
-
-    <physvol name="pvUX851Cone08B"               volume="lvUX851Cone08B">
-      <position z="UX851Cone08BZpos"/>
-    </physvol>
-
-    <physvol name="pvUX851Cone09"                volume="lvUX851Cone09">
-      <position z="UX851Cone09Zpos"/>
-    </physvol>
-
-    <physvol name="pvUX851Cone10"                volume="lvUX851Cone10">
-      <position z="UX851Cone10Zpos"/>
-    </physvol>
-
-    <physvol name="pvUX851Flange11"              volume="lvUX851Flange11">
-      <position z="UX851Flange11Zpos"/>
-    </physvol>
-
-    <!-- Now the vacuum inside -->
-    <physvol name="pvUX851Vacuum08B"             volume="lvUX851Vacuum08B">
-      <position z="0.5*UX851Vacuum08BLenght"/>
-    </physvol>
-
-  </volume>
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-UX852.xml b/compact/components/Pipe/2025-v00.00/Magnet-UX852.xml
deleted file mode 100644
index 8ab1a3bb3..000000000
--- a/compact/components/Pipe/2025-v00.00/Magnet-UX852.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<pipe>
-
-  <!-- ************************************************************** -->
-  <!-- * BEAM PIPE                                                  * -->
-  <!-- * Sections in MagnetRegion                                   * -->
-  <!-- *   from z=2270 mm to z=7620 mm                          * -->
-  <!-- *                                                            * -->
-  <!-- * Author: Gloria Corti                                       * -->
-  <!-- *                                                            * -->
-  <!-- * Consists of                                                * -->
-  <!-- *   UX85-2:                                                  * -->
-  <!-- *     - conical sections of 10 mrad of different thickness   * -->
-  <!-- *     - two flanges                                          * -->
-  <!-- *   and corresponding vaccum conical sections                * -->
-  <!-- ************************************************************** -->
-
-  <!-- UX85-2 Flange  -->
-  <volume name="lvUX852Flange01" material="Pipe:Al2219F" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Flange01"
-           dz="0.5*UX852Flange01Lenght"
-           rmin1="UX852Flange01RadiusZmin"
-           rmin2="UX852Flange01RadiusZmax"
-           rmax1="UX852Flange01OuterRadius"
-           rmax2="UX852Flange01OuterRadius"/>
-  </volume>
-
-  <!-- UX85-2 Cone 10 mrad of Alumimium 1.5mm thick for flange  -->
-  <volume name="lvUX852Cone02" material="Pipe:Al2219F" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Cone10mrad-02"
-           dz="0.5*UX852Cone02Lenght"
-           rmin1="UX852Cone02RadiusZmin"
-           rmin2="UX852Cone02RadiusZmax"
-           rmax1="UX852Cone02RadiusZmin + UX852Cone02Thick"
-           rmax2="UX852Cone02RadiusZmax + UX852Cone02Thick"/>
-  </volume>
-
-  <!-- UX85-2 Cone 10 mrad of Beryllium 1.0mm thick -->
-  <volume name="lvUX852Cone03" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Cone10mrad-03"
-           dz="0.5*UX852Cone03Lenght"
-           rmin1="UX852Cone03RadiusZmin"
-           rmin2="UX852Cone03RadiusZmax"
-           rmax1="UX852Cone03RadiusZmin + UX852Cone03Thick"
-           rmax2="UX852Cone03RadiusZmax + UX852Cone03Thick"/>
-  </volume>
-  <!-- UX85-2 Cone 10 mrad of Beryllium section for support A  -->
-  <volume name="lvUX852Cone04A" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Cone10mrad-04A"
-           dz="0.5*UX852Cone04ALenght"
-           rmin1="UX852Cone04ARadiusZmin"
-           rmin2="UX852Cone04ARadiusZmax"
-           rmax1="UX852Cone04ARadiusZmin + UX852Cone04AThick"
-           rmax2="UX852Cone04ARadiusZmax + UX852Cone04AThick"/>
-  </volume>
-  <!-- UX85-2 Cone 10 mrad of Beryllium section for support B - cylindrical on outside -->
-  <volume name="lvUX852Cone04B" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Cone10mrad-04B"
-           dz="0.5*UX852Cone04BLenght"
-           rmin1="UX852Cone04BRadiusZmin"
-           rmin2="UX852Cone04BRadiusZmax"
-           rmax1="UX852Cone04BOuterRadius"
-           rmax2="UX852Cone04BOuterRadius"/>
-  </volume>
-  <!-- UX85-2 Cone 10 mrad of Beryllium section for support C -->
-  <volume name="lvUX852Cone04C" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Cone10mrad-04C"
-           dz="0.5*UX852Cone04CLenght"
-           rmin1="UX852Cone04CRadiusZmin"
-           rmin2="UX852Cone04CRadiusZmax"
-           rmax1="UX852Cone04CRadiusZmin + UX852Cone04CThick"
-           rmax2="UX852Cone04CRadiusZmax + UX852Cone04CThick"/>
-  </volume>
-  <!-- UX85-2 Cone 10 mrad of Beryllium section for support - flange surrounds B section -->
-  <volume name="lvUX852Cone04Rib" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="Tube" name="UX85-2-Cone04-Rib"
-           dz="0.5*UX852Cone04RibLenght"
-           rmin="UX852Cone04RibInnerRadius"
-           rmax="UX852Cone04RibOuterRadius"/>
-  </volume>
-  <!-- UX85-2 Cone 10 mrad of Beryllium section for support A+B+C+flange -->
-  <volume name="lvUX852Cone04"  vis="Pipe:Magnet">
-    <physvol name="pvUX852Cone04A"             volume="lvUX852Cone04A">
-      <position z="-0.5*UX852Cone04Lenght + 0.5*UX852Cone04ALenght"/>
-    </physvol>
-    <physvol name="pvUX852Cone04B"             volume="lvUX852Cone04B">
-      <position z="-0.5*UX852Cone04Lenght + UX852Cone04ALenght + 0.5*UX852Cone04BLenght"/>
-    </physvol>
-    <physvol name="pvUX852Cone04C"             volume="lvUX852Cone04C">
-      <position z="-0.5*UX852Cone04Lenght + UX852Cone04ALenght + UX852Cone04BLenght + 0.5*UX852Cone04CLenght"/>
-    </physvol>
-    <physvol name="pvUX852Cone04Rib"           volume="lvUX852Cone04Rib">
-      <position z="-0.5*UX852Cone04Lenght + UX852Cone04ALenght + 0.5*UX852Cone04BLenght"/>
-    </physvol>
-  </volume>
-  <!-- UX85-2 Cone 10 mrad of Beryllium 1.0 mm thick -->
-  <volume name="lvUX852Cone05" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Cone10mrad-05"
-           dz="0.5*UX852Cone05Lenght"
-           rmin1="UX852Cone05RadiusZmin"
-           rmin2="UX852Cone05RadiusZmax"
-           rmax1="UX852Cone05RadiusZmin + UX852Cone05Thick"
-           rmax2="UX852Cone05RadiusZmax + UX852Cone05Thick"/>
-  </volume>
-  <!-- UX85-2 Cone 10 mrad of Beryllium 1.1 mm thick -->
-  <volume name="lvUX852Cone06" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Cone10mrad-06"
-           dz="0.5*UX852Cone06Lenght"
-           rmin1="UX852Cone06RadiusZmin"
-           rmin2="UX852Cone06RadiusZmax"
-           rmax1="UX852Cone06RadiusZmin + UX852Cone06Thick"
-           rmax2="UX852Cone06RadiusZmax + UX852Cone06Thick"/>
-  </volume>
-  <!-- UX85-2 Cone 10 mrad of Beryllium 1.3 mm thick -->
-  <volume name="lvUX852Cone07" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Cone10mrad-07"
-           dz="0.5*UX852Cone07Lenght"
-           rmin1="UX852Cone07RadiusZmin"
-           rmin2="UX852Cone07RadiusZmax"
-           rmax1="UX852Cone07RadiusZmin + UX852Cone07Thick"
-           rmax2="UX852Cone07RadiusZmax + UX852Cone07Thick"/>
-  </volume>
-  <!-- UX85-2 Cone 10 mrad of Aluminum 2.0 mm thick -->
-  <volume name="lvUX852Cone08" material="Pipe:Al2219F" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Cone10mrad-08"
-           dz="0.5*UX852Cone08Lenght"
-           rmin1="UX852Cone08RadiusZmin"
-           rmin2="UX852Cone08RadiusZmax"
-           rmax1="UX852Cone08RadiusZmin + UX852Cone08Thick"
-           rmax2="UX852Cone08RadiusZmax + UX852Cone08Thick"/>
-  </volume>
-  <!-- UX85-2 Flange -->
-  <volume name="lvUX852Flange09" material="Pipe:Al2219F" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Flange09"
-           dz="0.5*UX852Flange09Lenght"
-           rmin1="UX852Flange09RadiusZmin"
-           rmin2="UX852Flange09RadiusZmax"
-           rmax1="UX852Flange09OuterRadius"
-           rmax2="UX852Flange09OuterRadius"/>
-  </volume>
-  <!-- Vacuum in UX852 -->
-  <volume name="lvUX852Vacuum01" material="Vacuum" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-2-Vacuum-01"
-           dz="0.5*UX852Vacuum01Lenght"
-           rmax1="UX852Flange01RadiusZmin"
-           rmax2="UX852Flange09RadiusZmax"/>
-  </volume>
-
-  <!-- UX85-2 Pipes of Al and Be -->
-  <volume name="lvUX852" vis="Pipe:Magnet">
-    <physvol name="pvUX852Flange01"             volume="lvUX852Flange01">
-      <position z="UX852Flange01Zpos"/>
-    </physvol>
-    <physvol name="pvUX852Cone02"               volume="lvUX852Cone02">
-      <position z="UX852Cone02Zpos"/>
-    </physvol>
-    <physvol name="pvUX852Cone03"               volume="lvUX852Cone03">
-      <position z="UX852Cone03Zpos"/>
-    </physvol>
-    <physvol name="pvUX852Cone04"               volume="lvUX852Cone04">
-      <position z="UX852Cone04Zpos"/>
-    </physvol>
-    <physvol name="pvUX852Cone05"               volume="lvUX852Cone05">
-      <position z="UX852Cone05Zpos"/>
-    </physvol>
-    <physvol name="pvUX852Cone06"               volume="lvUX852Cone06">
-      <position z="UX852Cone06Zpos"/>
-    </physvol>
-    <physvol name="pvUX852Cone07"               volume="lvUX852Cone07">
-      <position z="UX852Cone07Zpos"/>
-    </physvol>
-    <physvol name="pvUX852Cone08"               volume="lvUX852Cone08">
-      <position z="UX852Cone08Zpos"/>
-    </physvol>
-    <physvol name="pvUX852Flange09"             volume="lvUX852Flange09">
-      <position z="UX852Flange09Zpos"/>
-    </physvol>
-    <physvol name="pvUX852Vacuum01"             volume="lvUX852Vacuum01">
-      <position z="0.5*UX852Vacuum01Lenght"/>
-    </physvol>
-
-  </volume>
-
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet-UX853.xml b/compact/components/Pipe/2025-v00.00/Magnet-UX853.xml
deleted file mode 100644
index be50cae71..000000000
--- a/compact/components/Pipe/2025-v00.00/Magnet-UX853.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<pipe>
-
-
-  <!-- ************************************************************** -->
-  <!-- * BEAM PIPE                                                  * -->
-  <!-- * Sections in MagnetRegion                                   * -->
-  <!-- *   from z=2270 mm to z=7620 mm                          * -->
-  <!-- *                                                            * -->
-  <!-- * Author: Gloria Corti                                       * -->
-  <!-- *                                                            * -->
-  <!-- * Consists of                                                * -->
-  <!-- *   UX85-3:                                                  * -->
-  <!-- *     - one flange                                           * -->
-  <!-- *     - conical section of 10 mrad                           * -->
-  <!-- *   and corresponding vaccum conical sections                * -->
-  <!-- ************************************************************** -->
-
-  <!-- UX85-3 Flange  -->
-  <volume name="lvUX853Flange01" material="Pipe:Al2219F" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-3-Flange01"
-           dz="0.5*UX853Flange01Lenght"
-           rmin1="UX853Flange01RadiusZmin"
-           rmin2="UX853Flange01RadiusZmax"
-           rmax1="UX853Flange01OuterRadius"
-           rmax2="UX853Flange01OuterRadius"/>
-  </volume>
-  <!-- UX85-3 Cone 10 mrad of Alumimium ~2-2.4*mm thick for flange  -->
-  <volume name="lvUX853Cone02" material="Pipe:Al2219F" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-3-Cone10mrad-02"
-           dz="0.5*UX853Cone02Lenght"
-           rmin1="UX853Cone02RadiusZmin"
-           rmin2="UX853Cone02RadiusZmax"
-           rmax1="UX853Cone02OuterRadius"
-           rmax2="UX853Cone02OuterRadius"/>
-  </volume>
-  <!-- UX85-3 Cone 10 mrad of Beryllium ~2*mm thick for welding and -->
-  <!-- support flange  -->
-  <volume name="lvUX853Cone03" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-3-Cone10mrad-03"
-           dz="0.5*UX853Cone03Lenght"
-           rmin1="UX853Cone03RadiusZmin"
-           rmin2="UX853Cone03RadiusZmax"
-           rmax1="UX853Cone03OuterRadius"
-           rmax2="UX853Cone03OuterRadius"/>
-  </volume>
-  <!-- UX85-3 little flange for support, surrounds Cone03 -->
-  <volume name="lvUX853Cone03Flange" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="Tube" name="UX85-3-Cone03-Flange"
-           dz="0.5*UX853Cone03FlangeLenght"
-           rmin="UX853Cone03FlangeInnerRadius"
-           rmax="UX853Cone03FlangeOuterRadius"/>
-  </volume>
-  <!-- UX85-3 Cone 10 mrad of Beryllium 1.4 mm thick -->
-  <volume name="lvUX853Cone04" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-3-Cone10mrad-04"
-           dz="0.5*UX853Cone04Lenght"
-           rmin1="UX853Cone04RadiusZmin"
-           rmin2="UX853Cone04RadiusZmax"
-           rmax1="UX853Cone04RadiusZmin + UX853Cone04Thick"
-           rmax2="UX853Cone04RadiusZmax + UX853Cone04Thick"/>
-  </volume>
-  <!-- UX85-3 Cone 10 mrad of Beryllium 1.6 mm thick -->
-  <volume name="lvUX853Cone05A" material="Pipe:BeTV56" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-3-Cone10mrad-05A"
-           dz="0.5*UX853Cone05ALenght"
-           rmin1="UX853Cone05ARadiusZmin"
-           rmin2="UX853Cone05ARadiusZmax"
-           rmax1="UX853Cone05ARadiusZmin + UX853Cone05AThick"
-           rmax2="UX853Cone05ARadiusZmax + UX853Cone05AThick"/>
-  </volume>
-  <!-- Vacuum in UX853InMagnet -->
-  <volume name="lvUX853Vacuum01" material="Vacuum" vis="Pipe:Magnet">
-    <shape type="ConeSegment" name="UX85-3-Vacuum-01"
-           dz="0.5*UX853Vacuum01Lenght"
-           rmax1="UX853Flange01RadiusZmin"
-           rmax2="UX853Cone05ARadiusZmax"/>
-  </volume>
-
-  <volume name="lvUX853InMagnet" vis="Pipe:Magnet">
-    <physvol name="pvUX853Flange01"                volume="lvUX853Flange01">
-      <position z="UX853Flange01Zpos"/>
-    </physvol>
-    <physvol name="pvUX853Cone02"                   volume="lvUX853Cone02">
-      <position z="UX853Cone02Zpos"/>
-    </physvol>
-    <physvol name="pvUX853Cone03"                   volume="lvUX853Cone03">
-      <position z="UX853Cone03Zpos"/>
-    </physvol>
-    <physvol name="pvUX853Cone03Flange"             volume="lvUX853Cone03Flange">
-      <position z="UX853Cone03FlangeZpos"/>
-    </physvol>
-    <physvol name="pvUX853Cone04"                   volume="lvUX853Cone04">
-      <position z="UX853Cone04Zpos"/>
-    </physvol>
-    <physvol name="pvUX853Cone05A"                  volume="lvUX853Cone05A">
-      <position z="UX853Cone05AZpos"/>
-    </physvol>
-    <!-- Now the vacuum inside -->
-    <physvol name="pvUX853Vacuum01"                 volume="lvUX853Vacuum01">
-      <position z="0.5*UX853Vacuum01Lenght"/>
-    </physvol>
-
-  </volume>
-
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Magnet.xml b/compact/components/Pipe/2025-v00.00/Magnet.xml
deleted file mode 100644
index 2f5354c0b..000000000
--- a/compact/components/Pipe/2025-v00.00/Magnet.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-
-  <detectors>
-    <detector name="PipeMagnet" type="DD4hep_VolumeAssembly" parent="${PipeMagnet:parent}" vis="Pipe:Vis">
-      <!-- ************************************************************** -->
-      <!-- * BEAM PIPE                                                  * -->
-      <!-- * Sections in MagnetRegion                                   * -->
-      <!-- *   from z=2270 mm to z=7620 mm                              * -->
-      <!-- *                                                            * -->
-      <!-- * UX85-1, Compensator at 2800mm, UX85-2, Bellow connection   * -->
-      <!-- * at 6900 and UX85-3                                         * -->
-      <!-- *                                                            * -->
-      <!-- * Author: Gloria Corti                                       * -->
-      <!-- *                                                            * -->
-      <!-- * Consists of                                                * -->
-      <!-- *   UX85-1:                                                  * -->
-      <!-- *     - conical sections of 10 mrad of different thickness   * -->
-      <!-- *       and materials                                        * -->
-      <!-- *     - flange                                               * -->
-      <!-- *   Compensator:                                             * -->
-      <!-- *     - two bellows                                          * -->
-      <!-- *     - conical sections of 10 mrad                          * -->
-      <!-- *     - two flanges                                          * -->
-      <!-- *   UX85-2:                                                  * -->
-      <!-- *     - conical sections of 10 mrad of different thickness   * -->
-      <!-- *     - two flanges                                          * -->
-      <!-- *   Bellow at 6900:                                          * -->
-      <!-- *     - one bellows                                          * -->
-      <!-- *     - conical section of 10 mrad                           * -->
-      <!-- *     - two flanges                                          * -->
-      <!-- *   UX85-3:                                                  * -->
-      <!-- *     - one flange                                           * -->
-      <!-- *     - conical section of 10 mrad                           * -->
-      <!-- *   and corresponding vaccum conical sections                * -->
-      <!-- ************************************************************** -->
-
-      <include ref="Magnet-UX851.xml"/>
-      <include ref="Magnet-UX852.xml"/>
-      <include ref="Magnet-UX853.xml"/>
-      <include ref="Magnet-Bellows.xml"/>
-      <include ref="Magnet-Compensator.xml"/>
-
-      <!--==================================================================================-->
-      <!--===================================Final  Assembly================================-->
-      <!--==================================================================================-->
-      <!-- For the moment assume sections put at 0.0 of this (set with center
-	   at start of MagnetRegion (=2700 mm) -->
-      <envelope type="Assembly" name="lvUX85InMagnet" vis="Pipe:Magnet">
-	<physvol name="pvUX851InMagnet"		 volume="lvUX851InMagnet">
-	  <position z="0.0*mm"/>
-	</physvol>
-	<physvol name="pvUX85Compensator2800"    volume="lvUX85Compensator2800">
-	  <position z="UX851InMagnetLenght"/>
-	</physvol>
-	<physvol name="pvUX852"  		 volume="lvUX852">
-	  <position z="UX851InMagnetLenght + UX85C2800Lenght"/>
-	</physvol>
-	<physvol name="pvUX85Bellow6900"	 volume="lvUX85Bellow6900">
-	  <position z="UX851InMagnetLenght + UX85C2800Lenght + UX852Lenght"/>
-	</physvol>
-	<physvol name="pvUX853" 		 volume="lvUX853InMagnet">
-	  <position z="UX851InMagnetLenght + UX85C2800Lenght + UX852Lenght + UX85B6900Lenght"/>
-	</physvol>
-      </envelope>
-      <!-- Central position of the pipe in the magnet region  -->
-      <position z= "0.5*Regions:BeforeMagnetZSize - Regions:MagnetRegionZPos" />
-      <nodebug/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeAfterMagnet.xml b/compact/components/Pipe/2025-v00.00/PipeAfterMagnet.xml
deleted file mode 100644
index 0623811e6..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeAfterMagnet.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="AfterMagnet-Params.xml"/>
-  <include ref="AfterMagnet-Bakeout.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeAfterMuon.xml b/compact/components/Pipe/2025-v00.00/PipeAfterMuon.xml
deleted file mode 100644
index f12873179..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeAfterMuon.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="AfterMuon-Params.xml"/>
-  <include ref="AfterMuon.xml"/>
-  <include ref="VMA/VMA-AA-Downstream.xml"/>
-  <include ref="VMA/VMA-AA-DownstreamVax.xml"/>
-  <include ref="VMA/VMA-BJ.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeAfterT.xml b/compact/components/Pipe/2025-v00.00/PipeAfterT.xml
deleted file mode 100644
index 9d87ef226..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeAfterT.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="AfterT.xml"/>
-  <include ref="AfterT-Support.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeBeforeMagGeomParams.xml b/compact/components/Pipe/2025-v00.00/PipeBeforeMagGeomParams.xml
deleted file mode 100644
index 59b1cde20..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeBeforeMagGeomParams.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-<define>
-<!-- ***************************************************************** -->
-<!-- *  BeamPipe in BeforeMagnet geometry parameters                 * -->
-<!-- *                                                               * -->
-<!-- *  Date: 2006-03-02                                             * -->
-<!-- *  Author: Gloria Corti                                         * -->
-<!-- *                                                               * -->
-<!-- *  The connection to Velo window is in Velo2Rich1               * -->
-<!-- *  This section of the beam pipe extend from z=970mm to 2700mm  * -->
-<!-- *                                                               * -->
-<!-- ***************************************************************** -->
-
-<!-- ***************************************************************** -->
-<!-- * UX85-1 In RICH1                                               * -->
-<!-- ***************************************************************** -->
-
-<!-- UX84-2 -->
-  <constant name = "UX842CylLength"    value =  "1621.00*mm"/>
-  <constant name = "UX842CylThick"     value =  "2.00*mm"/>
-  <constant name = "UX842CylRadius"    value = "40.00*mm"/>
-
-<!-- UX84 Flange Down -->
-  <constant name = "UX84FlangeDownLength"    value =  "20.00*mm"/>
-  <constant name = "UX84FlangeDownThick"     value =  "34.00*mm"/>
-  <constant name = "UX84FlangeDownRadius"    value = "UX842CylRadius+UX842CylThick"/>
-  <constant name = "UX84FlangeDownPosZ"      value = "UX842CylLength/2-UX84FlangeDownLength/2"/>
-
-<!-- UX84 Support -->
-  <constant name = "PipeSupBefVeloRec1X"       value =  "300.00*mm"/>
-  <constant name = "PipeSupBefVeloRec1Y"       value =  "380.00*mm"/>
-  <constant name = "PipeSupBefVeloRec1Z"       value =  "15.00*mm"/>
-  <constant name = "PipeSupBefVeloRec1HoleRad" value =  "81.00*mm"/>
-  <constant name = "PipeSupBefVeloRec2X"       value =  "180.00*mm"/>
-  <constant name = "PipeSupBefVeloRec2Y"       value =  "187.00*mm"/>
-  <constant name = "PipeSupBefVeloRec2Z"       value =  "20.00*mm"/>
-  <constant name = "PipeSupBefVeloRec2HoleRad" value =  "42.50*mm"/>
-
-<!-- UX85-1 Step to 54 mm diameter (after RF connection in Velo2Rich1 -->
-  <constant name = "UX851Cyl01Lenght"  value =  "1.00*mm"/>
-  <constant name = "UX851Cyl01Thick"   value =  "3.50*mm"/>
-  <constant name = "UX851Cyl01Radius"  value = "27.00*mm"/>
-  <constant name = "UX851Cyl01Zpos"    value = "0.5*UX851Cyl01Lenght"/>
-
-<!-- UX85-1 Cylinder 54 mm diamater Aluminium -->
-  <constant name  = "UX851Cyl02Lenght"  value = "16.00*mm"/>
-  <constant name  = "UX851Cyl02Thick"   value =  "1.50*mm"/>
-  <constant name  = "UX851Cyl02Radius"  value = "27.00*mm"/>
-  <constant name  = "UX851Cyl02Zpos"
-             value = "UX851Cyl01Lenght + 0.5*UX851Cyl02Lenght"/>
-
-<!-- UX85-1 Cylinder 54 mm diamater Beryllium - welding              -->
-<!--    extend from z = 987 mm to z = 982 mm -  RICH1SubMaster split -->
-<!-- ***************************************************************** -->
-  <constant name  = "UX851Cyl03Lenght"   value = "5.00*mm"/>
-  <constant name  = "UX851Cyl03Thick"    value = "1.50*mm"/>
-  <constant name  = "UX851Cyl03Radius"   value = "27.00*mm"/>
-
-  <constant name  = "UX851Cyl03ALenght"
-             value = "UX851Rich1SplitZminIP - UX851ZStartIP - UX851Cyl01Lenght -
-                      UX851Cyl02Lenght"/>
-  <constant name  = "UX851Cyl03AZpos"
-             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + 0.5*UX851Cyl03ALenght"/>
-
-  <constant name  = "UX851Cyl03BLenght"
-             value = "UX851Cyl03Lenght - UX851Cyl03ALenght"/>
-  <constant name  = "UX851Cyl03BZpos"
-             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03ALenght+
-                      0.5*UX851Cyl03BLenght"/>
-
-<!-- UX85-1 Cylinder 54 mm diamater Beryllium -->
-  <constant name  = "UX851Cyl04Lenght"   value = "88.00*mm"/>
-  <constant name  = "UX851Cyl04Radius"   value = "27.00*mm"/>
-  <constant name  = "UX851Cyl04Thick"    value =  "1.00*mm"/>
-  <constant name  = "UX851Cyl04Zpos"
-             value = "UX851Cyl01Lenght + UX851Cyl02Lenght+UX851Cyl03Lenght +
-                      0.5*UX851Cyl04Lenght"/>
-
-<!-- UX85-1 Cone 25 mrad                                               -->
-<!--    extend from z = 1080 mm to z = 2210 mm -  RICH1SubMaster split -->
-<!-- ***************************************************************** -->
-  <constant name  = "UX851Cone05Lenght"      value = "1130.00*mm"/>
-  <constant name  = "UX851Cone05Thick"       value =    "1.00*mm"/>
-
-  <constant name  = "UX851Cone05ALenght"
-             value = "UX851Rich1SplitZmaxIP - UX851ZStartIP - UX851Cyl01Lenght -
-                      UX851Cyl02Lenght - UX851Cyl03Lenght - UX851Cyl04Lenght"/>
-  <constant name  = "UX851Cone05ARadiusZmin" value = "27.00*mm"/>
-  <constant name  = "UX851Cone05ARadiusZmax"
-             value = "UX851Rich1SplitZmaxIP*tan(UX851Angle)"/>
-  <constant name  = "UX851Cone05AZpos"
-             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght +
-                      UX851Cyl04Lenght + 0.5*UX851Cone05ALenght"/>
-
-  <constant name  = "UX851Cone05BLenght"
-             value = "UX851Cone05Lenght - UX851Cone05ALenght"/>
-  <constant name  = "UX851Cone05BRadiusZmin" value = "UX851Cone05ARadiusZmax"/>
-  <constant name  = "UX851Cone05BRadiusZmax" value = "55.21*mm"/>
-  <constant name  = "UX851Cone05BZpos"
-             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght+
-                      UX851Cyl04Lenght + UX851Cone05ALenght + 0.5*UX851Cone05BLenght"/>
-
-<!-- UX85-1 Flange to seal RICH1 gas enclosure - around UX851Cone05 -->
-  <constant name  = "UX851Rich1Flange1Length"      value = "1*mm"/>
-  <constant name  = "UX851Rich1FlangeOffset"
-             value = "UX851Rich1FlangeOffsetIP - UX851ZStartIP"/>
-  <constant name  = "UX851Rich1FlangeOuterRadius"  value = "63.00*mm"/>
-  <constant name  = "UX851Rich1FlangeRadiusZmin"
-             value = "UX851Rich1FlangeOffsetIP*tan(UX851Angle) +
-                      UX851Cone05Thick"/>
-  <constant name  = "UX851Rich1FlangeRadiusZMax"
-             value = "(UX851Rich1FlangeOffsetIP + UX851Rich1Flange1Length)*
-                      tan(UX851Angle) + UX851Cone05Thick"/>
-  <constant name  = "UX851Rich1FlangeZpos"
-             value = "UX851Rich1FlangeOffset + 0.5*UX851Rich1Flange1Length"/>
-
-<!-- UX85-1 Window of -37 degree at end of 25 mrad cone -->
-  <constant name  = "UX851Win06Lenght"      value = "40.10*mm"/>
-  <constant name  = "UX851Win06Thick"       value = "1.0*mm"/>
-  <constant name  = "UX851Win06RadiusZmin"  value = "UX851Cone05BRadiusZmax"/>
-  <constant name  = "UX851Win06RadiusZmax"  value = "25*mm"/>
-  <constant name  = "UX851Win06Zpos"
-             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght +
-                      UX851Cyl04Lenght + UX851Cone05Lenght + 0.5*UX851Win06Lenght"/>
-
-<!-- UX85-1 Cylinder of 50 mm diameter                             -->
-<!--    extend from z = 2250.1 mm to z = 2500 mm -  RICH1/TT split -->
-<!--    Rich1 section                                              -->
-  <constant name  = "UX851Cyl07Lenght"  value = "249.90*mm"/>
-  <constant name  = "UX851Cyl07Thick"   value =   "1.00*mm"/>
-  <constant name  = "UX851Cyl07Radius"  value =  "25.00*mm"/>
-
-  <constant name  = "UX851Cyl07ALenght"
-             value = "UX851Rich1TTSplitZposIP - UX851ZStartIP - UX851Cyl01Lenght -
-                      UX851Cyl02Lenght - UX851Cyl03Lenght - UX851Cyl04Lenght -
-                      UX851Cone05Lenght - UX851Win06Lenght"/>
-  <constant name  = "UX851Cyl07AZpos"
-             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght +
-                      UX851Cyl04Lenght + UX851Cone05Lenght + UX851Win06Lenght +
-                      0.5*UX851Cyl07ALenght"/>
-
-<!-- UX85-1 in Rich1 -->
-  <constant name  = "UX851Rich1ALenght"
-             value = "UX851Cyl01Lenght+UX851Cyl02Lenght+UX851Cyl03ALenght"/>
-  <constant name  = "UX851Rich1BLenght"
-             value = "UX851Cyl03BZpos+UX851Cyl04Lenght+UX851Cone05ALenght"/>
-  <constant name  = "UX851Rich1CLenght"
-             value = "UX851Cone05BLenght+UX851Win06Lenght+UX851Cyl07ALenght"/>
-
-  <constant name  = "UX851InRich1Lenght"
-             value = "UX851Cyl01Lenght + UX851Cyl02Lenght + UX851Cyl03Lenght +
-                      UX851Cyl04Lenght + UX851Cone05Lenght + UX851Win06Lenght +
-                      UX851Cyl07ALenght"/>
-
-<!-- Vacuum sections overlapping various of the mechanical sections above -->
-<!-- only segmentation due to shape or regions -->
-<!-- Rich1 Before SubMaster                    -->
-  <constant name  = "UX85Vacuum01Lenght"
-             value = "UX851Cyl01Lenght+UX851Cyl02Lenght+UX851Cyl03ALenght"/>
-<!-- Rich1 In SubMaster                        -->
-  <constant name  = "UX85Vacuum03BLenght"
-             value = "UX851Cyl03BLenght+UX851Cyl04Lenght"/>
-
-<!-- ***************************************************************** -->
-<!-- * UX85-1 In TT                                                  * -->
-<!-- ***************************************************************** -->
-
-<!-- UX85-1 Cylinder of 50 mm diameter                             -->
-<!--    extend from z = 2250.1 mm to z = 2500 mm -  RICH1/TT split -->
-<!--    TT section                                                 -->
-  <constant name  = "UX851Cyl07BLenght"
-             value = "UX851Cyl07Lenght - UX851Cyl07ALenght"/>
-  <constant name  = "UX851Cyl07BZpos"
-             value = "0.5*UX851Cyl07BLenght"/>
-
-<!-- UX85-1 Cone 10 mrad                    -->
-<!-- Stop at end of BeforeMagnet Region     -->
-  <constant name  = "UX851Cone08ALenght"
-             value = "UX851TTMagnetSplitZposIP - UX851ZStartIP - UX851Cyl01Lenght -
-                      UX851Cyl02Lenght - UX851Cyl03Lenght - UX851Cyl04Lenght -
-                      UX851Cone05Lenght - UX851Win06Lenght - UX851Cyl07Lenght"/>
-  <constant name  = "UX851Cone08AThick"      value =  "1.00*mm"/>
-  <constant name  = "UX851Cone08ARadiusZmin" value = "25.00*mm"/>
-  <constant name  = "UX851Cone08ARadiusZmax"
-             value = "UX851TTMagnetSplitZposIP*tan(UX851to4Angle)"/>
-  <constant name  = "UX851Cone08AZpos"
-             value = "UX851Cyl07BLenght + 0.5*UX851Cone08ALenght"/>
-
-<!-- UX85-1 in TT      -->
-  <constant name  = "UX851TTLenght"
-             value = "UX851Cyl07BZpos+UX851Cone08ALenght"/>
-
-<!-- UX85BeforeMagnet -->
-  <constant name  = "UX85BeforeMagnetLenght"
-             value = "UX851Rich1ALenght+UX851Rich1BLenght+UX851Rich1CLenght+
-                      UX851TTLenght"/>
-
-</define>
diff --git a/compact/components/Pipe/2025-v00.00/PipeBeforeMagnet.xml b/compact/components/Pipe/2025-v00.00/PipeBeforeMagnet.xml
deleted file mode 100644
index 1f837885d..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeBeforeMagnet.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="BeforeMagnet.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeBeforeVelo.xml b/compact/components/Pipe/2025-v00.00/PipeBeforeVelo.xml
deleted file mode 100644
index d2ecdaebd..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeBeforeVelo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="BeforeVelo.xml"/>
-  <include ref="BeforeVelo-Support.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeCommon.xml b/compact/components/Pipe/2025-v00.00/PipeCommon.xml
deleted file mode 100644
index 597a556df..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeCommon.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="parameters.xml"/>
-  <include ref="materials.xml"/>
-  <include ref="VMA/VMA-Params.xml"/>
-  <include ref="PipeGeomParams.xml"/>
-  <include ref="PipeBeforeMagGeomParams.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeDownstream.xml b/compact/components/Pipe/2025-v00.00/PipeDownstream.xml
deleted file mode 100644
index f8324af3c..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeDownstream.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-
-  <include ref="Downstream-PipeParams.xml"/>
-  <include ref="Downstream.xml"/>
-
-  <include ref="Downstream-BakeoutParams.xml"/>
-  <include ref="Downstream-Bakeout.xml"/>
-
-  <include ref="Downstream-SupportParams.xml"/>
-  <include ref="Downstream-Support.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeGeomParams.xml b/compact/components/Pipe/2025-v00.00/PipeGeomParams.xml
deleted file mode 100644
index 1f8ba4dbe..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeGeomParams.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-<define>
-
-<!-- ***************************************************************** -->
-<!-- *  BeamPipe geometry parameters                                 * -->
-<!-- *                                                               * -->
-<!-- *  Date: 2006-03-02                                             * -->
-<!-- *  Author: Gloria Corti                                         * -->
-<!-- *                                                               * -->
-<!-- *  The connection to Velo window is in Velo2Rich1               * -->
-<!-- ***************************************************************** -->
-
-<!-- Angle of cones of the beam pipe -->
-
-  <constant name  = "UX851Angle"              value = "25.0*mrad"/>
-  <constant name  = "UX851to4Angle"           value = "10.0*mrad"/>
-
-<!-- UX85-1 General Positions and splits -->
-  <constant name = "UX851ZStartIP"            value =  "970.00*mm"/>
-  <constant name = "UX851Rich1SplitZminIP"    value =  "990.00*mm"/>
-  <constant name = "UX851Rich1SplitZmaxIP"    value = "2165.00*mm"/>
-  <constant name = "UX851Rich1TTSplitZposIP"  value = "2270.00*mm"/>
-  <constant name = "UX851TTMagnetSplitZposIP" value = "2700.00*mm"/>
-  <constant name = "UX851Rich1FlangeOffsetIP" value = "2146.00*mm"/>
-
-<!-- UX85-1 Lenght of section split between BeforeMagnet and Magnet -->
-  <constant name  = "UX851Cone08Lenght"       value =  "250.00*mm"/>
-
-<!-- Compensator at 2800 General Positions -->
-  <constant name = "UX85C2800ZStartIP"        value = "2798.80*mm"/>
-
-<!-- UX85-3 General Positions and splits -->
-  <constant name = "UX853ZStartIP"               value =  "7050.00*mm"/>
-  <constant name = "UX853MagnetTSplitZposIP"     value =  "7620.00*mm"/>
-  <constant name = "UX853TRich2SplitZposIP"      value =  "9439.00*mm"/>
-  <constant name = "UX853Rich2DownSplitZposIP"   value = "11900.00*mm"/>
-
-<!-- UX85-3 Lenght of sections related to split between Magnet and T -->
-  <constant name  = "UX853Flange01Cone02Lenght"  value =  "48.80*mm"/>
-  <constant name  = "UX853Cone0304Lenght"        value = "401.20*mm"/>
-  <constant name  = "UX853Cone05Lenght"          value = "800.00*mm"/>
-
-<!-- UX85-3 Lenght of sections related to split between Rich2 and Downstream -->
-<!-- manifactured 5 mm shorter than design                                   -->
-  <constant name  = "UX853Cone11Cone14Lenght"    value = "1495.00*mm"/>
-  <constant name  = "UX853Cone15Flange17Lenght"  value =  "100.00*mm"/>
-  <constant name  = "UX853ConeSupportFromEnd"    value = "1175.50*mm"/>
-  <constant name  = "UX853Cone12Lenght"          value =   "50.00*mm"/>
-
-<!-- Support Ring between Rich2 and M1 split -->
-  <constant name  = "UX853CableZposIP"           value = "11907.00*mm"/>
-  <constant name  = "UX853CollarInnerRadius"     value =   "122.10*mm"/>
-  <constant name  = "UX853CollarMiddleRadius"    value =   "126.50*mm"/>
-  <constant name  = "UX853CollarOuterRadius"     value =   "140.00*mm"/>
-  <constant name  = "UX853CollarSize"            value =    "24.00*mm"/>
-  <constant name  = "UX853CollarRich2Size"
-             value = "UX853Rich2DownSplitZposIP -
-                      (UX853CableZposIP - 0.5*UX853CollarSize)"/>
-
-<!-- Permanent Bakeout in RICH2 -->
- <constant  name  = "UX853BakeoutRich2StartIP"   value = "9450.00*mm"/>
- <constant  name  = "UX853BakeoutRich2Lenght"
-             value = "(UX853Rich2DownSplitZposIP - UX853CollarRich2Size) -
-                      UX853BakeoutRich2StartIP" />
-
-<!-- Compensator at 13100 (-5mm shorter) General Positions and splits -->
-  <constant name = "UX85C13100ZStartIP"          value ="13095.00*mm"/>
-
-<!-- UX85-4 General Positions-->
-  <constant name = "UX854ZStartIP"               value ="14400.00*mm"/>
-
-
-</define>
diff --git a/compact/components/Pipe/2025-v00.00/PipeMagnet.xml b/compact/components/Pipe/2025-v00.00/PipeMagnet.xml
deleted file mode 100644
index 030ea7c1d..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeMagnet.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="Magnet-PipeParams.xml"/>
-  <include ref="Magnet.xml"/>
-  <include ref="Magnet-SupportParams.xml"/>
-  <include ref="Magnet-Support.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeT.xml b/compact/components/Pipe/2025-v00.00/PipeT.xml
deleted file mode 100644
index bfbea67fa..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="InT.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeUT.xml b/compact/components/Pipe/2025-v00.00/PipeUT.xml
deleted file mode 100644
index 97a711eed..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeUT.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="InUT.xml"/>
-  <include ref="VMA/VMA-AA.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeUpstream.xml b/compact/components/Pipe/2025-v00.00/PipeUpstream.xml
deleted file mode 100644
index 96f00f4bb..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeUpstream.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="Upstream-Params.xml"/>
-  <include ref="Upstream.xml"/>
-  <include ref="VMA/VMA-AA-UpstreamVax.xml"/>
-  <include ref="VMA/VMA-AA-Upstream.xml"/>
-  <include ref="VMA/VMA-CA-Upstream1.xml"/>
-  <include ref="VMA/VMA-CA-Upstream2.xml"/>
-  <include ref="VMA/VMA-BK-Upstream.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/PipeVP.xml b/compact/components/Pipe/2025-v00.00/PipeVP.xml
deleted file mode 100644
index e4e3d0b67..000000000
--- a/compact/components/Pipe/2025-v00.00/PipeVP.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-  <include ref="InVP.xml"/>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-BPMSW.xml b/compact/components/Pipe/2025-v00.00/Upstream-BPMSW.xml
deleted file mode 100644
index bfc2fc84e..000000000
--- a/compact/components/Pipe/2025-v00.00/Upstream-BPMSW.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--==================================BPMSW==================================-->
-<!--===========================================================================-->
-<pipe>
-
-
-  <!-- UpStr:BPMSW -->
-  <!-- 1/8th of middle section -->
-  <volume name="lvBPMSWMidSect" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="subtraction" name="UpStr:BPMSWMidSectSub">
-      <shape type="Tube" name="UpStr:BPMSWMidSectTubs"
-             dz="0.5*UpStr:BPMSWMidSectLength"
-             rmin="UpStr:BPMSWMidSectRadius"
-             rmax="UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick"
-             startPhiAngle="44.9*degree"
-             deltaPhiAngle="89.8*degree"/>
-      <shape type="Box" name="UpStr:BPMSWMidSectTopCut"
-             dx="0.5*UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick"
-             dy="0.5*UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick"
-             dz="0.5*UpStr:BPMSWMidSectLength+1.0*mm"/>
-      <position y="UpStr:BPMSWMidSectTopCutOffset + UpStr:BPMSWMidSectRadius/2 + UpStr:BPMSWMidSectThick/2"/>
-      <shape type="Tube" name="UpStr:BPMSWMidSectHoleTubs"
-             dz="0.5*UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick"
-             rmax="UpStr:BPMSWMidSectHoleRadius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="UpStr:BPMSWMidSectRadius + UpStr:BPMSWMidSectThick/2" z="-UpStr:BPMSWMidSectHolePosZ"/>
-      </transformation>
-      <shape type="Tube" name="UpStr:BPMSWMidSectEdgeTubs"
-             dz="0.5*UpStr:BPMSWMidSectEdgeDepth*2"
-             rmax="UpStr:BPMSWMidSectEdgeRadius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="UpStr:BPMSWMidSectTopCutOffset" z="-UpStr:BPMSWMidSectHolePosZ"/>
-      </transformation>
-    </shape>
-  </volume>
-
-  <!-- Upstream Flange -->
-  <volume name="lvBPMSWFlangeUp" material="Pipe:Steel316LN">
-    <shape type="Tube" name="UpStr:BPMSWFlangeUpTubs"
-           dz="0.5*UpStr:BPMSWFlangeUpLength"
-           rmin="UpStr:BPMSWFlangeUpRadius"
-           rmax="UpStr:BPMSWFlangeUpRadius + UpStr:BPMSWFlangeUpThick"/>
-  </volume>
-
-  <!-- Upstream Flange -->
-  <volume name="lvBPMSWFlangeDown" material="Pipe:Steel316LN">
-    <shape type="Tube" name="UpStr:BPMSWFlangeDownTubs"
-           dz="0.5*UpStr:BPMSWFlangeDownLength"
-           rmin="UpStr:BPMSWFlangeDownRadius"
-           rmax="UpStr:BPMSWFlangeDownRadius + UpStr:BPMSWFlangeDownThick"/>
-  </volume>
-
-  <!-- Entry tube -->
-  <volume name="lvBPMSWEntry" material="Pipe:Steel316LN">
-    <shape type="Tube" name="UpStr:BPMSWEntryTubs"
-           dz="0.5*UpStr:BPMSWEntryLength"
-           rmin="UpStr:BPMSWEntryRadius"
-           rmax="UpStr:BPMSWEntryRadius + UpStr:BPMSWEntryThick"/>
-  </volume>
-
-  <!-- Exit Tube -->
-  <volume name="lvBPMSWExit" material="Pipe:Steel316LN">
-    <shape type="Tube" name="UpStr:BPMSWExitTubs"
-           dz="0.5*UpStr:BPMSWExitLength"
-           rmin="UpStr:BPMSWExitRadius"
-           rmax="UpStr:BPMSWExitRadius + UpStr:BPMSWExitThick"/>
-  </volume>
-
-  <!-- Plug -->
-  <volume name="lvBPMSWPlug" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="lvBPMSWPlugUnion">
-      <shape type="Tube" name="lvBPMSWPlugFlange"
-             dz="0.5*UpStr:BPMSWPlugFlangeLength"
-             rmax="UpStr:BPMSWPlugFlangeRadius"/>
-      <shape type="Tube" name="lvBPMSWPlugPin"
-             dz="0.5*UpStr:BPMSWPlugPinLength"
-             rmax="UpStr:BPMSWPlugPinRadius"/>
-    </shape>
-  </volume>
-
-  <!-- Vacuum -->
-  <volume name="lvBPMSWVacuum" material="Vacuum">
-    <shape type="Tube" name="UpStr:BPMSWVacuumTubs"
-           dz="0.5*UpStr:BPMSWVacuumLength"
-           rmax="UpStr:BPMSWFlangeUpRadius - 0.01*mm"/>
-  </volume>
-
-  <!-- 1/8th of middle section with plug -->
-  <volume name="lvBPMSWMidSectAss">
-    <physvol name="pvBPMSWMidSect"                volume="lvBPMSWMidSect"/>
-    <physvol name="pvBPMSWPlug"                   volume="lvBPMSWPlug">
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="UpStr:BPMSWMidSectTopCutOffset + UpStr:BPMSWPlugFlangeLength/2" z="-UpStr:BPMSWMidSectHolePosZ"/>
-      </transformation>
-    </physvol>
-  </volume>
-
-  <!-- Assebly of body -->
-  <volume name="lvBPMSWBody">
-    <physvol name="pvBPMSWFlangeUp"               volume="lvBPMSWFlangeUp"/>
-    <physvol name="pvBPMSWEntry"                  volume="lvBPMSWEntry">
-      <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength/2"/>
-    </physvol>
-
-    <physvol name="pvBPMSWMidSect0A"
-             volume="lvBPMSWMidSectAss">
-      <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength/2"/>
-    </physvol>
-    <physvol name="pvBPMSWMidSect1A"              volume="lvBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation z="90.0*degree"/>
-        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvBPMSWMidSect2A"              volume="lvBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation z="180.0*degree"/>
-        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvBPMSWMidSect3A"              volume="lvBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation z="270.0*degree"/>
-        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-
-    <physvol name="pvBPMSWMidSect0B"              volume="lvBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree"/>
-        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength + UpStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvBPMSWMidSect1B"              volume="lvBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree" z="90.0*degree"/>
-        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength + UpStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvBPMSWMidSect2B"              volume="lvBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree" z="180.0*degree"/>
-        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength + UpStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvBPMSWMidSect3B"              volume="lvBPMSWMidSectAss">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree" z="270.0*degree"/>
-        <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength + UpStr:BPMSWMidSectLength/2"/>
-      </transformation>
-    </physvol>
-
-    <physvol name="pvBPMSWExit"                   volume="lvBPMSWExit">
-      <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength*2 + UpStr:BPMSWExitLength/2"/>
-    </physvol>
-    <physvol name="pvBPMSWFlangeDown"             volume="lvBPMSWFlangeDown">
-      <position z="UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength*2 + UpStr:BPMSWExitLength + UpStr:BPMSWFlangeDownLength/2"/>
-    </physvol>
-  </volume>
-
-  <volume name="lvBPMSW">
-    <physvol name="pvBPMSWBody"                   volume="lvBPMSWBody"/>
-    <physvol name="pvBPMSWVacuum"                 volume="lvBPMSWVacuum">
-      <position z="-UpStr:BPMSWFlangeUpLength/2 + UpStr:BPMSWVacuumLength/2"/>
-    </physvol>
-  </volume>
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-Params.xml b/compact/components/Pipe/2025-v00.00/Upstream-Params.xml
deleted file mode 100644
index 13b6479a9..000000000
--- a/compact/components/Pipe/2025-v00.00/Upstream-Params.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-
-  <define>
-    <!--=====================================Pipe segment replacement of VVSSH  -->
-    <constant name="UpStr:VVSSHPipeZ"                 value="80.0*mm + 15.0*mm"/> <!-- 15mm to make pipe complete -->
-    <constant name="UpStr:VVSSHPipeRad"               value="30.0*mm"/>
-    <constant name="UpStr:VVSSHPipeThick"             value="1.5*mm"/>
-
-    <!--=====================================Parameters for VVSGF  -->
-    <constant name="UpStr:VVSGFBlockX"                value="160.0*mm"/>
-    <constant name="UpStr:VVSGFBlockY"                value="480.0*mm"/>
-    <constant name="UpStr:VVSGFBlockZ"                value="55.0*mm"/>
-    <constant name="UpStr:VVSGFHoleY"                 value="0.0*mm"/>
-    <constant name="UpStr:VVSGFFlangeZ"               value="10.0*mm - 0.01*mm"/>
-    <constant name="UpStr:VVSGFBlockRad"              value="31.5*mm"/>
-    <constant name="UpStr:VVSGFFlangeThick"           value="100.0*mm - UpStr:VVSGFBlockRad"/>
-
-    <!-- UX84 -->
-    <constant name="UpStr:UX84CylLength"    value="327.00*mm"/>
-    <constant name="UpStr:UX84CylThick"     value="2.00*mm"/>
-    <constant name="UpStr:UX84CylRadius"    value="40.00*mm"/>
-
-    <!-- UX84 Flange Up -->
-    <constant name="UpStr:UX84FlangeLength"    value="20.00*mm"/>
-    <constant name="UpStr:UX84FlangeThick"     value="34.00*mm"/>
-    <constant name="UpStr:UX84FlangeRadius"    value="UpStr:UX84CylRadius+UpStr:UX84CylThick"/>
-    <constant name="UpStr:UX84FlangePosZ"      value="-UpStr:UX84CylLength/2+UpStr:UX84FlangeLength/2"/>
-
-    <!-- Parameters for UpStr:BPMSW -->
-    <constant name="UpStr:BPMSWMidSectLength"          value="90.0*mm"/>
-    <constant name="UpStr:BPMSWMidSectRadius"          value="34.5*mm"/>
-    <constant name="UpStr:BPMSWMidSectThick"           value="56.5*mm - UpStr:BPMSWMidSectRadius"/>
-    <constant name="UpStr:BPMSWMidSectTopCutOffset"    value="47.9*mm"/>
-    <constant name="UpStr:BPMSWMidSectHoleRadius"      value="8.5*mm"/>
-    <constant name="UpStr:BPMSWMidSectHolePosZ"        value="15.0*mm"/>
-    <constant name="UpStr:BPMSWMidSectEdgeDepth"       value="4.0*mm"/>
-    <constant name="UpStr:BPMSWMidSectEdgeRadius"      value="28.0*mm"/>
-
-    <constant name="UpStr:BPMSWFlangeUpLength"         value="17.4*mm"/>
-    <constant name="UpStr:BPMSWFlangeUpRadius"         value="30.0*mm"/>
-    <constant name="UpStr:BPMSWFlangeUpThick"          value="57.0*mm - UpStr:BPMSWFlangeUpRadius"/>
-
-    <constant name="UpStr:BPMSWFlangeDownLength"       value="19.7*mm"/>
-    <constant name="UpStr:BPMSWFlangeDownRadius"       value="UpStr:BPMSWFlangeUpRadius"/>
-    <constant name="UpStr:BPMSWFlangeDownThick"        value="76.0*mm - UpStr:BPMSWFlangeDownRadius"/>
-
-    <constant name="UpStr:BPMSWEntryLength"            value="33.3*mm"/>
-    <constant name="UpStr:BPMSWEntryRadius"            value="UpStr:BPMSWFlangeUpRadius"/>
-    <constant name="UpStr:BPMSWEntryThick"             value="4.5*mm"/>
-
-    <constant name="UpStr:BPMSWExitLength"             value="34.6*mm"/>
-    <constant name="UpStr:BPMSWExitRadius"             value="UpStr:BPMSWFlangeUpRadius"/>
-    <constant name="UpStr:BPMSWExitThick"              value="51.5*mm - UpStr:BPMSWExitRadius"/>
-
-    <constant name="UpStr:BPMSWPlugFlangeLength"       value="11.0*mm"/>
-    <constant name="UpStr:BPMSWPlugFlangeRadius"       value="26.0*mm"/>
-    <constant name="UpStr:BPMSWPlugPinLength"          value="13.4*mm*2 + UpStr:BPMSWPlugFlangeLength"/>
-    <constant name="UpStr:BPMSWPlugPinRadius"          value="7.5*mm"/>
-
-    <constant name="UpStr:BPMSWVacuumLength"           value="UpStr:BPMSWFlangeUpLength + UpStr:BPMSWEntryLength + UpStr:BPMSWMidSectLength*2 + UpStr:BPMSWExitLength + UpStr:BPMSWFlangeDownLength"/>
-
-    <!-- Parameters for pipe UX86Adapter  -->
-    <constant name="UpStr:UX86AdapterPipeZ"              value="72.0*mm"/>
-    <constant name="UpStr:UX86AdapterPipeRad"            value="30.15*mm"/>
-    <constant name="UpStr:UX86AdapterPipeThick"          value="1.6*mm"/>
-
-    <!-- Parameters for pipe in MBXWH -->
-    <constant name="UpStr:MBXWHPipeLength"             value="3916.0*mm"/>
-    <constant name="UpStr:MBXWHPipeRadius"             value="26.0*mm"/>
-    <constant name="UpStr:MBXWHPipeThick"              value="2.0*mm"/>
-
-    <!-- Parameters for pipe in UpStr:MBXWS -->
-    <constant name="UpStr:MBXWSPipeLength"             value="1275.0*mm"/>
-    <constant name="UpStr:MBXWSPipeRadius"             value="26.0*mm"/>
-    <constant name="UpStr:MBXWSPipeThick"              value="2.0*mm"/>
-
-    <!-- Parameters for pipe in VCDA -->
-    <constant name="UpStr:VCDAPipeLength"              value="7000.0*mm"/>
-    <constant name="UpStr:VCDAPipeRadius"              value="40.0*mm"/>
-    <constant name="UpStr:VCDAPipeThick"               value="2.0*mm"/>
-
-    <!-- Parameters for pipe in VCDBU -->
-    <constant name="UpStr:VCDBUPipeLength"             value="5130.0*mm"/>
-    <constant name="UpStr:VCDBUPipeRadius"             value="40.0*mm"/>
-    <constant name="UpStr:VCDBUPipeThick"              value="2.0*mm"/>
-
-    <!-- Parameters for pipe in Trans -->
-    <constant name="UpStr:TransPipeLength"             value="75.0*mm"/>
-    <constant name="UpStr:TransPipeRadius"             value="40.0*mm"/>
-    <constant name="UpStr:TransPipeThick"              value="2.0*mm"/>
-
-
-<!-- Main -->
-  <constant name="UpStr:VaxMainBodyLength"                value="126.0*mm - 0.02*mm"/>
-  <constant name="UpStr:VaxMainBodyRadius"                value="100.0*mm"/>
-  <constant name="UpStr:VaxMainBodyThick"                 value="2.0*mm"/>
-  <constant name="UpStr:VaxMainBodyHole1Radius"           value="50.0*mm"/>
-  <constant name="UpStr:VaxMainBodyHole2Radius"           value="50.0*mm"/>
-  <constant name="UpStr:VaxMainBodyHole3Radius"           value="30.25*mm"/>
-  <constant name="UpStr:VaxMainBodyHole4Radius"           value="19.6*mm"/>
-  <constant name="UpStr:VaxMainBodyHole5Radius"           value="8.5*mm"/>
-  <constant name="UpStr:VaxMainBodyHole4Offset"           value="30.0*mm"/>
-  <constant name="UpStr:VaxMainBodyHole5Offset"           value="45.0*mm"/>
-
-
-<!-- Entry Window -->
-  <constant name="UpStr:VaxWindowTubsLenght"              value="4.0*mm"/>
-  <constant name="UpStr:VaxWindowFlangeRadius"            value="50.0*mm"/>
-  <constant name="UpStr:VaxWindowFlangeLength"            value="10.0*mm"/>
-  <constant name="UpStr:VaxWindowInnerRadius"             value="37.5*mm"/>
-  <constant name="UpStr:VaxWindowThick"                   value="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick - UpStr:VaxWindowFlangeRadius"/>
-  <constant name="UpStr:VaxWindowConeLength"              value="21.0*mm"/>
-  <constant name="UpStr:VaxWindowConeEndThick"            value="UpStr:VaxMainBodyRadius - UpStr:VaxWindowConeLength - UpStr:VaxWindowInnerRadius"/>
-  <constant name="UpStr:VaxWindowConeFlangeLength"        value="UpStr:VaxWindowFlangeLength - UpStr:VaxWindowTubsLenght"/>
-  <constant name="UpStr:VaxWindowConeEndLength"           value="5.0*mm"/>
-  <constant name="UpStr:VaxWindowConeEndRad"              value="59.0*mm"/>
-
-
-<!-- End Pipe -->
-  <constant name="UpStr:VaxEndPipeLength"                 value="64.0*mm"/>
-  <constant name="UpStr:VaxEndPipeRadius"                 value="32.5*mm"/>
-  <constant name="UpStr:VaxEndPipeThick"                  value="2.0*mm"/>
-  <constant name="UpStr:VaxEndPipeFlangeLength"           value="17.5*mm"/>
-  <constant name="UpStr:VaxEndPipeFlangeRadius"           value="UpStr:VaxEndPipeRadius + UpStr:VaxEndPipeThick + 0.01*mm"/>
-  <constant name="UpStr:VaxEndPipeFlangeThick"            value="63.5*mm - UpStr:VaxEndPipeFlangeRadius"/>
-
-
-<!-- End Cap -->
-  <constant name="UpStr:VaxEndCapTubsLenght"              value="UpStr:VaxWindowTubsLenght"/>
-  <constant name="UpStr:VaxEndCapInnerRadius"             value="UpStr:VaxEndPipeRadius + UpStr:VaxEndPipeThick + 0.01*mm"/>
-  <constant name="UpStr:VaxEndCapThick"                   value="UpStr:VaxMainBodyRadius - UpStr:VaxEndCapTubsLenght - UpStr:VaxEndCapInnerRadius"/>
-
-
-<!-- RF screen -->
-  <constant name="UpStr:VaxRfScreenFlangeLength"          value="8.0*mm"/>
-  <constant name="UpStr:VaxRfScreenFlangeRadius"          value="31.5*mm"/>
-  <constant name="UpStr:VaxRfScreenFlangeThick"           value="49.0*mm - UpStr:VaxRfScreenFlangeRadius"/>
-  <constant name="UpStr:VaxRfScreenEntryLength"           value="101.0*mm"/>
-  <constant name="UpStr:VaxRfScreenEntryRadius"           value="UpStr:VaxRfScreenFlangeRadius"/>
-  <constant name="UpStr:VaxRfScreenEntryThick"            value="2.5*mm"/>
-  <constant name="UpStr:VaxRfScreenConsLength"            value="10.0*mm"/>
-  <constant name="UpStr:VaxRfScreenExitLength"            value="63.5*mm"/>
-  <constant name="UpStr:VaxRfScreenExitRadius"            value="29.0*mm"/>
-  <constant name="UpStr:VaxRfScreenExitThick"             value="2.0*mm"/>
-
-
-<!-- Vacuum -->
-  <constant name="UpStr:VaxVacuumLength"                  value="190.0*mm"/>
-  <constant name="UpStr:VaxVacuumRadius"                  value="UpStr:VaxRfScreenExitRadius - 0.01*mm"/>
-
-
-<!-- Pipe 1 -->
-  <constant name="UpStr:VaxPipe1Length"                   value="204.0*mm"/>
-  <constant name="UpStr:VaxPipe1Radius"                   value="UpStr:VaxMainBodyHole1Radius"/>
-  <constant name="UpStr:VaxPipe1Thick"                    value="1.5*mm"/>
-  <constant name="UpStr:VaxPipe1HoleRadius"               value="19.6*mm"/>
-  <constant name="UpStr:VaxPipe1HoleOffset"               value="160.0*mm"/>
-
-
-<!-- Pipe 2 -->
-  <constant name="UpStr:VaxPipe2Length"                   value="330.0*mm"/>
-  <constant name="UpStr:VaxPipe2Radius"                   value="UpStr:VaxMainBodyHole2Radius"/>
-  <constant name="UpStr:VaxPipe2Thick"                    value="1.5*mm"/>
-  <constant name="UpStr:VaxPipe2FlangeLength"             value="19.8*mm"/>
-  <constant name="UpStr:VaxPipe2FlangeRadius"             value="UpStr:VaxPipe2Radius + UpStr:VaxPipe2Thick + 0.01*mm"/>
-  <constant name="UpStr:VaxPipe2FlangeThick"              value="75.5*mm - UpStr:VaxPipe2FlangeRadius"/>
-  <constant name="UpStr:VaxPipe2BeltLength"               value="5.0*mm"/>
-  <constant name="UpStr:VaxPipe2BeltPos"                  value="122.0*mm"/>
-
-
-<!-- Pipe 3 -->
-  <constant name="UpStr:VaxPipe3EntryLength"              value="220.0*mm"/>
-  <constant name="UpStr:VaxPipe3ExitLength"               value="120.0*mm"/>
-  <constant name="UpStr:VaxPipe3CutLength"                value="50.0*mm"/>
-  <constant name="UpStr:VaxPipe3Radius"                   value="UpStr:VaxMainBodyHole3Radius"/>
-  <constant name="UpStr:VaxPipe3Thick"                    value="1.5*mm"/>
-  <constant name="UpStr:VaxPipe3FlangeLength"             value="17.0*mm"/>
-  <constant name="UpStr:VaxPipe3FlangeRadius"             value="UpStr:VaxPipe3Radius + UpStr:VaxPipe3Thick + 0.01*mm"/>
-  <constant name="UpStr:VaxPipe3FlangeThick"              value="57.0*mm - UpStr:VaxPipe3FlangeRadius"/>
-
-<!-- Pipe 4 -->
-  <constant name="UpStr:VaxPipe4Length"                   value="158.5*mm"/>
-  <constant name="UpStr:VaxPipe4Radius"                   value="UpStr:VaxMainBodyHole4Radius"/>
-  <constant name="UpStr:VaxPipe4Thick"                    value="1.6*mm"/>
-  <constant name="UpStr:VaxPipe4FlangeLength"             value="13.0*mm"/>
-  <constant name="UpStr:VaxPipe4FlangeRadius"             value="UpStr:VaxPipe4Radius + UpStr:VaxPipe4Thick + 0.01*mm"/>
-  <constant name="UpStr:VaxPipe4FlangeThick"              value="35.0*mm - UpStr:VaxPipe4FlangeRadius"/>
-
-
-<!-- Pipe 5 -->
-  <constant name="UpStr:VaxPipe5Length"                   value="138.5*mm"/>
-  <constant name="UpStr:VaxPipe5Radius"                   value="UpStr:VaxMainBodyHole5Radius"/>
-  <constant name="UpStr:VaxPipe5Thick"                    value="1.0*mm"/>
-  <constant name="UpStr:VaxPipe5FlangeLength"             value="7.0*mm"/>
-  <constant name="UpStr:VaxPipe5FlangeRadius"             value="UpStr:VaxPipe5Radius + UpStr:VaxPipe5Thick + 0.01*mm"/>
-  <constant name="UpStr:VaxPipe5FlangeThick"              value="17.0*mm - UpStr:VaxPipe5FlangeRadius"/>
-
-
-<!-- Pipe 6 -->
-  <constant name="UpStr:VaxPipe6Length"                   value="110.0*mm"/>
-  <constant name="UpStr:VaxPipe6Radius"                   value="UpStr:VaxPipe1HoleRadius"/>
-  <constant name="UpStr:VaxPipe6Thick"                    value="1.6*mm"/>
-  <constant name="UpStr:VaxPipe6FlangeLength"             value="13.0*mm"/>
-  <constant name="UpStr:VaxPipe6FlangeRadius"             value="UpStr:VaxPipe6Radius + UpStr:VaxPipe6Thick + 0.01*mm"/>
-  <constant name="UpStr:VaxPipe6FlangeThick"              value="35.0*mm - UpStr:VaxPipe6FlangeRadius"/>
-
-
-<!-- Pipe 7 -->
-  <constant name="UpStr:VaxPipe7EntryLength"              value="115.0*mm"/>
-  <constant name="UpStr:VaxPipe7ExitLength"               value="110.0*mm"/>
-  <constant name="UpStr:VaxPipe7CutLength"                value="50.0*mm"/>
-  <constant name="UpStr:VaxPipe7Radius"                   value="30.25*mm"/>
-  <constant name="UpStr:VaxPipe7Thick"                    value="1.5*mm"/>
-  <constant name="UpStr:VaxPipe7LidLength"                value="4.0*mm"/>
-  <constant name="UpStr:VaxPipe7LidThick"                 value="UpStr:VaxPipe3Radius + UpStr:VaxPipe3Thick - UpStr:VaxPipe7Radius"/>
-  <constant name="UpStr:VaxPipe7FlangeLength"             value="17.0*mm"/>
-  <constant name="UpStr:VaxPipe7FlangeRadius"             value="UpStr:VaxPipe7Radius + UpStr:VaxPipe7Thick + 0.01*mm"/>
-  <constant name="UpStr:VaxPipe7FlangeThick"              value="57.0*mm - UpStr:VaxPipe7FlangeRadius"/>
-
-
-
-  </define>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-UX84.xml b/compact/components/Pipe/2025-v00.00/Upstream-UX84.xml
deleted file mode 100644
index b3446dd14..000000000
--- a/compact/components/Pipe/2025-v00.00/Upstream-UX84.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--==================================UX84-up================================-->
-<!--===========================================================================-->
-<pipe>
-
-  <!-- UX84 Cylinder of 40 mm radius -->
-  <volume name="lvUX84Cyl" material="Pipe:CuOFE">
-    <shape type="Tube" name ="UpStr:UX84Cylinder"
-           dz="0.5*UpStr:UX84CylLength"
-           rmin="UpStr:UX84CylRadius"
-           rmax="UpStr:UX84CylRadius+UpStr:UX84CylThick"/>
-  </volume>
-  <!-- UpStr:UX84 Flange of 76 mm radius -->
-  <volume name="lvUX84Flange" material="Pipe:Steel316LN">
-    <shape type="Tube" name ="UpStr:UX84Flange"
-           dz="0.5*UpStr:UX84FlangeLength"
-           rmin="UpStr:UX84FlangeRadius"
-           rmax="UpStr:UX84FlangeRadius+UpStr:UX84FlangeThick"/>
-  </volume>
-  <!-- Vacuum in UpStr:UX84Cyl -->
-  <volume name="lvUX84Vacuum" material="Vacuum">
-    <shape type="Tube" name ="UpStr:UX84Vacuum"
-           dz="0.5*UpStr:UX84CylLength"
-           rmax="UpStr:UX84CylRadius"/>
-  </volume>
-  <!-- Whole section: combination of sections -->
-  <volume name="lvUX84">
-    <physvol name="pvUX84Cyl"             volume="lvUX84Cyl"/>
-    <physvol name="pvUX84Vacuum"          volume="lvUX84Vacuum"/>
-    <physvol name="pvUX84Flange"          volume="lvUX84Flange">
-      <position z="UpStr:UX84FlangePosZ"/>
-    </physvol>
-  </volume>
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-VVSGF.xml b/compact/components/Pipe/2025-v00.00/Upstream-VVSGF.xml
deleted file mode 100644
index 0fbfd88b5..000000000
--- a/compact/components/Pipe/2025-v00.00/Upstream-VVSGF.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<!--================================== VVSGF ==================================-->
-<!--===========================================================================-->
-<pipe>
-
-  <!-- Main body -->
-  <volume name="lvVVSGFBlock" material="Pipe:Steel316LN" vis="Pipe:Upstream">
-    <shape type="BooleanShape" operation="subtraction" name="VVSGFBlockSub">
-      <shape type="Box" name="VVSGFBlockBox"
-             dx="0.5*UpStr:VVSGFBlockX"
-             dy="0.5*UpStr:VVSGFBlockY"
-             dz="0.5*UpStr:VVSGFBlockZ"/>
-      <shape type="Box" name="VVSGFBlockBoxAir"
-             dx="0.5*(UpStr:VVSGFBlockX - 20.0*mm)"
-             dy="0.5*(UpStr:VVSGFBlockY - 20.0*mm)"
-             dz="0.5*(UpStr:VVSGFBlockZ - 20.0*mm)"/>
-      <shape type="Tube" name="VVSGFBlockHole"
-             dz="0.5*(UpStr:VVSGFBlockZ + 1.0*mm)"
-             rmax="UpStr:VVSGFBlockRad"/>
-      <position y="UpStr:VVSGFHoleY"/>
-    </shape>
-  </volume>
-
-  <!-- Flange -->
-  <volume name="lvVVSGFFlange" material="Pipe:Steel316LN" vis="Pipe:Upstream">
-    <shape type="Tube" name="VVSGFFlangeTubs"
-           dz="0.5*UpStr:VVSGFFlangeZ"
-           rmin="UpStr:VVSGFBlockRad"
-           rmax="UpStr:VVSGFBlockRad + UpStr:VVSGFFlangeThick"/>
-  </volume>
-
-  <!-- Vacuum -->
-  <volume name="lvVVSGFVacuum" material="Vacuum" vis="Pipe:Vacuum">
-    <shape type="Tube" name="VVSGFVacuumTubs"
-           dz="0.5*(UpStr:VVSGFFlangeZ*2 + UpStr:VVSGFBlockZ)"
-           rmax="UpStr:VVSGFBlockRad - 0.01*mm"/>
-  </volume>
-
-  <!-- VVSGF -->
-  <volume name="lvVVSGF" vis="Pipe:Upstream">
-    <physvol name="pvVVSGFVacuum"                 logvol="lvVVSGFVacuum"/>
-    <physvol name="pvVVSGFBlock"                  logvol="lvVVSGFBlock">
-      <position y="-UpStr:VVSGFHoleY"/>
-    </physvol>
-    <physvol name="pvVVSGFFlangeUp"               logvol="lvVVSGFFlange">
-      <position z="-UpStr:VVSGFBlockZ/2 - UpStr:VVSGFFlangeZ/2 - 0.01*mm"/>
-    </physvol>
-    <physvol name="pvVVSGFFlangeUp"             logvol="lvVVSGFFlange">
-      <position z="UpStr:VVSGFBlockZ/2 + UpStr:VVSGFFlangeZ/2 + 0.01*mm"/>
-    </physvol>
-  </volume>
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream-Vax.xml b/compact/components/Pipe/2025-v00.00/Upstream-Vax.xml
deleted file mode 100644
index 0e596ce09..000000000
--- a/compact/components/Pipe/2025-v00.00/Upstream-Vax.xml
+++ /dev/null
@@ -1,538 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe                                          -->
-<!--===========================================================================-->
-<pipe>
-
-<!-- Entry window -->
-  <volume name="lvVaxUpStrWindow" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="VaxUpStrWindowUnion">
-      <shape type="Tube" name="VaxUpStrWindowTubs"
-            dz="0.5*UpStr:VaxWindowTubsLenght"
-            rmin="UpStr:VaxWindowFlangeRadius"
-            rmax="UpStr:VaxWindowFlangeRadius + UpStr:VaxWindowThick"/>
-      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrWindowSub">
-        <shape type="ConeSegment" name="VaxUpStrWindowCons"
-              dz="0.5*UpStr:VaxWindowConeLength"
-              rmax1="UpStr:VaxMainBodyRadius - 0.01*mm"
-              rmax2="UpStr:VaxWindowInnerRadius + UpStr:VaxWindowConeEndThick"/>
-        <shape type="Tube" name="VaxUpStrWindowSubTubs1"
-              dz="0.5*(UpStr:VaxWindowConeLength + 1.0*mm)"
-              rmax="UpStr:VaxWindowInnerRadius"/>
-        <shape type="Tube" name="VaxUpStrWindowSubTubs2"
-              dz="0.5*2*UpStr:VaxWindowConeFlangeLength"
-              rmax="UpStr:VaxWindowFlangeRadius"/>
-        <position z="-UpStr:VaxWindowConeLength/2"/>
-        <shape type="Tube" name="VaxUpStrWindowSubTubs3"
-              dz="0.5*2*UpStr:VaxWindowConeEndLength"
-              rmax="UpStr:VaxWindowConeEndRad"/>
-        <position z="UpStr:VaxWindowConeLength/2"/>
-      </shape>
-      <position z="UpStr:VaxWindowTubsLenght/2 + UpStr:VaxWindowConeLength/2 + 0.01*mm"/>
-    </shape>
-  </volume>
-
-<!-- Endcap -->
-  <volume name="lvVaxUpStrEndCap" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="lvVaxUpStrEndCapUnion">
-      <shape type="Tube" name="VaxUpStrEndCapTubs"
-            dz="0.5*UpStr:VaxEndCapTubsLenght"
-            rmin="UpStr:VaxEndCapInnerRadius + 0.01*mm"
-            rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick"/>
-      <shape type="ConeSegment" name="VaxUpStrEndCapCons"
-            dz="0.5*UpStr:VaxEndCapTubsLenght"
-            rmax1="UpStr:VaxEndCapInnerRadius + UpStr:VaxEndCapThick"
-            rmax2="UpStr:VaxMainBodyRadius - 0.01*mm"
-            rmin1="UpStr:VaxEndCapInnerRadius + 0.01*mm"
-            rmin2="UpStr:VaxEndCapInnerRadius + 0.01*mm"/>
-      <position z="-UpStr:VaxEndCapTubsLenght/2 - UpStr:VaxEndCapTubsLenght/2 - 0.01*mm"/>
-    </shape>
-  </volume>
-
-
-<!-- Main Body -->
-  <volume name="lvVaxUpStrMainBody" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="subtraction" name="VaxUpStrMainBodySub">
-      <shape type="Tube" name="VaxUpStrMainBodyTubs"
-            dz="0.5*UpStr:VaxMainBodyLength"
-            rmin="UpStr:VaxMainBodyRadius"
-            rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick"/>
-      <shape type="Tube" name="VaxUpStrMainBodyHole1"
-            dz="0.5*UpStr:VaxMainBodyRadius"
-            rmax="UpStr:VaxMainBodyHole1Radius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="UpStr:VaxMainBodyRadius"/>
-      </transformation>
-      <shape type="Tube" name="VaxUpStrMainBodyHole2"
-            dz="0.5*UpStr:VaxMainBodyRadius"
-            rmax="UpStr:VaxMainBodyHole2Radius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-UpStr:VaxMainBodyRadius"/>
-      </transformation>
-      <shape type="Tube" name="VaxUpStrMainBodyHole3"
-            dz="0.5*UpStr:VaxMainBodyRadius"
-            rmax="UpStr:VaxMainBodyHole3Radius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="UpStr:VaxMainBodyRadius"/>
-      </transformation>
-      <shape type="Tube" name="VaxUpStrMainBodyHole4"
-            dz="0.5*UpStr:VaxMainBodyRadius"
-            rmax="UpStr:VaxMainBodyHole4Radius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="-UpStr:VaxMainBodyRadius" z="-UpStr:VaxMainBodyHole4Offset"/>
-      </transformation>
-      <shape type="Tube" name="VaxUpStrMainBodyHole5"
-            dz="0.5*UpStr:VaxMainBodyRadius"
-            rmax="UpStr:VaxMainBodyHole5Radius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="-UpStr:VaxMainBodyRadius" z="UpStr:VaxMainBodyHole5Offset"/>
-      </transformation>
-    </shape>
-  </volume>
-
-
-<!-- End pipe -->
-  <volume name="lvVaxUpStrEndPipe" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="VaxUpStrEndPipeUnion">
-      <shape type="Tube" name="VaxUpStrEndPipeTubs"
-            dz="0.5*UpStr:VaxEndPipeLength"
-            rmin="UpStr:VaxEndPipeRadius"
-            rmax="UpStr:VaxEndPipeRadius + UpStr:VaxEndPipeThick"/>
-      <shape type="Tube" name="VaxUpStrEndPipeFlangeTubs"
-            dz="0.5*UpStr:VaxEndPipeFlangeLength"
-            rmin="UpStr:VaxEndPipeFlangeRadius"
-            rmax="UpStr:VaxEndPipeFlangeRadius + UpStr:VaxEndPipeFlangeThick"/>
-      <position z="UpStr:VaxEndPipeLength/2 - UpStr:VaxEndPipeFlangeLength/2"/>
-    </shape>
-  </volume>
-
-
-<!-- RF Screen -->
-  <volume name="lvVaxUpStrRfScreen" material="Pipe:CuOFE">
-    <shape type="BooleanShape" operation="union" name="VaxUpStrRfScreenUnion">
-      <shape type="Tube" name="VaxUpStrRfScreenFlangeTubs"
-            dz="0.5*UpStr:VaxRfScreenFlangeLength"
-            rmin="UpStr:VaxRfScreenFlangeRadius"
-            rmax="UpStr:VaxRfScreenFlangeRadius + UpStr:VaxRfScreenFlangeThick"/>
-      <shape type="Tube" name="VaxUpStrRfScreenEntryTubs"
-            dz="0.5*UpStr:VaxRfScreenEntryLength"
-            rmin="UpStr:VaxRfScreenEntryRadius"
-            rmax="UpStr:VaxRfScreenEntryRadius + UpStr:VaxRfScreenEntryThick"/>
-      <position z="UpStr:VaxRfScreenFlangeLength/2 + UpStr:VaxRfScreenEntryLength/2 + 0.01*mm"/>
-      <shape type="ConeSegment" name="VaxUpStrRfScreenCons"
-            dz="0.5*UpStr:VaxRfScreenConsLength"
-            rmin1="UpStr:VaxRfScreenEntryRadius"
-            rmin2="UpStr:VaxRfScreenExitRadius"
-            rmax1="UpStr:VaxRfScreenEntryRadius + UpStr:VaxRfScreenEntryThick"
-            rmax2="UpStr:VaxRfScreenExitRadius + UpStr:VaxRfScreenExitThick"/>
-      <position z="UpStr:VaxRfScreenFlangeLength/2 + UpStr:VaxRfScreenEntryLength + UpStr:VaxRfScreenConsLength/2 + 0.02*mm"/>
-      <shape type="Tube" name="VaxUpStrRfScreenExitTubs"
-            dz="0.5*UpStr:VaxRfScreenExitLength"
-            rmin="UpStr:VaxRfScreenExitRadius"
-            rmax="UpStr:VaxRfScreenExitRadius + UpStr:VaxRfScreenExitThick"/>
-      <position z="UpStr:VaxRfScreenFlangeLength/2 + UpStr:VaxRfScreenEntryLength + UpStr:VaxRfScreenConsLength + UpStr:VaxRfScreenExitLength/2 + 0.03*mm"/>
-    </shape>
-  </volume>
-
-
-<!-- Vacuum -->
-  <volume name="lvVaxUpStrVacuum" material="Vacuum">
-    <shape type="Tube" name="VaxUpStrVacuumTubs"
-          dz="0.5*UpStr:VaxVacuumLength"
-          rmax="UpStr:VaxVacuumRadius"/>
-  </volume>
-
-
-<!-- Pipe1, top pipe -->
-  <volume name="lvVaxUpStrPipe1" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe1Sub">
-      <shape type="Tube" name="VaxUpStrPipe1Tubs"
-            dz="0.5*UpStr:VaxPipe1Length"
-            rmin="UpStr:VaxPipe1Radius"
-            rmax="UpStr:VaxPipe1Radius + UpStr:VaxPipe1Thick"/>
-      <shape type="Tube" name="VaxUpStrPipe1SubTubs"
-            dz="0.5*UpStr:VaxMainBodyLength"
-            rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position z="-UpStr:VaxPipe1Length/2"/>
-      </transformation>
-      <shape type="Tube" name="VaxUpStrPipe1Hole1"
-            dz="0.5*UpStr:VaxPipe1Radius"
-            rmax="UpStr:VaxPipe1HoleRadius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="UpStr:VaxPipe1Radius" z="-UpStr:VaxPipe1Length/2 + UpStr:VaxPipe1HoleOffset"/>
-      </transformation>
-      <shape type="Tube" name="VaxUpStrPipe1Hole2"
-            dz="0.5*UpStr:VaxPipe1Radius"
-            rmax="UpStr:VaxPipe1HoleRadius"/>
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="-UpStr:VaxPipe1Radius" z="-UpStr:VaxPipe1Length/2 + UpStr:VaxPipe1HoleOffset"/>
-      </transformation>
-      <shape type="Tube" name="VaxUpStrPipe1Hole3"
-            dz="0.5*UpStr:VaxPipe1Radius"
-            rmax="UpStr:VaxPipe1HoleRadius"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="UpStr:VaxPipe1Radius" z="-UpStr:VaxPipe1Length/2 + UpStr:VaxPipe1HoleOffset"/>
-      </transformation>
-    </shape>
-  </volume>
-
-
-
-<!-- Pipe2 -->
-  <volume name="lvVaxUpStrPipe2" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe2Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe2Sub">
-        <shape type="Tube" name="VaxUpStrPipe2Tubs"
-              dz="0.5*UpStr:VaxPipe2Length"
-              rmin="UpStr:VaxPipe2Radius"
-              rmax="UpStr:VaxPipe2Radius + UpStr:VaxPipe2Thick"/>
-        <shape type="Tube" name="VaxUpStrPipe2SubTubs"
-              dz="0.5*UpStr:VaxMainBodyLength"
-              rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation x="90.0*degree"/>
-          <position z="-UpStr:VaxPipe2Length/2"/>
-        </transformation>
-      </shape>
-      <shape type="Tube" name="VaxUpStrPipe2FlangeTubs"
-            dz="0.5*UpStr:VaxPipe2FlangeLength"
-            rmin="UpStr:VaxPipe2FlangeRadius"
-            rmax="UpStr:VaxPipe2FlangeRadius + UpStr:VaxPipe2FlangeThick"/>
-      <position z="UpStr:VaxPipe2Length/2 - UpStr:VaxPipe2FlangeLength/2"/>
-      <shape type="Tube" name="VaxUpStrPipe2BeltTubs"
-            dz="0.5*UpStr:VaxPipe2BeltLength"
-            rmin="UpStr:VaxPipe2FlangeRadius"
-            rmax="UpStr:VaxPipe2FlangeRadius + UpStr:VaxPipe2FlangeThick"/>
-      <position z="-UpStr:VaxPipe2Length/2 + UpStr:VaxPipe2BeltPos - UpStr:VaxPipe2BeltLength/2"/>
-    </shape>
-  </volume>
-
-
-<!-- Pipe3 -->
-  <volume name="lvVaxUpStrPipe3" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe3Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe3Sub">
-        <shape type="Tube" name="VaxUpStrPipe3Tubs"
-              dz="0.5*(UpStr:VaxPipe3EntryLength + UpStr:VaxPipe3CutLength)"
-              rmin="UpStr:VaxPipe3Radius"
-              rmax="UpStr:VaxPipe3Radius + UpStr:VaxPipe3Thick"/>
-        <shape type="Tube" name="VaxUpStrPipe3SubTubs"
-              dz="0.5*UpStr:VaxMainBodyLength"
-              rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation y="90.0*degree"/>
-          <position z="-UpStr:VaxPipe3EntryLength/2 - UpStr:VaxPipe3CutLength/2"/>
-        </transformation>
-        <shape type="Box" name="VaxUpStrPipe3SubBox"
-             dx="0.5*150.0*mm"
-             dy="0.5*150.0*mm"
-             dz="0.5*2*UpStr:VaxPipe3CutLength"/>
-        <transformation>
-          <position z="UpStr:VaxPipe3CutLength"/>
-          <rotation/>
-          <position/>
-          <rotation x="45.0*degree"/>
-          <position z="UpStr:VaxPipe3EntryLength/2 - UpStr:VaxPipe3CutLength/2"/>
-        </transformation>
-      </shape>
-      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe3Sub2">
-        <shape type="Tube" name="VaxUpStrPipe3Tubs2"
-              dz="0.5*(UpStr:VaxPipe3ExitLength + UpStr:VaxPipe3CutLength)"
-              rmin="UpStr:VaxPipe3Radius"
-              rmax="UpStr:VaxPipe3Radius + UpStr:VaxPipe3Thick"/>
-        <shape type="Box" name="VaxUpStrPipe3SubBox2"
-             dx="0.5*150.0*mm"
-             dy="0.5*150.0*mm"
-             dz="0.5*2*UpStr:VaxPipe3CutLength"/>
-        <transformation>
-          <position z="-UpStr:VaxPipe3CutLength"/>
-          <rotation/>
-          <position/>
-          <rotation x="-45.0*degree"/>
-          <position z="-UpStr:VaxPipe3ExitLength/2 + UpStr:VaxPipe3CutLength/2"/>
-        </transformation>
-      </shape>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-UpStr:VaxPipe3ExitLength/2 + UpStr:VaxPipe3CutLength/2" z="UpStr:VaxPipe3EntryLength/2 - UpStr:VaxPipe3CutLength/2 + 0.01*mm"/>
-      </transformation>
-      <shape type="Tube" name="VaxUpStrPipe3FlangeTubs"
-            dz="0.5*UpStr:VaxPipe3FlangeLength"
-            rmin="UpStr:VaxPipe3FlangeRadius"
-            rmax="UpStr:VaxPipe3FlangeRadius + UpStr:VaxPipe3FlangeThick"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-UpStr:VaxPipe3ExitLength + UpStr:VaxPipe3FlangeLength/2" z="UpStr:VaxPipe3EntryLength/2 - UpStr:VaxPipe3CutLength/2 + 0.01*mm"/>
-      </transformation>
-    </shape>
-  </volume>
-
-<!-- Pipe4 -->
-  <volume name="lvVaxUpStrPipe4" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe4Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe4Sub">
-        <shape type="Tube" name="VaxUpStrPipe4Tubs"
-              dz="0.5*UpStr:VaxPipe4Length"
-              rmin="UpStr:VaxPipe4Radius"
-              rmax="UpStr:VaxPipe4Radius + UpStr:VaxPipe4Thick"/>
-        <shape type="Tube" name="VaxUpStrPipe4SubTubs"
-              dz="0.5*UpStr:VaxMainBodyLength"
-              rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation y="90.0*degree"/>
-          <position z="-UpStr:VaxPipe4Length/2"/>
-        </transformation>
-      </shape>
-      <shape type="Tube" name="VaxUpStrPipe4FlangeTubs"
-            dz="0.5*UpStr:VaxPipe4FlangeLength"
-            rmin="UpStr:VaxPipe4FlangeRadius"
-            rmax="UpStr:VaxPipe4FlangeRadius + UpStr:VaxPipe4FlangeThick"/>
-      <position z="UpStr:VaxPipe4Length/2 - UpStr:VaxPipe4FlangeLength/2"/>
-    </shape>
-  </volume>
-
-
-<!-- Pipe5 -->
-  <volume name="lvVaxUpStrPipe5" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe5Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe5Sub">
-        <shape type="Tube" name="VaxUpStrPipe5Tubs"
-              dz="0.5*UpStr:VaxPipe5Length"
-              rmin="UpStr:VaxPipe5Radius"
-              rmax="UpStr:VaxPipe5Radius + UpStr:VaxPipe5Thick"/>
-        <shape type="Tube" name="VaxUpStrPipe5SubTubs"
-              dz="0.5*UpStr:VaxMainBodyLength"
-              rmax="UpStr:VaxMainBodyRadius + UpStr:VaxMainBodyThick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation y="90.0*degree"/>
-          <position z="-UpStr:VaxPipe5Length/2"/>
-        </transformation>
-      </shape>
-      <shape type="Tube" name="VaxUpStrPipe5FlangeTubs"
-            dz="0.5*UpStr:VaxPipe5FlangeLength"
-            rmin="UpStr:VaxPipe5FlangeRadius"
-            rmax="UpStr:VaxPipe5FlangeRadius + UpStr:VaxPipe5FlangeThick"/>
-      <position z="UpStr:VaxPipe5Length/2 - UpStr:VaxPipe5FlangeLength/2"/>
-    </shape>
-  </volume>
-
-
-<!-- Pipe6 -->
-  <volume name="lvVaxUpStrPipe6" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe6Union">
-      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe6Sub">
-        <shape type="Tube" name="VaxUpStrPipe6Tubs"
-              dz="0.5*UpStr:VaxPipe6Length"
-              rmin="UpStr:VaxPipe6Radius"
-              rmax="UpStr:VaxPipe6Radius + 1.6*mm"/>
-        <shape type="Tube" name="VaxUpStrPipe6SubTubs"
-              dz="0.5*UpStr:VaxPipe1Length"
-              rmax="UpStr:VaxPipe1Radius + UpStr:VaxPipe1Thick + 0.01*mm"/>
-        <transformation>
-          <position/>
-          <rotation x="90.0*degree"/>
-          <position z="-UpStr:VaxPipe6Length/2"/>
-        </transformation>
-      </shape>
-      <shape type="Tube" name="VaxUpStrPipe6FlangeTubs"
-            dz="0.5*UpStr:VaxPipe6FlangeLength"
-            rmin="UpStr:VaxPipe6FlangeRadius"
-            rmax="UpStr:VaxPipe6FlangeRadius + UpStr:VaxPipe6FlangeThick"/>
-      <position z="UpStr:VaxPipe6Length/2 - UpStr:VaxPipe6FlangeLength/2"/>
-    </shape>
-  </volume>
-
-
-<!-- Pipe7 -->
-  <volume name="lvVaxUpStrPipe7" material="Pipe:Steel316LN">
-    <shape type="BooleanShape" operation="union" name="VaxUpStrPipe7Union">
-      <shape type="Tube" name="VaxUpStrPipe7Lid"
-            dz="0.5*UpStr:VaxPipe7LidLength"
-            rmin="UpStr:VaxPipe7Radius"
-            rmax="UpStr:VaxPipe7Radius + UpStr:VaxPipe7LidThick"/>
-      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe7Sub">
-        <shape type="Tube" name="VaxUpStrPipe7Tubs"
-              dz="0.5*(UpStr:VaxPipe7EntryLength + UpStr:VaxPipe7CutLength)"
-              rmin="UpStr:VaxPipe7Radius"
-              rmax="UpStr:VaxPipe7Radius + UpStr:VaxPipe7Thick"/>
-        <shape type="Box" name="VaxUpStrPipe7SubBox"
-             dx="0.5*150.0*mm"
-             dy="0.5*150.0*mm"
-             dz="0.5*2*UpStr:VaxPipe7CutLength"/>
-        <transformation>
-          <position z="UpStr:VaxPipe7CutLength"/>
-          <rotation/>
-          <position/>
-          <rotation x="45.0*degree"/>
-          <position z="UpStr:VaxPipe7EntryLength/2 - UpStr:VaxPipe7CutLength/2"/>
-        </transformation>
-      </shape>
-      <position z="UpStr:VaxPipe7EntryLength/2 + UpStr:VaxPipe7CutLength/2 + UpStr:VaxPipe7LidLength/2 + 0.01*mm"/>
-      <shape type="BooleanShape" operation="subtraction" name="VaxUpStrPipe7Sub2">
-        <shape type="Tube" name="VaxUpStrPipe7Tubs2"
-              dz="0.5*(UpStr:VaxPipe7ExitLength + UpStr:VaxPipe7CutLength)"
-              rmin="UpStr:VaxPipe7Radius"
-              rmax="UpStr:VaxPipe7Radius + UpStr:VaxPipe7Thick"/>
-        <shape type="Box" name="VaxUpStrPipe7SubBox2"
-             dx="0.5*150.0*mm"
-             dy="0.5*150.0*mm"
-             dz="0.5*2*UpStr:VaxPipe7CutLength"/>
-        <transformation>
-          <position z="-UpStr:VaxPipe7CutLength"/>
-          <rotation/>
-          <position/>
-          <rotation x="-45.0*degree"/>
-          <position z="-UpStr:VaxPipe7ExitLength/2 + UpStr:VaxPipe7CutLength/2"/>
-        </transformation>
-      </shape>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-UpStr:VaxPipe7ExitLength/2 + UpStr:VaxPipe7CutLength/2" z="UpStr:VaxPipe7EntryLength + UpStr:VaxPipe7LidLength/2 + 0.04*mm"/>
-      </transformation>
-      <shape type="Tube" name="VaxUpStrPipe7FlangeTubs"
-            dz="0.5*UpStr:VaxPipe7FlangeLength"
-            rmin="UpStr:VaxPipe7FlangeRadius"
-            rmax="UpStr:VaxPipe7FlangeRadius + UpStr:VaxPipe7FlangeThick"/>
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-UpStr:VaxPipe7ExitLength + UpStr:VaxPipe7FlangeLength/2" z="UpStr:VaxPipe7EntryLength + UpStr:VaxPipe7LidLength/2 + 0.04*mm"/>
-      </transformation>
-    </shape>
-  </volume>
-
-
-<!-- Complete -->
-  <volume name="lvVaxUpStr">
-    <physvol name="pvVaxUpStrMainBody"
-             volume="lvVaxUpStrMainBody"/>
-    <physvol name="pvVaxUpStrWindow"
-             volume="lvVaxUpStrWindow">
-      <position z="-UpStr:VaxMainBodyLength/2 - UpStr:VaxWindowTubsLenght/2 - 0.01*mm"/>
-    </physvol>
-    <physvol name="pvVaxUpStrRfScreen"
-             volume="lvVaxUpStrRfScreen">
-      <position z="-UpStr:VaxMainBodyLength/2 - UpStr:VaxWindowTubsLenght - 0.01*mm + UpStr:VaxRfScreenFlangeLength/2"/>
-    </physvol>
-    <physvol name="pvVaxUpStrEndCap"
-             volume="lvVaxUpStrEndCap">
-      <position z="UpStr:VaxMainBodyLength/2 + UpStr:VaxEndCapTubsLenght/2 + 0.01*mm"/>
-    </physvol>
-    <physvol name="pvVaxUpStrEndPipe"
-             volume="lvVaxUpStrEndPipe">
-      <position z="UpStr:VaxMainBodyLength/2 - UpStr:VaxEndCapTubsLenght + 0.01*mm + UpStr:VaxEndPipeLength/2"/>
-    </physvol>
-    <physvol name="pvVaxUpStrPipe1"
-             volume="lvVaxUpStrPipe1">
-      <transformation>
-        <position/>
-        <rotation x="-90.0*degree"/>
-        <position y="UpStr:VaxPipe1Length/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvVaxUpStrPipe2"
-             volume="lvVaxUpStrPipe2">
-      <transformation>
-        <position/>
-        <rotation x="90.0*degree"/>
-        <position y="-UpStr:VaxPipe2Length/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvVaxUpStrPipe3"
-             volume="lvVaxUpStrPipe3">
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="UpStr:VaxPipe3EntryLength/2 + UpStr:VaxPipe3CutLength/2 "/>
-      </transformation>
-    </physvol>
-    <physvol name="pvVaxUpStrPipe4"
-             volume="lvVaxUpStrPipe4">
-      <transformation>
-        <position/>
-        <rotation y="-90.0*degree"/>
-        <position x="-UpStr:VaxPipe4Length/2" z="-UpStr:VaxMainBodyHole4Offset"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvVaxUpStrPipe5"
-             volume="lvVaxUpStrPipe5">
-      <transformation>
-        <position/>
-        <rotation y="-90.0*degree"/>
-        <position x="-UpStr:VaxPipe5Length/2" z="UpStr:VaxMainBodyHole5Offset"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvVaxUpStrPipe6a"
-             volume="lvVaxUpStrPipe6">
-      <transformation>
-        <position/>
-        <rotation y="-90.0*degree"/>
-        <position x="-UpStr:VaxPipe6Length/2" y="UpStr:VaxPipe1HoleOffset"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvVaxUpStrPipe6b"
-             volume="lvVaxUpStrPipe6">
-      <transformation>
-        <position/>
-        <rotation y="90.0*degree"/>
-        <position x="UpStr:VaxPipe6Length/2" y="UpStr:VaxPipe1HoleOffset"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvVaxUpStrPipe6c"
-             volume="lvVaxUpStrPipe6">
-      <transformation>
-        <position/>
-        <rotation y="180.0*degree"/>
-        <position y="UpStr:VaxPipe1HoleOffset" z="-UpStr:VaxPipe6Length/2"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvVaxUpStrPipe7"
-             volume="lvVaxUpStrPipe7">
-      <transformation>
-        <position/>
-        <rotation x="-90.0*degree" z="90.0*degree"/>
-        <position y="UpStr:VaxPipe1Length + UpStr:VaxPipe7LidLength/2 + 0.01*mm"/>
-      </transformation>
-    </physvol>
-    <physvol name="pvVaxUpStrVacuum"
-             volume="lvVaxUpStrVacuum">
-      <position z="-UpStr:VaxMainBodyLength/2 - UpStr:VaxWindowTubsLenght - 0.01*mm + UpStr:VaxVacuumLength/2"/>
-    </physvol>
-  </volume>
-
-</pipe>
diff --git a/compact/components/Pipe/2025-v00.00/Upstream.xml b/compact/components/Pipe/2025-v00.00/Upstream.xml
deleted file mode 100644
index 4bc61f8bc..000000000
--- a/compact/components/Pipe/2025-v00.00/Upstream.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Beam Pipe Bakeout after the Magnet                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-
-    <!--==================================================================================-->
-    <!--===================================Bakeout========================================-->
-    <!--==================================================================================-->
-    <detector name="PipeUpstream" type="DD4hep_VolumeAssembly" parent="${PipeUpstream:parent}" vis="Pipe:Vis">
-
-      <!-- Pipe UpStr:UX86Adapter  (LHCb_Pipe_Section_Type_1) -->
-      <volume type="LHCb_Pipe_Section_Type_1" name="lvUX86Adapter">
-	<param name="vis"                value="Pipe:Upstream"/>
-	<param name="Material"           value="Pipe:Steel316LN"/>
-	<param name="Length"             value="UpStr:UX86AdapterPipeZ"/>
-	<param name="Radius"             value="UpStr:UX86AdapterPipeRad"/>
-	<param name="Thick"              value="UpStr:UX86AdapterPipeThick"/>
-	<param name="FlangeUpLength"     value="17.4*mm"/>
-	<param name="FlangeUpThick"      value="57.0*mm - (UpStr:UX86AdapterPipeRad + UpStr:UX86AdapterPipeThick + 0.01*mm)"/>
-	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
-	<param name="FlangeDownLength"   value="19.7*mm"/>
-	<param name="FlangeDownThick"    value="76.0*mm - (UpStr:UX86AdapterPipeRad + UpStr:UX86AdapterPipeThick + 0.01*mm)"/>
-	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
-      </volume>
-
-      <!-- Pipe UpStr:MBXWH  (LHCb_Pipe_Section_Type_1) -->
-      <volume type="LHCb_Pipe_Section_Type_1" name="lvMBXWHPipe">
-	<param name="vis"                value="Pipe:Upstream"/>
-	<param name="Material"           value="Pipe:CuOFE"/>
-	<param name="Length"             value="UpStr:MBXWHPipeLength"/>
-	<param name="Radius"             value="UpStr:MBXWHPipeRadius"/>
-	<param name="Thick"              value="UpStr:MBXWHPipeThick"/>
-	<param name="FlangeUpLength"     value="19.8*mm"/>
-	<param name="FlangeUpThick"      value="76.0*mm - (UpStr:MBXWHPipeRadius + UpStr:MBXWHPipeThick + 0.01*mm)"/>
-	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
-	<param name="FlangeDownLength"   value="17.4*mm"/>
-	<param name="FlangeDownThick"    value="57.0*mm - (UpStr:MBXWHPipeRadius + UpStr:MBXWHPipeThick + 0.01*mm)"/>
-	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
-      </volume>
-
-      <!-- UX85-4, Pipe in UpStr:MBXWS  (LHCb_Pipe_Section_Type_1) -->
-      <volume type="LHCb_Pipe_Section_Type_1" name="lvMBXWSPipe">
-	<param name="vis"                value="Pipe:Upstream"/>
-	<param name="Material"           value="Pipe:CuOFE"/>
-	<param name="Length"             value="UpStr:MBXWSPipeLength"/>
-	<param name="Radius"             value="UpStr:MBXWSPipeRadius"/>
-	<param name="Thick"              value="UpStr:MBXWSPipeThick"/>
-	<param name="FlangeUpLength"     value="17.4*mm"/>
-	<param name="FlangeUpThick"      value="29.0*mm"/>
-	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
-	<param name="FlangeDownLength"   value="19.8*mm"/>
-	<param name="FlangeDownThick"    value="48.0*mm"/>
-	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
-      </volume>
-      <!-- UX85-4, Pipe in VCDA  (LHCb_Pipe_Section_Type_1) -->
-      <volume type="LHCb_Pipe_Section_Type_1" name="lvVCDAPipe">
-	<param name="vis"                value="Pipe:Upstream"/>
-	<param name="Material"           value="Pipe:CuOFE"/>
-	<param name="Length"             value="UpStr:VCDAPipeLength"/>
-	<param name="Radius"             value="UpStr:VCDAPipeRadius"/>
-	<param name="Thick"              value="UpStr:VCDAPipeThick"/>
-	<param name="FlangeUpLength"     value="19.8*mm"/>
-	<param name="FlangeUpThick"      value="76.0*mm - (UpStr:VCDAPipeRadius + UpStr:VCDAPipeThick + 0.01*mm)"/>
-	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
-	<param name="FlangeDownLength"   value="17.4*mm"/>
-	<param name="FlangeDownThick"    value="76.0*mm - (UpStr:VCDAPipeRadius + UpStr:VCDAPipeThick + 0.01*mm)"/>
-	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
-      </volume>
-
-      <!-- UX85-4, Pipe in VCDBU  (LHCb_Pipe_Section_Type_1) -->
-      <volume type="LHCb_Pipe_Section_Type_1" name="lvVCDBUPipe">
-	<param name="vis"                value="Pipe:Upstream"/>
-	<param name="Material"           value="Pipe:CuOFE"/>
-	<param name="Length"             value="UpStr:VCDBUPipeLength"/>
-	<param name="Radius"             value="UpStr:VCDBUPipeRadius"/>
-	<param name="Thick"              value="UpStr:VCDBUPipeThick"/>
-	<param name="FlangeUpLength"     value="19.8*mm"/>
-	<param name="FlangeUpThick"      value="76.0*mm - (UpStr:VCDBUPipeRadius + UpStr:VCDBUPipeThick + 0.01*mm)"/>
-	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
-	<param name="FlangeDownLength"   value="17.4*mm"/>
-	<param name="FlangeDownThick"    value="76.0*mm - (UpStr:VCDBUPipeRadius + UpStr:VCDBUPipeThick + 0.01*mm)"/>
-	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
-      </volume>
-
-      <!-- UX85-4, Pipe in Trans  (LHCb_Pipe_Section_Type_1) -->
-      <volume type="LHCb_Pipe_Section_Type_1" name="lvTransPipe">
-	<param name="vis"                value="Pipe:Upstream"/>
-	<param name="Material"           value="Pipe:CuOFE"/>
-	<param name="Length"             value="UpStr:TransPipeLength"/>
-	<param name="Radius"             value="UpStr:TransPipeRadius"/>
-	<param name="Thick"              value="UpStr:TransPipeThick"/>
-	<param name="FlangeUpLength"     value="19.8*mm"/>
-	<param name="FlangeUpThick"      value="76.0*mm - (UpStr:TransPipeRadius + UpStr:TransPipeThick + 0.01*mm)"/>
-	<param name="FlangeUpMaterial"   value="Pipe:Steel316LN"/>
-	<param name="FlangeDownLength"   value="19.8*mm"/>
-	<param name="FlangeDownThick"    value="76.0*mm - (UpStr:TransPipeRadius + UpStr:TransPipeThick + 0.01*mm)"/>
-	<param name="FlangeDownMaterial" value="Pipe:Steel316LN"/>
-      </volume>
-
-      <!-- Pipe segment replacement of VVSSH  (LHCb_Pipe_Section_Type_1)  -->
-      <volume type="LHCb_Pipe_Section_Type_1" name="lvVVSSH">
-	<param name="vis"                value="Pipe:Upstream"/>
-	<param name="Material"           value="Pipe:Steel316LN"/>
-	<param name="Length"             value="UpStr:VVSSHPipeZ"/>
-	<param name="Radius"             value="UpStr:VVSSHPipeRad"/>
-	<param name="Thick"              value="UpStr:VVSSHPipeThick"/>
-	<param name="FlangeLength"       value="19.7*mm"/>
-	<param name="FlangeThick"        value="76.0*mm - (UpStr:VVSSHPipeRad + UpStr:VVSSHPipeThick + 0.01*mm)"/>
-	<param name="FlangeMaterial"     value="Pipe:Steel316LN"/>
-      </volume>
-
-      <include ref="Upstream-UX84.xml"/>
-      <include ref="Upstream-VVSGF.xml"/>
-      <include ref="Upstream-BPMSW.xml"/>
-      <include ref="Upstream-Vax.xml"/>
-
-      <!--==================================================================================-->
-      <!--===================================Final  Assembly================================-->
-      <!--==================================================================================-->
-      <envelope type="Assembly" name="lvPipeUpstream" vis="GreenVis">
-        <physvol name="pvUX84"        volume="lvUX84"/>
-        <physvol name="pvUX86Adapter" volume="lvUX86Adapter">
-          <position z="-327*mm/2 - 180.0*mm - 72.0*mm/2"/>
-        </physvol>
-        <physvol name="pvVVSGF" volume="lvVVSGF">
-          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm/2"/>
-        </physvol>
-        <physvol name="pvPipeInMBXWH" volume="lvMBXWHPipe">
-          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm/2"/>
-        </physvol>
-        <physvol name="pvPipeVCDA" volume="lvVCDAPipe">
-          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm/2"/>
-        </physvol>
-        <physvol name="pvPipeVCDBU" logvol="lvVCDBUPipe">
-          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm/2"/>
-        </physvol>
-        <physvol name="pvTransPipe" logvol="lvTransPipe">
-          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm/2"/>
-        </physvol>
-        <physvol name="pvVVSSH"       volume="lvVVSSH">
-          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm/2"/>
-        </physvol>
-	<physvol name="pvMBXWSUpStrPipe" volume="lvMBXWSPipe">
-	  <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm/2"/>
-	</physvol>
-        <physvol name="pvBPMSW" volume="lvBPMSW">
-          <transformation>
-            <position/>
-            <rotation x="180.0*degree"/>
-            <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm - 17.4*mm/2"/>
-          </transformation>
-
-        </physvol>
-	<physvol name="pvVaxUpStr" volume="lvVaxUpStr">
-	  <transformation>
-            <position/>
-            <rotation y="180.0*degree"/>
-            <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm - 285.0*mm - 180.0*mm - 134.0*mm/2"/>
-	  </transformation>
-	</physvol>
-        <physvol name="pvVVSGFVaxUpStr" volume="lvVVSGF">
-          <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm - 285.0*mm - 180.0*mm - 190.0*mm - 75.0*mm/2"/>
-        </physvol>
-      </envelope>
-
-      <position z="-Regions:BeforeMagnetZSize/2 - 327.0*mm/2 - Regions:UpstreamZPos"/>
-    </detector>
-
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Downstream.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Downstream.xml
deleted file mode 100644
index d1b599f16..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Downstream.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the VMA Warm Module BJ                                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-    <detector name="VMAAADownstream" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAADownstream:parent}" vis="VMA">
-      <params>
-        <param name="FullZ"            value="180*mm"/>
-        <param name="TransTubeRad"     value="40*mm"/>
-        <param name="TransTubeCylZ"    value="97.2*mm"/>
-        <param name="TransTubeConsRad" value="41*mm"/>
-        <param name="TransTubeConsZ"   value="6.3*mm"/>
-        <param name="EntryUpCylZ"      value="22.2*mm"/>
-        <param name="RfContactRad"     value="40*mm"/>
-        <param name="RfFingers"        value="48"/>
-      </params>
-      <RfContact vis="VMA:Contact">
-       <RfContactMount  material="Pipe:CuOFE"/>
-       <RfContactSingle material="Pipe:CuBe17410"/>
-      </RfContact>
-      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
-      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
-      <debug>
-        <item name="debug" value="VMA:debug"/>
-      </debug>
-      <position z="75.0*mm + 280*mm/2 - 2500.0*mm/2"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-DownstreamVax.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-DownstreamVax.xml
deleted file mode 100644
index e91e60b29..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-DownstreamVax.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the VMA Warm Module BJ                                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-    <detector name="VMAAADownstreamVax" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAADownstreamVax:parent}" vis="VMA">
-      <params>
-        <param name="FullZ"            value="180*mm"/>
-        <param name="TransTubeRad"     value="40*mm"/>
-        <param name="TransTubeCylZ"    value="97.2*mm"/>
-        <param name="TransTubeConsRad" value="41*mm"/>
-        <param name="TransTubeConsZ"   value="6.3*mm"/>
-        <param name="EntryUpCylZ"      value="22.2*mm"/>
-        <param name="RfContactRad"     value="40*mm"/>
-        <param name="RfFingers"        value="48"/>
-      </params>
-      <RfContact vis="VMA:Contact">
-       <RfContactMount  material="Pipe:CuOFE"/>
-       <RfContactSingle material="Pipe:CuBe17410"/>
-      </RfContact>
-      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
-      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
-      <debug>
-        <item name="debug" value="VMA:debug"/>
-      </debug>
-      <position z="75.0*mm + 280*mm + 80.0*mm + 1274.6*mm + 285.0*mm + 180.0*mm/2 - 2500.0*mm/2"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml
deleted file mode 100644
index 43c794555..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-Upstream.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the VMA Warm Module BJ                                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-    <detector name="VMAAAUpstream" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAAUpstream:parent}" vis="VMA">
-      <params>
-        <param name="FullZ"            value="180*mm"/>
-        <param name="TransTubeRad"     value="40*mm"/>
-        <param name="TransTubeCylZ"    value="97.2*mm"/>
-        <param name="TransTubeConsRad" value="41*mm"/>
-        <param name="TransTubeConsZ"   value="6.3*mm"/>
-        <param name="EntryUpCylZ"      value="22.2*mm"/>
-        <param name="RfContactRad"     value="40*mm"/>
-        <param name="RfFingers"        value="48"/>
-      </params>
-      <RfContact vis="VMA:Contact">
-       <RfContactMount  material="Pipe:CuOFE"/>
-       <RfContactSingle material="Pipe:CuBe17410"/>
-      </RfContact>
-      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
-      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
-      <debug>
-        <item name="debug" value="VMA:debug"/>
-      </debug>
-      <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm - 180.0*mm - 7000.0*mm - 180.0*mm/2"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-UpstreamVax.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-UpstreamVax.xml
deleted file mode 100644
index cec09ed31..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA-UpstreamVax.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the VMA Warm Module BJ                                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-    <detector name="VMAAAUpstreamVax" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAAUpstreamVax:parent}" vis="VMA:AA">
-      <params>
-        <param name="FullZ"            value="180*mm"/>
-        <param name="TransTubeRad"     value="40*mm"/>
-        <param name="TransTubeCylZ"    value="97.2*mm"/>
-        <param name="TransTubeConsRad" value="41*mm"/>
-        <param name="TransTubeConsZ"   value="6.3*mm"/>
-        <param name="EntryUpCylZ"      value="22.2*mm"/>
-        <param name="RfContactRad"     value="40*mm"/>
-        <param name="RfFingers"        value="48"/>
-      </params>
-      <RfContact vis="VMA:Contact">
-       <RfContactMount  material="Pipe:CuOFE"/>
-       <RfContactSingle material="Pipe:CuBe17410"/>
-      </RfContact>
-      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
-      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
-      <debug>
-        <item name="debug" value="VMA:debug"/>
-      </debug>
-      <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm - 80.0*mm - 1275.0*mm - 285.0*mm - 180.0*mm/2"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-AA.xml
deleted file mode 100644
index 84f7917ec..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-AA.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the VMA Warm Module BJ                                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-    <detector name="VMAAA" type="LHCb_Pipe_VMA_v1_0" parent="${VMAAA:parent}" vis="VMA">
-      <params>
-        <param name="FullZ"            value="100*mm"/>
-        <param name="TransTubeRad"     value="40*mm"/>
-        <param name="TransTubeCylZ"    value="97.2*mm"/>
-        <param name="TransTubeConsRad" value="41*mm"/>
-        <param name="TransTubeConsZ"   value="6.3*mm"/>
-        <param name="EntryUpCylZ"      value="22.2*mm"/>
-        <param name="RfContactRad"     value="40*mm"/>
-        <param name="RfFingers"        value="48"/>
-      </params>
-      <RfContact vis="VMA:Contact">
-       <RfContactMount  material="Pipe:CuOFE"/>
-       <RfContactSingle material="Pipe:CuBe17410"/>
-      </RfContact>
-      <TransitionTube material="Pipe:CuOFE"      vis="VMA:TransitionTube"/>
-      <Pipe           material="Pipe:Steel316LN" vis="VMA:Pipe"/>
-       <debug>
-        <item name="debug" value="VMA:debug"/>
-      </debug>
-      <position z="UX84FlangeDownPosZ + UX84FlangeDownLength/2 + 180.0*mm/2"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-BJ.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-BJ.xml
deleted file mode 100644
index 10e2551e7..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-BJ.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the VMA Warm Module BJ                                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-    <detector name="VMABJ" type="LHCb_Pipe_VMA_v1_0" parent="${VMABJ:parent}" vis="VMA">
-      <params>
-        <param name="FullZ"            value="280*mm"/>
-        <param name="TransTubeRad"     value="31.5*mm"/>
-        <param name="TransTubeCylZ"    value="197.2*mm"/>
-        <param name="TransTubeConsRad" value="32.5*mm"/>
-        <param name="TransTubeConsZ"   value="6.3*mm"/>
-        <param name="EntryUpCylZ"      value="6.2*mm"/>
-        <param name="RfContactRad"     value="31.5*mm"/>
-        <param name="RfFingers"        value="40"/>
-      </params>
-      <RfContact vis="VMA:Contact">
-       <RfContactMount  material="Pipe:CuOFE"/>
-       <RfContactSingle material="Pipe:CuBe17410"/>
-      </RfContact>
-      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
-      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
-      <Junction       material="Pipe:Steel316LN"  vis="VMA:Junction"/>
-      <debug>
-        <item name="debug" value="VMA:debug"/>
-      </debug>
-      <position z="75.0*mm + 280*mm/2 - 2500.0*mm/2"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml
deleted file mode 100644
index 732cb0fe5..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-BK-Upstream.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the VMA Warm Modules                                   -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-    <detector name="VMABKUpstream" type="LHCb_Pipe_VMA_v1_0" parent="${VMABKUpstream:parent}" vis="VMA">
-      <params>
-        <param name="FullZ"            value="280*mm"/>
-        <param name="TransTubeRad"     value="31.5*mm"/>
-        <param name="TransTubeCylZ"    value="162*mm"/>
-        <param name="TransTubeConsRad" value="41.0*mm"/>
-        <param name="TransTubeConsZ"   value="41.5*mm"/>
-        <param name="EntryUpCylZ"      value="22.2*mm"/>
-        <param name="RfContactRad"     value="40*mm"/>
-        <param name="RfFingers"        value="48"/>
-      </params>
-      <RfContact vis="VMA:Contact">
-       <RfContactMount  material="Pipe:CuOFE"/>
-       <RfContactSingle material="Pipe:CuBe17410"/>
-      </RfContact>
-      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
-      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
-      <Junction       material="Pipe:Steel316LN"  vis="VMA:Junction"/>
-      <debug>
-        <item name="debug" value="VMA:debug"/>
-      </debug>
-      <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm  - 180.0*mm - 7000.0*mm - 180.0*mm - 5130.0*mm - 75.0*mm - 280.0*mm/2"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml
deleted file mode 100644
index ea405fc65..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream1.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the VMA Warm Module BJ                                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-    <detector name="VMACAUpstream1" type="LHCb_Pipe_VMA_v1_0" parent="${VMACAUpstream:parent}" vis="VMA">
-      <params>
-        <param name="FullZ"            value="180*mm"/>
-        <param name="TransTubeRad"     value="31.5*mm"/>
-        <param name="TransTubeCylZ"    value="62*mm"/>
-        <param name="TransTubeConsRad" value="41*mm"/>
-        <param name="TransTubeConsZ"   value="41.5*mm"/>
-        <param name="EntryUpCylZ"      value="22.2*mm"/>
-        <param name="RfContactRad"     value="40*mm"/>
-        <param name="RfFingers"        value="48"/>
-      </params>
-      <RfContact vis="VMA:Contact">
-       <RfContactMount  material="Pipe:CuOFE"/>
-       <RfContactSingle material="Pipe:CuBe17410"/>
-      </RfContact>
-      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
-      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
-      <debug>
-        <item name="debug" value="VMA:debug"/>
-      </debug>
-
-      <position z="-327*mm/2 - 180.0*mm/2"/>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml
deleted file mode 100644
index a93a72a39..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-CA-Upstream2.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the VMA Warm Module BJ                                 -->
-<!--===========================================================================-->
-<lccdd>
-  <detectors>
-    <detector name="VMACAUpstream2" type="LHCb_Pipe_VMA_v1_0" parent="${VMACAUpstream:parent}" vis="VMA">
-      <params>
-        <param name="FullZ"            value="180*mm"/>
-        <param name="TransTubeRad"     value="31.5*mm"/>
-        <param name="TransTubeCylZ"    value="62*mm"/>
-        <param name="TransTubeConsRad" value="41*mm"/>
-        <param name="TransTubeConsZ"   value="41.5*mm"/>
-        <param name="EntryUpCylZ"      value="22.2*mm"/>
-        <param name="RfContactRad"     value="40*mm"/>
-        <param name="RfFingers"        value="48"/>
-      </params>
-      <RfContact vis="VMA:Contact">
-       <RfContactMount  material="Pipe:CuOFE"/>
-       <RfContactSingle material="Pipe:CuBe17410"/>
-      </RfContact>
-      <TransitionTube material="Pipe:CuOFE"       vis="VMA:TransitionTube"/>
-      <Pipe           material="Pipe:Steel316LN"  vis="VMA:Pipe"/>
-      <debug>
-        <item name="debug" value="VMA:debug"/>
-      </debug>
-
-      <transformation>
-        <position/>
-        <rotation rotX="180.0*degree"/>
-        <position z="-327*mm/2 - 180.0*mm - 72.0*mm - 75.0*mm - 3916.0*mm - 180.0*mm/2"/>
-      </transformation>
-    </detector>
-  </detectors>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/VMA/VMA-Params.xml b/compact/components/Pipe/2025-v00.00/VMA/VMA-Params.xml
deleted file mode 100644
index c8502731a..000000000
--- a/compact/components/Pipe/2025-v00.00/VMA/VMA-Params.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!--===========================================================================-->
-<!--  LHCb Detector Description                                                -->
-<!--===========================================================================-->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--===========================================================================-->
-<!-- XML description of the Global VMA Warm Module parameters                  -->
-<!--===========================================================================-->
-<lccdd>
-  <define>
-    <comment> RF contact mount global parameters </comment>
-    <constant name="VMA:RfContactThick"               value="3.00*mm"/>
-    <constant name="VMA:RfContactCylZ"                value="14.50*mm"/>
-    <constant name="VMA:RfContactFlangeZ"             value="2.50*mm"/>
-    <constant name="VMA:RfContactFlangeThickRaw"      value="55.8*mm"/>
-
-    <comment> RF contact single arm global parameters </comment>
-    <constant name="VMA:RfContSingleThick"            value="0.10*mm"/>
-    <constant name="VMA:RfContSinglePlateZ"           value="14.00*mm"/>
-    <constant name="VMA:RfContSingleX"                value="3.60*mm"/>
-
-    <constant name="VMA:RfContSingleArmZ"             value="90.80*mm"/>
-    <constant name="VMA:RfContSingleArmAng"           value="4.00*degree"/>
-    <constant name="VMA:RfContSingleEndZ"             value="8.37*mm"/>
-    <constant name="VMA:RfContSingleEndAng"           value="VMA:RfContSingleArmAng + 21*degree"/>
-
-    <comment> Transition tube global parameters </comment>
-    <constant name="VMA:TransTubeThick"               value="2.00*mm"/>
-    <constant name="VMA:TransTubeFlangeInnerThickRaw" value="51.5*mm"/>
-    <constant name="VMA:TransTubeFlangeThickRaw"      value="55.8*mm"/>
-    <constant name="VMA:TransTubeFlangeZ"             value="2.50*mm"/>
-    <constant name="VMA:TransTubeFlangeInnerZ"        value="5.5*mm"/>
-
-    <comment> Pipe global parameters </comment>
-    <constant name="VMA:EntryThick"                   value="1.50*mm"/>
-    <constant name="VMA:EntryRad"                     value="50.00*mm"/>
-    <constant name="VMA:EntryConsZ"                   value="2.80*mm"/>
-    <constant name="VMA:EntryConsRadEnd"              value="52.80*mm"/>
-    <constant name="VMA:EntryDownCylZ"                value="22.20*mm"/>
-
-    <constant name="VMA:BellowZ"                      value="110.00*mm"/>
-    <constant name="VMA:BellowPitch"                  value="4.00*mm"/>
-    <constant name="VMA:BellowThick"                  value="0.20*mm"/>
-    <constant name="VMA:BellowInnerRad"               value="51.50*mm"/>
-    <constant name="VMA:BellowOuterRad"               value="57.00*mm"/>
-    <constant name="VMA:BellowCyl1Z"                  value="50.00*mm"/>
-    <constant name="VMA:BellowCyl2Z"                  value="34.00*mm"/>
-
-    <constant name="VMA:FlangeUpThick"                value="24.50*mm"/>
-    <constant name="VMA:FlangeUpCylZ"                 value="19.80*mm"/>
-    <constant name="VMA:FlangeUpCylRad"               value="51.50*mm"/>
-    <constant name="VMA:FlangeUpCylSubZ"              value="3.80*mm"/>
-    <constant name="VMA:FlangeUpCylSubRad"            value="55.90*mm"/>
-
-    <constant name="VMA:FlangeDownThick"              value="24.50*mm"/>
-    <constant name="VMA:FlangeDownCylZ"               value="19.80*mm"/>
-    <constant name="VMA:FlangeDownCylRad"             value="51.50*mm"/>
-    <constant name="VMA:FlangeDownCylSubZ"            value="3.80*mm"/>
-    <constant name="VMA:FlangeDownCylSubRad"          value="55.90*mm"/>
-
-    <comment> Junction global parameters </comment>
-    <constant name="VMA:PipeCylZ"                     value="115.00*mm"/>
-    <constant name="VMA:PipeCylRad"                   value="50.00*mm"/>
-    <constant name="VMA:PipeCylThick"                 value="1.50*mm"/>
-
-    <constant name="VMA:PipeTopCylZ"                  value="112.0*mm"/>
-    <constant name="VMA:PipeTopCylRad"                value="17.5*mm"/>
-    <constant name="VMA:PipeTopCylThick"              value="VMA:PipeCylThick"/>
-    <constant name="VMA:PipeTopCylPosZ"               value="72.0*mm"/>
-
-    <constant name="VMA:PipeSideCylZ"                 value="125.0*mm"/>
-    <constant name="VMA:PipeSideCylRad"               value="30.0*mm"/>
-    <constant name="VMA:PipeSideCylThick"             value="VMA:PipeCylThick"/>
-    <constant name="VMA:PipeSideCylPosZ"              value="VMA:PipeTopCylPosZ"/>
-
-    <constant name="VMA:FlangeTopCylZ"                value="12.7*mm"/>
-    <constant name="VMA:FlangeTopCylThickRaw"         value="35.0*mm"/>
-
-    <constant name="VMA:FlangeSideCylZ"               value="17.5*mm"/>
-    <constant name="VMA:FlangeSideCylThickRaw"        value="57.0*mm"/>
-    <constant name="VMA:debug"                        value="0"/>
-  </define>
-
-  <display>
-    <vis name="VMA"                alpha="1.0"  r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true"/>
-    <vis name="VMA:Contact"        alpha="1.0"  r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true"/>
-    <vis name="VMA:TransitionTube" alpha="1.0"  r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true"/>
-    <vis name="VMA:Pipe"           alpha="1.0"  r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true"/>
-    <vis name="VMA:Junction"       alpha="1.0"  r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
-  </display>
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/materials.xml b/compact/components/Pipe/2025-v00.00/materials.xml
deleted file mode 100644
index aca60728a..000000000
--- a/compact/components/Pipe/2025-v00.00/materials.xml
+++ /dev/null
@@ -1,280 +0,0 @@
-<lccdd>
-<!--
-    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-
-  <materials>
-    <!-- ### Pipe Aluminium ### -->
-    <element  name="Pipe:Al" formula="Al" Z="13.0">
-      <atom type="A" value="26.98" unit="g/mole"/>
-    </element>
-    <material formula="Pipe:Al" name="Pipe:Aluminum" state="solid" >
-      <D type="density" unit="g/cm3" value="2.699" />
-      <fraction n="1.0" ref="Pipe:Al" />
-    </material>
-
-    <!-- ### Pipe Copper ### -->
-    <element Z="29" formula="Pipe:Cu" name="Pipe:Cu" >
-      <atom type="A" unit="g/mol" value="63.5456" />
-    </element>
-
-    <material formula="Pipe:Cu" name="Pipe:Copper" state="solid" >
-      <RL type="X0" unit="cm" value="1.43558" />
-      <NIL type="lambda" unit="cm" value="15.5141"/>
-      <D type="density" unit="g/cm3" value="8.96"/>
-      <composite n="1" ref="Pipe:Cu"/>
-    </material>
-
-    <!-- ### Pipe Beryllium ### -->
-    <element  name="Pipe:Be" formula="Be" Z="4.0">
-      <atom type="A" value="9.01" unit="g/mole"/>
-    </element>
-
-    <!-- ### Pipe Beryllium ### -->
-    <material name="Pipe:Beryllium">
-      <D name="density" value="1.848" unit="g/cm3"/>
-      <fraction n="1.0" ref="Pipe:Be"/>
-    </material>
-
-    <!-- ### Pipe Aluminium Beryllium Alloy ### -->
-    <material name="Pipe:AlBe">
-      <D name="density" value="2.104" unit="g/cm3"/>
-      <fraction ref="Pipe:Al"    n="0.40"/>
-      <fraction ref="Pipe:Be"    n="0.60"/>
-    </material>
-
-    <!-- ### Pipe Aluminium Copper Alloy ### -->
-    <material name ="Pipe:AlCu">
-      <D name="density" value="2.83" unit="g/cm3"/>
-      <fraction ref="Pipe:Al"    n="0.93"/>
-      <fraction ref="Cu"         n="0.07"/>
-    </material>
-
-    <!-- ### Pipe Steel ### -->
-    <material name ="Pipe:Steel">
-      <D name="density" value="7.87" unit="g/cm3"/>
-      <fraction ref="Fe"    n="1.0"/>
-      <fraction ref="C"     n="0.0"/>
-    </material>
-
-    <!-- ### Pipe Al6061 ### -->
-    <material name ="Pipe:Al6061">
-      <D name="density" value="2.7" unit="g/cm3"/>
-      <fraction ref="Al" n="0.9762"/>
-      <fraction ref="Si" n="0.0070"/>
-      <fraction ref="Fe" n="0.0010"/>
-      <fraction ref="Cu" n="0.0026"/>
-      <fraction ref="Mg" n="0.0012"/>
-      <fraction ref="Mg" n="0.0090"/>
-      <fraction ref="Cr" n="0.0026"/>
-      <fraction ref="Zn" n="0.0001"/>
-      <fraction ref="Ti" n="0.0003"/>
-    </material>
-
-    <!-- ### Pipe Al2219 forging ### -->
-    <material name ="Pipe:Al2219F">
-      <D name="density" value="2.84" unit="g/cm3"/>
-      <fraction ref="Al" n="0.93288"/>
-      <fraction ref="Si" n="0.0006"/>
-      <fraction ref="Fe" n="0.0011"/>
-      <fraction ref="Cu" n="0.0590"/>
-      <fraction ref="Mn" n="0.0029"/>
-      <fraction ref="Mg" n="0.0010"/>
-      <fraction ref="Zr" n="0.0011"/>
-      <fraction ref="Ti" n="0.00052"/>
-      <fraction ref="Zn" n="0.0001"/>
-      <fraction ref="V"  n="0.0008"/>
-    </material>
-
-    <!-- ### Pipe Al2219 standard ### -->
-    <material name ="Pipe:Al2219S">
-      <D name="density" value="2.84" unit="g/cm3"/>
-      <fraction ref="Al" n="0.9168"/>
-      <fraction ref="Si" n="0.0020"/>
-      <fraction ref="Fe" n="0.0030"/>
-      <fraction ref="Cu" n="0.0680"/>
-      <fraction ref="Mn" n="0.0040"/>
-      <fraction ref="Mg" n="0.0002"/>
-      <fraction ref="Zr" n="0.0025"/>
-      <fraction ref="Ti" n="0.0010"/>
-      <fraction ref="Zn" n="0.0010"/>
-      <fraction ref="V"  n="0.0015"/>
-    </material>
-
-    <!-- ### Pipe Be TV56 ### -->
-    <material name ="Pipe:BeTV56">
-      <D name="density" value="1.85" unit="g/cm3"/>
-      <fraction ref="Be" n="0.9780"/>
-      <fraction ref="O"  n="0.0066"/>
-      <fraction ref="C"  n="0.01251"/>
-      <fraction ref="Si" n="0.00026"/>
-      <fraction ref="Fe" n="0.0015"/>
-      <fraction ref="Al" n="0.00018"/>
-      <fraction ref="Ti" n="0.00019"/>
-      <fraction ref="Cr" n="0.00027"/>
-      <fraction ref="Cu" n="0.00013"/>
-      <fraction ref="Mn" n="0.00012"/>
-      <fraction ref="Mg" n="0.00012"/>
-      <fraction ref="Ni" n="0.00012"/>
-    </material>
-
-    <!-- ### Pipe Stainless Steel 316LN ### -->
-    <material name ="Pipe:Steel316LN">
-      <D name="density" value="8.0" unit="g/cm3"/>
-      <fraction ref="Fe" n="0.61195"/>
-      <fraction ref="Cr" n="0.185"/>
-      <fraction ref="Mn" n="0.020"/>
-      <fraction ref="Ni" n="0.140"/>
-      <fraction ref="N"  n="0.002"/>
-      <fraction ref="Mo" n="0.030"/>
-      <fraction ref="P"  n="0.00045"/>
-      <fraction ref="C"  n="0.0003"/>
-      <fraction ref="S"  n="0.0003"/>
-      <fraction ref="Si" n="0.0100"/>
-    </material>
-
-
-    <!-- ### Pipe Aluminium EN AW-6082 ### -->
-    <material name="Pipe:Al6082">
-      <D name="density" value="2.70" unit="g/cm3"/>
-      <fraction ref="Al" n="0.9445"/>
-      <fraction ref="Si" n="0.0130"/>
-      <fraction ref="Fe" n="0.0050"/>
-      <fraction ref="Cu" n="0.0100"/>
-      <fraction ref="Mn" n="0.0100"/>
-      <fraction ref="Mg" n="0.0120"/>
-      <fraction ref="Zr" n="0.0020"/>
-      <fraction ref="Ti" n="0.0010"/>
-      <fraction ref="Cr" n="0.0025"/>
-    </material>
-
-    <!-- ### Pipe Aluminium EN AW-7075 ### -->
-    <material name="Pipe:AW7075">
-      <D name="density" value="2.70" unit="g/cm3"/>
-      <fraction ref="Al" n="0.8865"/>
-      <fraction ref="Si" n="0.004"/>
-      <fraction ref="Fe" n="0.0050"/>
-      <fraction ref="Cu" n="0.0160"/>
-      <fraction ref="Mn" n="0.0030"/>
-      <fraction ref="Mg" n="0.0250"/>
-      <fraction ref="Zr" n="0.0010"/>
-      <fraction ref="Ti" n="0.0010"/>
-      <fraction ref="Cr" n="0.0025"/>
-      <fraction ref="Zn" n="0.056"/>
-    </material>
-
-    <!-- ### Pipe Aerogel for bakeout ### -->
-    <material name="Pipe:BakeOutAerogel">
-      <D type="density" value="0.11" unit="g/cm3"/>
-      <composite ref="Si" n="1" />
-      <composite ref="O"  n="2" />
-    </material>
-
-    <!-- ### Pipe Mount Brass ### -->
-    <material name    = "Pipe:Brass">
-      <D type="density" value="8.53" unit="g/cm3"/>
-      <fraction ref = "Cu" n = "0.70"/>
-      <fraction ref = "Zn"   n = "0.30"/>
-    </material>
-
-    <!-- ### Pipe Mount AW2219 ### -->
-    <material name    = "Pipe:AW2219">
-      <D type="density" value="2.84" unit="g/cm3"/>
-      <fraction ref = "Al" n = "0.9168"/>
-      <fraction ref = "Cu" n = "0.0680"/>
-      <fraction ref = "Fe" n = "0.0030"/>
-      <fraction ref = "Mg" n = "0.0002"/>
-      <fraction ref = "Mn" n = "0.0040"/>
-      <fraction ref = "Si" n = "0.0020"/>
-      <fraction ref = "Ti" n = "0.0010"/>
-      <fraction ref = "V"  n = "0.0015"/>
-      <fraction ref = "Zn" n = "0.0010"/>
-      <fraction ref = "Zr" n = "0.0025"/>
-    </material>
-
-    <!-- ### Cables  FutureFibre ### -->
-
-    <material name="Pipe:CarbonForFibre">
-      <D type="density" value="1.76" unit="g/cm3"/>
-      <composite ref="C" n="1" />
-    </material>
-    <material name="Pipe:CarbonFibreResin">
-      <D type="density" value="1.21" unit="g/cm3"/>
-      <composite ref="C" n="36" />
-      <composite ref="H" n="4" />
-      <composite ref="O" n="10" />
-      <composite ref="N" n="1" />
-    </material>
-
-    <material name="Pipe:FutureFibre">
-      <D type="density" value="1.84" unit="g/cm3"/>
-      <fraction ref="Pipe:CarbonForFibre"   n="0.62" />
-      <fraction ref="Pipe:CarbonFibreResin" n="0.38" />
-    </material>
-
-    <!-- ### Cables  Technora ### -->
-    <material name="Pipe:Technora">
-      <D type="density" value="1.39" unit="g/cm3"/>
-      <composite ref="C"  n="8"/>
-      <composite ref="H"  n="4"/>
-      <composite ref="Cl" n="2"/>
-      <composite ref="O"  n="2"/>
-    </material>
-
-    <!-- ### Pipe Supports Celazole ### -->
-    <material name   ="Pipe:Celazole">
-      <D type="density" value="1.3" unit="g/cm3"/>
-      <composite ref="C" n="20"/>
-      <composite ref="H" n="12"/>
-      <composite ref="N" n="4"/>
-    </material>
-
-    <!-- ### Pipe Supports Titanium small pins ### -->
-    <material name   ="Pipe:PipeTitaniumG5">
-      <D type="density" value="4.42" unit="g/cm3"/>
-      <fraction ref="Al" n="0.06"/>
-      <fraction ref="Fe" n="0.0025"/>
-      <fraction ref="Ti" n="0.8955"/>
-      <fraction ref="V"  n="0.04"/>
-      <fraction ref="O"  n="0.0020"/>
-
-    </material>
-
-    <!-- ### Pipe Supports Sintimid ### -->
-    <material name   ="Pipe:Sintimid">
-      <D type="density" value="1.43" unit="g/cm3"/>
-      <composite ref="C"   n="18"/>
-      <composite ref="O"   n="5"/>
-      <composite ref="N" n="2"/>
-    </material>
-
-    <!--### Pipe Supports Sintimid15G ###-->
-    <material name   ="Pipe:Sintimid15G">
-      <D type="density" value="1.42" unit="g/cm3"/>
-      <fraction ref="Pipe:Sintimid" n="0.85"/>
-      <fraction ref="C"        n="0.15"/>
-    </material>
-
-    <!-- ### Cu OFE ### -->
-    <material name   ="Pipe:CuOFE">
-      <D type="density" value="8.96" unit="g/cm3"/>
-      <fraction ref="Cu" n="1.0"/>
-    </material>
-
-    <!-- ### Cu-Be 17410 ### -->
-    <material name   ="Pipe:CuBe17410">
-      <D type="density" value="8.80" unit="g/cm3"/>
-      <fraction ref="Cu" n="0.99"/>
-      <fraction ref="Be" n="0.004"/>
-      <fraction ref="Co"    n="0.006"/>
-    </material>
-  </materials>
-
-</lccdd>
diff --git a/compact/components/Pipe/2025-v00.00/parameters.xml b/compact/components/Pipe/2025-v00.00/parameters.xml
deleted file mode 100644
index 98b42280a..000000000
--- a/compact/components/Pipe/2025-v00.00/parameters.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--========================================================================== -->
-<!--  LHCb Detector Description                                                -->
-<!--========================================================================== -->
-<!--                                                                           -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!--  All rights reserved.                                                     -->
-<!--                                                                           -->
-<!--   @author  M.Frank                                                        -->
-<!--   @date    14/10/2018                                                     -->
-<!--                                                                           -->
-<!--========================================================================== -->
-<!-- XML description of the Full beam pipe in LHCb                             -->
-<!--========================================================================== -->
-<lccdd>
-  <define>
-    <constant name="PipeUpstream:parent"           value="/world/UpstreamRegion"                 type="string"/>
-    <constant name="PipeBeforeMagnet:parent"       value="/world/BeforeMagnetRegion"             type="string"/>
-    <constant name="PipeBeforeVeloJunction:parent" value="/world/BeforeMagnetRegion"             type="string"/>
-    <constant name="PipeBeforeVelo:parent"         value="/world/BeforeMagnetRegion/BeforeVelo"  type="string"/>
-    <constant name="PipeInVP:parent"               value="/world/BeforeMagnetRegion/VP"          type="string"/>
-    <constant name="PipeInUT:parent"               value="/world/BeforeMagnetRegion/UT"          type="string"/>
-    <constant name="PipeInRich1:parent"            value="/world/BeforeMagnetRegion/Rich1"       type="string"/>
-    <constant name="PipeMagnet:parent"             value="/world/MagnetRegion"                   type="string"/>
-    <constant name="PipeAfterMagnetBakeout:parent" value="/world/AfterMagnetRegion"              type="string"/>
-    <constant name="PipeAfterT:parent"             value="/world/AfterMagnetRegion"              type="string"/>
-    <constant name="PipeInT:parent"                value="/world/AfterMagnetRegion/T"            type="string"/>
-    <constant name="PipeDownstream:parent"         value="/world/DownstreamRegion"               type="string"/>
-    <constant name="PipeAfterMuon:parent"          value="/world/DownstreamRegion/AfterMuon"     type="string"/>
-
-    <constant name="VMAAAUpstream:parent"          value="/world/UpstreamRegion/PipeUpstream"    type="string"/>
-    <constant name="VMAAAUpstreamVax:parent"       value="/world/UpstreamRegion/PipeUpstream"    type="string"/>
-    <constant name="VMACAUpstream:parent"          value="/world/UpstreamRegion/PipeUpstream"    type="string"/>
-    <constant name="VMABKUpstream:parent"          value="/world/UpstreamRegion/PipeUpstream"    type="string"/>
-
-    <constant name="VMAAA:parent"                  value="/world/BeforeMagnetRegion/BeforeVelo/PipeBeforeVelo" type="string"/>
-
-    <constant name="VMAAADownstream:parent"        value="/world/DownstreamRegion/AfterMuon/PipeAfterMuon"     type="string"/>
-    <constant name="VMAAADownstreamVax:parent"     value="/world/DownstreamRegion/AfterMuon/PipeAfterMuon"     type="string"/>
-    <constant name="VMABJ:parent"                  value="/world/DownstreamRegion/AfterMuon/PipeAfterMuon"     type="string"/>
-
-  <!-- The following two lines defined in LHCb.xml and hence commented out here -->
-  <!--  <constant name="Rich1:parent"                  value="/world/BeforeMagnetRegion"             type="string"/> -->
-  <!--  <constant name="Rich2:parent"                  value="/world/AfterMagnetRegion"              type="string"/> -->
-
-  </define>
-
-  <display>
-    <vis name="Pipe:Vis"        alpha="0.3" r="0.4" g="0.4" b="0.4" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:Vacuum"     alpha="1"   r="0.4" g="0.4" b="0.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:Bakeout"    alpha="0.4" r="0.0" g="1.0" b="0.1" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:Magnet"     alpha="1"   r="1.0" g="0.1" b="0.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:Upstream"   alpha="1"   r="0.0" g="0.1" b="1.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:Downstream" alpha="1"   r="0.0" g="0.1" b="1.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:AfterMuon"  alpha="1"   r="1.0" g="0.7" b="0.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:Support"    alpha="1"   r="1.0" g="0.1" b="0.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:InVP"       alpha="1"   r="0.5" g="1.0" b="0.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:InUT"       alpha="1"   r="0.0" g="0.1" b="1.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:InRich1"    alpha="1"   r="0.0" g="1.0" b="0.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:InT"        alpha="1.0" r="0.0" g="0.9" b="0.0" showDaughters="true"  visible="true"/>
-    <vis name="Pipe:AfterT"     alpha="1.0" r="0.9" g="0.0" b="0.0" showDaughters="true"  visible="true"/>
-  </display>
-
-  <include ref="./materials.xml"/>
-</lccdd>
diff --git a/compact/components/SMOG2/2025-v00.00/SMOG2.xml b/compact/components/SMOG2/2025-v00.00/SMOG2.xml
deleted file mode 100644
index b5eff72db..000000000
--- a/compact/components/SMOG2/2025-v00.00/SMOG2.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-    (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-<lccdd>
-
-  <info name="SMOG2" title="SMOG2" author="Marco Santimaria" url="https://cds.cern.ch/record/2673690" status="development" version="$Id: $">
-    <comment>
-      SMOG2 gas storage cell
-    </comment>
-  </info>
-
-  <define>
-    <constant name="SMOG2:tube_rmin" value="5*mm" />
-    <constant name="SMOG2:tube_thickness" value="0.2*mm" />
-    <constant name="SMOG2:tube_length" value="20*cm" />
-    <constant name="SMOG2:supp_rmin" value="13*mm" />
-    <constant name="SMOG2:supp_rmax" value="17*mm" />
-    <constant name="SMOG2:supp_thickness" value="5*mm" />
-    <constant name="SMOG2:supp_dist" value="1*cm" />
-    <constant name="SMOG2:cone_rmax" value="28*mm" />
-    <constant name="SMOG2:cone_length" value="8*cm" />
-    <constant name="SMOG2:ring_dr" value="5*mm" />
-    <constant name="SMOG2:wing_dx" value="48.3*mm" />
-    <constant name="SMOG2:wing_dy" value="1.2*mm" />
-    <constant name="SMOG2:supp_h" value="1*cm" />
-    <constant name="SMOG2:bar_dim" value="1*cm" />
-    <constant name="SMOG2:wing_delta" value="0*mm" />
-    <constant name="SMOG2:delta_z" value="0.1*mm" />
-    <constant name="SMOG2:wfs_length" value="98.5*mm" />
-    <constant name="SMOG2:wfs_down_length" value="3.6*mm" />
-    <constant name="SMOG2:wfs_hole_r" value="2.5*mm" />
-    <constant name="SMOG2:wfs_clear" value="5*mm" />
-    <constant name="SMOG2:opening_shift" value="0.5*mm" />
-    <constant name="SMOG2:h_sub" value="4*cm"/>
-    <constant name="SMOG2:pistS_r" value="1.5*mm"/>
-    <constant name="SMOG2:pistS_length" value="13*mm"/>
-    <constant name="SMOG2:pistB_r" value="7*mm"/>
-    <constant name="SMOG2:pistB_length" value="15*mm"/>
-    <constant name="SMOG2:fixed_tol" value="0*mm"/>
-    <constant name="SMOG2:z_pos" value="VP:RFBoxZPosition - VP:RFBoxTopPlateZSize/2 - VP:RFBoxThick - SMOG2:tube_length/2 - SMOG2:wfs_down_length - 2*SMOG2:wing_dy - 2*mm"/>
-  </define>
-
-  <display>
-    <vis name="SMOG2:CellVis" alpha="0.3" showDaughters="true"  visible="false"/>
-    <vis name="SMOG2:VacuumVis" alpha="1.0" r="0.2" g="0.2" b="0.2" showDaughters="true" visible="true" />
-    <vis name="SMOG2:AlVis" alpha="1.0" r="0.75" g="0.75" b="0.75" showDaughters="true" visible="true" />
-    <vis name="SMOG2:WingVis" alpha="0.6" r="0.16" g="0.30" b="0.75" showDaughters="true" visible="true" />
-    <vis name="SMOG2:WingTVis" alpha="0.6" r="0.31" g="0.44" b="0.85" showDaughters="true" visible="true" />
-    <vis name="SMOG2:RingVis" alpha="1.0" r="0.95" g="0.23" b="0.05" showDaughters="true" visible="true" />
-    <vis name="SMOG2:WFSVis" alpha="1.0" r="1.0" g="0.65" b="0" showDaughters="true" visible="true" />
-    <vis name="SMOG2:SuppVis" alpha="0.2" r="0" g="0.5" b="0" showDaughters="true" visible="true" />
-  </display>
-
-  <detectors>
-
-      <detector id="SMOG2_L:ID" name="SMOG2_L" type="LHCb_SMOG2_Left_v1_0" parent="${SMOG2_L:parent}" vis="CellVis">
-      <tube rmin="SMOG2:tube_rmin" thickness="SMOG2:tube_thickness" length="SMOG2:tube_length"/>
-      <cone rmax="SMOG2:cone_rmax" length="SMOG2:cone_length"/>
-      <box dx="SMOG2:wing_dx" dy="SMOG2:wing_dy" dz="SMOG2:tube_length"/>
-      <position x="SMOG2:opening_shift" y="0*cm" z="SMOG2:z_pos"/>
-      <rotation z="0*degree" y = "0*degree" x="180*degree"/>
-    </detector>
-
-      <detector id="SMOG2_R:ID" name="SMOG2_R" type="LHCb_SMOG2_Right_v1_0" parent="${SMOG2_R:parent}" vis="CellVis">
-      <tube rmin="SMOG2:tube_rmin" thickness="SMOG2:tube_thickness" length="SMOG2:tube_length"/>
-      <cone rmax="SMOG2:cone_rmax" length="SMOG2:cone_length"/>
-      <box dx="SMOG2:wing_dx" dy="SMOG2:wing_dy" dz="SMOG2:tube_length"/>
-      <position x="-SMOG2:opening_shift" y="0*cm" z="SMOG2:z_pos"/>
-      <rotation z="180*degree" y = "0*degree" x="180*degree"/>
-    </detector>
-
-      <detector id="SMOG2_F:ID" name="SMOG2_F" type="LHCb_SMOG2_Fixed_v1_0" parent="${SMOG2_F:parent}" vis="CellVis">
-      <cone rmax="SMOG2:cone_rmax" length="SMOG2:cone_length"/>
-      <box dx="SMOG2:wing_dx" dy="SMOG2:wing_dy" dz="SMOG2:tube_length"/>
-      <position x="0*cm" y="0*cm" z="SMOG2:z_pos - SMOG2:tube_length/2 - SMOG2:cone_length - SMOG2:wing_dy - SMOG2:fixed_tol"/>
-      <rotation z="0*degree" y = "0*degree" x="180*degree"/>
-    </detector>
-
-  </detectors>
-
-  <!--
-  <plugins>
-    <plugin name="LHCb_Align_cond_XML_reader" type="xml"/>
-  </plugins>
-  -->
-
-</lccdd>
diff --git a/compact/components/UT/2025-v00.00/Module.xml b/compact/components/UT/2025-v00.00/Module.xml
deleted file mode 100644
index e970a9115..000000000
--- a/compact/components/UT/2025-v00.00/Module.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<ut>
-<!--
-    (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-    <!--======Readout ASIC======-->
-    <volume material="UT:UTAsic" name="lvAsic1" vis="UT:Asic">
-        <shape name="utAsic" type="Box" dx="(UTAsicWide)/2" dy="(UTAsicLong)/2" dz="(UTAsicThick)/2"/>
-    </volume>
-    <volume name="lvAsic4">
-        <physvol volume="lvAsic1" name="pvAsicForGroup4_0">
-            <position x="-3/8*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup4_1">
-            <position x="-1/8*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup4_2">
-            <position x="1/8*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup4_3">
-            <position x="3/8*UTSensorSiWide"/>
-        </physvol>
-    </volume>
-    <volume name="lvAsic8">
-        <physvol volume="lvAsic1" name="pvAsicForGroup8_0">
-            <position x="-7/16*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup8_1">
-            <position x="-5/16*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup8_2">
-            <position x="-3/16*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup8_3">
-            <position x="-1/16*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup8_4">
-            <position x="1/16*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup8_5">
-            <position x="3/16*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup8_6">
-            <position x="5/16*UTSensorSiWide"/>
-        </physvol>
-        <physvol volume="lvAsic1" name="pvAsicForGroup8_7">
-            <position x="7/16*UTSensorSiWide"/>
-        </physvol>
-    </volume>
-    <!--====== HybridFlex ======-->
-    <!-- Porting from UTv4r1-materials branch instead of UTV4r2 -->
-    <volume material="UT:HybridFlex4" name="lvModuleFlex4" vis="UT:HybridFlex">
-        <shape name="utHybridFlex4" type="Box" dx="(UTHybridFlex4Wide)/2" dy="(UTHybridFlex4Long)/2" dz="(UTHybridFlex4Thick)/2"/>
-    </volume>
-    <volume material="UT:HybridFlex8" name="lvModuleFlex8" vis="UT:HybridFlex">
-        <shape name="utHybridFlex8" type="Box" dx="(UTHybridFlex8Wide)/2" dy="(UTHybridFlex8Long)/2" dz="(UTHybridFlex8Thick)/2"/>
-    </volume>
-    <!--====== Hysol+Dia glue ======-->
-    <volume material="UT:HysolDia" name="lvHysolA" vis="UT:Invisible">
-        <shape name="utHysolA" type="BooleanShape" operation="subtraction">
-            <shape name="utHysolBoxA1" type="Box" dx="(UTHysolWide)/2" dy="(UTHysolLongA)/2" dz="(UTHysolThick)/2"/>
-            <shape name="utHysolBoxA2" type="Box" dx="(UTHysolCutWide*2)/2" dy="(UTHysolCutLongA*2)/2" dz="(UTHysolThick*2)/2"/>
-            <position x="UTHysolWide/2" y="UTHysolLongA/2"/>
-            <shape name="utHysolBoxA3" type="Box" dx="(UTHysolWide*2)/2" dy="(UTHysolGapWide)/2" dz="(UTHysolThick*2)/2"/>
-            <position y="UTHysolLongA/2-UTSensorLongA-UTHysolGapWide/2"/>
-        </shape>
-    </volume>
-    <volume material="UT:HysolDia" name="lvHysolB" vis="UT:Invisible">
-        <shape name="utHysolB" type="BooleanShape" operation="subtraction">
-            <shape name="utHysolBoxB1" type="Box" dx="(UTHysolWide)/2" dy="(UTHysolLongB)/2" dz="(UTHysolThick)/2"/>
-            <shape name="utHysolBoxB2" type="Box" dx="(UTHysolCutWide*2)/2" dy="(UTHysolCutLongB*2)/2" dz="(UTHysolThick*2)/2"/>
-            <position x="UTHysolWide/2" y="UTHysolLongB/2"/>
-            <shape name="utHysolBoxB3" type="Box" dx="(UTHysolWide*2)/2" dy="(UTHysolGapWide)/2" dz="(UTHysolThick*2)/2"/>
-            <position y="UTHysolLongB/2-UTSensorLongB-UTHysolGapWide/2"/>
-        </shape>
-    </volume>
-    <volume material="UT:HysolDia" name="lvHysolC" vis="UT:Invisible">
-        <shape name="utHysolC" type="BooleanShape" operation="subtraction">
-            <shape name="utHysolBoxC1" type="Box" dx="(UTHysolWide)/2" dy="(UTHysolLongC)/2" dz="(UTHysolThick)/2"/>
-            <shape name="utHysolBoxC2" type="Box" dx="(UTHysolCutWide*2)/2" dy="(UTHysolCutLongC*2)/2" dz="(UTHysolThick*2)/2"/>
-            <position x="UTHysolWide/2" y="UTHysolLongC/2"/>
-            <shape name="utHysolBoxC3" type="Box" dx="(UTHysolWide*2)/2" dy="(UTHysolGapWide)/2" dz="(UTHysolThick*2)/2"/>
-            <position y="UTHysolLongC/2-UTSensorLongC-UTHysolGapWide/2"/>
-        </shape>
-    </volume>
-    <volume material="UT:HysolDia" name="lvHysolD" vis="UT:Invisible">
-        <shape name="utHysolD" type="BooleanShape" operation="subtraction">
-            <shape name="utHysolBoxD1" type="Box" dx="(UTHysolWide)/2" dy="(UTHysolLongD)/2" dz="(UTHysolThick)/2"/>
-            <shape name="utHysolBoxD2" type="Box" dx="(UTHysolCutWide*2)/2" dy="(UTHysolCutLongD*2)/2" dz="(UTHysolThick*2)/2"/>
-            <position x="UTHysolWide/2" y="UTHysolLongD/2"/>
-            <shape name="utHysolBoxD3" type="Box" dx="(UTHysolWide*2)/2" dy="(UTHysolGapWide)/2" dz="(UTHysolThick*2)/2"/>
-            <position y="UTHysolLongD/2-UTSensorLongD-UTHysolGapWide/2"/>
-        </shape>
-    </volume>
-    <!--====== Stiff ======-->
-    <volume material="UT:BoronNitride" name="lvStiffA" vis="UT:Stiffener">
-        <shape name="utStiffA" type="BooleanShape" operation="subtraction">
-            <shape name="utStiffBoxA1" type="Box" dx="(UTStiffWide)/2" dy="(UTStiffLongA)/2" dz="(UTStiffThick)/2"/>
-            <shape name="utStiffBoxA2" type="Box" dx="(UTStiffCutWide*2)/2" dy="(UTStiffCutLongA*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2" y="UTStiffLongA/2"/>
-            <shape name="utStiffBoxA3" type="Box" dx="(UTStiffWide-UTAnchorWide*2-UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position y="-UTStiffLongA/2"/>
-            <shape name="utStiffBoxA4" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2" y="-UTStiffLongA/2"/>
-            <shape name="utStiffBoxA5" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2" y="-UTStiffLongA/2"/>
-
-            <shape name="utStiffCutA1" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2-UTAnchorSide-UTAnchorWide" y="-UTStiffLongA/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutA2" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorSide+UTAnchorWide" y="-UTStiffLongA/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutA3" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2-UTAnchorSide" y="-UTStiffLongA/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutA4" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorSide" y="-UTStiffLongA/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutA5" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2" y="UTStiffLongA/2-UTAnchorLong+1*mm"/>
-            <shape name="utStiffCutA6" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorWide" y="UTStiffLongA/2-UTAnchorLong+1*mm"/>
-        </shape>
-    </volume>
-
-    <volume material="UT:BoronNitride" name="lvStiffB" vis="UT:Stiffener">
-        <shape name="utStiffB" type="BooleanShape" operation="subtraction">
-            <shape name="utStiffBoxB1" type="Box" dx="(UTStiffWide)/2" dy="(UTStiffLongB)/2" dz="(UTStiffThick)/2"/>
-            <shape name="utStiffBoxB2" type="Box" dx="(UTStiffCutWide*2)/2" dy="(UTStiffCutLongB*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2" y="UTStiffLongB/2"/>
-            <shape name="utStiffBoxB3" type="Box" dx="(UTStiffWide-UTAnchorWide*2-UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position y="-UTStiffLongB/2"/>
-            <shape name="utStiffBoxB4" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2" y="-UTStiffLongB/2"/>
-            <shape name="utStiffBoxB5" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2" y="-UTStiffLongB/2"/>
-
-            <shape name="utStiffCutB1" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2-UTAnchorSide-UTAnchorWide" y="-UTStiffLongB/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutB2" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorSide+UTAnchorWide" y="-UTStiffLongB/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutB3" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2-UTAnchorSide" y="-UTStiffLongB/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutB4" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorSide" y="-UTStiffLongB/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutB5" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2" y="UTStiffLongB/2-UTAnchorLong+1*mm"/>
-            <shape name="utStiffCutB6" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorWide" y="UTStiffLongB/2-UTAnchorLong+1*mm"/>
-        </shape>
-    </volume>
-    <volume material="UT:BoronNitride" name="lvStiffC" vis="UT:Stiffener">
-        <shape name="utStiffC" type="BooleanShape" operation="subtraction">
-            <shape name="utStiffBoxC1" type="Box" dx="(UTStiffWide)/2" dy="(UTStiffLongC)/2" dz="(UTStiffThick)/2"/>
-            <shape name="utStiffBoxC2" type="Box" dx="(UTStiffCutWide*2)/2" dy="(UTStiffCutLongC*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2" y="UTStiffLongC/2"/>
-            <shape name="utStiffBoxC3" type="Box" dx="(UTStiffWide-UTAnchorWide*2-UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position y="-UTStiffLongC/2"/>
-            <shape name="utStiffBoxC4" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2" y="-UTStiffLongC/2"/>
-            <shape name="utStiffBoxC5" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2" y="-UTStiffLongC/2"/>
-
-            <shape name="utStiffCutC1" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2-UTAnchorSide-UTAnchorWide" y="-UTStiffLongC/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutC2" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorSide+UTAnchorWide" y="-UTStiffLongC/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutC3" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2-UTAnchorSide" y="-UTStiffLongC/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutC4" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorSide" y="-UTStiffLongC/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutC5" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2" y="UTStiffLongC/2-UTAnchorLong+1*mm"/>
-            <shape name="utStiffCutC6" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorWide" y="UTStiffLongC/2-UTAnchorLong+1*mm"/>
-        </shape>
-    </volume>
-    <volume material="UT:BoronNitride" name="lvStiffD" vis="UT:Stiffener">
-        <shape name="utStiffD" type="BooleanShape" operation="subtraction">
-            <shape name="utStiffBoxD1" type="Box" dx="(UTStiffWide)/2" dy="(UTStiffLongD)/2" dz="(UTStiffThick)/2"/>
-            <shape name="utStiffBoxD2" type="Box" dx="(UTStiffCutWide*2)/2" dy="(UTStiffCutLongD*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2" y="UTStiffLongD/2"/>
-            <shape name="utStiffBoxD3" type="Box" dx="(UTStiffWide-UTAnchorWide*2-UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position y="-UTStiffLongD/2"/>
-            <shape name="utStiffBoxD4" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2" y="-UTStiffLongD/2"/>
-            <shape name="utStiffBoxD5" type="Box" dx="(UTAnchorSide*2)/2" dy="(UTAnchorLong*2)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2" y="-UTStiffLongD/2"/>
-
-            <shape name="utStiffCutD1" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2-UTAnchorSide-UTAnchorWide" y="-UTStiffLongD/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutD2" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorSide+UTAnchorWide" y="-UTStiffLongD/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutD3" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="UTStiffWide/2-UTAnchorSide" y="-UTStiffLongD/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutD4" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorSide" y="-UTStiffLongD/2+UTAnchorLong-1*mm"/>
-            <shape name="utStiffCutD5" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2" y="UTStiffLongD/2-UTAnchorLong+1*mm"/>
-            <shape name="utStiffCutD6" type="Box" dx="(6*mm)/2" dy="(2*mm)/2" dz="(UTStiffThick*2)/2"/>
-            <position x="-UTStiffWide/2+UTAnchorWide" y="UTStiffLongD/2-UTAnchorLong+1*mm"/>
-        </shape>
-    </volume>
-    <!--====== Phase change thermal interface material ======-->
-    <volume material="UT:HybridTim" name="lvTimA" vis="UT:Invisible">
-        <shape name="utTimA" type="BooleanShape" operation="subtraction">
-            <shape name="utTimBoxA1" type="Box" dx="(UTTimWide)/2" dy="(UTTimLongA)/2" dz="(UTTimThick)/2"/>
-            <shape name="utTimBoxA2" type="Box" dx="(UTTimCutWide*2)/2" dy="(UTTimCutLongA*2)/2" dz="(UTTimThick*2)/2"/>
-            <position x="UTTimWide/2" y="UTTimLongA/2"/>
-        </shape>
-    </volume>
-
-    <volume material="UT:HybridTim" name="lvTimB" vis="UT:Invisible">
-        <shape name="utTimB" type="BooleanShape" operation="subtraction">
-            <shape name="utTimBoxB1" type="Box" dx="(UTTimWide)/2" dy="(UTTimLongB)/2" dz="(UTTimThick)/2"/>
-            <shape name="utTimBoxB2" type="Box" dx="(UTTimCutWide*2)/2" dy="(UTTimCutLongB*2)/2" dz="(UTTimThick*2)/2"/>
-            <position x="UTTimWide/2" y="UTTimLongB/2"/>
-        </shape>
-    </volume>
-
-    <volume material="UT:HybridTim" name="lvTimC" vis="UT:Invisible">
-        <shape name="utTimC" type="BooleanShape" operation="subtraction">
-            <shape name="utTimBoxC1" type="Box" dx="(UTTimWide)/2" dy="(UTTimLongC)/2" dz="(UTTimThick)/2"/>
-            <shape name="utTimBoxC2" type="Box" dx="(UTTimCutWide*2)/2" dy="(UTTimCutLongC*2)/2" dz="(UTTimThick*2)/2"/>
-            <position x="UTTimWide/2" y="UTTimLongC/2"/>
-        </shape>
-    </volume>
-
-    <volume material="UT:HybridTim" name="lvTimD" vis="UT:Invisible">
-        <shape name="utTimD" type="BooleanShape" operation="subtraction">
-            <shape name="utTimBoxD1" type="Box" dx="(UTTimWide)/2" dy="(UTTimLongD)/2" dz="(UTTimThick)/2"/>
-            <shape name="utTimBoxD2" type="Box" dx="(UTTimCutWide*2)/2" dy="(UTTimCutLongD*2)/2" dz="(UTTimThick*2)/2"/>
-            <position x="UTTimWide/2" y="UTTimLongD/2"/>
-        </shape>
-    </volume>
-    <!--====== Hybrid - SensorGroup + ASIC + HybridFlex + Hysol + Stiffener + Tim (Computed in C++) ======-->
-    <volume name="lvModuleA" vis="UT:Envelope">
-        <physvol volume="lvAsic4" name="pvAsicA">
-            <position y="UTAsicYA" z="UTAsic4Z"/>
-        </physvol>
-        <physvol volume="lvModuleFlex4" name="pvHybridFlexA">
-            <position y="UTHybridFlexYA" z="UTHybridFlex4Z"/>
-        </physvol>
-        <physvol volume="lvHysolA" name="pvHysolA">
-            <position z="UTHysolZ"/>
-        </physvol>
-        <physvol volume="lvStiffA" name="pvStiffA">
-            <position z="UTStiffZ"/>
-        </physvol>
-        <physvol volume="lvTimA" name="pvTimA">
-            <position z="UTTimZ"/>
-        </physvol>
-    </volume>
-
-    <volume name="lvModuleB" vis="UT:Envelope">
-        <physvol volume="lvAsic8" name="pvAsicB">
-            <position y="UTAsicYB" z="UTAsic8Z"/>
-        </physvol>
-        <physvol volume="lvModuleFlex8" name="pvHybridFlexB">
-            <position y="UTHybridFlexYB" z="UTHybridFlex8Z"/>
-        </physvol>
-        <physvol volume="lvHysolB" name="pvHysolB">
-            <position z="UTHysolZ"/>
-        </physvol>
-        <physvol volume="lvStiffB" name="pvStiffB">
-            <position z="UTStiffZ"/>
-        </physvol>
-        <physvol volume="lvTimB" name="pvTimB">
-            <position z="UTTimZ"/>
-        </physvol>
-    </volume>
-
-    <volume name="lvModuleC" vis="UT:Envelope">
-        <physvol volume="lvAsic8" name="pvAsicC">
-            <position y="UTAsicYC" z="UTAsic8Z"/>
-        </physvol>
-        <physvol volume="lvModuleFlex8" name="pvHybridFlexC">
-            <position y="UTHybridFlexYC" z="UTHybridFlex8Z"/>
-        </physvol>
-        <physvol volume="lvHysolC" name="pvHysolC">
-            <position z="UTHysolZ"/>
-        </physvol>
-        <physvol volume="lvStiffC" name="pvStiffC">
-            <position z="UTStiffZ"/>
-        </physvol>
-        <physvol volume="lvTimC" name="pvTimC">
-            <position z="UTTimZ"/>
-        </physvol>
-    </volume>
-
-    <volume name="lvModuleD" vis="UT:Envelope">
-        <physvol volume="lvAsic8" name="pvAsicD">
-            <position y="UTAsicYD" z="UTAsic8Z"/>
-        </physvol>
-        <physvol volume="lvModuleFlex8" name="pvHybridFlexD">
-            <position y="UTHybridFlexYD" z="UTHybridFlex8Z"/>
-        </physvol>
-        <physvol volume="lvHysolD" name="pvHysolD">
-            <position z="UTHysolZ"/>
-        </physvol>
-        <physvol volume="lvStiffD" name="pvStiffD">
-            <position z="UTStiffZ"/>
-        </physvol>
-        <physvol volume="lvTimD" name="pvTimD">
-            <position z="UTTimZ"/>
-        </physvol>
-    </volume>
-</ut>
diff --git a/compact/components/UT/2025-v00.00/Sensor.xml b/compact/components/UT/2025-v00.00/Sensor.xml
deleted file mode 100644
index 0edf7f602..000000000
--- a/compact/components/UT/2025-v00.00/Sensor.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<ut>
-<!--
-    (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-    <!--======Metalization Layer======-->
-    <volume material="UT:Aluminium" name="lvMetalLayerA" vis="UT:Sensor">
-        <shape name="utMetalLayerA" type="Box" dx="(UTSensorAlWide)/2" dy="(UTSensorAlLongA)/2" dz="(UTSensorAlThick)/2"/>
-    </volume>
-    <volume material="UT:Aluminium" name="lvMetalLayerB" vis="UT:Sensor">
-        <shape name="utMetalLayerB" type="Box" dx="(UTSensorAlWide)/2" dy="(UTSensorAlLongB)/2" dz="(UTSensorAlThick)/2"/>
-    </volume>
-    <volume material="UT:Aluminium" name="lvMetalLayerC" vis="UT:Sensor">
-        <shape name="utMetalLayerC" type="Box" dx="(UTSensorAlWide)/2" dy="(UTSensorAlLongC)/2" dz="(UTSensorAlThick)/2"/>
-    </volume>
-    <volume material="UT:Aluminium" name="lvMetalLayerD" vis="UT:Sensor">
-        <shape name="utMetalLayerD" type="BooleanShape" operation="subtraction">
-            <shape name="utMetalLayerBox1" type="Box" dx="(UTSensorAlWide)/2" dy="(UTSensorAlLongD)/2" dz="(UTSensorAlThick)/2"/>
-            <shape name="utMetalLayerTub1" type="Tube" dz="(UTSensorAlThick*2)/2" rmax="UTBeamHoleRadius+UTEpsilon"/>
-            <position x="UTSensorAlWide/2-UTSensorOverlapX/2" y="UTSensorAlLongD/2-UTSensorOverlapY0/2"/>
-        </shape>
-    </volume>
-
-    <!--=====GuardRing=====-->
-    <volume material="Silicon" name="lvGuardRingA" vis="UT:Sensor">
-        <shape name="utGuardRingA" type="BooleanShape" operation="subtraction">
-            <shape name="utGuardRingBox11" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongA)/2" dz="(UTSensorGRThickA)/2"/>
-            <shape name="utGuardRingBox12" type="Box" dx="(UTSensorSiWide+UTEpsilon)/2" dy="(UTSensorSiLongA+UTEpsilon)/2" dz="(UTSensorGRThickA*2)/2"/>
-            <position y="UTSensorSiOffsetY"/>
-        </shape>
-    </volume>
-    <volume material="Silicon" name="lvGuardRingB" vis="UT:Sensor">
-        <shape name="utGuardRingB" type="BooleanShape" operation="subtraction">
-            <shape name="utGuardRingBox21" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongB)/2" dz="(UTSensorGRThickB)/2"/>
-            <shape name="utGuardRingBox22" type="Box" dx="(UTSensorSiWide+UTEpsilon)/2" dy="(UTSensorSiLongB+UTEpsilon)/2" dz="(UTSensorGRThickB*2)/2"/>
-            <position y="UTSensorSiOffsetY"/>
-        </shape>
-    </volume>
-    <volume material="Silicon" name="lvGuardRingC" vis="UT:Sensor">
-        <shape name="utGuardRingC" type="BooleanShape" operation="subtraction">
-            <shape name="utGuardRingBox31" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongC)/2" dz="(UTSensorGRThickC)/2"/>
-            <shape name="utGuardRingBox32" type="Box" dx="(UTSensorSiWide+UTEpsilon)/2" dy="(UTSensorSiLongC+UTEpsilon)/2" dz="(UTSensorGRThickC*2)/2"/>
-            <position y="UTSensorSiOffsetY"/>
-        </shape>
-    </volume>
-    <volume material="Silicon" name="lvGuardRingD" vis="UT:Sensor">
-        <shape name="utGuardRingD" type="BooleanShape" operation="union">
-            <shape name="utGuardRingFrame1" type="BooleanShape" operation="subtraction">
-                <shape name="utGuardRingBox41" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongD)/2" dz="(UTSensorGRThickD)/2"/>
-                <shape name="utGuardRingTub41" type="Tube" dz="(UTSensorGRThickD*2)/2" rmax="UTBeamHoleRadius+UTSensorGRWideFar+UTEpsilon"/>
-                <position x="UTSensorWide/2-UTSensorOverlapX/2" y="UTSensorLongD/2-UTSensorOverlapY0/2"/>
-                <shape name="utGuardRingBox42" type="Box" dx="(UTSensorSiWide+UTEpsilon)/2" dy="(UTSensorSiLongC+UTEpsilon)/2" dz="(UTSensorGRThickD*3)/2"/>
-                <position y="UTSensorSiOffsetY"/>
-            </shape>
-
-            <shape name="utGuardRingArc1" type="BooleanShape" operation="intersection">
-                <shape name="utGuardRingBox43" type="Box" dx="(UTSensorWide)/2" dy="(UTSensorLongD)/2" dz="(UTSensorGRThickD)/2"/>
-                <shape name="utGuardRingTub42" type="Tube" dz="(UTSensorGRThickD*2)/2" rmax="UTBeamHoleRadius+UTSensorGRWideFar" rmin="UTBeamHoleRadius"/>
-                <position x="UTSensorWide/2-UTSensorOverlapX/2" y="UTSensorLongD/2-UTSensorOverlapY0/2"/>
-            </shape>
-        </shape>
-    </volume>
-
-    <!--======Sensor (normal, dual, quad, hole)======-->
-    <volume material="Silicon" name="lvSensorNorm" sensitive="1" vis="UT:Sensor">
-        <shape name="utSensorNorm" type="Box" dx="(UTSensorSiWide)/2" dy="(UTSensorSiLongA)/2" dz="(UTSensorSiThickA)/2"/>
-    </volume>
-    <volume material="Silicon" name="lvSensorDual" sensitive="1" vis="UT:Sensor">
-        <shape name="utSensorDual" type="Box" dx="(UTSensorSiWide/2)/2" dy="(UTSensorSiLongB)/2" dz="(UTSensorSiThickB)/2"/>
-    </volume>
-    <volume material="Silicon" name="lvSensorQuad" sensitive="1" vis="UT:Sensor">
-        <shape name="utSensorQuad" type="Box" dx="(UTSensorSiWide/2)/2" dy="(UTSensorSiLongC)/2" dz="(UTSensorSiThickC)/2"/>
-    </volume>
-    <volume material="Silicon" name="lvSensorHole" sensitive="1" vis="UT:Sensor">
-        <shape name="utSensorHole" type="BooleanShape" operation="subtraction">
-            <shape name="utSensorQuadBox4" type="Box" dx="(UTSensorSiWide/2)/2" dy="(UTSensorSiLongD)/2" dz="(UTSensorSiThickD)/2"/>
-            <shape name="utSensorQuadTub4" type="Tube" dz="(UTSensorSiThickD*2)/2" rmax="UTBeamHoleRadius+UTSensorGRWideSide+UTEpsilon"/>
-            <position x="UTSensorSiWide/4-UTSensorSiOverlapX/2" y="UTSensorSiLongD/2-UTSensorSiOverlapY/2"/>
-        </shape>
-    </volume>
-
-    <!--======Sector (norm, dual, quad, hold)======-->
-    <volume name="lvSectorNorm" vis="UT:Envelope"/>
-    <volume name="lvSectorDual" vis="UT:Envelope"/>
-    <volume name="lvSectorQuad" vis="UT:Envelope"/>
-    <volume material="Air" name="lvSectorHole" vis="UT:Envelope">
-        <shape name="utSectorHole" type="Box" dx="(UTSensorSiWide/2)/2" dy="(UTSensorSiLongD)/2" dz="(UTSensorSiThickD)/2"/>
-    </volume>
-    <!--======Sensor Groups======-->
-    <volume name="lvGroupA" vis="UT:Envelope">
-        <physvol volume="lvMetalLayerA" name="pvMetalLayerA">
-            <position z="UTSensorAlZ"/>
-        </physvol>
-        <physvol volume="lvGuardRingA" name="pvGuardRingA">
-            <position z="UTSensorSiZ"/>
-        </physvol>
-    </volume>
-    <volume name="lvGroupB" vis="UT:Envelope">
-        <physvol volume="lvMetalLayerB" name="pvMetalLayerB">
-            <position z="UTSensorAlZ"/>
-        </physvol>
-        <physvol volume="lvGuardRingB" name="pvGuardRingB">
-            <position z="UTSensorSiZ"/>
-        </physvol>
-    </volume>
-    <volume name="lvGroupC" vis="UT:Envelope">
-        <physvol volume="lvMetalLayerC" name="pvMetalLayerC">
-            <position z="UTSensorAlZ"/>
-        </physvol>
-        <physvol volume="lvGuardRingC" name="pvGuardRingC">
-            <position z="UTSensorSiZ"/>
-        </physvol>
-    </volume>
-    <volume name="lvGroupD" vis="UT:Envelope">
-        <physvol volume="lvMetalLayerD" name="pvMetalLayerD">
-            <position z="UTSensorAlZ"/>
-        </physvol>
-        <physvol volume="lvGuardRingD" name="pvGuardRingD">
-            <position z="UTSensorSiZ"/>
-        </physvol>
-    </volume>
-</ut>
diff --git a/compact/components/UT/2025-v00.00/Stave.xml b/compact/components/UT/2025-v00.00/Stave.xml
deleted file mode 100644
index 7bf12c786..000000000
--- a/compact/components/UT/2025-v00.00/Stave.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<ut>
-	<!--
-	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-	This software is distributed under the terms of the GNU General Public
-	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-	In applying this licence, CERN does not waive the privileges and immunities
-	granted to it by virtue of its status as an Intergovernmental Organization
-	or submit itself to any jurisdiction.
-	-->
-	<!-- ========== Stave Geometry ========== -->
-	<!-- ========== MegArray connector ========== -->
-	<volume material="Silicon" name="lvMegArray" vis="UT:Connector">
-		<shape dx="UTMegArrayWide/2" dy="UTMegArrayLong/2" dz="UTMegArrayThick/2" name="utMegArray" type="Box" />
-	</volume>
-	<!-- ========== HV connector ========== -->
-	<volume material="Silicon" name="lvHVConnector" vis="UT:Connector">
-		<shape dx="UTHVConnectorWide/2" dy="UTHVConnectorLong/2" dz="UTHVConnectorThick/2" name="utHVConnector" type="Box" />
-	</volume>
-	<!-- ========== Flex Cable Kapton========== -->
-	<volume material="UT:FlexCable" name="lvCableKaptonL" vis="UT:KaptonCable">
-		<shape dx="UTCableWide/2" dy="UTCableLongL/2" dz="UTCableKaptonThick/2" name="utCableKaptonL" type="Box" />
-	</volume>
-	<volume material="UT:FlexCable" name="lvCableKaptonM" vis="UT:KaptonCable">
-		<shape dx="UTCableWide/2" dy="UTCableLongM/2" dz="UTCableKaptonThick/2" name="utCableKaptonM" type="Box" />
-	</volume>
-	<volume material="UT:FlexCable" name="lvCableKaptonS" vis="UT:KaptonCable">
-		<shape dx="UTCableWide/2" dy="UTCableLongS/2" dz="UTCableKaptonThick/2" name="utCableKaptonS" type="Box" />
-	</volume>
-	<!-- ========== Flex Cable Copper========== -->
-	<volume material="Copper" name="lvCableCuL" vis="UT:KaptonCable">
-		<shape name="utCableCuL" operation="subtraction" type="BooleanShape">
-			<shape dx="UTCableWide/2" dy="UTCableLongL/2" dz="UTCableCuThickL0/2" name="utCableCuBoxL0" type="Box" />
-			<shape dx="UTCableWide" dy="UTCableLongL1" dz="UTCableCuThickL0-UTCableCuThickL1" name="utCableCuBoxL1" type="Box" />
-			<position y="-UTCableLongL/2+UTCableLongL0+UTCableLongL1" z="-UTCableCuThickL0/2" />
-			<shape dx="UTCableWide" dy="UTCableLongL2" dz="UTCableCuThickL0-UTCableCuThickL2" name="utCableCuBoxL2" type="Box" />
-			<position y="-UTCableLongL/2+UTCableLongL0+UTCableLongL1+UTCableLongL2" z="-UTCableCuThickL0/2" />
-			<shape dx="UTCableWide" dy="UTCableLongL3" dz="UTCableCuThickL0-UTCableCuThickL3" name="utCableCuBoxL3" type="Box" />
-			<position y="-UTCableLongL/2+UTCableLongL0+UTCableLongL1+UTCableLongL2+UTCableLongL3" z="-UTCableCuThickL0/2" />
-		</shape>
-	</volume>
-	<volume material="Copper" name="lvCableCuM" vis="UT:KaptonCable">
-		<shape name="utCableCuM" operation="subtraction" type="BooleanShape">
-			<shape dx="UTCableWide/2" dy="UTCableLongM/2" dz="UTCableCuThickM0/2" name="utCableCuBoxM0" type="Box" />
-			<shape dx="UTCableWide" dy="UTCableLongM1" dz="UTCableCuThickM0-UTCableCuThickM1" name="utCableCuBoxM1" type="Box" />
-			<position y="-UTCableLongM/2+UTCableLongM0+UTCableLongM1" z="-UTCableCuThickM0/2" />
-			<shape dx="UTCableWide" dy="UTCableLongM2" dz="UTCableCuThickM0-UTCableCuThickM2" name="utCableCuBoxM2" type="Box" />
-			<position y="-UTCableLongM/2+UTCableLongM0+UTCableLongM1+UTCableLongM2" z="-UTCableCuThickM0/2" />
-			<shape dx="UTCableWide" dy="UTCableLongM3" dz="UTCableCuThickM0-UTCableCuThickM3" name="utCableCuBoxM3" type="Box" />
-			<position y="-UTCableLongM/2+UTCableLongM0+UTCableLongM1+UTCableLongM2+UTCableLongM3" z="-UTCableCuThickM0/2" />
-		</shape>
-	</volume>
-	<volume material="Copper" name="lvCableCuS" vis="UT:KaptonCable">
-		<shape name="utCableCuS" operation="subtraction" type="BooleanShape">
-			<shape dx="UTCableWide/2" dy="UTCableLongS/2" dz="UTCableCuThickS0/2" name="utCableCuBoxS0" type="Box" />
-			<shape dx="UTCableWide" dy="UTCableLongS1" dz="UTCableCuThickS0-UTCableCuThickS1" name="utCableCuBoxS1" type="Box" />
-			<position y="-UTCableLongS/2+UTCableLongS0+UTCableLongS1" z="-UTCableCuThickS0/2" />
-			<shape dx="UTCableWide" dy="UTCableLongS2" dz="UTCableCuThickS0-UTCableCuThickS2" name="utCableCuBoxS2" type="Box" />
-			<position y="-UTCableLongS/2+UTCableLongS0+UTCableLongS1+UTCableLongS2" z="-UTCableCuThickS0/2" />
-		</shape>
-	</volume>
-	<!-- ========== Kapton Cable ========== -->
-	<volume name="lvCableL">
-		<physvol name="pvCableCuL" volume="lvCableCuL">
-			<position z="UTCableKaptonThick/2" />
-		</physvol>
-		<physvol name="pvCableKaptonL" volume="lvCableKaptonL">
-			<position z="-UTCableCuThickL0/2" />
-		</physvol>
-		<physvol name="pvMegArrayL" volume="lvMegArray">
-			<position y="-UTCableLongL/2+UTMegArrayY" z="-1/2*(UTCableCuThickL0+UTMegArrayThick+UTCableKaptonThick)" />
-		</physvol>
-		<physvol name="pvConnectorL" volume="lvHVConnector">
-			<!-- <position x="UTHVConnectorLX" y="-UTCableLongL/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickL0+UTHVConnectorThick+UTCableKaptonThick)" /> -->
-			<position y="-UTCableLongL/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickL0+UTHVConnectorThick+UTCableKaptonThick)" />
-		</physvol>
-	</volume>
-	<volume name="lvCableM">
-		<physvol name="pvCableCuM" volume="lvCableCuM">
-			<position z="UTCableKaptonThick/2" />
-		</physvol>
-		<physvol name="pvCableKaptonM" volume="lvCableKaptonM">
-			<position z="-UTCableCuThickM0/2" />
-		</physvol>
-		<physvol name="pvMegArrayM" volume="lvMegArray">
-			<position y="-UTCableLongM/2+UTMegArrayY" z="-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)" />
-		</physvol>
-		<physvol name="pvConnectorM" volume="lvHVConnector">
-			<position y="-UTCableLongM/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickM0+UTHVConnectorThick+UTCableKaptonThick)" />
-			<!-- <position x="UTHVConnectorMX" y="-UTCableLongM/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickM0+UTHVConnectorThick+UTCableKaptonThick)" /> -->
-		</physvol>
-	</volume>
-	<volume name="lvCableS">
-		<physvol name="pvCableCuS" volume="lvCableCuS">
-			<position z="UTCableKaptonThick/2" />
-		</physvol>
-		<physvol name="pvCableKaptonS" volume="lvCableKaptonS">
-			<position z="-UTCableCuThickS0/2" />
-		</physvol>
-		<physvol name="pvMegArrayS" volume="lvMegArray">
-			<position y="-UTCableLongS/2+UTMegArrayY" z="-1/2*(UTCableCuThickS0+UTMegArrayThick+UTCableKaptonThick)" />
-		</physvol>
-		<physvol name="pvConnectorS" volume="lvHVConnector">
-			<position y="-UTCableLongS/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickS0+UTHVConnectorThick+UTCableKaptonThick)" />
-			<!-- <position x="UTHVConnectorSX" y="-UTCableLongS/2+UTHVConnectorLong/2" z="-1/2*(UTCableCuThickS0+UTHVConnectorThick+UTCableKaptonThick)" /> -->
-		</physvol>
-	</volume>
-	<!-- ========== Bare Stave ========== -->
-	<volume material="UT:BareStave" name="lvBareStaveA" vis="UT:BareStave">
-		<shape dx="UTBareStaveWide/2" dy="UTBareStaveLong/2" dz="UTBareStaveThick/2" name="utBareStaveA" type="Box" />
-	</volume>
-	<volume material="UT:BareStave" name="lvBareStaveB" vis="UT:BareStave">
-		<shape dx="UTBareStaveWide/2" dy="UTBareStaveLong/2" dz="UTBareStaveThick/2" name="utBareStaveB" type="Box" />
-	</volume>
-	<volume material="UT:BareStave" name="lvBareStaveC" vis="UT:BareStave">
-		<shape name="utBareStaveC" operation="subtraction" type="BooleanShape">
-			<shape dx="UTBareStaveWide/2" dy="UTBareStaveLong/2" dz="UTBareStaveThick/2" name="utBareStaveBox" type="Box" />
-			<shape dz="UTBareStaveThick" name="utBareStaveTub" rmax="UTBeamHoleRadius" type="Tube" />
-			<position x="UTBareStaveWide/2-UTBareStaveEdge-UTSensorOverlapX/2" />
-		</shape>
-	</volume>
-	<!-- ====== Stave A/B/C (Computed in C++) ====== -->
-	<!-- ========== Stave Type A ========== -->
-	<!-- ========== Stave Type A core ========== -->
-	<volume name="lvStaveACore" vis="UT:Envelope">
-		<physvol name="pvBareStaveA" volume="lvBareStaveA" />
-		<physvol name="pvCableA1" volume="lvCableS">
-			<position y="-UTStaveLong/2+UTCableLongS/2" z="-UTStaveCableZ" />
-		</physvol>
-		<physvol name="pvCableA2" volume="lvCableM">
-			<position y="-UTStaveLong/2+UTCableLongM/2" z="UTStaveCableZ" />
-			<rotation y="pi*rad" />
-		</physvol>
-		<physvol name="pvCableA3" volume="lvCableM">
-			<position y="UTStaveLong/2-UTCableLongM/2" z="-UTStaveCableZ" />
-			<rotation z="pi*rad" />
-		</physvol>
-		<physvol name="pvCableA4" volume="lvCableS">
-			<position y="UTStaveLong/2-UTCableLongS/2" z="UTStaveCableZ" />
-			<rotation y="pi*rad" z="pi*rad" />
-		</physvol>
-	</volume>
-	<!-- ========== Stave Type A Front ========== -->
-	<volume name="lvStaveAFront" vis="UT:Envelope"/>
-	<!-- ========== Stave Type A Back ========== -->
-	<volume name="lvStaveABack" vis="UT:Envelope"/>
-	<volume name="lvStaveA" vis="UT:Envelope">
-		<physvol name="pvStaveACore" volume="lvStaveACore">
-		</physvol>
-	</volume>
-	<!-- ========== Stave Type B ========== -->
-	<!-- ========== Stave Type B core ========== -->
-	<volume name="lvStaveBCore" vis="UT:Envelope">
-		<physvol name="pvBareStaveB" volume="lvBareStaveB" />
-		<physvol name="pvCableB1" volume="lvCableS">
-			<position y="-UTStaveLong/2+UTCableLongS/2" z="-UTStaveCableZ" />
-		</physvol>
-		<physvol name="pvCableB2" volume="lvCableM">
-			<position y="-UTStaveLong/2+UTCableLongM/2" z="UTStaveCableZ" />
-			<rotation y="pi*rad" />
-		</physvol>
-		<physvol name="pvCableB3" volume="lvCableM">
-			<position y="UTStaveLong/2-UTCableLongM/2" z="-UTStaveCableZ" />
-			<rotation z="pi*rad" />
-		</physvol>
-		<physvol name="pvCableB4" volume="lvCableS">
-			<position y="UTStaveLong/2-UTCableLongS/2" z="UTStaveCableZ" />
-			<rotation y="pi*rad" z="pi*rad" />
-		</physvol>
-	</volume>
-	<!-- ========== Stave Type B Front ========== -->
-	<volume name="lvStaveBFront" vis="UT:Envelope"/>
-	<!-- ========== Stave Type B Back ========== -->
-	<volume name="lvStaveBBack" vis="UT:Envelope"/>
-	<volume name="lvStaveB" vis="UT:Envelope">
-		<physvol name="pvStaveBCore" volume="lvStaveBCore">
-		</physvol>
-	</volume>
-	<!-- ========== Stave Type C ========== -->
-	<!-- ========== Stave Type C core ========== -->
-	<volume name="lvStaveCCore" vis="UT:Envelope">
-		<physvol name="pvBareStaveC" volume="lvBareStaveC" />
-		<physvol name="pvCableC1" volume="lvCableL">
-			<position y="-UTStaveLong/2+UTCableLongL/2" z="-UTStaveCableZ" />
-		</physvol>
-		<physvol name="pvCableC2" volume="lvCableM">
-			<position y="-UTStaveLong/2+UTCableLongM/2" z="UTStaveCableZ" />
-			<rotation y="pi*rad" />
-		</physvol>
-		<physvol name="pvCableC3" volume="lvCableM">
-			<position y="UTStaveLong/2-UTCableLongM/2" z="-UTStaveCableZ" />
-			<rotation z="pi*rad" />
-		</physvol>
-		<physvol name="pvCableC4" volume="lvCableL">
-			<position y="UTStaveLong/2-UTCableLongL/2" z="UTStaveCableZ" />
-			<rotation y="pi*rad" z="pi*rad" />
-		</physvol>
-	</volume>
-	<!-- ========== Stave Type C Front ========== -->
-	<volume name="lvStaveCFront" vis="UT:Envelope"/>
-	<!-- ========== Stave Type C Back ========== -->
-	<volume name="lvStaveCBack" vis="UT:Envelope"/>
-	<volume name="lvStaveC" vis="UT:Envelope">
-		<physvol name="pvStaveCCore" volume="lvStaveCCore">
-		</physvol>
-	</volume>
-</ut>
diff --git a/compact/components/UT/2025-v00.00/UT.xml b/compact/components/UT/2025-v00.00/UT.xml
deleted file mode 100644
index f17fdeeb6..000000000
--- a/compact/components/UT/2025-v00.00/UT.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<!--
-    (c) Copyright 2023 CERN for the benefit of the LHCb Collaboration
-
-    This software is distributed under the terms of the GNU General Public
-    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-    In applying this licence, CERN does not waive the privileges and immunities
-    granted to it by virtue of its status as an Intergovernmental Organization
-    or submit itself to any jurisdiction.
--->
-<lccdd>
-    <include ref="parameters.xml"/>
-    <include ref="detector.xml"/>
-    <include ref="conditions.xml"/>
-</lccdd>
diff --git a/compact/components/UT/2025-v00.00/UTBox.xml b/compact/components/UT/2025-v00.00/UTBox.xml
deleted file mode 100644
index 25e818fe0..000000000
--- a/compact/components/UT/2025-v00.00/UTBox.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<ut>
-	<!--
-	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-	This software is distributed under the terms of the GNU General Public
-	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-	In applying this licence, CERN does not waive the privileges and immunities
-	granted to it by virtue of its status as an Intergovernmental Organization
-	or submit itself to any jurisdiction.
-	-->
-	<!-- UT frame -->
-	<volume name="lvUT" vis="UT:Envelope"/>
-	<volume material="UT:Aluminium" name="lvUTFrame" vis="UT:Frame">
-		<shape name="utFrame" operation="subtraction" type="BooleanShape">
-			<shape dx="UTFrameOuterWide/2" dy="UTFrameOuterLong/2" dz="UTFrameThick/2" name="utFrameBoxOuter" type="Box" />
-			<shape dx="UTFrameInnerWide/2" dy="UTFrameInnerLong/2" dz="UTFrameThick*1.1/2" name="utFrameBoxInner" type="Box" />
-		</shape>
-	</volume>
-	<!-- UT light tight box -->
-	<volume material="UT:BoxWall" name="lvUTBox" vis="UT:Box">
-		<shape name="utBox" operation="subtraction" type="BooleanShape">
-			<shape dx="UTBoxOuterWide/2" dy="UTBoxOuterLong/2" dz="UTBoxOuterThick/2" name="utBoxOuter" type="Box" />
-			<shape dx="UTBoxInnerWide/2" dy="UTBoxInnerLong/2" dz="UTBoxInnerThick/2" name="utBoxInner" type="Box" />
-			<shape dz="UTBoxOuterThick*1.1/2" name="utBoxPipeHole" rmax="UTBoxWallSealOR" type="Tube" />
-		</shape>
-	</volume>
-	<!-- UT box plug -->
-	<volume vis="UT:Airex" material="UT:Airex" name="lvUTBoxPipeAirexRingInner">
-		<shape dz="UTBoxPipeAirexRingInnerThick/2" name="utBoxPipeAirexRingInner" rmax="UTBoxPipeAirexRingInnerOR" rmin="UTBoxPipeAirexRingIR" type="Tube" />
-	</volume>
-	<volume vis="UT:Airex" material="UT:Airex" name="lvUTBoxPipeAirexRingMiddle">
-		<shape dz="UTBoxPipeAirexRingMiddleThick/2" name="utBoxPipeAirexRingMiddle" rmax="UTBoxPipeAirexRingMiddleOR" rmin="UTBoxPipeAirexRingIR" type="Tube" />
-	</volume>
-	<volume vis="UT:Airex" material="UT:Airex" name="lvUTBoxPipeAirexRingOuter">
-		<shape dz="UTBoxPipeAirexRingOuterThick/2" name="utBoxPipeAirexRingOuter" rmax="UTBoxPipeAirexRingOuterOR" rmin="UTBoxPipeAirexRingIR" type="Tube" />
-	</volume>
-	<volume name="lvUTBoxPipeAirexRing">
-		<physvol name="pvUTBoxPipeAirexRingInner" volume="lvUTBoxPipeAirexRingInner">
-			<position z="0.5*(UTBoxPipeAirexRingInnerThick+UTBoxPipeAirexRingMiddleThick)" />
-		</physvol>
-		<physvol name="pvUTBoxPipeAirexRingMiddle" volume="lvUTBoxPipeAirexRingMiddle" />
-		<physvol name="pvUTBoxPipeAirexRingOuter" volume="lvUTBoxPipeAirexRingOuter">
-			<position z="-0.5*(UTBoxPipeAirexRingOuterThick+UTBoxPipeAirexRingMiddleThick)" />
-		</physvol>
-	</volume>
-	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTBoxWallSeal">
-		<shape dz="UTBoxWallSealThick/2" name="utBoxWallSeal" rmax="UTBoxWallSealOR-UTEpsilon" rmin="UTBoxWallSealIR" type="Tube" />
-	</volume>
-	<volume vis="UT:HalfMoon" material="UT:Airex" name="lvUTBoxInternalAirexRing">
-		<shape dz="UTInternalRingThick/2-UTEpsilon" name="utBoxInternalAirexRing" rmax="UTInternalRingOR" rmin="UTInternalRingIR" type="Tube" />
-	</volume>
-	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTBoxInternalSeal">
-		<shape dz="UTInternalSealThick/2" name="utBoxInternalSeal" rmax="UTInternalSealOR" rmin="UTInternalSealIR" type="Tube" />
-	</volume>
-	<volume name="lvUTBoxPlugPiece">
-		<physvol name="pvUTBoxPipeAirexRing" volume="lvUTBoxPipeAirexRing">
-			<position z="3*mm"/>
-		</physvol>
-		<physvol name="pvUTBoxWallSeal" volume="lvUTBoxWallSeal">
-			<position z="3*mm"/>
-		</physvol>
-		<physvol name="pvUTBoxInternalAirexRing" volume="lvUTBoxInternalAirexRing">
-			<position z="0.5*(UTBoxWallDownstreamThick+UTInternalRingThick)" />
-		</physvol>
-		<physvol name="pvUTBoxInternalSeal" volume="lvUTBoxInternalSeal">
-			<position z="0.5*(UTBoxWallDownstreamThick+UTInternalSealThick)" />
-		</physvol>
-	</volume>
-	<volume name="lvUTBoxPlug">
-		<physvol name="pvUTBoxPlug1" volume="lvUTBoxPlugPiece">
-			<position z="0.5*(UTBoxOuterThick-UTPlugThickZ)" />
-			<rotation x="180*degree" />
-		</physvol>
-		<physvol name="pvUTBoxPlug2" volume="lvUTBoxPlugPiece">
-			<position z="-0.5*(UTBoxOuterThick-UTPlugThickZ)" />
-		</physvol>
-	</volume>
-	<!-- End of Stave (EOS) volumes -->
-	<volume material="UT:Steel" name="lvUTaEOS" vis="UT:EOS">
-		<shape dx="(UTEOSWideUTa/2)/2-UTEpsilon" dy="UTEOSLong/2-UTEpsilon" dz="UTEOSThick/2-UTEpsilon" name="utUTaEOS" type="Box" />
-	</volume>
-	<volume material="UT:EOSPigtail" name="lvUTaEOSPigtail" vis="UT:EOS">
-		<shape dx="(UTEOSWideUTa/2)/2-UTEpsilon" dy="UTEOSPigtailLong/2-UTEpsilon" dz="UTEOSPigtailThick/2-UTEpsilon" name="utUTaEOSPigtail" type="Box" />
-	</volume>
-	<volume material="UT:Steel" name="lvUTbEOS" vis="UT:EOS">
-		<shape dx="(UTEOSWideUTb/2)/2-UTEpsilon" dy="UTEOSLong/2-UTEpsilon" dz="UTEOSThick/2-UTEpsilon" name="utUTbEOS" type="Box" />
-	</volume>
-	<volume material="UT:EOSPigtail" name="lvUTbEOSPigtail" vis="UT:EOS">
-		<shape dx="(UTEOSWideUTb/2)/2-UTEpsilon" dy="UTEOSPigtailLong/2-UTEpsilon" dz="UTEOSPigtailThick/2-UTEpsilon" name="utUTbEOSPigtail" type="Box" />
-	</volume>
-	<!-- UT Kapton jacket for electronic insulation -->
-	<volume material="UT:BeamPipeJacket" name="lvUTCylJacket">
-		<shape dz="UTCylJacketLength/2" name="UTCylJacket" rmax="UTCylJacketRadius+UTCylJacketThick" rmin="UTCylJacketRadius" type="Tube" />
-	</volume>
-	<volume material="UT:BeamPipeJacket" name="lvUTConeJacketUpstream">
-		<shape dz="UTConeJacketUpstreamLength/2" name="UTConeJacketUpstream" rmax2="UTConeJacketCutOutRadiusZmin+UTConeJacketThick" rmax1="UTConeJacketRadiusZmin+UTConeJacketThick" rmin2="UTConeJacketCutOutRadiusZmin" rmin1="UTConeJacketRadiusZmin" type="ConeSegment" />
-	</volume>
-	<volume material="UT:BeamPipeJacket" name="lvUTConeJacketDownstream">
-		<shape dz="UTConeJacketDownstreamLength/2" name="UTConeJacketDownstream" rmax2="UTConeJacketRadiusZmax+UTConeJacketThick" rmax1="UTConeJacketCutOutRadiusZmax+UTConeJacketThick" rmin2="UTConeJacketRadiusZmax" rmin1="UTConeJacketCutOutRadiusZmax" type="ConeSegment" />
-	</volume>
-	<volume name="lvUTJacket">
-		<physvol name="pvUTCylJacket" volume="lvUTCylJacket">
-			<position z="UTCylJacketZpos" />
-		</physvol>
-		<physvol name="pvUTConeJacketUpstream" volume="lvUTConeJacketUpstream">
-			<position z="UTConeJacketZposUpstream" />
-		</physvol>
-		<physvol name="pvUTConeJacketDownstream" volume="lvUTConeJacketDownstream">
-			<position z="UTConeJacketZposDownstream" />
-		</physvol>
-	</volume>
-	<volume vis="UT:PipeHeater" material="UT:PipeHeater" name="lvUTPipeHeaterUpstream">
-		<shape dz="UTPipeHeaterUpstreamLength/2" name="UTPipeHeaterUpstream" rmax="UTPipeHeaterUpstreamRadius+UTPipeHeaterUpstreamThick" rmin="UTPipeHeaterUpstreamRadius" type="Tube" />
-	</volume>
-	<volume vis="UT:PipeHeater" material="UT:PipeHeater" name="lvUTPipeHeaterDownstreamInUT">
-		<shape name="utPipeHeaterInUT" operation="subtraction" type="BooleanShape">
-			<shape dz="UTPipeHeaterDownstreamLength/2" name="UTPipeHeaterDownstream" rmax2="UTPipeHeaterDownstreamRadiusZmax+UTPipeHeaterDownstreamThick" rmax1="UTPipeHeaterDownstreamRadiusZmin+UTPipeHeaterDownstreamThick" rmin2="UTPipeHeaterDownstreamRadiusZmax" rmin1="UTPipeHeaterDownstreamRadiusZmin" type="ConeSegment" />
-			<shape rmax="UTPipeHeaterDownstreamRadiusZmax+UTPipeHeaterDownstreamThick+UTEpsilon" dz="(UTPipeHeaterDownstreamLengthInMagnet)/2+UTEpsilon" name="UTPipeHeaterDownstreamInUTSubMagnet" type="Tube" />
-			<position z="UTPipeHeaterDownstreamZmax-(UTPipeHeaterDownstreamLengthInMagnet)/2+UTEpsilon-UTPipeHeaterDownstreamPos-UTSystemZ" />
-		</shape>
-	</volume>
-	<volume name="lvUTPipeHeater">
-		<physvol name="pvUTPipeHeaterUpstream" volume="lvUTPipeHeaterUpstream">
-			<position z="UTPipeHeaterUpstreamPos" />
-		</physvol>
-		<physvol name="pvUTPipeHeaterDownstream" volume="lvUTPipeHeaterDownstreamInUT">
-			<position z="UTPipeHeaterDownstreamPos" />
-		</physvol>
-	</volume>
-</ut>
diff --git a/compact/components/UT/2025-v00.00/UTHalf.xml b/compact/components/UT/2025-v00.00/UTHalf.xml
deleted file mode 100644
index 6a0f3b1f6..000000000
--- a/compact/components/UT/2025-v00.00/UTHalf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ut>
-	<!--
-	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-	This software is distributed under the terms of the GNU General Public
-	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-	In applying this licence, CERN does not waive the privileges and immunities
-	granted to it by virtue of its status as an Intergovernmental Organization
-	or submit itself to any jurisdiction.
-	-->
-	<volume name="lvUTC" vis="UT:Envelope"/>
-	<volume name="lvUTA" vis="UT:Envelope"/>
-</ut>
diff --git a/compact/components/UT/2025-v00.00/UTaULayer.xml b/compact/components/UT/2025-v00.00/UTaULayer.xml
deleted file mode 100644
index cf80bd603..000000000
--- a/compact/components/UT/2025-v00.00/UTaULayer.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<ut>
-	<!--
-	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-	This software is distributed under the terms of the GNU General Public
-	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-	In applying this licence, CERN does not waive the privileges and immunities
-	granted to it by virtue of its status as an Intergovernmental Organization
-	or submit itself to any jurisdiction.
-	-->
-	<volume name="lvUTaUCsideLayer" vis="UT:Envelope">
-		<physvol name="pvUTaCEOSU1" volume="lvUTaEOS">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTaCEOSU2" volume="lvUTaEOS">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTaCEOSPigtailU1" volume="lvUTaEOSPigtail">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-		<physvol name="pvUTaCEOSPigtailU2" volume="lvUTaEOSPigtail">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-	</volume>
-	<!-- ================================================================= -->
-	<volume name="lvUTaUAsideLayer" vis="UT:Envelope">
-		<physvol name="pvUTaAEOSU1" volume="lvUTaEOS">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTaAEOSU2" volume="lvUTaEOS">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTaAEOSPigtailU1" volume="lvUTaEOSPigtail">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-		<physvol name="pvUTaAEOSPigtailU2" volume="lvUTaEOSPigtail">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-	</volume>
-</ut>
diff --git a/compact/components/UT/2025-v00.00/UTaXLayer.xml b/compact/components/UT/2025-v00.00/UTaXLayer.xml
deleted file mode 100644
index 59934dacd..000000000
--- a/compact/components/UT/2025-v00.00/UTaXLayer.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<ut>
-	<!--
-	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-	This software is distributed under the terms of the GNU General Public
-	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-	In applying this licence, CERN does not waive the privileges and immunities
-	granted to it by virtue of its status as an Intergovernmental Organization
-	or submit itself to any jurisdiction.
-	-->
-	<volume name="lvUTaXCsideLayer" vis="UT:Envelope">
-		<physvol name="pvUTaCEOSX1" volume="lvUTaEOS">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTaCEOSX2" volume="lvUTaEOS">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTaCEOSPigtailX1" volume="lvUTaEOSPigtail">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-		<physvol name="pvUTaCEOSPigtailX2" volume="lvUTaEOSPigtail">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-	</volume>
-	<!-- ================================================================= -->
-	<volume name="lvUTaXAsideLayer" vis="UT:Envelope">
-		<physvol name="pvUTaAEOSX1" volume="lvUTaEOS">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTaAEOSX2" volume="lvUTaEOS">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTaAEOSPigtailX1" volume="lvUTaEOSPigtail">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-		<physvol name="pvUTaAEOSPigtailX2" volume="lvUTaEOSPigtail">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTa/4)" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-	</volume>
-</ut>
diff --git a/compact/components/UT/2025-v00.00/UTbVLayer.xml b/compact/components/UT/2025-v00.00/UTbVLayer.xml
deleted file mode 100644
index 6825d7d96..000000000
--- a/compact/components/UT/2025-v00.00/UTbVLayer.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<ut>
-	<!--
-	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-	This software is distributed under the terms of the GNU General Public
-	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-	In applying this licence, CERN does not waive the privileges and immunities
-	granted to it by virtue of its status as an Intergovernmental Organization
-	or submit itself to any jurisdiction.
-	-->
-	<volume name="lvUTbVCsideLayer" vis="UT:Envelope">
-		<physvol name="pvUTbCEOSV1" volume="lvUTbEOS">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTbCEOSV2" volume="lvUTbEOS">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTbCEOSPigtailV1" volume="lvUTbEOSPigtail">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-		<physvol name="pvUTbCEOSPigtailV2" volume="lvUTbEOSPigtail">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-	</volume>
-	<!-- ================================================================= -->
-	<volume name="lvUTbVAsideLayer" vis="UT:Envelope">
-		<physvol name="pvUTbAEOSV1" volume="lvUTbEOS">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTbAEOSV2" volume="lvUTbEOS">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTbAEOSPigtailV1" volume="lvUTbEOSPigtail">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-		<physvol name="pvUTbAEOSPigtailV2" volume="lvUTbEOSPigtail">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-	</volume>
-</ut>
diff --git a/compact/components/UT/2025-v00.00/UTbXLayer.xml b/compact/components/UT/2025-v00.00/UTbXLayer.xml
deleted file mode 100644
index bf871e6e5..000000000
--- a/compact/components/UT/2025-v00.00/UTbXLayer.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<ut>
-	<!--
-	(c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
-
-	This software is distributed under the terms of the GNU General Public
-	Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
-
-	In applying this licence, CERN does not waive the privileges and immunities
-	granted to it by virtue of its status as an Intergovernmental Organization
-	or submit itself to any jurisdiction.
-	-->
-	<volume name="lvUTbXCsideLayer" vis="UT:Envelope">
-		<physvol name="pvUTbCEOSX1" volume="lvUTbEOS">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTbCEOSX2" volume="lvUTbEOS">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTbCEOSPigtailX1" volume="lvUTbEOSPigtail">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-		<physvol name="pvUTbCEOSPigtailX2" volume="lvUTbEOSPigtail">
-			<position x="1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-	</volume>
-	<!-- ================================================================= -->
-	<volume name="lvUTbXAsideLayer" vis="UT:Envelope">
-
-		<physvol name="pvUTbAEOSX1" volume="lvUTbEOS">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="UTBareStaveLong/2+UTEOSLong/2" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTbAEOSX2" volume="lvUTbEOS">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="-(UTBareStaveLong/2+UTEOSLong/2)" z="UTStaveDz" />
-		</physvol>
-		<physvol name="pvUTbAEOSPigtailX1" volume="lvUTbEOSPigtail">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-		<physvol name="pvUTbAEOSPigtailX2" volume="lvUTbEOSPigtail">
-			<position x="-(1/2*UTLayerSideCorrectedWidth-UTEOSWideUTb/4)" y="-(UTBareStaveLong/2+UTEOSLong+UTEOSPigtailLong/2)" z="UTStaveDz+UTEOSPigtailThick-(UTStaveDz/2-UTStaveCableZ-1/2*(UTCableCuThickM0+UTMegArrayThick+UTCableKaptonThick)-1/2*UTMegArrayThick)+UTEpsilon" />
-		</physvol>
-	</volume>
-</ut>
diff --git a/compact/components/UT/2025-v00.00/conditions.xml b/compact/components/UT/2025-v00.00/conditions.xml
deleted file mode 100644
index 0b364ca05..000000000
--- a/compact/components/UT/2025-v00.00/conditions.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- ========================================================================== -->
-<!--  LHCb Detector Description                                                 -->
-<!-- ========================================================================== -->
-<!--                                                                            -->
-<!--  Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)  -->
-<!--  All rights reserved.                                                      -->
-<!--                                                                            -->
-<!--   @author  M.Frank                                                         -->
-<!--   @date    14/10/2018                                                      -->
-<!--                                                                            -->
-<!-- ========================================================================== -->
-<lccdd>
-
-  <plugins>
-    <plugin name="LHCb_UT_cond_XML_reader" type="xml">
-
-      <conditions_config prefix="Conditions/UT"/>
-
-      <alignment detector="UT" path="Alignment/Global.yml" name="UTSystem"/>
-      <alignment_pattern path_regex=".*([CA])side" path="Alignment/Global.yml" name="UT${1}side"/>
-      <alignment_pattern path_regex=".*([CA])side/UT(\S\S)" path="Alignment/HalfLayers.yml" name="UT${1}sideUT${2}"/>
-      <alignment_pattern path_regex=".*([CA])side/UT(\S\S)/Stave(\d)" path="Alignment/Staves.yml" name="UT${1}sideUT${2}Stave${3}"/>
-      <alignment_pattern path_regex=".*([CA])side/UT(\S\S)/Stave(\d)/Face(\d)" path="Alignment/Staves.yml" name="UT${1}sideUT${2}Stave${3}Face${4}"/>
-      <alignment_pattern path_regex=".*([CA])side/UT(\S\S)/Stave(\d)/Face(\d)/Module(\d)" path="Alignment/Modules.yml" name="UT${1}sideUT${2}Stave${3}Face${4}Module${5}"/>
-
-      <!-- TELL40 boards to UT (sub)sector mapping -->
-      <conditions path="ReadoutConf.yml">
-        <condition name="ReadoutMap"/>
-      </conditions>
-
-      <!-- simulation conditions made optional -->
-      <conditions path="ChannelInfo/NoiseValues.yml">
-        <condition name="NoiseValues" optional='1'/>
-      </conditions>
-      <conditions path="ChannelInfo/ReadoutSectors.yml">
-        <condition name="ReadoutSectors" optional='1'/>
-      </conditions>
-      <conditions path="ChannelInfo/PedestalValues.yml">
-        <condition name="PedestalValues" optional='1'/>
-      </conditions>
-      <conditions path="ReadoutConf/ClusteringThresholds.yml">
-        <condition name="ClusteringThresholds" optional='1'/>
-      </conditions>
-      <conditions path="HitError.yml">
-        <condition name="HitError" optional='1'/>
-      </conditions>
-
-      <!-- Thresholds for each ASIC -->
-      <conditions path="ChannelInfo/Thresholds.yml">
-        <condition name="Thresholds" optional='1'/>
-      </conditions>
-
-      <!-- Hit limits for each ASIC -->
-      <conditions path="ChannelInfo/HitLimits.yml">
-        <condition name="HitLimits" optional='1'/>
-      </conditions>
-
-      <!-- Parameters of response function for each ASIC -->
-      <conditions path="ChannelInfo/SALTResponse.yml">
-        <condition name="SALTResponse" optional='1'/>
-      </conditions>
-    </plugin>
-  </plugins>
-
-</lccdd>
diff --git a/compact/components/UT/2025-v00.00/detector.xml b/compact/components/UT/2025-v00.00/detector.xml
deleted file mode 100644
index e8f3b38fe..000000000
--- a/compact/components/UT/2025-v00.00/detector.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--==========================================================================-->
-<!-- LHCb Detector Description -->
-<!--==========================================================================-->
-<!--  -->
-<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!-- All rights reserved. -->
-<!--  -->
-<!-- @author  H.Wu -->
-<!-- @date    03/05/2021 -->
-<!--  -->
-<!--==========================================================================-->
-<!-- XML description of the UT stations -->
-<!--==========================================================================-->
-
-<lccdd>
-	<define>
-	</define>
-	<detectors>
-		<detector id="UT:ID" name="UT" type="LHCb_UT_v1_0" parent="${UT:parent}" readout="UTHits" vis="UT:Envelope">
-
-			<include ref="../../Pipe/trunk/InUT.xml"/>
-			<include ref="Sensor.xml"/>
-			<include ref="Module.xml"/>
-			<include ref="Stave.xml"/>
-			<include ref="UTBox.xml"/>
-			<include ref="UTaXLayer.xml"/>
-			<include ref="UTaULayer.xml"/>
-			<include ref="UTbVLayer.xml"/>
-			<include ref="UTbXLayer.xml"/>
-			<include ref="UTHalf.xml"/>
-
-			<debug>
-				<item name="debug" value="false"/>
-				<item name="Build_Sides" value="1"/>
-				<item name="Build_Aside" value="1"/>
-				<item name="Build_Aside_UTaX" value="1"/>
-				<item name="Build_Aside_UTaU" value="1"/>
-				<item name="Build_Aside_UTbV" value="1"/>
-				<item name="Build_Aside_UTbX" value="1"/>
-				<item name="Build_Cside" value="1"/>
-				<item name="Build_Cside_UTaX" value="1"/>
-				<item name="Build_Cside_UTaU" value="1"/>
-				<item name="Build_Cside_UTbV" value="1"/>
-				<item name="Build_Cside_UTbX" value="1"/>
-				<item name="Build_Frame" value="1"/>
-				<item name="Build_Jacket" value="1"/>
-				<item name="Build_PipeHeater" value="1"/>
-				<item name="Build_Box" value="1"/>
-				<item name="Build_BoxPlug" value="1"/>
-				<item name="select_volume" value="lvUT"/>
-			</debug>
-
-			<position z="2485*mm" />
-
-		</detector>
-	</detectors>
-	<readouts>
-		<readout name="UTHits">
-			<id>system:8,sensor:1,sector:1,module:3,face:1,stave:4,layer:2,side:1</id>
-		</readout>
-	</readouts>
-</lccdd>
diff --git a/compact/components/UT/2025-v00.00/parameters.xml b/compact/components/UT/2025-v00.00/parameters.xml
deleted file mode 100644
index 3c30e6ccb..000000000
--- a/compact/components/UT/2025-v00.00/parameters.xml
+++ /dev/null
@@ -1,729 +0,0 @@
-<!-- ========================================================================== -->
-<!-- LHCb Detector Description -->
-<!-- ========================================================================== -->
-<!--  -->
-<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!-- All rights reserved. -->
-<!--  -->
-<!-- @author  M.Frank -->
-<!-- @date    14/10/2018 -->
-<!--  -->
-<!-- ========================================================================== -->
-<!-- XML description of the UT constant definitions -->
-<!-- ========================================================================== -->
-<lccdd>
-	<define>
-		<!-- UT Geometry constants -->
-		<!-- *  Author: Jianchun Wang  * -->
-		<constant name="UTGeomVersion" value="1.1" />
-		<constant name="UTEpsilon" value="0.001*mm" />
-		<!-- ========== UT sensors ========== -->
-    <constant name="UTSensorAPitch" value="0.1875*mm" />
-    <constant name="UTSensorBCDPitch" value="0.0935*mm" />
-		<constant name="UTSensorWide" value="97.5*mm" />
-		<constant name="UTSensorLongA" value="99.5*mm" />
-		<constant name="UTSensorLongB" value="UTSensorLongA" />
-		<constant name="UTSensorSiOverlapY" value="1.8*mm" />
-		<constant name="UTSensorGRWideFar" value="0.8*mm" />
-		<constant name="UTSensorGRWideNear" value="0.8*mm+0.5*mm" />
-		<constant name="UTSensorOverlapY" value="UTSensorSiOverlapY+UTSensorGRWideFar+UTSensorGRWideNear" />
-		<constant name="UTSensorLongC" value="(UTSensorLongA+UTSensorOverlapY)/2" />
-		<constant name="UTSensorLongD" value="UTSensorLongC" />
-		<constant name="UTSensorThick" value="0.320*mm" />
-		<constant name="UTSensorOverlapY0" value="UTSensorSiOverlapY+UTSensorGRWideFar*2" />
-		<constant name="UTSensorSiOverlapX" value="2.0*mm" />
-		<constant name="UTSensorGRWideSide" value="0.8*mm" />
-		<constant name="UTSensorOverlapX" value="UTSensorSiOverlapX+2*UTSensorGRWideSide" />
-		<constant name="UTSensorSiWide" value="UTSensorWide-2*UTSensorGRWideSide" />
-		<constant name="UTSensorSiLongA" value="UTSensorLongA-UTSensorGRWideFar-UTSensorGRWideNear" />
-		<constant name="UTSensorSiLongB" value="UTSensorLongB-UTSensorGRWideFar-UTSensorGRWideNear" />
-		<constant name="UTSensorSiLongC" value="UTSensorLongC-UTSensorGRWideFar-UTSensorGRWideNear" />
-		<constant name="UTSensorSiLongD" value="UTSensorLongD-UTSensorGRWideFar-UTSensorGRWideNear" />
-		<constant name="UTSensorAlThick" value="0.003*mm" />
-		<constant name="UTSensorSiThickA" value="0.320*mm-UTSensorAlThick" />
-		<constant name="UTSensorSiThickB" value="0.250*mm-UTSensorAlThick" />
-		<constant name="UTSensorSiThickC" value="0.250*mm-UTSensorAlThick" />
-		<constant name="UTSensorSiThickD" value="0.250*mm-UTSensorAlThick" />
-		<constant name="UTSensorSiOffsetY" value="(UTSensorGRWideNear-UTSensorGRWideFar)/2" />
-		<constant name="UTSensorGRThickA" value="UTSensorSiThickA" />
-		<constant name="UTSensorGRThickB" value="UTSensorSiThickB" />
-		<constant name="UTSensorGRThickC" value="UTSensorSiThickC" />
-		<constant name="UTSensorGRThickD" value="UTSensorSiThickD" />
-		<constant name="UTSensorAlWide" value="UTSensorWide" />
-		<constant name="UTSensorAlLongA" value="UTSensorLongA" />
-		<constant name="UTSensorAlLongB" value="UTSensorLongB" />
-		<constant name="UTSensorAlLongC" value="UTSensorLongC" />
-		<constant name="UTSensorAlLongD" value="UTSensorLongD" />
-		<constant name="UTSensorAlZ" value="UTSensorThick/2-UTSensorAlThick/2" />
-		<constant name="UTSensorSiZ" value="-UTSensorAlThick/2" />
-		<!-- ========== Hybrid ========== -->
-		<constant name="UTStiffWide" value="UTSensorWide" />
-		<constant name="UTHybridWide" value="UTStiffWide" />
-		<constant name="UTHybridFlex4Long" value="30*mm" />
-		<constant name="UTAnchorLong" value="10*mm" />
-		<constant name="UTHybridFlex4Gap" value="1*mm" />
-		<constant name="UTStiffLongA" value="UTSensorLongA+UTHybridFlex4Gap+UTHybridFlex4Long+UTAnchorLong*2" />
-		<constant name="UTHybridLongA" value="UTStiffLongA" />
-		<constant name="UTHybridFlex8Long" value="30*mm" />
-		<constant name="UTHybridFlex8Gap" value="1*mm" />
-		<constant name="UTStiffLongB" value="UTSensorLongB+UTHybridFlex8Gap+UTHybridFlex8Long+UTAnchorLong*2" />
-		<constant name="UTHybridLongB" value="UTStiffLongB" />
-		<constant name="UTStiffLongC" value="UTSensorLongC+UTHybridFlex8Gap+UTHybridFlex8Long+UTAnchorLong*2" />
-		<constant name="UTHybridLongC" value="UTStiffLongC" />
-		<constant name="UTStiffLongD" value="UTSensorLongD+UTHybridFlex8Gap+UTHybridFlex8Long+UTAnchorLong*2" />
-		<constant name="UTHybridLongD" value="UTStiffLongD" />
-		<constant name="UTSiAsicThick" value="0.320*mm" />
-		<constant name="UTSilverEpoxyThick" value="0.100*mm" />
-		<constant name="UTAsicThick" value="UTSiAsicThick+UTSilverEpoxyThick" />
-		<constant name="UTHybridFlex4Thick" value="0.400*mm" />
-		<constant name="UTHysolThick" value="0.050*mm" />
-		<constant name="UTStiffThick" value="0.500*mm" />
-		<constant name="UTTimThick" value="0.125*mm" />
-		<constant name="UTHybrid4Thick" value="UTTimThick+UTStiffThick+UTHysolThick+UTHybridFlex4Thick+UTAsicThick+4*UTEpsilon" />
-		<constant name="UTHybridFlex8Thick" value="0.400*mm" />
-		<constant name="UTHybrid8Thick" value="UTTimThick+UTStiffThick+UTHysolThick+UTHybridFlex8Thick+UTAsicThick+4*UTEpsilon" />
-		<constant name="UTAsicWide" value="10.9*mm" />
-		<constant name="UTAsicLong" value="4.75*mm" />
-		<constant name="UTAsicThickAve" value="UTAsicThick*UTAsicWide/UTSensorSiWide" />
-		<constant name="UTHybridFlex4Wide" value="UTSensorWide" />
-		<constant name="UTHybridFlex8Wide" value="UTSensorWide" />
-		<constant name="UTHysolWide" value="UTSensorWide" />
-		<constant name="UTHysolLongA" value="UTSensorLongA+UTHybridFlex4Gap+UTHybridFlex4Long" />
-		<constant name="UTHysolLongB" value="UTSensorLongB+UTHybridFlex8Gap+UTHybridFlex8Long" />
-		<constant name="UTHysolLongC" value="UTSensorLongC+UTHybridFlex8Gap+UTHybridFlex8Long" />
-		<constant name="UTHysolLongD" value="UTSensorLongD+UTHybridFlex8Gap+UTHybridFlex8Long" />
-		<constant name="UTStiffLWide" value="10*mm" />
-		<constant name="UTHysolCutWide" value="UTSensorWide-UTStiffLWide" />
-		<constant name="UTHysolCutLongA" value="UTSensorLongA-UTStiffLWide" />
-		<constant name="UTHysolCutLongB" value="UTSensorLongB-UTStiffLWide" />
-		<constant name="UTHysolCutLongC" value="UTSensorLongC-UTStiffLWide" />
-		<constant name="UTHysolCutLongD" value="UTSensorLongD-UTStiffLWide" />
-		<constant name="UTHysolGapWide" value="1*mm" />
-		<constant name="UTStiffCutWide" value="UTSensorWide-UTStiffLWide" />
-		<constant name="UTStiffCutLongA" value="UTSensorLongA-UTStiffLWide+UTAnchorLong" />
-		<constant name="UTStiffCutLongB" value="UTSensorLongB-UTStiffLWide+UTAnchorLong" />
-		<constant name="UTStiffCutLongC" value="UTSensorLongC-UTStiffLWide+UTAnchorLong" />
-		<constant name="UTStiffCutLongD" value="UTSensorLongD-UTStiffLWide+UTAnchorLong" />
-		<constant name="UTAnchorWide" value="10*mm" />
-		<constant name="UTAnchorSide" value="15*mm" />
-		<constant name="UTTimWide" value="UTSensorWide" />
-		<constant name="UTTimLongA" value="UTSensorLongA+UTHybridFlex4Gap+UTHybridFlex4Long" />
-		<constant name="UTTimLongB" value="UTSensorLongB+UTHybridFlex8Gap+UTHybridFlex8Long" />
-		<constant name="UTTimLongC" value="UTSensorLongC+UTHybridFlex8Gap+UTHybridFlex8Long" />
-		<constant name="UTTimLongD" value="UTSensorLongD+UTHybridFlex8Gap+UTHybridFlex8Long" />
-		<constant name="UTTimCutWide" value="UTSensorWide-UTStiffLWide" />
-		<constant name="UTTimCutLongA" value="UTSensorLongA-UTStiffLWide" />
-		<constant name="UTTimCutLongB" value="UTSensorLongB-UTStiffLWide" />
-		<constant name="UTTimCutLongC" value="UTSensorLongC-UTStiffLWide" />
-		<constant name="UTTimCutLongD" value="UTSensorLongD-UTStiffLWide" />
-		<constant name="UTHybridAsicGap" value="2*mm" />
-		<constant name="UTHybridFlex4End" value="UTHybridFlex4Gap+UTHybridFlex4Long" />
-		<constant name="UTTimZ" value="UTHybrid4Thick/2-UTTimThick/2" />
-		<constant name="UTStiffZ" value="UTTimZ-(UTTimThick+UTStiffThick)/2-UTEpsilon" />
-		<constant name="UTHysolZ" value="UTStiffZ-(UTStiffThick+UTHysolThick)/2-UTEpsilon" />
-		<constant name="UTSensorYA" value="UTHybridLongA/2-UTAnchorLong-UTSensorLongA/2" />
-		<constant name="UTSensorYB" value="UTHybridLongA/2-UTAnchorLong-UTSensorLongA/2" />
-		<constant name="UTSensorYC" value="UTHybridLongA/2-UTAnchorLong-UTSensorLongA/2" />
-		<constant name="UTSensorYD" value="UTHybridLongA/2-UTAnchorLong-UTSensorLongA/2" />
-		<constant name="UTSensorZ" value="UTHysolZ-(UTHysolThick+UTSensorThick)/2-UTEpsilon" />
-		<constant name="UTHybridFlexYA" value="UTSensorYA-UTSensorLongA/2-UTHybridFlex4Gap-UTHybridFlex4Long/2" />
-		<constant name="UTHybridFlexYB" value="UTSensorYB-UTSensorLongB/2-UTHybridFlex8Gap-UTHybridFlex8Long/2" />
-		<constant name="UTHybridFlexYC" value="UTSensorYC-UTSensorLongC/2-UTHybridFlex8Gap-UTHybridFlex8Long/2" />
-		<constant name="UTHybridFlexYD" value="UTSensorYD-UTSensorLongD/2-UTHybridFlex8Gap-UTHybridFlex8Long/2" />
-		<constant name="UTHybridFlex4Z" value="UTHysolZ-(UTHysolThick+UTHybridFlex4Thick)/2-UTEpsilon" />
-		<constant name="UTHybridFlex8Z" value="UTHysolZ-(UTHysolThick+UTHybridFlex8Thick)/2-UTEpsilon" />
-		<constant name="UTAsicYA" value="UTSensorYA-UTSensorLongA/2-UTHybridAsicGap-UTAsicLong/2" />
-		<constant name="UTAsicYB" value="UTSensorYB-UTSensorLongB/2-UTHybridAsicGap-UTAsicLong/2" />
-		<constant name="UTAsicYC" value="UTSensorYC-UTSensorLongC/2-UTHybridAsicGap-UTAsicLong/2" />
-		<constant name="UTAsicYD" value="UTSensorYD-UTSensorLongD/2-UTHybridAsicGap-UTAsicLong/2" />
-		<constant name="UTAsic4Z" value="UTHybridFlex4Z-(UTHybridFlex4Thick+UTAsicThick)/2-UTEpsilon" />
-		<constant name="UTAsic8Z" value="UTHybridFlex8Z-(UTHybridFlex8Thick+UTAsicThick)/2-UTEpsilon" />
-		<!-- ========== Stave ========== -->
-		<constant name="UTBareStaveThick" value="3.90*mm" />
-		<constant name="UTCableKaptonThick" value="0.325*mm" />
-		<constant name="UTCableCuThickL0" value="0.037*mm" />
-		<constant name="UTCableThick" value="UTCableKaptonThick+UTCableCuThickL0" />
-		<constant name="UTStaveThick" value="UTBareStaveThick+UTCableThick*2+UTHybrid4Thick*2 + 4*UTEpsilon" />
-		<constant name="UTBareStaveEdge" value="1*mm" />
-		<constant name="UTBareStaveWide" value="UTHybridWide+2*UTBareStaveEdge" />
-		<constant name="UTStaveWide" value="UTBareStaveWide" />
-		<constant name="UTBareStaveEnd" value="15.11*mm" />
-		<constant name="UTBareStaveLong" value="UTSensorLongA*14-UTSensorOverlapY*13+UTHybridFlex4End*2+UTBareStaveEnd*2" />
-		<constant name="UTBareStaveEOSLong" value="111.28*mm" />
-		<constant name="UTStaveLong" value="UTBareStaveLong+2*UTBareStaveEOSLong" />
-		<constant name="UTCableWide" value="UTBareStaveWide" />
-		<constant name="UTCableLongL0" value="UTSensorLongA-UTSensorOverlapY" />
-		<constant name="UTCableLongL1" value="UTSensorLongA*2-UTSensorOverlapY*2" />
-		<constant name="UTCableLongL2" value="UTSensorLongA*2-UTSensorOverlapY*2" />
-		<constant name="UTCableLongL3" value="UTSensorLongA+UTSensorLongC-UTSensorOverlapY*2" />
-		<constant name="UTCableLongL" value="UTCableLongL0+UTCableLongL1+UTCableLongL2+UTCableLongL3" />
-		<constant name="UTCableLongM0" value="UTBareStaveEOSLong" />
-		<constant name="UTCableLongM1" value="UTSensorLongA*2-UTSensorOverlapY*2" />
-		<constant name="UTCableLongM2" value="UTSensorLongA*2-UTSensorOverlapY*2" />
-		<constant name="UTCableLongM3" value="UTSensorLongA*2-UTSensorOverlapY*2" />
-		<constant name="UTCableLongM" value="UTCableLongM0+UTCableLongM1+UTCableLongM2+UTCableLongM3" />
-		<constant name="UTCableLongS0" value="UTBareStaveEOSLong+UTSensorLongA-UTSensorOverlapY" />
-		<constant name="UTCableLongS1" value="UTSensorLongA*2-UTSensorOverlapY*2" />
-		<constant name="UTCableLongS2" value="UTSensorLongA*2-UTSensorOverlapY*2" />
-		<constant name="UTCableLongS" value="UTCableLongS0+UTCableLongS1+UTCableLongS2" />
-		<constant name="UTCableCuThickL1" value="0.032*mm" />
-		<constant name="UTCableCuThickL2" value="0.026*mm" />
-		<constant name="UTCableCuThickL3" value="0.011*mm" />
-		<constant name="UTCableCuThickM0" value="0.037*mm" />
-		<constant name="UTCableCuThickM1" value="0.030*mm" />
-		<constant name="UTCableCuThickM2" value="0.020*mm" />
-		<constant name="UTCableCuThickM3" value="0.010*mm" />
-		<constant name="UTCableCuThickS0" value="0.030*mm" />
-		<constant name="UTCableCuThickS1" value="0.020*mm" />
-		<constant name="UTCableCuThickS2" value="0.010*mm" />
-		<constant name="UTMegArrayWide" value="55*mm" />
-		<constant name="UTMegArrayLong" value="17.5*mm" />
-		<constant name="UTMegArrayThick" value="3*mm" />
-		<constant name="UTMegArrayY" value="40.8*mm" />
-		<constant name="UTHVConnectorWide" value="20*mm" />
-		<constant name="UTHVConnectorLong" value="10*mm" />
-		<constant name="UTHVConnectorThick" value="3*mm" />
-		<constant name="UTHVConnectorLX" value="36*mm" />
-		<constant name="UTHVConnectorMX" value="-36*mm" />
-		<constant name="UTHVConnectorSX" value="36*mm" />
-		<constant name="UTCoolingJointLong" value="30*mm" />
-		<constant name="UTCoolingJointR0" value="2.0*mm" />
-		<constant name="UTCoolingJointR1" value="1.0*mm" />
-		<constant name="UTCoolingJointX" value="-40*mm" />
-		<constant name="UTStaveHybridAStepY" value="UTSensorLongA-UTSensorOverlapY" />
-		<constant name="UTStaveHybridBStepY" value="UTSensorLongB-UTSensorOverlapY" />
-		<constant name="UTStaveHybridCStepY" value="UTSensorLongC-UTSensorOverlapY" />
-		<constant name="UTStaveHybridDStepY" value="UTSensorLongD-UTSensorOverlapY" />
-		<constant name="UTStaveAHybridY0" value="UTHybridLongA/2-UTAnchorLong-UTSensorOverlapY0/2-UTStaveHybridAStepY/2" />
-		<constant name="UTStaveBHybridY0" value="UTHybridLongB/2-UTAnchorLong-UTSensorOverlapY0/2-UTStaveHybridBStepY/2" />
-		<constant name="UTStaveCHybridY0" value="UTHybridLongD/2-UTAnchorLong-UTSensorOverlapY0/2-UTStaveHybridDStepY/2" />
-		<constant name="UTStaveCableZ" value="UTBareStaveThick/2+UTCableThick/2+UTEpsilon" />
-		<constant name="UTStaveHybridZ" value="UTBareStaveThick/2+UTHybrid4Thick/2+UTCableThick+2*UTEpsilon" />
-		<!-- Aluminium frame -->
-		<constant name="UTFrameThick" value="15*mm" />
-		<constant name="UTVirtualBoxWide" value="2586*mm" />
-		<constant name="UTFrameOuterWide" value="UTVirtualBoxWide" />
-		<constant name="UTVirtualBoxLong" value="2628*mm" />
-		<constant name="UTFrameOuterLong" value="UTVirtualBoxLong" />
-		<constant name="UTBoxOuterWide" value="2040*mm" />
-		<constant name="UTFrameInnerWide" value="UTBoxOuterWide" />
-		<constant name="UTBoxOuterLong" value="1960*mm" />
-		<constant name="UTFrameInnerLong" value="UTBoxOuterLong" />
-		<!-- UT light tight box -->
-		<constant name="UTBoxOuterThick" value="430.0*mm" />
-		<constant name="UTBoxWallDownstreamThick" value="20.0*mm" />
-		<constant name="UTBoxInnerThick" value="UTBoxOuterThick-2*UTBoxWallDownstreamThick" />
-		<constant name="UTBoxWallSideThick" value="25.0*mm" />
-		<constant name="UTBoxInnerWide" value="UTBoxOuterWide-2*UTBoxWallSideThick" />
-		<constant name="UTBoxInnerLong" value="UTBoxOuterLong-2*UTBoxWallSideThick" />
-		<!-- UTBoxWallUpstreamThick is thickness of plates on front and back (in Z) in the UT -->
-		<!-- UTBoxWallSideThick is thickness of top, bottom, left, and right plates when looking downstream -->
-		<constant name="UTBeamHoleRadius" value="33.4*mm" />
-		<constant name="UTBoxBeamHoleRadius" value="UTBeamHoleRadius-0.1*mm" />
-		<!-- UT box plug -->
-		<constant name="UTCylJacketThick" value="5.12*mm" />
-		<constant name="UTConeJacketThick" value="UTCylJacketThick" />
-		<constant name="UTPipeHeaterDownstreamThick" value="0.35*mm" />
-		<constant name="UTConeJacketRadiusZmax" value="UX851Cone08ARadiusZmax+UX851Cone08AThick+UTPipeHeaterDownstreamThick+0.01*mm" />
-		<constant name="UTPlugOuterRadius" value="UTConeJacketRadiusZmax + UTConeJacketThick + 57.6*mm" />
-		<constant name="UTPlugInnerRadius" value="UTConeJacketRadiusZmax + UTConeJacketThick" />
-		<constant name="UTPlugThickZ" value="UTBoxWallDownstreamThick" />
-		<constant name="UTInternalRingThick" value="5.0*mm" />
-		<constant name="UTInternalRingIR" value="46.0*mm" />
-		<constant name="UTInternalRingOR" value="80.0*mm" />
-		<constant name="UTInternalSealThick" value="5.0*mm" />
-		<constant name="UTInternalSealIR" value="43.5*mm" />
-		<constant name="UTInternalSealOR" value="46.0*mm" />
-		<constant name="UTBoxPipeAirexRingInnerThick" value="8.0*mm" />
-		<constant name="UTBoxPipeAirexRingMiddleThick" value="10.0*mm" />
-		<constant name="UTBoxPipeAirexRingOuterThick" value="8.0*mm" />
-		<constant name="UTBoxPipeAirexRingIR" value="35.0*mm" />
-		<constant name="UTBoxPipeAirexRingInnerOR" value="43.5*mm" />
-		<constant name="UTBoxPipeAirexRingMiddleOR" value="52.0*mm" />
-		<constant name="UTBoxPipeAirexRingOuterOR" value="43.5*mm" />
-		<constant name="UTBoxWallSealThick" value="10.0*mm" />
-		<constant name="UTBoxWallSealIR" value="UTBoxPipeAirexRingMiddleOR" />
-		<constant name="UTBoxWallSealOR" value="55.0*mm" />
-		<!-- Kapton beam pipe jacket -->
-		<constant name="UTCylJacketLength" value="UX851Cyl07BLenght" />
-		<constant name="UTCylJacketZpos" value="UTCylJacketLength*0.5" />
-		<!-- 230 -->
-		<constant name="UTPipeHeaterUpstreamRadius" value="UX851Cyl07Radius+UX851Cyl07Thick+0.01*mm" />
-		<constant name="UTPipeHeaterUpstreamThick" value="0.35*mm" />
-		<constant name="UTCylJacketRadius" value="UTPipeHeaterUpstreamRadius+UTPipeHeaterUpstreamThick+0.01*mm" />
-		<constant name="UTConeJacketLength" value="UX851Cone08ALenght" />
-		<!-- 200 -->
-		<!-- 27.0009+1+0.01 -->
-		<constant name="UTConeJacketRadiusZmin" value="UX851Cone08ARadiusZmin+UX851Cone08AThick+UTPipeHeaterDownstreamThick+0.01*mm" />
-		<!-- 25+1+0.01 -->
-		<!-- aerogel cutout -->
-		<constant name="UTConeJacketCutOutOffset" value="5*mm" />
-		<constant name="UTLayerDz" value="55*mm" />
-		<constant name="UTStaveDz" value="15*mm" />
-		<constant name="UTConeJacketCutOutLength" value="UTLayerDz+UTStaveDz+UTStaveThick+2*UTConeJacketCutOutOffset" />
-		<constant name="UTSystemZ" value="2485*mm" />
-		<constant name="UTStationDz" value="280*mm" />
-		<constant name="UTConeJacketCutOutPos" value="UTSystemZ+0.5*UTStationDz-0.5*UTLayerDz-0.5*UTStaveDz-0.5*UTStaveThick-UTConeJacketCutOutOffset-UX851Rich1TTSplitZposIP" />
-		<constant name="UTConeJacketCutOutLHCbZmin" value="UX851Rich1TTSplitZposIP+UTConeJacketCutOutPos" />
-		<constant name="UTConeJacketCutOutLHCbZmax" value="UX851Rich1TTSplitZposIP+UTConeJacketCutOutPos+UTConeJacketCutOutLength" />
-		<constant name="UTConeJacketCutOutRadiusZmin" value="UTConeJacketCutOutLHCbZmin*tan(UX851to4Angle)+UX851Cyl07Thick+UTPipeHeaterDownstreamThick+0.01*mm" />
-		<constant name="UTConeJacketCutOutRadiusZmax" value="UTConeJacketCutOutLHCbZmax*tan(UX851to4Angle)+UX851Cyl07Thick+UTPipeHeaterDownstreamThick+0.02*mm" />
-		<constant name="UTConeJacketUpstreamLength" value="UTConeJacketCutOutPos-UTCylJacketLength" />
-		<constant name="UTConeJacketDownstreamLength" value="UTConeJacketLength-UTConeJacketUpstreamLength-UTConeJacketCutOutLength" />
-		<constant name="UTConeJacketZposUpstream" value="UTCylJacketLength+UTConeJacketUpstreamLength*0.5" />
-		<constant name="UTConeJacketZposDownstream" value="UTConeJacketCutOutPos+UTConeJacketCutOutLength+0.5*UTConeJacketDownstreamLength" />
-		<!-- beam pipe heaters -->
-		<constant name="UTPipeHeaterUpstreamLength" value="200.0*mm" />
-		<!-- 25+1+0.01 -->
-		<constant name="UTPipeHeaterUpstreamPos" value="UX851Rich1TTSplitZposIP-UTSystemZ-17.0*mm+0.5*UTPipeHeaterUpstreamLength" />
-		<constant name="UTPipeHeaterDownstreamLength" value="67.0*mm" />
-		<constant name="UTPipeHeaterDownstreamZmin" value="UX851TTMagnetSplitZposIP-UTBoxWallDownstreamThick-5*mm" />
-		<constant name="UTPipeHeaterDownstreamLengthInUT" value="UX851TTMagnetSplitZposIP-UTPipeHeaterDownstreamZmin" />
-		<constant name="UTPipeHeaterDownstreamLengthInMagnet" value="UTPipeHeaterDownstreamLength-UTPipeHeaterDownstreamLengthInUT" />
-		<constant name="UTPipeHeaterDownstreamZmax" value="UTPipeHeaterDownstreamZmin+UTPipeHeaterDownstreamLength" />
-		<constant name="UTPipeHeaterDownstreamRadiusZmin" value="UTPipeHeaterDownstreamZmin*tan(UX851to4Angle)+UX851Cyl07Thick+0.01*mm" />
-		<constant name="UTPipeHeaterDownstreamRadiusZmax" value="UTPipeHeaterDownstreamZmax*tan(UX851to4Angle)+UX851Cyl07Thick+0.01*mm" />
-		<constant name="UTPipeHeaterDownstreamPos" value="UTPipeHeaterDownstreamZmin+0.5*UTPipeHeaterDownstreamLength-UTSystemZ" />
-		<!-- Detector Z positions -->
-		<!-- virtual thickness -->
-		<constant name="UTEOSPigtailThick" value="7.236*mm" />
-		<constant name="UTLayerThick" value="UTStaveThick+UTStaveDz+UTEOSPigtailThick+0.01*mm" />
-		<constant name="UTStationThick" value="UTLayerThick+UTLayerDz+0.01*mm" />
-		<constant name="UTVirtualBoxAWide" value="UTBoxInnerWide" />
-		<constant name="UTVirtualBoxBWide" value="UTBoxInnerWide" />
-		<constant name="UTVirtualHoleRadius" value="UTPlugInnerRadius-0.1*mm" />
-		<!-- Beam pipe hole -->
-		<constant name="UTAngle" value="5.0*degree" />
-		<constant name="UTSinAngle" value="sin(UTAngle)" />
-		<constant name="UTEOSWideUTa" value="16*UTStaveWide+UTSinAngle*UTStaveLong" />
-		<constant name="UTEOSWideUTb" value="18*UTStaveWide+UTSinAngle*UTStaveLong" />
-		<constant name="UTEOSLong" value="46.765*mm" />
-		<constant name="UTEOSThick" value="3.29*mm" />
-		<constant name="UTEOSPigtailLong" value="(UTBoxInnerLong-UTBareStaveLong)/2-UTEOSLong" />
-		<!-- Stereo angle -->
-		<constant name="UTCosAngle" value="cos(UTAngle)" />
-		<!-- Stave positions -->
-		<!--
-		From the center to either side, the design has one instance of 5.5mm
-		overlap, then 2 instances of 4.2mm overlap, and the rest is 3.6mm overlap
-		-->
-		<constant name="UTStaveAOverlap" value="3.600*mm" />
-		<constant name="UTStaveBOverlap" value="4.200*mm" />
-		<constant name="UTStaveCOverlap" value="5.500*mm" />
-		<constant name="UTStaveStep" value="UTStaveWide-UTStaveAOverlap" />
-		<constant name="UTStaveCCorrect" value="(UTStaveCOverlap-UTStaveAOverlap)/2" />
-		<constant name="UTStaveBCorrect" value="UTStaveCCorrect+(UTStaveBOverlap-UTStaveAOverlap)" />
-		<constant name="UTStaveACorrect" value="UTStaveBCorrect+(UTStaveBOverlap-UTStaveAOverlap)" />
-		<!-- U/V layers have different corrections due to stereo angle -->
-		<constant name="UTUVGlobalCorrectX" value="(UTStaveStep/2-UTStaveCCorrect)*(1.0/UTCosAngle-1)" />
-		<constant name="UTUVHoleCorrectX" value="UTStaveStep*(UTSinAngle*UTSinAngle/UTCosAngle)" />
-		<constant name="UTStaveCCorrectUV" value="UTStaveCCorrect-UTUVGlobalCorrectX+UTUVHoleCorrectX" />
-		<constant name="UTStaveBCorrectUV" value="UTStaveBCorrect-UTUVGlobalCorrectX" />
-		<constant name="UTStaveACorrectUV" value="UTStaveACorrect-UTUVGlobalCorrectX" />
-		<constant name="UTStaveCUVPosY" value="UTSinAngle*(UTStaveWide-UTStaveCOverlap)/2" />
-		<constant name="UTaXR1S1CorrectionX" value="-1.9*mm" />
-		<constant name="UTaXR1S2CorrectionX" value="2.1*mm" />
-		<constant name="UTaXR1S3CorrectionX" value="-1.8*mm" />
-		<constant name="UTaXR1S4CorrectionX" value="1.0*mm" />
-		<constant name="UTaXR1S5CorrectionX" value="-1.7*mm" />
-		<constant name="UTaXR1S6CorrectionX" value="0.0*mm" />
-		<constant name="UTaXR2S1CorrectionX" value="-1.0*mm" />
-		<constant name="UTaXR2S2CorrectionX" value="0.*mm" />
-		<constant name="UTaXR2S3CorrectionX" value="0.*mm" />
-		<constant name="UTaXR2S4CorrectionX" value="-0.2*mm" />
-		<constant name="UTaXR3S1CorrectionX" value="1.5*mm" />
-		<constant name="UTaXR3S2CorrectionX" value="-0.6*mm" />
-		<constant name="UTaXR3S3CorrectionX" value="1.7*mm" />
-		<constant name="UTaXR3S4CorrectionX" value="-1.5*mm" />
-		<constant name="UTaXR3S5CorrectionX" value="2.00*mm" />
-		<constant name="UTaXR3S6CorrectionX" value="-2.5*mm" />
-
-		<constant name="UTaUR1S1CorrectionX" value="-1.720*mm" />
-		<constant name="UTaUR1S2CorrectionX" value="2.180*mm" />
-		<constant name="UTaUR1S3CorrectionX" value="-1.620*mm" />
-		<constant name="UTaUR1S4CorrectionX" value="1.180*mm" />
-		<constant name="UTaUR1S5CorrectionX" value="-1.520*mm" />
-		<constant name="UTaUR1S6CorrectionX" value="0.180*mm" />
-		<constant name="UTaUR2S1CorrectionX" value="-0.820*mm" />
-		<constant name="UTaUR2S2CorrectionX" value="-0.552*mm" />
-		<constant name="UTaUR2S3CorrectionX" value="0.552*mm" />
-		<constant name="UTaUR2S4CorrectionX" value="-0.380*mm" />
-		<constant name="UTaUR3S1CorrectionX" value="1.220*mm" />
-		<constant name="UTaUR3S2CorrectionX" value="-0.780*mm" />
-		<constant name="UTaUR3S3CorrectionX" value="1.520*mm" />
-		<constant name="UTaUR3S4CorrectionX" value="-1.780*mm" />
-		<constant name="UTaUR3S5CorrectionX" value="1.720*mm" />
-		<constant name="UTaUR3S6CorrectionX" value="-2.680*mm" />
-
-		<constant name="UTbVR1S1CorrectionX" value="2.680*mm" />
-		<constant name="UTbVR1S2CorrectionX" value="-1.92*mm" />
-		<constant name="UTbVR1S3CorrectionX" value="1.780*mm" />
-		<constant name="UTbVR1S4CorrectionX" value="-1.720*mm" />
-		<constant name="UTbVR1S5CorrectionX" value="0.880*mm" />
-		<constant name="UTbVR1S6CorrectionX" value="-1.520*mm" />
-		<constant name="UTbVR1S7CorrectionX" value="-0.120*mm" />
-		<constant name="UTbVR2S1CorrectionX" value="-0.820*mm" />
-		<constant name="UTbVR2S2CorrectionX" value="-0.552*mm" />
-		<constant name="UTbVR2S3CorrectionX" value="0.552*mm" />
-		<constant name="UTbVR2S4CorrectionX" value="-0.18*mm" />
-		<constant name="UTbVR3S1CorrectionX" value="1.22*mm" />
-		<constant name="UTbVR3S2CorrectionX" value="-0.68*mm" />
-		<constant name="UTbVR3S3CorrectionX" value="1.42*mm" />
-		<constant name="UTbVR3S4CorrectionX" value="-1.58*mm" />
-		<constant name="UTbVR3S5CorrectionX" value="1.52*mm" />
-		<constant name="UTbVR3S6CorrectionX" value="-2.48*mm" />
-		<constant name="UTbVR3S7CorrectionX" value="1.72*mm" />
-
-		<constant name="UTbXR1S1CorrectionX" value="2.4*mm" />
-		<constant name="UTbXR1S2CorrectionX" value="-2.1*mm" />
-		<constant name="UTbXR1S3CorrectionX" value="1.5*mm" />
-		<constant name="UTbXR1S4CorrectionX" value="-1.9*mm" />
-		<constant name="UTbXR1S5CorrectionX" value="0.6*mm" />
-		<constant name="UTbXR1S6CorrectionX" value="-1.7*mm" />
-		<constant name="UTbXR1S7CorrectionX" value="-0.3*mm" />
-		<constant name="UTbXR2S1CorrectionX" value="-1.0*mm" />
-		<constant name="UTbXR2S2CorrectionX" value="0.0*mm" />
-		<constant name="UTbXR2S3CorrectionX" value="0.0*mm" />
-		<constant name="UTbXR2S4CorrectionX" value="0.0*mm" />
-		<constant name="UTbXR3S1CorrectionX" value="1.4*mm" />
-		<constant name="UTbXR3S2CorrectionX" value="-0.4*mm" />
-		<constant name="UTbXR3S3CorrectionX" value="1.6*mm" />
-		<constant name="UTbXR3S4CorrectionX" value="-1.3*mm" />
-		<constant name="UTbXR3S5CorrectionX" value="1.8*mm" />
-		<constant name="UTbXR3S6CorrectionX" value="-2.2*mm" />
-		<constant name="UTbXR3S7CorrectionX" value="1.9*mm" />
-		<!-- A/C side cuts -->
-		<constant name="UTStaveGap" value="UTStaveDz-UTStaveThick" />
-		<constant name="UTSideCutGap" value="10*mm" />
-		<constant name="UTaXSideOverlap" value="UTStaveWide-(UTStaveStep+UTStaveCCorrect)" />
-		<constant name="UTBareLayerThick" value="UTStaveThick+UTStaveDz+0.01*mm" />
-		<constant name="UTaXLayerCut" value="(UTaXSideOverlap+3*UTSideCutGap)*(0.5*(UTLayerThick+UTStaveDz-UTStaveThick)/(UTStaveDz-UTStaveThick))-(0.5*UTaXSideOverlap+2*UTSideCutGap)" />
-		<constant name="UTaXLayerSideLongWidth" value="17/2*UTStaveStep-UTStaveACorrect+1/2*UTStaveWide+2*UTaXLayerCut-1/2*UTaXSideOverlap" />
-		<constant name="UTaXLayerSideShortWidth" value="UTaXLayerSideLongWidth-2*(2*UTaXLayerCut+UTSideCutGap)" />
-		<constant name="UTaULayerSideLongWidth" value="UTaXLayerSideLongWidth" />
-		<constant name="UTaULayerSideShortWidth" value="UTaXLayerSideShortWidth" />
-		<constant name="UTbVLayerSideLongWidth" value="UTaXLayerSideLongWidth" />
-		<constant name="UTbVLayerSideShortWidth" value="UTaXLayerSideShortWidth" />
-		<constant name="UTbXLayerSideLongWidth" value="UTaXLayerSideLongWidth" />
-		<constant name="UTbXLayerSideShortWidth" value="UTaXLayerSideShortWidth" />
-		<constant name="UTLayerSideCorrectedWidth" value="UTaXLayerSideLongWidth-2*UTaXLayerCut" />
-		<constant name="UTLayerSideCorrectedX" value="1/2*UTLayerSideCorrectedWidth*(1-UTCosAngle)" />
-		<constant name="UTLayerSideCorrectedY" value="1/2*UTLayerSideCorrectedWidth*UTSinAngle" />
-	</define>
-	<materials>
-		<!-- Elements (temporary) -->
-		<element Z="13" formula="Al" name="UT:AluminiumElement">
-			<!-- <D type="density" value="2.7" unit="g/cm3" /> -->
-			<atom type="A" unit="g/mol" value="26.98" />
-		</element>
-		<element Z="56" formula="Ba" name="UT:Barium">
-			<D type="density" value="3.51" unit="g/cm3" />
-			<atom type="A" unit="g/mol" value="137.327" />
-		</element>
-		<material density="0.46*g/cm3" name="UT:EPDM">
-			<D type="density" unit="g/cm3" value="0.46" />
-			<composite n="5" ref="Carbon" />
-			<composite n="10" ref="Hydrogen" />
-		</material>
-		<material name="UT:Aluminium">
-			<D type="density" value="2.7" unit="g/cm3" />
-			<fraction n="1.000" ref="UT:AluminiumElement" />
-		</material>
-		<material name="UT:Steel">
-			<!-- Hangyi -->
-			<D type="density" unit="g/cm3" value="7.8" />
-			<fraction n="0.7" ref="Iron" />
-			<fraction n="0.1" ref="Carbon" />
-			<fraction n="0.2" ref="Copper" />
-		</material>
-		<material name="UT:Airex">
-			<D type="density" value="0.06" unit="g/cm3" />
-			<composite n="37" ref="Carbon" />
-			<composite n="24" ref="Hydrogen" />
-			<composite n="6" ref="Oxygen" />
-			<composite n="2" ref="Nitrogen" />
-		</material>
-		<material name="UT:Al2O3">
-			<D type="density" value="3.97" unit="g/cm3" />
-			<composite n="2" ref="UT:Aluminium" />
-			<composite n="3" ref="Oxygen" />
-		</material>
-		<material name="UT:AluminaTrihydrate">
-			<D type="density" value="2.42" unit="g/cm3" />
-			<composite n="1" ref="UT:Aluminium" />
-			<composite n="3" ref="Hydrogen" />
-			<composite n="3" ref="Oxygen" />
-		</material>
-		<material name="UT:AluminiumNitride">
-			<D type="density" value="3.30" unit="g/cm3" />
-			<composite n="1" ref="UT:Aluminium" />
-			<composite n="1" ref="Nitrogen" />
-		</material>
-		<material name="UT:BaTiO3">
-			<D type="density" value="6.02" unit="g/cm3" />
-			<composite n="1" ref="UT:Barium" />
-			<composite n="1" ref="Titanium" />
-			<composite n="3" ref="Oxygen" />
-		</material>
-		<material name="UT:BoronNitride">
-			<D type="density" value="2.29" unit="g/cm3" />
-			<composite n="1" ref="Boron" />
-			<composite n="1" ref="Nitrogen" />
-		</material>
-		<material name="UT:DiamondPowder">
-			<D type="density" value="3.51" unit="g/cm3" />
-			<composite n="1" ref="Carbon" />
-		</material>
-		<material name="UT:Glass">
-			<D type="density" value="2.46" unit="g/cm3" />
-			<composite n="1" ref="Silicon" />
-			<composite n="2" ref="Oxygen" />
-		</material>
-		<material name="UT:Kevlar">
-			<D type="density" value="1.44" unit="g/cm3" />
-			<composite n="2" ref="Nitrogen" />
-			<composite n="10" ref="Hydrogen" />
-			<composite n="14" ref="Carbon" />
-			<composite n="2" ref="Oxygen" />
-		</material>
-		<material name="UT:Polyethylene">
-			<D type="density" value="0.93" unit="g/cm3" />
-			<composite n="2" ref="Carbon" />
-			<composite n="4" ref="Hydrogen" />
-		</material>
-		<material name="UT:Polyurethane">
-			<D type="density" value="1.005" unit="g/cm3" />
-			<composite n="3" ref="Carbon" />
-			<composite n="8" ref="Hydrogen" />
-			<composite n="2" ref="Nitrogen" />
-			<composite n="1" ref="Oxygen" />
-		</material>
-		<material name="UT:PlugFoam">
-			<D type="density" value="0.2" unit="g/cm3" />
-			<fraction n="1.0000" ref="UT:Polyurethane" />
-		</material>
-		<!-- Ethylene Propylene Rubber -->
-		<material name="UT:EPR">
-			<D type="density" value="0.86" unit="g/cm3" />
-			<composite n="6" ref="Carbon" />
-			<composite n="10" ref="Hydrogen" />
-		</material>
-		<material name="UT:SilicaAerogel">
-			<D type="density" value="0.0898" unit="g/cm3" />
-			<composite n="1" ref="Silicon" />
-			<composite n="2" ref="Oxygen" />
-		</material>
-		<material name="UT:TitaniumDioxide">
-			<D type="density" value="4.23" unit="g/cm3" />
-			<composite n="1" ref="Titanium" />
-			<composite n="2" ref="Oxygen" />
-		</material>
-		<material name="UT:RohacellFoam">
-			<D type="density" value="0.051" unit="g/cm3" />
-			<fraction n="0.6084" ref="Carbon" />
-			<fraction n="0.2200" ref="Oxygen" />
-			<fraction n="0.0740" ref="Hydrogen" />
-			<fraction n="0.0960" ref="Nitrogen" />
-			<fraction n="0.0016" ref="Zinc" />
-		</material>
-		<material name="UT:AllcompK9Foam">
-			<D type="density" value="0.200" unit="g/cm3" />
-			<fraction n="1.0000" ref="Carbon" />
-		</material>
-		<!-- Mixtures -->
-		<material name="UT:Epoxy">
-			<D type="density" value="1.3" unit="g/cm3" />
-			<fraction n="0.07" ref="Hydrogen" />
-			<fraction n="0.76" ref="Carbon" />
-			<fraction n="0.17" ref="Oxygen" />
-		</material>
-		<!-- Kapton from wiki/Kapton -->
-		<material name="UT:Kapton">
-			<D type="density" value="1.43" unit="g/cm3" />
-			<composite n="22" ref="Carbon" />
-			<composite n="10" ref="Hydrogen" />
-			<composite n="2" ref="Nitrogen" />
-			<composite n="5" ref="Oxygen" />
-		</material>
-		<material name="UT:CarbonFiber">
-			<D type="density" value="1.72" unit="g/cm3" />
-			<composite n="6" ref="Hydrogen" />
-			<composite n="9" ref="Carbon" />
-			<composite n="2" ref="Oxygen" />
-			<composite n="3" ref="Nitrogen" />
-		</material>
-		<material name="UT:Traces">
-			<D type="density" value="9.023" unit="g/cm3" />
-			<fraction n="0.44" ref="Copper" />
-			<fraction n="0.02" ref="Gold" />
-			<fraction n="0.54" ref="Nickel" />
-		</material>
-		<material name="UT:WireBonds">
-			<D type="density" value="2.7" unit="g/cm3" />
-			<fraction n="1.0" ref="UT:Aluminium" />
-		</material>
-		<material name="UT:EthyleneAlcohol">
-			<D type="density" value="1.1132" unit="g/cm3" />
-			<composite n="6" ref="Hydrogen" />
-			<composite n="2" ref="Carbon" />
-			<composite n="2" ref="Oxygen" />
-		</material>
-		<material name="UT:CoolingFluid">
-			<D type="density" value="1.0684" unit="g/cm3" />
-			<fraction n="0.63" ref="UT:EthyleneAlcohol" />
-			<fraction n="0.37" ref="Water" />
-		</material>
-		<material name="UT:PyrogelXT">
-			<D type="density" value="0.18" unit="g/cm3" />
-			<fraction n="0.48" ref="UT:SilicaAerogel" />
-			<fraction n="0.48" ref="UT:Glass" />
-			<fraction n="0.02" ref="UT:TitaniumDioxide" />
-			<fraction n="0.02" ref="UT:AluminaTrihydrate" />
-		</material>
-		<material name="UT:HysolBN">
-			<D type="density" value="1.342" unit="g/cm3" />
-			<fraction n="0.7692" ref="UT:Epoxy" />
-			<fraction n="0.2308" ref="UT:BoronNitride" />
-		</material>
-		<material name="UT:BareStave">
-			<D type="density" value="0.3823" unit="g/cm3" />
-			<fraction n="0.0383" ref="UT:RohacellFoam" />
-			<fraction n="0.0801" ref="UT:AllcompK9Foam" />
-			<fraction n="0.4614" ref="UT:CarbonFiber" />
-			<fraction n="0.0588" ref="Titanium" />
-			<fraction n="0.0062" ref="UT:Epoxy" />
-			<fraction n="0.0453" ref="UT:CoolingFluid" />
-			<fraction n="0.3099" ref="UT:HysolBN" />
-		</material>
-		<material name="UT:BeamPipeJacket">
-			<D type="density" value="0.209" unit="g/cm3" />
-			<fraction n="0.1601" ref="UT:Kapton" />
-			<fraction n="0.8399" ref="UT:PyrogelXT" />
-		</material>
-		<material name="UT:PipeHeater">
-			<D type="density" value="1.703" unit="g/cm3" />
-			<fraction n="0.1909" ref="Copper" />
-			<fraction n="0.8091" ref="UT:Kapton" />
-		</material>
-		<material name="UT:HybridFlex8">
-			<D type="density" value="1.710" unit="g/cm3" />
-			<fraction n="0.5167" ref="UT:Kapton" />
-			<fraction n="0.4486" ref="Copper" />
-			<fraction n="0.0347" ref="UT:HysolBN" />
-		</material>
-		<material name="UT:EOSPigtail">
-			<D type="density" value="4.279" unit="g/cm3" />
-			<fraction n="0.9282" ref="UT:Steel" />
-			<fraction n="0.0718" ref="UT:HybridFlex8" />
-		</material>
-		<material name="UT:BoxWall">
-			<D type="density" value="0.1038" unit="g/cm3" />
-			<fraction n="0.3471" ref="UT:CarbonFiber" />
-			<fraction n="0.0607" ref="UT:Epoxy" />
-			<fraction n="0.0315" ref="UT:Aluminium" />
-			<fraction n="0.5607" ref="UT:Airex" />
-		</material>
-		<material name="UT:CFPrePreg">
-			<D type="density" value="1.460" unit="g/cm3" />
-			<fraction n="0.53" ref="Carbon" />
-			<fraction n="0.47" ref="UT:Epoxy" />
-		</material>
-		<material name="UT:Resistor">
-			<D type="density" value="4.2768" unit="g/cm3" />
-			<fraction n="0.86" ref="UT:Al2O3" />
-			<fraction n="0.08" ref="Nickel" />
-			<fraction n="0.06" ref="Tin" />
-		</material>
-		<material name="UT:Capacitor">
-			<D type="density" value="6.2480" unit="g/cm3" />
-			<fraction n="0.86" ref="UT:BaTiO3" />
-			<fraction n="0.08" ref="Nickel" />
-			<fraction n="0.06" ref="Tin" />
-		</material>
-		<material name="UT:Dcdc">
-			<D type="density" value="7.4825" unit="g/cm3" />
-			<fraction n="0.0026" ref="Silicon" />
-			<fraction n="0.5186" ref="Gold" />
-			<fraction n="0.2672" ref="UT:Polyethylene" />
-			<fraction n="0.0017" ref="UT:Resistor" />
-			<fraction n="0.2099" ref="UT:Capacitor" />
-		</material>
-		<material name="UT:FlexCable">
-			<D type="density" value="1.8092" unit="g/cm3" />
-			<fraction n="0.5751" ref="UT:Kapton" />
-			<fraction n="0.2681" ref="Copper" />
-			<fraction n="0.1568" ref="UT:HysolBN" />
-		</material>
-		<material name="UT:HybridFilm">
-			<D type="density" value="3.912" unit="g/cm3" />
-			<fraction n="0.5731" ref="UT:Glass" />
-			<fraction n="0.4269" ref="Gold" />
-			<fraction n="0.0000" ref="UT:Epoxy" />
-		</material>
-		<material name="UT:HybridFlex4">
-			<D type="density" value="1.710" unit="g/cm3" />
-			<fraction n="0.7410" ref="UT:Kapton" />
-			<fraction n="0.2243" ref="Copper" />
-			<fraction n="0.0347" ref="UT:HysolBN" />
-		</material>
-		<material name="UT:BoxPlug">
-			<D type="density" value="0.86" unit="g/cm3" />
-			<fraction n="0.9999" ref="UT:EPR" />
-			<fraction n="0.0001" ref="UT:Epoxy" />
-		</material>
-		<material name="UT:HybridTim">
-			<D type="density" value="1.100" unit="g/cm3" />
-			<fraction n="1.0000" ref="UT:Epoxy" />
-		</material>
-		<material name="UT:HysolDia">
-			<D type="density" value="1.310" unit="g/cm3" />
-			<fraction n="0.7692" ref="UT:Epoxy" />
-			<fraction n="0.2308" ref="UT:DiamondPowder" />
-		</material>
-		<material name="UT:SilverEpoxy">
-			<D type="density" value="3.200" unit="g/cm3" />
-			<fraction n="0.9434" ref="UT:Epoxy" />
-			<fraction n="0.0566" ref="Silver" />
-		</material>
-		<material name="UT:Asic">
-			<D type="density" value="2.404" unit="g/cm3" />
-			<fraction n="0.9351" ref="Silicon" />
-			<fraction n="0.0360" ref="Copper" />
-			<fraction n="0.0289" ref="UT:Aluminium" />
-		</material>
-		<material name="UT:UTAsic">
-			<D type="density" value="2.5935" unit="g/cm3" />
-			<fraction n="0.7062" ref="UT:Asic" />
-			<fraction n="0.2938" ref="UT:SilverEpoxy" />
-		</material>
-	</materials>
-	<display>
-		<vis name="DEBUG:RED" alpha="0.5" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true" />
-		<vis name="DEBUG:GREEN" alpha="0.5" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true" />
-		<vis name="DEBUG:BLUE" alpha="0.5" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true" />
-		<vis name="UT:Envelope" alpha="0.0" r="0.5" g="0.5" b="0.5" showDaughters="true" visible="false" />
-		<vis name="UT:Invisible" alpha="0.0" r="1.0" g="1.0" b="1.0" showDaughters="false" visiable="false" />
-		<vis name="UT:Box" alpha="0.1" r="0.95" g="0.95" b="0.95" showDaughters="true" visible="true" />
-		<vis name="UT:Airex" alpha="1.0" r="0.11" g="0.28" b="0.41" showDaughters="false" visible="true" />
-		<vis name="UT:Connector" alpha="1.0" r="0.93" g="0.91" b="0.91" showDaughters="false" visible="true" />
-		<vis name="UT:EPDM" alpha="1.0" r="0.75" g="0.75" b="0.90" showDaughters="false" visible="true" />
-		<vis name="UT:HalfMoon" alpha="1.0" r="0.45" g="0.56" b="0.69" showDaughters="false" visible="true" />
-		<vis name="UT:PipeHeater" alpha="1.0" r="0.36" g="0.79" b="0.79" showDaughters="false" visible="true" />
-		<!-- Silver -->
-		<vis name="UT:Frame" alpha="1.0" r="0.33" g="0.18" b="0.25" showDaughters="true" visible="true" />
-		<vis name="UT:EOS" alpha="1.0" r="0.33" g="0.18" b="0.25" showDaughters="false" visible="true" />
-		<vis name="UT:Jacket" alpha="1.0" r="0.5" g="0.5" b="0.5" showDaughters="true" visible="true" />
-		<vis name="UT:KaptonCable" alpha="1.0" r="0.16" g="0.39" b="0.61" showDaughters="false" visible="true" />
-		<vis name="UT:BareStave" alpha="1.0" r="0.04" g="0.24" b="0.43" showDaughters="false" visible="true" />
-		<vis name="UT:HybridFlex" alpha="1.0" r="0.63" g="0.38" b="0.47" showDaughters="true" visible="true" />
-		<vis name="UT:Asic" alpha="1.0" r="0.71" g="0.74" b="0.76" showDaughters="false" visible="true" />
-		<vis name="UT:Stiffener" alpha="1.0" r="0.58" g="0.74" b="0.88" showDaughters="false" visible="true" />
-		<vis name="UT:Sensor" alpha="1.0" r="0.25" g="0.6" b="0.8" showDaughters="true" visible="true" />
-		<!-- High constrast palette -->
-		<!-- <vis name="UT:BareStave" alpha="1.0" r="0.0" g="0.50" b="0.0" showDaughters="false" visible="true"/> -->
-		<!-- <vis name="UT:HybridFlex" alpha="1.0" r="1.0" g="1.0" b="0.0" showDaughters="true" visible="true"/> -->
-		<!-- <vis name="UT:Asic" alpha="1.0" r="1.0" g="0.0" b="0.0" showDaughters="false" visible="true"/> -->
-		<!-- <vis name="UT:Stiffener" alpha="0.8" r="0.86" g="0.85" b="0.80" showDaughters="false" visible="true"/> -->
-		<!-- <vis name="UT:Sensor" alpha="1.0" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/> -->
-	</display>
-</lccdd>
-- 
GitLab


From c0a3584c892e14810bb5e5c2ac881988c30af30b Mon Sep 17 00:00:00 2001
From: Menglin Xu <mexu@cern.ch>
Date: Sat, 15 Mar 2025 13:45:07 +0100
Subject: [PATCH 8/8] change the version of UT, SMOG2 and Pipe after MR 688

---
 compact/run3/2025-v00.00/path.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compact/run3/2025-v00.00/path.xml b/compact/run3/2025-v00.00/path.xml
index e28756fc2..5c3b6b08d 100644
--- a/compact/run3/2025-v00.00/path.xml
+++ b/compact/run3/2025-v00.00/path.xml
@@ -13,11 +13,11 @@
     <constant name="path:BlockWall" value="../../components/BlockWall/2024-v00.00" type="string"/>
     <constant name="path:Bcm" value="../../components/Bcm/2024-v00.00" type="string"/>
     <constant name="path:MBXW" value="../../components/MBXW/2024-v00.00" type="string"/>
-    <constant name="path:Pipe" value="../../components/Pipe/2025-v00.00" type="string"/>
+    <constant name="path:Pipe" value="../../components/Pipe/2024-v00.01" type="string"/>
     <constant name="path:Rich" value="../../components/Rich/2025-v00.00" type="string"/>
-    <constant name="path:SMOG2" value="../../components/SMOG2/2025-v00.00" type="string"/>
+    <constant name="path:SMOG2" value="../../components/SMOG2/2024-v00.00" type="string"/>
     <constant name="path:VP" value="../../components/VP/2025-v00.00" type="string"/>
-    <constant name="path:UT" value="../../components/UT/2025-v00.00" type="string"/>
+    <constant name="path:UT" value="../../components/UT/2024-v00.01" type="string"/>
     <constant name="path:Magnet" value="../../components/Magnet/2024-v00.00" type="string"/>
     <constant name="path:FT" value="../../components/FT/2024-v00.00" type="string"/>
     <constant name="path:NeutronShielding" value="../../components/NeutronShielding/2024-v00.00" type="string"/>
-- 
GitLab