diff --git a/Detector/UT/src/UT_geo.cpp b/Detector/UT/src/UT_geo.cpp
index 1b1e0fa85901817e020f05a10286da881359ae17..952ea4268474464ec8bd9010b5473206ba89f6d3 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 ce2d80526c68bf094dc3fe74d8c7a5ed65e31eac..6c14df488c6a796e47ea194bba264340478a95c4 100644
--- a/compact/components/Pipe/trunk/Magnet-UX851.xml
+++ b/compact/components/Pipe/trunk/Magnet-UX851.xml
@@ -33,13 +33,6 @@
-
-
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 0000000000000000000000000000000000000000..05c1cbd1f01c9c32d05ce0a1954d8b1e525a81e7
--- /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 0000000000000000000000000000000000000000..38acca7c401d35386c55e21fd84475f942322815
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/Regions-invisible.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..2c5397a6a537126c95b97bce4633afb04996c4b8
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/Regions.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..331929ee674669dc71b3145ff0ba583ec42948e5
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/detector.xml
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..f84335711d56577aeb1e292f2443d9018ad35f76
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/parameters.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..46bcfc9511a3014885f77cf1c4bb0c8e00bb8d66
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/visualization-invisible.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..127a106841bf4e206b02a64cf62a10dfc594a64e
--- /dev/null
+++ b/compact/components/Regions/2024-v00.01/visualization.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/compact/components/Regions/trunk/detector.xml b/compact/components/Regions/trunk/detector.xml
index 58109b1eb8e615fcc085ac2c8f6ca4fcd3a6653e..331929ee674669dc71b3145ff0ba583ec42948e5 100644
--- a/compact/components/Regions/trunk/detector.xml
+++ b/compact/components/Regions/trunk/detector.xml
@@ -22,8 +22,13 @@
-
+
+
+
+
+
@@ -35,8 +40,13 @@
-
+
+
+
+
+
+
+
diff --git a/compact/components/Regions/trunk/parameters.xml b/compact/components/Regions/trunk/parameters.xml
index 7cb7ed9f65a0fc33faf4dadc42a137345c316752..f84335711d56577aeb1e292f2443d9018ad35f76 100644
--- a/compact/components/Regions/trunk/parameters.xml
+++ b/compact/components/Regions/trunk/parameters.xml
@@ -25,6 +25,8 @@
+
+
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 0000000000000000000000000000000000000000..120b8d852de86349b470eb1f4778bb5df66524bb
--- /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 0000000000000000000000000000000000000000..e970a9115007b38e18046ee891727c83bf6c5768
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/Module.xml
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..0edf7f602a83567e9ed605ee72b539c139aec765
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/Sensor.xml
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..7bf12c7865cb35c6366425dc152d3364364170b6
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/Stave.xml
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..f17fdeeb61a616fac70ae67926113c0f47c26a99
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/UT.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..66eec6aa87530e6bb78d9144d20c768f4c910001
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/UTBox.xml
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..6a0f3b1f67cd0ee84fc6177f437263cbc5f46cf1
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/UTHalf.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
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 0000000000000000000000000000000000000000..cf80bd6038fca71c9d08f2db3114baec059c0454
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/UTaULayer.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..59934dacd5ecbd7b5ef15f89e70326fa8a048e9f
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/UTaXLayer.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..6825d7d96bb82072b962fbfff328a60d129d2bfb
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/UTbVLayer.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..bf871e6e53b3ec6408cbdfe589b55fd7fe7bf54f
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/UTbXLayer.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..0250992e50b438fbc70b5db2009385d9ca12ff52
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/conditions.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 0000000000000000000000000000000000000000..e8f3b38fe6eb6bc78cae3981d78e0e2b1cff06ec
--- /dev/null
+++ b/compact/components/UT/2024-v00.02/detector.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+