From d740157b70740cd1de3cd6d4dba41b7a05cd4ab3 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Mon, 4 Jun 2018 11:39:59 +0200
Subject: [PATCH] New attempt to fix truncated tube shape

---
 DDCore/src/Shapes.cpp                         |  12 +-
 .../compact/Check_Shape_TruncatedTube.xml     |  13 +
 .../ClientTests/ref/Ref_TruncatedTube.txt     | 257 ++++++------------
 3 files changed, 104 insertions(+), 178 deletions(-)

diff --git a/DDCore/src/Shapes.cpp b/DDCore/src/Shapes.cpp
index dddaa025d..709c55cc5 100644
--- a/DDCore/src/Shapes.cpp
+++ b/DDCore/src/Shapes.cpp
@@ -436,13 +436,13 @@ void TruncatedTube::make(double zhalf, double rmin, double rmax, double startPhi
   double r         = cutAtStart;
   double R         = cutAtDelta;
   // exaggerate dimensions - does not matter, it's subtracted!
-  double boxX      = rmax;
-  double boxY      = rmax;
+  double boxX      = 30.*rmax;
+  double boxY      = 20.*rmax;
   // width of the box > width of the tubs
   double boxZ      = 1.1 * zhalf;
   // angle of the box w.r.t. tubs
   double cath      = r - R * std::cos( deltaPhi*units::deg );
-  double hypo      = std::sqrt( r * r + R * R - 2. * r * R * cos( deltaPhi*units::deg ));
+  double hypo      = std::sqrt( r * r + R * R - 2. * r * R * std::cos( deltaPhi*units::deg ));
   double cos_alpha = cath / hypo;
   double alpha     = -std::acos( cos_alpha );
          
@@ -456,15 +456,15 @@ void TruncatedTube::make(double zhalf, double rmin, double rmax, double startPhi
   if( !cutInside )
     xBox = r + boxX / std::sin( std::fabs( alpha ));
   else
-    xBox = - ( boxX / std::sin( std::fabs( alpha )) - r );
+    xBox = - (boxX / std::sin( std::fabs( alpha )) - r);
 #if 0
   cout << "Box:  " << boxX << " " << boxZ << " " << boxY << endl;
   cout << "Tubs: " << rmin << " " << rmax << " " << zhalf << " " << startPhi << " " << deltaPhi << endl;
   cout << "Pos:  " << xBox << " " << 0 << " " << 0 << endl;
 #endif
-  Box  box(boxX, boxZ, boxY);
+  Box  box(boxX, boxY, boxZ);
   Tube tubs(rmin, rmax, zhalf, startPhi*units::deg, (startPhi+deltaPhi)*units::deg);
-  SubtractionSolid sub(tubs, box, Transform3D(rot,Position(xBox, 0., 0.)));
+  SubtractionSolid sub(tubs, box, Transform3D(rot,Position(xBox,0.,0.)));
   _assign(sub.ptr(),"","trunctube",true);
 }
 
diff --git a/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml b/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml
index 2c1953799..65cee856d 100644
--- a/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml
+++ b/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml
@@ -5,6 +5,17 @@
 
   <detectors>
     <detector id="1" name="Shape_TruncatedTube" type="DD4hep_TestShape_Creator">
+<!--
+      <TruncTubs name="trunctubs2" rMin="6.9551*m" rMax="9*m" cutAtStart="6.9551*m" cutAtDelta="7.20045*m" cutInside="true" startPhi="0*deg" deltaPhi="15*deg" zHalf="6.57005*m"/>
+-->
+
+      <check vis="Shape1_vis">
+        <shape type="TruncatedTube" zhalf="6.57005*m" rmin="6.9551*m" rmax="9*m" 
+               startphi="0*deg" deltaphi="15*deg" 
+               cutAtStart="6.9551*m" cutAtDelta="7.20045*m" cutInside="1"/>
+      </check>
+
+<!--
       <check vis="Shape1_vis">
         <shape type="TruncatedTube" zhalf="50*cm" rmin="20*cm" rmax="40*cm" 
                startphi="0*rad" deltaphi="pi/2.*rad" 
@@ -17,6 +28,8 @@
         <position x="30*cm"  y="30*cm"   z="-90*cm"/>
         <rotation x="0*cm"   y="0*cm"    z="0*cm"/>
       </check>
+-->
+
       <test  type="DD4hep_Mesh_Verifier" ref="${DD4hepINSTALL}/examples/ClientTests/ref/Ref_TruncatedTube.txt" create="CheckShape_create"/>
     </detector>
   </detectors>
diff --git a/examples/ClientTests/ref/Ref_TruncatedTube.txt b/examples/ClientTests/ref/Ref_TruncatedTube.txt
index 3a10e9de0..412be0c6a 100644
--- a/examples/ClientTests/ref/Ref_TruncatedTube.txt
+++ b/examples/ClientTests/ref/Ref_TruncatedTube.txt
@@ -1,174 +1,87 @@
 ShapeCheck[0] TGeoCompositeShape 84 Mesh-points:
 TGeoCompositeShape TruncatedTube N(mesh)=84  N(vert)=84  N(seg)=0  N(pols)=0
-TGeoCompositeShape 0   Local  (  20.00,    0.00,  -50.00) Global (  20.00,    0.00,  -50.00)
-TGeoCompositeShape 1   Local  (  19.94,    1.57,  -50.00) Global (  19.94,    1.57,  -50.00)
-TGeoCompositeShape 2   Local  (  19.75,    3.13,  -50.00) Global (  19.75,    3.13,  -50.00)
-TGeoCompositeShape 3   Local  (  19.45,    4.67,  -50.00) Global (  19.45,    4.67,  -50.00)
-TGeoCompositeShape 4   Local  (  19.02,    6.18,  -50.00) Global (  19.02,    6.18,  -50.00)
-TGeoCompositeShape 5   Local  (  18.48,    7.65,  -50.00) Global (  18.48,    7.65,  -50.00)
-TGeoCompositeShape 6   Local  (  17.82,    9.08,  -50.00) Global (  17.82,    9.08,  -50.00)
-TGeoCompositeShape 7   Local  (  17.05,   10.45,  -50.00) Global (  17.05,   10.45,  -50.00)
-TGeoCompositeShape 8   Local  (  16.18,   11.76,  -50.00) Global (  16.18,   11.76,  -50.00)
-TGeoCompositeShape 9   Local  (  15.21,   12.99,  -50.00) Global (  15.21,   12.99,  -50.00)
-TGeoCompositeShape 10  Local  (  14.14,   14.14,  -50.00) Global (  14.14,   14.14,  -50.00)
-TGeoCompositeShape 11  Local  (  12.99,   15.21,  -50.00) Global (  12.99,   15.21,  -50.00)
-TGeoCompositeShape 12  Local  (  11.76,   16.18,  -50.00) Global (  11.76,   16.18,  -50.00)
-TGeoCompositeShape 13  Local  (  10.45,   17.05,  -50.00) Global (  10.45,   17.05,  -50.00)
-TGeoCompositeShape 14  Local  (   9.08,   17.82,  -50.00) Global (   9.08,   17.82,  -50.00)
-TGeoCompositeShape 15  Local  (   7.65,   18.48,  -50.00) Global (   7.65,   18.48,  -50.00)
-TGeoCompositeShape 16  Local  (   6.18,   19.02,  -50.00) Global (   6.18,   19.02,  -50.00)
-TGeoCompositeShape 17  Local  (   4.67,   19.45,  -50.00) Global (   4.67,   19.45,  -50.00)
-TGeoCompositeShape 18  Local  (   3.13,   19.75,  -50.00) Global (   3.13,   19.75,  -50.00)
-TGeoCompositeShape 19  Local  (   1.57,   19.94,  -50.00) Global (   1.57,   19.94,  -50.00)
-TGeoCompositeShape 20  Local  (   0.00,   20.00,  -50.00) Global (   0.00,   20.00,  -50.00)
-TGeoCompositeShape 21  Local  (  40.00,    0.00,  -50.00) Global (  40.00,    0.00,  -50.00)
-TGeoCompositeShape 22  Local  (  39.88,    3.14,  -50.00) Global (  39.88,    3.14,  -50.00)
-TGeoCompositeShape 23  Local  (  39.51,    6.26,  -50.00) Global (  39.51,    6.26,  -50.00)
-TGeoCompositeShape 24  Local  (  38.89,    9.34,  -50.00) Global (  38.89,    9.34,  -50.00)
-TGeoCompositeShape 25  Local  (  38.04,   12.36,  -50.00) Global (  38.04,   12.36,  -50.00)
-TGeoCompositeShape 26  Local  (  36.96,   15.31,  -50.00) Global (  36.96,   15.31,  -50.00)
-TGeoCompositeShape 27  Local  (  35.64,   18.16,  -50.00) Global (  35.64,   18.16,  -50.00)
-TGeoCompositeShape 28  Local  (  34.11,   20.90,  -50.00) Global (  34.11,   20.90,  -50.00)
-TGeoCompositeShape 29  Local  (  32.36,   23.51,  -50.00) Global (  32.36,   23.51,  -50.00)
-TGeoCompositeShape 30  Local  (  30.42,   25.98,  -50.00) Global (  30.42,   25.98,  -50.00)
-TGeoCompositeShape 31  Local  (  28.28,   28.28,  -50.00) Global (  28.28,   28.28,  -50.00)
-TGeoCompositeShape 32  Local  (  25.98,   30.42,  -50.00) Global (  25.98,   30.42,  -50.00)
-TGeoCompositeShape 33  Local  (  23.51,   32.36,  -50.00) Global (  23.51,   32.36,  -50.00)
-TGeoCompositeShape 34  Local  (  20.90,   34.11,  -50.00) Global (  20.90,   34.11,  -50.00)
-TGeoCompositeShape 35  Local  (  18.16,   35.64,  -50.00) Global (  18.16,   35.64,  -50.00)
-TGeoCompositeShape 36  Local  (  15.31,   36.96,  -50.00) Global (  15.31,   36.96,  -50.00)
-TGeoCompositeShape 37  Local  (  12.36,   38.04,  -50.00) Global (  12.36,   38.04,  -50.00)
-TGeoCompositeShape 38  Local  (   9.34,   38.89,  -50.00) Global (   9.34,   38.89,  -50.00)
-TGeoCompositeShape 39  Local  (   6.26,   39.51,  -50.00) Global (   6.26,   39.51,  -50.00)
-TGeoCompositeShape 40  Local  (   3.14,   39.88,  -50.00) Global (   3.14,   39.88,  -50.00)
-TGeoCompositeShape 41  Local  (   0.00,   40.00,  -50.00) Global (   0.00,   40.00,  -50.00)
-TGeoCompositeShape 42  Local  (  20.00,    0.00,   50.00) Global (  20.00,    0.00,   50.00)
-TGeoCompositeShape 43  Local  (  19.94,    1.57,   50.00) Global (  19.94,    1.57,   50.00)
-TGeoCompositeShape 44  Local  (  19.75,    3.13,   50.00) Global (  19.75,    3.13,   50.00)
-TGeoCompositeShape 45  Local  (  19.45,    4.67,   50.00) Global (  19.45,    4.67,   50.00)
-TGeoCompositeShape 46  Local  (  19.02,    6.18,   50.00) Global (  19.02,    6.18,   50.00)
-TGeoCompositeShape 47  Local  (  18.48,    7.65,   50.00) Global (  18.48,    7.65,   50.00)
-TGeoCompositeShape 48  Local  (  17.82,    9.08,   50.00) Global (  17.82,    9.08,   50.00)
-TGeoCompositeShape 49  Local  (  17.05,   10.45,   50.00) Global (  17.05,   10.45,   50.00)
-TGeoCompositeShape 50  Local  (  16.18,   11.76,   50.00) Global (  16.18,   11.76,   50.00)
-TGeoCompositeShape 51  Local  (  15.21,   12.99,   50.00) Global (  15.21,   12.99,   50.00)
-TGeoCompositeShape 52  Local  (  14.14,   14.14,   50.00) Global (  14.14,   14.14,   50.00)
-TGeoCompositeShape 53  Local  (  12.99,   15.21,   50.00) Global (  12.99,   15.21,   50.00)
-TGeoCompositeShape 54  Local  (  11.76,   16.18,   50.00) Global (  11.76,   16.18,   50.00)
-TGeoCompositeShape 55  Local  (  10.45,   17.05,   50.00) Global (  10.45,   17.05,   50.00)
-TGeoCompositeShape 56  Local  (   9.08,   17.82,   50.00) Global (   9.08,   17.82,   50.00)
-TGeoCompositeShape 57  Local  (   7.65,   18.48,   50.00) Global (   7.65,   18.48,   50.00)
-TGeoCompositeShape 58  Local  (   6.18,   19.02,   50.00) Global (   6.18,   19.02,   50.00)
-TGeoCompositeShape 59  Local  (   4.67,   19.45,   50.00) Global (   4.67,   19.45,   50.00)
-TGeoCompositeShape 60  Local  (   3.13,   19.75,   50.00) Global (   3.13,   19.75,   50.00)
-TGeoCompositeShape 61  Local  (   1.57,   19.94,   50.00) Global (   1.57,   19.94,   50.00)
-TGeoCompositeShape 62  Local  (   0.00,   20.00,   50.00) Global (   0.00,   20.00,   50.00)
-TGeoCompositeShape 63  Local  (  40.00,    0.00,   50.00) Global (  40.00,    0.00,   50.00)
-TGeoCompositeShape 64  Local  (  39.88,    3.14,   50.00) Global (  39.88,    3.14,   50.00)
-TGeoCompositeShape 65  Local  (  39.51,    6.26,   50.00) Global (  39.51,    6.26,   50.00)
-TGeoCompositeShape 66  Local  (  38.89,    9.34,   50.00) Global (  38.89,    9.34,   50.00)
-TGeoCompositeShape 67  Local  (  38.04,   12.36,   50.00) Global (  38.04,   12.36,   50.00)
-TGeoCompositeShape 68  Local  (  36.96,   15.31,   50.00) Global (  36.96,   15.31,   50.00)
-TGeoCompositeShape 69  Local  (  35.64,   18.16,   50.00) Global (  35.64,   18.16,   50.00)
-TGeoCompositeShape 70  Local  (  34.11,   20.90,   50.00) Global (  34.11,   20.90,   50.00)
-TGeoCompositeShape 71  Local  (  32.36,   23.51,   50.00) Global (  32.36,   23.51,   50.00)
-TGeoCompositeShape 72  Local  (  30.42,   25.98,   50.00) Global (  30.42,   25.98,   50.00)
-TGeoCompositeShape 73  Local  (  28.28,   28.28,   50.00) Global (  28.28,   28.28,   50.00)
-TGeoCompositeShape 74  Local  (  25.98,   30.42,   50.00) Global (  25.98,   30.42,   50.00)
-TGeoCompositeShape 75  Local  (  23.51,   32.36,   50.00) Global (  23.51,   32.36,   50.00)
-TGeoCompositeShape 76  Local  (  20.90,   34.11,   50.00) Global (  20.90,   34.11,   50.00)
-TGeoCompositeShape 77  Local  (  18.16,   35.64,   50.00) Global (  18.16,   35.64,   50.00)
-TGeoCompositeShape 78  Local  (  15.31,   36.96,   50.00) Global (  15.31,   36.96,   50.00)
-TGeoCompositeShape 79  Local  (  12.36,   38.04,   50.00) Global (  12.36,   38.04,   50.00)
-TGeoCompositeShape 80  Local  (   9.34,   38.89,   50.00) Global (   9.34,   38.89,   50.00)
-TGeoCompositeShape 81  Local  (   6.26,   39.51,   50.00) Global (   6.26,   39.51,   50.00)
-TGeoCompositeShape 82  Local  (   3.14,   39.88,   50.00) Global (   3.14,   39.88,   50.00)
-TGeoCompositeShape 83  Local  (   0.00,   40.00,   50.00) Global (   0.00,   40.00,   50.00)
-TGeoCompositeShape Bounding box:  dx=  20.00 dy=  20.00 dz=  50.00 Origin: x=  20.00 y=  20.00 z=   0.00
-ShapeCheck[1] TGeoCompositeShape 84 Mesh-points:
-TGeoCompositeShape TruncatedTube N(mesh)=84  N(vert)=84  N(seg)=0  N(pols)=0
-TGeoCompositeShape 0   Local  (  20.00,    0.00,  -50.00) Global (  50.00,   30.00, -140.00)
-TGeoCompositeShape 1   Local  (  19.94,    1.57,  -50.00) Global (  49.94,   31.57, -140.00)
-TGeoCompositeShape 2   Local  (  19.75,    3.13,  -50.00) Global (  49.75,   33.13, -140.00)
-TGeoCompositeShape 3   Local  (  19.45,    4.67,  -50.00) Global (  49.45,   34.67, -140.00)
-TGeoCompositeShape 4   Local  (  19.02,    6.18,  -50.00) Global (  49.02,   36.18, -140.00)
-TGeoCompositeShape 5   Local  (  18.48,    7.65,  -50.00) Global (  48.48,   37.65, -140.00)
-TGeoCompositeShape 6   Local  (  17.82,    9.08,  -50.00) Global (  47.82,   39.08, -140.00)
-TGeoCompositeShape 7   Local  (  17.05,   10.45,  -50.00) Global (  47.05,   40.45, -140.00)
-TGeoCompositeShape 8   Local  (  16.18,   11.76,  -50.00) Global (  46.18,   41.76, -140.00)
-TGeoCompositeShape 9   Local  (  15.21,   12.99,  -50.00) Global (  45.21,   42.99, -140.00)
-TGeoCompositeShape 10  Local  (  14.14,   14.14,  -50.00) Global (  44.14,   44.14, -140.00)
-TGeoCompositeShape 11  Local  (  12.99,   15.21,  -50.00) Global (  42.99,   45.21, -140.00)
-TGeoCompositeShape 12  Local  (  11.76,   16.18,  -50.00) Global (  41.76,   46.18, -140.00)
-TGeoCompositeShape 13  Local  (  10.45,   17.05,  -50.00) Global (  40.45,   47.05, -140.00)
-TGeoCompositeShape 14  Local  (   9.08,   17.82,  -50.00) Global (  39.08,   47.82, -140.00)
-TGeoCompositeShape 15  Local  (   7.65,   18.48,  -50.00) Global (  37.65,   48.48, -140.00)
-TGeoCompositeShape 16  Local  (   6.18,   19.02,  -50.00) Global (  36.18,   49.02, -140.00)
-TGeoCompositeShape 17  Local  (   4.67,   19.45,  -50.00) Global (  34.67,   49.45, -140.00)
-TGeoCompositeShape 18  Local  (   3.13,   19.75,  -50.00) Global (  33.13,   49.75, -140.00)
-TGeoCompositeShape 19  Local  (   1.57,   19.94,  -50.00) Global (  31.57,   49.94, -140.00)
-TGeoCompositeShape 20  Local  (   0.00,   20.00,  -50.00) Global (  30.00,   50.00, -140.00)
-TGeoCompositeShape 21  Local  (  40.00,    0.00,  -50.00) Global (  70.00,   30.00, -140.00)
-TGeoCompositeShape 22  Local  (  39.88,    3.14,  -50.00) Global (  69.88,   33.14, -140.00)
-TGeoCompositeShape 23  Local  (  39.51,    6.26,  -50.00) Global (  69.51,   36.26, -140.00)
-TGeoCompositeShape 24  Local  (  38.89,    9.34,  -50.00) Global (  68.89,   39.34, -140.00)
-TGeoCompositeShape 25  Local  (  38.04,   12.36,  -50.00) Global (  68.04,   42.36, -140.00)
-TGeoCompositeShape 26  Local  (  36.96,   15.31,  -50.00) Global (  66.96,   45.31, -140.00)
-TGeoCompositeShape 27  Local  (  35.64,   18.16,  -50.00) Global (  65.64,   48.16, -140.00)
-TGeoCompositeShape 28  Local  (  34.11,   20.90,  -50.00) Global (  64.11,   50.90, -140.00)
-TGeoCompositeShape 29  Local  (  32.36,   23.51,  -50.00) Global (  62.36,   53.51, -140.00)
-TGeoCompositeShape 30  Local  (  30.42,   25.98,  -50.00) Global (  60.42,   55.98, -140.00)
-TGeoCompositeShape 31  Local  (  28.28,   28.28,  -50.00) Global (  58.28,   58.28, -140.00)
-TGeoCompositeShape 32  Local  (  25.98,   30.42,  -50.00) Global (  55.98,   60.42, -140.00)
-TGeoCompositeShape 33  Local  (  23.51,   32.36,  -50.00) Global (  53.51,   62.36, -140.00)
-TGeoCompositeShape 34  Local  (  20.90,   34.11,  -50.00) Global (  50.90,   64.11, -140.00)
-TGeoCompositeShape 35  Local  (  18.16,   35.64,  -50.00) Global (  48.16,   65.64, -140.00)
-TGeoCompositeShape 36  Local  (  15.31,   36.96,  -50.00) Global (  45.31,   66.96, -140.00)
-TGeoCompositeShape 37  Local  (  12.36,   38.04,  -50.00) Global (  42.36,   68.04, -140.00)
-TGeoCompositeShape 38  Local  (   9.34,   38.89,  -50.00) Global (  39.34,   68.89, -140.00)
-TGeoCompositeShape 39  Local  (   6.26,   39.51,  -50.00) Global (  36.26,   69.51, -140.00)
-TGeoCompositeShape 40  Local  (   3.14,   39.88,  -50.00) Global (  33.14,   69.88, -140.00)
-TGeoCompositeShape 41  Local  (   0.00,   40.00,  -50.00) Global (  30.00,   70.00, -140.00)
-TGeoCompositeShape 42  Local  (  20.00,    0.00,   50.00) Global (  50.00,   30.00,  -40.00)
-TGeoCompositeShape 43  Local  (  19.94,    1.57,   50.00) Global (  49.94,   31.57,  -40.00)
-TGeoCompositeShape 44  Local  (  19.75,    3.13,   50.00) Global (  49.75,   33.13,  -40.00)
-TGeoCompositeShape 45  Local  (  19.45,    4.67,   50.00) Global (  49.45,   34.67,  -40.00)
-TGeoCompositeShape 46  Local  (  19.02,    6.18,   50.00) Global (  49.02,   36.18,  -40.00)
-TGeoCompositeShape 47  Local  (  18.48,    7.65,   50.00) Global (  48.48,   37.65,  -40.00)
-TGeoCompositeShape 48  Local  (  17.82,    9.08,   50.00) Global (  47.82,   39.08,  -40.00)
-TGeoCompositeShape 49  Local  (  17.05,   10.45,   50.00) Global (  47.05,   40.45,  -40.00)
-TGeoCompositeShape 50  Local  (  16.18,   11.76,   50.00) Global (  46.18,   41.76,  -40.00)
-TGeoCompositeShape 51  Local  (  15.21,   12.99,   50.00) Global (  45.21,   42.99,  -40.00)
-TGeoCompositeShape 52  Local  (  14.14,   14.14,   50.00) Global (  44.14,   44.14,  -40.00)
-TGeoCompositeShape 53  Local  (  12.99,   15.21,   50.00) Global (  42.99,   45.21,  -40.00)
-TGeoCompositeShape 54  Local  (  11.76,   16.18,   50.00) Global (  41.76,   46.18,  -40.00)
-TGeoCompositeShape 55  Local  (  10.45,   17.05,   50.00) Global (  40.45,   47.05,  -40.00)
-TGeoCompositeShape 56  Local  (   9.08,   17.82,   50.00) Global (  39.08,   47.82,  -40.00)
-TGeoCompositeShape 57  Local  (   7.65,   18.48,   50.00) Global (  37.65,   48.48,  -40.00)
-TGeoCompositeShape 58  Local  (   6.18,   19.02,   50.00) Global (  36.18,   49.02,  -40.00)
-TGeoCompositeShape 59  Local  (   4.67,   19.45,   50.00) Global (  34.67,   49.45,  -40.00)
-TGeoCompositeShape 60  Local  (   3.13,   19.75,   50.00) Global (  33.13,   49.75,  -40.00)
-TGeoCompositeShape 61  Local  (   1.57,   19.94,   50.00) Global (  31.57,   49.94,  -40.00)
-TGeoCompositeShape 62  Local  (   0.00,   20.00,   50.00) Global (  30.00,   50.00,  -40.00)
-TGeoCompositeShape 63  Local  (  40.00,    0.00,   50.00) Global (  70.00,   30.00,  -40.00)
-TGeoCompositeShape 64  Local  (  39.88,    3.14,   50.00) Global (  69.88,   33.14,  -40.00)
-TGeoCompositeShape 65  Local  (  39.51,    6.26,   50.00) Global (  69.51,   36.26,  -40.00)
-TGeoCompositeShape 66  Local  (  38.89,    9.34,   50.00) Global (  68.89,   39.34,  -40.00)
-TGeoCompositeShape 67  Local  (  38.04,   12.36,   50.00) Global (  68.04,   42.36,  -40.00)
-TGeoCompositeShape 68  Local  (  36.96,   15.31,   50.00) Global (  66.96,   45.31,  -40.00)
-TGeoCompositeShape 69  Local  (  35.64,   18.16,   50.00) Global (  65.64,   48.16,  -40.00)
-TGeoCompositeShape 70  Local  (  34.11,   20.90,   50.00) Global (  64.11,   50.90,  -40.00)
-TGeoCompositeShape 71  Local  (  32.36,   23.51,   50.00) Global (  62.36,   53.51,  -40.00)
-TGeoCompositeShape 72  Local  (  30.42,   25.98,   50.00) Global (  60.42,   55.98,  -40.00)
-TGeoCompositeShape 73  Local  (  28.28,   28.28,   50.00) Global (  58.28,   58.28,  -40.00)
-TGeoCompositeShape 74  Local  (  25.98,   30.42,   50.00) Global (  55.98,   60.42,  -40.00)
-TGeoCompositeShape 75  Local  (  23.51,   32.36,   50.00) Global (  53.51,   62.36,  -40.00)
-TGeoCompositeShape 76  Local  (  20.90,   34.11,   50.00) Global (  50.90,   64.11,  -40.00)
-TGeoCompositeShape 77  Local  (  18.16,   35.64,   50.00) Global (  48.16,   65.64,  -40.00)
-TGeoCompositeShape 78  Local  (  15.31,   36.96,   50.00) Global (  45.31,   66.96,  -40.00)
-TGeoCompositeShape 79  Local  (  12.36,   38.04,   50.00) Global (  42.36,   68.04,  -40.00)
-TGeoCompositeShape 80  Local  (   9.34,   38.89,   50.00) Global (  39.34,   68.89,  -40.00)
-TGeoCompositeShape 81  Local  (   6.26,   39.51,   50.00) Global (  36.26,   69.51,  -40.00)
-TGeoCompositeShape 82  Local  (   3.14,   39.88,   50.00) Global (  33.14,   69.88,  -40.00)
-TGeoCompositeShape 83  Local  (   0.00,   40.00,   50.00) Global (  30.00,   70.00,  -40.00)
-TGeoCompositeShape Bounding box:  dx=  20.00 dy=  20.00 dz=  50.00 Origin: x=  20.00 y=  20.00 z=   0.00
+TGeoCompositeShape 0   Local  ( 695.51,    0.00, -657.00) Global ( 695.51,    0.00, -657.00)
+TGeoCompositeShape 1   Local  ( 695.45,    9.10, -657.00) Global ( 695.45,    9.10, -657.00)
+TGeoCompositeShape 2   Local  ( 695.27,   18.21, -657.00) Global ( 695.27,   18.21, -657.00)
+TGeoCompositeShape 3   Local  ( 694.97,   27.31, -657.00) Global ( 694.97,   27.31, -657.00)
+TGeoCompositeShape 4   Local  ( 694.56,   36.40, -657.00) Global ( 694.56,   36.40, -657.00)
+TGeoCompositeShape 5   Local  ( 694.02,   45.49, -657.00) Global ( 694.02,   45.49, -657.00)
+TGeoCompositeShape 6   Local  ( 693.37,   54.57, -657.00) Global ( 693.37,   54.57, -657.00)
+TGeoCompositeShape 7   Local  ( 692.59,   63.64, -657.00) Global ( 692.59,   63.64, -657.00)
+TGeoCompositeShape 8   Local  ( 691.70,   72.70, -657.00) Global ( 691.70,   72.70, -657.00)
+TGeoCompositeShape 9   Local  ( 690.69,   81.75, -657.00) Global ( 690.69,   81.75, -657.00)
+TGeoCompositeShape 10  Local  ( 689.56,   90.78, -657.00) Global ( 689.56,   90.78, -657.00)
+TGeoCompositeShape 11  Local  ( 688.31,   99.80, -657.00) Global ( 688.31,   99.80, -657.00)
+TGeoCompositeShape 12  Local  ( 686.95,  108.80, -657.00) Global ( 686.95,  108.80, -657.00)
+TGeoCompositeShape 13  Local  ( 685.46,  117.78, -657.00) Global ( 685.46,  117.78, -657.00)
+TGeoCompositeShape 14  Local  ( 683.86,  126.75, -657.00) Global ( 683.86,  126.75, -657.00)
+TGeoCompositeShape 15  Local  ( 682.15,  135.69, -657.00) Global ( 682.15,  135.69, -657.00)
+TGeoCompositeShape 16  Local  ( 680.31,  144.60, -657.00) Global ( 680.31,  144.60, -657.00)
+TGeoCompositeShape 17  Local  ( 678.36,  153.50, -657.00) Global ( 678.36,  153.50, -657.00)
+TGeoCompositeShape 18  Local  ( 676.29,  162.36, -657.00) Global ( 676.29,  162.36, -657.00)
+TGeoCompositeShape 19  Local  ( 674.11,  171.20, -657.00) Global ( 674.11,  171.20, -657.00)
+TGeoCompositeShape 20  Local  ( 671.81,  180.01, -657.00) Global ( 671.81,  180.01, -657.00)
+TGeoCompositeShape 21  Local  ( 900.00,    0.00, -657.00) Global ( 900.00,    0.00, -657.00)
+TGeoCompositeShape 22  Local  ( 899.92,   11.78, -657.00) Global ( 899.92,   11.78, -657.00)
+TGeoCompositeShape 23  Local  ( 899.69,   23.56, -657.00) Global ( 899.69,   23.56, -657.00)
+TGeoCompositeShape 24  Local  ( 899.31,   35.33, -657.00) Global ( 899.31,   35.33, -657.00)
+TGeoCompositeShape 25  Local  ( 898.77,   47.10, -657.00) Global ( 898.77,   47.10, -657.00)
+TGeoCompositeShape 26  Local  ( 898.07,   58.86, -657.00) Global ( 898.07,   58.86, -657.00)
+TGeoCompositeShape 27  Local  ( 897.23,   70.61, -657.00) Global ( 897.23,   70.61, -657.00)
+TGeoCompositeShape 28  Local  ( 896.22,   82.35, -657.00) Global ( 896.22,   82.35, -657.00)
+TGeoCompositeShape 29  Local  ( 895.07,   94.08, -657.00) Global ( 895.07,   94.08, -657.00)
+TGeoCompositeShape 30  Local  ( 893.76,  105.78, -657.00) Global ( 893.76,  105.78, -657.00)
+TGeoCompositeShape 31  Local  ( 892.30,  117.47, -657.00) Global ( 892.30,  117.47, -657.00)
+TGeoCompositeShape 32  Local  ( 890.69,  129.14, -657.00) Global ( 890.69,  129.14, -657.00)
+TGeoCompositeShape 33  Local  ( 888.92,  140.79, -657.00) Global ( 888.92,  140.79, -657.00)
+TGeoCompositeShape 34  Local  ( 887.00,  152.41, -657.00) Global ( 887.00,  152.41, -657.00)
+TGeoCompositeShape 35  Local  ( 884.93,  164.01, -657.00) Global ( 884.93,  164.01, -657.00)
+TGeoCompositeShape 36  Local  ( 882.71,  175.58, -657.00) Global ( 882.71,  175.58, -657.00)
+TGeoCompositeShape 37  Local  ( 880.33,  187.12, -657.00) Global ( 880.33,  187.12, -657.00)
+TGeoCompositeShape 38  Local  ( 877.81,  198.63, -657.00) Global ( 877.81,  198.63, -657.00)
+TGeoCompositeShape 39  Local  ( 875.13,  210.10, -657.00) Global ( 875.13,  210.10, -657.00)
+TGeoCompositeShape 40  Local  ( 872.31,  221.54, -657.00) Global ( 872.31,  221.54, -657.00)
+TGeoCompositeShape 41  Local  ( 869.33,  232.94, -657.00) Global ( 869.33,  232.94, -657.00)
+TGeoCompositeShape 42  Local  ( 695.51,    0.00,  657.00) Global ( 695.51,    0.00,  657.00)
+TGeoCompositeShape 43  Local  ( 695.45,    9.10,  657.00) Global ( 695.45,    9.10,  657.00)
+TGeoCompositeShape 44  Local  ( 695.27,   18.21,  657.00) Global ( 695.27,   18.21,  657.00)
+TGeoCompositeShape 45  Local  ( 694.97,   27.31,  657.00) Global ( 694.97,   27.31,  657.00)
+TGeoCompositeShape 46  Local  ( 694.56,   36.40,  657.00) Global ( 694.56,   36.40,  657.00)
+TGeoCompositeShape 47  Local  ( 694.02,   45.49,  657.00) Global ( 694.02,   45.49,  657.00)
+TGeoCompositeShape 48  Local  ( 693.37,   54.57,  657.00) Global ( 693.37,   54.57,  657.00)
+TGeoCompositeShape 49  Local  ( 692.59,   63.64,  657.00) Global ( 692.59,   63.64,  657.00)
+TGeoCompositeShape 50  Local  ( 691.70,   72.70,  657.00) Global ( 691.70,   72.70,  657.00)
+TGeoCompositeShape 51  Local  ( 690.69,   81.75,  657.00) Global ( 690.69,   81.75,  657.00)
+TGeoCompositeShape 52  Local  ( 689.56,   90.78,  657.00) Global ( 689.56,   90.78,  657.00)
+TGeoCompositeShape 53  Local  ( 688.31,   99.80,  657.00) Global ( 688.31,   99.80,  657.00)
+TGeoCompositeShape 54  Local  ( 686.95,  108.80,  657.00) Global ( 686.95,  108.80,  657.00)
+TGeoCompositeShape 55  Local  ( 685.46,  117.78,  657.00) Global ( 685.46,  117.78,  657.00)
+TGeoCompositeShape 56  Local  ( 683.86,  126.75,  657.00) Global ( 683.86,  126.75,  657.00)
+TGeoCompositeShape 57  Local  ( 682.15,  135.69,  657.00) Global ( 682.15,  135.69,  657.00)
+TGeoCompositeShape 58  Local  ( 680.31,  144.60,  657.00) Global ( 680.31,  144.60,  657.00)
+TGeoCompositeShape 59  Local  ( 678.36,  153.50,  657.00) Global ( 678.36,  153.50,  657.00)
+TGeoCompositeShape 60  Local  ( 676.29,  162.36,  657.00) Global ( 676.29,  162.36,  657.00)
+TGeoCompositeShape 61  Local  ( 674.11,  171.20,  657.00) Global ( 674.11,  171.20,  657.00)
+TGeoCompositeShape 62  Local  ( 671.81,  180.01,  657.00) Global ( 671.81,  180.01,  657.00)
+TGeoCompositeShape 63  Local  ( 900.00,    0.00,  657.00) Global ( 900.00,    0.00,  657.00)
+TGeoCompositeShape 64  Local  ( 899.92,   11.78,  657.00) Global ( 899.92,   11.78,  657.00)
+TGeoCompositeShape 65  Local  ( 899.69,   23.56,  657.00) Global ( 899.69,   23.56,  657.00)
+TGeoCompositeShape 66  Local  ( 899.31,   35.33,  657.00) Global ( 899.31,   35.33,  657.00)
+TGeoCompositeShape 67  Local  ( 898.77,   47.10,  657.00) Global ( 898.77,   47.10,  657.00)
+TGeoCompositeShape 68  Local  ( 898.07,   58.86,  657.00) Global ( 898.07,   58.86,  657.00)
+TGeoCompositeShape 69  Local  ( 897.23,   70.61,  657.00) Global ( 897.23,   70.61,  657.00)
+TGeoCompositeShape 70  Local  ( 896.22,   82.35,  657.00) Global ( 896.22,   82.35,  657.00)
+TGeoCompositeShape 71  Local  ( 895.07,   94.08,  657.00) Global ( 895.07,   94.08,  657.00)
+TGeoCompositeShape 72  Local  ( 893.76,  105.78,  657.00) Global ( 893.76,  105.78,  657.00)
+TGeoCompositeShape 73  Local  ( 892.30,  117.47,  657.00) Global ( 892.30,  117.47,  657.00)
+TGeoCompositeShape 74  Local  ( 890.69,  129.14,  657.00) Global ( 890.69,  129.14,  657.00)
+TGeoCompositeShape 75  Local  ( 888.92,  140.79,  657.00) Global ( 888.92,  140.79,  657.00)
+TGeoCompositeShape 76  Local  ( 887.00,  152.41,  657.00) Global ( 887.00,  152.41,  657.00)
+TGeoCompositeShape 77  Local  ( 884.93,  164.01,  657.00) Global ( 884.93,  164.01,  657.00)
+TGeoCompositeShape 78  Local  ( 882.71,  175.58,  657.00) Global ( 882.71,  175.58,  657.00)
+TGeoCompositeShape 79  Local  ( 880.33,  187.12,  657.00) Global ( 880.33,  187.12,  657.00)
+TGeoCompositeShape 80  Local  ( 877.81,  198.63,  657.00) Global ( 877.81,  198.63,  657.00)
+TGeoCompositeShape 81  Local  ( 875.13,  210.10,  657.00) Global ( 875.13,  210.10,  657.00)
+TGeoCompositeShape 82  Local  ( 872.31,  221.54,  657.00) Global ( 872.31,  221.54,  657.00)
+TGeoCompositeShape 83  Local  ( 869.33,  232.94,  657.00) Global ( 869.33,  232.94,  657.00)
+TGeoCompositeShape Bounding box:  dx= 114.09 dy= 116.47 dz= 657.00 Origin: x= 785.91 y= 116.47 z=   0.00
-- 
GitLab