From f4a4a83bb646befcff446bcb7e27fc7c4f002460 Mon Sep 17 00:00:00 2001
From: Menglin Xu <menglin.xu@cern.ch>
Date: Mon, 16 Jun 2025 06:29:54 +0000
Subject: [PATCH 1/2] Merge branch 'ut/bp-interface' into 'lcg-105-compat'

Update UT beampipe interface + Fix Type B sensor thickness

See merge request lhcb/Detector!516
---
 Detector/UT/src/UT_geo.cpp                    |   9 +-
 .../components/Pipe/trunk/Magnet-UX851.xml    |  10 -
 .../components/Regions/2024-v00.01/INFO.md    |   1 +
 .../Regions/2024-v00.01/Regions-invisible.xml |  15 +
 .../Regions/2024-v00.01/Regions.xml           |  15 +
 .../Regions/2024-v00.01/detector.xml          |  94 +++
 .../Regions/2024-v00.01/parameters.xml        |  87 ++
 .../2024-v00.01/visualization-invisible.xml   |  27 +
 .../Regions/2024-v00.01/visualization.xml     |  27 +
 compact/components/Regions/trunk/detector.xml |  18 +-
 .../components/Regions/trunk/parameters.xml   |   2 +
 compact/components/UT/2024-v00.02/INFO.md     |   7 +
 compact/components/UT/2024-v00.02/Module.xml  | 311 +++++++
 compact/components/UT/2024-v00.02/Sensor.xml  | 128 +++
 compact/components/UT/2024-v00.02/Stave.xml   | 208 +++++
 compact/components/UT/2024-v00.02/UT.xml      |  16 +
 compact/components/UT/2024-v00.02/UTBox.xml   | 245 ++++++
 compact/components/UT/2024-v00.02/UTHalf.xml  |  14 +
 .../components/UT/2024-v00.02/UTaULayer.xml   |  41 +
 .../components/UT/2024-v00.02/UTaXLayer.xml   |  41 +
 .../components/UT/2024-v00.02/UTbVLayer.xml   |  41 +
 .../components/UT/2024-v00.02/UTbXLayer.xml   |  42 +
 .../components/UT/2024-v00.02/conditions.xml  |  69 ++
 .../components/UT/2024-v00.02/detector.xml    |  62 ++
 .../components/UT/2024-v00.02/parameters.xml  | 759 ++++++++++++++++++
 compact/components/UT/trunk/UTBox.xml         | 210 +++--
 compact/components/UT/trunk/parameters.xml    | 154 ++--
 27 files changed, 2525 insertions(+), 128 deletions(-)
 create mode 100644 compact/components/Regions/2024-v00.01/INFO.md
 create mode 100644 compact/components/Regions/2024-v00.01/Regions-invisible.xml
 create mode 100644 compact/components/Regions/2024-v00.01/Regions.xml
 create mode 100644 compact/components/Regions/2024-v00.01/detector.xml
 create mode 100644 compact/components/Regions/2024-v00.01/parameters.xml
 create mode 100644 compact/components/Regions/2024-v00.01/visualization-invisible.xml
 create mode 100644 compact/components/Regions/2024-v00.01/visualization.xml
 create mode 100644 compact/components/UT/2024-v00.02/INFO.md
 create mode 100644 compact/components/UT/2024-v00.02/Module.xml
 create mode 100644 compact/components/UT/2024-v00.02/Sensor.xml
 create mode 100644 compact/components/UT/2024-v00.02/Stave.xml
 create mode 100644 compact/components/UT/2024-v00.02/UT.xml
 create mode 100644 compact/components/UT/2024-v00.02/UTBox.xml
 create mode 100644 compact/components/UT/2024-v00.02/UTHalf.xml
 create mode 100644 compact/components/UT/2024-v00.02/UTaULayer.xml
 create mode 100644 compact/components/UT/2024-v00.02/UTaXLayer.xml
 create mode 100644 compact/components/UT/2024-v00.02/UTbVLayer.xml
 create mode 100644 compact/components/UT/2024-v00.02/UTbXLayer.xml
 create mode 100644 compact/components/UT/2024-v00.02/conditions.xml
 create mode 100644 compact/components/UT/2024-v00.02/detector.xml
 create mode 100644 compact/components/UT/2024-v00.02/parameters.xml

diff --git a/Detector/UT/src/UT_geo.cpp b/Detector/UT/src/UT_geo.cpp
index 1b1e0fa859..952ea42684 100644
--- a/Detector/UT/src/UT_geo.cpp
+++ b/Detector/UT/src/UT_geo.cpp
@@ -1236,8 +1236,13 @@ namespace {
       }
     }
     if ( m_build_jacket ) {
-      pv = lvUT.placeVolume( volume( "lvUTJacket" ),
-                             Position( 0, 0, _toDouble( "UX851Rich1TTSplitZposIP-UTSystemZ" ) ) );
+      try {
+        pv = lvUT.placeVolume( volume( "lvUTJacket" ), Position( 0, 0, _toDouble( "UTJacketZPos" ) ) );
+      } catch ( std::runtime_error& e ) {
+        // In geometry_version < 2024-v00.02, UTJacketZPos was not defined
+        pv = lvUT.placeVolume( volume( "lvUTJacket" ),
+                               Position( 0, 0, _toDouble( "UX851Rich1TTSplitZposIP-UTSystemZ" ) ) );
+      }
     }
     if ( m_build_pipeheater ) { pv = lvUT.placeVolume( volume( "lvUTPipeHeater" ) ); }
     // registerVolume( lvUT.name(), lvUT );
diff --git a/compact/components/Pipe/trunk/Magnet-UX851.xml b/compact/components/Pipe/trunk/Magnet-UX851.xml
index ce2d80526c..6c14df488c 100644
--- a/compact/components/Pipe/trunk/Magnet-UX851.xml
+++ b/compact/components/Pipe/trunk/Magnet-UX851.xml
@@ -33,13 +33,6 @@
 
   <!-- 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"
@@ -89,9 +82,6 @@
   </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"/>
diff --git a/compact/components/Regions/2024-v00.01/INFO.md b/compact/components/Regions/2024-v00.01/INFO.md
new file mode 100644
index 0000000000..05c1cbd1f0
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/INFO.md
@@ -0,0 +1 @@
+In order to update UT beampipe interface which was implemented in EYETS 2023-2024, the lvMagnetRegion is modified to cut out a tube from its original box shape to avoid overlapping with protruding UT beampipe interface.
diff --git a/compact/components/Regions/2024-v00.01/Regions-invisible.xml b/compact/components/Regions/2024-v00.01/Regions-invisible.xml
new file mode 100644
index 0000000000..38acca7c40
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/Regions-invisible.xml
@@ -0,0 +1,15 @@
+<!--
+    (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="visualization-invisible.xml"/>
+    <include ref="detector.xml"/>
+</lccdd>
diff --git a/compact/components/Regions/2024-v00.01/Regions.xml b/compact/components/Regions/2024-v00.01/Regions.xml
new file mode 100644
index 0000000000..2c5397a6a5
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/Regions.xml
@@ -0,0 +1,15 @@
+<!--
+    (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="visualization.xml"/>
+    <include ref="detector.xml"/>
+</lccdd>
diff --git a/compact/components/Regions/2024-v00.01/detector.xml b/compact/components/Regions/2024-v00.01/detector.xml
new file mode 100644
index 0000000000..331929ee67
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/detector.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 LHCb detector region definitions                    -->
+<!-- ========================================================================== -->
+<lccdd>
+  <detectors>
+
+    <detector name="UpstreamRegion" type="DD4hep_VolumeAssembly" parent="/world" ignore="UpstreamRegion:ignore" vis="Regions:Upstream">
+      <envelope name="lvUpstreamRegion" type="Box" material="Air" vis="Regions:Upstream"
+                dx="Regions:UpstreamXSize/2" dy="Regions:UpstreamYSize/2" dz="Regions:UpstreamZSize/2"/>
+      <position x="0*cm" y="0*cm" z="Regions:UpstreamZPos"/>
+    </detector>
+
+    <detector name="BeforeMagnetRegion" type="DD4hep_VolumeAssembly" parent="/world" ignore="BeforeMagnetRegion:ignore" vis="Regions:BeforeMagnet">
+      <envelope name="lvBeforeMagnetRegion" material="Air">
+			  <shape name="shape-BeforeMagnetRegion" type="BooleanShape" operation="union">
+          <shape name="shape-BeforeMagnetRegion-Box" type="Box"
+                 dx="Regions:BeforeMagnetXSize/2" dy="Regions:BeforeMagnetYSize/2" dz="Regions:BeforeMagnetZSize/2"/>
+          <shape name="shape-BeforeMagnetRegion-Tube" type="Tube"
+                  dz="Regions:BeforeMagnetUTPlugZSize/2" rmax="Regions:BeforeMagnetUTPlugRadius"/>
+          <position z="(Regions:BeforeMagnetZSize+Regions:BeforeMagnetUTPlugZSize)/2"/>
+        </shape>
+      </envelope>
+      <position x="0*cm" y="0*cm" z="Regions:BeforeMagnetZPos"/>
+      <volume name="lvBeforeVelo" material="Air" vis="Regions:BeforeVelo">
+        <shape type="Box" dx="Regions:BeforeVeloXSize/2" dy="Regions:BeforeVeloYSize/2" dz="Regions:BeforeVeloZSize/2"/>
+      </volume>
+      <physvol element="BeforeVelo" volume="lvBeforeVelo">
+        <position x="0*mm" y="0*mm" z="-1792.5*mm"/>
+      </physvol>
+    </detector>
+
+    <detector name="MagnetRegion" type="DD4hep_VolumeAssembly" parent="/world" ignore="MagnetRegion:ignore" vis="Regions:Magnet">
+      <envelope name="lvMagnetRegion" type="Box" material="Air">
+			  <shape name="shape-MagnetRegion" type="BooleanShape" operation="subtraction">
+          <shape type="Box" name="shape-MagnetRegion-Box" dx="Regions:MagnetRegionXSize/2" dy="Regions:MagnetRegionYSize/2" dz="Regions:MagnetRegionZSize/2"/>
+          <shape type="Tube" name="shape-MagnetRegion-Tube" dz="Regions:BeforeMagnetUTPlugZSize/2" rmax="Regions:BeforeMagnetUTPlugRadius"/>
+          <position z="(-Regions:MagnetRegionZSize+Regions:BeforeMagnetUTPlugZSize)/2"/>
+        </shape>
+      </envelope>
+      <position x="0*cm" y="0*cm" z="Regions:MagnetRegionZPos"/>
+    </detector>
+
+    <detector name="AfterMagnetRegion" type="DD4hep_VolumeAssembly" parent="/world" ignore="AfterMagnetRegion:ignore" vis="Regions:AfterMagnet">
+      <volume name="lvT" material="Air" vis="Regions:T">
+        <shape type="BooleanShape" operation="subtraction" name="Tsolid">
+          <shape type="Box" name="TBox"
+                 dx="Regions:TTMSizeX/2" dy="Regions:TTMSizeY/2" dz="Regions:TTMSizeZ/2"/>
+          <shape type="Box" name="TShave"
+                 dx="Regions:TTMSizeX/2+Regions:Teps" dy="Regions:TTMSizeY/2+Regions:Teps" dz="20*mm/2"/>
+          <position y="-Regions:TBeamHoleRadius" z="0.5*(Regions:TTMSizeZ+20*mm)"/>
+          <rotation x="Regions:TBeamAngle"/>
+        </shape>
+      </volume>
+      <physvol element="T" volume="lvT">
+        <position x="0*mm" y="0*mm" z="Regions:TZPosInAfterMagnet"/>
+      </physvol>
+      <envelope name="lvAfterMagnetRegion" type="Box" material="Air"
+                dx="Regions:AfterMagnetXSize/2" dy="Regions:AfterMagnetYSize/2" dz="Regions:AfterMagnetZSize/2"/>
+      <position x="0*cm" y="0*cm" z="Regions:AfterMagnetZPos"/>
+    </detector>
+
+    <detector name="DownstreamRegion" type="DD4hep_VolumeAssembly" parent="/world" ignore="DownstreamRegion:ignore" vis="Regions:Downstream">
+      <volume name="lvAfterMuon" material="Air" vis="Regions:AfterMuon">
+        <shape name="shape-AfterMuon" type="BooleanShape" operation="union">
+          <shape type="Box" name="shape-AfterMuonBox1"
+                 dx="Regions:AfterMuonMainXSize/2" dy="Regions:AfterMuonMainYSize/2" dz="Regions:AfterMuonMainZSize/2"/>
+          <shape type="Box" name="shape-AfterMuonBox2"
+                 dx="Regions:AfterMuonHoleXSize/2" dy="Regions:AfterMuonHoleYSize/2" dz="Regions:AfterMuonHoleZSize"/>
+          <position z="-Regions:AfterMuonMainZSize/2"/>
+        </shape>
+      </volume>
+      <physvol element="AfterMuon" volume="lvAfterMuon">
+        <position x="0*mm" y="0*mm" z="19730.0*mm + 2000.0*mm/2 + 500.0*mm - Regions:DownstreamZPos"/>
+      </physvol>
+
+      <envelope name="lvDownstreamRegion" material="Air">
+        <shape name="shape-DownstreamRegion" type="Box"
+               dx="Regions:DownstreamXSize/2" dy="Regions:DownstreamYSize/2" dz="Regions:DownstreamZSize/2"/>
+      </envelope>
+      <position x="0*cm" y="0*cm" z="Regions:DownstreamZPos"/>
+    </detector>
+
+  </detectors>
+</lccdd>
diff --git a/compact/components/Regions/2024-v00.01/parameters.xml b/compact/components/Regions/2024-v00.01/parameters.xml
new file mode 100644
index 0000000000..f84335711d
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/parameters.xml
@@ -0,0 +1,87 @@
+<!-- ========================================================================== -->
+<!--  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 LHCb detector region parameters                     -->
+<!-- ========================================================================== -->
+<lccdd>
+
+  <define>
+    <!-- Upstream parameters -->
+    <constant name="Regions:UpstreamXSize" value="20000*mm" />
+    <constant name="Regions:UpstreamYSize" value="20000*mm" />
+    <!-- UpstreamZSize = 22700 mm - 2700 mm-->
+    <constant name="Regions:UpstreamZSize" value="20000*mm" />
+
+    <!-- BeforeMagnet parameters -->
+    <constant name="Regions:BeforeMagnetXSize" value="20000*mm" />
+    <constant name="Regions:BeforeMagnetYSize" value="20000*mm" />
+    <!-- BeforeMagnetZSize = 2700 mm + 2700 mm -->
+    <constant name="Regions:BeforeMagnetZSize" value="5400*mm" />
+    <constant name="Regions:BeforeMagnetUTPlugZSize" value="42*mm" />
+    <constant name="Regions:BeforeMagnetUTPlugRadius" value="82.5*mm" />
+
+    <!-- Magnet parameters -->
+    <constant name="Regions:MagnetRegionXSize" value="20000*mm" />
+    <constant name="Regions:MagnetRegionYSize" value="20000*mm" />
+    <!-- MagnetZSize = 7620 mm - 2700 mm -->
+    <constant name="Regions:MagnetRegionZSize" value="4920*mm" />
+    <constant name="Regions:MagnetRegionZPos"  value="0.5*(Regions:BeforeMagnetZSize+Regions:MagnetRegionZSize)" />
+
+    <!-- AfterMagnet parameters -->
+    <constant name="Regions:AfterMagnetXSize"  value="20000*mm" />
+    <constant name="Regions:AfterMagnetYSize"  value="20000*mm" />
+    <!-- IT1 starts at 7620mm = 7628mm - 8mm (=3950*4mrad) -->
+    <!-- AfterMagnetZSize = 11900 mm - 7620 mm -->
+    <constant name="Regions:AfterMagnetZSize"  value="4280*mm" />
+    <constant name="Regions:AfterMagnetZPos"
+              value="Regions:MagnetRegionZSize+0.5*(Regions:BeforeMagnetZSize+Regions:AfterMagnetZSize)"/>
+
+    <!--sub-region of the AftermagnetRegion-->
+    <constant name="Regions:TZPos"  value="8529.5*mm"/>
+    <constant name="Regions:TZStart"         value="7620*mm" />
+    <constant name="Regions:TZEnd"           value="9439*mm" />
+    <constant name="Regions:TTMSizeX"        value="8325.*mm" />
+    <constant name="Regions:TTMSizeY"        value="6285.*mm" />
+    <constant name="Regions:TTMSizeZ"        value="Regions:TZEnd - Regions:TZStart" />
+    <constant name="Regions:TBeamHoleRadius" value="105.0*mm" />
+    <constant name="Regions:TBeamAngle"      value="3.601*mrad" />
+    <constant name="Regions:Teps"            value="float:epsilon"/>
+    <constant name="Regions:TZPosInAfterMagnet" value="Regions:TZPos - Regions:AfterMagnetZPos" />
+
+    <!-- DownStream parameters -->
+    <constant name="Regions:DownstreamXSize" value="20000*mm" />
+    <constant name="Regions:DownstreamYSize" value="20000*mm" />
+    <!-- AfterMagnetZSize = 22900 mm - 11900 mm -->
+    <constant name="Regions:DownstreamZSize" value="8000*mm" />
+
+    <!-- Z_center coordinates of the regions -->
+    <constant name="Regions:UpstreamZPos"
+	   value="-.5*(Regions:UpstreamZSize+Regions:BeforeMagnetZSize)" />
+
+    <!-- BeforeMagnet region is centered about the LHCb origin -->
+    <constant name="Regions:BeforeMagnetZPos" value="0" />
+    <constant name="Regions:DownstreamZPos"
+              value="Regions:MagnetRegionZSize+Regions:AfterMagnetZSize+.5*(Regions:BeforeMagnetZSize+Regions:DownstreamZSize)" />
+
+    <constant name="Regions:BeforeVeloXSize" value="3100*mm"/>
+    <constant name="Regions:BeforeVeloYSize" value="3100*mm"/>
+    <constant name="Regions:BeforeVeloZSize" value="1815*mm"/>
+
+    <constant name="Regions:AfterMuonMainXSize" value="2000*mm" />
+    <constant name="Regions:AfterMuonMainYSize" value="2000*mm" />
+    <constant name="Regions:AfterMuonMainZSize" value="2000*mm" />
+    <constant name="Regions:AfterMuonHoleXSize" value="499*mm" />
+    <constant name="Regions:AfterMuonHoleYSize" value="550*mm" />
+    <constant name="Regions:AfterMuonHoleZSize" value="500*mm" />
+
+  </define>
+
+</lccdd>
diff --git a/compact/components/Regions/2024-v00.01/visualization-invisible.xml b/compact/components/Regions/2024-v00.01/visualization-invisible.xml
new file mode 100644
index 0000000000..46bcfc9511
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/visualization-invisible.xml
@@ -0,0 +1,27 @@
+<!-- ========================================================================== -->
+<!--  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 LHCb detector region parameters                     -->
+<!-- ========================================================================== -->
+<lccdd>
+
+  <display>
+    <vis name="Regions:Upstream"     alpha="0.1" r="0.1" g="1.0" b="0.0" showDaughters="true" visible="false"/>
+    <vis name="Regions:BeforeMagnet" alpha="0.2" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="false"/>
+    <vis name="Regions:BeforeVelo"   alpha="0.2" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="false"/>
+    <vis name="Regions:Magnet"       alpha="0.2" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="false"/>
+    <vis name="Regions:AfterMagnet"  alpha="0.2" r="1.0" g="1.0" b="0.0" showDaughters="true" visible="false"/>
+    <vis name="Regions:T"            alpha="0.2" r="0.7" g="1.0" b="0.0" showDaughters="true" visible="false"/>
+    <vis name="Regions:Downstream"   alpha="0.2" r="1.0" g="0.0" b="1.0" showDaughters="true" visible="false"/>
+    <vis name="Regions:AfterMuon"    alpha="0.2" r="1.0" g="0.6" b="0.0" showDaughters="true" visible="false"/>
+  </display>
+
+</lccdd>
diff --git a/compact/components/Regions/2024-v00.01/visualization.xml b/compact/components/Regions/2024-v00.01/visualization.xml
new file mode 100644
index 0000000000..127a106841
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/visualization.xml
@@ -0,0 +1,27 @@
+<!-- ========================================================================== -->
+<!--  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 LHCb detector region parameters                     -->
+<!-- ========================================================================== -->
+<lccdd>
+
+  <display>
+    <vis name="Regions:Upstream"     alpha="0.1" r="0.1" g="1.0" b="0.0" showDaughters="true" visible="true"/>
+    <vis name="Regions:BeforeMagnet" alpha="0.2" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
+    <vis name="Regions:BeforeVelo"   alpha="0.2" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
+    <vis name="Regions:Magnet"       alpha="0.2" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
+    <vis name="Regions:AfterMagnet"  alpha="0.2" r="1.0" g="1.0" b="0.0" showDaughters="true" visible="true"/>
+    <vis name="Regions:T"            alpha="0.2" r="0.7" g="1.0" b="0.0" showDaughters="true" visible="true"/>
+    <vis name="Regions:Downstream"   alpha="0.2" r="1.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
+    <vis name="Regions:AfterMuon"    alpha="0.2" r="1.0" g="0.6" b="0.0" showDaughters="true" visible="true"/>
+  </display>
+
+</lccdd>
diff --git a/compact/components/Regions/trunk/detector.xml b/compact/components/Regions/trunk/detector.xml
index 58109b1eb8..331929ee67 100644
--- a/compact/components/Regions/trunk/detector.xml
+++ b/compact/components/Regions/trunk/detector.xml
@@ -22,8 +22,13 @@
 
     <detector name="BeforeMagnetRegion" type="DD4hep_VolumeAssembly" parent="/world" ignore="BeforeMagnetRegion:ignore" vis="Regions:BeforeMagnet">
       <envelope name="lvBeforeMagnetRegion" material="Air">
-        <shape name="shape-BeforeMagnetRegion" type="Box"
-               dx="Regions:BeforeMagnetXSize/2" dy="Regions:BeforeMagnetYSize/2" dz="Regions:BeforeMagnetZSize/2"/>
+			  <shape name="shape-BeforeMagnetRegion" type="BooleanShape" operation="union">
+          <shape name="shape-BeforeMagnetRegion-Box" type="Box"
+                 dx="Regions:BeforeMagnetXSize/2" dy="Regions:BeforeMagnetYSize/2" dz="Regions:BeforeMagnetZSize/2"/>
+          <shape name="shape-BeforeMagnetRegion-Tube" type="Tube"
+                  dz="Regions:BeforeMagnetUTPlugZSize/2" rmax="Regions:BeforeMagnetUTPlugRadius"/>
+          <position z="(Regions:BeforeMagnetZSize+Regions:BeforeMagnetUTPlugZSize)/2"/>
+        </shape>
       </envelope>
       <position x="0*cm" y="0*cm" z="Regions:BeforeMagnetZPos"/>
       <volume name="lvBeforeVelo" material="Air" vis="Regions:BeforeVelo">
@@ -35,8 +40,13 @@
     </detector>
 
     <detector name="MagnetRegion" type="DD4hep_VolumeAssembly" parent="/world" ignore="MagnetRegion:ignore" vis="Regions:Magnet">
-      <envelope name="lvMagnetRegion" type="Box" material="Air"
-                dx="Regions:MagnetRegionXSize/2" dy="Regions:MagnetRegionYSize/2" dz="Regions:MagnetRegionZSize/2"/>
+      <envelope name="lvMagnetRegion" type="Box" material="Air">
+			  <shape name="shape-MagnetRegion" type="BooleanShape" operation="subtraction">
+          <shape type="Box" name="shape-MagnetRegion-Box" dx="Regions:MagnetRegionXSize/2" dy="Regions:MagnetRegionYSize/2" dz="Regions:MagnetRegionZSize/2"/>
+          <shape type="Tube" name="shape-MagnetRegion-Tube" dz="Regions:BeforeMagnetUTPlugZSize/2" rmax="Regions:BeforeMagnetUTPlugRadius"/>
+          <position z="(-Regions:MagnetRegionZSize+Regions:BeforeMagnetUTPlugZSize)/2"/>
+        </shape>
+      </envelope>
       <position x="0*cm" y="0*cm" z="Regions:MagnetRegionZPos"/>
     </detector>
 
diff --git a/compact/components/Regions/trunk/parameters.xml b/compact/components/Regions/trunk/parameters.xml
index 7cb7ed9f65..f84335711d 100644
--- a/compact/components/Regions/trunk/parameters.xml
+++ b/compact/components/Regions/trunk/parameters.xml
@@ -25,6 +25,8 @@
     <constant name="Regions:BeforeMagnetYSize" value="20000*mm" />
     <!-- BeforeMagnetZSize = 2700 mm + 2700 mm -->
     <constant name="Regions:BeforeMagnetZSize" value="5400*mm" />
+    <constant name="Regions:BeforeMagnetUTPlugZSize" value="42*mm" />
+    <constant name="Regions:BeforeMagnetUTPlugRadius" value="82.5*mm" />
 
     <!-- Magnet parameters -->
     <constant name="Regions:MagnetRegionXSize" value="20000*mm" />
diff --git a/compact/components/UT/2024-v00.02/INFO.md b/compact/components/UT/2024-v00.02/INFO.md
new file mode 100644
index 0000000000..120b8d852d
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/INFO.md
@@ -0,0 +1,7 @@
+Update UT-beam pipe interface in the following aspects
+
+
+- Components 2,3,4 as illustrated in EDMS document: https://edms.cern.ch/document/2863462. Installed during YETS22-23, but some of them were not included in the geometry until this MR.
+- 16-cm long x 5mm thick pyrogel around the beam pipe in the middle of UT. Installed during YETS23-24.
+- The degisn of Airex ring (a.k.a. UT beam pipe collar) and HalfMoons are changed from https://edms.cern.ch/document/2797582 (design in YETS22-23) to https://edms.cern.ch/document/3061946 and https://edms.cern.ch/document/3062195 (design in YETS23-24)
+- Change in Type B sensor thickness corresponds to https://gitlab.cern.ch/lhcb-conddb/DDDB/-/merge_requests/160
diff --git a/compact/components/UT/2024-v00.02/Module.xml b/compact/components/UT/2024-v00.02/Module.xml
new file mode 100644
index 0000000000..e970a91150
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/Sensor.xml b/compact/components/UT/2024-v00.02/Sensor.xml
new file mode 100644
index 0000000000..0edf7f602a
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/Stave.xml b/compact/components/UT/2024-v00.02/Stave.xml
new file mode 100644
index 0000000000..7bf12c7865
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/UT.xml b/compact/components/UT/2024-v00.02/UT.xml
new file mode 100644
index 0000000000..f17fdeeb61
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/UTBox.xml b/compact/components/UT/2024-v00.02/UTBox.xml
new file mode 100644
index 0000000000..66eec6aa87
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/UTBox.xml
@@ -0,0 +1,245 @@
+<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 -->
+	<!-- Airex -->
+	<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="lvUTBoxPipeAirexRingOuter">
+		<shape dz="UTBoxPipeAirexRingOuterThick/2" name="utBoxPipeAirexRingOuter" rmax="UTBoxPipeAirexRingOuterOR" rmin="UTBoxPipeAirexRingIR" type="Tube" />
+	</volume>
+	<volume name="lvUTBoxPipeAirexRing">
+		<physvol name="pvUTBoxPipeAirexRingInner" volume="lvUTBoxPipeAirexRingInner">
+			<position z="-UTEpsilon-0.5*UTBoxPipeAirexRingInnerThick" />
+		</physvol>
+		<physvol name="pvUTBoxPipeAirexRingOuter" volume="lvUTBoxPipeAirexRingOuter">
+			<position z="-UTEpsilon+0.5*UTBoxPipeAirexRingOuterThick" />
+		</physvol>
+	</volume>
+	<!-- HalfMoon -->
+	<!-- Carbon fiber part -->
+	<volume vis="UT:HalfMoon" material="UT:CarbonFiber" name="lvUTHalfMoonCarbonFiber">
+			<shape type="BooleanShape" operation="subtraction" name="utHalfMoonCarbonFiber">
+				<shape type="Tube" dz="UTHalfMoonCarbonFiberThick/2" name="utHalfMoonCarbonFiberMain" rmax="UTHalfMoonOR" rmin="UTHalfMoonMR" />
+				<shape type="Box" dz="UTHalfMoonCarbonFiberThick" name="utHalfMoonCarbonFiberSub" dx="UTHalfMoonMR-UTHalfMoonIR" dy="UTHalfMoonOR" />
+			</shape>
+	</volume>
+	<!-- Rohacell Foam layer-->
+	<volume vis="UT:HalfMoon" material="UT:RohacellFoam" name="lvUTHalfMoonRohacell">
+			<shape type="BooleanShape" operation="subtraction" name="utHalfMoonRohacell">
+				<shape type="Tube" dz="UTHalfMoonRohacellThick/2" name="utHalfMoonRohacellMain" rmax="UTHalfMoonOR" rmin="UTHalfMoonMR" />
+				<shape type="Box" dz="UTHalfMoonRohacellThick" name="utHalfMoonRohacellSub" dx="UTHalfMoonMR-UTHalfMoonIR" dy="UTHalfMoonOR" />
+			</shape>
+	</volume>
+	<!-- EPDM part -->
+	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTHalfMoonEPDM">
+		<shape type="BooleanShape" operation="subtraction" name="utHalfMoon">
+			<shape type="Tube" dz="UTHalfMoonThick/2" name="utHalfMoonTube" rmax="UTHalfMoonOR" rmin="UTHalfMoonIR" />
+			<shape type="BooleanShape" operation="subtraction" name="utHalfMoonSub">
+				<shape type="Tube" dz="UTHalfMoonThick" name="utHalfMoonSubTube" rmax="2*UTHalfMoonOR" rmin="UTHalfMoonMR" />
+				<shape type="Box" dz="UTHalfMoonThick" name="utHalfMoonSubTubeSub" dx="UTHalfMoonMR-UTHalfMoonIR" dy="UTHalfMoonOR" />
+			</shape>
+		</shape>
+	</volume>
+	<volume name="lvUTHalfMoon">
+		<physvol name="pvUTHalfMoonEPDM" volume="lvUTHalfMoonEPDM">
+			<position z="0.5*UTHalfMoonThick"/>
+		</physvol>
+		<physvol name="pvUTHalfMoonCarbonFiber1" volume="lvUTHalfMoonCarbonFiber">
+			<position z="0.5*UTHalfMoonCarbonFiberThick"/>
+		</physvol>
+		<physvol name="pvUTHalfMoonRohacell" volume="lvUTHalfMoonRohacell">
+			<position z="UTHalfMoonCarbonFiberThick+0.5*UTHalfMoonRohacellThick"/>
+		</physvol>
+		<physvol name="pvUTHalfMoonCarbonFiber2" volume="lvUTHalfMoonCarbonFiber">
+			<position z="1.5*UTHalfMoonCarbonFiberThick+UTHalfMoonRohacellThick"/>
+		</physvol>
+	</volume>
+	<volume name="lvUTBoxPlugPiece">
+		<physvol name="pvUTBoxPipeAirexRing" volume="lvUTBoxPipeAirexRing"/>
+		<physvol name="pvUTHalfMoon" volume="lvUTHalfMoon"/>
+	</volume>
+	<volume name="lvUTBoxPlug">
+		<physvol name="pvUTBoxPlug1" volume="lvUTBoxPlugPiece">
+			<position z="0.5*UTBoxOuterThick" />
+		</physvol>
+		<physvol name="pvUTBoxPlug2" volume="lvUTBoxPlugPiece">
+			<position z="-0.5*UTBoxOuterThick" />
+			<rotation x="180*degree" />
+		</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 -->
+	<!-- First kapton layer -->
+	<volume vis="UT:BeamPipeJacket" material="UT:Kapton" name="lvUTCylJacketKapton">
+		<shape name="UTCylJacketKapton" type="Tube" dz="UTCylJacketLength/2"
+		  rmin="UTCylJacketIR"
+		  rmax="UTCylJacketIR+UTKaptonThick"/>
+	</volume>
+	<volume vis="UT:BeamPipeJacket" material="UT:Kapton" name="lvUTConeJacketKapton">
+		<shape name="UTConeJacketKapton" type="ConeSegment"
+     	dz="0.5*UTConeJacketLength"
+     	rmin2="UTConeJacketZmaxIR"
+     	rmin1="UTConeJacketZminIR"
+     	rmax2="UTConeJacketZmaxIR+UTKaptonThick"
+     	rmax1="UTConeJacketZminIR+UTKaptonThick"/>
+	</volume>
+
+	<!-- Upstream -->
+	<volume vis="UT:Pygel" material="UT:BeamPipeJacket" name="lvUTUpstrmPygel">
+		<shape type="Tube" name="UTUpstrmPygel"
+			dz="UTUpstrmPygelLength/2"
+			rmin="UTUpstrmPygelIR"
+			rmax="UTUpstrmPygelIR+UTPygelThick" />
+	</volume>
+	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTUpstreamEPDM">
+		<shape type="Tube" name="UTUpstreamEPDM"
+			dz="UTUpstreamEPDMLength/2"
+			rmin="UTUpstreamEPDMIR"
+			rmax="UTUpstreamEPDMIR+UTCylJacketEPDMThick" />
+	</volume>
+	<volume name="lvUTUpstreamJacket">
+		<physvol name="pvUTUpstrmPygel" volume="lvUTUpstrmPygel">
+			<position z="UTUpstrmPygelPos"/>
+		</physvol>
+		<physvol name="pvUTUpstreamEPDM" volume="lvUTUpstreamEPDM">
+		  <position z="UTUpstreamEPDMPos"/>
+		</physvol>
+	</volume>
+
+	<!-- Middle Pyrogel between two stereo layers -->
+	<volume vis="UT:Pygel" material="UT:BeamPipeJacket" name="lvUTCylPygelMiddle">
+		<shape type="Tube"
+			name="UTCylPygelMiddle"
+			dz="UTMiddlePygelCylLength/2"
+			rmin="UX851Cyl07Radius+UX851Cyl07Thick+UTKaptonThick"
+			rmax="UX851Cyl07Radius+UX851Cyl07Thick+UTKaptonThick+UTPygelThick" />
+	</volume>
+	<volume vis="UT:Pygel" material="UT:BeamPipeJacket" name="lvUTConePygelMiddle">
+		<shape type="ConeSegment"
+			name="UTConePygelMiddle"
+			dz="UTMiddlePygelConeLength/2"
+			rmin1="UTMiddlePygelConeZminIR"
+			rmax1="UTMiddlePygelConeZminIR+UTPygelThick"
+			rmin2="UTMiddlePygelConeZmaxIR"
+			rmax2="UTMiddlePygelConeZmaxIR+UTPygelThick" />
+	</volume>
+	<volume name="lvUTPygelMiddle">
+		<physvol name="pvUTCylPygelMiddle" volume="lvUTCylPygelMiddle">
+			<position z="-UTMiddlePygelConeLength/2"/>
+		</physvol>
+		<physvol name="pvUTConePygelMiddle" volume="lvUTConePygelMiddle">
+			<position z="UTMiddlePygelCylLength/2"/>
+		</physvol>
+	</volume>
+
+	<!-- Downstream -->
+	<volume vis="UT:Pygel" material="UT:BeamPipeJacket" name="lvUTDnstrmPygel">
+		<shape type="ConeSegment" name="UTDnstrmPygel"
+			dz="UTDnstrmPygelLength/2"
+			rmin1="UTDnstrmPygelZminIR"
+			rmax1="UTDnstrmPygelZminIR+UTPygelThick"
+			rmin2="UTDnstrmPygelZmaxIR"
+			rmax2="UTDnstrmPygelZmaxIR+UTPygelThick" />
+	</volume>
+	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTDnstrmEPDM">
+		<shape dz="UTDnstrmEPDMLength/2" name="UTDnstrmEPDM"
+			rmin1="UTDnstrmEPDMZminIR"
+			rmax1="UTDnstrmEPDMZminIR+UTCylJacketEPDMThick"
+			rmin2="UTDnstrmEPDMZmaxIR"
+			rmax2="UTDnstrmEPDMZmaxIR+UTCylJacketEPDMThick"
+			type="ConeSegment" />
+	</volume>
+	<volume name="lvUTDnstrmJacket">
+		<physvol name="pvUTDnstrmPygel" volume="lvUTDnstrmPygel">
+			<position z="UTDnstrmPygelPos"/>
+		</physvol>
+		<physvol name="pvUTDnstrmEPDM" volume="lvUTDnstrmEPDM">
+			<position z="UTDnstrmEPDMPos"/>
+		</physvol>
+	</volume>
+
+	<volume name="lvUTJacket">
+		<!-- innermost kapton -->
+		<physvol name="pvUTCylJacketKapton" volume="lvUTCylJacketKapton">
+		  <position z="-0.5*UTBoxOuterThick+0.5*UX851Cyl07BLenght"/>
+		</physvol>
+		<physvol name="pvUTConeJacketKapton" volume="lvUTConeJacketKapton">
+		  <position z="0.5*UTBoxOuterThick-0.5*UX851Cone08ALenght"/>
+		</physvol>
+
+		<!-- middle pyrogel -->
+		<physvol name="pvUTPygelMiddle" volume="lvUTPygelMiddle"/>
+
+		<!-- upstream and downstream layers -->
+		<physvol namJackete="pvUTUpstreamJacket" volume="lvUTUpstreamJacket">
+			<position z="-0.5*0.5*(UTBoxOuterThick+UTBoxInnerThick)" />
+		</physvol>
+		<physvol name="pvUTDnstrmJacket" volume="lvUTDnstrmJacket">
+			<position z="0.5*0.5*(UTBoxOuterThick+UTBoxInnerThick)" />
+		</physvol>
+	</volume>
+
+	<!-- Beampipe Heater -->
+	<!-- upstream -->
+	<volume vis="UT:PipeHeater" material="UT:PipeHeater" name="lvUTPipeHeaterUpstream">
+		<shape type="Tube" name="UTPipeHeaterUpstream"
+			dz="UTPipeHeaterUpstreamLength/2"
+ rmin="UTPipeHeaterUpstreamIR"
+			rmax="UTPipeHeaterUpstreamIR+UTPipeHeaterUpstreamThick" />
+	</volume>
+	<!-- downstream -->
+	<volume vis="UT:PipeHeater" material="UT:PipeHeater" name="lvUTPipeHeaterDnstrm">
+		<shape type="ConeSegment" name="UTPipeHeaterDnstrm"
+			dz="UTPipeHeaterDnstrmLength/2"
+			rmin1="UTPipeHeaterDnstrmZminIR"
+			rmax1="UTPipeHeaterDnstrmZminIR+UTPipeHeaterDnstrmThick"
+			rmin2="UTPipeHeaterDnstrmZmaxIR"
+			rmax2="UTPipeHeaterDnstrmZmaxIR+UTPipeHeaterDnstrmThick" />
+	</volume>
+	<volume name="lvUTPipeHeater">
+		<physvol name="pvUTPipeHeaterUpstream" volume="lvUTPipeHeaterUpstream">
+			<position z="UTPipeHeaterUpstreamPos" />
+		</physvol>
+		<physvol name="pvUTPipeHeaterDnstrm" volume="lvUTPipeHeaterDnstrm">
+			<position z="UTPipeHeaterDnstrmPos" />
+		</physvol>
+	</volume>
+</ut>
diff --git a/compact/components/UT/2024-v00.02/UTHalf.xml b/compact/components/UT/2024-v00.02/UTHalf.xml
new file mode 100644
index 0000000000..6a0f3b1f67
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/UTaULayer.xml b/compact/components/UT/2024-v00.02/UTaULayer.xml
new file mode 100644
index 0000000000..cf80bd6038
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/UTaXLayer.xml b/compact/components/UT/2024-v00.02/UTaXLayer.xml
new file mode 100644
index 0000000000..59934dacd5
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/UTbVLayer.xml b/compact/components/UT/2024-v00.02/UTbVLayer.xml
new file mode 100644
index 0000000000..6825d7d96b
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/UTbXLayer.xml b/compact/components/UT/2024-v00.02/UTbXLayer.xml
new file mode 100644
index 0000000000..bf871e6e53
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/conditions.xml b/compact/components/UT/2024-v00.02/conditions.xml
new file mode 100644
index 0000000000..0250992e50
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/conditions.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                                                      -->
+<!--                                                                            -->
+<!-- ========================================================================== -->
+<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>
+
+      <!-- UT mapping -->
+      <conditions path="ChannelInfo/MonitoringSectorMaps.yml">
+        <condition name="MonitoringSectorMaps" optional='1'/>
+      </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/2024-v00.02/detector.xml b/compact/components/UT/2024-v00.02/detector.xml
new file mode 100644
index 0000000000..e8f3b38fe6
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/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/2024-v00.02/parameters.xml b/compact/components/UT/2024-v00.02/parameters.xml
new file mode 100644
index 0000000000..7d976324fd
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/parameters.xml
@@ -0,0 +1,759 @@
+<!-- ========================================================================== -->
+<!-- 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" />
+		<!-- WithCorrectedP0Parameter can only be 0 or 1 -->
+		<!-- 0: for data collected in 2024 -->
+		<!-- 1: for data collected after 2024 -->
+		<constant name="WithCorrectedP0Parameter" value="1" />
+		<!-- ========== 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.320*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="UTBoxWallDnstrmThick" value="20.0*mm" />
+		<constant name="UTBoxWallUpstrmThick" value="UTBoxWallDnstrmThick" />
+		<constant name="UTBoxInnerThick" value="UTBoxOuterThick-2*UTBoxWallDnstrmThick" />
+		<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 -->
+		<constant name="UTKaptonThick" value="0.1*mm" />
+		<constant name="UTCylJacketThick" value="5.0*mm" />
+		<constant name="UTPygelThick" value="4.0*mm" /> <!-- 5mm compressed -->
+		<constant name="UTCylJacketEPDMThick" value="3.8*mm" /> <!-- 5mm compressed -->
+		<!-- 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" />
+		<constant name="UTConeJacketThick" value="UTCylJacketThick" />
+		<constant name="UTPipeHeaterDnstrmThick" value="0.35*mm" />
+		<constant name="UTConeJacketRadiusZmax" value="UX851Cone08ARadiusZmax+UX851Cone08AThick+UTPipeHeaterDnstrmThick+0.01*mm" />
+		<constant name="UTPlugOuterRadius" value="UTConeJacketRadiusZmax + UTConeJacketThick + 57.6*mm" />
+		<constant name="UTPlugInnerRadius" value="UTConeJacketRadiusZmax + UTConeJacketThick" />
+		<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="10.0*mm" />
+		<constant name="UTBoxPipeAirexRingOuterThick" value="15.0*mm" />
+		<constant name="UTPlugThickZ" value="2*UTBoxPipeAirexRingOuterThick" />
+		<constant name="UTHalfMoonIR" value="43*mm" />
+		<constant name="UTHalfMoonMR" value="53*mm" />
+		<constant name="UTHalfMoonOR" value="82.5*mm" />
+		<constant name="UTHalfMoonThick" value="10.6*mm" />
+		<constant name="UTHalfMoonRohacellThick" value="5*mm" />
+		<constant name="UTHalfMoonCarbonFiberThick" value="0.3*mm" />
+		<constant name="UTBoxPipeAirexRingIR" value="36.5*mm" /> <!-- artificually compress Airex from 36.0*mm -->
+		<constant name="UTBoxPipeAirexRingInnerOR" value="50*mm" />
+		<constant name="UTBoxPipeAirexRingOuterOR" value="43*mm" /> <!-- 43.5*mm compressed -->
+		<constant name="UTBoxWallSealThick" value="10.0*mm" />
+		<constant name="UTBoxWallSealIR" value="UTHalfMoonIR" />
+		<constant name="UTBoxWallSealOR" value="55.0*mm" />
+		<!-- Kapton beam pipe jacket -->
+		<constant name="UTJacketZPos" value="0.0*mm" />
+		<constant name="UTMiddlePygelLength" value="160*mm" />
+		<constant name="UTMiddlePygelCylLength" value="UTBoxOuterThick/2-UX851Cone08ALenght+UTMiddlePygelLength/2" />
+		<constant name="UTMiddlePygelConeLength" value="UTMiddlePygelLength-UTMiddlePygelCylLength" />
+		<constant name="UTMiddlePygelConeZminIR" value="UX851Cone08ARadiusZmin+UX851Cone08AThick+UTKaptonThick" />
+		<constant name="UTMiddlePygelConeZmaxIR" value="UX851Cone08ARadiusZmin+(UX851Cone08ARadiusZmax-UX851Cone08ARadiusZmin)*UTMiddlePygelConeLength/UX851Cone08ALenght+UX851Cone08AThick+UTKaptonThick" />
+		<constant name="UTCylJacketLength" value="UX851Cyl07BLenght" />
+		<constant name="UTCylJacketZpos" value="UTCylJacketLength*0.5" />
+		<constant name="UTCylJacketIR" value="UX851Cyl07Radius+UX851Cyl07Thick" />
+		<constant name="UTConeJacketLength" value="UX851Cone08ALenght" />
+		<constant name="UTConeJacketZminIR" value="UX851Cone08ARadiusZmin+UX851Cone08AThick" />
+		<constant name="UTConeJacketZmaxIR" value="UX851Cone08ARadiusZmax+UX851Cone08AThick" />
+		<constant name="UTPipeHeaterUpstreamIR" value="UTCylJacketIR+UTKaptonThick" />
+		<constant name="UTPipeHeaterUpstreamThick" value="0.35*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+UTPipeHeaterDnstrmThick+0.01*mm" />
+		<constant name="UTConeJacketCutOutRadiusZmax" value="UTConeJacketCutOutLHCbZmax*tan(UX851to4Angle)+UX851Cyl07Thick+UTPipeHeaterDnstrmThick+0.02*mm" />
+		<constant name="UTConeJacketUpstreamLength" value="UTConeJacketCutOutPos-UTCylJacketLength" />
+		<constant name="UTDnstrmLength" value="UTConeJacketLength-UTConeJacketUpstreamLength-UTConeJacketCutOutLength" />
+		<constant name="UTConeJacketZposUpstream" value="UTCylJacketLength+UTConeJacketUpstreamLength*0.5" />
+		<constant name="UTConeJacketZposDnstrm" value="UTConeJacketCutOutPos+UTConeJacketCutOutLength+0.5*UTDnstrmLength" />
+		<!-- UT box plug -->
+		<constant name="UTUpstrmPygelLength" value="72*mm" />
+		<constant name="UTUpstrmPygelIR" value="UX851Cyl07Radius+UX851Cyl07Thick+UTPipeHeaterUpstreamThick+UTKaptonThick" />
+		<constant name="UTUpstrmPygelPos" value="-12*mm" /> <!-- with respect to center of wall at z=2280*mm -->
+		<constant name="UTUpstreamEPDMLength" value="28*mm" />
+		<constant name="UTUpstreamEPDMIR" value="UTUpstrmPygelIR+UTPygelThick" />
+		<constant name="UTUpstreamEPDMPos" value="6*mm" /> <!-- with respect to center of wall at z=2280*mm -->
+		<constant name="UTDnstrmPygelLength" value="UTUpstrmPygelLength" />
+		<constant name="UTDnstrmPygelInUTLength" value="30*mm" />
+		<constant name="UTDnstrmPygelInMagnetLength" value="UTUpstrmPygelLength-30*mm" />
+		<constant name="UTDnstrmPygelZminIR" value="(UX851TTMagnetSplitZposIP-UTDnstrmPygelInUTLength)*tan(UX851to4Angle)+UX851Cone08AThick+UTKaptonThick+UTPipeHeaterDnstrmThick" />
+		<constant name="UTDnstrmPygelZmaxIR" value="(UX851TTMagnetSplitZposIP+42*mm)*tan(UX851to4Angle)+UX851Cone08AThick+UTKaptonThick+UTPipeHeaterDnstrmThick" />
+		<constant name="UTDnstrmPygelPos" value="16*mm" /><!-- with respect to center of wall at z=2690*mm -->
+		<constant name="UTDnstrmPygelInMagnetPos" value="0.5*UTDnstrmPygelInMagnetLength" /> <!-- with respect to end of BeforeMagnetRegion at z=2700*mm -->
+		<constant name="UTDnstrmEPDMLength" value="UTUpstreamEPDMLength" />
+		<constant name="UTDnstrmEPDMInUTLength" value="26*mm" />
+		<constant name="UTDnstrmEPDMInMagnetLength" value="UTUpstreamEPDMLength-UTDnstrmEPDMInUTLength" />
+		<constant name="UTDnstrmEPDMZminIR" value="UX851Cone08ARadiusZmax+UX851Cone08AThick+UTKaptonThick+UTPipeHeaterDnstrmThick+UTPygelThick" />
+		<constant name="UTDnstrmEPDMZmaxIR" value="(UX851TTMagnetSplitZposIP+UTDnstrmEPDMInMagnetLength)*tan(UX851to4Angle)+UX851Cone08AThick+UTKaptonThick+UTPipeHeaterDnstrmThick+UTPygelThick" />
+		<constant name="UTDnstrmEPDMPos" value="-2*mm" /> <!-- with respect to center of wall at z=2690*mm -->
+		<constant name="UTDnstrmEPDMInMagnetPos" value="0.5*UTDnstrmEPDMInMagnetLength" /> <!-- with respect to end of BeforeMagnetRegion at z=2700*mm -->
+		<!-- beam pipe heaters -->
+		<!-- Heaters: https://edms.cern.ch/document/2383870 -->
+		<!-- <constant name="UTPipeHeaterUpstreamPos" value="UX851Rich1TTSplitZposIP-UTSystemZ-17.0*mm+0.5*UTPipeHeaterUpstreamLength" /> -->
+		<constant name="UTPipeHeaterUpstreamPos" value="-0.5*0.5*(UTBoxOuterThick+UTBoxInnerThick)+UTUpstrmPygelPos" />
+		<constant name="UTPipeHeaterUpstreamLength" value="42.0*mm" />
+		<constant name="UTPipeHeaterDnstrmLength" value="67.0*mm" />
+		<constant name="UTPipeHeaterDnstrmZmin" value="UX851TTMagnetSplitZposIP-UTBoxWallDnstrmThick-5*mm" />
+		<constant name="UTPipeHeaterDnstrmZmax" value="UTPipeHeaterDnstrmZmin+UTPipeHeaterDnstrmLength" />
+		<constant name="UTPipeHeaterDnstrmLengthInUT" value="UX851TTMagnetSplitZposIP-UTPipeHeaterDnstrmZmin" /> <constant name="UTPipeHeaterDnstrmLengthInMagnet" value="UTPipeHeaterDnstrmLength-UTPipeHeaterDnstrmLengthInUT" />
+		<constant name="UTPipeHeaterDnstrmZminIR" value="UTPipeHeaterDnstrmZmin*tan(UX851to4Angle)+UX851Cyl07Thick+UTKaptonThick" />
+		<constant name="UTPipeHeaterDnstrmZmaxIR" value="UTPipeHeaterDnstrmZmax*tan(UX851to4Angle)+UX851Cyl07Thick+UTKaptonThick" />
+		<constant name="UTPipeHeaterDnstrmPos" value="UTPipeHeaterDnstrmZmin+0.5*UTPipeHeaterDnstrmLength-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: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"> <!-- aerogel -->
+			<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:CFPrePregCu">
+    	<D type="density" value="1.791" unit="g/cm3" />
+      <fraction n="0.46" ref="UT:CarbonFiber" />
+      <fraction n="0.37" ref="UT:Epoxy" />
+      <fraction n="0.17" ref="Copper" />
+    </material>
+		<material name="UT:BoxWall">
+			<D type="density" value="0.1393" unit="g/cm3" />
+			<fraction n="0.5889" ref="UT:CFPrePregCu" />
+			<fraction n="0.4111" ref="UT:Airex" />
+		</material>
+		<material name="UT:CFPrePreg">
+			<D type="density" value="1.480" unit="g/cm3" />
+			<fraction n="0.63" ref="UT:CarbonFiber" />
+			<fraction n="0.37" ref="UT:Epoxy" />
+		</material>
+		<material name="UT:BoxPlug">
+			<D type="density" value="0.1250" unit="g/cm3" />
+			<fraction n="0.4579" ref="UT:Airex" />
+			<fraction n="0.5421" ref="UT:CFPrePreg" />
+		</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: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.2" 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" />
+		<vis name="UT:Pygel" alpha="1.0" r="0.91" g="0.91" b="0.93" showDaughters="false" visible="true" />
+		<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>
diff --git a/compact/components/UT/trunk/UTBox.xml b/compact/components/UT/trunk/UTBox.xml
index 25e818fe03..66eec6aa87 100644
--- a/compact/components/UT/trunk/UTBox.xml
+++ b/compact/components/UT/trunk/UTBox.xml
@@ -26,54 +26,71 @@
 		</shape>
 	</volume>
 	<!-- UT box plug -->
+	<!-- Airex -->
 	<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)" />
+			<position z="-UTEpsilon-0.5*UTBoxPipeAirexRingInnerThick" />
 		</physvol>
-		<physvol name="pvUTBoxPipeAirexRingMiddle" volume="lvUTBoxPipeAirexRingMiddle" />
 		<physvol name="pvUTBoxPipeAirexRingOuter" volume="lvUTBoxPipeAirexRingOuter">
-			<position z="-0.5*(UTBoxPipeAirexRingOuterThick+UTBoxPipeAirexRingMiddleThick)" />
+			<position z="-UTEpsilon+0.5*UTBoxPipeAirexRingOuterThick" />
 		</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" />
+	<!-- HalfMoon -->
+	<!-- Carbon fiber part -->
+	<volume vis="UT:HalfMoon" material="UT:CarbonFiber" name="lvUTHalfMoonCarbonFiber">
+			<shape type="BooleanShape" operation="subtraction" name="utHalfMoonCarbonFiber">
+				<shape type="Tube" dz="UTHalfMoonCarbonFiberThick/2" name="utHalfMoonCarbonFiberMain" rmax="UTHalfMoonOR" rmin="UTHalfMoonMR" />
+				<shape type="Box" dz="UTHalfMoonCarbonFiberThick" name="utHalfMoonCarbonFiberSub" dx="UTHalfMoonMR-UTHalfMoonIR" dy="UTHalfMoonOR" />
+			</shape>
+	</volume>
+	<!-- Rohacell Foam layer-->
+	<volume vis="UT:HalfMoon" material="UT:RohacellFoam" name="lvUTHalfMoonRohacell">
+			<shape type="BooleanShape" operation="subtraction" name="utHalfMoonRohacell">
+				<shape type="Tube" dz="UTHalfMoonRohacellThick/2" name="utHalfMoonRohacellMain" rmax="UTHalfMoonOR" rmin="UTHalfMoonMR" />
+				<shape type="Box" dz="UTHalfMoonRohacellThick" name="utHalfMoonRohacellSub" dx="UTHalfMoonMR-UTHalfMoonIR" dy="UTHalfMoonOR" />
+			</shape>
+	</volume>
+	<!-- EPDM part -->
+	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTHalfMoonEPDM">
+		<shape type="BooleanShape" operation="subtraction" name="utHalfMoon">
+			<shape type="Tube" dz="UTHalfMoonThick/2" name="utHalfMoonTube" rmax="UTHalfMoonOR" rmin="UTHalfMoonIR" />
+			<shape type="BooleanShape" operation="subtraction" name="utHalfMoonSub">
+				<shape type="Tube" dz="UTHalfMoonThick" name="utHalfMoonSubTube" rmax="2*UTHalfMoonOR" rmin="UTHalfMoonMR" />
+				<shape type="Box" dz="UTHalfMoonThick" name="utHalfMoonSubTubeSub" dx="UTHalfMoonMR-UTHalfMoonIR" dy="UTHalfMoonOR" />
+			</shape>
+		</shape>
 	</volume>
-	<volume name="lvUTBoxPlugPiece">
-		<physvol name="pvUTBoxPipeAirexRing" volume="lvUTBoxPipeAirexRing">
-			<position z="3*mm"/>
+	<volume name="lvUTHalfMoon">
+		<physvol name="pvUTHalfMoonEPDM" volume="lvUTHalfMoonEPDM">
+			<position z="0.5*UTHalfMoonThick"/>
 		</physvol>
-		<physvol name="pvUTBoxWallSeal" volume="lvUTBoxWallSeal">
-			<position z="3*mm"/>
+		<physvol name="pvUTHalfMoonCarbonFiber1" volume="lvUTHalfMoonCarbonFiber">
+			<position z="0.5*UTHalfMoonCarbonFiberThick"/>
 		</physvol>
-		<physvol name="pvUTBoxInternalAirexRing" volume="lvUTBoxInternalAirexRing">
-			<position z="0.5*(UTBoxWallDownstreamThick+UTInternalRingThick)" />
+		<physvol name="pvUTHalfMoonRohacell" volume="lvUTHalfMoonRohacell">
+			<position z="UTHalfMoonCarbonFiberThick+0.5*UTHalfMoonRohacellThick"/>
 		</physvol>
-		<physvol name="pvUTBoxInternalSeal" volume="lvUTBoxInternalSeal">
-			<position z="0.5*(UTBoxWallDownstreamThick+UTInternalSealThick)" />
+		<physvol name="pvUTHalfMoonCarbonFiber2" volume="lvUTHalfMoonCarbonFiber">
+			<position z="1.5*UTHalfMoonCarbonFiberThick+UTHalfMoonRohacellThick"/>
 		</physvol>
 	</volume>
+	<volume name="lvUTBoxPlugPiece">
+		<physvol name="pvUTBoxPipeAirexRing" volume="lvUTBoxPipeAirexRing"/>
+		<physvol name="pvUTHalfMoon" volume="lvUTHalfMoon"/>
+	</volume>
 	<volume name="lvUTBoxPlug">
 		<physvol name="pvUTBoxPlug1" volume="lvUTBoxPlugPiece">
-			<position z="0.5*(UTBoxOuterThick-UTPlugThickZ)" />
-			<rotation x="180*degree" />
+			<position z="0.5*UTBoxOuterThick" />
 		</physvol>
 		<physvol name="pvUTBoxPlug2" volume="lvUTBoxPlugPiece">
-			<position z="-0.5*(UTBoxOuterThick-UTPlugThickZ)" />
+			<position z="-0.5*UTBoxOuterThick" />
+			<rotation x="180*degree" />
 		</physvol>
 	</volume>
 	<!-- End of Stave (EOS) volumes -->
@@ -90,42 +107,139 @@
 		<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" />
+	<!-- First kapton layer -->
+	<volume vis="UT:BeamPipeJacket" material="UT:Kapton" name="lvUTCylJacketKapton">
+		<shape name="UTCylJacketKapton" type="Tube" dz="UTCylJacketLength/2"
+		  rmin="UTCylJacketIR"
+		  rmax="UTCylJacketIR+UTKaptonThick"/>
+	</volume>
+	<volume vis="UT:BeamPipeJacket" material="UT:Kapton" name="lvUTConeJacketKapton">
+		<shape name="UTConeJacketKapton" type="ConeSegment"
+     	dz="0.5*UTConeJacketLength"
+     	rmin2="UTConeJacketZmaxIR"
+     	rmin1="UTConeJacketZminIR"
+     	rmax2="UTConeJacketZmaxIR+UTKaptonThick"
+     	rmax1="UTConeJacketZminIR+UTKaptonThick"/>
+	</volume>
+
+	<!-- Upstream -->
+	<volume vis="UT:Pygel" material="UT:BeamPipeJacket" name="lvUTUpstrmPygel">
+		<shape type="Tube" name="UTUpstrmPygel"
+			dz="UTUpstrmPygelLength/2"
+			rmin="UTUpstrmPygelIR"
+			rmax="UTUpstrmPygelIR+UTPygelThick" />
+	</volume>
+	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTUpstreamEPDM">
+		<shape type="Tube" name="UTUpstreamEPDM"
+			dz="UTUpstreamEPDMLength/2"
+			rmin="UTUpstreamEPDMIR"
+			rmax="UTUpstreamEPDMIR+UTCylJacketEPDMThick" />
+	</volume>
+	<volume name="lvUTUpstreamJacket">
+		<physvol name="pvUTUpstrmPygel" volume="lvUTUpstrmPygel">
+			<position z="UTUpstrmPygelPos"/>
+		</physvol>
+		<physvol name="pvUTUpstreamEPDM" volume="lvUTUpstreamEPDM">
+		  <position z="UTUpstreamEPDMPos"/>
+		</physvol>
 	</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" />
+
+	<!-- Middle Pyrogel between two stereo layers -->
+	<volume vis="UT:Pygel" material="UT:BeamPipeJacket" name="lvUTCylPygelMiddle">
+		<shape type="Tube"
+			name="UTCylPygelMiddle"
+			dz="UTMiddlePygelCylLength/2"
+			rmin="UX851Cyl07Radius+UX851Cyl07Thick+UTKaptonThick"
+			rmax="UX851Cyl07Radius+UX851Cyl07Thick+UTKaptonThick+UTPygelThick" />
+	</volume>
+	<volume vis="UT:Pygel" material="UT:BeamPipeJacket" name="lvUTConePygelMiddle">
+		<shape type="ConeSegment"
+			name="UTConePygelMiddle"
+			dz="UTMiddlePygelConeLength/2"
+			rmin1="UTMiddlePygelConeZminIR"
+			rmax1="UTMiddlePygelConeZminIR+UTPygelThick"
+			rmin2="UTMiddlePygelConeZmaxIR"
+			rmax2="UTMiddlePygelConeZmaxIR+UTPygelThick" />
+	</volume>
+	<volume name="lvUTPygelMiddle">
+		<physvol name="pvUTCylPygelMiddle" volume="lvUTCylPygelMiddle">
+			<position z="-UTMiddlePygelConeLength/2"/>
+		</physvol>
+		<physvol name="pvUTConePygelMiddle" volume="lvUTConePygelMiddle">
+			<position z="UTMiddlePygelCylLength/2"/>
+		</physvol>
 	</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" />
+
+	<!-- Downstream -->
+	<volume vis="UT:Pygel" material="UT:BeamPipeJacket" name="lvUTDnstrmPygel">
+		<shape type="ConeSegment" name="UTDnstrmPygel"
+			dz="UTDnstrmPygelLength/2"
+			rmin1="UTDnstrmPygelZminIR"
+			rmax1="UTDnstrmPygelZminIR+UTPygelThick"
+			rmin2="UTDnstrmPygelZmaxIR"
+			rmax2="UTDnstrmPygelZmaxIR+UTPygelThick" />
+	</volume>
+	<volume vis="UT:EPDM" material="UT:EPDM" name="lvUTDnstrmEPDM">
+		<shape dz="UTDnstrmEPDMLength/2" name="UTDnstrmEPDM"
+			rmin1="UTDnstrmEPDMZminIR"
+			rmax1="UTDnstrmEPDMZminIR+UTCylJacketEPDMThick"
+			rmin2="UTDnstrmEPDMZmaxIR"
+			rmax2="UTDnstrmEPDMZmaxIR+UTCylJacketEPDMThick"
+			type="ConeSegment" />
+	</volume>
+	<volume name="lvUTDnstrmJacket">
+		<physvol name="pvUTDnstrmPygel" volume="lvUTDnstrmPygel">
+			<position z="UTDnstrmPygelPos"/>
+		</physvol>
+		<physvol name="pvUTDnstrmEPDM" volume="lvUTDnstrmEPDM">
+			<position z="UTDnstrmEPDMPos"/>
+		</physvol>
 	</volume>
+
 	<volume name="lvUTJacket">
-		<physvol name="pvUTCylJacket" volume="lvUTCylJacket">
-			<position z="UTCylJacketZpos" />
+		<!-- innermost kapton -->
+		<physvol name="pvUTCylJacketKapton" volume="lvUTCylJacketKapton">
+		  <position z="-0.5*UTBoxOuterThick+0.5*UX851Cyl07BLenght"/>
 		</physvol>
-		<physvol name="pvUTConeJacketUpstream" volume="lvUTConeJacketUpstream">
-			<position z="UTConeJacketZposUpstream" />
+		<physvol name="pvUTConeJacketKapton" volume="lvUTConeJacketKapton">
+		  <position z="0.5*UTBoxOuterThick-0.5*UX851Cone08ALenght"/>
 		</physvol>
-		<physvol name="pvUTConeJacketDownstream" volume="lvUTConeJacketDownstream">
-			<position z="UTConeJacketZposDownstream" />
+
+		<!-- middle pyrogel -->
+		<physvol name="pvUTPygelMiddle" volume="lvUTPygelMiddle"/>
+
+		<!-- upstream and downstream layers -->
+		<physvol namJackete="pvUTUpstreamJacket" volume="lvUTUpstreamJacket">
+			<position z="-0.5*0.5*(UTBoxOuterThick+UTBoxInnerThick)" />
+		</physvol>
+		<physvol name="pvUTDnstrmJacket" volume="lvUTDnstrmJacket">
+			<position z="0.5*0.5*(UTBoxOuterThick+UTBoxInnerThick)" />
 		</physvol>
 	</volume>
+
+	<!-- Beampipe Heater -->
+	<!-- upstream -->
 	<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>
+		<shape type="Tube" name="UTPipeHeaterUpstream"
+			dz="UTPipeHeaterUpstreamLength/2"
+ rmin="UTPipeHeaterUpstreamIR"
+			rmax="UTPipeHeaterUpstreamIR+UTPipeHeaterUpstreamThick" />
+	</volume>
+	<!-- downstream -->
+	<volume vis="UT:PipeHeater" material="UT:PipeHeater" name="lvUTPipeHeaterDnstrm">
+		<shape type="ConeSegment" name="UTPipeHeaterDnstrm"
+			dz="UTPipeHeaterDnstrmLength/2"
+			rmin1="UTPipeHeaterDnstrmZminIR"
+			rmax1="UTPipeHeaterDnstrmZminIR+UTPipeHeaterDnstrmThick"
+			rmin2="UTPipeHeaterDnstrmZmaxIR"
+			rmax2="UTPipeHeaterDnstrmZmaxIR+UTPipeHeaterDnstrmThick" />
 	</volume>
 	<volume name="lvUTPipeHeater">
 		<physvol name="pvUTPipeHeaterUpstream" volume="lvUTPipeHeaterUpstream">
 			<position z="UTPipeHeaterUpstreamPos" />
 		</physvol>
-		<physvol name="pvUTPipeHeaterDownstream" volume="lvUTPipeHeaterDownstreamInUT">
-			<position z="UTPipeHeaterDownstreamPos" />
+		<physvol name="pvUTPipeHeaterDnstrm" volume="lvUTPipeHeaterDnstrm">
+			<position z="UTPipeHeaterDnstrmPos" />
 		</physvol>
 	</volume>
 </ut>
diff --git a/compact/components/UT/trunk/parameters.xml b/compact/components/UT/trunk/parameters.xml
index 647c67deba..7d976324fd 100644
--- a/compact/components/UT/trunk/parameters.xml
+++ b/compact/components/UT/trunk/parameters.xml
@@ -45,7 +45,7 @@
 		<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="UTSensorSiThickB" value="0.320*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" />
@@ -215,50 +215,61 @@
 		<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="UTBoxWallDnstrmThick" value="20.0*mm" />
+		<constant name="UTBoxWallUpstrmThick" value="UTBoxWallDnstrmThick" />
+		<constant name="UTBoxInnerThick" value="UTBoxOuterThick-2*UTBoxWallDnstrmThick" />
 		<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 -->
+		<constant name="UTKaptonThick" value="0.1*mm" />
+		<constant name="UTCylJacketThick" value="5.0*mm" />
+		<constant name="UTPygelThick" value="4.0*mm" /> <!-- 5mm compressed -->
+		<constant name="UTCylJacketEPDMThick" value="3.8*mm" /> <!-- 5mm compressed -->
 		<!-- 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="UTPipeHeaterDnstrmThick" value="0.35*mm" />
+		<constant name="UTConeJacketRadiusZmax" value="UX851Cone08ARadiusZmax+UX851Cone08AThick+UTPipeHeaterDnstrmThick+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="UTBoxPipeAirexRingInnerThick" value="10.0*mm" />
+		<constant name="UTBoxPipeAirexRingOuterThick" value="15.0*mm" />
+		<constant name="UTPlugThickZ" value="2*UTBoxPipeAirexRingOuterThick" />
+		<constant name="UTHalfMoonIR" value="43*mm" />
+		<constant name="UTHalfMoonMR" value="53*mm" />
+		<constant name="UTHalfMoonOR" value="82.5*mm" />
+		<constant name="UTHalfMoonThick" value="10.6*mm" />
+		<constant name="UTHalfMoonRohacellThick" value="5*mm" />
+		<constant name="UTHalfMoonCarbonFiberThick" value="0.3*mm" />
+		<constant name="UTBoxPipeAirexRingIR" value="36.5*mm" /> <!-- artificually compress Airex from 36.0*mm -->
+		<constant name="UTBoxPipeAirexRingInnerOR" value="50*mm" />
+		<constant name="UTBoxPipeAirexRingOuterOR" value="43*mm" /> <!-- 43.5*mm compressed -->
 		<constant name="UTBoxWallSealThick" value="10.0*mm" />
-		<constant name="UTBoxWallSealIR" value="UTBoxPipeAirexRingMiddleOR" />
+		<constant name="UTBoxWallSealIR" value="UTHalfMoonIR" />
 		<constant name="UTBoxWallSealOR" value="55.0*mm" />
 		<!-- Kapton beam pipe jacket -->
+		<constant name="UTJacketZPos" value="0.0*mm" />
+		<constant name="UTMiddlePygelLength" value="160*mm" />
+		<constant name="UTMiddlePygelCylLength" value="UTBoxOuterThick/2-UX851Cone08ALenght+UTMiddlePygelLength/2" />
+		<constant name="UTMiddlePygelConeLength" value="UTMiddlePygelLength-UTMiddlePygelCylLength" />
+		<constant name="UTMiddlePygelConeZminIR" value="UX851Cone08ARadiusZmin+UX851Cone08AThick+UTKaptonThick" />
+		<constant name="UTMiddlePygelConeZmaxIR" value="UX851Cone08ARadiusZmin+(UX851Cone08ARadiusZmax-UX851Cone08ARadiusZmin)*UTMiddlePygelConeLength/UX851Cone08ALenght+UX851Cone08AThick+UTKaptonThick" />
 		<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="UTCylJacketIR" value="UX851Cyl07Radius+UX851Cyl07Thick" />
 		<constant name="UTConeJacketLength" value="UX851Cone08ALenght" />
-		<!-- 200 -->
-		<!-- 27.0009+1+0.01 -->
-		<constant name="UTConeJacketRadiusZmin" value="UX851Cone08ARadiusZmin+UX851Cone08AThick+UTPipeHeaterDownstreamThick+0.01*mm" />
+		<constant name="UTConeJacketZminIR" value="UX851Cone08ARadiusZmin+UX851Cone08AThick" />
+		<constant name="UTConeJacketZmaxIR" value="UX851Cone08ARadiusZmax+UX851Cone08AThick" />
+		<constant name="UTPipeHeaterUpstreamIR" value="UTCylJacketIR+UTKaptonThick" />
+		<constant name="UTPipeHeaterUpstreamThick" value="0.35*mm" />
 		<!-- 25+1+0.01 -->
 		<!-- aerogel cutout -->
 		<constant name="UTConeJacketCutOutOffset" value="5*mm" />
@@ -270,24 +281,45 @@
 		<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="UTConeJacketCutOutRadiusZmin" value="UTConeJacketCutOutLHCbZmin*tan(UX851to4Angle)+UX851Cyl07Thick+UTPipeHeaterDnstrmThick+0.01*mm" />
+		<constant name="UTConeJacketCutOutRadiusZmax" value="UTConeJacketCutOutLHCbZmax*tan(UX851to4Angle)+UX851Cyl07Thick+UTPipeHeaterDnstrmThick+0.02*mm" />
 		<constant name="UTConeJacketUpstreamLength" value="UTConeJacketCutOutPos-UTCylJacketLength" />
-		<constant name="UTConeJacketDownstreamLength" value="UTConeJacketLength-UTConeJacketUpstreamLength-UTConeJacketCutOutLength" />
+		<constant name="UTDnstrmLength" value="UTConeJacketLength-UTConeJacketUpstreamLength-UTConeJacketCutOutLength" />
 		<constant name="UTConeJacketZposUpstream" value="UTCylJacketLength+UTConeJacketUpstreamLength*0.5" />
-		<constant name="UTConeJacketZposDownstream" value="UTConeJacketCutOutPos+UTConeJacketCutOutLength+0.5*UTConeJacketDownstreamLength" />
+		<constant name="UTConeJacketZposDnstrm" value="UTConeJacketCutOutPos+UTConeJacketCutOutLength+0.5*UTDnstrmLength" />
+		<!-- UT box plug -->
+		<constant name="UTUpstrmPygelLength" value="72*mm" />
+		<constant name="UTUpstrmPygelIR" value="UX851Cyl07Radius+UX851Cyl07Thick+UTPipeHeaterUpstreamThick+UTKaptonThick" />
+		<constant name="UTUpstrmPygelPos" value="-12*mm" /> <!-- with respect to center of wall at z=2280*mm -->
+		<constant name="UTUpstreamEPDMLength" value="28*mm" />
+		<constant name="UTUpstreamEPDMIR" value="UTUpstrmPygelIR+UTPygelThick" />
+		<constant name="UTUpstreamEPDMPos" value="6*mm" /> <!-- with respect to center of wall at z=2280*mm -->
+		<constant name="UTDnstrmPygelLength" value="UTUpstrmPygelLength" />
+		<constant name="UTDnstrmPygelInUTLength" value="30*mm" />
+		<constant name="UTDnstrmPygelInMagnetLength" value="UTUpstrmPygelLength-30*mm" />
+		<constant name="UTDnstrmPygelZminIR" value="(UX851TTMagnetSplitZposIP-UTDnstrmPygelInUTLength)*tan(UX851to4Angle)+UX851Cone08AThick+UTKaptonThick+UTPipeHeaterDnstrmThick" />
+		<constant name="UTDnstrmPygelZmaxIR" value="(UX851TTMagnetSplitZposIP+42*mm)*tan(UX851to4Angle)+UX851Cone08AThick+UTKaptonThick+UTPipeHeaterDnstrmThick" />
+		<constant name="UTDnstrmPygelPos" value="16*mm" /><!-- with respect to center of wall at z=2690*mm -->
+		<constant name="UTDnstrmPygelInMagnetPos" value="0.5*UTDnstrmPygelInMagnetLength" /> <!-- with respect to end of BeforeMagnetRegion at z=2700*mm -->
+		<constant name="UTDnstrmEPDMLength" value="UTUpstreamEPDMLength" />
+		<constant name="UTDnstrmEPDMInUTLength" value="26*mm" />
+		<constant name="UTDnstrmEPDMInMagnetLength" value="UTUpstreamEPDMLength-UTDnstrmEPDMInUTLength" />
+		<constant name="UTDnstrmEPDMZminIR" value="UX851Cone08ARadiusZmax+UX851Cone08AThick+UTKaptonThick+UTPipeHeaterDnstrmThick+UTPygelThick" />
+		<constant name="UTDnstrmEPDMZmaxIR" value="(UX851TTMagnetSplitZposIP+UTDnstrmEPDMInMagnetLength)*tan(UX851to4Angle)+UX851Cone08AThick+UTKaptonThick+UTPipeHeaterDnstrmThick+UTPygelThick" />
+		<constant name="UTDnstrmEPDMPos" value="-2*mm" /> <!-- with respect to center of wall at z=2690*mm -->
+		<constant name="UTDnstrmEPDMInMagnetPos" value="0.5*UTDnstrmEPDMInMagnetLength" /> <!-- with respect to end of BeforeMagnetRegion at z=2700*mm -->
 		<!-- 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" />
+		<!-- Heaters: https://edms.cern.ch/document/2383870 -->
+		<!-- <constant name="UTPipeHeaterUpstreamPos" value="UX851Rich1TTSplitZposIP-UTSystemZ-17.0*mm+0.5*UTPipeHeaterUpstreamLength" /> -->
+		<constant name="UTPipeHeaterUpstreamPos" value="-0.5*0.5*(UTBoxOuterThick+UTBoxInnerThick)+UTUpstrmPygelPos" />
+		<constant name="UTPipeHeaterUpstreamLength" value="42.0*mm" />
+		<constant name="UTPipeHeaterDnstrmLength" value="67.0*mm" />
+		<constant name="UTPipeHeaterDnstrmZmin" value="UX851TTMagnetSplitZposIP-UTBoxWallDnstrmThick-5*mm" />
+		<constant name="UTPipeHeaterDnstrmZmax" value="UTPipeHeaterDnstrmZmin+UTPipeHeaterDnstrmLength" />
+		<constant name="UTPipeHeaterDnstrmLengthInUT" value="UX851TTMagnetSplitZposIP-UTPipeHeaterDnstrmZmin" /> <constant name="UTPipeHeaterDnstrmLengthInMagnet" value="UTPipeHeaterDnstrmLength-UTPipeHeaterDnstrmLengthInUT" />
+		<constant name="UTPipeHeaterDnstrmZminIR" value="UTPipeHeaterDnstrmZmin*tan(UX851to4Angle)+UX851Cyl07Thick+UTKaptonThick" />
+		<constant name="UTPipeHeaterDnstrmZmaxIR" value="UTPipeHeaterDnstrmZmax*tan(UX851to4Angle)+UX851Cyl07Thick+UTKaptonThick" />
+		<constant name="UTPipeHeaterDnstrmPos" value="UTPipeHeaterDnstrmZmin+0.5*UTPipeHeaterDnstrmLength-UTSystemZ" />
 		<!-- Detector Z positions -->
 		<!-- virtual thickness -->
 		<constant name="UTEOSPigtailThick" value="7.236*mm" />
@@ -502,16 +534,6 @@
 			<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" />
@@ -599,7 +621,7 @@
 			<fraction n="0.0453" ref="UT:CoolingFluid" />
 			<fraction n="0.3099" ref="UT:HysolBN" />
 		</material>
-		<material name="UT:BeamPipeJacket">
+		<material name="UT:BeamPipeJacket"> <!-- aerogel -->
 			<D type="density" value="0.209" unit="g/cm3" />
 			<fraction n="0.1601" ref="UT:Kapton" />
 			<fraction n="0.8399" ref="UT:PyrogelXT" />
@@ -620,17 +642,26 @@
 			<fraction n="0.9282" ref="UT:Steel" />
 			<fraction n="0.0718" ref="UT:HybridFlex8" />
 		</material>
+		<material name="UT:CFPrePregCu">
+    	<D type="density" value="1.791" unit="g/cm3" />
+      <fraction n="0.46" ref="UT:CarbonFiber" />
+      <fraction n="0.37" ref="UT:Epoxy" />
+      <fraction n="0.17" ref="Copper" />
+    </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" />
+			<D type="density" value="0.1393" unit="g/cm3" />
+			<fraction n="0.5889" ref="UT:CFPrePregCu" />
+			<fraction n="0.4111" 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" />
+			<D type="density" value="1.480" unit="g/cm3" />
+			<fraction n="0.63" ref="UT:CarbonFiber" />
+			<fraction n="0.37" ref="UT:Epoxy" />
+		</material>
+		<material name="UT:BoxPlug">
+			<D type="density" value="0.1250" unit="g/cm3" />
+			<fraction n="0.4579" ref="UT:Airex" />
+			<fraction n="0.5421" ref="UT:CFPrePreg" />
 		</material>
 		<material name="UT:Resistor">
 			<D type="density" value="4.2768" unit="g/cm3" />
@@ -670,11 +701,6 @@
 			<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" />
@@ -707,13 +733,13 @@
 		<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:Box" alpha="0.2" 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:Pygel" alpha="1.0" r="0.91" g="0.91" b="0.93" showDaughters="false" visible="true" />
 		<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" />
-- 
GitLab


From f8d2c333f475820befbd930cfecca2d597cafd0e Mon Sep 17 00:00:00 2001
From: Miroslav Saur <miroslav.saur@cern.ch>
Date: Sat, 4 Oct 2025 20:51:21 +0800
Subject: [PATCH 2/2] Checksum update

---
 .../checksums                                 | 20 +++++++++----------
 compact/run3/trunk/checksums                  | 20 +++++++++----------
 compact/run4/trunk/checksums                  | 20 +++++++++----------
 compact/run5/branch-baseline/checksums        |  6 +++---
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/compact/run3/before-rich1-geom-update-26052022/checksums b/compact/run3/before-rich1-geom-update-26052022/checksums
index cd2b1ba0a0..5a3d2fc3c8 100644
--- a/compact/run3/before-rich1-geom-update-26052022/checksums
+++ b/compact/run3/before-rich1-geom-update-26052022/checksums
@@ -1,4 +1,4 @@
-/world_volume: 1789341451
+/world_volume: 1550915226
 /world_volume/lvAfterMagnetRegion_3: 3911401405
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1: 1368806147
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWinTubeLock: 2067417882
@@ -48,7 +48,7 @@
 /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: 572740552
+/world_volume/lvBeforeMagnetRegion_1: 1174244411
 /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
@@ -62,14 +62,14 @@
 /world_volume/lvBeforeMagnetRegion_1/lvRich1Master_1/pvRich1SubMaster: 600466472
 /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: 1464830097
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTA_4: 3464962573
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBoxPlug_2: 1729663351
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBox_1: 2733054024
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTC_3: 3016860759
 /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/lvUTJacket_5: 3533654916
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTPipeHeater_6: 1907483245
 /world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUX851InUT_7: 31157452
 /world_volume/lvBeforeMagnetRegion_1/lvVP_2: 974646733
 /world_volume/lvBeforeMagnetRegion_1/lvVP_2/lvVeloDownStreamPipe_6: 1791284487
@@ -124,7 +124,7 @@
 /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: 3987785721
+/world_volume/lvMagnetRegion_2: 2910351921
 /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
diff --git a/compact/run3/trunk/checksums b/compact/run3/trunk/checksums
index fe7a87e6de..df2c2491c0 100644
--- a/compact/run3/trunk/checksums
+++ b/compact/run3/trunk/checksums
@@ -1,4 +1,4 @@
-/world_volume: 734658399
+/world_volume: 488621774
 /world_volume/lvAfterMagnetRegion_3: 2277670334
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1: 3260302501
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWinTubeLock: 2067417882
@@ -48,7 +48,7 @@
 /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: 1755403829
 /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
@@ -62,14 +62,14 @@
 /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: 1464830097
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTA_4: 3464962573
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBoxPlug_2: 1729663351
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBox_1: 2733054024
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTC_3: 3016860759
 /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/lvUTJacket_5: 3533654916
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTPipeHeater_6: 1907483245
 /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
@@ -125,7 +125,7 @@
 /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: 3987785721
+/world_volume/lvMagnetRegion_2: 2910351921
 /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
diff --git a/compact/run4/trunk/checksums b/compact/run4/trunk/checksums
index fe7a87e6de..df2c2491c0 100644
--- a/compact/run4/trunk/checksums
+++ b/compact/run4/trunk/checksums
@@ -1,4 +1,4 @@
-/world_volume: 734658399
+/world_volume: 488621774
 /world_volume/lvAfterMagnetRegion_3: 2277670334
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1: 3260302501
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWinTubeLock: 2067417882
@@ -48,7 +48,7 @@
 /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: 1755403829
 /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
@@ -62,14 +62,14 @@
 /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: 1464830097
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTA_4: 3464962573
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBoxPlug_2: 1729663351
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTBox_1: 2733054024
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTC_3: 3016860759
 /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/lvUTJacket_5: 3533654916
+/world_volume/lvBeforeMagnetRegion_1/lvUT_3/lvUTPipeHeater_6: 1907483245
 /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
@@ -125,7 +125,7 @@
 /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: 3987785721
+/world_volume/lvMagnetRegion_2: 2910351921
 /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
diff --git a/compact/run5/branch-baseline/checksums b/compact/run5/branch-baseline/checksums
index 003e854e86..e422d76047 100644
--- a/compact/run5/branch-baseline/checksums
+++ b/compact/run5/branch-baseline/checksums
@@ -1,4 +1,4 @@
-/world_volume: 1289401811
+/world_volume: 1730923363
 /world_volume/lvAfterMagnetRegion_3: 2838017651
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1: 3260302501
 /world_volume/lvAfterMagnetRegion_3/lvRich2Master_1/pvRich2EntryWinTubeLock: 2067417882
@@ -49,7 +49,7 @@
 /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: 1831933811
+/world_volume/lvBeforeMagnetRegion_1: 4229809929
 /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
@@ -123,7 +123,7 @@
 /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: 3987785721
+/world_volume/lvMagnetRegion_2: 2910351921
 /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
-- 
GitLab