diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index 4ffa377789fc069131c745764cf991428c7d5b1a..545312316d9aac211e32869fdec4eb09a4f3204a 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -132,7 +132,10 @@ dd4hep_add_test_reg( ClientTests_Save_ROOT_MiniTel_LONGTEST
REGEX_PASS "\\+\\+\\+ Successfully saved geometry data to file.")
#
# Test basic shapes by comparing mesh vertices with reference file
-foreach (test Box Cone ConeSegment Tube ElTube CutTube Hyperboloid Paraboloid Polycone PseudoTrap Sphere Torus Trap Trapezoid TruncatedTube ExtrudedPolygon)
+foreach (test Box Cone ConeSegment Tube ElTube
+ CutTube Hyperboloid Paraboloid
+ Polycone PseudoTrap Sphere Torus
+ Trap Trapezoid TruncatedTube ExtrudedPolygon)
dd4hep_add_test_reg( ClientTests_Check_Shape_${test}
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
EXEC_ARGS geoDisplay file:${CMAKE_CURRENT_SOURCE_DIR}/compact/Check_Shape_${test}.xml -load -destroy
diff --git a/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml b/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml
index 3335dcf80171571aeb18a23e385361c8ad30091b..671f134afaba6df83f59ddfa1dc02373a551d5b2 100644
--- a/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml
+++ b/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml
@@ -7,14 +7,14 @@
<detector id="1" name="Shape_PseudoTrap" type="DD4hep_TestShape_Creator">
<check vis="Shape1_vis">
<shape type="PseudoTrap" z="30*cm" radius="10*cm"
- x1="10*cm" x2="3*cm" y1="30*cm" y2="10*cm" minusZ="0"/>
+ x1="10*cm" x2="3*cm" y1="30*cm" y2="10*cm" minusZ="false"/>
<position x="30*cm" y="30*cm" z="50*cm"/>
<rotation x="0" y="0" z="0"/>
</check>
<check vis="Shape2_vis">
<shape type="PseudoTrap" z="30*cm" radius="5*cm"
- x1="10*cm" x2="3*cm" y1="30*cm" y2="10*cm" minusZ="1"/>
+ x1="3*cm" x2="10*cm" y1="30*cm" y2="10*cm" minusZ="true"/>
<position x="30*cm" y="30*cm" z="-50*cm"/>
<rotation x="0" y="0" z="0"/>
</check>
diff --git a/examples/ClientTests/ref/Ref_PseudoTrap.txt b/examples/ClientTests/ref/Ref_PseudoTrap.txt
index aa09a881fd8f7c94b60dafaf4f4e0d599e1fc9d5..eef96dc40673a073768a38d7994c33c53a618540 100644
--- a/examples/ClientTests/ref/Ref_PseudoTrap.txt
+++ b/examples/ClientTests/ref/Ref_PseudoTrap.txt
@@ -49,50 +49,50 @@ TGeoCompositeShape 45 Local ( -2.71, -10.00, 30.09) Global ( 27.29, 20.
TGeoCompositeShape Bounding box: dx= 10.00 dy= 30.00 dz= 30.23 Origin: x= 0.00 y= 0.00 z= 0.23
ShapeCheck[1] TGeoCompositeShape 46 Mesh-points:
TGeoCompositeShape PseudoTrap N(mesh)=46 N(vert)=46 N(seg)=0 N(pols)=0
-TGeoCompositeShape 0 Local ( -10.00, -30.00, -30.00) Global ( 20.00, 0.00, -80.00)
-TGeoCompositeShape 1 Local ( -10.00, 30.00, -30.00) Global ( 20.00, 60.00, -80.00)
-TGeoCompositeShape 2 Local ( 10.00, 30.00, -30.00) Global ( 40.00, 60.00, -80.00)
-TGeoCompositeShape 3 Local ( 10.00, -30.00, -30.00) Global ( 40.00, 0.00, -80.00)
-TGeoCompositeShape 4 Local ( -3.00, -10.00, 30.00) Global ( 27.00, 20.00, -20.00)
-TGeoCompositeShape 5 Local ( -3.00, 10.00, 30.00) Global ( 27.00, 40.00, -20.00)
-TGeoCompositeShape 6 Local ( 3.00, 10.00, 30.00) Global ( 33.00, 40.00, -20.00)
-TGeoCompositeShape 7 Local ( 3.00, -10.00, 30.00) Global ( 33.00, 20.00, -20.00)
-TGeoCompositeShape 8 Local ( 2.74, 10.00, 30.18) Global ( 32.74, 40.00, -19.82)
-TGeoCompositeShape 9 Local ( 2.46, 10.00, 30.35) Global ( 32.46, 40.00, -19.65)
-TGeoCompositeShape 10 Local ( 2.18, 10.00, 30.50) Global ( 32.18, 40.00, -19.50)
-TGeoCompositeShape 11 Local ( 1.88, 10.00, 30.63) Global ( 31.88, 40.00, -19.37)
-TGeoCompositeShape 12 Local ( 1.58, 10.00, 30.74) Global ( 31.58, 40.00, -19.26)
-TGeoCompositeShape 13 Local ( 1.27, 10.00, 30.84) Global ( 31.27, 40.00, -19.16)
-TGeoCompositeShape 14 Local ( 0.96, 10.00, 30.91) Global ( 30.96, 40.00, -19.09)
-TGeoCompositeShape 15 Local ( 0.64, 10.00, 30.96) Global ( 30.64, 40.00, -19.04)
-TGeoCompositeShape 16 Local ( 0.32, 10.00, 30.99) Global ( 30.32, 40.00, -19.01)
-TGeoCompositeShape 17 Local ( 0.00, 10.00, 31.00) Global ( 30.00, 40.00, -19.00)
-TGeoCompositeShape 18 Local ( -0.32, 10.00, 30.99) Global ( 29.68, 40.00, -19.01)
-TGeoCompositeShape 19 Local ( -0.64, 10.00, 30.96) Global ( 29.36, 40.00, -19.04)
-TGeoCompositeShape 20 Local ( -0.96, 10.00, 30.91) Global ( 29.04, 40.00, -19.09)
-TGeoCompositeShape 21 Local ( -1.27, 10.00, 30.84) Global ( 28.73, 40.00, -19.16)
-TGeoCompositeShape 22 Local ( -1.58, 10.00, 30.74) Global ( 28.42, 40.00, -19.26)
-TGeoCompositeShape 23 Local ( -1.88, 10.00, 30.63) Global ( 28.12, 40.00, -19.37)
-TGeoCompositeShape 24 Local ( -2.18, 10.00, 30.50) Global ( 27.82, 40.00, -19.50)
-TGeoCompositeShape 25 Local ( -2.46, 10.00, 30.35) Global ( 27.54, 40.00, -19.65)
-TGeoCompositeShape 26 Local ( -2.74, 10.00, 30.18) Global ( 27.26, 40.00, -19.82)
-TGeoCompositeShape 27 Local ( 2.74, -10.00, 30.18) Global ( 32.74, 20.00, -19.82)
-TGeoCompositeShape 28 Local ( 2.46, -10.00, 30.35) Global ( 32.46, 20.00, -19.65)
-TGeoCompositeShape 29 Local ( 2.18, -10.00, 30.50) Global ( 32.18, 20.00, -19.50)
-TGeoCompositeShape 30 Local ( 1.88, -10.00, 30.63) Global ( 31.88, 20.00, -19.37)
-TGeoCompositeShape 31 Local ( 1.58, -10.00, 30.74) Global ( 31.58, 20.00, -19.26)
-TGeoCompositeShape 32 Local ( 1.27, -10.00, 30.84) Global ( 31.27, 20.00, -19.16)
-TGeoCompositeShape 33 Local ( 0.96, -10.00, 30.91) Global ( 30.96, 20.00, -19.09)
-TGeoCompositeShape 34 Local ( 0.64, -10.00, 30.96) Global ( 30.64, 20.00, -19.04)
-TGeoCompositeShape 35 Local ( 0.32, -10.00, 30.99) Global ( 30.32, 20.00, -19.01)
-TGeoCompositeShape 36 Local ( 0.00, -10.00, 31.00) Global ( 30.00, 20.00, -19.00)
-TGeoCompositeShape 37 Local ( -0.32, -10.00, 30.99) Global ( 29.68, 20.00, -19.01)
-TGeoCompositeShape 38 Local ( -0.64, -10.00, 30.96) Global ( 29.36, 20.00, -19.04)
-TGeoCompositeShape 39 Local ( -0.96, -10.00, 30.91) Global ( 29.04, 20.00, -19.09)
-TGeoCompositeShape 40 Local ( -1.27, -10.00, 30.84) Global ( 28.73, 20.00, -19.16)
-TGeoCompositeShape 41 Local ( -1.58, -10.00, 30.74) Global ( 28.42, 20.00, -19.26)
-TGeoCompositeShape 42 Local ( -1.88, -10.00, 30.63) Global ( 28.12, 20.00, -19.37)
-TGeoCompositeShape 43 Local ( -2.18, -10.00, 30.50) Global ( 27.82, 20.00, -19.50)
-TGeoCompositeShape 44 Local ( -2.46, -10.00, 30.35) Global ( 27.54, 20.00, -19.65)
-TGeoCompositeShape 45 Local ( -2.74, -10.00, 30.18) Global ( 27.26, 20.00, -19.82)
-TGeoCompositeShape Bounding box: dx= 10.00 dy= 30.00 dz= 30.50 Origin: x= 0.00 y= 0.00 z= 0.50
+TGeoCompositeShape 0 Local ( -3.00, -30.00, -30.00) Global ( 27.00, 0.00, -80.00)
+TGeoCompositeShape 1 Local ( -3.00, 30.00, -30.00) Global ( 27.00, 60.00, -80.00)
+TGeoCompositeShape 2 Local ( 3.00, 30.00, -30.00) Global ( 33.00, 60.00, -80.00)
+TGeoCompositeShape 3 Local ( 3.00, -30.00, -30.00) Global ( 33.00, 0.00, -80.00)
+TGeoCompositeShape 4 Local ( -10.00, -10.00, 30.00) Global ( 20.00, 20.00, -20.00)
+TGeoCompositeShape 5 Local ( -10.00, 10.00, 30.00) Global ( 20.00, 40.00, -20.00)
+TGeoCompositeShape 6 Local ( 10.00, 10.00, 30.00) Global ( 40.00, 40.00, -20.00)
+TGeoCompositeShape 7 Local ( 10.00, -10.00, 30.00) Global ( 40.00, 20.00, -20.00)
+TGeoCompositeShape 8 Local ( -2.74, 30.00, -30.18) Global ( 27.26, 60.00, -80.18)
+TGeoCompositeShape 9 Local ( -2.46, 30.00, -30.35) Global ( 27.54, 60.00, -80.35)
+TGeoCompositeShape 10 Local ( -2.18, 30.00, -30.50) Global ( 27.82, 60.00, -80.50)
+TGeoCompositeShape 11 Local ( -1.88, 30.00, -30.63) Global ( 28.12, 60.00, -80.63)
+TGeoCompositeShape 12 Local ( -1.58, 30.00, -30.74) Global ( 28.42, 60.00, -80.74)
+TGeoCompositeShape 13 Local ( -1.27, 30.00, -30.84) Global ( 28.73, 60.00, -80.84)
+TGeoCompositeShape 14 Local ( -0.96, 30.00, -30.91) Global ( 29.04, 60.00, -80.91)
+TGeoCompositeShape 15 Local ( -0.64, 30.00, -30.96) Global ( 29.36, 60.00, -80.96)
+TGeoCompositeShape 16 Local ( -0.32, 30.00, -30.99) Global ( 29.68, 60.00, -80.99)
+TGeoCompositeShape 17 Local ( -0.00, 30.00, -31.00) Global ( 30.00, 60.00, -81.00)
+TGeoCompositeShape 18 Local ( 0.32, 30.00, -30.99) Global ( 30.32, 60.00, -80.99)
+TGeoCompositeShape 19 Local ( 0.64, 30.00, -30.96) Global ( 30.64, 60.00, -80.96)
+TGeoCompositeShape 20 Local ( 0.96, 30.00, -30.91) Global ( 30.96, 60.00, -80.91)
+TGeoCompositeShape 21 Local ( 1.27, 30.00, -30.84) Global ( 31.27, 60.00, -80.84)
+TGeoCompositeShape 22 Local ( 1.58, 30.00, -30.74) Global ( 31.58, 60.00, -80.74)
+TGeoCompositeShape 23 Local ( 1.88, 30.00, -30.63) Global ( 31.88, 60.00, -80.63)
+TGeoCompositeShape 24 Local ( 2.18, 30.00, -30.50) Global ( 32.18, 60.00, -80.50)
+TGeoCompositeShape 25 Local ( 2.46, 30.00, -30.35) Global ( 32.46, 60.00, -80.35)
+TGeoCompositeShape 26 Local ( 2.74, 30.00, -30.18) Global ( 32.74, 60.00, -80.18)
+TGeoCompositeShape 27 Local ( -2.74, -30.00, -30.18) Global ( 27.26, 0.00, -80.18)
+TGeoCompositeShape 28 Local ( -2.46, -30.00, -30.35) Global ( 27.54, 0.00, -80.35)
+TGeoCompositeShape 29 Local ( -2.18, -30.00, -30.50) Global ( 27.82, 0.00, -80.50)
+TGeoCompositeShape 30 Local ( -1.88, -30.00, -30.63) Global ( 28.12, 0.00, -80.63)
+TGeoCompositeShape 31 Local ( -1.58, -30.00, -30.74) Global ( 28.42, 0.00, -80.74)
+TGeoCompositeShape 32 Local ( -1.27, -30.00, -30.84) Global ( 28.73, 0.00, -80.84)
+TGeoCompositeShape 33 Local ( -0.96, -30.00, -30.91) Global ( 29.04, 0.00, -80.91)
+TGeoCompositeShape 34 Local ( -0.64, -30.00, -30.96) Global ( 29.36, 0.00, -80.96)
+TGeoCompositeShape 35 Local ( -0.32, -30.00, -30.99) Global ( 29.68, 0.00, -80.99)
+TGeoCompositeShape 36 Local ( -0.00, -30.00, -31.00) Global ( 30.00, 0.00, -81.00)
+TGeoCompositeShape 37 Local ( 0.32, -30.00, -30.99) Global ( 30.32, 0.00, -80.99)
+TGeoCompositeShape 38 Local ( 0.64, -30.00, -30.96) Global ( 30.64, 0.00, -80.96)
+TGeoCompositeShape 39 Local ( 0.96, -30.00, -30.91) Global ( 30.96, 0.00, -80.91)
+TGeoCompositeShape 40 Local ( 1.27, -30.00, -30.84) Global ( 31.27, 0.00, -80.84)
+TGeoCompositeShape 41 Local ( 1.58, -30.00, -30.74) Global ( 31.58, 0.00, -80.74)
+TGeoCompositeShape 42 Local ( 1.88, -30.00, -30.63) Global ( 31.88, 0.00, -80.63)
+TGeoCompositeShape 43 Local ( 2.18, -30.00, -30.50) Global ( 32.18, 0.00, -80.50)
+TGeoCompositeShape 44 Local ( 2.46, -30.00, -30.35) Global ( 32.46, 0.00, -80.35)
+TGeoCompositeShape 45 Local ( 2.74, -30.00, -30.18) Global ( 32.74, 0.00, -80.18)
+TGeoCompositeShape Bounding box: dx= 10.00 dy= 30.00 dz= 30.50 Origin: x= 0.00 y= 0.00 z= -0.50