Bug fixes in the geometry of SSD cone, Reorginization of variables, and the
authornilsen <nilsen@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 14 Apr 2004 21:11:12 +0000 (21:11 +0000)
committernilsen <nilsen@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 14 Apr 2004 21:11:12 +0000 (21:11 +0000)
removal of coding violations.

ITS/AliITSv11Geometry.cxx
ITS/AliITSv11Geometry.h
ITS/AliITSv11GeometrySupport.cxx
ITS/AliITSv11GeometrySupport.h

index 71516ba..0d07862 100644 (file)
@@ -43,7 +43,7 @@ ClassImp(AliITSv11Geometry)
 //______________________________________________________________________
 Double_t AliITSv11Geometry::Yfrom2Points(Double_t x0,Double_t y0,
                                          Double_t x1,Double_t y1,
-                                         Double_t x){
+                                         Double_t x)const{
     // Given the two points (x0,y0) and (x1,y1) and the location x, returns
     // the value y corresponding to that point x on the line defined by the
     // two points.
@@ -75,7 +75,7 @@ Double_t AliITSv11Geometry::Yfrom2Points(Double_t x0,Double_t y0,
 //______________________________________________________________________
 Double_t AliITSv11Geometry::Xfrom2Points(Double_t x0,Double_t y0,
                                          Double_t x1,Double_t y1,
-                                         Double_t y){
+                                         Double_t y)const{
     // Given the two points (x0,y0) and (x1,y1) and the location y, returns
     // the value x corresponding to that point y on the line defined by the
     // two points.
@@ -106,7 +106,7 @@ Double_t AliITSv11Geometry::Xfrom2Points(Double_t x0,Double_t y0,
 }
 //______________________________________________________________________
 Double_t AliITSv11Geometry::RmaxFrom2Points(const TGeoPcon *p,Int_t i1,
-                                            Int_t i2,Double_t z){
+                                            Int_t i2,Double_t z)const{
     // functions Require at parts of Volume A to be already defined.
     // Retruns the value of Rmax corresponding to point z alone the line
     // defined by the two points p.Rmax(i1),p-GetZ(i1) and p->GetRmax(i2),
@@ -130,7 +130,7 @@ Double_t AliITSv11Geometry::RmaxFrom2Points(const TGeoPcon *p,Int_t i1,
 }
 //______________________________________________________________________
 Double_t AliITSv11Geometry::RminFrom2Points(const TGeoPcon *p,Int_t i1,
-                                            Int_t i2,Double_t z){
+                                            Int_t i2,Double_t z)const{
     // Retruns the value of Rmin corresponding to point z alone the line
     // defined by the two points p->GetRmin(i1),p->GetZ(i1) and 
     // p->GetRmin(i2),  p->GetZ(i2).
@@ -149,7 +149,7 @@ Double_t AliITSv11Geometry::RminFrom2Points(const TGeoPcon *p,Int_t i1,
 }
 //______________________________________________________________________
 Double_t AliITSv11Geometry::RFrom2Points(const Double_t *p,const Double_t *az,
-                                         Int_t i1,Int_t i2,Double_t z){
+                                         Int_t i1,Int_t i2,Double_t z)const{
     // Retruns the value of Rmin corresponding to point z alone the line
     // defined by the two points p->GetRmin(i1),p->GetZ(i1) and 
     // p->GetRmin(i2), p->GetZ(i2).
@@ -168,7 +168,7 @@ Double_t AliITSv11Geometry::RFrom2Points(const Double_t *p,const Double_t *az,
 }
 //______________________________________________________________________
 Double_t AliITSv11Geometry::Zfrom2MinPoints(const TGeoPcon *p,Int_t i1,
-                                            Int_t i2,Double_t r){
+                                            Int_t i2,Double_t r)const{
     // Retruns the value of Z corresponding to point R alone the line
     // defined by the two points p->GetRmin(i1),p->GetZ(i1) and 
     // p->GetRmin(i2),p->GetZ(i2)
@@ -188,7 +188,7 @@ Double_t AliITSv11Geometry::Zfrom2MinPoints(const TGeoPcon *p,Int_t i1,
 }
 //______________________________________________________________________
 Double_t AliITSv11Geometry::Zfrom2MaxPoints(const TGeoPcon *p,Int_t i1,
-                                            Int_t i2,Double_t r){
+                                            Int_t i2,Double_t r)const{
     // Retruns the value of Z corresponding to point R alone the line
     // defined by the two points p->GetRmax(i1),p->GetZ(i1) and 
     // p->GetRmax(i2),p->GetZ(i2)
@@ -208,7 +208,7 @@ Double_t AliITSv11Geometry::Zfrom2MaxPoints(const TGeoPcon *p,Int_t i1,
 }
 //______________________________________________________________________
 Double_t AliITSv11Geometry::Zfrom2Points(const Double_t *z,const Double_t *ar,
-                                         Int_t i1,Int_t i2,Double_t r){
+                                         Int_t i1,Int_t i2,Double_t r)const{
     // Retruns the value of z corresponding to point R alone the line
     // defined by the two points p->GetRmax(i1),p->GetZ(i1) and 
     // p->GetRmax(i2),p->GetZ(i2)
@@ -228,7 +228,7 @@ Double_t AliITSv11Geometry::Zfrom2Points(const Double_t *z,const Double_t *ar,
 //______________________________________________________________________
 Double_t AliITSv11Geometry::RmaxFromZpCone(const TGeoPcon *p,int ip,
                                            Double_t tc,Double_t z,
-                                           Double_t th){
+                                           Double_t th)const{
     // General Outer Cone surface equation Rmax.
     // Intputs:
     //     TGeoPcon  *p   The poly cone where the initial point comes from
@@ -242,8 +242,8 @@ Double_t AliITSv11Geometry::RmaxFromZpCone(const TGeoPcon *p,int ip,
     // Return:
     //     The value Rmax correstponding to the line at angle th, offeset by
     //     th, and the point p->GetZ/Rmin[ip] at the location z.
-    Double_t tantc = TanD(tc);
-    Double_t costc = CosD(tc);
+    Double_t tantc = TMath::Tan(tc*TMath::DegToRad());
+    Double_t costc = TMath::Cos(tc*TMath::DegToRad());
 
     return -tantc*(z-p->GetZ(ip))+p->GetRmax(ip)+th/costc;
 }
@@ -251,7 +251,7 @@ Double_t AliITSv11Geometry::RmaxFromZpCone(const TGeoPcon *p,int ip,
 Double_t AliITSv11Geometry::RFromZpCone(const Double_t *ar,
                                         const Double_t *az,int ip,
                                         Double_t tc,Double_t z,
-                                        Double_t th){
+                                        Double_t th)const{
     // General Cone surface equation R(z).
     // Intputs:
     //     Double_t  ar   The array of R values
@@ -266,15 +266,15 @@ Double_t AliITSv11Geometry::RFromZpCone(const Double_t *ar,
     // Return:
     //     The value R correstponding to the line at angle th, offeset by
     //     th, and the point p->GetZ/Rmax[ip] at the locatin z.
-    Double_t tantc = TanD(tc);
-    Double_t costc = CosD(tc);
+    Double_t tantc = TMath::Tan(tc*TMath::DegToRad());
+    Double_t costc = TMath::Cos(tc*TMath::DegToRad());
 
     return -tantc*(z-az[ip])+ar[ip]+th/costc;
 }
 //______________________________________________________________________
 Double_t AliITSv11Geometry::RminFromZpCone(const TGeoPcon *p,Int_t ip,
                                            Double_t tc,Double_t z,
-                                           Double_t th){
+                                           Double_t th)const{
     // General Inner Cone surface equation Rmin.
     // Intputs:
     //     TGeoPcon  *p   The poly cone where the initial point comes from
@@ -288,15 +288,15 @@ Double_t AliITSv11Geometry::RminFromZpCone(const TGeoPcon *p,Int_t ip,
     // Return:
     //     The value Rmin correstponding to the line at angle th, offeset by
     //     th, and the point p->GetZ/Rmin[ip] at the location z.
-    Double_t tantc = TanD(tc);
-    Double_t costc = CosD(tc);
+    Double_t tantc = TMath::Tan(tc*TMath::DegToRad());
+    Double_t costc = TMath::Cos(tc*TMath::DegToRad());
 
     return -tantc*(z-p->GetZ(ip))+p->GetRmin(ip)+th/costc;
 }
 //______________________________________________________________________
 Double_t AliITSv11Geometry::ZFromRmaxpCone(const TGeoPcon *p,int ip,
                                            Double_t tc,Double_t r,
-                                           Double_t th){
+                                           Double_t th)const{
     // General Outer cone Surface equation for z.
     // Intputs:
     //     TGeoPcon  *p   The poly cone where the initial point comes from
@@ -310,8 +310,8 @@ Double_t AliITSv11Geometry::ZFromRmaxpCone(const TGeoPcon *p,int ip,
     // Return:
     //     The value Z correstponding to the line at angle th, offeset by
     //     th, and the point p->GetZ/Rmax[ip] at the location r.
-    Double_t tantc = TanD(tc);
-    Double_t costc = CosD(tc);
+    Double_t tantc = TMath::Tan(tc*TMath::DegToRad());
+    Double_t costc = TMath::Cos(tc*TMath::DegToRad());
 
     return p->GetZ(ip)+(p->GetRmax(ip)+th/costc-r)/tantc;
 }
@@ -319,7 +319,7 @@ Double_t AliITSv11Geometry::ZFromRmaxpCone(const TGeoPcon *p,int ip,
 Double_t AliITSv11Geometry::ZFromRmaxpCone(const Double_t *ar,
                                            const Double_t *az,int ip,
                                            Double_t tc,Double_t r,
-                                           Double_t th){
+                                           Double_t th)const{
     // General Outer cone Surface equation for z.
     // Intputs:
     //     Double_t  ar   The array of R values
@@ -334,15 +334,15 @@ Double_t AliITSv11Geometry::ZFromRmaxpCone(const Double_t *ar,
     // Return:
     //     The value Z correstponding to the line at angle th, offeset by
     //     th, and the point p->GetZ/Rmax[ip] at the locatin r.
-    Double_t tantc = TanD(tc);
-    Double_t costc = CosD(tc);
+    Double_t tantc = TMath::Tan(tc*TMath::DegToRad());
+    Double_t costc = TMath::Cos(tc*TMath::DegToRad());
 
     return az[ip]+(ar[ip]+th/costc-r)/tantc;
 }
 //______________________________________________________________________
 Double_t AliITSv11Geometry::ZFromRminpCone(const TGeoPcon *p,int ip,
                                            Double_t tc,Double_t r,
-                                           Double_t th){
+                                           Double_t th)const{
     // General Inner cone Surface equation for z.
     // Intputs:
     //     TGeoPcon  *p   The poly cone where the initial point comes from
@@ -356,8 +356,8 @@ Double_t AliITSv11Geometry::ZFromRminpCone(const TGeoPcon *p,int ip,
     // Return:
     //     The value Z correstponding to the line at angle th, offeset by
     //     th, and the point p->GetZ/Rmin[ip] at the location r.
-    Double_t tantc = TanD(tc);
-    Double_t costc = CosD(tc);
+    Double_t tantc = TMath::Tan(tc*TMath::DegToRad());
+    Double_t costc = TMath::Cos(tc*TMath::DegToRad());
 
     return p->GetZ(ip)+(p->GetRmin(ip)+th/costc-r)/tantc;
 }
@@ -365,7 +365,7 @@ Double_t AliITSv11Geometry::ZFromRminpCone(const TGeoPcon *p,int ip,
 void AliITSv11Geometry::RadiusOfCurvature(Double_t rc,Double_t theta0,
                                           Double_t z0,Double_t r0,
                                           Double_t theta1,Double_t &z1,
-                                          Double_t &r1){
+                                          Double_t &r1)const{
     // Given a initial point z0,r0, the initial angle theta0, and the radius
     // of curvature, returns the point z1, r1 at the angle theta1. Theta
     // measured from the r axis in the clock wise direction [degrees].
@@ -381,14 +381,14 @@ void AliITSv11Geometry::RadiusOfCurvature(Double_t rc,Double_t theta0,
     // Return:
     //    none.
 
-    z1 = rc*(SinD(theta1)-SinD(theta0))+z0;
-    r1 = rc*(CosD(theta1)-CosD(theta0))+r0;
+    z1 = rc*(TMath::Sin(theta1*TMath::DegToRad())-TMath::Sin(theta0*TMath::DegToRad()))+z0;
+    r1 = rc*(TMath::Cos(theta1*TMath::DegToRad())-TMath::Cos(theta0*TMath::DegToRad()))+r0;
     return;
 }
 //______________________________________________________________________
 void AliITSv11Geometry::InsidePoint(const TGeoPcon *p,Int_t i1,Int_t i2,
                                     Int_t i3,Double_t c,TGeoPcon *q,Int_t j1,
-                                    Bool_t max){
+                                    Bool_t max)const{
     // Given two lines defined by the points i1, i2,i3 in the TGeoPcon 
     // class p that intersect at point p->GetZ(i2) return the point z,r 
     // that is Cthick away in the TGeoPcon class q. If points i1=i2
@@ -440,7 +440,7 @@ void AliITSv11Geometry::InsidePoint(const TGeoPcon *p,Int_t i1,Int_t i2,
 void AliITSv11Geometry::InsidePoint(Double_t x0,Double_t y0,
                                     Double_t x1,Double_t y1,
                                     Double_t x2,Double_t y2,Double_t c,
-                                    Double_t &x,Double_t &y){
+                                    Double_t &x,Double_t &y)const{
     // Given two intersecting lines defined by the points (x0,y0), (x1,y1) and
     // (x1,y1), (x1,y2) {intersecting at (x1,y1)} the point (x,y) a distance
     // c away is returned such that two lines a distance c away from the
@@ -481,8 +481,8 @@ void AliITSv11Geometry::InsidePoint(Double_t x0,Double_t y0,
         } // end if
         return;
     } //
-    x = x1-c*(dx12*r01-dx01*r12)/m; //cout <<"L442 x="<<x<<endl;
-    y = y1-c*(dy12*r01-dy01*r12)/m; //cout <<"L443 y="<<y<<endl;
+    x = x1+c*(dx12*r01-dx01*r12)/m; //cout <<"L442 x="<<x<<endl;
+    y = y1+c*(dy12*r01-dy01*r12)/m; //cout <<"L443 y="<<y<<endl;
     //cout <<"=============================================="<<endl;
     return;
 }
@@ -496,10 +496,9 @@ void AliITSv11Geometry:: PrintArb8(const TGeoArb8 *a)const{
     // Return:
     //   none.
 
-    if(GetDebug()){
-        printf("%s",a->GetName());
-        a->InspectShape();
-    } // end if
+    if(!GetDebug()) return;
+    printf("%s",a->GetName());
+    a->InspectShape();
     return;
 }
 //----------------------------------------------------------------------
@@ -512,7 +511,7 @@ void AliITSv11Geometry:: PrintPcon(const TGeoPcon *a)const{
     // Return:
     //   none.
   
-    if(GetDebug()) return;
+    if(!GetDebug()) return;
     cout << a->GetName() << ": N=" << a->GetNz() << " Phi1=" << a->GetPhi1()
          << ", Dphi=" << a->GetDphi() << endl;
     cout << "i\t   Z   \t  Rmin \t  Rmax" << endl;
@@ -532,7 +531,7 @@ void AliITSv11Geometry::PrintTube(const TGeoTube *a)const{
     // Return:
     //   none.
 
-    if(GetDebug()) return;
+    if(!GetDebug()) return;
     cout << a->GetName() <<": Rmin="<<a->GetRmin()
          <<" Rmax=" <<a->GetRmax()<<" Dz="<<a->GetDz()<<endl;
     return;
@@ -547,7 +546,7 @@ void AliITSv11Geometry::PrintTubeSeg(const TGeoTubeSeg *a)const{
     // Return:
     //   none.
 
-    if(GetDebug()) return;
+    if(!GetDebug()) return;
     cout << a->GetName() <<": Phi1="<<a->GetPhi1()<<
         " Phi2="<<a->GetPhi2()<<" Rmin="<<a->GetRmin()
          <<" Rmax=" <<a->GetRmax()<<" Dz="<<a->GetDz()<<endl;
@@ -563,7 +562,7 @@ void AliITSv11Geometry::PrintConeSeg(const TGeoConeSeg *a)const{
     // Return:
     //   none.
 
-    if(GetDebug()) return;
+    if(!GetDebug()) return;
     cout << a->GetName() <<": Phi1="<<a->GetPhi1()<<
         " Phi2="<<a->GetPhi2()<<" Rmin1="<<a->GetRmin1()
          <<" Rmax1=" <<a->GetRmax1()<<" Rmin2="<<a->GetRmin2()
@@ -580,7 +579,7 @@ void AliITSv11Geometry::PrintBBox(const TGeoBBox *a)const{
     // Return:
     //   none.
 
-    if(GetDebug()) return;
+    if(!GetDebug()) return;
     cout << a->GetName() <<": Dx="<<a->GetDX()<<
         " Dy="<<a->GetDY()<<" Dz="<<a->GetDZ() <<endl;
     return;
index 290a8a3..f134ff6 100644 (file)
@@ -35,65 +35,65 @@ class AliITSv11Geometry : public TObject {
     //
     // Define Trig functions for use with degrees (standerd TGeo angles).
     // Sine function
-    static Double_t SinD(Double_t deg){return TMath::Sin(deg*TMath::DegToRad());}
+    Double_t SinD(Double_t deg)const{return TMath::Sin(deg*TMath::DegToRad());}
     // Cosine function
-    static Double_t CosD(Double_t deg){return TMath::Cos(deg*TMath::DegToRad());}
+    Double_t CosD(Double_t deg)const{return TMath::Cos(deg*TMath::DegToRad());}
     // Tangent function
-    static Double_t TanD(Double_t deg){return TMath::Tan(deg*TMath::DegToRad());}
+    Double_t TanD(Double_t deg)const{return TMath::Tan(deg*TMath::DegToRad());}
     // Given the line, defined by the two points (x0,y0) and (x1,y1) and the
     // point x, return the value of y.
-    static Double_t Yfrom2Points(Double_t x0,Double_t y0,
-                                 Double_t x1,Double_t y1,Double_t x);
+    Double_t Yfrom2Points(Double_t x0,Double_t y0,
+                                 Double_t x1,Double_t y1,Double_t x)const;
     // Given the line, defined by the two points (x0,y0) and (x1,y1) and the
     // point y, return the value of x.
-    static Double_t Xfrom2Points(Double_t x0,Double_t y0,
-                                 Double_t x1,Double_t y1,Double_t y);
+    Double_t Xfrom2Points(Double_t x0,Double_t y0,
+                                 Double_t x1,Double_t y1,Double_t y)const;
     // Given 2 points from a TGeoPcon(z and Rmax) finds Rmax at given z
-    static Double_t RmaxFrom2Points(const TGeoPcon *p,Int_t i1,Int_t i2,
-                                    Double_t z);
+    Double_t RmaxFrom2Points(const TGeoPcon *p,Int_t i1,Int_t i2,
+                                    Double_t z)const;
     // Given 2 points from a TGeoPcon(z and Rmin) finds Rmin at given z
-    static Double_t RminFrom2Points(const TGeoPcon *p,Int_t i1,Int_t i2,
-                                    Double_t z);
+    Double_t RminFrom2Points(const TGeoPcon *p,Int_t i1,Int_t i2,
+                                    Double_t z)const;
     // Give two points in the array ar and az, returns the value r 
     // corresponding z along the line defined by those two points
-    static Double_t RFrom2Points(const Double_t *ar,const Double_t *az,
-                                 Int_t i1,Int_t i2,Double_t z);
+    Double_t RFrom2Points(const Double_t *ar,const Double_t *az,
+                                 Int_t i1,Int_t i2,Double_t z)const;
     // Given 2 points from a TGeoPcon(z and Rmax) finds z at given Rmin
-    static Double_t Zfrom2MinPoints(const TGeoPcon *p,Int_t i1,Int_t i2,
-                                    Double_t r);
+    Double_t Zfrom2MinPoints(const TGeoPcon *p,Int_t i1,Int_t i2,
+                                    Double_t r)const;
     // Given 2 points from a TGeoPcon(z and Rmax) finds z at given Rmax
-    static Double_t Zfrom2MaxPoints(const TGeoPcon *p,Int_t i1,Int_t i2,
-                                    Double_t r);
+    Double_t Zfrom2MaxPoints(const TGeoPcon *p,Int_t i1,Int_t i2,
+                                    Double_t r)const;
     // Give two points in the array ar and az, returns the value z 
     // corresponding r along the line defined by those two points
-    static Double_t Zfrom2Points(const Double_t *az,const Double_t *ar,
-                                 Int_t i1,Int_t i2,Double_t r);
+    Double_t Zfrom2Points(const Double_t *az,const Double_t *ar,
+                                 Int_t i1,Int_t i2,Double_t r)const;
     // Given 1 point from a TGeoPcon(z and Rmax) the angle tc returns r for 
     // a given z, an offset (distnace perpendicular to line at angle tc) of 
     // th may be applied.
-    static Double_t RmaxFromZpCone(const TGeoPcon *p,int ip,Double_t tc,
-                                   Double_t z,Double_t th=0.0);
-    static Double_t RFromZpCone(const Double_t *ar,const Double_t *az,int ip,
-                                Double_t tc,Double_t z,Double_t th=0.0);
+    Double_t RmaxFromZpCone(const TGeoPcon *p,int ip,Double_t tc,
+                                   Double_t z,Double_t th=0.0)const;
+    Double_t RFromZpCone(const Double_t *ar,const Double_t *az,int ip,
+                                Double_t tc,Double_t z,Double_t th=0.0)const;
     // Given 1 point from a TGeoPcon(z and Rmin) the angle tc returns r for 
     // a given z, an offset (distnace perpendicular to line at angle tc) of 
     // th may be applied.
-    static Double_t RminFromZpCone(const TGeoPcon *p,Int_t ip,Double_t tc,
-                                   Double_t z,Double_t th=0.0);
+    Double_t RminFromZpCone(const TGeoPcon *p,Int_t ip,Double_t tc,
+                                   Double_t z,Double_t th=0.0)const;
     // Given 1 point from a TGeoPcon(z and Rmax) the angle tc returns z for 
     // a given Rmax, an offset (distnace perpendicular to line at angle tc) of 
     // th may be applied.
-    static Double_t ZFromRmaxpCone(const TGeoPcon *p,int ip,Double_t tc,
-                                   Double_t r,Double_t th=0.0);
+    Double_t ZFromRmaxpCone(const TGeoPcon *p,int ip,Double_t tc,
+                                   Double_t r,Double_t th=0.0)const;
     // General Outer cone Surface equation for z.
-    static Double_t ZFromRmaxpCone(const Double_t *ar,const Double_t *az,
+    Double_t ZFromRmaxpCone(const Double_t *ar,const Double_t *az,
                                    Int_t ip,Double_t tc,Double_t r,
-                                   Double_t th=0.0);
+                                   Double_t th=0.0)const;
     // Given 1 point from a TGeoPcon(z and Rmin) the angle tc returns z for 
     // a given Rmin, an offset (distnace perpendicular to line at angle tc) of 
     // th may be applied.
-    static Double_t ZFromRminpCone(const TGeoPcon *p,int ip,Double_t tc,
-                                   Double_t r,Double_t th=0.0);
+    Double_t ZFromRminpCone(const TGeoPcon *p,int ip,Double_t tc,
+                                   Double_t r,Double_t th=0.0)const;
     // Given two lines defined by the points i1, i2,i3 in the TGeoPcon 
     // class p that intersect at point p->GetZ(i2) return the point z,r 
     // that is Cthick away in the TGeoPcon class q. If points i1=i2
@@ -101,21 +101,21 @@ class AliITSv11Geometry : public TObject {
     // if points i2=i3 and max=kTRUE then points p->GetRmax(i2) and
     // p->GetRmin(i3) are used. If i2=i3 and max=kFALSE, then p->GetRmin(i2)
     // and p->GetRmax(i3) are used.
-    static void InsidePoint(const TGeoPcon *p,Int_t i1,Int_t i2,Int_t i3,
-                        Double_t Cthick,TGeoPcon *q,Int_t j1,Bool_t max);
+    void InsidePoint(const TGeoPcon *p,Int_t i1,Int_t i2,Int_t i3,
+                        Double_t Cthick,TGeoPcon *q,Int_t j1,Bool_t max)const;
     // Given two intersecting lines defined by the points (x0,y0), (x1,y1) and
     // (x1,y1), (x1,y2) {intersecting at (x1,y1)} the point (x,y) a distance
     // c away is returned such that two lines a distance c away from the
     // lines defined above intersect at (x,y).
-    static void InsidePoint(Double_t x0,Double_t y0,Double_t x1,Double_t y1,
+     void InsidePoint(Double_t x0,Double_t y0,Double_t x1,Double_t y1,
                             Double_t x2,Double_t y2,Double_t c,
-                            Double_t &x,Double_t &y);
+                            Double_t &x,Double_t &y)const;
     // Given a initial point z0,r0, the initial angle theta0, and the radius
     // of curvature, returns the point z1, r1 at the angle theta1. Theta
     // measured from the r axis in the clock wise direction [degrees].
-    static void RadiusOfCurvature(Double_t rc,Double_t theta0,Double_t z0,
-                                  Double_t r0,Double_t theta1,Double_t &z1,
-                                  Double_t &r1);
+    void RadiusOfCurvature(Double_t rc,Double_t theta0,Double_t z0,
+                           Double_t r0,Double_t theta1,Double_t &z1,
+                           Double_t &r1)const;
     //
     // Output functions for debugging
     //
@@ -136,15 +136,17 @@ class AliITSv11Geometry : public TObject {
                           Int_t linec=3,Int_t lines=1,Int_t linew=4,
                           Int_t markc=2,Int_t marks=4,
                           Float_t marksize=1.0) const;
+  protected:
+
+    // Units, Convert from k?? to cm,degree,GeV,seconds,
+    static const Double_t fgkmm = 0.10; // Convert mm to TGeom's cm.
+    static const Double_t fgkcm = 1.00; // Convert cv to TGeom's cm.
+    static const Double_t fgkDegree = 1.0; //Convert degrees to TGeom's degrees
+    static const Double_t fgkRadian = 180./3.14159265358979323846; //To Radians
+
   private:
     Bool_t fDebug; //! Debug flag
     ClassDef(AliITSv11Geometry,1) // Base class for ITS v11 geometry
 };
 
-// Units, Convert from k?? to cm,degree,GeV,seconds,
-static const Double_t kmm = 0.10; // Convert mm to TGeom's cm.
-static const Double_t kcm = 1.00; // Convert cv to TGeom's cm.
-static const Double_t kDegree = 1.0; // Convert degrees to TGeom's degrees
-static const Double_t kRadian = TMath::DegToRad(); // conver to Radians
-
 #endif
index 2e8e2bb..d474880 100644 (file)
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+// This class Defines the Geometry for the ITS services and support cones
+// outside of the ceneteral volume (except for the Ceneteral support 
+// cylinders. Other classes define the rest of the ITS. Specificaly the ITS
+// The SSD support cone,SSD Support centeral cylinder, SDD support cone,
+// The SDD cupport centeral cylinder, the SPD Thermal Sheald, The supports
+// and cable trays on both the RB26 (muon dump) and RB24 sides, and all of
+// the cabling from the ladders/stave ends out past the TPC. 
+
 /* $Id$ */
-#include <stdio.h>
-#include <stdlib.h>
 // General Root includes
-#include <Riostream.h>
 #include <TMath.h>
-#include <float.h>
-#include <TFile.h>    // only required for Tracking function?
-#include <TObjArray.h>
-#include <TClonesArray.h>
-#include <TLorentzVector.h>
-#include <TObjString.h>
 // Root Geometry includes
 #include <TGeoManager.h>
 #include <TGeoVolume.h>
 #include <TGeoArb8.h>
 #include <TGeoCompositeShape.h>
 #include <TGeoMatrix.h>
-#include <TGeoNode.h>
-#include <TGeoMaterial.h>
-#include <TGeoMedium.h>
-#include "AliITSBaseGeometry.h"
 #include "AliITSv11GeometrySupport.h"
 
 ClassImp(AliITSv11GeometrySupport)
@@ -45,7 +40,7 @@ ClassImp(AliITSv11GeometrySupport)
 #define SQ(A) (A)*(A)
 
 //______________________________________________________________________
-void AliITSv11GeometrySupport::SPDCone(TGeoVolume *Moth){
+void AliITSv11GeometrySupport::SPDCone(TGeoVolume *moth){
     // Define the detail SPD support cone geometry.
     // Inputs:
     //   none.
@@ -54,10 +49,10 @@ void AliITSv11GeometrySupport::SPDCone(TGeoVolume *Moth){
     // Return:
     //  none.
 
-    SPDThermalSheald(Moth);
+    SPDThermalSheald(moth);
 }
 //______________________________________________________________________
-void AliITSv11GeometrySupport::SPDThermalSheald(TGeoVolume *Moth){
+void AliITSv11GeometrySupport::SPDThermalSheald(TGeoVolume *moth){
     // Define the detail SPD Thermal Sheld geometry.
     // Inputs:
     //   none.
@@ -66,127 +61,130 @@ void AliITSv11GeometrySupport::SPDThermalSheald(TGeoVolume *Moth){
     // Return:
     //  none.
     // From ALICE-Thermal Screen (SPD) "Cylinder" file thermal-screen2_a3.ps
-    // Volumes A1,A2,A2,Ah1,Ah2,Ah3, and B1,B2,B3,Bh1,Bh2,Bh3;
-    // "CONE TRANSITION" file thermal-screen1_a3.ps Volumes C1,C2,C3,Ch1,Ch2,
-    // Ch3; "FLANGE" file thermal-screen4_a3.ps Volumes D,Ds,Dw,Dws; and 
-    // "HALF ASSEMBLY" file thermal-screen3_a3.ps. This object, both halfs,
-    // are incased inside of a single minimum sized mother volume called M,
-    // which is a union of two parts M1 and 4 copies of M2.
-    const Double_t TSCarbonFiberThA = 0.03*kmm; // 
-    //const Double_t TSCarbonFiberThB = 0.10*kmm; //
-    const Double_t TSCLengthB  = 50.0*kmm; //
-    const Double_t TSCLengthA  = 900.0*kmm-2.0*TSCLengthB; //
-    const Double_t TSCLengthC  = 290.0*kmm; //
-    const Double_t TSCLengthD  = 15.0*kmm; //
-    const Double_t TSCAngle    = 36.0*kDegree;//Rep. angle of cent. accordin
-    const Double_t TSCRoutA    = 99.255*kmm; // Outer radii
-    const Double_t TSCRinA     = 81.475*kmm; // Iner radii
-    const Double_t TSCRoutB    = 99.955*kmm; // Outer radii
-    const Double_t TSCRinB     = 80.775*kmm; // Iner radii
-    const Double_t TSCRoutCp   = 390.0*kmm;  // Outer radii
-    const Double_t TSCRinCp    = 373.0*kmm;  // Iner radii
-    Double_t TSCRoutC,TSCRinC; // values need to be calculated
-    const Double_t TSCRwingD   = 492.5*kmm;  // Outer radii
-    const Double_t TSCRoutD    = 0.5*840.*kmm;// Outer radii
-    const Double_t TSCRinD     = 373.0*kmm;  // Iner radii
-    const Double_t TSCAngleDD  = (60.*kmm/TSCRwingD)*kRadian;// angular wing
+    // Volumes sA1,sA2,sA3,sAh1,sAh2,sAh3, and b1,b2,b3,bh1,bh2,bh3;
+    // "CONE TRANSITION" file thermal-screen1_a3.ps Volumes sC1,sC2,sC3,
+    // sCh1,sCh2, sCh3; "FLANGE" file thermal-screen4_a3.ps Volumes d,sDs,
+    // sDw,sDws; and "HALF ASSEMBLY" file thermal-screen3_a3.ps. This object,
+    // both halfs, are incased inside of a single minimum sized mother 
+    // volume called M, which is a union of two parts sM1 and 4 copies of sM2.
+    const Double_t ktscarbonFiberThA = 0.03*fgkmm; // 
+    //const Double_t ktscarbonFiberThB = 0.10*fgkmm; //
+    const Double_t ktscLengthB  = 50.0*fgkmm; //
+    const Double_t ktscLengthA  = 900.0*fgkmm-2.0*ktscLengthB; //
+    const Double_t ktscLengthC  = 290.0*fgkmm; //
+    const Double_t ktscLengthD  = 15.0*fgkmm; //
+    const Double_t ktscAngle    = 36.0*fgkDegree;//Rep. angle of cent. accordin
+    const Double_t ktscRoutA    = 99.255*fgkmm; // Outer radii
+    const Double_t ktscRinA     = 81.475*fgkmm; // Iner radii
+    const Double_t ktscRoutB    = 99.955*fgkmm; // Outer radii
+    const Double_t ktscRinB     = 80.775*fgkmm; // Iner radii
+    const Double_t ktscRoutCp   = 390.0*fgkmm;  // Outer radii
+    const Double_t ktscRinCp    = 373.0*fgkmm;  // Iner radii
+    Double_t ktscRoutC,ktscRinC; // values need to be calculated
+    const Double_t ktscRwingD   = 492.5*fgkmm;  // Outer radii
+    const Double_t ktscRoutD    = 0.5*840.*fgkmm;// Outer radii
+    const Double_t ktscRinD     = 373.0*fgkmm;  // Iner radii
+    // angular wing
+    const Double_t ktscAngleDD  = (60.*fgkmm/ktscRwingD)*fgkRadian;
                                                     // width of fill material
-    const Double_t TSCAngleDDs = ((60.*kmm-2.*TSCarbonFiberThA)/
-                                                  TSCRwingD)*kRadian;
-    const Double_t TSCAngleD0  = 45.*kDegree;//Strting angle of wing
-    const Double_t TSCoutSA    = 24.372*kmm; // The other one Calculated
-    const Double_t TSCinLA     = 31.674*kmm; // The ohter one Calculated
-    const Double_t TSCoutSB    = 24.596*kmm; // The other one Calculated
-    const Double_t TSCinLB     = 31.453*kmm; // The ohter one Calculated
-    const Double_t TSCoutSC    = 148.831*kmm;// The other one Calculated
-    const Double_t TSCinLC     = 90.915*kmm; // The ohter one Calculated
+    const Double_t ktscAngleDDs = ((60.*fgkmm-2.*ktscarbonFiberThA)/
+                                                  ktscRwingD)*fgkRadian;
+    const Double_t ktscAngleD0  = 45.*fgkDegree;//Strting angle of wing
+    const Double_t ktscoutSA    = 24.372*fgkmm; // The other one Calculated
+    const Double_t ktscinLA     = 31.674*fgkmm; // The ohter one Calculated
+    const Double_t ktscoutSB    = 24.596*fgkmm; // The other one Calculated
+    const Double_t ktscinLB     = 31.453*fgkmm; // The ohter one Calculated
+    const Double_t ktscoutSC    = 148.831*fgkmm;// The other one Calculated
+    const Double_t ktscinLC     = 90.915*fgkmm; // The ohter one Calculated
     Int_t i,k;
     Double_t th;
     Double_t xo[7],yo[7],xi[7],yi[7];
     Double_t xbo[7],ybo[7],xbi[7],ybi[7];
     Double_t xco[7],yco[7],xci[7],yci[7];
-    TGeoArb8 *A1,*A2,*A3,*Ah1,*Ah2,*Ah3,*B1,*B2,*B3,*Bh1,*Bh2,*Bh3;
-    TGeoArb8 *C1,*C2,*C3,*Ch1,*Ch2,*Ch3;
-    TGeoTube  *D,*Ds;
-    TGeoTubeSeg *Dw,*Dws;
-    TGeoCompositeShape *M;
+    TGeoArb8 *sA1,*sA2,*sA3,*sAh1,*sAh2,*sAh3,*sB1,*sB2,*sB3,*sBh1,*sBh2,*sBh3;
+    TGeoArb8 *sC1,*sC2,*sC3,*sCh1,*sCh2,*sCh3;
+    TGeoPcon *sM1;
+    TGeoTube  *sD,*sDs;
+    TGeoTubeSeg *sDw,*sDws,*sM2;
+    TGeoCompositeShape *sM;
     TGeoRotation *rot;
     TGeoTranslation *tranb,*tranbm,*tranc;
     TGeoTranslation *tranITSspdShealdVVt0;
     TGeoCombiTrans *rotITSspdShealdVVt1,*rotITSspdShealdVVt2;
     TGeoCombiTrans *rotITSspdShealdVVt3;
-    TGeoMedium *SPDcf  = 0; // SPD support cone Carbon Fiber materal number.
-    TGeoMedium *SPDfs  = 0; // SPD support cone inserto stesalite 4411w.
-    TGeoMedium *SPDfo  = 0; // SPD support cone foam, Rohacell 50A.
-    TGeoMedium *SPDss  = 0; // SPD support cone screw material,Stainless steal
-    TGeoMedium *SPDair = 0; // SPD support cone Air
-    //TGeoMedium *SPDal  = 0; // SPD support cone SDD mounting bracket Al
+    TGeoMedium *medSPDcf  = 0; // SPD support cone Carbon Fiber materal number.
+    TGeoMedium *medSPDfs  = 0; // SPD support cone inserto stesalite 4411w.
+    TGeoMedium *medSPDfo  = 0; // SPD support cone foam, Rohacell 50A.
+    TGeoMedium *medSPDss  = 0; // SPD support cone screw material,Stainless
+    TGeoMedium *medSPDair = 0; // SPD support cone Air
+    //TGeoMedium *medSPDal  = 0; // SPD support cone SDD mounting bracket Al
 
-    TSCRoutC = TMath::Sqrt(TSCRoutCp*TSCRoutCp-0.25*TSCoutSC*TSCoutSC);
-    TSCRinC  = TMath::Sqrt(TSCRinCp *TSCRinCp -0.25*TSCinLC *TSCinLC );
-    A1  = new TGeoArb8("ITS SPD Therm Screen Clyinder A1",0.5*TSCLengthA);
-    A2  = new TGeoArb8("ITS SPD Therm Screen Clyinder A2",0.5*TSCLengthA);
-    A3  = new TGeoArb8("ITS SPD Therm Screen Clyinder A3",0.5*TSCLengthA);
-    Ah1 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ah1",0.5*TSCLengthA);
-    Ah2 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ah2",0.5*TSCLengthA);
-    Ah3 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ah3",0.5*TSCLengthA);
-    B1  = new TGeoArb8("ITS SPD Therm Screen Clyinder B1",0.5*TSCLengthB);
-    B2  = new TGeoArb8("ITS SPD Therm Screen Clyinder B2",0.5*TSCLengthB);
-    B3  = new TGeoArb8("ITS SPD Therm Screen Clyinder B3",0.5*TSCLengthB);
-    Bh1 = new TGeoArb8("ITS SPD Therm Screen Cylinder Bh1",0.5*TSCLengthB);
-    Bh2 = new TGeoArb8("ITS SPD Therm Screen Cylinder Bh2",0.5*TSCLengthB);
-    Bh3 = new TGeoArb8("ITS SPD Therm Screen Cylinder Bh3",0.5*TSCLengthB);
-    C1  = new TGeoArb8("ITS SPD Therm Screen Clyinder C1",0.5*TSCLengthC);
-    C2  = new TGeoArb8("ITS SPD Therm Screen Clyinder C2",0.5*TSCLengthC);
-    C3  = new TGeoArb8("ITS SPD Therm Screen Clyinder C3",0.5*TSCLengthC);
-    Ch1 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ch1",0.5*TSCLengthC);
-    Ch2 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ch2",0.5*TSCLengthC);
-    Ch3 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ch3",0.5*TSCLengthC);
-    D = new TGeoTube("ITS SPD Therm Screen Flange D",TSCRinD,TSCRoutD,
-                    0.5*TSCLengthD);
-    Ds = new TGeoTube("ITS SPD Therm Screen Flange fill Ds",
-                      TSCRinD+TSCarbonFiberThA,TSCRoutD-TSCarbonFiberThA,
-                      0.5*TSCLengthD);
-    PrintTube(D);
-    PrintTube(Ds);
-    Dw = new TGeoTubeSeg("ITS SPD Therm Screen Flange Wing Dw",
-                         TSCRoutD,TSCRwingD ,0.5*TSCLengthD,
-                         TSCAngleD0-0.5*TSCAngleDD,TSCAngleD0+0.5*TSCAngleDD);
-    Dws = new TGeoTubeSeg("ITS SPD Therm Screen Flange Wing Fill Ds",
-                          TSCRoutD,TSCRwingD-TSCarbonFiberThA,
-                          0.5*TSCLengthD,TSCAngleD0-0.5*TSCAngleDDs,
-                          TSCAngleD0+0.5*TSCAngleDDs);
-    PrintTubeSeg(Dw);
-    PrintTubeSeg(Dws);
+    ktscRoutC = TMath::Sqrt(ktscRoutCp*ktscRoutCp-0.25*ktscoutSC*ktscoutSC);
+    ktscRinC  = TMath::Sqrt(ktscRinCp *ktscRinCp -0.25*ktscinLC *ktscinLC );
+    sA1  = new TGeoArb8("ITS SPD Therm Screen Clyinder A1",0.5*ktscLengthA);
+    sA2  = new TGeoArb8("ITS SPD Therm Screen Clyinder A2",0.5*ktscLengthA);
+    sA3  = new TGeoArb8("ITS SPD Therm Screen Clyinder A3",0.5*ktscLengthA);
+    sAh1 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ah1",0.5*ktscLengthA);
+    sAh2 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ah2",0.5*ktscLengthA);
+    sAh3 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ah3",0.5*ktscLengthA);
+    sB1  = new TGeoArb8("ITS SPD Therm Screen Clyinder B1",0.5*ktscLengthB);
+    sB2  = new TGeoArb8("ITS SPD Therm Screen Clyinder B2",0.5*ktscLengthB);
+    sB3  = new TGeoArb8("ITS SPD Therm Screen Clyinder B3",0.5*ktscLengthB);
+    sBh1 = new TGeoArb8("ITS SPD Therm Screen Cylinder Bh1",0.5*ktscLengthB);
+    sBh2 = new TGeoArb8("ITS SPD Therm Screen Cylinder Bh2",0.5*ktscLengthB);
+    sBh3 = new TGeoArb8("ITS SPD Therm Screen Cylinder Bh3",0.5*ktscLengthB);
+    sC1  = new TGeoArb8("ITS SPD Therm Screen Clyinder C1",0.5*ktscLengthC);
+    sC2  = new TGeoArb8("ITS SPD Therm Screen Clyinder C2",0.5*ktscLengthC);
+    sC3  = new TGeoArb8("ITS SPD Therm Screen Clyinder C3",0.5*ktscLengthC);
+    sCh1 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ch1",0.5*ktscLengthC);
+    sCh2 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ch2",0.5*ktscLengthC);
+    sCh3 = new TGeoArb8("ITS SPD Therm Screen Cylinder Ch3",0.5*ktscLengthC);
+    sD = new TGeoTube("ITS SPD Therm Screen Flange D",ktscRinD,ktscRoutD,
+                    0.5*ktscLengthD);
+    sDs = new TGeoTube("ITS SPD Therm Screen Flange fill Ds",
+                      ktscRinD+ktscarbonFiberThA,ktscRoutD-ktscarbonFiberThA,
+                      0.5*ktscLengthD);
+    PrintTube(sD);
+    PrintTube(sDs);
+    sDw = new TGeoTubeSeg("ITS SPD Therm Screen Flange Wing Dw",
+                         ktscRoutD,ktscRwingD ,0.5*ktscLengthD,
+                         ktscAngleD0-0.5*ktscAngleDD,
+                         ktscAngleD0+0.5*ktscAngleDD);
+    sDws = new TGeoTubeSeg("ITS SPD Therm Screen Flange Wing Fill Ds",
+                          ktscRoutD,ktscRwingD-ktscarbonFiberThA,
+                          0.5*ktscLengthD,ktscAngleD0-0.5*ktscAngleDDs,
+                          ktscAngleD0+0.5*ktscAngleDDs);
+    PrintTubeSeg(sDw);
+    PrintTubeSeg(sDws);
     k = 0;
     for(i=-1;i<2;i++){
-      th = ((Double_t)(i+1))*TSCAngle*kDegree;
-      xo[k]  = TSCRoutA*SinD(th) - 0.5*TSCoutSA*CosD(th);
-      yo[k]  = TSCRoutA*CosD(th) + 0.5*TSCoutSA*SinD(th);
-      xi[k]  = TSCRinA *SinD(th) - 0.5*TSCinLA *CosD(th);
-      yi[k]  = TSCRinA *CosD(th) + 0.5*TSCinLA *SinD(th);
-      xbo[k] = TSCRoutB*SinD(th) - 0.5*TSCoutSB*CosD(th);
-      ybo[k] = TSCRoutB*CosD(th) + 0.5*TSCoutSB*SinD(th);
-      xbi[k] = TSCRinB *SinD(th) - 0.5*TSCinLB *CosD(th);
-      ybi[k] = TSCRinB *CosD(th) + 0.5*TSCinLB *SinD(th);
-      xco[k] = TSCRoutC*SinD(th) - 0.5*TSCoutSC*CosD(th);
-      yco[k] = TSCRoutC*CosD(th) + 0.5*TSCoutSC*SinD(th);
-      xci[k] = TSCRinC *SinD(th) - 0.5*TSCinLC *CosD(th);
-      yci[k] = TSCRinC *CosD(th) + 0.5*TSCinLC *SinD(th);
-      k++;
-      xo[k]  = TSCRoutA*SinD(th) + 0.5*TSCoutSA*CosD(th);
-      yo[k]  = TSCRoutA*CosD(th) - 0.5*TSCoutSA*SinD(th);
-      xi[k]  = TSCRinA *SinD(th) + 0.5*TSCinLA *CosD(th);
-      yi[k]  = TSCRinA *CosD(th) - 0.5*TSCinLA *SinD(th);
-      xbo[k] = TSCRoutB*SinD(th) + 0.5*TSCoutSB*CosD(th);
-      ybo[k] = TSCRoutB*CosD(th) - 0.5*TSCoutSB*SinD(th);
-      xbi[k] = TSCRinB *SinD(th) + 0.5*TSCinLB *CosD(th);
-      ybi[k] = TSCRinB *CosD(th) - 0.5*TSCinLB *SinD(th);
-      xco[k] = TSCRoutC*SinD(th) + 0.5*TSCoutSC*CosD(th);
-      yco[k] = TSCRoutC*CosD(th) - 0.5*TSCoutSC*SinD(th);
-      xci[k] = TSCRinC *SinD(th) + 0.5*TSCinLC *CosD(th);
-      yci[k] = TSCRinC *CosD(th) - 0.5*TSCinLC *SinD(th);
-      k++;
+        th = ((Double_t)(i+1))*ktscAngle*fgkDegree;
+        xo[k]  = ktscRoutA*SinD(th) - 0.5*ktscoutSA*CosD(th);
+        yo[k]  = ktscRoutA*CosD(th) + 0.5*ktscoutSA*SinD(th);
+        xi[k]  = ktscRinA *SinD(th) - 0.5*ktscinLA *CosD(th);
+        yi[k]  = ktscRinA *CosD(th) + 0.5*ktscinLA *SinD(th);
+        xbo[k] = ktscRoutB*SinD(th) - 0.5*ktscoutSB*CosD(th);
+        ybo[k] = ktscRoutB*CosD(th) + 0.5*ktscoutSB*SinD(th);
+        xbi[k] = ktscRinB *SinD(th) - 0.5*ktscinLB *CosD(th);
+        ybi[k] = ktscRinB *CosD(th) + 0.5*ktscinLB *SinD(th);
+        xco[k] = ktscRoutC*SinD(th) - 0.5*ktscoutSC*CosD(th);
+        yco[k] = ktscRoutC*CosD(th) + 0.5*ktscoutSC*SinD(th);
+        xci[k] = ktscRinC *SinD(th) - 0.5*ktscinLC *CosD(th);
+        yci[k] = ktscRinC *CosD(th) + 0.5*ktscinLC *SinD(th);
+        k++;
+        xo[k]  = ktscRoutA*SinD(th) + 0.5*ktscoutSA*CosD(th);
+        yo[k]  = ktscRoutA*CosD(th) - 0.5*ktscoutSA*SinD(th);
+        xi[k]  = ktscRinA *SinD(th) + 0.5*ktscinLA *CosD(th);
+        yi[k]  = ktscRinA *CosD(th) - 0.5*ktscinLA *SinD(th);
+        xbo[k] = ktscRoutB*SinD(th) + 0.5*ktscoutSB*CosD(th);
+        ybo[k] = ktscRoutB*CosD(th) - 0.5*ktscoutSB*SinD(th);
+        xbi[k] = ktscRinB *SinD(th) + 0.5*ktscinLB *CosD(th);
+        ybi[k] = ktscRinB *CosD(th) - 0.5*ktscinLB *SinD(th);
+        xco[k] = ktscRoutC*SinD(th) + 0.5*ktscoutSC*CosD(th);
+        yco[k] = ktscRoutC*CosD(th) - 0.5*ktscoutSC*SinD(th);
+        xci[k] = ktscRinC *SinD(th) + 0.5*ktscinLC *CosD(th);
+        yci[k] = ktscRinC *CosD(th) - 0.5*ktscinLC *SinD(th);
+        k++;
     } // end for i
     xo[6] = xo[5];
     yo[6] = 0.0;
@@ -201,326 +199,324 @@ void AliITSv11GeometrySupport::SPDThermalSheald(TGeoVolume *Moth){
     xci[6] = xci[5];
     yci[6] = 0.0;
     if(GetDebug()){
-    cout.precision(4);
-    cout.width(7);
-    cout <<"i     \t  xo  yo    \t  xi yi     \t  xbo ybo   \t   xbi ybi  "
-        "\t   xco yco   \t   xci yxi"<<endl;
-    for(i=0;i<7;i++){
-        cout << i <<"\t"<<xo[i]<<","<<yo[i];
-        cout      <<"\t"<<xi[i]<<","<<yi[i];
-        cout      <<"\t"<<xbo[i]<<","<<ybo[i];
-        cout      <<"\t"<<xbi[i]<<","<<ybi[i];
-        cout      <<"\t"<<xco[i]<<","<<yco[i];
-        cout      <<"\t"<<xci[i]<<","<<yci[i];
-        cout<<endl;}
+        Info("SPDThermalSheald","i     \t  xo  yo    \t  xi yi     \t  xbo "
+             "ybo   \t   xbi ybi  \t   xco yco   \t   xci yxi");
+        for(i=0;i<7;i++){
+            Info("SPDThermalSheald","%7d\t%7.4f,%7.4f\t%7.4f,%7.4f\t"
+                 "%7.4f,%7.4f\t%7.4f,%7.4f\t%7.4f,%7.4f\t%7.4f,%7.4f",i,
+                 xo[i],yo[i],xi[i],yi[i],
+                 xbo[i],ybo[i],xbi[i],ybi[i],
+                 xco[i],yco[i],xci[i],yci[i]);
+        } // end for i
     } // end if GetDebug()
     //+++++++++++++++++++++++++
-    A1->SetVertex(0,xo[0],yo[0]);
-    A1->SetVertex(1,xo[1],yo[1]);
-    A1->SetVertex(2,xi[1],yi[1]);
-    A1->SetVertex(3,xi[0],yi[0]);
-    //
-    A2->SetVertex(0,xo[1],yo[1]);
-    A2->SetVertex(1,xo[2],yo[2]);
-    A2->SetVertex(2,xi[2],yi[2]);
-    A2->SetVertex(3,xi[1],yi[1]);
-    //
-    A3->SetVertex(0,xo[5],yo[5]);
-    A3->SetVertex(1,xo[6],yo[6]);
-    A3->SetVertex(2,xi[6],yi[6]);
-    A3->SetVertex(3,xi[5],yi[5]);
+    sA1->SetVertex(0,xo[0],yo[0]);
+    sA1->SetVertex(1,xo[1],yo[1]);
+    sA1->SetVertex(2,xi[1],yi[1]);
+    sA1->SetVertex(3,xi[0],yi[0]);
+    //
+    sA2->SetVertex(0,xo[1],yo[1]);
+    sA2->SetVertex(1,xo[2],yo[2]);
+    sA2->SetVertex(2,xi[2],yi[2]);
+    sA2->SetVertex(3,xi[1],yi[1]);
+    //
+    sA3->SetVertex(0,xo[5],yo[5]);
+    sA3->SetVertex(1,xo[6],yo[6]);
+    sA3->SetVertex(2,xi[6],yi[6]);
+    sA3->SetVertex(3,xi[5],yi[5]);
     //--------------------------
-    B1->SetVertex(0,xbo[0],ybo[0]);
-    B1->SetVertex(1,xbo[1],ybo[1]);
-    B1->SetVertex(2,xbi[1],ybi[1]);
-    B1->SetVertex(3,xbi[0],ybi[0]);
-    //
-    B2->SetVertex(0,xbo[1],ybo[1]);
-    B2->SetVertex(1,xbo[2],ybo[2]);
-    B2->SetVertex(2,xbi[2],ybi[2]);
-    B2->SetVertex(3,xbi[1],ybi[1]);
-    //
-    B3->SetVertex(0,xbo[5],ybo[5]);
-    B3->SetVertex(1,xbo[6],ybo[6]);
-    B3->SetVertex(2,xbi[6],ybi[6]);
-    B3->SetVertex(3,xbi[5],ybi[5]);
+    sB1->SetVertex(0,xbo[0],ybo[0]);
+    sB1->SetVertex(1,xbo[1],ybo[1]);
+    sB1->SetVertex(2,xbi[1],ybi[1]);
+    sB1->SetVertex(3,xbi[0],ybi[0]);
+    //
+    sB2->SetVertex(0,xbo[1],ybo[1]);
+    sB2->SetVertex(1,xbo[2],ybo[2]);
+    sB2->SetVertex(2,xbi[2],ybi[2]);
+    sB2->SetVertex(3,xbi[1],ybi[1]);
+    //
+    sB3->SetVertex(0,xbo[5],ybo[5]);
+    sB3->SetVertex(1,xbo[6],ybo[6]);
+    sB3->SetVertex(2,xbi[6],ybi[6]);
+    sB3->SetVertex(3,xbi[5],ybi[5]);
     //--------------------------
-    C1->SetVertex(0,xco[0],yco[0]);
-    C1->SetVertex(1,xco[1],yco[1]);
-    C1->SetVertex(2,xci[1],yci[1]);
-    C1->SetVertex(3,xci[0],yci[0]);
-    //
-    C2->SetVertex(0,xco[1],yco[1]);
-    C2->SetVertex(1,xco[2],yco[2]);
-    C2->SetVertex(2,xci[2],yci[2]);
-    C2->SetVertex(3,xci[1],yci[1]);
-    //
-    C3->SetVertex(0,xco[5],yco[5]);
-    C3->SetVertex(1,xco[6],yco[6]);
-    C3->SetVertex(2,xci[6],yci[6]);
-    C3->SetVertex(3,xci[5],yci[5]);
+    sC1->SetVertex(0,xco[0],yco[0]);
+    sC1->SetVertex(1,xco[1],yco[1]);
+    sC1->SetVertex(2,xci[1],yci[1]);
+    sC1->SetVertex(3,xci[0],yci[0]);
+    //
+    sC2->SetVertex(0,xco[1],yco[1]);
+    sC2->SetVertex(1,xco[2],yco[2]);
+    sC2->SetVertex(2,xci[2],yci[2]);
+    sC2->SetVertex(3,xci[1],yci[1]);
+    //
+    sC3->SetVertex(0,xco[5],yco[5]);
+    sC3->SetVertex(1,xco[6],yco[6]);
+    sC3->SetVertex(2,xci[6],yci[6]);
+    sC3->SetVertex(3,xci[5],yci[5]);
     // Defining the hole, filled with air
-    Double_t p1,c1,x,y,x7[3],y7[3];
-    p1 = (xo[0]-xi[0])/(yo[0]-yi[0]);
-    c1 = xo[0]+0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(xo[0]-xi[0])+
+    Double_t lp1,lc1,x,y,x7[3],y7[3];
+    lp1 = (xo[0]-xi[0])/(yo[0]-yi[0]);
+    lc1 = xo[0]+0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(xo[0]-xi[0])+
                                             SQ(yo[0]-yi[0]))/(xo[0]-xi[0]);
-    y = TSCRoutA-2.*TSCarbonFiberThA;
-    x = p1*(y-yo[0])+c1;
-    Ah1->SetVertex(0,x,y);
-    Bh1->SetVertex(0,x,y);
-    Ch1->SetVertex(4,x,y);
-    y = TSCRinA+TSCarbonFiberThA;
-    x = p1*(y-yo[0])+c1;
-    Ah1->SetVertex(3,x,y);
-    Bh1->SetVertex(3,x,y);
+    y = ktscRoutA-2.*ktscarbonFiberThA;
+    x = lp1*(y-yo[0])+lc1;
+    sAh1->SetVertex(0,x,y);
+    sBh1->SetVertex(0,x,y);
+    sCh1->SetVertex(4,x,y);
+    y = ktscRinA+ktscarbonFiberThA;
+    x = lp1*(y-yo[0])+lc1;
+    sAh1->SetVertex(3,x,y);
+    sBh1->SetVertex(3,x,y);
     x7[0] = x; y7[0] = y; // vortexing done after last point
-    //Ch1->SetVertex(7,x,y);
-    p1 = (xo[1]-xi[1])/(yo[1]-yi[1]);
-    c1 = xo[1]-0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(xo[1]-xi[1])+
+    //sCh1->SetVertex(7,x,y);
+    lp1 = (xo[1]-xi[1])/(yo[1]-yi[1]);
+    lc1 = xo[1]-0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(xo[1]-xi[1])+
                                             SQ(yo[1]-yi[1]))/(xo[1]-xi[1]);
-    y = TSCRoutA-2.*TSCarbonFiberThA;
-    x = p1*(y-yo[1])+c1;
-    Ah1->SetVertex(1,x,y);
-    Bh1->SetVertex(1,x,y);
-    Ch1->SetVertex(5,x,y);
-    y = TSCRinA+TSCarbonFiberThA;
-    x = p1*(y-yo[1])+c1;
-    Ah1->SetVertex(2,x,y);
-    Bh1->SetVertex(2,x,y);
-    Ch1->SetVertex(6,x,y);
-    //
-    // The easist way to get the points for the hole in volume A2 is to
+    y = ktscRoutA-2.*ktscarbonFiberThA;
+    x = lp1*(y-yo[1])+lc1;
+    sAh1->SetVertex(1,x,y);
+    sBh1->SetVertex(1,x,y);
+    sCh1->SetVertex(5,x,y);
+    y = ktscRinA+ktscarbonFiberThA;
+    x = lp1*(y-yo[1])+lc1;
+    sAh1->SetVertex(2,x,y);
+    sBh1->SetVertex(2,x,y);
+    sCh1->SetVertex(6,x,y);
+    //
+    // The easist way to get the points for the hole in volume sA2 is to
     // rotate it to the Y axis where the y coordinates are easier to know
     // and then rotate it back.
     Double_t xp,yp,xa,ya,xb,yb;
-    th = 0.5*TSCAngle;
+    th = 0.5*ktscAngle;
     xa = CosD(th)*xo[1]-SinD(th)*yo[1];
     ya = SinD(th)*xo[1]+CosD(th)*yo[1];
     xb = CosD(th)*xi[1]-SinD(th)*yi[1];
     yb = SinD(th)*xi[1]+CosD(th)*yi[1];
-    p1 = (xa-xb)/(ya-yb);
-    c1 = xa+0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(xa-xb)+SQ(ya-yb))/(xa-xb);
-    y = ya-TSCarbonFiberThA;
-    x = p1*(y-ya)+c1;
+    lp1 = (xa-xb)/(ya-yb);
+    lc1 = xa+0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(xa-xb)+SQ(ya-yb))/(xa-xb);
+    y = ya-ktscarbonFiberThA;
+    x = lp1*(y-ya)+lc1;
     xp = CosD(-th)*x-SinD(-th)*y;
     yp = SinD(-th)*x+CosD(-th)*y;
-    Ah2->SetVertex(0,xp,yp);
-    Bh2->SetVertex(0,xp,yp);
-    Ch2->SetVertex(4,xp,yp);
-    y = yb+2.0*TSCarbonFiberThA;
-    x = p1*(y-ya)+c1;
+    sAh2->SetVertex(0,xp,yp);
+    sBh2->SetVertex(0,xp,yp);
+    sCh2->SetVertex(4,xp,yp);
+    y = yb+2.0*ktscarbonFiberThA;
+    x = lp1*(y-ya)+lc1;
     xp = CosD(-th)*x-SinD(-th)*y;
     yp = SinD(-th)*x+CosD(-th)*y;
-    Ah2->SetVertex(3,xp,yp);
-    Bh2->SetVertex(3,xp,yp);
+    sAh2->SetVertex(3,xp,yp);
+    sBh2->SetVertex(3,xp,yp);
     x7[1] = x; y7[1] = y; // vortexing done after last point
-    //Ch2->SetVertex(7,xp,yp);
+    //sCh2->SetVertex(7,xp,yp);
     xa = CosD(th)*xo[2]-SinD(th)*yo[2];
     ya = SinD(th)*xo[2]+CosD(th)*yo[2];
     xb = CosD(th)*xi[2]-SinD(th)*yi[2];
     yb = SinD(th)*xi[2]+CosD(th)*yi[2];
-    p1 = (xa-xb)/(ya-yb);
-    c1 = xa-0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(xa-xb)+SQ(ya-yb))/(xa-xb);
-    y = ya-TSCarbonFiberThA;
-    x = p1*(y-ya)+c1;
+    lp1 = (xa-xb)/(ya-yb);
+    lc1 = xa-0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(xa-xb)+SQ(ya-yb))/(xa-xb);
+    y = ya-ktscarbonFiberThA;
+    x = lp1*(y-ya)+lc1;
     xp = CosD(-th)*x-SinD(-th)*y;
     yp = SinD(-th)*x+CosD(-th)*y;
-    Ah2->SetVertex(1,xp,yp);
-    Bh2->SetVertex(1,xp,yp);
-    Ch2->SetVertex(5,xp,yp);
-    y = yb+2.0*TSCarbonFiberThA;
-    x = p1*(y-ya)+c1;
+    sAh2->SetVertex(1,xp,yp);
+    sBh2->SetVertex(1,xp,yp);
+    sCh2->SetVertex(5,xp,yp);
+    y = yb+2.0*ktscarbonFiberThA;
+    x = lp1*(y-ya)+lc1;
     xp = CosD(-th)*x-SinD(-th)*y;
     yp = SinD(-th)*x+CosD(-th)*y;
-    Ah2->SetVertex(2,xp,yp);
-    Bh2->SetVertex(2,xp,yp);
-    Ch2->SetVertex(6,xp,yp);
+    sAh2->SetVertex(2,xp,yp);
+    sBh2->SetVertex(2,xp,yp);
+    sCh2->SetVertex(6,xp,yp);
     //
-    p1 = (yo[5]-yi[5])/(xo[5]-xi[5]);
-    c1 = yo[5]+0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(yo[5]-yi[5])+
+    lp1 = (yo[5]-yi[5])/(xo[5]-xi[5]);
+    lc1 = yo[5]+0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(yo[5]-yi[5])+
                                             SQ(xo[5]-xi[5]))/(yo[5]-yi[5]);
-    x = xo[5]-TSCarbonFiberThA;
-    y = p1*(x-xo[5])+c1;
-    Ah3->SetVertex(0,x,y);
-    Bh3->SetVertex(0,x,y);
-    Ch3->SetVertex(4,x,y);
-    x = xi[5]+2.0*TSCarbonFiberThA;
-    y = p1*(x-xo[5])+c1;
-    Ah3->SetVertex(3,x,y);
-    Bh3->SetVertex(3,x,y);
+    x = xo[5]-ktscarbonFiberThA;
+    y = lp1*(x-xo[5])+lc1;
+    sAh3->SetVertex(0,x,y);
+    sBh3->SetVertex(0,x,y);
+    sCh3->SetVertex(4,x,y);
+    x = xi[5]+2.0*ktscarbonFiberThA;
+    y = lp1*(x-xo[5])+lc1;
+    sAh3->SetVertex(3,x,y);
+    sBh3->SetVertex(3,x,y);
     x7[2] = x; y7[2] = y; // vortexing done after last point
-    //Ch3->SetVertex(7,x,y);
-    y = 2.0*TSCarbonFiberThA;
-    x = xo[5]-TSCarbonFiberThA;
-    Ah3->SetVertex(1,x,y);
-    Bh3->SetVertex(1,x,y);
-    Ch3->SetVertex(5,x,y);
-    y = 2.0*TSCarbonFiberThA;
-    x = xi[5]+2.0*TSCarbonFiberThA;
-    Ah3->SetVertex(2,x,y);
-    Bh3->SetVertex(2,x,y);
-    Ch3->SetVertex(6,x,y);
+    //sCh3->SetVertex(7,x,y);
+    y = 2.0*ktscarbonFiberThA;
+    x = xo[5]-ktscarbonFiberThA;
+    sAh3->SetVertex(1,x,y);
+    sBh3->SetVertex(1,x,y);
+    sCh3->SetVertex(5,x,y);
+    y = 2.0*ktscarbonFiberThA;
+    x = xi[5]+2.0*ktscarbonFiberThA;
+    sAh3->SetVertex(2,x,y);
+    sBh3->SetVertex(2,x,y);
+    sCh3->SetVertex(6,x,y);
     //
     for(i=0;i<4;i++){ // define points at +dz
-      A1->SetVertex(i+4,(A1->GetVertices())[2*i],(A1->GetVertices())[1+2*i]);
-      A2->SetVertex(i+4,(A2->GetVertices())[2*i],(A2->GetVertices())[1+2*i]);
-      A3->SetVertex(i+4,(A3->GetVertices())[2*i],(A3->GetVertices())[1+2*i]);
-      //
-      B1->SetVertex(i+4,(B1->GetVertices())[2*i],(B1->GetVertices())[1+2*i]);
-      B2->SetVertex(i+4,(B2->GetVertices())[2*i],(B2->GetVertices())[1+2*i]);
-      B3->SetVertex(i+4,(B3->GetVertices())[2*i],(B3->GetVertices())[1+2*i]);
-      // C's are a cone which must match up with B's.
-      C1->SetVertex(i+4,(B1->GetVertices())[2*i],(B1->GetVertices())[1+2*i]);
-      C2->SetVertex(i+4,(B2->GetVertices())[2*i],(B2->GetVertices())[1+2*i]);
-      C3->SetVertex(i+4,(B3->GetVertices())[2*i],(B3->GetVertices())[1+2*i]);
-      //
-      Ah1->SetVertex(i+4,(Ah1->GetVertices())[2*i],
-                         (Ah1->GetVertices())[1+2*i]);
-      Ah2->SetVertex(i+4,(Ah2->GetVertices())[2*i],
-                         (Ah2->GetVertices())[1+2*i]);
-      Ah3->SetVertex(i+4,(Ah3->GetVertices())[2*i],
-                         (Ah3->GetVertices())[1+2*i]);
-      //
-      Bh1->SetVertex(i+4,(Bh1->GetVertices())[2*i],
-                         (Bh1->GetVertices())[1+2*i]);
-      Bh2->SetVertex(i+4,(Bh2->GetVertices())[2*i],
-                         (Bh2->GetVertices())[1+2*i]);
-      Bh3->SetVertex(i+4,(Bh3->GetVertices())[2*i],
-                         (Bh3->GetVertices())[1+2*i]);
+     sA1->SetVertex(i+4,(sA1->GetVertices())[2*i],(sA1->GetVertices())[1+2*i]);
+     sA2->SetVertex(i+4,(sA2->GetVertices())[2*i],(sA2->GetVertices())[1+2*i]);
+     sA3->SetVertex(i+4,(sA3->GetVertices())[2*i],(sA3->GetVertices())[1+2*i]);
+     //
+     sB1->SetVertex(i+4,(sB1->GetVertices())[2*i],(sB1->GetVertices())[1+2*i]);
+     sB2->SetVertex(i+4,(sB2->GetVertices())[2*i],(sB2->GetVertices())[1+2*i]);
+     sB3->SetVertex(i+4,(sB3->GetVertices())[2*i],(sB3->GetVertices())[1+2*i]);
+     // C's are a cone which must match up with B's.
+     sC1->SetVertex(i+4,(sB1->GetVertices())[2*i],(sB1->GetVertices())[1+2*i]);
+     sC2->SetVertex(i+4,(sB2->GetVertices())[2*i],(sB2->GetVertices())[1+2*i]);
+     sC3->SetVertex(i+4,(sB3->GetVertices())[2*i],(sB3->GetVertices())[1+2*i]);
+     //
+     sAh1->SetVertex(i+4,(sAh1->GetVertices())[2*i],
+                     (sAh1->GetVertices())[1+2*i]);
+     sAh2->SetVertex(i+4,(sAh2->GetVertices())[2*i],
+                     (sAh2->GetVertices())[1+2*i]);
+     sAh3->SetVertex(i+4,(sAh3->GetVertices())[2*i],
+                     (sAh3->GetVertices())[1+2*i]);
+     //
+     sBh1->SetVertex(i+4,(sBh1->GetVertices())[2*i],
+                     (sBh1->GetVertices())[1+2*i]);
+     sBh2->SetVertex(i+4,(sBh2->GetVertices())[2*i],
+                     (sBh2->GetVertices())[1+2*i]);
+     sBh3->SetVertex(i+4,(sBh3->GetVertices())[2*i],
+                     (sBh3->GetVertices())[1+2*i]);
     } // end for
     //
-    p1 = (xco[0]-xci[0])/(yco[0]-yci[0]);
-    c1 = xco[0]+0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(xco[0]-xci[0])+
+    lp1 = (xco[0]-xci[0])/(yco[0]-yci[0]);
+    lc1 = xco[0]+0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(xco[0]-xci[0])+
                                            SQ(yco[0]-yci[0]))/(xco[0]-xci[0]);
-    y = TSCRoutC-2.*TSCarbonFiberThA;
-    x = p1*(y-yco[0])+c1;
-    Ch1->SetVertex(0,x,y);
-    y = TSCRinC+TSCarbonFiberThA;
-    x = p1*(y-yci[0])+c1;
-    Ch1->SetVertex(2,x,y);
-    p1 = (xco[1]-xci[1])/(yco[1]-yci[1]);
-    c1 = xco[1]-0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(xco[1]-xci[1])+
+    y = ktscRoutC-2.*ktscarbonFiberThA;
+    x = lp1*(y-yco[0])+lc1;
+    sCh1->SetVertex(0,x,y);
+    y = ktscRinC+ktscarbonFiberThA;
+    x = lp1*(y-yci[0])+lc1;
+    sCh1->SetVertex(2,x,y);
+    lp1 = (xco[1]-xci[1])/(yco[1]-yci[1]);
+    lc1 = xco[1]-0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(xco[1]-xci[1])+
                                            SQ(yco[1]-yci[1]))/(xco[1]-xci[1]);
-    y = TSCRoutC-2.*TSCarbonFiberThA;
-    x = p1*(y-yco[1])+c1;
-    Ch1->SetVertex(1,x,y);
-    y = TSCRinC+TSCarbonFiberThA;
-    x = p1*(y-yci[1])+c1;
-    Ch1->SetVertex(3,x,y);
-    //
-    th = 0.5*TSCAngle;
+    y = ktscRoutC-2.*ktscarbonFiberThA;
+    x = lp1*(y-yco[1])+lc1;
+    sCh1->SetVertex(1,x,y);
+    y = ktscRinC+ktscarbonFiberThA;
+    x = lp1*(y-yci[1])+lc1;
+    sCh1->SetVertex(3,x,y);
+    //
+    th = 0.5*ktscAngle;
     xa = CosD(th)*xco[1]-SinD(th)*yco[1];
     ya = SinD(th)*xco[1]+CosD(th)*yco[1];
     xb = CosD(th)*xci[1]-SinD(th)*yci[1];
     yb = SinD(th)*xci[1]+CosD(th)*yci[1];
-    p1 = (xa-xb)/(ya-yb);
-    c1 = xa+0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(xa-xb)+SQ(ya-yb))/(xa-xb);
-    y = ya-TSCarbonFiberThA;
-    x = p1*(y-ya)+c1;
+    lp1 = (xa-xb)/(ya-yb);
+    lc1 = xa+0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(xa-xb)+SQ(ya-yb))/(xa-xb);
+    y = ya-ktscarbonFiberThA;
+    x = lp1*(y-ya)+lc1;
     xp = CosD(-th)*x-SinD(-th)*y;
     yp = SinD(-th)*x+CosD(-th)*y;
-    yp = ya-TSCarbonFiberThA;
-    xp = p1*(y-ya)+c1;
-    Ch2->SetVertex(0,xp,yp);
-    y = yb+2.0*TSCarbonFiberThA;
-    x = p1*(y-ya)+c1;
+    yp = ya-ktscarbonFiberThA;
+    xp = lp1*(y-ya)+lc1;
+    sCh2->SetVertex(0,xp,yp);
+    y = yb+2.0*ktscarbonFiberThA;
+    x = lp1*(y-ya)+lc1;
     xp = CosD(-th)*x-SinD(-th)*y;
     yp = SinD(-th)*x+CosD(-th)*y;
-    Ch2->SetVertex(2,xp,yp);
+    sCh2->SetVertex(2,xp,yp);
     xa = CosD(th)*xco[2]-SinD(th)*yco[2];
     ya = SinD(th)*xco[2]+CosD(th)*yco[2];
     xb = CosD(th)*xci[2]-SinD(th)*yci[2];
     yb = SinD(th)*xci[2]+CosD(th)*yci[2];
-    p1 = (xa-xb)/(ya-yb);
-    c1 = xa-0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(xa-xb)+SQ(ya-yb))/(xa-xb);
-    y = ya-TSCarbonFiberThA;
-    x = p1*(y-ya)+c1;
+    lp1 = (xa-xb)/(ya-yb);
+    lc1 = xa-0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(xa-xb)+SQ(ya-yb))/(xa-xb);
+    y = ya-ktscarbonFiberThA;
+    x = lp1*(y-ya)+lc1;
     xp = CosD(-th)*x-SinD(-th)*y;
     yp = SinD(-th)*x+CosD(-th)*y;
-    Ch2->SetVertex(1,xp,yp);
-    y = yb+2.0*TSCarbonFiberThA;
-    x = p1*(y-ya)+c1;
+    sCh2->SetVertex(1,xp,yp);
+    y = yb+2.0*ktscarbonFiberThA;
+    x = lp1*(y-ya)+lc1;
     xp = CosD(-th)*x-SinD(-th)*y;
     yp = SinD(-th)*x+CosD(-th)*y;
-    Ch2->SetVertex(3,xp,yp);
+    sCh2->SetVertex(3,xp,yp);
     //
-    p1 = (yco[5]-yci[5])/(xco[5]-xci[5]);
-    c1 = yco[5]+0.5*TSCarbonFiberThA*TMath::Sqrt(SQ(yco[5]-yci[5])+
+    lp1 = (yco[5]-yci[5])/(xco[5]-xci[5]);
+    lc1 = yco[5]+0.5*ktscarbonFiberThA*TMath::Sqrt(SQ(yco[5]-yci[5])+
                                           SQ(xco[5]-xci[5]))/(yco[5]-yci[5]);
-    x = xco[5]-TSCarbonFiberThA;
-    y = p1*(x-xco[5])+c1;
-    Ch3->SetVertex(0,x,y);
-    x = xci[5]+2.0*TSCarbonFiberThA;
-    y = p1*(x-xci[5])+c1;
-    Ch3->SetVertex(2,x,y);
-    y = 2.0*TSCarbonFiberThA;
-    x = xco[5]-TSCarbonFiberThA;
-    Ch3->SetVertex(1,x,y);
-    y = 2.0*TSCarbonFiberThA;
-    x = xci[5]+2.0*TSCarbonFiberThA;
-    Ch3->SetVertex(3,x,y);
-    Ch1->SetVertex(7,x7[0],y7[0]); // 7th point most be done last ???
-    Ch2->SetVertex(7,x7[1],y7[1]); // 7th point most be done last ???
-    Ch3->SetVertex(7,x7[2],y7[2]); // 7th point most be done last ???
-    PrintArb8(A1);
-    PrintArb8(Ah1);
-    PrintArb8(A2);
-    PrintArb8(Ah2);
-    PrintArb8(A3);
-    PrintArb8(Ah3);
-    PrintArb8(B1);
-    PrintArb8(Bh1);
-    PrintArb8(B2);
-    PrintArb8(Bh2);
-    PrintArb8(B3);
-    PrintArb8(Bh3);
-    PrintArb8(C1);
-    PrintArb8(Ch1);
-    PrintArb8(C2);
-    PrintArb8(Ch2);
-    PrintArb8(C3);
-    PrintArb8(Ch3);
+    x = xco[5]-ktscarbonFiberThA;
+    y = lp1*(x-xco[5])+lc1;
+    sCh3->SetVertex(0,x,y);
+    x = xci[5]+2.0*ktscarbonFiberThA;
+    y = lp1*(x-xci[5])+lc1;
+    sCh3->SetVertex(2,x,y);
+    y = 2.0*ktscarbonFiberThA;
+    x = xco[5]-ktscarbonFiberThA;
+    sCh3->SetVertex(1,x,y);
+    y = 2.0*ktscarbonFiberThA;
+    x = xci[5]+2.0*ktscarbonFiberThA;
+    sCh3->SetVertex(3,x,y);
+    sCh1->SetVertex(7,x7[0],y7[0]); // 7th point most be done last ???
+    sCh2->SetVertex(7,x7[1],y7[1]); // 7th point most be done last ???
+    sCh3->SetVertex(7,x7[2],y7[2]); // 7th point most be done last ???
+    PrintArb8(sA1);
+    PrintArb8(sAh1);
+    PrintArb8(sA2);
+    PrintArb8(sAh2);
+    PrintArb8(sA3);
+    PrintArb8(sAh3);
+    PrintArb8(sB1);
+    PrintArb8(sBh1);
+    PrintArb8(sB2);
+    PrintArb8(sBh2);
+    PrintArb8(sB3);
+    PrintArb8(sBh3);
+    PrintArb8(sC1);
+    PrintArb8(sCh1);
+    PrintArb8(sC2);
+    PrintArb8(sCh2);
+    PrintArb8(sC3);
+    PrintArb8(sCh3);
     //
     // Define Minimal volume to inclose this SPD Thermal Sheald.
-    TGeoPcon *M1 = new TGeoPcon("ITSspdShealdVV",0.0,360.0,9);
-    M1->Z(0)    = 0.5*TSCLengthA+TSCLengthB;
-    M1->Rmin(0) = TSCRinB;
-    x = B1->GetVertices()[0]; // [0][0]
-    y = B1->GetVertices()[1]; // [0][1]
-    M1->Rmax(0) = TMath::Sqrt(x*x+y*y);
-    M1->Z(1)    = M1->GetZ(0)-TSCLengthB;
-    M1->Rmin(1) = M1->GetRmin(0);
-    M1->Rmax(1) = M1->GetRmax(0);
-    M1->Z(2)    = M1->GetZ(1);
-    M1->Rmin(2) = TSCRinA;
-    x = A1->GetVertices()[0]; // [0]0]
-    y = A1->GetVertices()[1]; // [0][1]
-    M1->Rmax(2) = TMath::Sqrt(x*x+y*y);
-    M1->Z(3)    = -(M1->GetZ(0)-TSCLengthB);
-    M1->Rmin(3) = M1->GetRmin(2);
-    M1->Rmax(3) = M1->GetRmax(2);
-    M1->Z(4)    = M1->GetZ(3);
-    M1->Rmin(4) = M1->GetRmin(1);
-    M1->Rmax(4) = M1->GetRmax(1);
-    M1->Z(5)    = -(M1->GetZ(0));
-    M1->Rmin(5) = M1->GetRmin(0);
-    M1->Rmax(5) = M1->GetRmax(0);
-    M1->Z(6)    = M1->GetZ(5) - TSCLengthC;
-    M1->Rmin(6) = TSCRinC;
-    x = C1->GetVertices()[0]; // [0][0]
-    y = C1->GetVertices()[1]; // [0][1]
-    M1->Rmax(6) = TMath::Sqrt(x*x+y*y);
-    M1->Z(7)    = M1->GetZ(6);
-    M1->Rmin(7) = D->GetRmin();
-    M1->Rmax(7) = D->GetRmax();
-    M1->Z(8)    = M1->Z(7) - TSCLengthD;
-    M1->Rmin(8) = M1->GetRmin(7);
-    M1->Rmax(8) = M1->GetRmax(7);
-    TGeoTubeSeg *M2 = new TGeoTubeSeg("ITSspdShealdWingVV",
-       M1->GetRmax(8),Dw->GetRmax(),Dw->GetDz(),Dw->GetPhi1(),Dw->GetPhi2());
-    PrintTubeSeg(M2);
-    //
-    x = 0.5*(M1->GetZ(8) + M1->GetZ(7));
+    sM1 = new TGeoPcon("ITSspdShealdVV",0.0,360.0,9);
+    sM1->Z(0)    = 0.5*ktscLengthA+ktscLengthB;
+    sM1->Rmin(0) = ktscRinB;
+    x = sB1->GetVertices()[0]; // [0][0]
+    y = sB1->GetVertices()[1]; // [0][1]
+    sM1->Rmax(0) = TMath::Sqrt(x*x+y*y);
+    sM1->Z(1)    = sM1->GetZ(0)-ktscLengthB;
+    sM1->Rmin(1) = sM1->GetRmin(0);
+    sM1->Rmax(1) = sM1->GetRmax(0);
+    sM1->Z(2)    = sM1->GetZ(1);
+    sM1->Rmin(2) = ktscRinA;
+    x = sA1->GetVertices()[0]; // [0]0]
+    y = sA1->GetVertices()[1]; // [0][1]
+    sM1->Rmax(2) = TMath::Sqrt(x*x+y*y);
+    sM1->Z(3)    = -(sM1->GetZ(0)-ktscLengthB);
+    sM1->Rmin(3) = sM1->GetRmin(2);
+    sM1->Rmax(3) = sM1->GetRmax(2);
+    sM1->Z(4)    = sM1->GetZ(3);
+    sM1->Rmin(4) = sM1->GetRmin(1);
+    sM1->Rmax(4) = sM1->GetRmax(1);
+    sM1->Z(5)    = -(sM1->GetZ(0));
+    sM1->Rmin(5) = sM1->GetRmin(0);
+    sM1->Rmax(5) = sM1->GetRmax(0);
+    sM1->Z(6)    = sM1->GetZ(5) - ktscLengthC;
+    sM1->Rmin(6) = ktscRinC;
+    x = sC1->GetVertices()[0]; // [0][0]
+    y = sC1->GetVertices()[1]; // [0][1]
+    sM1->Rmax(6) = TMath::Sqrt(x*x+y*y);
+    sM1->Z(7)    = sM1->GetZ(6);
+    sM1->Rmin(7) = sD->GetRmin();
+    sM1->Rmax(7) = sD->GetRmax();
+    sM1->Z(8)    = sM1->Z(7) - ktscLengthD;
+    sM1->Rmin(8) = sM1->GetRmin(7);
+    sM1->Rmax(8) = sM1->GetRmax(7);
+    sM2 = new TGeoTubeSeg("ITSspdShealdWingVV",
+                          sM1->GetRmax(8),sDw->GetRmax(),sDw->GetDz(),
+                          sDw->GetPhi1(),sDw->GetPhi2());
+    PrintTubeSeg(sM2);
+    //
+    x = 0.5*(sM1->GetZ(8) + sM1->GetZ(7));
     tranITSspdShealdVVt0 = new TGeoTranslation("ITSspdShealdVVt0",0.0,0.0,x);
     tranITSspdShealdVVt0->RegisterYourself();
     TGeoRotation rotz90("",0.0,0.0,90.0); // never registered.
@@ -535,223 +531,223 @@ void AliITSv11GeometrySupport::SPDThermalSheald(TGeoVolume *Moth){
     rotITSspdShealdVVt3 = new TGeoCombiTrans(*tranITSspdShealdVVt0,rotz270);
     rotITSspdShealdVVt3->SetName("ITSspdShealdVVt3");
     rotITSspdShealdVVt3->RegisterYourself();
-    M = new TGeoCompositeShape("ITS SPD Thermal sheald volume",
-                              "(((ITSspdShealdVV+"
-                              "ITSspdShealdWingVV:ITSspdShealdVVt0)+"
-                              "ITSspdShealdWingVV:ITSspdShealdVVt1)+"
-                              "ITSspdShealdWingVV:ITSspdShealdVVt2)+"
-                              "ITSspdShealdWingVV:ITSspdShealdVVt3");
+    sM = new TGeoCompositeShape("ITS SPD Thermal sheald volume",
+                                "(((ITSspdShealdVV+"
+                                "ITSspdShealdWingVV:ITSspdShealdVVt0)+"
+                                "ITSspdShealdWingVV:ITSspdShealdVVt1)+"
+                                "ITSspdShealdWingVV:ITSspdShealdVVt2)+"
+                                "ITSspdShealdWingVV:ITSspdShealdVVt3");
     //
     TGeoManager *mgr = gGeoManager;
-    SPDcf = mgr->GetMedium("ITSspdCarbonFiber");
-    SPDfs = mgr->GetMedium("ITSspdStaselite4411w");
-    SPDfo = mgr->GetMedium("ITSspdRohacell50A");
-    SPDss = mgr->GetMedium("ITSspdStainlessSteal");
-    SPDair= mgr->GetMedium("ITSspdAir");
-    TGeoVolume *A1v,*A2v,*A3v,*Ah1v,*Ah2v,*Ah3v;
-    TGeoVolume *B1v,*B2v,*B3v,*Bh1v,*Bh2v,*Bh3v;
-    TGeoVolume *C1v,*C2v,*C3v,*Ch1v,*Ch2v,*Ch3v;
-    TGeoVolume *Dv,*Dsv,*Dwv,*Dwsv,*Mv;
-    Mv = new TGeoVolume("ITSspdThermalSheald",M,SPDair);
-    Mv->SetVisibility(kTRUE);
-    Mv->SetLineColor(7); // light Blue
-    Mv->SetLineWidth(1);
-    Mv->SetFillColor(Mv->GetLineColor());
-    Mv->SetFillStyle(4090); // 90% transparent
-    Moth->AddNode(Mv,1,0); ///////////////////// Virtual Volume ////////
-    A1v = new TGeoVolume("ITSspdCentCylA1CF",A1,SPDcf);
-    A1v->SetVisibility(kTRUE);
-    A1v->SetLineColor(4);
-    A1v->SetLineWidth(1);
-    A2v = new TGeoVolume("ITSspdCentCylA2CF",A2,SPDcf);
-    A2v->SetVisibility(kTRUE);
-    A2v->SetLineColor(4);
-    A2v->SetLineWidth(1);
-    A3v = new TGeoVolume("ITSspdCentCylA3CF",A3,SPDcf);
-    A3v->SetVisibility(kTRUE);
-    A3v->SetLineColor(4);
-    A3v->SetLineWidth(1);
-    B1v = new TGeoVolume("ITSspdCentCylB1CF",B1,SPDcf);
-    B1v->SetVisibility(kTRUE);
-    B1v->SetLineColor(4);
-    B1v->SetLineWidth(1);
-    B2v = new TGeoVolume("ITSspdCentCylB2CF",B2,SPDcf);
-    B2v->SetVisibility(kTRUE);
-    B2v->SetLineColor(4);
-    B2v->SetLineWidth(1);
-    B3v = new TGeoVolume("ITSspdCentCylB3CF",B3,SPDcf);
-    B3v->SetVisibility(kTRUE);
-    B3v->SetLineColor(4);
-    B3v->SetLineWidth(1);
-    C1v = new TGeoVolume("ITSspdCentCylC1CF",C1,SPDcf);
-    C1v->SetVisibility(kTRUE);
-    C1v->SetLineColor(4);
-    C1v->SetLineWidth(1);
-    C2v = new TGeoVolume("ITSspdCentCylC2CF",C2,SPDcf);
-    C2v->SetVisibility(kTRUE);
-    C2v->SetLineColor(4);
-    C2v->SetLineWidth(1);
-    C3v = new TGeoVolume("ITSspdCentCylC3CF",C3,SPDcf);
-    C3v->SetVisibility(kTRUE);
-    C3v->SetLineColor(4);
-    C3v->SetLineWidth(1);
-    Ah1v = new TGeoVolume("ITSspdCentCylA1AirA",Ah1,SPDair);
-    Ah1v->SetVisibility(kTRUE);
-    Ah1v->SetLineColor(5); // Yellow
-    Ah1v->SetFillColor(Ah1v->GetLineColor());
-    Ah1v->SetFillStyle(4090); // 90% transparent
-    Ah2v = new TGeoVolume("ITSspdCentCylA2AirA",Ah2,SPDair);
-    Ah2v->SetVisibility(kTRUE);
-    Ah2v->SetLineColor(5); // Yellow
-    Ah2v->SetFillColor(Ah2v->GetLineColor());
-    Ah2v->SetFillStyle(4090); // 90% transparent
-    Ah3v = new TGeoVolume("ITSspdCentCylA3AirA",Ah3,SPDair);
-    Ah3v->SetVisibility(kTRUE);
-    Ah3v->SetLineColor(5); // Yellow
-    Ah3v->SetFillColor(Ah3v->GetLineColor());
-    Ah3v->SetFillStyle(4090); // 90% transparent
-    Bh1v = new TGeoVolume("ITSspdCentCylA1AirB",Bh1,SPDair);
-    Bh1v->SetVisibility(kTRUE);
-    Bh1v->SetLineColor(5); // Yellow
-    Bh1v->SetFillColor(Bh1v->GetLineColor());
-    Bh1v->SetFillStyle(4090); // 90% transparent
-    Bh2v = new TGeoVolume("ITSspdCentCylA2AirB",Bh2,SPDair);
-    Bh2v->SetVisibility(kTRUE);
-    Bh2v->SetLineColor(5); // Yellow
-    Bh2v->SetFillColor(Bh2v->GetLineColor());
-    Bh2v->SetFillStyle(4090); // 90% transparent
-    Bh3v = new TGeoVolume("ITSspdCentCylA3AirB",Bh3,SPDair);
-    Bh3v->SetVisibility(kTRUE);
-    Bh3v->SetLineColor(5); // Yellow
-    Bh3v->SetFillColor(Bh3v->GetLineColor());
-    Bh3v->SetFillStyle(4090); // 90% transparent
-    Ch1v = new TGeoVolume("ITSspdCentCylA1AirC",Ch1,SPDair);
-    Ch1v->SetVisibility(kTRUE);
-    Ch1v->SetLineColor(5); // Yellow
-    Ch1v->SetFillColor(Ch1v->GetLineColor());
-    Ch1v->SetFillStyle(4090); // 90% transparent
-    Ch2v = new TGeoVolume("ITSspdCentCylA2AirC",Ch2,SPDair);
-    Ch2v->SetVisibility(kTRUE);
-    Ch2v->SetLineColor(5); // Yellow
-    Ch2v->SetFillColor(Ch2v->GetLineColor());
-    Ch2v->SetFillStyle(4090); // 90% transparent
-    Ch3v = new TGeoVolume("ITSspdCentCylA3AirC",Ch3,SPDair);
-    Ch3v->SetVisibility(kTRUE);
-    Ch3v->SetLineColor(5); // Yellow
-    Ch3v->SetFillColor(Ch3v->GetLineColor());
-    Ch3v->SetFillStyle(4090); // 90% transparent
-    Dv = new TGeoVolume("ITSspdCentCylA1CD",D,SPDcf);
-    Dv->SetVisibility(kTRUE);
-    Dv->SetLineColor(4);
-    Dv->SetLineWidth(1);
-    Dwv = new TGeoVolume("ITSspdCentCylA1CDw",Dw,SPDcf);
-    Dwv->SetVisibility(kTRUE);
-    Dwv->SetLineColor(4);
-    Dwv->SetLineWidth(1);
-    Dsv = new TGeoVolume("ITSspdCentCylA1Dfill",Ds,SPDfs);
-    Dsv->SetVisibility(kTRUE);
-    Dsv->SetLineColor(3); // Green
-    Dsv->SetFillColor(Dsv->GetLineColor());
-    Dsv->SetFillStyle(4010); // 10% transparent
-    Dwsv = new TGeoVolume("ITSspdCentCylA1DwingFill",Dws,SPDfs);
-    Dwsv->SetVisibility(kTRUE);
-    Dwsv->SetLineColor(3); // Green
-    Dwsv->SetFillColor(Dwsv->GetLineColor());
-    Dwsv->SetFillStyle(4010); // 10% transparent
-    //
-    A1v->AddNode(Ah1v,1,0);
-    A2v->AddNode(Ah2v,1,0);
-    A3v->AddNode(Ah3v,1,0);
-    B1v->AddNode(Bh1v,1,0);
-    B2v->AddNode(Bh2v,1,0);
-    B3v->AddNode(Bh3v,1,0);
-    C1v->AddNode(Ch1v,1,0);
-    C2v->AddNode(Ch2v,1,0);
-    C3v->AddNode(Ch3v,1,0);
-    Dv ->AddNode(Dsv ,1,0);
-    Dwv->AddNode(Dwsv,1,0);
-    //
-    Mv->AddNode(A1v,1,0);
-    Mv->AddNode(A2v,1,0);
-    Mv->AddNode(A3v,1,0);
-    tranb  = new TGeoTranslation("",0.0,0.0,0.5*(TSCLengthA+TSCLengthB));
-    tranbm = new TGeoTranslation("",0.0,0.0,0.5*(-TSCLengthA-TSCLengthB));
-    Mv->AddNode(B1v,1,tranb);
-    Mv->AddNode(B2v,1,tranb);
-    Mv->AddNode(B3v,1,tranb);
-    Mv->AddNode(B1v,2,tranbm);
-    Mv->AddNode(B2v,2,tranbm);
-    Mv->AddNode(B3v,2,tranbm);
-    // Muon side (rb26) is at -Z.
+    medSPDcf = mgr->GetMedium("ITSspdCarbonFiber");
+    medSPDfs = mgr->GetMedium("ITSspdStaselite4411w");
+    medSPDfo = mgr->GetMedium("ITSspdRohacell50A");
+    medSPDss = mgr->GetMedium("ITSspdStainlessSteal");
+    medSPDair= mgr->GetMedium("ITSspdAir");
+    TGeoVolume *vA1,*vA2,*vA3,*vAh1,*vAh2,*vAh3;
+    TGeoVolume *vB1,*vB2,*vB3,*vBh1,*vBh2,*vBh3;
+    TGeoVolume *vC1,*vC2,*vC3,*vCh1,*vCh2,*vCh3;
+    TGeoVolume *vD,*vDs,*vDw,*vDws,*vM;
+    vM = new TGeoVolume("ITSspdThermalSheald",sM,medSPDair);
+    vM->SetVisibility(kTRUE);
+    vM->SetLineColor(7); // light Blue
+    vM->SetLineWidth(1);
+    vM->SetFillColor(vM->GetLineColor());
+    vM->SetFillStyle(4090); // 90% transparent
+    moth->AddNode(vM,1,0); ///////////////////// Virtual Volume ////////
+    vA1 = new TGeoVolume("ITSspdCentCylA1CF",sA1,medSPDcf);
+    vA1->SetVisibility(kTRUE);
+    vA1->SetLineColor(4);
+    vA1->SetLineWidth(1);
+    vA2 = new TGeoVolume("ITSspdCentCylA2CF",sA2,medSPDcf);
+    vA2->SetVisibility(kTRUE);
+    vA2->SetLineColor(4);
+    vA2->SetLineWidth(1);
+    vA3 = new TGeoVolume("ITSspdCentCylA3CF",sA3,medSPDcf);
+    vA3->SetVisibility(kTRUE);
+    vA3->SetLineColor(4);
+    vA3->SetLineWidth(1);
+    vB1 = new TGeoVolume("ITSspdCentCylB1CF",sB1,medSPDcf);
+    vB1->SetVisibility(kTRUE);
+    vB1->SetLineColor(4);
+    vB1->SetLineWidth(1);
+    vB2 = new TGeoVolume("ITSspdCentCylB2CF",sB2,medSPDcf);
+    vB2->SetVisibility(kTRUE);
+    vB2->SetLineColor(4);
+    vB2->SetLineWidth(1);
+    vB3 = new TGeoVolume("ITSspdCentCylB3CF",sB3,medSPDcf);
+    vB3->SetVisibility(kTRUE);
+    vB3->SetLineColor(4);
+    vB3->SetLineWidth(1);
+    vC1 = new TGeoVolume("ITSspdCentCylC1CF",sC1,medSPDcf);
+    vC1->SetVisibility(kTRUE);
+    vC1->SetLineColor(4);
+    vC1->SetLineWidth(1);
+    vC2 = new TGeoVolume("ITSspdCentCylC2CF",sC2,medSPDcf);
+    vC2->SetVisibility(kTRUE);
+    vC2->SetLineColor(4);
+    vC2->SetLineWidth(1);
+    vC3 = new TGeoVolume("ITSspdCentCylC3CF",sC3,medSPDcf);
+    vC3->SetVisibility(kTRUE);
+    vC3->SetLineColor(4);
+    vC3->SetLineWidth(1);
+    vAh1 = new TGeoVolume("ITSspdCentCylA1AirA",sAh1,medSPDair);
+    vAh1->SetVisibility(kTRUE);
+    vAh1->SetLineColor(5); // Yellow
+    vAh1->SetFillColor(vAh1->GetLineColor());
+    vAh1->SetFillStyle(4090); // 90% transparent
+    vAh2 = new TGeoVolume("ITSspdCentCylA2AirA",sAh2,medSPDair);
+    vAh2->SetVisibility(kTRUE);
+    vAh2->SetLineColor(5); // Yellow
+    vAh2->SetFillColor(vAh2->GetLineColor());
+    vAh2->SetFillStyle(4090); // 90% transparent
+    vAh3 = new TGeoVolume("ITSspdCentCylA3AirA",sAh3,medSPDair);
+    vAh3->SetVisibility(kTRUE);
+    vAh3->SetLineColor(5); // Yellow
+    vAh3->SetFillColor(vAh3->GetLineColor());
+    vAh3->SetFillStyle(4090); // 90% transparent
+    vBh1 = new TGeoVolume("ITSspdCentCylA1AirB",sBh1,medSPDair);
+    vBh1->SetVisibility(kTRUE);
+    vBh1->SetLineColor(5); // Yellow
+    vBh1->SetFillColor(vBh1->GetLineColor());
+    vBh1->SetFillStyle(4090); // 90% transparent
+    vBh2 = new TGeoVolume("ITSspdCentCylA2AirB",sBh2,medSPDair);
+    vBh2->SetVisibility(kTRUE);
+    vBh2->SetLineColor(5); // Yellow
+    vBh2->SetFillColor(vBh2->GetLineColor());
+    vBh2->SetFillStyle(4090); // 90% transparent
+    vBh3 = new TGeoVolume("ITSspdCentCylA3AirB",sBh3,medSPDair);
+    vBh3->SetVisibility(kTRUE);
+    vBh3->SetLineColor(5); // Yellow
+    vBh3->SetFillColor(vBh3->GetLineColor());
+    vBh3->SetFillStyle(4090); // 90% transparent
+    vCh1 = new TGeoVolume("ITSspdCentCylA1AirC",sCh1,medSPDair);
+    vCh1->SetVisibility(kTRUE);
+    vCh1->SetLineColor(5); // Yellow
+    vCh1->SetFillColor(vCh1->GetLineColor());
+    vCh1->SetFillStyle(4090); // 90% transparent
+    vCh2 = new TGeoVolume("ITSspdCentCylA2AirC",sCh2,medSPDair);
+    vCh2->SetVisibility(kTRUE);
+    vCh2->SetLineColor(5); // Yellow
+    vCh2->SetFillColor(vCh2->GetLineColor());
+    vCh2->SetFillStyle(4090); // 90% transparent
+    vCh3 = new TGeoVolume("ITSspdCentCylA3AirC",sCh3,medSPDair);
+    vCh3->SetVisibility(kTRUE);
+    vCh3->SetLineColor(5); // Yellow
+    vCh3->SetFillColor(vCh3->GetLineColor());
+    vCh3->SetFillStyle(4090); // 90% transparent
+    vD = new TGeoVolume("ITSspdCentCylA1CD",sD,medSPDcf);
+    vD->SetVisibility(kTRUE);
+    vD->SetLineColor(4);
+    vD->SetLineWidth(1);
+    vDw = new TGeoVolume("ITSspdCentCylA1CDw",sDw,medSPDcf);
+    vDw->SetVisibility(kTRUE);
+    vDw->SetLineColor(4);
+    vDw->SetLineWidth(1);
+    vDs = new TGeoVolume("ITSspdCentCylA1Dfill",sDs,medSPDfs);
+    vDs->SetVisibility(kTRUE);
+    vDs->SetLineColor(3); // Green
+    vDs->SetFillColor(vDs->GetLineColor());
+    vDs->SetFillStyle(4010); // 10% transparent
+    vDws = new TGeoVolume("ITSspdCentCylA1DwingFill",sDws,medSPDfs);
+    vDws->SetVisibility(kTRUE);
+    vDws->SetLineColor(3); // Green
+    vDws->SetFillColor(vDws->GetLineColor());
+    vDws->SetFillStyle(4010); // 10% transparent
+    //
+    vA1->AddNode(vAh1,1,0);
+    vA2->AddNode(vAh2,1,0);
+    vA3->AddNode(vAh3,1,0);
+    vB1->AddNode(vBh1,1,0);
+    vB2->AddNode(vBh2,1,0);
+    vB3->AddNode(vBh3,1,0);
+    vC1->AddNode(vCh1,1,0);
+    vC2->AddNode(vCh2,1,0);
+    vC3->AddNode(vCh3,1,0);
+    vD ->AddNode(vDs ,1,0);
+    vDw->AddNode(vDws,1,0);
+    //
+    vM->AddNode(vA1,1,0);
+    vM->AddNode(vA2,1,0);
+    vM->AddNode(vA3,1,0);
+    tranb  = new TGeoTranslation("",0.0,0.0,0.5*(ktscLengthA+ktscLengthB));
+    tranbm = new TGeoTranslation("",0.0,0.0,0.5*(-ktscLengthA-ktscLengthB));
+    vM->AddNode(vB1,1,tranb);
+    vM->AddNode(vB2,1,tranb);
+    vM->AddNode(vB3,1,tranb);
+    vM->AddNode(vB1,2,tranbm);
+    vM->AddNode(vB2,2,tranbm);
+    vM->AddNode(vB3,2,tranbm);
+    // Muon side (rsB26) is at -Z.
     tranc = new TGeoTranslation("",0.0,0.0,
-                                0.5*(-TSCLengthA-TSCLengthB-TSCLengthC));
-    Mv->AddNode(C1v,1,tranc);
-    Mv->AddNode(C2v,1,tranc);
-    Mv->AddNode(C3v,1,tranc);
-    Mv->AddNode(Dv,1,tranITSspdShealdVVt0);
-    Mv->AddNode(Dwv,1,tranITSspdShealdVVt0);
-    Mv->AddNode(Dwv,2,rotITSspdShealdVVt1);
-    Mv->AddNode(Dwv,3,rotITSspdShealdVVt2);
-    Mv->AddNode(Dwv,4,rotITSspdShealdVVt3);
+                                0.5*(-ktscLengthA-ktscLengthB-ktscLengthC));
+    vM->AddNode(vC1,1,tranc);
+    vM->AddNode(vC2,1,tranc);
+    vM->AddNode(vC3,1,tranc);
+    vM->AddNode(vD,1,tranITSspdShealdVVt0);
+    vM->AddNode(vDw,1,tranITSspdShealdVVt0);
+    vM->AddNode(vDw,2,rotITSspdShealdVVt1);
+    vM->AddNode(vDw,3,rotITSspdShealdVVt2);
+    vM->AddNode(vDw,4,rotITSspdShealdVVt3);
     k=2;
     for(i=1;i<10;i++) {
-        th = ((Double_t)i)*TSCAngle*kDegree;
+        th = ((Double_t)i)*ktscAngle*fgkDegree;
         rot = new TGeoRotation("",0.0,0.0,th);
-        Mv->AddNode(A1v,i+1,rot);
-        Mv->AddNode(B1v,i+2,new TGeoCombiTrans(*tranb,*rot));
-        Mv->AddNode(B1v,i+12,new TGeoCombiTrans(*tranbm,*rot));
-        Mv->AddNode(C1v,i+1,new TGeoCombiTrans(*tranc,*rot));
+        vM->AddNode(vA1,i+1,rot);
+        vM->AddNode(vB1,i+2,new TGeoCombiTrans(*tranb,*rot));
+        vM->AddNode(vB1,i+12,new TGeoCombiTrans(*tranbm,*rot));
+        vM->AddNode(vC1,i+1,new TGeoCombiTrans(*tranc,*rot));
         if(i!=0||i!=2||i!=7){
-            Mv->AddNode(A2v,k++,rot);
-            Mv->AddNode(B2v,k++,new TGeoCombiTrans(*tranb,*rot));
-            Mv->AddNode(B2v,k++,new TGeoCombiTrans(*tranbm,*rot));
-            Mv->AddNode(C2v,k++,new TGeoCombiTrans(*tranc,*rot));
+            vM->AddNode(vA2,k++,rot);
+            vM->AddNode(vB2,k++,new TGeoCombiTrans(*tranb,*rot));
+            vM->AddNode(vB2,k++,new TGeoCombiTrans(*tranbm,*rot));
+            vM->AddNode(vC2,k++,new TGeoCombiTrans(*tranc,*rot));
         } // end if
         if(i==5) {
-            Mv->AddNode(A3v,2,rot);
-            Mv->AddNode(B3v,3,new TGeoCombiTrans(*tranb,*rot));
-            Mv->AddNode(B3v,4,new TGeoCombiTrans(*tranbm,*rot));
-            Mv->AddNode(C3v,2,new TGeoCombiTrans(*tranc,*rot));
+            vM->AddNode(vA3,2,rot);
+            vM->AddNode(vB3,3,new TGeoCombiTrans(*tranb,*rot));
+            vM->AddNode(vB3,4,new TGeoCombiTrans(*tranbm,*rot));
+            vM->AddNode(vC3,2,new TGeoCombiTrans(*tranc,*rot));
         } // end if
     } // end for i
     rot = new TGeoRotation("",180.,0.0,0.0);
-    Mv->AddNode(A3v,3,rot);
-    Mv->AddNode(B3v,5,new TGeoCombiTrans(*tranb,*rot));
-    Mv->AddNode(B3v,6,new TGeoCombiTrans(*tranbm,*rot));
-    Mv->AddNode(C3v,3,new TGeoCombiTrans(*tranc,*rot));
+    vM->AddNode(vA3,3,rot);
+    vM->AddNode(vB3,5,new TGeoCombiTrans(*tranb,*rot));
+    vM->AddNode(vB3,6,new TGeoCombiTrans(*tranbm,*rot));
+    vM->AddNode(vC3,3,new TGeoCombiTrans(*tranc,*rot));
     rot = new TGeoRotation("",180.,0.0,180.0);
-    Mv->AddNode(A3v,4,rot);
-    Mv->AddNode(B3v,7,new TGeoCombiTrans(*tranb,*rot));
-    Mv->AddNode(B3v,8,new TGeoCombiTrans(*tranbm,*rot));
-    Mv->AddNode(C3v,4,new TGeoCombiTrans(*tranc,*rot));
+    vM->AddNode(vA3,4,rot);
+    vM->AddNode(vB3,7,new TGeoCombiTrans(*tranb,*rot));
+    vM->AddNode(vB3,8,new TGeoCombiTrans(*tranbm,*rot));
+    vM->AddNode(vC3,4,new TGeoCombiTrans(*tranc,*rot));
     if(GetDebug()){
-        A1v->PrintNodes();
-        Ah1v->PrintNodes();
-        A2v->PrintNodes();
-        Ah2v->PrintNodes();
-        A3v->PrintNodes();
-        Ah3v->PrintNodes();
-        B1v->PrintNodes();
-        Bh1v->PrintNodes();
-        B2v->PrintNodes();
-        Bh2v->PrintNodes();
-        B3v->PrintNodes();
-        Bh3v->PrintNodes();
-        C1v->PrintNodes();
-        Ch1v->PrintNodes();
-        C2v->PrintNodes();
-        Ch2v->PrintNodes();
-        C3v->PrintNodes();
-        Ch3v->PrintNodes();
-        Dv->PrintNodes();
-        Dsv->PrintNodes();
-        Dwv->PrintNodes();
-        Dwsv->PrintNodes();
-        //Mv->PrintNodes();
+        vA1->PrintNodes();
+        vAh1->PrintNodes();
+        vA2->PrintNodes();
+        vAh2->PrintNodes();
+        vA3->PrintNodes();
+        vAh3->PrintNodes();
+        vB1->PrintNodes();
+        vBh1->PrintNodes();
+        vB2->PrintNodes();
+        vBh2->PrintNodes();
+        vB3->PrintNodes();
+        vBh3->PrintNodes();
+        vC1->PrintNodes();
+        vCh1->PrintNodes();
+        vC2->PrintNodes();
+        vCh2->PrintNodes();
+        vC3->PrintNodes();
+        vCh3->PrintNodes();
+        vD->PrintNodes();
+        vDs->PrintNodes();
+        vDw->PrintNodes();
+        vDws->PrintNodes();
+        //vM->PrintNodes();
     } // end if
 }
 //______________________________________________________________________
-void AliITSv11GeometrySupport::SDDCone(TGeoVolume *Moth){
+void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth){
     // Define the detail SDD support cone geometry.
     // Inputs:
     //   none.
@@ -762,305 +758,312 @@ void AliITSv11GeometrySupport::SDDCone(TGeoVolume *Moth){
     //
     // From Cilindro Centrale - Lavorazioni, ALR 0816/1 04/08/03 File
     // name SDD/Cilindro.hpgl
-    const Double_t TSLength       = 790.0*kmm; // Thermal Sheeld length
-    const Double_t TSInsertoLength= 15.0*kmm;    // ????
-    const Double_t TSOuterR       = 0.5*(220.+10.)*kmm; // ????
-    const Double_t TSInnerR       = 0.5*(220.-10.)*kmm; // ????
-    const Double_t TSCarbonFiberth= 0.02*kmm;     // ????
-    const Double_t TSBoltDiameter = 6.0*kmm; // M6 screw
-    const Double_t TSBoltDepth    = 6.0*kmm; // in volume C
-    const Double_t TSBoltRadius   = 0.5*220.*kmm; // Radius in volume C
-    const Double_t TSBoltAngle0   = 0.0*kDegree; // Angle in volume C
-    const Double_t TSBoltdAngle   = 30.0*kDegree; // Angle in Volume C
-    Double_t x,y,z,t,t0;
+    const Double_t ktsLength       = 790.0*fgkmm; // Thermal Sheeld length
+    const Double_t ktsInsertoLength= 15.0*fgkmm;    // ????
+    const Double_t ktsOuterR       = 0.5*(220.+10.)*fgkmm; // ????
+    const Double_t ktsInnerR       = 0.5*(220.-10.)*fgkmm; // ????
+    const Double_t ktscarbonFiberth= 0.02*fgkmm;     // ????
+    const Double_t ktsBoltDiameter = 6.0*fgkmm; // M6 screw
+    const Double_t ktsBoltDepth    = 6.0*fgkmm; // in volume sC
+    const Double_t ktsBoltRadius   = 0.5*220.*fgkmm; // Radius in volume sC
+    const Double_t ktsBoltAngle0   = 0.0*fgkDegree; // Angle in volume sC
+    const Double_t ktsBoltdAngle   = 30.0*fgkDegree; // Angle in Volume sC
+    Double_t x,y,z,t,t0,rmin,rmax;
     Int_t i,n;
-    TGeoTube *A,*B,*C,*D;
+    TGeoTube *sA,*sB,*sC,*sD;
     TGeoTranslation *tran;
     TGeoRotation *rot;
     TGeoCombiTrans *rotran;
-    TGeoMedium *SDDcf,*SDDfs,*SDDfo,*SDDss;
+    TGeoMedium *medSDDcf,*medSDDfs,*medSDDfo,*medSDDss;
 
-    A = new TGeoTube("ITS SDD Central Cylinder",TSInnerR,TSOuterR,
-                     0.5*TSLength);
-    B = new TGeoTube("ITS SDD CC Foam",TSInnerR+TSCarbonFiberth,
-                    TSOuterR-TSCarbonFiberth,
-                    0.5*(TSLength-2.0*TSInsertoLength));
-    C = new TGeoTube("ITS SDD CC Inserto",TSInnerR+TSCarbonFiberth,
-                    TSOuterR-TSCarbonFiberth,0.5*TSLength);
-    D = new TGeoTube("ITS SDD CC M6 bolt end",0.0,0.5*TSBoltDiameter,
-                    0.5*TSBoltDepth);
-    PrintTube(A);
-    PrintTube(B);
-    PrintTube(C);
-    PrintTube(D);
+    sA = new TGeoTube("ITS SDD Central Cylinder",ktsInnerR,ktsOuterR,
+                     0.5*ktsLength);
+    sB = new TGeoTube("ITS SDD CC Foam",ktsInnerR+ktscarbonFiberth,
+                    ktsOuterR-ktscarbonFiberth,
+                    0.5*(ktsLength-2.0*ktsInsertoLength));
+    sC = new TGeoTube("ITS SDD CC Inserto",ktsInnerR+ktscarbonFiberth,
+                    ktsOuterR-ktscarbonFiberth,0.5*ktsLength);
+    sD = new TGeoTube("ITS SDD CC M6 bolt end",0.0,0.5*ktsBoltDiameter,
+                    0.5*ktsBoltDepth);
+    PrintTube(sA);
+    PrintTube(sB);
+    PrintTube(sC);
+    PrintTube(sD);
     //
     TGeoManager *mgr = gGeoManager;
-    SDDcf = mgr->GetMedium("ITSssdCarbonFiber");
-    SDDfs = mgr->GetMedium("ITSssdStaselite4411w");
-    SDDfo = mgr->GetMedium("ITSssdRohacell50A");
-    SDDss = mgr->GetMedium("ITSssdStainlessSteal");
-    TGeoVolume *Av,*Bv,*Cv,*Dv;
-    Av = new TGeoVolume("ITSsddCentCylCF",A,SDDcf);
-    Av->SetVisibility(kTRUE);
-    Av->SetLineColor(4);
-    Av->SetLineWidth(1);
-    Av->SetFillColor(Av->GetLineColor());
-    Av->SetFillStyle(4000); // 0% transparent
-    Bv = new TGeoVolume("ITSsddCentCylF",B,SDDfo);
-    Bv->SetVisibility(kTRUE);
-    Bv->SetLineColor(3);
-    Bv->SetLineWidth(1);
-    Bv->SetFillColor(Bv->GetLineColor());
-    Bv->SetFillStyle(4000); // 0% transparent
-    Cv = new TGeoVolume("ITSsddCentCylSt",C,SDDfs);
-    Cv->SetVisibility(kTRUE);
-    Cv->SetLineColor(2);
-    Cv->SetLineWidth(1);
-    Cv->SetFillColor(Cv->GetLineColor());
-    Cv->SetFillStyle(4000); // 0% transparent
-    Dv = new TGeoVolume("ITSsddCentCylSS",D,SDDss);
-    Dv->SetVisibility(kTRUE);
-    Dv->SetLineColor(1);
-    Dv->SetLineWidth(1);
-    Dv->SetFillColor(Dv->GetLineColor());
-    Dv->SetFillStyle(4000); // 0% transparent
-    //
-    Moth->AddNode(Av,1,0);
-    Av->AddNode(Cv,1,0);
-    Cv->AddNode(Bv,1,0);
-    n = (Int_t)((360.*kDegree)/TSBoltdAngle);
+    medSDDcf = mgr->GetMedium("ITSssdCarbonFiber");
+    medSDDfs = mgr->GetMedium("ITSssdStaselite4411w");
+    medSDDfo = mgr->GetMedium("ITSssdRohacell50A");
+    medSDDss = mgr->GetMedium("ITSssdStainlessSteal");
+    TGeoVolume *vA,*vB,*vC,*vD;
+    vA = new TGeoVolume("ITSsddCentCylCF",sA,medSDDcf);
+    vA->SetVisibility(kTRUE);
+    vA->SetLineColor(4);
+    vA->SetLineWidth(1);
+    vA->SetFillColor(vA->GetLineColor());
+    vA->SetFillStyle(4000); // 0% transparent
+    vB = new TGeoVolume("ITSsddCentCylF",sB,medSDDfo);
+    vB->SetVisibility(kTRUE);
+    vB->SetLineColor(3);
+    vB->SetLineWidth(1);
+    vB->SetFillColor(vB->GetLineColor());
+    vB->SetFillStyle(4000); // 0% transparent
+    vC = new TGeoVolume("ITSsddCentCylSt",sC,medSDDfs);
+    vC->SetVisibility(kTRUE);
+    vC->SetLineColor(2);
+    vC->SetLineWidth(1);
+    vC->SetFillColor(vC->GetLineColor());
+    vC->SetFillStyle(4000); // 0% transparent
+    vD = new TGeoVolume("ITSsddCentCylSS",sD,medSDDss);
+    vD->SetVisibility(kTRUE);
+    vD->SetLineColor(1);
+    vD->SetLineWidth(1);
+    vD->SetFillColor(vD->GetLineColor());
+    vD->SetFillStyle(4000); // 0% transparent
+    //
+    moth->AddNode(vA,1,0);
+    vA->AddNode(vC,1,0);
+    vC->AddNode(vB,1,0);
+    n = (Int_t)((360.*fgkDegree)/ktsBoltdAngle);
     for(i=0;i<n;i++){
-        t = TSBoltAngle0+((Double_t)i)*TSBoltdAngle;
-        x = TSBoltRadius*CosD(t);
-        y = TSBoltRadius*SinD(t);
-        z = 0.5*(TSLength-TSBoltDepth);
+        t = ktsBoltAngle0+((Double_t)i)*ktsBoltdAngle;
+        x = ktsBoltRadius*CosD(t);
+        y = ktsBoltRadius*SinD(t);
+        z = 0.5*(ktsLength-ktsBoltDepth);
         tran = new TGeoTranslation("",x,y,z);
-        Cv->AddNode(Dv,i+1,tran);
+        vC->AddNode(vD,i+1,tran);
         tran = new TGeoTranslation("",x,y,-z);
-        Cv->AddNode(Dv,i+n+1,tran);
+        vC->AddNode(vD,i+n+1,tran);
     } // end for i
     if(GetDebug()){
-        Av->PrintNodes();
-        Bv->PrintNodes();
-        Cv->PrintNodes();
-        Dv->PrintNodes();
+        vA->PrintNodes();
+        vB->PrintNodes();
+        vC->PrintNodes();
+        vD->PrintNodes();
     } // end if
     // SDD Suport Cone
     //
     //
-    const Double_t Thickness = 10.5*kmm; // Thickness of Rohacell+carbon fiber
-    const Double_t Cthick    = 1.5*kmm; // Carbon finber thickness
-    const Double_t Rcurv     = 15.0*kmm; // Radius of curvature.
-    const Double_t Tc        = 45.0; // angle of SDD cone [degrees].
-    const Double_t Sintc = TMath::Sin(Tc*TMath::DegToRad());
-    const Double_t Costc = TMath::Cos(Tc*TMath::DegToRad());
-    const Double_t Tantc = TMath::Tan(Tc*TMath::DegToRad());
-    const Double_t ZouterMilled = 23.0*kmm;
-    const Double_t Zcylinder    = 186.0*kmm;
-    const Double_t Z0           = Zcylinder + 0.5*TSLength;
-    //const Int_t Nspoaks         = 12;
-    //const Int_t Nmounts         = 4;
-    //const Double_t DmountAngle  = 9.0; // degrees
-    const Double_t RoutMax      = 0.5*560.0*kmm;
-    const Double_t RoutMin      = 0.5*539.0*kmm;
+    const Double_t kconThickness    = 10.5*fgkmm;//Thickness Rohacell+car. fib.
+    const Double_t kconCthick       = 1.5*fgkmm; // Carbon finber thickness
+    const Double_t kconRcurv        = 15.0*fgkmm; // Radius of curvature.
+    const Double_t kconTc           = 45.0; // angle of SDD cone [degrees].
+    const Double_t kconZouterMilled = 23.0*fgkmm;
+    const Double_t kconZcylinder    = 186.0*fgkmm;
+    const Double_t kconZ0           = kconZcylinder + 0.5*ktsLength;
+    //const Int_t kconNspoaks         = 12;
+    //const Int_t kconNmounts         = 4;
+    //const Double_t kconDmountAngle  = 9.0; // degrees
+    const Double_t kconRoutMax      = 0.5*560.0*fgkmm;
+    const Double_t kconRoutMin      = 0.5*539.0*fgkmm;
     // Holes in cone for cables
-    const Double_t PhiHole1     = 0.0*kDegree;
-    const Double_t dPhiHole1    = 25.0*kDegree;
-    const Double_t RholeMax1    = 0.5*528.*kmm;
-    const Double_t RholeMin1    = 0.5*464.*kmm;
-    const Double_t PhiHole2     = 0.0*kDegree;
-    const Double_t dPhiHole2    = 50.0*kDegree;
-    const Double_t RholeMax2    = 0.5*375.*kmm;
-    const Double_t RholeMin2    = 0.5*280.*kmm;
-    //
-    //const Int_t NpostsOut       = 6;
-    //const Int_t NpostsIn        = 3;
-    //const Double_t Phi0PostOut  = 0.0; // degree
-    //const Double_t Phi0PostIn   = 0.0; // degree
-    //const Double_t dRpostOut    = 16.0*kmm;
-    //const Double_t dRpostIn     = 16.0*kmm;
-    //const Double_t ZpostMaxOut  = 116.0*kmm;
-    //const Double_t ZpostMaxIn   = 190.0*kmm;
-    const Double_t RinMax       = 0.5*216*kmm;
-    const Double_t RinCylinder  = 0.5*231.0*kmm;
-    //const Double_t RinHole      = 0.5*220.0*kmm;
-    const Double_t RinMin       = 0.5*210.0*kmm;
-    const Double_t dZin         = 15.0*kmm; // ???
-    //
-    Double_t dza = Thickness/Sintc-(RoutMax-RoutMin)/Tantc;
-    Double_t Z,Rmin,Rmax; // Temp variables.
+    const Double_t kconPhiHole1     = 0.0*fgkDegree;
+    const Double_t kcondPhiHole1    = 25.0*fgkDegree;
+    const Double_t kconRholeMax1    = 0.5*528.*fgkmm;
+    const Double_t kconRholeMin1    = 0.5*464.*fgkmm;
+    const Double_t kconPhiHole2     = 0.0*fgkDegree;
+    const Double_t kcondPhiHole2    = 50.0*fgkDegree;
+    const Double_t kconRholeMax2    = 0.5*375.*fgkmm;
+    const Double_t kconRholeMin2    = 0.5*280.*fgkmm;
+    //
+    //const Int_t kconNpostsOut       = 6;
+    //const Int_t kconNpostsIn        = 3;
+    //const Double_t kconPhi0PostOut  = 0.0; // degree
+    //const Double_t kconPhi0PostIn   = 0.0; // degree
+    //const Double_t kcondRpostOut    = 16.0*fgkmm;
+    //const Double_t kcondRpostIn     = 16.0*fgkmm;
+    //const Double_t kconZpostMaxOut  = 116.0*fgkmm;
+    //const Double_t kconZpostMaxIn   = 190.0*fgkmm;
+    const Double_t kconRinMax       = 0.5*216*fgkmm;
+    const Double_t kconRinCylinder  = 0.5*231.0*fgkmm;
+    //const Double_t kconRinHole      = 0.5*220.0*fgkmm;
+    const Double_t kconRinMin       = 0.5*210.0*fgkmm;
+    const Double_t kcondZin         = 15.0*fgkmm; // ???
+    const Double_t kSinkconTc       = SinD(kconTc);
+    const Double_t kCoskconTc       = CosD(kconTc);
+    const Double_t kTankconTc       = TanD(kconTc);
+    //
+    TGeoPcon *sE,*sF,*sG,*sH,*sI,*sJ,*sK;
+    TGeoCompositeShape *sL,*sM,*sN;
+    //
+    Double_t dza = kconThickness/kSinkconTc-
+        (kconRoutMax-kconRoutMin)/kTankconTc;
     if(dza<=0){ // The number or order of the points are in error for a proper
      // call to pcons!
      Error("SDDcone","The definition of the points for a call to PCONS is"
            " in error. abort.");
      return;
     } // end if
-    TGeoPcon *E = new TGeoPcon("ITSsddSuportConeCarbonFiberSurfaceE",
-                               0.0,360.0,12);
-    E->Z(0)    = 0.0;
-    E->Rmin(0) = RoutMin;
-    E->Rmax(0) = RoutMax;
-    E->Z(1)    = ZouterMilled - dza;
-    E->Rmin(1) = E->GetRmin(0);
-    E->Rmax(1) = E->GetRmax(0);
-    E->Z(2)    = ZouterMilled;
-    E->Rmax(2) = E->GetRmax(0);
-    RadiusOfCurvature(Rcurv,0.,E->GetZ(1),E->GetRmin(1),Tc,Z,Rmin);
-    E->Z(3)    = Z;
-    E->Rmin(3) = Rmin;
-    E->Rmin(2) = RminFrom2Points(E,3,1,E->GetZ(2));
-    RadiusOfCurvature(Rcurv,0.,E->GetZ(2),E->GetRmax(2),Tc,Z,Rmax);
-    E->Z(4)    = Z;
-    E->Rmax(4) = Rmax;
-    E->Rmin(4) = RminFromZpCone(E,Tc,E->GetZ(4),0.0);
-    E->Rmax(3) = RmaxFrom2Points(E,4,2,E->GetZ(3));
-    E->Rmin(7) = RinMin;
-    E->Rmin(8) = RinMin;
-    RadiusOfCurvature(Rcurv,90.0,0.0,RinMax,90.0-Tc,Z,Rmax);
-    E->Rmax(8) = Rmax;
-    E->Z(8)    = ZFromRmaxpCone(E,Tc,E->GetRmax(8));
-    E->Z(9)    = Zcylinder;
-    E->Rmin(9) = RinMin;
-    E->Z(10)    = E->GetZ(9);
-    E->Rmin(10) = RinCylinder;
-    E->Rmin(11) = RinCylinder;
-    E->Rmax(11) = E->GetRmin(11);
-    Rmin        = E->GetRmin(8);
-    RadiusOfCurvature(Rcurv,90.0-Tc,E->GetZ(8),E->GetRmax(8),90.0,Z,Rmax);
-    Rmax = RinMax;
-    E->Z(11)    = Z+(E->GetZ(8)-Z)*(E->GetRmax(11)-Rmax)/(E->GetRmax(8)-Rmax);
-    E->Rmax(9) = RmaxFrom2Points(E,11,8,E->GetZ(9));
-    E->Rmax(10) = E->GetRmax(9);
-    E->Z(6)    = Z-dZin;
-    E->Z(7)    = E->GetZ(6);
-    E->Rmax(6) = RmaxFromZpCone(E,Tc,E->GetZ(6));
-    E->Rmax(7) = E->GetRmax(6);
-    RadiusOfCurvature(Rcurv,90.,E->GetZ(6),0.0,90.0-Tc,Z,Rmin);
-    E->Z(5)    = Z;
-    E->Rmin(5) = RminFromZpCone(E,Tc,Z);
-    E->Rmax(5) = RmaxFromZpCone(E,Tc,Z);
-    RadiusOfCurvature(Rcurv,90.-Tc,0.0,E->Rmin(5),90.0,Z,Rmin);
-    E->Rmin(6) = Rmin;
-    PrintPcon(E);
+    sE = new TGeoPcon("ITSsddSuportConeCarbonFiberSurfaceE",0.0,360.0,12);
+    sE->Z(0)    = 0.0;
+    sE->Rmin(0) = kconRoutMin;
+    sE->Rmax(0) = kconRoutMax;
+    sE->Z(1)    = kconZouterMilled - dza;
+    sE->Rmin(1) = sE->GetRmin(0);
+    sE->Rmax(1) = sE->GetRmax(0);
+    sE->Z(2)    = kconZouterMilled;
+    sE->Rmax(2) = sE->GetRmax(0);
+    RadiusOfCurvature(kconRcurv,0.,sE->GetZ(1),sE->GetRmin(1),kconTc,z,rmin);
+    sE->Z(3)    = z;
+    sE->Rmin(3) = rmin;
+    sE->Rmin(2) = RminFrom2Points(sE,3,1,sE->GetZ(2));
+    RadiusOfCurvature(kconRcurv,0.,sE->GetZ(2),sE->GetRmax(2),kconTc,z,rmax);
+    sE->Z(4)    = z;
+    sE->Rmax(4) = rmax;
+    sE->Rmin(4) = RminFromZpCone(sE,3,kconTc,sE->GetZ(4),0.0);
+    sE->Rmax(3) = RmaxFrom2Points(sE,4,2,sE->GetZ(3));
+    sE->Rmin(7) = kconRinMin;
+    sE->Rmin(8) = kconRinMin;
+    RadiusOfCurvature(kconRcurv,90.0,0.0,kconRinMax,90.0-kconTc,z,rmax);
+    sE->Rmax(8) = rmax;
+    sE->Z(8)    = ZFromRmaxpCone(sE,4,kconTc,sE->GetRmax(8));
+    sE->Z(9)    = kconZcylinder;
+    sE->Rmin(9) = kconRinMin;
+    sE->Z(10)    = sE->GetZ(9);
+    sE->Rmin(10) = kconRinCylinder;
+    sE->Rmin(11) = kconRinCylinder;
+    sE->Rmax(11) = sE->GetRmin(11);
+    rmin         = sE->GetRmin(8);
+    RadiusOfCurvature(kconRcurv,90.0-kconTc,sE->GetZ(8),sE->GetRmax(8),90.0,
+                      z,rmax);
+    rmax = kconRinMax;
+    sE->Z(11)    = z+(sE->GetZ(8)-z)*(sE->GetRmax(11)-rmax)/
+                                           (sE->GetRmax(8)-rmax);
+    sE->Rmax(9) = RmaxFrom2Points(sE,11,8,sE->GetZ(9));
+    sE->Rmax(10) = sE->GetRmax(9);
+    sE->Z(6)    = z-kcondZin;
+    sE->Z(7)    = sE->GetZ(6);
+    sE->Rmax(6) = RmaxFromZpCone(sE,4,kconTc,sE->GetZ(6));
+    sE->Rmax(7) = sE->GetRmax(6);
+    RadiusOfCurvature(kconRcurv,90.,sE->GetZ(6),0.0,90.0-kconTc,z,rmin);
+    sE->Z(5)    = z;
+    sE->Rmin(5) = RminFromZpCone(sE,3,kconTc,z);
+    sE->Rmax(5) = RmaxFromZpCone(sE,4,kconTc,z);
+    RadiusOfCurvature(kconRcurv,90.-kconTc,0.0,sE->Rmin(5),90.0,z,rmin);
+    sE->Rmin(6) = rmin;
+    PrintPcon(sE);
     // Inner Core, Inserto material
-    TGeoPcon *F = new TGeoPcon("ITSsddSuportConeInsertoStesaliteF",
-                               0.,360.0,9);
-    F->Z(0)    = E->GetZ(0);
-    F->Rmin(0) = E->GetRmin(0)+Cthick;
-    F->Rmax(0) = E->GetRmax(0)-Cthick;
-    F->Z(1)    = E->GetZ(1);
-    F->Rmin(1) = F->GetRmin(0);
-    F->Rmax(1) = F->GetRmax(0);
-    F->Z(2)    = E->GetZ(2);
-    F->Rmax(2) = F->GetRmax(1);
-    RadiusOfCurvature(Rcurv-Cthick,0.,F->GetZ(1),F->GetRmax(1),Tc,Z,Rmin);
-    F->Z(3)    = Z;
-    F->Rmin(3) = Rmin;
-    F->Rmin(2) = RminFrom2Points(F,3,1,F->GetZ(2));
-    RadiusOfCurvature(Rcurv+Cthick,0.,F->GetZ(2),F->GetRmax(2),Tc,Z,Rmax);
-    F->Z(4)    = Z;
-    F->Rmax(4) = Rmax;
-    F->Rmin(4) = RmaxFromZpCone(E,Tc,F->GetZ(4),-Cthick);
-    F->Rmax(3) = RmaxFrom2Points(F,4,2,F->GetZ(3));
-    F->Rmin(7) = E->GetRmin(7);
-    F->Rmin(8) = E->GetRmin(8);
-    F->Z(6)    = E->GetZ(6)+Cthick;
-    F->Rmin(6) = E->GetRmin(6);
-    F->Z(7)    = F->GetZ(6);
-    F->Rmax(8) = E->GetRmax(8)-Cthick*Sintc;
-    RadiusOfCurvature(Rcurv+Cthick,90.0,F->GetZ(6),F->GetRmin(6),90.0-Tc,
-                      Z,Rmin);
-    F->Z(5)    = Z;
-    F->Rmin(5) = Rmin;
-    F->Rmax(5) = RmaxFromZpCone(F,Tc,Z);
-    F->Rmax(6) = RmaxFromZpCone(F,Tc,F->GetZ(6));
-    F->Rmax(7) = F->GetRmax(6);
-    F->Z(8)    = ZFromRmaxpCone(F,Tc,F->GetRmax(8),-Cthick);
-    PrintPcon(F);
+    sF = new TGeoPcon("ITSsddSuportConeInsertoStesaliteF",0.,360.0,9);
+    sF->Z(0)    = sE->GetZ(0);
+    sF->Rmin(0) = sE->GetRmin(0)+kconCthick;
+    sF->Rmax(0) = sE->GetRmax(0)-kconCthick;
+    sF->Z(1)    = sE->GetZ(1);
+    sF->Rmin(1) = sF->GetRmin(0);
+    sF->Rmax(1) = sF->GetRmax(0);
+    sF->Z(2)    = sE->GetZ(2);
+    sF->Rmax(2) = sF->GetRmax(1);
+    RadiusOfCurvature(kconRcurv-kconCthick,0.,sF->GetZ(1),sF->GetRmax(1),
+                      kconTc,z,rmin);
+    sF->Z(3)    = z;
+    sF->Rmin(3) = rmin;
+    sF->Rmin(2) = RminFrom2Points(sF,3,1,sF->GetZ(2));
+    RadiusOfCurvature(kconRcurv+kconCthick,0.,sF->GetZ(2),sF->GetRmax(2),
+                      kconTc,z,rmax);
+    sF->Z(4)    = z;
+    sF->Rmax(4) = rmax;
+    sF->Rmin(4) = RmaxFromZpCone(sE,2,kconTc,sF->GetZ(4),
+                                                   -kconCthick);
+    sF->Rmax(3) = RmaxFrom2Points(sF,4,2,sF->GetZ(3));
+    sF->Rmin(7) = sE->GetRmin(7);
+    sF->Rmin(8) = sE->GetRmin(8);
+    sF->Z(6)    = sE->GetZ(6)+kconCthick;
+    sF->Rmin(6) = sE->GetRmin(6);
+    sF->Z(7)    = sF->GetZ(6);
+    sF->Rmax(8) = sE->GetRmax(8)-kconCthick*kSinkconTc;
+    RadiusOfCurvature(kconRcurv+kconCthick,90.0,sF->GetZ(6),sF->GetRmin(6),
+                      90.0-kconTc,z,rmin);
+    sF->Z(5)    = z;
+    sF->Rmin(5) = rmin;
+    sF->Rmax(5) = RmaxFromZpCone(sF,4,kconTc,z);
+    sF->Rmax(6) = RmaxFromZpCone(sF,4,kconTc,sF->GetZ(6));
+    sF->Rmax(7) = sF->GetRmax(6);
+    sF->Z(8)    = ZFromRmaxpCone(sF,4,kconTc,sF->GetRmax(8),-kconCthick);
+    PrintPcon(sF);
     // Inner Core, Inserto material
-    TGeoPcon *G = new TGeoPcon("ITSsddSuportConeFoamCoreG",0.0,360.0,4);
-    RadiusOfCurvature(Rcurv+Cthick,0.0,F->GetZ(1),F->GetRmin(1),Tc,Z,Rmin);
-    G->Z(0)    = Z;
-    G->Rmin(0) = Rmin;
-    G->Rmax(0) = G->GetRmin(0);
-    G->Z(1)    = G->GetZ(0)+(Thickness-2.0*Cthick)/Sintc;;
-    G->Rmin(1) = RminFromZpCone(F,Tc,G->GetZ(1));
-    G->Rmax(1) = RmaxFromZpCone(F,Tc,G->GetZ(1));
-    G->Z(2)    = E->GetZ(5)-Cthick;
-    G->Rmin(2) = RminFromZpCone(F,Tc,G->GetZ(2));
-    G->Rmax(2) = RmaxFromZpCone(F,Tc,G->GetZ(2));
-    G->Z(3)    = F->GetZ(5)+(Thickness-2.0*Cthick)*Costc;
-    G->Rmax(3) = RmaxFromZpCone(F,Tc,G->GetZ(3));
-    G->Rmin(3) = G->GetRmax(3);
-    PrintPcon(G);
-    //
-    TGeoPcon *H = new TGeoPcon("ITSsddSuportConeHoleH",PhiHole1,dPhiHole1,4);
-    H->Rmin(0) = RholeMax1;
-    H->Rmax(0) = H->GetRmin(0);
-    H->Z(0)    = ZFromRminpCone(E,Tc,H->GetRmin(0));
-    H->Rmax(1) = H->GetRmax(0);
-    H->Z(1)    = ZFromRmaxpCone(E,Tc,H->GetRmax(1));
-    H->Rmin(1) = RminFromZpCone(E,Tc,H->GetZ(1));
-    H->Rmin(2) = RholeMin1;
-    H->Z(2)    = ZFromRminpCone(E,Tc,H->GetRmin(2));
-    H->Rmax(2) = RmaxFromZpCone(E,Tc,H->GetZ(2));
-    H->Rmin(3) = H->GetRmin(2);
-    H->Rmax(3) = H->GetRmin(3);
-    H->Z(3)    = ZFromRminpCone(E,Tc,H->GetRmin(3));
-    PrintPcon(H);
-    //
-    x = Cthick/(0.5*(RholeMax1+RholeMin1));
-    t0 = PhiHole1 - x*kRadian;
-    t  = dPhiHole1 + 2.0*x*kRadian;
-    TGeoPcon *I = new TGeoPcon("ITSsddSuportConeHoleI",t0,t,4);
-    I->Rmin(0) = RholeMax1+Cthick;
-    I->Rmax(0) = I->GetRmin(0);
-    I->Z(0)    = ZFromRminpCone(F,Tc,I->GetRmin(0));
-    I->Rmax(1) = I->GetRmax(0);
-    I->Z(1)    = ZFromRmaxpCone(F,Tc,I->GetRmax(1));
-    I->Rmin(1) = RminFromZpCone(F,Tc,I->GetZ(1));
-    I->Rmin(2) = RholeMin1-Cthick;
-    I->Z(2)    = ZFromRminpCone(F,Tc,I->GetRmin(2));
-    I->Rmax(2) = RmaxFromZpCone(F,Tc,I->GetZ(2));
-    I->Rmin(3) = I->GetRmin(2);
-    I->Rmax(3) = I->GetRmin(3);
-    I->Z(3)    = ZFromRmaxpCone(F,Tc,I->GetRmax(3));
-    PrintPcon(I);
-    //
-    TGeoPcon *J = new TGeoPcon("ITSsddSuportConeHoleJ",PhiHole2,dPhiHole2,4);
-    J->Rmin(0) = RholeMax2;
-    J->Rmax(0) = J->GetRmin(0);
-    J->Z(0)    = ZFromRminpCone(E,Tc,J->GetRmin(0));
-    J->Rmax(1) = J->GetRmax(0);
-    J->Z(1)    = ZFromRmaxpCone(E,Tc,J->GetRmax(1));
-    J->Rmin(1) = RminFromZpCone(E,Tc,J->GetZ(1));
-    J->Rmin(2) = RholeMin2;
-    J->Z(2)    = ZFromRminpCone(E,Tc,J->GetRmin(2));
-    J->Rmax(2) = RmaxFromZpCone(E,Tc,J->GetZ(2));
-    J->Rmin(3) = J->GetRmin(2);
-    J->Rmax(3) = J->GetRmin(3);
-    J->Z(3)    = ZFromRmaxpCone(E,Tc,J->GetRmax(3));
-    PrintPcon(J);
-    //
-    x = Cthick/(0.5*(RholeMax2+RholeMin2));
-    t0 = PhiHole2 - x*kRadian;
-    t  = dPhiHole2 + 2.0*x*kRadian;
-    TGeoPcon *K = new TGeoPcon("ITSsddSuportConeHoleK",t0,t,4);
-    K->Rmin(0) = RholeMax2+Cthick;
-    K->Rmax(0) = K->GetRmin(0);
-    K->Z(0)    = ZFromRminpCone(F,Tc,K->GetRmin(0));
-    K->Rmax(1) = K->GetRmax(0);
-    K->Z(1)    = ZFromRmaxpCone(F,Tc,K->GetRmax(1));
-    K->Rmin(1) = RminFromZpCone(F,Tc,K->GetZ(1));
-    K->Rmin(2) = RholeMin2-Cthick;
-    K->Z(2)    = ZFromRminpCone(F,Tc,K->GetRmin(2));
-    K->Rmax(2) = RmaxFromZpCone(F,Tc,K->GetZ(2));
-    K->Rmin(3) = K->GetRmin(2);
-    K->Rmax(3) = K->GetRmin(3);
-    K->Z(3)    = ZFromRmaxpCone(F,Tc,K->GetRmax(3));
-    PrintPcon(K);
-    //
-    TGeoCompositeShape *L,*M,*N;
+    sG = new TGeoPcon("ITSsddSuportConeFoamCoreG",0.0,360.0,4);
+    RadiusOfCurvature(kconRcurv+kconCthick,0.0,sF->GetZ(1),sF->GetRmin(1),
+                      kconTc,z,rmin);
+    sG->Z(0)    = z;
+    sG->Rmin(0) = rmin;
+    sG->Rmax(0) = sG->GetRmin(0);
+    sG->Z(1)    = sG->GetZ(0)+(kconThickness-2.0*kconCthick)/kSinkconTc;;
+    sG->Rmin(1) = RminFromZpCone(sF,3,kconTc,sG->GetZ(1));
+    sG->Rmax(1) = RmaxFromZpCone(sF,4,kconTc,sG->GetZ(1));
+    sG->Z(2)    = sE->GetZ(5)-kconCthick;
+    sG->Rmin(2) = RminFromZpCone(sF,3,kconTc,sG->GetZ(2));
+    sG->Rmax(2) = RmaxFromZpCone(sF,4,kconTc,sG->GetZ(2));
+    sG->Z(3)    = sF->GetZ(5)+(kconThickness-2.0*kconCthick)*kCoskconTc;
+    sG->Rmax(3) = RmaxFromZpCone(sF,4,kconTc,sG->GetZ(3));
+    sG->Rmin(3) = sG->GetRmax(3);
+    PrintPcon(sG);
+    //
+    sH = new TGeoPcon("ITSsddSuportConeHoleH",kconPhiHole1,kcondPhiHole1,4);
+    sH->Rmin(0) = kconRholeMax1;
+    sH->Rmax(0) = sH->GetRmin(0);
+    sH->Z(0)    = ZFromRminpCone(sE,3,kconTc,sH->GetRmin(0));
+    sH->Rmax(1) = sH->GetRmax(0);
+    sH->Z(1)    = ZFromRmaxpCone(sE,4,kconTc,sH->GetRmax(1));
+    sH->Rmin(1) = RminFromZpCone(sE,3,kconTc,sH->GetZ(1));
+    sH->Rmin(2) = kconRholeMin1;
+    sH->Z(2)    = ZFromRminpCone(sE,3,kconTc,sH->GetRmin(2));
+    sH->Rmax(2) = RmaxFromZpCone(sE,4,kconTc,sH->GetZ(2));
+    sH->Rmin(3) = sH->GetRmin(2);
+    sH->Rmax(3) = sH->GetRmin(3);
+    sH->Z(3)    = ZFromRminpCone(sE,3,kconTc,sH->GetRmin(3));
+    PrintPcon(sH);
+    //
+    x = kconCthick/(0.5*(kconRholeMax1+kconRholeMin1));
+    t0 = kconPhiHole1 - x*fgkRadian;
+    t  = kcondPhiHole1 + 2.0*x*fgkRadian;
+    sI = new TGeoPcon("ITSsddSuportConeHoleI",t0,t,4);
+    sI->Rmin(0) = kconRholeMax1+kconCthick;
+    sI->Rmax(0) = sI->GetRmin(0);
+    sI->Z(0)    = ZFromRminpCone(sF,3,kconTc,sI->GetRmin(0));
+    sI->Rmax(1) = sI->GetRmax(0);
+    sI->Z(1)    = ZFromRmaxpCone(sF,4,kconTc,sI->GetRmax(1));
+    sI->Rmin(1) = RminFromZpCone(sF,3,kconTc,sI->GetZ(1));
+    sI->Rmin(2) = kconRholeMin1-kconCthick;
+    sI->Z(2)    = ZFromRminpCone(sF,3,kconTc,sI->GetRmin(2));
+    sI->Rmax(2) = RmaxFromZpCone(sF,4,kconTc,sI->GetZ(2));
+    sI->Rmin(3) = sI->GetRmin(2);
+    sI->Rmax(3) = sI->GetRmin(3);
+    sI->Z(3)    = ZFromRmaxpCone(sF,4,kconTc,sI->GetRmax(3));
+    PrintPcon(sI);
+    //
+    sJ = new TGeoPcon("ITSsddSuportConeHoleJ",kconPhiHole2,
+                                kcondPhiHole2,4);
+    sJ->Rmin(0) = kconRholeMax2;
+    sJ->Rmax(0) = sJ->GetRmin(0);
+    sJ->Z(0)    = ZFromRminpCone(sE,3,kconTc,sJ->GetRmin(0));
+    sJ->Rmax(1) = sJ->GetRmax(0);
+    sJ->Z(1)    = ZFromRmaxpCone(sE,4,kconTc,sJ->GetRmax(1));
+    sJ->Rmin(1) = RminFromZpCone(sE,3,kconTc,sJ->GetZ(1));
+    sJ->Rmin(2) = kconRholeMin2;
+    sJ->Z(2)    = ZFromRminpCone(sE,3,kconTc,sJ->GetRmin(2));
+    sJ->Rmax(2) = RmaxFromZpCone(sE,4,kconTc,sJ->GetZ(2));
+    sJ->Rmin(3) = sJ->GetRmin(2);
+    sJ->Rmax(3) = sJ->GetRmin(3);
+    sJ->Z(3)    = ZFromRmaxpCone(sE,4,kconTc,sJ->GetRmax(3));
+    PrintPcon(sJ);
+    //
+    x = kconCthick/(0.5*(kconRholeMax2+kconRholeMin2));
+    t0 = kconPhiHole2 - x*fgkRadian;
+    t  = kcondPhiHole2 + 2.0*x*fgkRadian;
+    sK = new TGeoPcon("ITSsddSuportConeHoleK",t0,t,4);
+    sK->Rmin(0) = kconRholeMax2+kconCthick;
+    sK->Rmax(0) = sK->GetRmin(0);
+    sK->Z(0)    = ZFromRminpCone(sF,3,kconTc,sK->GetRmin(0));
+    sK->Rmax(1) = sK->GetRmax(0);
+    sK->Z(1)    = ZFromRmaxpCone(sF,4,kconTc,sK->GetRmax(1));
+    sK->Rmin(1) = RminFromZpCone(sF,3,kconTc,sK->GetZ(1));
+    sK->Rmin(2) = kconRholeMin2-kconCthick;
+    sK->Z(2)    = ZFromRminpCone(sF,3,kconTc,sK->GetRmin(2));
+    sK->Rmax(2) = RmaxFromZpCone(sF,4,kconTc,sK->GetZ(2));
+    sK->Rmin(3) = sK->GetRmin(2);
+    sK->Rmax(3) = sK->GetRmin(3);
+    sK->Z(3)    = ZFromRmaxpCone(sF,4,kconTc,sK->GetRmax(3));
+    PrintPcon(sK);
+    //
     rot = new TGeoRotation("ITSsddRotZ30",0.0,0.0,30.0);
     rot->RegisterYourself();
     rot = new TGeoRotation("ITSsddRotZ60",0.0,0.0,60.0);
@@ -1083,105 +1086,105 @@ void AliITSv11GeometrySupport::SDDCone(TGeoVolume *Moth){
     rot->RegisterYourself();
     rot = new TGeoRotation("ITSsddRotZ330",0.0,0.0,330.0);
     rot->RegisterYourself();
-    L = new TGeoCompositeShape("ITS SDD Suport Cone","((((((((((((((((("
-                               "ITSsddSuportConeCarbonFiberSurfaceE -"
-                               "ITSsddSuportConeHoleH)  -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ30) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ60) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ90) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ120) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ150) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ180) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ210) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ240) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ270) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ300) -"
-                               "ITSsddSuportConeHoleH:ITSsddRotZ330) -"
-                               "ITSsddSuportConeHoleJ)  -"
-                               "ITSsddSuportConeHoleJ:ITSsddRotZ60) -"
-                               "ITSsddSuportConeHoleJ:ITSsddRotZ120) -"
-                               "ITSsddSuportConeHoleJ:ITSsddRotZ180) -"
+    sL = new TGeoCompositeShape("ITS SDD Suport Cone","((((((((((((((((("
+                                "ITSsddSuportConeCarbonFiberSurfaceE -"
+                                "ITSsddSuportConeHoleH)  -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ30) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ60) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ90) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ120) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ150) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ180) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ210) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ240) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ270) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ300) -"
+                                "ITSsddSuportConeHoleH:ITSsddRotZ330) -"
+                                "ITSsddSuportConeHoleJ)  -"
+                                "ITSsddSuportConeHoleJ:ITSsddRotZ60) -"
+                                "ITSsddSuportConeHoleJ:ITSsddRotZ120) -"
+                                "ITSsddSuportConeHoleJ:ITSsddRotZ180) -"
                                "ITSsddSuportConeHoleJ:ITSsddRotZ240) -"
-                               "ITSsddSuportConeHoleJ:ITSsddRotZ300");
-    M = new TGeoCompositeShape("ITS SDD Suport Cone Inserto Stesalite",
-                               "((((((((((((((((("
-                               "ITSsddSuportConeInsertoStesaliteF -"
-                               "ITSsddSuportConeHoleI)  -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ30) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ60) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ90) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ120) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ150) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ180) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ210) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ240) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ270) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ300) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ330) -"
-                               "ITSsddSuportConeHoleK)  -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ60) -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ120) -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ180) -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ240) -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ300");
-    N = new TGeoCompositeShape("ITS SDD Suport Cone Foam Core",
-                               "((((((((((((((((("
-                               "ITSsddSuportConeFoamCoreG -"
-                               "ITSsddSuportConeHoleI)  -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ30) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ60) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ90) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ120) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ150) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ180) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ210) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ240) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ270) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ300) -"
-                               "ITSsddSuportConeHoleI:ITSsddRotZ330) -"
-                               "ITSsddSuportConeHoleK)  -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ60) -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ120) -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ180) -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ240) -"
-                               "ITSsddSuportConeHoleK:ITSsddRotZ300");
+                                "ITSsddSuportConeHoleJ:ITSsddRotZ300");
+    sM = new TGeoCompositeShape("ITS SDD Suport Cone Inserto Stesalite",
+                                "((((((((((((((((("
+                                "ITSsddSuportConeInsertoStesaliteF -"
+                                "ITSsddSuportConeHoleI)  -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ30) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ60) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ90) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ120) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ150) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ180) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ210) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ240) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ270) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ300) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ330) -"
+                                "ITSsddSuportConeHoleK)  -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ60) -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ120) -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ180) -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ240) -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ300");
+    sN = new TGeoCompositeShape("ITS SDD Suport Cone Foam Core",
+                                "((((((((((((((((("
+                                "ITSsddSuportConeFoamCoreG -"
+                                "ITSsddSuportConeHoleI)  -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ30) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ60) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ90) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ120) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ150) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ180) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ210) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ240) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ270) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ300) -"
+                                "ITSsddSuportConeHoleI:ITSsddRotZ330) -"
+                                "ITSsddSuportConeHoleK)  -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ60) -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ120) -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ180) -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ240) -"
+                                "ITSsddSuportConeHoleK:ITSsddRotZ300");
     //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    TGeoVolume *Lv,*Mv,*Nv;
-    Lv = new TGeoVolume("ITSsddConeL",L,SDDcf);
-    Lv->SetVisibility(kTRUE);
-    Lv->SetLineColor(4);
-    Lv->SetLineWidth(1);
-    Lv->SetFillColor(Lv->GetLineColor());
-    Lv->SetFillStyle(4000); // 0% transparent
-    Mv = new TGeoVolume("ITSsddConeM",M,SDDfs);
-    Mv->SetVisibility(kTRUE);
-    Mv->SetLineColor(2);
-    Mv->SetLineWidth(1);
-    Mv->SetFillColor(Mv->GetLineColor());
-    Mv->SetFillStyle(4010); // 10% transparent
-    Nv = new TGeoVolume("ITSsddConeN",N,SDDfo);
-    Nv->SetVisibility(kTRUE);
-    Nv->SetLineColor(7);
-    Nv->SetLineWidth(1);
-    Nv->SetFillColor(Nv->GetLineColor());
-    Nv->SetFillStyle(4050); // 50% transparent
-    //
-    Mv->AddNode(Nv,1,0);
-    Lv->AddNode(Mv,1,0);
-    tran = new TGeoTranslation("",0.0,0.0,-Z0);
-    Moth->AddNode(Lv,1,tran);
-    rot = new TGeoRotation("",0.0,180.0*kDegree,0.0);
-    rotran = new TGeoCombiTrans("",0.0,0.0,Z0,rot);
+    TGeoVolume *vL,*vM,*vN;
+    vL = new TGeoVolume("ITSsddConeL",sL,medSDDcf);
+    vL->SetVisibility(kTRUE);
+    vL->SetLineColor(4);
+    vL->SetLineWidth(1);
+    vL->SetFillColor(vL->GetLineColor());
+    vL->SetFillStyle(4000); // 0% transparent
+    vM = new TGeoVolume("ITSsddConeM",sM,medSDDfs);
+    vM->SetVisibility(kTRUE);
+    vM->SetLineColor(2);
+    vM->SetLineWidth(1);
+    vM->SetFillColor(vM->GetLineColor());
+    vM->SetFillStyle(4010); // 10% transparent
+    vN = new TGeoVolume("ITSsddConeN",sN,medSDDfo);
+    vN->SetVisibility(kTRUE);
+    vN->SetLineColor(7);
+    vN->SetLineWidth(1);
+    vN->SetFillColor(vN->GetLineColor());
+    vN->SetFillStyle(4050); // 50% transparent
+    //
+    vM->AddNode(vN,1,0);
+    vL->AddNode(vM,1,0);
+    tran = new TGeoTranslation("",0.0,0.0,-kconZ0);
+    moth->AddNode(vL,1,tran);
+    rot = new TGeoRotation("",0.0,180.0*fgkDegree,0.0);
+    rotran = new TGeoCombiTrans("",0.0,0.0,kconZ0,rot);
     delete rot;// rot not explicity used in AddNode functions.
-    Moth->AddNode(Lv,2,rotran);
+    moth->AddNode(vL,2,rotran);
     if(GetDebug()){
-        Lv->PrintNodes();
-        Mv->PrintNodes();
-        Nv->PrintNodes();
+        vL->PrintNodes();
+        vM->PrintNodes();
+        vN->PrintNodes();
     } // end if
 }
 //______________________________________________________________________
-void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
+void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth){
     // Define the detail SSD support cone geometry.
     // Inputs:
     //   none.
@@ -1191,37 +1194,40 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
     //  none.
     //
     Int_t i,j;
-    Double_t t,t0,dt,x,y,z,vl[3],vg[3],x0,y0;
-    TGeoMedium *SSDcf  = 0; // SSD support cone Carbon Fiber materal number.
-    TGeoMedium *SSDfs  = 0; // SSD support cone inserto stesalite 4411w.
-    TGeoMedium *SSDfo  = 0; // SSD support cone foam, Rohacell 50A.
-    TGeoMedium *SSDss  = 0; // SSD support cone screw material,Stainless steal
-    TGeoMedium *SSDair = 0; // SSD support cone Air
-    TGeoMedium *SSDal  = 0; // SSD support cone SDD mounting bracket Al
+    Double_t t,t0,dt,x,y,z,vl[3],vg[3],x0,y0,rmin,rmax;
+    TGeoMedium *medSSDcf  = 0; // SSD support cone Carbon Fiber materal number.
+    TGeoMedium *medSSDfs  = 0; // SSD support cone inserto stesalite 4411w.
+    TGeoMedium *medSSDfo  = 0; // SSD support cone foam, Rohacell 50A.
+    TGeoMedium *medSSDss  = 0; // SSD support cone screw material,Stainless
+    TGeoMedium *medSSDair = 0; // SSD support cone Air
+    TGeoMedium *medSSDal  = 0; // SSD support cone SDD mounting bracket Al
     TGeoManager *mgr = gGeoManager;
-    SSDcf = mgr->GetMedium("ITSssdCarbonFiber");
-    SSDfs = mgr->GetMedium("ITSssdStaselite4411w");
-    SSDfo = mgr->GetMedium("ITSssdRohacell50A");
-    SSDss = mgr->GetMedium("ITSssdStainlessSteal");
-    SSDair= mgr->GetMedium("ITSssdAir");
-    SSDal = mgr->GetMedium("ITSssdAl");
+    medSSDcf = mgr->GetMedium("ITSssdCarbonFiber");
+    medSSDfs = mgr->GetMedium("ITSssdStaselite4411w");
+    medSSDfo = mgr->GetMedium("ITSssdRohacell50A");
+    medSSDss = mgr->GetMedium("ITSssdStainlessSteal");
+    medSSDair= mgr->GetMedium("ITSssdAir");
+    medSSDal = mgr->GetMedium("ITSssdAl");
     //
     // SSD Central cylinder/Thermal Sheald.
-    const Double_t CylZlength     = 1140.0*kmm; //
-    const Double_t CylZFoamlength = 1020.0*kmm; //
-    const Double_t CylROuter      = 0.5*595.0*kmm; //
-    const Double_t CylRInner      = 0.5*560.5*kmm; //
-    const Double_t CylCthick      = 0.64*kmm; //
-    const Double_t CylFoamThick   = 5.0*kmm; //
-    const Double_t CylRholes      = 0.5*575.0*kmm;
-    const Double_t CylZM6         = 6.0*kmm; //
-    const Double_t CylRM6         = 0.5*6.0*kmm;
-    const Double_t CylPhi0M6      = 0.0*kDegree;
-    const Int_t    CylNM6         = 40;
-    const Double_t CylZPin        = 10.0*kmm;
-    const Double_t CylRPin        = 0.5*4.0*kmm;
-    const Double_t CylPhi0Pin     = (90.0+4.5)*kDegree;
-    const Int_t    CylNPin        = 2;
+    const Double_t kcylZlength     = 1140.0*fgkmm; //
+    const Double_t kcylZFoamlength = 1020.0*fgkmm; //
+    const Double_t kcylROuter      = 0.5*595.0*fgkmm; //
+    const Double_t kcylRInner      = 0.5*560.5*fgkmm; //
+    const Double_t kcylCthick      = 0.64*fgkmm; //
+    const Double_t kcylFoamThick   = 5.0*fgkmm; //
+    const Double_t kcylRholes      = 0.5*575.0*fgkmm;
+    const Double_t kcylZM6         = 6.0*fgkmm; //
+    const Double_t kcylRM6         = 0.5*6.0*fgkmm;
+    const Double_t kcylPhi0M6      = 0.0*fgkDegree;
+    const Int_t    kcylNM6         = 40;
+    const Double_t kcylZPin        = 10.0*fgkmm;
+    const Double_t kcylRPin        = 0.5*4.0*fgkmm;
+    const Double_t kcylPhi0Pin     = (90.0+4.5)*fgkDegree;
+    const Int_t    kcylNPin        = 2;
+    //
+    TGeoPcon *sCA,*sCB;
+    TGeoTube *sCC,*cD,*cE;
     //
     //Begin_Html
     /*
@@ -1233,448 +1239,456 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
       </P>
      */
     //End_Html
-    TGeoPcon *CA = new TGeoPcon("ITS SSD Thermal Centeral Carbon Fiber "
-                                "CylinderCA",0.0,360.0,6);
-    TGeoPcon *CB = new TGeoPcon("ITS SSD Thermal Centeral Stesalite "
-                                "CylinderCB",0.0,360.0,6);
-    TGeoTube *CC = new TGeoTube("ITS SSD Thermal Centeral Rohacell "
-                                "CylinderCC",
-                                CylROuter-CylCthick-CylFoamThick,
-                                CylROuter-CylCthick,0.5*CylZFoamlength);
-    CA->Z(0)    = -0.5*CylZlength;
-    CA->Rmin(0) = CylRInner;
-    CA->Rmax(0) = CylROuter;
-    CA->Z(1)    = CA->GetZ(0) + CylZM6;
-    CA->Rmin(1) = CA->GetRmin(0);
-    CA->Rmax(1) = CA->GetRmax(0);
-    CA->Z(2)    = -0.5*CylZFoamlength;
-    CA->Rmin(2) = CylROuter - 2.0*CylCthick-CylFoamThick;
-    CA->Rmax(2) = CA->GetRmax(0);
-    CA->Z(3)    = -CA->GetZ(2);
-    CA->Rmin(3) = CA->GetRmin(2);
-    CA->Rmax(3) = CA->GetRmax(2);
-    CA->Z(4)    = -CA->GetZ(1);
-    CA->Rmin(4) = CA->GetRmin(1);
-    CA->Rmax(4) = CA->GetRmax(1);
-    CA->Z(5)    = -CA->GetZ(0);
-    CA->Rmin(5) = CA->GetRmin(0);
-    CA->Rmax(5) = CA->GetRmax(0);
-    //
-    CB->Z(0)    = CA->GetZ(0);
-    CB->Rmin(0) = CA->GetRmin(0) + CylCthick;
-    CB->Rmax(0) = CA->GetRmax(0) - CylCthick;
-    CB->Z(1)    = CA->GetZ(1);
-    CB->Rmin(1) = CA->GetRmin(1) + CylCthick;
-    CB->Rmax(1) = CA->GetRmax(1) - CylCthick;
-    CB->Z(2)    = CA->GetZ(2);
-    CB->Rmin(2) = CA->GetRmin(2) + CylCthick;
-    CB->Rmax(2) = CA->GetRmax(2) - CylCthick;
-    CB->Z(3)    = CA->GetZ(3);
-    CB->Rmin(3) = CA->GetRmin(3) + CylCthick;
-    CB->Rmax(3) = CA->GetRmax(3) - CylCthick;
-    CB->Z(4)    = CA->GetZ(4);
-    CB->Rmin(4) = CA->GetRmin(4) + CylCthick;
-    CB->Rmax(4) = CA->GetRmax(4) - CylCthick;
-    CB->Z(5)    = CA->GetZ(5);
-    CB->Rmin(5) = CA->GetRmin(5) + CylCthick;
-    CB->Rmax(5) = CA->GetRmax(5) - CylCthick;
-    //
-    PrintPcon(CA);
-    PrintPcon(CB);
-    PrintTube(CC);
-    //
-    TGeoTube *CD = new TGeoTube("ITS SSD Thermal Centeral Cylinder M6 screwCD",
-                                0.0,CylRM6,0.5*CylZM6);
-    TGeoTube *CE = new TGeoTube("ITS SSD Thermal Centeral Cylinder PinCE",
-                                0.0,CylRPin,0.5*CylZPin);
-    //
-    TGeoVolume *CAv,*CBv,*CCv,*CDv,*CEv;
-    CAv = new TGeoVolume("ITSssdCentCylCA",CA,SSDcf);
-    CAv->SetVisibility(kTRUE);
-    CAv->SetLineColor(4); // blue
-    CAv->SetLineWidth(1);
-    CAv->SetFillColor(CAv->GetLineColor());
-    CAv->SetFillStyle(4000); // 0% transparent
-    CBv = new TGeoVolume("ITSssdCentCylCB",CB,SSDfs);
-    CBv->SetVisibility(kTRUE);
-    CBv->SetLineColor(2); // red
-    CBv->SetLineWidth(1);
-    CBv->SetFillColor(CBv->GetLineColor());
-    CBv->SetFillStyle(4050); // 50% transparent
-    CCv = new TGeoVolume("ITSssdCentCylCC",CC,SSDfo);
-    CCv->SetVisibility(kTRUE);
-    CCv->SetLineColor(3); // green
-    CCv->SetLineWidth(1);
-    CCv->SetFillColor(CCv->GetLineColor());
-    CCv->SetFillStyle(4050); // 50% transparent
-    CDv = new TGeoVolume("ITSssdCentCylCD",CD,SSDss);
-    CDv->SetVisibility(kTRUE);
-    CDv->SetLineColor(1); // black
-    CDv->SetLineWidth(1);
-    CDv->SetFillColor(CDv->GetLineColor());
-    CDv->SetFillStyle(4000); // 0% transparent
-    CEv = new TGeoVolume("ITSssdCentCylCE",CE,SSDss);
-    CEv->SetVisibility(kTRUE);
-    CEv->SetLineColor(1); // black
-    CEv->SetLineWidth(1);
-    CEv->SetFillColor(CEv->GetLineColor());
-    CEv->SetFillStyle(4000); // 0% transparent
+    sCA = new TGeoPcon("ITS SSD Thermal Centeral Carbon Fiber CylinderCA",
+                       0.0,360.0,6);
+    sCB = new TGeoPcon("ITS SSD Thermal Centeral Stesalite CylinderCB",
+                       0.0,360.0,6);
+    sCC = new TGeoTube("ITS SSD Thermal Centeral Rohacell CylinderCC",
+                       kcylROuter-kcylCthick-kcylFoamThick,
+                       kcylROuter-kcylCthick,0.5*kcylZFoamlength);
+    sCA->Z(0)    = -0.5*kcylZlength;
+    sCA->Rmin(0) = kcylRInner;
+    sCA->Rmax(0) = kcylROuter;
+    sCA->Z(1)    = sCA->GetZ(0) + kcylZM6;
+    sCA->Rmin(1) = sCA->GetRmin(0);
+    sCA->Rmax(1) = sCA->GetRmax(0);
+    sCA->Z(2)    = -0.5*kcylZFoamlength;
+    sCA->Rmin(2) = kcylROuter - 2.0*kcylCthick-kcylFoamThick;
+    sCA->Rmax(2) = sCA->GetRmax(0);
+    sCA->Z(3)    = -sCA->GetZ(2);
+    sCA->Rmin(3) = sCA->GetRmin(2);
+    sCA->Rmax(3) = sCA->GetRmax(2);
+    sCA->Z(4)    = -sCA->GetZ(1);
+    sCA->Rmin(4) = sCA->GetRmin(1);
+    sCA->Rmax(4) = sCA->GetRmax(1);
+    sCA->Z(5)    = -sCA->GetZ(0);
+    sCA->Rmin(5) = sCA->GetRmin(0);
+    sCA->Rmax(5) = sCA->GetRmax(0);
+    //
+    sCB->Z(0)    = sCA->GetZ(0);
+    sCB->Rmin(0) = sCA->GetRmin(0) + kcylCthick;
+    sCB->Rmax(0) = sCA->GetRmax(0) - kcylCthick;
+    sCB->Z(1)    = sCA->GetZ(1);
+    sCB->Rmin(1) = sCA->GetRmin(1) + kcylCthick;
+    sCB->Rmax(1) = sCA->GetRmax(1) - kcylCthick;
+    sCB->Z(2)    = sCA->GetZ(2);
+    sCB->Rmin(2) = sCA->GetRmin(2) + kcylCthick;
+    sCB->Rmax(2) = sCA->GetRmax(2) - kcylCthick;
+    sCB->Z(3)    = sCA->GetZ(3);
+    sCB->Rmin(3) = sCA->GetRmin(3) + kcylCthick;
+    sCB->Rmax(3) = sCA->GetRmax(3) - kcylCthick;
+    sCB->Z(4)    = sCA->GetZ(4);
+    sCB->Rmin(4) = sCA->GetRmin(4) + kcylCthick;
+    sCB->Rmax(4) = sCA->GetRmax(4) - kcylCthick;
+    sCB->Z(5)    = sCA->GetZ(5);
+    sCB->Rmin(5) = sCA->GetRmin(5) + kcylCthick;
+    sCB->Rmax(5) = sCA->GetRmax(5) - kcylCthick;
+    //
+    PrintPcon(sCA);
+    PrintPcon(sCB);
+    PrintTube(sCC);
+    //
+    cD = new TGeoTube("ITS SSD Thermal Centeral Cylinder M6 screwCD",
+                      0.0,kcylRM6,0.5*kcylZM6);
+    cE = new TGeoTube("ITS SSD Thermal Centeral Cylinder PinCE",
+                      0.0,kcylRPin,0.5*kcylZPin);
+    //
+    TGeoVolume *vCA,*vCB,*vCC,*vCD,*vCE;
+    vCA = new TGeoVolume("ITSssdCentCylCA",sCA,medSSDcf);
+    vCA->SetVisibility(kTRUE);
+    vCA->SetLineColor(4); // blue
+    vCA->SetLineWidth(1);
+    vCA->SetFillColor(vCA->GetLineColor());
+    vCA->SetFillStyle(4000); // 0% transparent
+    vCB = new TGeoVolume("ITSssdCentCylCB",sCB,medSSDfs);
+    vCB->SetVisibility(kTRUE);
+    vCB->SetLineColor(2); // red
+    vCB->SetLineWidth(1);
+    vCB->SetFillColor(vCB->GetLineColor());
+    vCB->SetFillStyle(4050); // 50% transparent
+    vCC = new TGeoVolume("ITSssdCentCylCC",sCC,medSSDfo);
+    vCC->SetVisibility(kTRUE);
+    vCC->SetLineColor(3); // green
+    vCC->SetLineWidth(1);
+    vCC->SetFillColor(vCC->GetLineColor());
+    vCC->SetFillStyle(4050); // 50% transparent
+    vCD = new TGeoVolume("ITSssdCentCylCD",cD,medSSDss);
+    vCD->SetVisibility(kTRUE);
+    vCD->SetLineColor(1); // black
+    vCD->SetLineWidth(1);
+    vCD->SetFillColor(vCD->GetLineColor());
+    vCD->SetFillStyle(4000); // 0% transparent
+    vCE = new TGeoVolume("ITSssdCentCylCE",cE,medSSDss);
+    vCE->SetVisibility(kTRUE);
+    vCE->SetLineColor(1); // black
+    vCE->SetLineWidth(1);
+    vCE->SetFillColor(vCE->GetLineColor());
+    vCE->SetFillStyle(4000); // 0% transparent
     // Insert Bolt and Pins in both the Cone and Cylinder at the same time.
-    CBv->AddNode(CCv,1,0);
-    CAv->AddNode(CBv,1,0);
-    Moth->AddNode(CAv,1,0);
+    vCB->AddNode(vCC,1,0);
+    vCA->AddNode(vCB,1,0);
+    moth->AddNode(vCA,1,0);
     if(GetDebug()){
-        CAv->PrintNodes();
-        CBv->PrintNodes();
-        CCv->PrintNodes();
+        vCA->PrintNodes();
+        vCB->PrintNodes();
+        vCC->PrintNodes();
     } // end if
     //
     // SSD Cone
     // Data from Drawings ALR 0743/2E "Supporto Globale Settore SSD" and 
     // ALR 0743/2A "Supporto Generale Settore SSD".
     //
-    const Double_t ConThick            = 13.0*kmm; // Thickness of Cone.
-    const Double_t ConCthick           = 0.75*kmm; // Carbon finber thickness
-    const Double_t ConRCurv            = 10.0*kmm; // Radius of curvature.
-    const Double_t ConT                = 39.0*kDegree; // angle of SSD cone.
-    const Double_t ConZOuterRing       = 47.0*kmm;
-    const Double_t ConZOuterRingMill   = ConZOuterRing-5.0*kmm;
-    const Double_t ConZToCylinder      = 170.0*kmm;
-    const Double_t ConZLength          = 176.5*kmm-
-                                          (ConZOuterRing-ConZOuterRingMill);
-    const Double_t ConZInnerRing       = 161.5*kmm-
-                                          (ConZOuterRing-ConZOuterRingMill);
-    const Double_t ConZOuterRingInside = 30.25*kmm-
-                                          (ConZOuterRing-ConZOuterRingMill);
-    const Double_t ConZDisplacement    = ConZToCylinder + 0.5*CylZlength;
-    const Double_t ConROuterMax        = 0.5*985.0*kmm;
-    const Double_t ConROuterMin        = 0.5*945.0*kmm;
-    const Double_t ConRCylOuterMill    = 0.5*597.0*kmm;
-    const Double_t ConRInnerMin        = 0.5*564.0*kmm;
-    const Double_t ConRCentCurv0       = 0.5*927.0*kmm;
-    const Double_t ConRCentCurv1       = 0.5*593.0*kmm;
-    //const Double_t ConRCentCurv2       = 0.5*578.0*kmm;
+    const Double_t kconThick            = 13.0*fgkmm; // Thickness of Cone.
+    const Double_t kconCthick           = 0.75*fgkmm; // Car. finber thickness
+    const Double_t kconRCurv0           = 10.0*fgkmm; // Radius of curvature.
+    const Double_t kconRCurv1           = 25.0*fgkmm; // Radius of curvature.
+    const Double_t kconT                = 39.0*fgkDegree; // angle of SSD cone.
+    const Double_t kconZOuterRing       = 47.0*fgkmm;
+    const Double_t kconZOuterRingMill   = kconZOuterRing-5.0*fgkmm;
+    const Double_t kconZToCylinder      = 170.0*fgkmm;
+    const Double_t kconZLengthMill      = 171.5*fgkmm;
+    const Double_t kconZLength          = 176.5*fgkmm-
+                                          (kconZOuterRing-kconZOuterRingMill);
+    //const Double_t kconZInnerRing       = 161.5*fgkmm-
+    //                                     (kconZOuterRing-kconZOuterRingMill);
+    const Double_t kconZOuterRingInside = 30.25*fgkmm-
+                                          (kconZOuterRing-kconZOuterRingMill);
+    const Double_t kconZDisplacement    = kconZToCylinder + 0.5*kcylZlength;
+    const Double_t kconROuterMax        = 0.5*985.0*fgkmm;
+    const Double_t kconROuterMin        = 0.5*945.0*fgkmm;
+    const Double_t kconRCylOuterMill    = 0.5*597.0*fgkmm;
+    const Double_t kconRInnerMin        = 0.5*562.0*fgkmm;
+    //const Double_t kconRCentCurv0       = 0.5*927.0*fgkmm;
+    const Double_t kconRCentCurv1       = 0.5*593.0*fgkmm;
+    const Double_t kconRCentCurv2       = 0.5*578.0*fgkmm;
     // Foam core.
-    const Double_t ConRohacellL0       = 112.3*kmm;
-    const Double_t ConRohacellL1       = 58.4*kmm;
+    const Double_t kconRohacellL0       = 112.3*fgkmm;
+    const Double_t kconRohacellL1       = 58.4*fgkmm;
     // Screws and pins in outer SSD cone ring
-    const Double_t ConROutHoles        = 0.5*965.0*kmm;
-    const Double_t ConRScrewM5by12     = 0.5*5.0*kmm;
-    const Double_t ConLScrewM5by12     = 0.5*12.0*kmm;
-    const Int_t    ConNScrewM5by12     = 2;
-    const Double_t ConRPinO6           = 0.5*6.0*kmm;
-    const Double_t ConLPinO6           = 0.5*10.0*kmm;
-    const Int_t    ConNPinO6           = 3;
-    const Int_t    ConNRailScrews      = 4;
-    const Int_t    ConNRailPins        = 2;
-    const Int_t    ConNmounts          = 4;
-    const Double_t ConMountPhi0        = 9.0*kDegree; // degrees
-    // Holes in SSD cone, Ch* Cable Hole, Th* Tubing hole, and
-    // Mh* mounting-post holes
-    const Double_t ConCableHoleROut    = 0.5*920.0*kmm;
-    const Double_t ConCableHoleRinner  = 0.5*800.0*kmm;
-    const Double_t ConCableHoleWidth   = 200.0*kmm;
-    const Double_t ConCableHoleAngle   = 42.0*kDegree;
-    //const Double_t ConCableHolePhi0    = 90.0/4.0*kDegree;
-    //const Int_t    ConNCableHoles      = 8;
-    const Double_t ConCoolHoleWidth    = 40.0*kmm;
-    const Double_t ConCoolHoleHight    = 30.0*kmm;
-    const Double_t ConCoolHoleRmin     = 350.0*kmm;
-    //const Double_t ConCoolHolephi0     = 90.0/4.0*kDegree;
-    //const Int_t    ConNCoolHoles       = 8;
-    const Double_t ConMountHoleWidth   = 20.0*kmm;
-    const Double_t ConMountHoleHight   = 20.0*kmm;
-    const Double_t ConMountHoleRmin    = 317.5*kmm;
-    //const Double_t ConMountHolephi0    = 0.0*kDegree;
-    //const Int_t    ConNMountHoles      = 6;
+    const Double_t kconROutHoles        = 0.5*965.0*fgkmm;
+    const Double_t kconRScrewM5by12     = 0.5*5.0*fgkmm;
+    const Double_t kconLScrewM5by12     = 0.5*12.0*fgkmm;
+    const Int_t    kconNScrewM5by12     = 2;
+    const Double_t kconRPinO6           = 0.5*6.0*fgkmm;
+    const Double_t kconLPinO6           = 0.5*10.0*fgkmm;
+    const Int_t    kconNPinO6           = 3;
+    const Int_t    kconNRailScrews      = 4;
+    const Int_t    kconNRailPins        = 2;
+    const Int_t    kconNmounts          = 4;
+    const Double_t kconMountPhi0        = 9.0*fgkDegree; // degrees
+    //
+    const Double_t kconCableHoleROut    = 0.5*920.0*fgkmm;
+    const Double_t kconCableHoleRinner  = 0.5*800.0*fgkmm;
+    const Double_t kconCableHoleWidth   = 200.0*fgkmm;
+    const Double_t kconCableHoleAngle   = 42.0*fgkDegree;
+    //const Double_t kconCableHolePhi0    = 90.0/4.0*fgkDegree;
+    //const Int_t    kconNCableHoles      = 8;
+    const Double_t kconCoolHoleWidth    = 40.0*fgkmm;
+    const Double_t kconCoolHoleHight    = 30.0*fgkmm;
+    const Double_t kconCoolHoleRmin     = 350.0*fgkmm;
+    //const Double_t kconCoolHolephi0     = 90.0/4.0*fgkDegree;
+    //const Int_t    kconNCoolHoles       = 8;
+    const Double_t kconMountHoleWidth   = 20.0*fgkmm;
+    const Double_t kconMountHoleHight   = 20.0*fgkmm;
+    const Double_t kconMountHoleRmin    = 317.5*fgkmm;
+    //const Double_t kconMountHolephi0    = 0.0*fgkDegree;
+    //const Int_t    kconNMountHoles      = 6;
     // SSD cone Wings with holes.
-    const Double_t ConWingRmax         = 527.5*kmm;
-    const Double_t ConWingWidth        = 70.0*kmm;
-    const Double_t ConWingThick        = 10.0*kmm;
-    const Double_t ConWingPhi0         = 45.0*kDegree;
-    //const Int_t    ConNWings           = 4;
+    const Double_t kconWingRmax         = 527.5*fgkmm;
+    const Double_t kconWingWidth        = 70.0*fgkmm;
+    const Double_t kconWingThick        = 10.0*fgkmm;
+    const Double_t kconWingPhi0         = 45.0*fgkDegree;
+    //const Int_t    kconNWings           = 4;
     // SSD-SDD Thermal/Mechanical cylinder mounts
-    const Double_t ConRM6Head          = 8.0*kmm;
-    const Double_t ConZM6Head     = 8.5*kmm;
+    const Double_t kconRM6Head          = 8.0*fgkmm;
+    const Double_t kconZM6Head          = 8.5*fgkmm;
     //
     // SSD-SDD Mounting bracket
-    const Double_t SupPRmin            = 0.5*539.0*kmm;// see SDD RoutMin
-    const Double_t SupPRmax            = 0.5*585.0*kmm;
-    const Double_t SupPZ               = 3.5*kmm;
-    const Double_t SupPPhi1            = (-0.5*70.0*kmm/SupPRmax)*kRadian;
-    const Double_t SupPPhi2            = -SupPPhi1;
-    //
-    const Double_t Sintc               = TMath::Sin(ConT*TMath::DegToRad());
-    const Double_t Costc               = TMath::Cos(ConT*TMath::DegToRad());
+    const Double_t ksupPRmin            = 0.5*539.0*fgkmm;// see SDD RoutMin
+    const Double_t ksupPRmax            = 0.5*585.0*fgkmm;
+    const Double_t ksupPZ               = 3.5*fgkmm;
+    const Double_t ksupPPhi1            = (-0.5*70.*fgkmm/ksupPRmax)*fgkRadian;
+    const Double_t ksupPPhi2            = -ksupPPhi1;
+    //
+    const Double_t kSinkconTc           = SinD(kconT);
+    const Double_t kCoskconTc           = CosD(kconT);
+    //
+    TGeoPcon *sA0,*sB0,*sC0,*sF0,*sQ;
+    TGeoConeSeg *sAh1,*sBh1;
+    TGeoArb8 *sAh2,*sBh2;
+    TGeoBBox *sAh3,*sBh3,*sAh4,*sBh4;
+    TGeoConeSeg *sG,*sH;
+    TGeoTubeSeg *sT;
+    TGeoTube *sD,*sE,*sR,*sS;
+    TGeoCompositeShape *sA,*sB,*sC,*sF;
     //
     // Lets start with the upper left outer carbon fiber surface.
     // Between za[2],rmaxa[2] and za[4],rmaxa[4] there is a curved section
-    // given by rmaxa = rmaxa[2]-r*Sind(t) for 0<=t<=ConT and 
-    // za = za[2] + r*Cosd(t) for 0<=t<=ConT. Simularly between za[1],rmina[1
+    // given by rmaxa = rmaxa[2]-r*Sind(t) for 0<=t<=kconT and 
+    // za = za[2] + r*Cosd(t) for 0<=t<=kconT. Simularly between za[1],rmina[1
     // and za[3],rmina[3] there is a curve section given by
-    // rmina = rmina[1]-r*Sind(t) for 0<=t<=ConT and za = za[1]+r&Sind(t)
-    // for t<=0<=ConT. These curves have been replaced by straight lines
+    // rmina = rmina[1]-r*Sind(t) for 0<=t<=kconT and za = za[1]+r&Sind(t)
+    // for t<=0<=kconT. These curves have been replaced by straight lines
     // between the equivelent points for simplicity.
-    // Poly-cone Volume A0. Top part of SSD cone Carbon Fiber.
-    TGeoPcon *A0 = new TGeoPcon("ITSssdSuportConeCarbonFiberSurfaceA0",
-                               0.0,360.0,15);
-    A0->Z(0)    = 0.0;
-    A0->Rmin(0) = ConROuterMin;
-    A0->Rmax(0) = ConROuterMax;
-    A0->Z(1)    = ConZOuterRingInside-ConRCurv;
-    A0->Rmin(1) = A0->GetRmin(0);
-    A0->Rmax(1) = A0->GetRmax(0);
-    A0->Z(2)    = ConZOuterRingInside;
-    A0->Rmin(2) = ConROuterMin-ConRCurv;
-    A0->Rmax(2) = A0->GetRmax(0);
-    A0->Z(3)    = A0->GetZ(2);
-    A0->Rmin(3) = -1000; // See Below
-    A0->Rmax(3) = A0->GetRmax(0);
-    A0->Z(4)    = ConZOuterRingMill-ConRCurv;
-    A0->Rmin(4) = -1000; // See Below
-    A0->Rmax(4) = A0->GetRmax(0);
-    A0->Z(5)    = ConZOuterRingMill;
-    A0->Rmin(5) = -1000; // See Below
-    A0->Rmax(5) = A0->GetRmax(0) - ConRCurv;
-    A0->Z(6)    = A0->GetZ(5);
-    A0->Rmin(6) = -1000; // See Below
-    A0->Rmax(6) = ConRCentCurv0;
-    A0->Z(7)    = ConZOuterRingMill+ConRCurv*Sintc;
-    A0->Rmin(7) = -1000; // See Below
-    A0->Rmax(7) = ConRCentCurv0-ConRCurv*Costc;
-    A0->Z(8)    = -1000; // See Below
-    A0->Rmin(8) = ConRInnerMin;
-    A0->Rmax(8) = -1000; // See Below
-    A0->Z(9)    = ConZInnerRing;
-    A0->Rmin(9) = -1000; // See Below
-    A0->Rmax(9) = -1000; // See Below
-    A0->Z(10)   = ConZInnerRing;
-    A0->Rmin(10)= ConRInnerMin;
-    A0->Rmax(10)= -1000; // See Below
-    A0->Z(11)   = ConZLength-ConRCurv+ConRCurv*Costc;
-    A0->Rmin(11)= ConRInnerMin;
-    A0->Rmax(11)= ConRCentCurv1+ConRCurv*Sintc;
-    A0->Z(12)   = ConZToCylinder;
-    A0->Rmin(12)= ConRInnerMin;
-    A0->Rmax(12)= -1000; // See Below
-    A0->Z(13)   = ConZToCylinder;
-    A0->Rmin(13)= ConRCylOuterMill;
-    A0->Rmax(13)= -1000; // See Below
-    A0->Z(14)   = -1000; // See Below
-    A0->Rmin(14)= ConRCylOuterMill;
-    A0->Rmax(14)= ConRCylOuterMill;
-    // Compute values undefined above.
-    RadiusOfCurvature(ConRCurv,0.0,A0->GetZ(9),A0->GetRmin(9),ConT,A0->Z(8),x);
-    A0->Rmin(3) = AliITSv11Geometry::RminFromZpCone(A0,8,90.-ConT,A0->GetZ(3),0.0);
-    A0->Rmin(4) = AliITSv11Geometry::RminFromZpCone(A0,3,90.-ConT,A0->GetZ(4),0.0);
-    A0->Rmin(5) = AliITSv11Geometry::RminFromZpCone(A0,3,90.-ConT,A0->GetZ(5),0.0);
-    A0->Rmin(6) = A0->GetRmin(5);
-    A0->Rmin(7) = AliITSv11Geometry::RminFromZpCone(A0,3,90.-ConT,A0->GetZ(7),0.0);
-    A0->Rmax(8) = AliITSv11Geometry::RmaxFromZpCone(A0,4,90.-ConT,A0->GetZ(8),0.0);
-    A0->Rmin(9) = AliITSv11Geometry::RminFromZpCone(A0,3,90.-ConT,A0->GetZ(9),0.0);
-    A0->Rmax(9) = AliITSv11Geometry::RmaxFromZpCone(A0,4,90.-ConT,A0->GetZ(9),0.0);
-    A0->Rmax(10)= AliITSv11Geometry::RmaxFromZpCone(A0,4,90.-ConT,A0->GetZ(10),0.0);
-    t = TanD(270.+ConT);
-    A0->Z(14)   = (ConRCylOuterMill-A0->GetRmax(4)+t*A0->GetZ(4))/t;
-    A0->Rmax(12)= AliITSv11Geometry::RmaxFrom2Points(A0,11,14,A0->GetZ(12));
-    A0->Rmax(13)= AliITSv11Geometry::RmaxFrom2Points(A0,11,14,A0->GetZ(13));
-    PrintPcon(A0);
-    //
-    // Poly-cone Volume B. Stesalite inside volume A0.
+    // Poly-cone Volume sA0. Top part of SSD cone Carbon Fiber.
+    sA0 = new TGeoPcon("ITSssdSuportConeCarbonFiberSurfaceA0",0.0,360.0,15);
+    sA0->Z(0)    = 0.0;
+    sA0->Rmin(0) = kconROuterMin;
+    sA0->Rmax(0) = kconROuterMax;
+    sA0->Z(1)    = kconZOuterRingInside-kconRCurv0;
+    sA0->Rmin(1) = sA0->GetRmin(0);
+    sA0->Rmax(1) = sA0->GetRmax(0);
+    sA0->Z(2)    = kconZOuterRingInside;
+    sA0->Rmin(2) = sA0->GetRmin(1)-kconRCurv0;
+    sA0->Rmax(2) = sA0->GetRmax(0);
+    sA0->Z(3)    = sA0->GetZ(2);
+    sA0->Rmin(3) = -1000; // See Below
+    sA0->Rmax(3) = sA0->GetRmax(0);
+    sA0->Z(4)    = kconZOuterRingMill-kconRCurv0;
+    sA0->Rmin(4) = -1000; // See Below
+    sA0->Rmax(4) = sA0->GetRmax(0);
+    sA0->Z(5)    = kconZOuterRingMill;
+    sA0->Rmin(5) = -1000; // See Below
+    sA0->Rmax(5) = sA0->GetRmax(4) - kconRCurv0;
+    sA0->Z(6)    = sA0->GetZ(5);
+    sA0->Rmin(6) = -1000; // See Below
+    sA0->Rmax(6) = -1000; // See Below
+    sA0->Z(7)    = sA0->GetZ(6)+kconRCurv0*(1.-kCoskconTc);
+    sA0->Rmin(7) = -1000; // See Below
+    sA0->Rmax(7) = -1000; // See Below
+    sA0->Z(8)    = -1000; // See Below
+    sA0->Rmin(8) = kconRCentCurv2+kconRCurv1*kSinkconTc; // See Below
+    sA0->Rmax(8) = -1000; // See Below
+    sA0->Z(9)    = -1000; // See Below
+    sA0->Rmin(9) = kconRCentCurv2;
+    sA0->Rmax(9) = -1000; // See Below
+    sA0->Z(10)   = -1000; // See Below
+    sA0->Rmin(10)= kconRInnerMin;
+    sA0->Rmax(10)= -1000; // See Below
+    sA0->Z(11)   = kconZLengthMill-kconRCurv0*(1.0-kCoskconTc);
+    sA0->Rmin(11)= sA0->GetRmin(10);
+    sA0->Rmax(11)= kconRCentCurv1+kconRCurv0*kSinkconTc;
+    sA0->Z(12)   = kconZToCylinder;
+    sA0->Rmin(12)= sA0->GetRmin(10);
+    sA0->Rmax(12)= -1000; // See Below
+    sA0->Z(13)   = sA0->GetZ(12);
+    sA0->Rmin(13)= kconRCylOuterMill;
+    sA0->Rmax(13)= -1000; // See Below
+    z            = kconZLengthMill;
+    rmin         = kconRCentCurv1;
+    rmax         = rmin;
+    sA0->Z(14)   = -1000; // See Below
+    sA0->Rmin(14)= sA0->GetRmin(13);
+    sA0->Rmax(14)= sA0->GetRmin(14);
+    // Compute values undefined above
+    sA0->Z(14)   = Xfrom2Points(sA0->GetZ(11),sA0->GetRmax(11),z,rmax,
+                               sA0->GetRmax(14));
+    sA0->Z(8)    = ZFromRmaxpCone(sA0,11,90.-kconT,sA0->GetRmin(8),-kconThick);
+    sA0->Rmax(8) = RmaxFromZpCone(sA0,11,90.-kconT,sA0->GetZ(8),0.0);
+    sA0->Z(9)    = sA0->GetZ(8)+kconRCurv1*(1.-kCoskconTc);
+    sA0->Z(10)   = sA0->GetZ(9);
+    sA0->Rmin(3) = RminFromZpCone(sA0,8,90.-kconT,sA0->GetZ(3),0.0);
+    sA0->Rmin(4) = RminFromZpCone(sA0,3,90.-kconT,sA0->GetZ(4),0.0);
+    sA0->Rmin(5) = RminFromZpCone(sA0,3,90.-kconT,sA0->GetZ(5),0.0);
+    sA0->Rmin(7) = RminFromZpCone(sA0,3,90.-kconT,sA0->GetZ(7),0.0);
+    sA0->Rmax(7) = RmaxFromZpCone(sA0,11,90.-kconT,sA0->GetZ(7),0.0);
+    sA0->Rmin(6) = sA0->GetRmin(5);
+    sA0->Rmax(6) = RmaxFromZpCone(sA0,11,90.-kconT,sA0->GetZ(7),0.0);
+    sA0->Rmax(9) = RmaxFromZpCone(sA0,11,90.-kconT,sA0->GetZ(9),0.0);
+    sA0->Rmax(10)= sA0->GetRmax(9);
+    t = TanD(270.+kconT);
+    sA0->Rmax(12)= RmaxFrom2Points(sA0,11,14,sA0->GetZ(12));
+    sA0->Rmax(13)= sA0->GetRmax(12);
+    PrintPcon(sA0);
+    //
+    // Poly-cone Volume B. Stesalite inside volume sA0.
     // Now lets define the Inserto Stesalite 4411w material volume.
-    // Poly-cone Volume A0. Top part of SSD cone Carbon Fiber.
-    TGeoPcon *B0 = new TGeoPcon("ITSssdSuportConeStaseliteB0",
-                               0.0,360.0,15);
-    //
-    B0->Z(0)    = A0->GetZ(0);
-    B0->Rmin(0) = A0->GetRmin(0) + ConCthick;
-    B0->Rmax(0) = A0->GetRmax(0) - ConCthick;
-    InsidePoint(A0,0,1,2,ConCthick,B0,1,kFALSE); // Rmin
-    B0->Rmax(1) = B0->Rmax(0);
-    InsidePoint(A0,1,2,3,ConCthick,B0,2,kFALSE); // Rmin
-    B0->Rmax(2) = B0->Rmax(0);
-    InsidePoint(A0,2,3,9,ConCthick,B0,3,kFALSE);
-    B0->Rmax(3) = B0->Rmax(0);
-    InsidePoint(A0,0,4,5,ConCthick,B0,4,kTRUE); // Rmax
-    B0->Rmin(4) = -1000.; // see Bellow
-    InsidePoint(A0,4,5,6,ConCthick,B0,5,kTRUE); // Rmax
-    B0->Rmin(5) = -1000.; // see Bellow
-    InsidePoint(A0,5,6,7,ConCthick,B0,6,kTRUE); // Rmax
-    B0->Rmin(6) = -1000.; // see Bellow
-    InsidePoint(A0,6,7,11,ConCthick,B0,7,kTRUE); // Rmax
-    B0->Rmin(7) = -1000.; // see Bellow
-    InsidePoint(A0,3,8,9,ConCthick,B0,8,kFALSE); // Rmin
-    B0->Rmax(8) = -1000.; // see Bellow
-    InsidePoint(A0,8,9,10,ConCthick,B0,9,kFALSE); // Rmin
-    B0->Rmax(9) = -1000.; // see Bellow
-    B0->Z(10)   = A0->GetZ(10) + ConCthick;
-    B0->Rmin(10)= A0->GetRmin(10);
-    B0->Rmax(10)= -1000.; // see Bellow
-    InsidePoint(A0,7,11,14,ConCthick,B0,11,kTRUE); // Rmax
-    B0->Rmin(11)= A0->GetRmin(10);
-    B0->Z(2)    = A0->GetZ(12);
-    B0->Rmin(12)= A0->GetRmin(12);
-    B0->Rmax(12)= -1000.; // see Bellow
-    B0->Z(13)   = A0->GetZ(13);
-    B0->Rmin(13)= A0->GetRmin(13);
-    B0->Rmax(13)= -1000.; // see Bellow
-    B0->Z(14)   = A0->GetZ(14) - ConCthick;
-    B0->Rmin(14)= A0->GetRmin(14);
-    B0->Rmax(14)= B0->Rmin(14); // Close?
-    B0->Rmin(4) = RminFrom2Points(B0,3,8,B0->GetZ(4));
-    B0->Rmin(5) = RminFrom2Points(B0,3,8,B0->GetZ(5));
-    B0->Rmin(6) = B0->GetRmin(5);
-    B0->Rmin(7) = RminFrom2Points(B0,3,8,B0->GetZ(7));
-    B0->Rmax(8) = RmaxFrom2Points(B0,7,11,B0->GetZ(8));
-    B0->Rmax(9) = RmaxFrom2Points(B0,7,11,B0->GetZ(9));
-    B0->Rmax(10)= B0->GetRmax(9);
-    B0->Rmax(12)= RmaxFrom2Points(B0,11,14,B0->GetZ(12));
-    B0->Rmax(13)= RmaxFrom2Points(B0,11,14,B0->GetZ(13));
-    PrintPcon(B0);
-    //
-    // Poly-cone Volume C0. Foam inside volume A0.
+    // Poly-cone Volume sA0. Top part of SSD cone Carbon Fiber.
+    sB0 = new TGeoPcon("ITSssdSuportConeStaseliteB0",0.0,360.0,15);
+    //
+    sB0->Z(0)    = sA0->GetZ(0);
+    sB0->Rmin(0) = sA0->GetRmin(0) + kconCthick;
+    sB0->Rmax(0) = sA0->GetRmax(0) - kconCthick;
+    InsidePoint(sA0,0,1,2,kconCthick,sB0,1,kFALSE); // Rmin
+    sB0->Rmax(1) = sB0->Rmax(0);
+    InsidePoint(sA0,1,2,3,kconCthick,sB0,2,kFALSE); // Rmin
+    sB0->Rmax(2) = sB0->Rmax(0);
+    InsidePoint(sA0,2,3,9,kconCthick,sB0,3,kFALSE);
+    sB0->Rmax(3) = sB0->Rmax(0);
+    InsidePoint(sA0,0,4,5,kconCthick,sB0,4,kTRUE); // Rmax
+    sB0->Rmin(4) = -1000.; // see Bellow
+    InsidePoint(sA0,4,5,6,kconCthick,sB0,5,kTRUE); // Rmax
+    sB0->Rmin(5) = -1000.; // see Bellow
+    InsidePoint(sA0,5,6,7,kconCthick,sB0,6,kTRUE); // Rmax
+    sB0->Rmin(6) = -1000.; // see Bellow
+    InsidePoint(sA0,6,7,11,kconCthick,sB0,7,kTRUE); // Rmax
+    sB0->Rmin(7) = -1000.; // see Bellow
+    InsidePoint(sA0,3,8,9,kconCthick,sB0,8,kFALSE); // Rmin
+    sB0->Rmax(8) = -1000.; // see Bellow
+    InsidePoint(sA0,8,9,10,kconCthick,sB0,9,kFALSE); // Rmin
+    sB0->Rmax(9) = -1000.; // see Bellow
+    sB0->Z(10)   = sA0->GetZ(10) + kconCthick;
+    sB0->Rmin(10)= sA0->GetRmin(10);
+    sB0->Rmax(10)= -1000.; // see Bellow
+    InsidePoint(sA0,7,11,14,kconCthick,sB0,11,kTRUE); // Rmax
+    sB0->Rmin(11)= sA0->GetRmin(10);
+    sB0->Z(12)    = sA0->GetZ(12);
+    sB0->Rmin(12)= sA0->GetRmin(12);
+    sB0->Rmax(12)= -1000.; // see Bellow
+    sB0->Z(13)   = sA0->GetZ(13);
+    sB0->Rmin(13)= sA0->GetRmin(13);
+    sB0->Rmax(13)= -1000.; // see Bellow
+    sB0->Z(14)   = sA0->GetZ(14) - kconCthick;
+    sB0->Rmin(14)= sA0->GetRmin(14);
+    sB0->Rmax(14)= sB0->Rmin(14); // Close?
+    sB0->Rmin(4) = RminFrom2Points(sB0,3,8,sB0->GetZ(4));
+    sB0->Rmin(5) = RminFrom2Points(sB0,3,8,sB0->GetZ(5));
+    sB0->Rmin(6) = sB0->GetRmin(5);
+    sB0->Rmin(7) = RminFrom2Points(sB0,3,8,sB0->GetZ(7));
+    sB0->Rmax(8) = RmaxFrom2Points(sB0,7,11,sB0->GetZ(8));
+    sB0->Rmax(9) = RmaxFrom2Points(sB0,7,11,sB0->GetZ(9));
+    sB0->Rmax(10)= sB0->GetRmax(9);
+    sB0->Rmax(12)= RmaxFrom2Points(sB0,11,14,sB0->GetZ(12));
+    sB0->Rmax(13)= RmaxFrom2Points(sB0,11,14,sB0->GetZ(13));
+    PrintPcon(sB0);
+    //
+    // Poly-cone Volume sC0. Foam inside volume sA0.
     // Now lets define the Rohacell foam material volume.
-    TGeoPcon *C0 = new TGeoPcon("ITSssdSuportConeRohacellC0",
-                               0.0,360.0,4);
-    C0->Z(1)    = B0->GetZ(7);
-    C0->Rmax(1) = B0->GetRmax(7);
-    C0->Rmin(1) = RminFrom2Points(B0,3,8,C0->GetZ(1));
-    C0->Rmin(0) = C0->GetRmax(1);
-    C0->Rmax(0) = C0->GetRmin(0);
-    C0->Z(0)    = Zfrom2MinPoints(B0,3,8,C0->Rmin(0));
-    C0->Z(3)    = C0->GetZ(0)+(ConThick-2.0*ConCthick+ConRohacellL0)*Costc;
-    C0->Rmin(3) = C0->GetRmin(0)+(ConThick-2.0*ConCthick-ConRohacellL0)*Sintc;
-    C0->Rmax(3) = C0->GetRmin(3);
-    C0->Rmin(2) = C0->GetRmin(3);
-    C0->Z(2)    = Zfrom2MinPoints(B0,3,8,C0->GetRmin(2));
-    C0->Rmax(2) = RmaxFrom2Points(B0,4,11,C0->GetZ(2));
-    PrintPcon(C0);
-    //
-    // Poly-cone Volume F.  Second Foam inside volume A0.
+    sC0 = new TGeoPcon("ITSssdSuportConeRohacellC0",0.0,360.0,4);
+    sC0->Z(1)    = sB0->GetZ(7);
+    sC0->Rmax(1) = sB0->GetRmax(7);
+    sC0->Rmin(1) = RminFrom2Points(sB0,3,8,sC0->GetZ(1));
+    sC0->Rmin(0) = sC0->GetRmax(1);
+    sC0->Rmax(0) = sC0->GetRmin(0);
+    sC0->Z(0)    = Zfrom2MinPoints(sB0,3,8,sC0->Rmin(0));
+    t = kconThick-2.0*kconCthick;
+    sC0->Rmax(3) = sC0->GetRmax(0)-kCoskconTc*TMath::Sqrt(
+                             kconRohacellL0*kconRohacellL0-t*t)+t*kSinkconTc;
+    sC0->Rmin(3) = sC0->GetRmax(3);
+    sC0->Z(3)    = ZFromRmaxpCone(sB0,11,90.-kconT,sC0->GetRmax(3),0.0);;
+    sC0->Rmin(2) = sC0->GetRmin(3);
+    sC0->Z(2)    = ZFromRminpCone(sB0,3,90.-kconT,sC0->GetRmin(2),0.0);
+    sC0->Rmax(2) = RmaxFromZpCone(sB0,11,90.0-kconT,sC0->GetZ(2),0.0);
+    PrintPcon(sC0);
+    //
+    // Poly-cone Volume sF.  Second Foam inside volume sA0.
     // Now lets define the Rohacell foam material volume.
-    TGeoPcon *F0 = new TGeoPcon("ITSssdSuportConeRohacellCF0",
-                               0.0,360.0,4);
-    F0->Z(2)    = B0->GetZ(8);
-    F0->Rmin(2) = B0->GetRmin(8);
-    F0->Rmax(2) = B0->GetRmax(8);
-    F0->Z(0)    = F0->GetZ(2)-ConRohacellL1*Sintc;
-    F0->Rmin(0) = F0->GetRmin(2)+ConRohacellL1*Costc;
-    F0->Rmax(0) = F0->GetRmin(0);
-    F0->Z(1)    = Zfrom2MaxPoints(B0,4,11,F0->GetRmax(0));
-    F0->Rmax(1) = F0->GetRmax(0);
-    F0->Rmin(1) = RminFrom2Points(B0,3,8,F0->GetZ(1));
-    F0->Rmin(3) = F0->GetRmin(2)+(ConThick-2.0*ConCthick)*Costc;
-    F0->Z(3)    = F0->GetZ(2)+(ConThick-2.0*ConCthick)*Sintc;
-    F0->Rmax(3) = F0->GetRmin(3);
-    PrintPcon(F0);
+    sF0 = new TGeoPcon("ITSssdSuportConeRohacellCF0",0.0,360.0,4);
+    sF0->Z(2)    = sB0->GetZ(8);
+    sF0->Rmin(2) = sB0->GetRmin(8);
+    sF0->Rmax(2) = sB0->GetRmax(8);
+    sF0->Z(0)    = sF0->GetZ(2)-kconRohacellL1*kSinkconTc;
+    sF0->Rmin(0) = sF0->GetRmin(2)+kconRohacellL1*kCoskconTc;
+    sF0->Rmax(0) = sF0->GetRmin(0);
+    sF0->Z(1)    = ZFromRmaxpCone(sB0,11,90.-kconT,sF0->GetRmax(0),0.0);;
+    sF0->Rmax(1) = sF0->GetRmax(0);
+    sF0->Rmin(1) = RminFrom2Points(sB0,3,8,sF0->GetZ(1));
+    sF0->Rmax(3) = sF0->GetRmin(2)+(kconThick-2.0*kconCthick)*kCoskconTc;
+    sF0->Rmin(3) = sF0->GetRmax(3);
+    sF0->Z(3)    = ZFromRmaxpCone(sB0,11,90.-kconT,sF0->GetRmax(3),0.0);
+    PrintPcon(sF0);
     // Holes for Cables to pass Through is created by the intersection
-    // between a cone segment and an Arb8, One for the volume A0 and a
-    // larger one for the volumes B0 and C0, so that the surface is covered
-    // in carbon figer (volume A0).
-    TGeoConeSeg *Ah1 = new TGeoConeSeg("ITSssdCableHoleAh1",
-                                       0.5*ConZLength,ConCableHoleRinner,
-                                       ConCableHoleROut,ConCableHoleRinner,
-                                       ConCableHoleROut,
-                                       (90.-0.5*ConCableHoleWidth/
-                                       ConCableHoleROut)*kRadian,
-                                       (90.+0.5*ConCableHoleWidth/
-                                       ConCableHoleROut)*kRadian);
-    TGeoConeSeg *Bh1 = new TGeoConeSeg("ITSssdCableHoleBh1",0.5*ConZLength,
-                                      ConCableHoleRinner-ConCthick,
-                                      ConCableHoleROut+ConCthick,
-                                      ConCableHoleRinner-ConCthick,
-                                      ConCableHoleROut+ConCthick,
-                                      (90.+((-0.5*ConCableHoleWidth-ConCthick)/
-                                       (ConCableHoleROut-ConCthick)))*kRadian,
-                                      (90.+((+0.5*ConCableHoleWidth-ConCthick)/
-                                       (ConCableHoleROut-ConCthick)))*kRadian);
-    x0 = Ah1->GetRmax1()*CosD(Ah1->GetPhi2());
-    y0 = Ah1->GetRmax1()*SinD(Ah1->GetPhi2());
-    TGeoArb8 *Ah2 = new TGeoArb8("ITSssdCableHoleAh2",0.5*ConZLength);
-    y  = Ah1->GetRmax1();
-    x  = x0+(y-y0)/TanD(90.0+ConCableHoleAngle);
-    Ah2->SetVertex(0,x,y);
-    y  = Ah1->GetRmin1()*SinD(Ah1->GetPhi2());
-    x  = x0+(y-y0)/TanD(90.0+ConCableHoleAngle);
-    Ah2->SetVertex(3,x,y);
-    x0 = Ah1->GetRmax1()*CosD(Ah1->GetPhi1());
-    y0 = Ah1->GetRmax1()*SinD(Ah1->GetPhi1());
-    y  = Ah1->GetRmax1();
-    x  = x0+(y-y0)/TanD(90.0-ConCableHoleAngle);
-    Ah2->SetVertex(1,x,y);
-    y  = Ah1->GetRmin1()*SinD(Ah1->GetPhi1());
-    x  = x0+(y-y0)/TanD(90.0-ConCableHoleAngle);
-    Ah2->SetVertex(2,x,y);
-    //
-    x0 = Bh1->GetRmax1()*CosD(Bh1->GetPhi2());
-    y0 = Bh1->GetRmax1()*SinD(Bh1->GetPhi2());
-    TGeoArb8 *Bh2 = new TGeoArb8("ITSssdCableHoleBh2",0.5*ConZLength);
-    y  = Bh1->GetRmax1();
-    x  = x0+(y-y0)/TanD(90.0+ConCableHoleAngle);
-    Bh2->SetVertex(0,x,y);
-    y  = Bh1->GetRmin1()*SinD(Bh1->GetPhi2());
-    x  = x0+(y-y0)/TanD(90.0+ConCableHoleAngle);
-    Bh2->SetVertex(3,x,y);
-    x0 = Bh1->GetRmax1()*CosD(Bh1->GetPhi1());
-    y0 = Bh1->GetRmax1()*SinD(Bh1->GetPhi1());
-    y  = Bh1->GetRmax1();
-    x  = x0+(y-y0)/TanD(90.0-ConCableHoleAngle);
-    Bh2->SetVertex(1,x,y);
-    y  = Bh1->GetRmin1()*SinD(Bh1->GetPhi1());
-    x  = x0+(y-y0)/TanD(90.0-ConCableHoleAngle);
-    Bh2->SetVertex(2,x,y);
+    // between a cone segment and an Arb8, One for the volume sA0 and a
+    // larger one for the volumes sB0 and sC0, so that the surface is covered
+    // in carbon figer (volume sA0).
+    sAh1 = new TGeoConeSeg("ITSssdCableHoleAh1",
+                           0.5*kconZLength,kconCableHoleRinner,
+                           kconCableHoleROut,kconCableHoleRinner,
+                           kconCableHoleROut,
+                           90.-(0.5*kconCableHoleWidth/
+                                kconCableHoleROut)*fgkRadian,
+                           90.+(0.5*kconCableHoleWidth/
+                                kconCableHoleROut)*fgkRadian);
+    sBh1 = new TGeoConeSeg("ITSssdCableHoleBh1",0.5*kconZLength,
+                           kconCableHoleRinner-kconCthick,
+                           kconCableHoleROut+kconCthick,
+                           kconCableHoleRinner-kconCthick,
+                           kconCableHoleROut+kconCthick,
+                           90.-(((0.5*kconCableHoleWidth+kconCthick)/
+                                 (kconCableHoleROut+kconCthick)))*fgkRadian,
+                           90.+(((0.5*kconCableHoleWidth+kconCthick)/
+                                 (kconCableHoleROut+kconCthick)))*fgkRadian);
+    x0 = sAh1->GetRmax1()*CosD(sAh1->GetPhi2());
+    y0 = sAh1->GetRmax1()*SinD(sAh1->GetPhi2());
+    sAh2 = new TGeoArb8("ITSssdCableHoleAh2",0.5*kconZLength);
+    y  = sAh1->GetRmax1();
+    x  = x0+(y-y0)/TanD(90.0+kconCableHoleAngle);
+    sAh2->SetVertex(0,x,y);
+    y  = sAh1->GetRmin1()*SinD(sAh1->GetPhi2());
+    x  = x0+(y-y0)/TanD(90.0+kconCableHoleAngle);
+    sAh2->SetVertex(3,x,y);
+    x0 = sAh1->GetRmax1()*CosD(sAh1->GetPhi1());
+    y0 = sAh1->GetRmax1()*SinD(sAh1->GetPhi1());
+    y  = sAh1->GetRmax1();
+    x  = x0+(y-y0)/TanD(90.0-kconCableHoleAngle);
+    sAh2->SetVertex(1,x,y);
+    y  = sAh1->GetRmin1()*SinD(sAh1->GetPhi1());
+    x  = x0+(y-y0)/TanD(90.0-kconCableHoleAngle);
+    sAh2->SetVertex(2,x,y);
+    //
+    x0 = sBh1->GetRmax1()*CosD(sBh1->GetPhi2());
+    y0 = sBh1->GetRmax1()*SinD(sBh1->GetPhi2());
+    sBh2 = new TGeoArb8("ITSssdCableHoleBh2",0.5*kconZLength);
+    y  = sBh1->GetRmax1();
+    x  = x0+(y-y0)/TanD(90.0+kconCableHoleAngle);
+    sBh2->SetVertex(0,x,y);
+    y  = sBh1->GetRmin1()*SinD(sBh1->GetPhi2());
+    x  = x0+(y-y0)/TanD(90.0+kconCableHoleAngle);
+    sBh2->SetVertex(3,x,y);
+    x0 = sBh1->GetRmax1()*CosD(sBh1->GetPhi1());
+    y0 = sBh1->GetRmax1()*SinD(sBh1->GetPhi1());
+    y  = sBh1->GetRmax1();
+    x  = x0+(y-y0)/TanD(90.0-kconCableHoleAngle);
+    sBh2->SetVertex(1,x,y);
+    y  = sBh1->GetRmin1()*SinD(sBh1->GetPhi1());
+    x  = x0+(y-y0)/TanD(90.0-kconCableHoleAngle);
+    sBh2->SetVertex(2,x,y);
     for(i=0;i<4;i++){ // define points at +dz
-        Ah2->SetVertex(i+4,(Ah2->GetVertices())[2*i],
-                           (Ah2->GetVertices())[1+2*i]);
-        Bh2->SetVertex(i+4,(Bh2->GetVertices())[2*i],
-                           (Bh2->GetVertices())[1+2*i]);
+        sAh2->SetVertex(i+4,(sAh2->GetVertices())[2*i],
+                           (sAh2->GetVertices())[1+2*i]);
+        sBh2->SetVertex(i+4,(sBh2->GetVertices())[2*i],
+                           (sBh2->GetVertices())[1+2*i]);
     } // end for i
-    TGeoBBox *Ah3 = new TGeoBBox("ITSssdCoolingHoleAh3",0.5*ConCoolHoleWidth,
-                                 0.5*ConCoolHoleHight,0.5*ConZLength);
-    TGeoBBox *Bh3 = new TGeoBBox("ITSssdCoolingHoleBh3",
-                                 0.5*ConCoolHoleWidth+ConCthick,
-                                 0.5*ConCoolHoleHight+ConCthick,
-                                 0.5*ConZLength);
-    TGeoBBox *Ah4 = new TGeoBBox("ITSssdMountingPostHoleAh4",
-                                 0.5*ConMountHoleWidth,
-                                 0.5*ConMountHoleHight,0.5*ConZLength);
-    TGeoBBox *Bh4 = new TGeoBBox("ITSssdMountingPostHoleBh4",
-                                 0.5*ConMountHoleWidth+ConCthick,
-                                 0.5*ConMountHoleHight+ConCthick,
-                                 0.5*ConZLength);
-    PrintConeSeg(Ah1);
-    PrintConeSeg(Bh1);
-    PrintArb8(Ah2);
-    PrintArb8(Bh2);
-    PrintBBox(Ah3);
-    PrintBBox(Bh3);
-    PrintBBox(Ah4);
-    PrintBBox(Bh4);
+    sAh3 = new TGeoBBox("ITSssdCoolingHoleAh3",0.5*kconCoolHoleWidth,
+                        0.5*kconCoolHoleHight,0.5*kconZLength);
+    sBh3 = new TGeoBBox("ITSssdCoolingHoleBh3",
+                        0.5*kconCoolHoleWidth+kconCthick,
+                        0.5*kconCoolHoleHight+kconCthick,0.5*kconZLength);
+    sAh4 = new TGeoBBox("ITSssdMountingPostHoleAh4",0.5*kconMountHoleWidth,
+                        0.5*kconMountHoleHight,0.5*kconZLength);
+    sBh4 = new TGeoBBox("ITSssdMountingPostHoleBh4",
+                        0.5*kconMountHoleWidth+kconCthick,
+                        0.5*kconMountHoleHight+kconCthick,0.5*kconZLength);
+    PrintConeSeg(sAh1);
+    PrintConeSeg(sBh1);
+    PrintArb8(sAh2);
+    PrintArb8(sBh2);
+    PrintBBox(sAh3);
+    PrintBBox(sBh3);
+    PrintBBox(sAh4);
+    PrintBBox(sBh4);
     // SSD Cone Wings
-    TGeoConeSeg *G = new TGeoConeSeg("ITSssdWingCarbonFiberSurfaceG",
-                                     0.5*ConWingThick,ConROuterMax-ConCthick,
-                                     ConWingRmax,
-                                     ConROuterMax-ConCthick,ConWingRmax,
-                          ConWingPhi0-(0.5*ConWingWidth/ConWingRmax)*kRadian,
-                          ConWingPhi0+(0.5*ConWingWidth/ConWingRmax)*kRadian);
-    TGeoConeSeg *H = new TGeoConeSeg("ITSssdWingStaseliteH",
-                 0.5*ConWingThick-ConCthick,ConROuterMax-ConCthick,
-                                     ConWingRmax-ConCthick,
-                                     ConROuterMax-ConCthick,
-                                     ConWingRmax-ConCthick,
-                                     ConWingPhi0-((0.5*ConWingWidth-ConCthick)/
-                                             (ConWingRmax-ConCthick))*kRadian,
-                                     ConWingPhi0+((0.5*ConWingWidth-ConCthick)/
-                    (ConWingRmax-ConCthick))*kRadian);
-    PrintConeSeg(G);
-    PrintConeSeg(H);
+    sG = new TGeoConeSeg("ITSssdWingCarbonFiberSurfaceG",
+                         0.5*kconWingThick,kconROuterMax-kconCthick,
+                         kconWingRmax,kconROuterMax-kconCthick,kconWingRmax,
+                      kconWingPhi0-(0.5*kconWingWidth/kconWingRmax)*fgkRadian,
+                      kconWingPhi0+(0.5*kconWingWidth/kconWingRmax)*fgkRadian);
+    sH = new TGeoConeSeg("ITSssdWingStaseliteH",
+                         0.5*kconWingThick-kconCthick,kconROuterMax-kconCthick,
+                         kconWingRmax-kconCthick,
+                         kconROuterMax-kconCthick,
+                         kconWingRmax-kconCthick,
+                         kconWingPhi0-((0.5*kconWingWidth-kconCthick)/
+                                       (kconWingRmax-kconCthick))*fgkRadian,
+                         kconWingPhi0+((0.5*kconWingWidth-kconCthick)/
+                                       (kconWingRmax-kconCthick))*fgkRadian);
+    PrintConeSeg(sG);
+    PrintConeSeg(sH);
     // SDD support plate, SSD side.
-    //Poly-cone Volume T.
-    TGeoTubeSeg *T = new TGeoTubeSeg("ITSssdsddMountingBracketT",
-                                     SupPRmin,SupPRmax,
-                                     SupPZ,SupPPhi1,
-                                     SupPPhi2);
-    PrintTubeSeg(T);
+    //Poly-cone Volume sT.
+    sT = new TGeoTubeSeg("ITSssdsddMountingBracketT",ksupPRmin,ksupPRmax,
+                         ksupPZ,ksupPPhi1,ksupPPhi2);
+    PrintTubeSeg(sT);
     //
     TGeoRotation *rotZ225 =new TGeoRotation("ITSssdConeZ225", 0.0,0.0, 22.5);
     rotZ225->RegisterYourself();
@@ -1699,7 +1713,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
     TGeoRotation *rotZ3375=new TGeoRotation("ITSssdConeZ3375",0.0,0.0,337.5);
     rotZ3375->RegisterYourself();
     //
-    vl[0] = 0.0;vl[1] = ConCoolHoleRmin+0.5*ConCoolHoleHight;vl[2] = 0.0;
+    vl[0] = 0.0;vl[1] = kconCoolHoleRmin+0.5*kconCoolHoleHight;vl[2] = 0.0;
     rotZ225->LocalToMaster(vl,vg);
     TGeoCombiTrans *rotranA225  = new TGeoCombiTrans("ITSssdConeTZ225",vg[0],
                                                      vg[1],vg[2],rotZ225);
@@ -1740,7 +1754,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
     //TGeoRotation *rotZ240 = new TGeoRotation("ITSssdConeZ240",0.0,0.0,240.0);
     TGeoRotation *rotZ300 = new TGeoRotation("ITSssdConeZ300",0.0,0.0,300.0);
     TGeoRotation *rotZ330 = new TGeoRotation("ITSssdConeZ330",0.0,0.0,330.0);
-    vl[0] = ConMountHoleRmin+0.5*ConMountHoleHight; vl[1] = 0.0; vl[2] = 0.0;
+    vl[0] = kconMountHoleRmin+0.5*kconMountHoleHight; vl[1] = 0.0; vl[2] = 0.0;
     rotZ30->LocalToMaster(vl,vg);
     TGeoCombiTrans *rotranA30 = new TGeoCombiTrans("ITSssdConeTZ30",vl[0],
                                                       vl[1],vl[2],rotZ30);
@@ -1765,7 +1779,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
     TGeoCombiTrans *rotranA330 = new TGeoCombiTrans("ITSssdConeTZ330",vg[0],
                                                      vg[1],vg[2],rotZ330);
     rotranA330->RegisterYourself();
-    vl[0] = 0.0; vl[1] = 0.0; vl[2] = A0->GetZ(10)+T->GetDz();
+    vl[0] = 0.0; vl[1] = 0.0; vl[2] = sA0->GetZ(10)+sT->GetDz();
     rotZ60->LocalToMaster(vl,vg);
     TGeoCombiTrans *rotranBrTZ60  = new TGeoCombiTrans("ITSssdConeBrTZ60",
                                                   vg[0],vg[1],vg[2],rotZ60);
@@ -1776,8 +1790,8 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
     TGeoCombiTrans *rotranBrTZ300 = new TGeoCombiTrans("ITSssdConeBrTZ300",
                                                   vg[0],vg[1],vg[2],rotZ300);
     rotranBrTZ300->RegisterYourself();
-    TGeoCompositeShape *A = new TGeoCompositeShape(
-        "ITSssdSuportConeCarbonFiberSurfaceA","(((((((((((((((((((((((((((("
+    sA = new TGeoCompositeShape("ITSssdSuportConeCarbonFiberSurfaceA",
+        "(((((((((((((((((((((((((((("
         "ITSssdSuportConeCarbonFiberSurfaceA0 +"
         "ITSssdWingCarbonFiberSurfaceG) +"
         "ITSssdWingCarbonFiberSurfaceG:ITSssdConeZ90) +"
@@ -1809,8 +1823,8 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
         "ITSssdsddMountingBracketT:ITSssdConeBrTZ180) -"
         "ITSssdsddMountingBracketT:ITSssdConeBrTZ300"
         );
-    TGeoCompositeShape *B = new TGeoCompositeShape(
-        "ITSssdSuportConeStaseliteB","(((((((((((((((((((((((((((("
+    sB = new TGeoCompositeShape("ITSssdSuportConeStaseliteB",
+        "(((((((((((((((((((((((((((("
         "ITSssdSuportConeStaseliteB0 +"
         "ITSssdWingStaseliteH) +"
         "ITSssdWingStaseliteH:ITSssdConeZ90) +"
@@ -1842,8 +1856,8 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
         "ITSssdsddMountingBracketT:ITSssdConeBrTZ180) -"
         "ITSssdsddMountingBracketT:ITSssdConeBrTZ300"
         );
-    TGeoCompositeShape *C = new TGeoCompositeShape(
-      "ITSssdSuportConeRohacellC","("
+    sC = new TGeoCompositeShape("ITSssdSuportConeRohacellC",
+      "("
       "ITSssdSuportConeRohacellC0 -((((((("
       "ITSssdCableHoleBh1:ITSssdConeZ225*ITSssdCableHoleBh2:ITSssdConeZ225)-"
       "ITSssdCableHoleBh1:ITSssdConeZ675*ITSssdCableHoleBh2:ITSssdConeZ675)-"
@@ -1853,8 +1867,8 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
       "ITSssdCableHoleBh1:ITSssdConeZ2475*ITSssdCableHoleBh2:ITSssdConeZ2475)-"
       "ITSssdCableHoleBh1:ITSssdConeZ2925*ITSssdCableHoleBh2:ITSssdConeZ2925))"
         );
-    TGeoCompositeShape *F = new TGeoCompositeShape(
-        "ITSssdSuportConeRohacellCF","((((("
+    sF = new TGeoCompositeShape("ITSssdSuportConeRohacellCF",
+        "((((("
         "ITSssdSuportConeRohacellCF0 -("
         "ITSssdMountingPostHoleBh4:ITSssdConeTZ30) -"
         "ITSssdMountingPostHoleBh4:ITSssdConeTZ90) -"
@@ -1867,244 +1881,243 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *Moth){
     // In volume SCB, th Inserto Stesalite 4411w material volume, there
     // are a number of Stainless steel screw and pin studs which will be
     // filled with screws/studs.
-    TGeoTube *D = new TGeoTube("ITS Screw+stud used to mount things to "
-                       "the SSD support cone",
-                               0.0,ConRScrewM5by12,ConLScrewM5by12);
-    PrintTube(D);
-    TGeoTube *E = new TGeoTube("ITS pin used to mount things to the "
-                       "SSD support cone",0.0,ConRPinO6,ConLPinO6);
-    PrintTube(E);
+    sD = new TGeoTube("ITS Screw+stud used to mount things to the SSD "
+                      "support cone",
+                      0.0,kconRScrewM5by12,kconLScrewM5by12);
+    PrintTube(sD);
+    sE = new TGeoTube("ITS pin used to mount things to the "
+                      "SSD support cone",0.0,kconRPinO6,kconLPinO6);
+    PrintTube(sE);
     // Bolt heads holding the SSD-SDD tube to the SSD cone.
     // Bolt -- PolyCone
-    //Poly-cone Volume Q.
-    TGeoPcon *Q = new TGeoPcon("ITS SSD Thermal sheal M6 screw headQ",
-                               0.0,360.0,4);
-    Q->Z(0)    = A0->GetZ(12);
-    Q->Rmin(0) = 0.0;
-    Q->Rmax(0) = CylRM6;
-    Q->Z(1)    = Q->GetZ(0) + ConZM6Head;
-    Q->Rmin(1) = 0.0;
-    Q->Rmax(1) = CylRM6;
-    Q->Z(2)    = Q->GetZ(1);
-    Q->Rmin(2) = 0.0;
-    Q->Rmax(2) = ConRM6Head;
-    Q->Z(3)    = Q->GetZ(0)-SupPZ;
-    Q->Rmin(3) = 0.0;
-    Q->Rmax(3) = 0.5*ConRM6Head;
-    PrintPcon(Q);
+    //Poly-cone Volume sQ.
+    sQ = new TGeoPcon("ITS SSD Thermal sheal M6 screw headQ",0.0,360.0,4);
+    sQ->Z(0)    = sA0->GetZ(12);
+    sQ->Rmin(0) = 0.0;
+    sQ->Rmax(0) = kcylRM6;
+    sQ->Z(1)    = sQ->GetZ(0) + kconZM6Head;
+    sQ->Rmin(1) = 0.0;
+    sQ->Rmax(1) = kcylRM6;
+    sQ->Z(2)    = sQ->GetZ(1);
+    sQ->Rmin(2) = 0.0;
+    sQ->Rmax(2) = kconRM6Head;
+    sQ->Z(3)    = sQ->GetZ(0)-ksupPZ;
+    sQ->Rmin(3) = 0.0;
+    sQ->Rmax(3) = 0.5*kconRM6Head;
+    PrintPcon(sQ);
     // air infront of bolt (stasolit Volume K) -- Tube
-    TGeoTube *R = new TGeoTube("ITS Air in front of bolt (in stasolit)R",
-                               Q->GetRmin(3),Q->GetRmax(3),
-                               0.5*(SupPZ-ConCthick));
+    sR = new TGeoTube("ITS Air in front of bolt (in stasolit)R",
+                      sQ->GetRmin(3),sQ->GetRmax(3),0.5*(ksupPZ-kconCthick));
     // air infront of bolt (carbon fiber volume I) -- Tube
-    TGeoTube *S = new TGeoTube("ITS Air in front of Stainless Steal Screw "
-                               "end, M6S",Q->GetRmin(3),Q->GetRmax(3),
-                               0.5*ConCthick);
-    PrintTube(S);
-    //
-    TGeoVolume *Av,*Bv,*Cv,*Dv,*Ev,*Fv,*Qv,*Rv,*Sv,*Tv;
-    //
-    Av = new TGeoVolume("ITSssdConeA",A,SSDcf); // Carbon Fiber
-    Av->SetVisibility(kTRUE);
-    Av->SetLineColor(4); // blue
-    Av->SetLineWidth(1);
-    Av->SetFillColor(Av->GetLineColor());
-    Av->SetFillStyle(4000); // 0% transparent
-    Bv = new TGeoVolume("ITSssdConeB",B,SSDfs); // Staselite
-    Bv->SetVisibility(kTRUE);
-    Bv->SetLineColor(2); // red
-    Bv->SetLineWidth(1);
-    Bv->SetFillColor(Bv->GetLineColor());
-    Bv->SetFillStyle(4010); // 10% transparent
-    Cv = new TGeoVolume("ITSssdConeC",C,SSDfo); // Rohacell
-    Cv->SetVisibility(kTRUE);
-    Cv->SetLineColor(3); // green
-    Cv->SetLineWidth(1);
-    Cv->SetFillColor(Cv->GetLineColor());
-    Cv->SetFillStyle(4050); // 50% transparent
-    Fv = new TGeoVolume("ITSssdConeF",F,SSDfo); // Rohacell;
-    Fv->SetVisibility(kTRUE);
-    Fv->SetLineColor(3); // green
-    Fv->SetLineWidth(1);
-    Fv->SetFillColor(Fv->GetLineColor());
-    Fv->SetFillStyle(4050); // 50% transparent
-    Dv = new TGeoVolume("ITSssdConeD",D,SSDss);
-    Dv->SetVisibility(kTRUE);
-    Dv->SetLineColor(1); // black
-    Dv->SetLineWidth(1);
-    Dv->SetFillColor(Dv->GetLineColor());
-    Dv->SetFillStyle(4000); // 0% transparent
-    Ev = new TGeoVolume("ITSssdConeE",E,SSDss);
-    Ev->SetVisibility(kTRUE);
-    Ev->SetLineColor(1); // black
-    Ev->SetLineWidth(1);
-    Ev->SetFillColor(Ev->GetLineColor());
-    Ev->SetFillStyle(4000); // 0% transparent
-    Qv = new TGeoVolume("ITSssdConeQ",Q,SSDss);
-    Qv->SetVisibility(kTRUE);
-    Qv->SetLineColor(1); // black
-    Qv->SetLineWidth(1);
-    Qv->SetFillColor(Qv->GetLineColor());
-    Qv->SetFillStyle(4000); // 00% transparent
-    Rv = new TGeoVolume("ITSssdConeR",R,SSDair);
-    Rv->SetVisibility(kTRUE);
-    Rv->SetLineColor(5); // yellow
-    Rv->SetLineWidth(1);
-    Rv->SetFillColor(Rv->GetLineColor());
-    Rv->SetFillStyle(4090); // 90% transparent
-    Sv = new TGeoVolume("ITSssdConeS",S,SSDair);
-    Sv->SetVisibility(kTRUE);
-    Sv->SetLineColor(5); // yellow
-    Sv->SetLineWidth(1);
-    Sv->SetFillColor(Sv->GetLineColor());
-    Sv->SetFillStyle(4090); // 90% transparent
-    Tv = new TGeoVolume("ITSssdsddMountingBracket",S,SSDal);
-    Tv->SetVisibility(kTRUE);
-    Tv->SetLineColor(5); // yellow
-    Tv->SetLineWidth(1);
-    Tv->SetFillColor(Tv->GetLineColor());
-    Tv->SetFillStyle(4000); // 0% transparent
+    sS = new TGeoTube("ITS Air in front of Stainless Steal Screw end, M6S",
+                      sQ->GetRmin(3),sQ->GetRmax(3),0.5*kconCthick);
+    PrintTube(sS);
+    //
+    TGeoVolume *vA,*vB,*vC,*vD,*vE,*vF,*vQ,*vR,*vS,*vT;
+    //
+    vA = new TGeoVolume("ITSssdConeA",sA,medSSDcf); // Carbon Fiber
+    vA->SetVisibility(kTRUE);
+    vA->SetLineColor(4); // blue
+    vA->SetLineWidth(1);
+    vA->SetFillColor(vA->GetLineColor());
+    vA->SetFillStyle(4000); // 0% transparent
+    vB = new TGeoVolume("ITSssdConeB",sB,medSSDfs); // Staselite
+    vB->SetVisibility(kTRUE);
+    vB->SetLineColor(2); // red
+    vB->SetLineWidth(1);
+    vB->SetFillColor(vB->GetLineColor());
+    vB->SetFillStyle(4010); // 10% transparent
+    vC = new TGeoVolume("ITSssdConeC",sC,medSSDfo); // Rohacell
+    vC->SetVisibility(kTRUE);
+    vC->SetLineColor(3); // green
+    vC->SetLineWidth(1);
+    vC->SetFillColor(vC->GetLineColor());
+    vC->SetFillStyle(4050); // 50% transparent
+    vF = new TGeoVolume("ITSssdConeF",sF,medSSDfo); // Rohacell;
+    vF->SetVisibility(kTRUE);
+    vF->SetLineColor(3); // green
+    vF->SetLineWidth(1);
+    vF->SetFillColor(vF->GetLineColor());
+    vF->SetFillStyle(4050); // 50% transparent
+    vD = new TGeoVolume("ITSssdConeD",sD,medSSDss);
+    vD->SetVisibility(kTRUE);
+    vD->SetLineColor(1); // black
+    vD->SetLineWidth(1);
+    vD->SetFillColor(vD->GetLineColor());
+    vD->SetFillStyle(4000); // 0% transparent
+    vE = new TGeoVolume("ITSssdConeE",sE,medSSDss);
+    vE->SetVisibility(kTRUE);
+    vE->SetLineColor(1); // black
+    vE->SetLineWidth(1);
+    vE->SetFillColor(vE->GetLineColor());
+    vE->SetFillStyle(4000); // 0% transparent
+    vQ = new TGeoVolume("ITSssdConeQ",sQ,medSSDss);
+    vQ->SetVisibility(kTRUE);
+    vQ->SetLineColor(1); // black
+    vQ->SetLineWidth(1);
+    vQ->SetFillColor(vQ->GetLineColor());
+    vQ->SetFillStyle(4000); // 00% transparent
+    vR = new TGeoVolume("ITSssdConeR",sR,medSSDair);
+    vR->SetVisibility(kTRUE);
+    vR->SetLineColor(5); // yellow
+    vR->SetLineWidth(1);
+    vR->SetFillColor(vR->GetLineColor());
+    vR->SetFillStyle(4090); // 90% transparent
+    vS = new TGeoVolume("ITSssdConeS",sS,medSSDair);
+    vS->SetVisibility(kTRUE);
+    vS->SetLineColor(5); // yellow
+    vS->SetLineWidth(1);
+    vS->SetFillColor(vS->GetLineColor());
+    vS->SetFillStyle(4090); // 90% transparent
+    vT = new TGeoVolume("ITSssdsddMountingBracket",sT,medSSDal);
+    vT->SetVisibility(kTRUE);
+    vT->SetLineColor(5); // yellow
+    vT->SetLineWidth(1);
+    vT->SetFillColor(vT->GetLineColor());
+    vT->SetFillStyle(4000); // 0% transparent
     //
     TGeoCombiTrans *rotran;
     TGeoTranslation *tran;
-    tran = new TGeoTranslation("ITSssdConeTrans",0.0,0.0,-ConZDisplacement);
+    tran = new TGeoTranslation("ITSssdConeTrans",0.0,0.0,-kconZDisplacement);
     TGeoRotation *rotY180 = new TGeoRotation("",0.0,180.0,0.0);
     TGeoCombiTrans *flip  = new TGeoCombiTrans("ITSssdConeFlip",
-                                           0.0,0.0,ConZDisplacement,rotY180);
+                                           0.0,0.0,kconZDisplacement,rotY180);
     delete rotY180;// rot not explicity used in AddNode functions.
     //
     //
     //
     //
-    Av->AddNode(Bv,1,0);
-    Bv->AddNode(Cv,1,0);
-    Bv->AddNode(Fv,1,0);
-    Moth->AddNode(Av,1,tran); // RB24 side
-    Moth->AddNode(Av,2,flip); // RB26 side (Absorber)
+    vA->AddNode(vB,1,0);
+    vB->AddNode(vC,1,0);
+    vB->AddNode(vF,1,0);
+    moth->AddNode(vA,1,tran); // RB24 side
+    moth->AddNode(vA,2,flip); // RB26 side (Absorber)
     //
     //
     //
     // Insert Bolt and Pins in both the Cone and Cylinder at the same time.
-    Int_t NcopyCDv=0,NcopyCEv=0,NcopyQv=0,NcopyRv=0,NcopySv=0,NcopyTv=0;
-    Int_t NcopyDv=0,NcopyEv=0;
-    z = CB->GetZ(0)-0.5*CylZPin;
-    dt = (360.0/((Double_t)CylNPin));
-    for(i=0;i<CylNPin;i++){
+    Int_t nCopyCDv=0,nCopyCEv=0,nCopyQv=0,nCopyvR=0,nCopySv=0,nCopyTv=0;
+    Int_t nCopyvD=0,nCopyvE=0;
+    z = sCB->GetZ(0)-0.5*kcylZPin;
+    dt = (360.0/((Double_t)kcylNPin));
+    for(i=0;i<kcylNPin;i++){
         t = ((Double_t)i)*dt;
-        x = CylRholes*CosD(t+CylPhi0Pin);
-        y = CylRholes*SinD(t+CylPhi0Pin);
+        x = kcylRholes*CosD(t+kcylPhi0Pin);
+        y = kcylRholes*SinD(t+kcylPhi0Pin);
         tran = new TGeoTranslation("",x,y,z);
-        CBv->AddNode(CDv,++NcopyCDv,tran);
+        vCB->AddNode(vCD,++nCopyCDv,tran);
         tran = new TGeoTranslation("",x,y,-z);
-        CBv->AddNode(CDv,++NcopyCDv,tran);
+        vCB->AddNode(vCD,++nCopyCDv,tran);
     } // end for i
-    dt = (360.0/((Double_t)CylNM6));
-    for(i=0;i<CylNM6;i++){
+    dt = (360.0/((Double_t)kcylNM6));
+    for(i=0;i<kcylNM6;i++){
         t = ((Double_t)i)*dt;
-        x = CylRholes*CosD(t+CylPhi0M6);
-        y = CylRholes*SinD(t+CylPhi0M6);
-        z = CB->GetZ(0)-0.5*CylZM6;
+        x = kcylRholes*CosD(t+kcylPhi0M6);
+        y = kcylRholes*SinD(t+kcylPhi0M6);
+        z = sCB->GetZ(0)-0.5*kcylZM6;
         tran = new TGeoTranslation("",x,y,z);
-        CBv->AddNode(CEv,++NcopyCEv,tran);
+        vCB->AddNode(vCE,++nCopyCEv,tran);
         tran = new TGeoTranslation("",x,y,-z);
-        CBv->AddNode(CEv,++NcopyCEv,tran);
+        vCB->AddNode(vCE,++nCopyCEv,tran);
         tran = new TGeoTranslation("",x,y,0.0);
-        Bv->AddNode(Qv,++NcopyQv,tran);
-        if(!((t<rotranBrTZ60->GetRotation()->GetPhiRotation()+T->GetPhi2()&&
-              t>rotranBrTZ60->GetRotation()->GetPhiRotation()-T->GetPhi1())||
-             (t<rotranBrTZ180->GetRotation()->GetPhiRotation()+T->GetPhi2()&&
-              t>rotranBrTZ180->GetRotation()->GetPhiRotation()-T->GetPhi1())||
-             (t<rotranBrTZ300->GetRotation()->GetPhiRotation()+T->GetPhi2()&&
-              t>rotranBrTZ300->GetRotation()->GetPhiRotation()-T->GetPhi1()))){
-            // If not at an angle where the bracket T is located.
-            tran = new TGeoTranslation("",x,y,B0->GetZ(10)-R->GetDz());
-            Bv->AddNode(Rv,++NcopyRv,tran);
-            tran = new TGeoTranslation("",x,y,A0->GetZ(10)-S->GetDz());
-            Av->AddNode(Sv,++NcopySv,tran);
+        vB->AddNode(vQ,++nCopyQv,tran);
+        if(!((t<rotranBrTZ60->GetRotation()->GetPhiRotation()+sT->GetPhi2()&&
+             t>rotranBrTZ60->GetRotation()->GetPhiRotation()-sT->GetPhi1())||
+            (t<rotranBrTZ180->GetRotation()->GetPhiRotation()+sT->GetPhi2()&&
+             t>rotranBrTZ180->GetRotation()->GetPhiRotation()-sT->GetPhi1())||
+            (t<rotranBrTZ300->GetRotation()->GetPhiRotation()+sT->GetPhi2()&&
+             t>rotranBrTZ300->GetRotation()->GetPhiRotation()-sT->GetPhi1()))){
+            // If not at an angle where the bracket sT is located.
+            tran = new TGeoTranslation("",x,y,sB0->GetZ(10)-sR->GetDz());
+            vB->AddNode(vR,++nCopyvR,tran);
+            tran = new TGeoTranslation("",x,y,sA0->GetZ(10)-sS->GetDz());
+            vA->AddNode(vS,++nCopySv,tran);
         } // end if
     } // end for i
     // Add the mounting brackets to the RB24 side only.
-    vl[0] = 0.0; vl[1] = 0.0, vl[2] = A0->GetZ(10)+ConZDisplacement-T->GetDz();
+    vl[0] = 0.0;
+    vl[1] = 0.0;
+    vl[2] = sA0->GetZ(10)+kconZDisplacement-sT->GetDz();
     rotZ60->LocalToMaster(vl,vg);
     rotran = new TGeoCombiTrans("",vg[0],vg[1],vg[2],rotZ60);
-    Moth->AddNode(Tv,++NcopyTv,rotran);
+    moth->AddNode(vT,++nCopyTv,rotran);
     rotZ180->LocalToMaster(vl,vg);
     rotran = new TGeoCombiTrans("",vg[0],vg[1],vg[2],rotZ180);
-    Moth->AddNode(Tv,++NcopyTv,rotran);
+    moth->AddNode(vT,++nCopyTv,rotran);
     rotZ300->LocalToMaster(vl,vg);
     rotran = new TGeoCombiTrans("",vg[0],vg[1],vg[2],rotZ300);
-    Moth->AddNode(Tv,++NcopyTv,rotran);
+    moth->AddNode(vT,++nCopyTv,rotran);
     //
     Double_t da[] = {-3.5,-1.5,1.5,3.5};
     for(i=0;i<2;i++){ // Mounting for ITS-TPC bracket or ITS-Rails
         t0 = 180.*((Double_t)i);
-        for(j=-ConNScrewM5by12/2;j<=ConNScrewM5by12/2;j++)if(j!=0){
+        for(j=-kconNScrewM5by12/2;j<=kconNScrewM5by12/2;j++)if(j!=0){
                     //screws per ITS-TPC brkt
             t = t0 + 5.0*((Double_t)j);
-            tran = new TGeoTranslation("",ConROutHoles*CosD(t),
-                                          ConROutHoles*SinD(t),
-                                          B0->GetZ(0)+D->GetDz());
-            Bv->AddNode(Dv,++NcopyDv,tran);
+            tran = new TGeoTranslation("",kconROutHoles*CosD(t),
+                                          kconROutHoles*SinD(t),
+                                          sB0->GetZ(0)+sD->GetDz());
+            vB->AddNode(vD,++nCopyvD,tran);
         } // end or j
-        for(j=-ConNPinO6/2;j<=ConNPinO6/2;j++){ // pins per ITS-TPC bracket
+        for(j=-kconNPinO6/2;j<=kconNPinO6/2;j++){ // pins per ITS-TPC bracket
             t = t0 + 3.0*((Double_t)j);
-            tran = new TGeoTranslation("",ConROutHoles*CosD(t),
-                                          ConROutHoles*SinD(t),
-                                          B0->GetZ(0)+D->GetDz());
-            Bv->AddNode(Ev,++NcopyEv,tran);
+            tran = new TGeoTranslation("",kconROutHoles*CosD(t),
+                                          kconROutHoles*SinD(t),
+                                          sB0->GetZ(0)+sD->GetDz());
+            vB->AddNode(vE,++nCopyvE,tran);
         } // end or j
         t0 = (96.5+187.*((Double_t)i));
-        for(j=0;j<ConNRailScrews;j++){ // screws per ITS-rail bracket
+        for(j=0;j<kconNRailScrews;j++){ // screws per ITS-rail bracket
             t = t0+da[j];
-            tran = new TGeoTranslation("",ConROutHoles*CosD(t),
-                                          ConROutHoles*SinD(t),
-                                          B0->GetZ(0)+D->GetDz());
-            Bv->AddNode(Dv,++NcopyDv,tran);
+            tran = new TGeoTranslation("",kconROutHoles*CosD(t),
+                                          kconROutHoles*SinD(t),
+                                          sB0->GetZ(0)+sD->GetDz());
+            vB->AddNode(vD,++nCopyvD,tran);
         } // end or j
         t0 = (91.5+184.*((Double_t)i));
-        for(j=-ConNRailPins/2;j<=ConNRailPins/2;j++)if(j!=0){ 
+        for(j=-kconNRailPins/2;j<=kconNRailPins/2;j++)if(j!=0){ 
              // pins per ITS-rail bracket
             t = t0+(7.0*((Double_t)j));
-            tran = new TGeoTranslation("",ConROutHoles*CosD(t),
-                                          ConROutHoles*SinD(t),
-                                          B0->GetZ(0)+D->GetDz());
-            Bv->AddNode(Ev,++NcopyEv,tran);
+            tran = new TGeoTranslation("",kconROutHoles*CosD(t),
+                                          kconROutHoles*SinD(t),
+                                          sB0->GetZ(0)+sD->GetDz());
+            vB->AddNode(vE,++nCopyvE,tran);
         } // end or j
     } // end for i
-    for(i=0;i<ConNmounts;i++){ 
+    for(i=0;i<kconNmounts;i++){ 
                 // mounting points for SPD-cone+Beam-pipe support
-        t0 = (45.0+((Double_t)i)*360./((Double_t)ConNmounts));
+        t0 = (45.0+((Double_t)i)*360./((Double_t)kconNmounts));
         for(j=-1;j<=1;j++)if(j!=0){ // 2 screws per bracket
-            t = t0+((Double_t)j)*0.5*ConMountPhi0;
-            tran = new TGeoTranslation("",ConROutHoles*CosD(t),
-                                          ConROutHoles*SinD(t),
-                                          B0->GetZ(0)+D->GetDz());
-            Bv->AddNode(Dv,++NcopyDv,tran);
+            t = t0+((Double_t)j)*0.5*kconMountPhi0;
+            tran = new TGeoTranslation("",kconROutHoles*CosD(t),
+                                          kconROutHoles*SinD(t),
+                                          sB0->GetZ(0)+sD->GetDz());
+            vB->AddNode(vD,++nCopyvD,tran);
         } // end for j
         for(j=0;j<1;j++){ // 1 pin per bracket
             t = t0;
-            tran = new TGeoTranslation("",ConROutHoles*CosD(t),
-                                          ConROutHoles*SinD(t),
-                                          B0->GetZ(0)+D->GetDz());
-            Bv->AddNode(Ev,++NcopyEv,tran);
+            tran = new TGeoTranslation("",kconROutHoles*CosD(t),
+                                          kconROutHoles*SinD(t),
+                                          sB0->GetZ(0)+sD->GetDz());
+            vB->AddNode(vE,++nCopyvE,tran);
         } // end for j
     } // end for i
     if(GetDebug()){
-        Av->PrintNodes();
-        Bv->PrintNodes();
-        Cv->PrintNodes();
-        Dv->PrintNodes();
-        Ev->PrintNodes();
-        Fv->PrintNodes();
-        Qv->PrintNodes();
-        Rv->PrintNodes();
-        Sv->PrintNodes();
-        Tv->PrintNodes();
+        vA->PrintNodes();
+        vB->PrintNodes();
+        vC->PrintNodes();
+        vD->PrintNodes();
+        vE->PrintNodes();
+        vF->PrintNodes();
+        vQ->PrintNodes();
+        vR->PrintNodes();
+        vS->PrintNodes();
+        vT->PrintNodes();
     } // end if
 }
 
 //______________________________________________________________________
-void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *Moth){
+void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth){
     // Define the detail ITS cable support trays on both the RB24 and 
     // RB26 sides..
     // Inputs:
@@ -2115,351 +2128,354 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *Moth){
     //  none.
     // Based on the Drawings SSup_201A.jpg unless otherwise stated, 
     // Volumes A..., 
-    TGeoMedium *SUPcf    = 0; // SUP support cone Carbon Fiber materal number.
-    TGeoMedium *SUPfs    = 0; // SUP support cone inserto stesalite 4411w.
-    TGeoMedium *SUPfo    = 0; // SUP support cone foam, Rohacell 50A.
-    TGeoMedium *SUPss    = 0; // SUP support cone screw material,Stainless
-    TGeoMedium *SUPair   = 0; // SUP support cone Air
-    TGeoMedium *SUPal    = 0; // SUP support cone SDD mounting bracket Al
-    TGeoMedium *SUPwater = 0; // SUP support cone Water
+    TGeoMedium *medSUPcf    = 0; // SUP support cone Carbon Fiber materal nbr.
+    TGeoMedium *medSUPfs    = 0; // SUP support cone inserto stesalite 4411w.
+    TGeoMedium *medSUPfo    = 0; // SUP support cone foam, Rohacell 50A.
+    TGeoMedium *medSUPss    = 0; // SUP support cone screw material,Stainless
+    TGeoMedium *medSUPair   = 0; // SUP support cone Air
+    TGeoMedium *medSUPal    = 0; // SUP support cone SDD mounting bracket Al
+    TGeoMedium *medSUPwater = 0; // SUP support cone Water
     TGeoManager *mgr = gGeoManager;
-    SUPcf    = mgr->GetMedium("ITSssdCarbonFiber");
-    SUPfs    = mgr->GetMedium("ITSssdStaselite4411w");
-    SUPfo    = mgr->GetMedium("ITSssdRohacell50A");
-    SUPss    = mgr->GetMedium("ITSssdStainlessSteal");
-    SUPair   = mgr->GetMedium("ITSssdAir");
-    SUPal    = mgr->GetMedium("ITSssdAl");
-    SUPwater = mgr->GetMedium("ITSssdWater");
+    medSUPcf    = mgr->GetMedium("ITSssdCarbonFiber");
+    medSUPfs    = mgr->GetMedium("ITSssdStaselite4411w");
+    medSUPfo    = mgr->GetMedium("ITSssdRohacell50A");
+    medSUPss    = mgr->GetMedium("ITSssdStainlessSteal");
+    medSUPair   = mgr->GetMedium("ITSssdAir");
+    medSUPal    = mgr->GetMedium("ITSssdAl");
+    medSUPwater = mgr->GetMedium("ITSssdWater");
     //
     Int_t i,j;
     Double_t x,y,z,t,t0,dt,di,r;
-
     // RB 24 side
-    const Double_t Z024         = 900*kmm;//SSup_203A.jpg
-    const Double_t ThssFrame24  = 5.0*kmm;
-    const Double_t RssFrame24   = 444.5*kmm-ThssFrame24; // SSup_204A.jpg
-    const Double_t WidthFrame24 = 10.0*kmm;
-    const Double_t HightFrame24 = 10.0*kmm;
-    const Double_t Phi0Frame24  = 15.2*kDegree; // SSup_602A.jpg
-    const Double_t Phi1Frame24  = (90.0-7.6)*kDegree; // SSup_802A.jpg
-    const Double_t ZssFrameSection24 = (415.0-10.0)*kmm;
-    const Int_t    NZsections24      = 4;
-    const Int_t    NPhiSections24    = 4;
-    const Int_t    NFramesPhi24      = 4;
-    //
-    TGeoTubeSeg *M24 = new TGeoTubeSeg("ITS sup Cable tray support frame "
-                                       "mother volume M24",
-                                       RssFrame24,RssFrame24+ThssFrame24,
-                                   0.5*(4.*ZssFrameSection24+5*WidthFrame24),
-                                       Phi0Frame24,Phi1Frame24);
-    TGeoTubeSeg *A24 = new TGeoTubeSeg("ITS sup Cable tray support frame "
-                                       "radial section A24",
-                          RssFrame24,RssFrame24+ThssFrame24,0.5*WidthFrame24,
-                                       Phi0Frame24,Phi1Frame24);
-    TGeoBBox *B24 = new TGeoBBox("ITS sup Cable tray support frame Z section "
-                                 "B24",
-                    0.5*ThssFrame24,0.5*HightFrame24,0.5*ZssFrameSection24);
-    PrintTubeSeg(A24);
-    PrintTubeSeg(M24);
-    PrintBBox(B24);
-    TGeoVolume *A24v,*B24v,*M24v;
+    const Double_t kfrm24Z0           = 900*fgkmm;//SSup_203A.jpg
+    const Double_t kfrm24Thss         = 5.0*fgkmm;
+    const Double_t kfrm24Rss          = 444.5*fgkmm-kfrm24Thss; //SSup_204A.jpg
+    const Double_t kfrm24Width        = 10.0*fgkmm;
+    const Double_t kfrm24Hight        = 10.0*fgkmm;
+    const Double_t kfrm24Phi0         = 15.2*fgkDegree; // SSup_602A.jpg
+    const Double_t kfrm24Phi1         = (90.0-7.6)*fgkDegree; // SSup_802A.jpg
+    const Double_t kfrm24ZssSection   = (415.0-10.0)*fgkmm;
+    const Int_t    kfrm24NZsections   = 4;
+    const Int_t    kfrm24NPhiSections = 4;
+    const Int_t    kfrm24NPhi         = 4;
+    //
+    TGeoTubeSeg *sM24,*sA24;
+    TGeoBBox *sB24;
+    sM24 = new TGeoTubeSeg("ITS sup Cable tray support frame mother volume "
+                           "M24",kfrm24Rss,kfrm24Rss+kfrm24Thss,
+                           0.5*(4.*kfrm24ZssSection+5*kfrm24Width),
+                           kfrm24Phi0,kfrm24Phi1);
+    sA24 = new TGeoTubeSeg("ITS sup Cable tray support frame radial section "
+                           "A24",kfrm24Rss,kfrm24Rss+kfrm24Thss,
+                           0.5*kfrm24Width,kfrm24Phi0,kfrm24Phi1);
+    sB24 = new TGeoBBox("ITS sup Cable tray support frame Z section B24",
+                        0.5*kfrm24Thss,0.5*kfrm24Hight,0.5*kfrm24ZssSection);
+    PrintTubeSeg(sA24);
+    PrintTubeSeg(sM24);
+    PrintBBox(sB24);
+    TGeoVolume *vA24,*vB24,*vM24;
     TGeoTranslation *tran;
     TGeoRotation    *rot;
     TGeoCombiTrans  *tranrot;
     //
-    A24v = new TGeoVolume("ITSsupFrameA24",A24,SUPss);
-    A24v->SetVisibility(kTRUE);
-    A24v->SetLineColor(1); // black
-    A24v->SetLineWidth(1);
-    A24v->SetFillColor(A24v->GetLineColor());
-    A24v->SetFillStyle(4000); // 0% transparent
-    B24v = new TGeoVolume("ITSsupFrameB24",B24,SUPss);
-    B24v->SetVisibility(kTRUE);
-    B24v->SetLineColor(1); // black
-    B24v->SetLineWidth(1);
-    B24v->SetFillColor(B24v->GetLineColor());
-    B24v->SetFillStyle(4000); // 0% transparent
-    M24v = new TGeoVolume("ITSsupFrameM24",M24,SUPair);
-    M24v->SetVisibility(kTRUE);
-    M24v->SetLineColor(7); // light blue
-    M24v->SetLineWidth(1);
-    M24v->SetFillColor(M24v->GetLineColor());
-    M24v->SetFillStyle(4090); // 90% transparent
-    //
-    Int_t NcA24=1,NcB24=1;
-    t0 = Phi0Frame24;
-    dt = (Phi1Frame24-Phi0Frame24)/((Double_t)NPhiSections24);
-    for(i=0;i<=NZsections24;i++){
+    vA24 = new TGeoVolume("ITSsupFrameA24",sA24,medSUPss);
+    vA24->SetVisibility(kTRUE);
+    vA24->SetLineColor(1); // black
+    vA24->SetLineWidth(1);
+    vA24->SetFillColor(vA24->GetLineColor());
+    vA24->SetFillStyle(4000); // 0% transparent
+    vB24 = new TGeoVolume("ITSsupFrameB24",sB24,medSUPss);
+    vB24->SetVisibility(kTRUE);
+    vB24->SetLineColor(1); // black
+    vB24->SetLineWidth(1);
+    vB24->SetFillColor(vB24->GetLineColor());
+    vB24->SetFillStyle(4000); // 0% transparent
+    vM24 = new TGeoVolume("ITSsupFrameM24",sM24,medSUPair);
+    vM24->SetVisibility(kTRUE);
+    vM24->SetLineColor(7); // light blue
+    vM24->SetLineWidth(1);
+    vM24->SetFillColor(vM24->GetLineColor());
+    vM24->SetFillStyle(4090); // 90% transparent
+    //
+    Int_t ncopyA24=1,ncopyB24=1;
+    t0 = kfrm24Phi0;
+    dt = (kfrm24Phi1-kfrm24Phi0)/((Double_t)kfrm24NPhiSections);
+    for(i=0;i<=kfrm24NZsections;i++){
         di = (Double_t) i;
-        z = -M24->GetDz()+A24->GetDz() + di*(ZssFrameSection24+WidthFrame24);
+        z = -sM24->GetDz()+sA24->GetDz() + di*(kfrm24ZssSection+kfrm24Width);
         tran = new TGeoTranslation("",0.0,0.0,z);
-        M24v->AddNode(A24v,NcA24++,tran);
-        r = RssFrame24+B24->GetDX();
-        z = z + A24->GetDz()+B24->GetDZ();
-       if(i<NZsections24) for(j=0;j<=NPhiSections24;j++){
+        vM24->AddNode(vA24,ncopyA24++,tran);
+        r = kfrm24Rss+sB24->GetDX();
+        z = z + sA24->GetDz()+sB24->GetDZ();
+       if(i<kfrm24NZsections) for(j=0;j<=kfrm24NPhiSections;j++){
             t = t0 + ((Double_t)j)*dt;
             rot = new TGeoRotation("",0.0,0.0,t);
             y = r*SinD(t);
             x = r*CosD(t);
             tranrot = new TGeoCombiTrans("",x,y,z,rot);
             delete rot;// rot not explicity used in AddNode functions.
-            M24v->AddNode(B24v,NcB24++,tranrot);
+            vM24->AddNode(vB24,ncopyB24++,tranrot);
         } // end for j
     } // end for i
-    tran = new TGeoTranslation("",0.0,0.0,Z024+M24->GetDz());
-    Moth->AddNode(M24v,1,tran);
-    for(i=1;i<NFramesPhi24;i++){
+    tran = new TGeoTranslation("",0.0,0.0,kfrm24Z0+sM24->GetDz());
+    moth->AddNode(vM24,1,tran);
+    for(i=1;i<kfrm24NPhi;i++){
         di = (Double_t) i;
         rot = new TGeoRotation("",0.0,0.0,90.0*di);
-        tranrot = new TGeoCombiTrans("",0.0,0.0,Z024+M24->GetDz(),rot);
+        tranrot = new TGeoCombiTrans("",0.0,0.0,kfrm24Z0+sM24->GetDz(),rot);
         delete rot;// rot not explicity used in AddNode functions.
-        Moth->AddNode(M24v,i+1,tranrot);
+        moth->AddNode(vM24,i+1,tranrot);
     } // end for i
     if(GetDebug()){
-        A24v->PrintNodes();
-        B24v->PrintNodes();
-        M24v->PrintNodes();
+        vA24->PrintNodes();
+        vB24->PrintNodes();
+        vM24->PrintNodes();
     } // end if
     // Cable support tray 
     // Material is Aluminum
-    //const Double_t RS24in     = TMath::Max(RssFrame24,444.5*kmm);
+    //const Double_t kcsb24RSin       = TMath::Max(kfrm24Rss,444.5*fgkmm);
                                            // SSup_204A & SSup_206A
-    //const Double_t RS24Airout = 459.5*kmm; // SSup_204A & SSup_206A
-    //const Double_t RS24out    = 494.5*kmm; // SSup_206A & SSup_204A
-    //const Double_t RS24PPout  = 550.0*kmm; // SSup_206A
-    const Double_t LS24PP     = 350.0*kmm; // SSup_202A
-    const Double_t LS24       = (2693.0-900.0)*kmm; //SSup_205A & SSup_207A
-    const Double_t ThS24wall  = 1.0*kmm; // SSup_209A & SSup_210A
-    const Double_t WbS24      = 42.0*kmm; // SSup_209A & SSup_210A
-    //const Double_t WtS24      = 46.9*kmm; // SSup_209A & SSup_210A
-    const Double_t WcapS24    = 50.0*kmm; // SSup_209A & SSup_210A
-    //const Double_t WdS24      = 41.0*kmm; //SSup_209A ? should be 41.46938776
-    const Double_t HS24       = 50.0*kmm; // SSup_209A & SSup_210A
-    const Double_t OutDcoolTub= 12.0*kmm; // SSup_209A
-    const Double_t InDcoolTub = 10.0*kmm; // SSup_209A
-    const Double_t BlkNozInDS24= 6.0*kmm; // SSup_209A
+    //const Double_t kcb24RSAirout   = 459.5*fgkmm; // SSup_204A & SSup_206A
+    //const Double_t kcb24RSout      = 494.5*fgkmm; // SSup_206A & SSup_204A
+    //const Double_t kcb24RSPPout    = 550.0*fgkmm; // SSup_206A
+    const Double_t kcb24LSPP       = 350.0*fgkmm; // SSup_202A
+    const Double_t kcb24LS         = (2693.0-900.0)*fgkmm;//SSup_205A&SSup_207A
+    const Double_t kcb24ThSwall    = 1.0*fgkmm; // SSup_209A & SSup_210A
+    const Double_t kcb24WbS        = 42.0*fgkmm; // SSup_209A & SSup_210A
+    //const Double_t kcb24WtS        = 46.9*fgkmm; // SSup_209A & SSup_210A
+    const Double_t kcb24WcapS      = 50.0*fgkmm; // SSup_209A & SSup_210A
+    //const Double_t kcb24WdS   = 41.0*fgkmm; //SSup_209A ? should be 41.469387
+    const Double_t kcb24HS         = 50.0*fgkmm; // SSup_209A & SSup_210A
+    const Double_t kcb24OutDcoolTub= 12.0*fgkmm; // SSup_209A
+    const Double_t kcb24InDcoolTub = 10.0*fgkmm; // SSup_209A
+    const Double_t kcbBlkNozInDS   = 6.0*fgkmm; // SSup_209A
     // The following are deduced or guessed at
-    //const Double_t LtopLipS24 = 6.0*kmm; // Guessed at.
-    //const Double_t LdLipS24   = 6.0*kmm; // Guessed at.
-    //const Double_t HdS24      = OutDcoolTub; //
-    const Double_t BlkNozZS24 = 6.0*kmm; // Guessed at.
+    //const Double_t kcb24LtopLipS   = 6.0*fgkmm; // Guessed at.
+    //const Double_t kcb24LdLipS     = 6.0*fgkmm; // Guessed at.
+    //const Double_t kcb24HdS        = kcb24OutDcoolTub; //
+    const Double_t kcb24BlkNozZS   = 6.0*fgkmm; // Guessed at.
     // Simplifided exterior shape. The side wall size is 2.5*thicker than
     // it should be (due to simplification).
-    TGeoArb8 *C24 = new TGeoArb8("ITS Sup Cable Tray Element C24",0.5*LS24);
-    C24->SetVertex(0,-0.5*WcapS24,HS24+ThS24wall);
-    C24->SetVertex(1,+0.5*WcapS24,HS24+ThS24wall);
-    C24->SetVertex(2,+0.5*WbS24,0.0);
-    C24->SetVertex(3,-0.5*WbS24,0.0);
-    C24->SetVertex(4,-0.5*WcapS24,HS24+ThS24wall);
-    C24->SetVertex(5,+0.5*WcapS24,HS24+ThS24wall);
-    C24->SetVertex(6,+0.5*WbS24,0.0);
-    C24->SetVertex(7,-0.5*WbS24,0.0);
-    TGeoArb8 *D24 = new TGeoArb8("ITS Sup Cable Tray lower Element D24",
-                                 0.5*LS24);
+    TGeoArb8 *sC24,*sD24,*sF24,*sH24;
+    TGeoTube *sE24,*sG24;
+    //
+    sC24 = new TGeoArb8("ITS Sup Cable Tray Element C24",0.5*kcb24LS);
+    sC24->SetVertex(0,-0.5*kcb24WcapS,kcb24HS+kcb24ThSwall);
+    sC24->SetVertex(1,+0.5*kcb24WcapS,kcb24HS+kcb24ThSwall);
+    sC24->SetVertex(2,+0.5*kcb24WbS,0.0);
+    sC24->SetVertex(3,-0.5*kcb24WbS,0.0);
+    sC24->SetVertex(4,-0.5*kcb24WcapS,kcb24HS+kcb24ThSwall);
+    sC24->SetVertex(5,+0.5*kcb24WcapS,kcb24HS+kcb24ThSwall);
+    sC24->SetVertex(6,+0.5*kcb24WbS,0.0);
+    sC24->SetVertex(7,-0.5*kcb24WbS,0.0);
+    sD24 = new TGeoArb8("ITS Sup Cable Tray lower Element D24",0.5*kcb24LS);
     // Because of question about the value of WdS24, compute what it
     // should be assuming cooling tube fixes hight of volume.
-    x = OutDcoolTub*(0.5*WcapS24-0.5*WbS24-ThS24wall)/(HS24-ThS24wall);
-    D24->SetVertex(0,-x,OutDcoolTub+ThS24wall);
-    D24->SetVertex(1,+x,OutDcoolTub+ThS24wall);
-    D24->SetVertex(2,+0.5*WbS24-ThS24wall,ThS24wall);
-    D24->SetVertex(3,-0.5*WbS24+ThS24wall,ThS24wall);
-    D24->SetVertex(4,-x,OutDcoolTub+ThS24wall);
-    D24->SetVertex(5,+x,OutDcoolTub+ThS24wall);
-    D24->SetVertex(6,+0.5*WbS24-ThS24wall,ThS24wall);
-    D24->SetVertex(7,-0.5*WbS24+ThS24wall,ThS24wall);
-    TGeoTube *E24 = new TGeoTube("ITS Sup Cooling Tube E24",0.5*InDcoolTub,
-                                 0.5*OutDcoolTub,0.5*LS24-BlkNozZS24);
-    TGeoArb8 *F24 = new TGeoArb8("ITS Sup Cable Tray lower Element block F24",
-                                 0.5*BlkNozZS24);
-    for(i=0;i<8;i++) F24->SetVertex(i,D24->GetVertices()[i*2+0],
-                                      D24->GetVertices()[i*2+1]); //
-    TGeoTube *G24 = new TGeoTube("ITS Sup Cooling Tube hole in block G24",
-                                 0.0,0.5*BlkNozInDS24,0.5*BlkNozZS24);
-    TGeoArb8 *H24 = new TGeoArb8("ITS Sup Cable Tray upper Element H24",
-                                 0.5*(LS24- LS24PP));
-    H24->SetVertex(0,C24->GetVertices()[0*2+0]+2.*ThS24wall,
-                     C24->GetVertices()[0*2+1]-ThS24wall);
-    H24->SetVertex(1,C24->GetVertices()[1*2+0]-2.*ThS24wall,
-                     C24->GetVertices()[1*2+1]-ThS24wall);
-    H24->SetVertex(2,D24->GetVertices()[1*2+0]-ThS24wall,
-                     D24->GetVertices()[1*2+1]+ThS24wall);
-    H24->SetVertex(3,D24->GetVertices()[0*2+0]+ThS24wall,
-                     D24->GetVertices()[0*2+1]+ThS24wall);
-    for(i=4;i<8;i++) H24->SetVertex(i,H24->GetVertices()[(i-4)*2+0],
-                                      H24->GetVertices()[(i-4)*2+1]); //
-    PrintArb8(C24);
-    PrintArb8(D24);
-    PrintTube(E24);
-    PrintArb8(F24);
-    PrintTube(G24);
-    PrintArb8(H24);
-    TGeoVolume *C24v,*D24v,*E24v,*F24v,*Ga24v,*Gw24v,*H24v;
-    //
-    C24v = new TGeoVolume("ITSsupCableTrayC24",C24,SUPal);
-    C24v->SetVisibility(kTRUE);
-    C24v->SetLineColor(6); //
-    C24v->SetLineWidth(1);
-    C24v->SetFillColor(C24v->GetLineColor());
-    C24v->SetFillStyle(4000); // 0% transparent
-    D24v = new TGeoVolume("ITSsupCableTrayLowerD24",D24,SUPair);
-    D24v->SetVisibility(kTRUE);
-    D24v->SetLineColor(6); //
-    D24v->SetLineWidth(1);
-    D24v->SetFillColor(D24v->GetLineColor());
-    D24v->SetFillStyle(4000); // 0% transparent
-    E24v = new TGeoVolume("ITSsupCableTrayCoolTubeE24",E24,SUPss);
-    E24v->SetVisibility(kTRUE);
-    E24v->SetLineColor(6); //
-    E24v->SetLineWidth(1);
-    E24v->SetFillColor(E24v->GetLineColor());
-    E24v->SetFillStyle(4000); // 0% transparent
-    F24v = new TGeoVolume("ITSsupCableTrayBlockF24",F24,SUPal);
-    F24v->SetVisibility(kTRUE);
-    F24v->SetLineColor(6); //
-    F24v->SetLineWidth(1);
-    F24v->SetFillColor(F24v->GetLineColor());
-    F24v->SetFillStyle(4000); // 0% transparent
-    Gw24v = new TGeoVolume("ITSsupCableTrayCoolantWaterG24",G24,SUPwater);
-    Gw24v->SetVisibility(kTRUE);
-    Gw24v->SetLineColor(6); //
-    Gw24v->SetLineWidth(1);
-    Gw24v->SetFillColor(Gw24v->GetLineColor());
-    Gw24v->SetFillStyle(4000); // 0% transparent
-    Ga24v = new TGeoVolume("ITSsupCableTrayCoolantAirG24",G24,SUPair);
-    Ga24v->SetVisibility(kTRUE);
-    Ga24v->SetLineColor(6); //
-    Ga24v->SetLineWidth(1);
-    Ga24v->SetFillColor(Ga24v->GetLineColor());
-    Ga24v->SetFillStyle(4000); // 0% transparent
-    H24v = new TGeoVolume("ITSsupCableTrayUpperC24",H24,SUPair);
-    H24v->SetVisibility(kTRUE);
-    H24v->SetLineColor(6); //
-    H24v->SetLineWidth(1);
-    H24v->SetFillColor(H24v->GetLineColor());
-    H24v->SetFillStyle(4000); // 0% transparent
-    //
-    tran = new TGeoTranslation("",-OutDcoolTub,OutDcoolTub+ThS24wall,0.0);
-    F24v->AddNode(Gw24v,1,tran);
-    D24v->AddNode(E24v,1,tran);
-    tran = new TGeoTranslation("",0.0,OutDcoolTub+ThS24wall,0.0);
-    F24v->AddNode(Gw24v,2,tran);
-    D24v->AddNode(E24v,2,tran);
-    tran = new TGeoTranslation("",+OutDcoolTub,OutDcoolTub+ThS24wall,0.0);
-    F24v->AddNode(Gw24v,3,tran);
-    D24v->AddNode(E24v,3,tran);
-    tran = new TGeoTranslation("",0.0,0.0,0.5*LS24-0.5*BlkNozZS24);
-    D24v->AddNode(F24v,1,tran);
-    tran = new TGeoTranslation("",0.0,0.0,-(0.5*LS24-0.5*BlkNozZS24));
-    D24v->AddNode(F24v,2,tran);
-    C24v->AddNode(D24v,1,0);
-    C24v->AddNode(H24v,1,0);
+    x = kcb24OutDcoolTub*(0.5*kcb24WcapS-0.5*kcb24WbS-kcb24ThSwall)/
+                                              (kcb24HS-kcb24ThSwall);
+    sD24->SetVertex(0,-x,kcb24OutDcoolTub+kcb24ThSwall);
+    sD24->SetVertex(1,+x,kcb24OutDcoolTub+kcb24ThSwall);
+    sD24->SetVertex(2,+0.5*kcb24WbS-kcb24ThSwall,kcb24ThSwall);
+    sD24->SetVertex(3,-0.5*kcb24WbS+kcb24ThSwall,kcb24ThSwall);
+    sD24->SetVertex(4,-x,kcb24OutDcoolTub+kcb24ThSwall);
+    sD24->SetVertex(5,+x,kcb24OutDcoolTub+kcb24ThSwall);
+    sD24->SetVertex(6,+0.5*kcb24WbS-kcb24ThSwall,kcb24ThSwall);
+    sD24->SetVertex(7,-0.5*kcb24WbS+kcb24ThSwall,kcb24ThSwall);
+    sE24 = new TGeoTube("ITS Sup Cooling Tube E24",0.5*kcb24InDcoolTub,
+                        0.5*kcb24OutDcoolTub,0.5*kcb24LS-kcb24BlkNozZS);
+    sF24 = new TGeoArb8("ITS Sup Cable Tray lower Element block F24",
+                        0.5*kcb24BlkNozZS);
+    for(i=0;i<8;i++) sF24->SetVertex(i,sD24->GetVertices()[i*2+0],
+                                      sD24->GetVertices()[i*2+1]); //
+    sG24 = new TGeoTube("ITS Sup Cooling Tube hole in block G24",
+                        0.0,0.5*kcbBlkNozInDS,0.5*kcb24BlkNozZS);
+    sH24 = new TGeoArb8("ITS Sup Cable Tray upper Element H24",
+                        0.5*(kcb24LS- kcb24LSPP));
+    sH24->SetVertex(0,sC24->GetVertices()[0*2+0]+2.*kcb24ThSwall,
+                     sC24->GetVertices()[0*2+1]-kcb24ThSwall);
+    sH24->SetVertex(1,sC24->GetVertices()[1*2+0]-2.*kcb24ThSwall,
+                     sC24->GetVertices()[1*2+1]-kcb24ThSwall);
+    sH24->SetVertex(2,sD24->GetVertices()[1*2+0]-kcb24ThSwall,
+                     sD24->GetVertices()[1*2+1]+kcb24ThSwall);
+    sH24->SetVertex(3,sD24->GetVertices()[0*2+0]+kcb24ThSwall,
+                     sD24->GetVertices()[0*2+1]+kcb24ThSwall);
+    for(i=4;i<8;i++) sH24->SetVertex(i,sH24->GetVertices()[(i-4)*2+0],
+                                      sH24->GetVertices()[(i-4)*2+1]); //
+    PrintArb8(sC24);
+    PrintArb8(sD24);
+    PrintTube(sE24);
+    PrintArb8(sF24);
+    PrintTube(sG24);
+    PrintArb8(sH24);
+    TGeoVolume *vC24,*vD24,*vE24,*vF24,*vGa24,*vGw24,*vH24;
+    //
+    vC24 = new TGeoVolume("ITSsupCableTrayC24",sC24,medSUPal);
+    vC24->SetVisibility(kTRUE);
+    vC24->SetLineColor(6); //
+    vC24->SetLineWidth(1);
+    vC24->SetFillColor(vC24->GetLineColor());
+    vC24->SetFillStyle(4000); // 0% transparent
+    vD24 = new TGeoVolume("ITSsupCableTrayLowerD24",sD24,medSUPair);
+    vD24->SetVisibility(kTRUE);
+    vD24->SetLineColor(6); //
+    vD24->SetLineWidth(1);
+    vD24->SetFillColor(vD24->GetLineColor());
+    vD24->SetFillStyle(4000); // 0% transparent
+    vE24 = new TGeoVolume("ITSsupCableTrayCoolTubeE24",sE24,medSUPss);
+    vE24->SetVisibility(kTRUE);
+    vE24->SetLineColor(6); //
+    vE24->SetLineWidth(1);
+    vE24->SetFillColor(vE24->GetLineColor());
+    vE24->SetFillStyle(4000); // 0% transparent
+    vF24 = new TGeoVolume("ITSsupCableTrayBlockF24",sF24,medSUPal);
+    vF24->SetVisibility(kTRUE);
+    vF24->SetLineColor(6); //
+    vF24->SetLineWidth(1);
+    vF24->SetFillColor(vF24->GetLineColor());
+    vF24->SetFillStyle(4000); // 0% transparent
+    vGw24 = new TGeoVolume("ITSsupCableTrayCoolantWaterG24",sG24,medSUPwater);
+    vGw24->SetVisibility(kTRUE);
+    vGw24->SetLineColor(6); //
+    vGw24->SetLineWidth(1);
+    vGw24->SetFillColor(vGw24->GetLineColor());
+    vGw24->SetFillStyle(4000); // 0% transparent
+    vGa24 = new TGeoVolume("ITSsupCableTrayCoolantAirG24",sG24,medSUPair);
+    vGa24->SetVisibility(kTRUE);
+    vGa24->SetLineColor(6); //
+    vGa24->SetLineWidth(1);
+    vGa24->SetFillColor(vGa24->GetLineColor());
+    vGa24->SetFillStyle(4000); // 0% transparent
+    vH24 = new TGeoVolume("ITSsupCableTrayUpperC24",sH24,medSUPair);
+    vH24->SetVisibility(kTRUE);
+    vH24->SetLineColor(6); //
+    vH24->SetLineWidth(1);
+    vH24->SetFillColor(vH24->GetLineColor());
+    vH24->SetFillStyle(4000); // 0% transparent
+    //
+    tran = new TGeoTranslation("",-kcb24OutDcoolTub,
+                               kcb24OutDcoolTub+kcb24ThSwall,0.0);
+    vF24->AddNode(vGw24,1,tran);
+    vD24->AddNode(vE24,1,tran);
+    tran = new TGeoTranslation("",0.0,kcb24OutDcoolTub+kcb24ThSwall,0.0);
+    vF24->AddNode(vGw24,2,tran);
+    vD24->AddNode(vE24,2,tran);
+    tran = new TGeoTranslation("",+kcb24OutDcoolTub,
+                               kcb24OutDcoolTub+kcb24ThSwall,0.0);
+    vF24->AddNode(vGw24,3,tran);
+    vD24->AddNode(vE24,3,tran);
+    tran = new TGeoTranslation("",0.0,0.0,0.5*kcb24LS-0.5*kcb24BlkNozZS);
+    vD24->AddNode(vF24,1,tran);
+    tran = new TGeoTranslation("",0.0,0.0,-(0.5*kcb24LS-0.5*kcb24BlkNozZS));
+    vD24->AddNode(vF24,2,tran);
+    vC24->AddNode(vD24,1,0);
+    vC24->AddNode(vH24,1,0);
     //==================================================================
     //
     // RB 26 side
-    const Double_t Z026         = -900*kmm;//SSup_203A.jpg
-    const Double_t ThssFrame26  = 5.0*kmm;
-    const Double_t R0ssFrame26  = 444.5*kmm-ThssFrame26; // SSup_204A.jpg
-    const Double_t R1ssFrame26  = 601.6*kmm-ThssFrame26; // SSup_208A.jpg
-    const Double_t WidthFrame26 = 10.0*kmm;
-    //const Double_t HightFrame26 = 10.0*kmm;
-    const Double_t Phi0Frame26  = 15.2*kDegree; // SSup_602A.jpg
-    const Double_t Phi1Frame26  = (90.0-7.6)*kDegree; // SSup_802A.jpg
-    const Double_t ZssFrameSection26 = (415.0-10.0)*kmm;
-    const Int_t    NZsections26      = 4;
-    const Int_t    NPhiSections26    = 4;
-    const Int_t    NFramesPhi26      = 4;
-    TGeoConeSeg *A26[NZsections26+1],*M26; // Cylinderial support structure
-    TGeoArb8     *B26; // Cylinderial support structure
+    const Double_t kfrm26Z0           = -900*fgkmm;//SSup_203A.jpg
+    const Double_t kfrm26Thss         = 5.0*fgkmm;
+    const Double_t kfrm26R0ss         = 444.5*fgkmm-kfrm26Thss; //SSup_204A.jpg
+    const Double_t kfrm26R1ss         = 601.6*fgkmm-kfrm26Thss; //SSup_208A.jpg
+    const Double_t kfrm26Width        = 10.0*fgkmm;
+    //const Double_t kfrm26Hight       = 10.0*fgkmm;
+    const Double_t kfrm26Phi0         = 15.2*fgkDegree; // SSup_602A.jpg
+    const Double_t kfrm26Phi1         = (90.0-7.6)*fgkDegree; // SSup_802A.jpg
+    const Double_t kfrm26ZssSection   = (415.0-10.0)*fgkmm;
+    const Int_t    kfrm26NZsections   = 4;
+    const Int_t    kfrm26NPhiSections = 4;
+    const Int_t    kfrm26NPhi         = 4;
+    TGeoConeSeg *sA26[kfrm26NZsections+1],*sM26;//Cylinderial support structure
+    TGeoArb8     *sB26; // Cylinderial support structure
     Char_t name[100];
     Double_t r1,r2,m;
 
-    M26 = new TGeoConeSeg("ITS sup Cable tray support frame mother volume "
-                          "M26",0.5*(4.*ZssFrameSection26+5*WidthFrame26),
-                          R1ssFrame26,R1ssFrame26+ThssFrame26,
-                          R0ssFrame26,R0ssFrame26+ThssFrame26,
-                          Phi0Frame26,Phi1Frame26);
-    m = -((R1ssFrame26-R0ssFrame26)/
-         (((Double_t)NZsections26)*(ZssFrameSection26+WidthFrame26)));
-    for(i=0;i<NZsections26+1;i++){
-        di = ((Double_t) i)*(ZssFrameSection26+WidthFrame26);
+    sM26 = new TGeoConeSeg("ITS sup Cable tray support frame mother volume "
+                          "M26",0.5*(4.*kfrm26ZssSection+5*kfrm26Width),
+                          kfrm26R1ss,kfrm26R1ss+kfrm26Thss,
+                          kfrm26R0ss,kfrm26R0ss+kfrm26Thss,
+                          kfrm26Phi0,kfrm26Phi1);
+    m = -((kfrm26R1ss-kfrm26R0ss)/
+         (((Double_t)kfrm26NZsections)*(kfrm26ZssSection+kfrm26Width)));
+    for(i=0;i<kfrm26NZsections+1;i++){
+        di = ((Double_t) i)*(kfrm26ZssSection+kfrm26Width);
         sprintf(name,
                 "ITS sup Cable tray support frame radial section A26[%d]",i);
-        r1 = R1ssFrame26+m*di;
-        r2 = R1ssFrame26+m*(di+WidthFrame26);
-        A26[i] = new TGeoConeSeg(name,0.5*WidthFrame26,r2,r2+ThssFrame26,
-                                 r1,r1+ThssFrame26,Phi0Frame26,Phi1Frame26);
+        r1 = kfrm26R1ss+m*di;
+        r2 = kfrm26R1ss+m*(di+kfrm26Width);
+        sA26[i] = new TGeoConeSeg(name,0.5*kfrm26Width,r2,r2+kfrm26Thss,
+                                 r1,r1+kfrm26Thss,kfrm26Phi0,kfrm26Phi1);
     } // end for i
-    B26 = new TGeoArb8("ITS sup Cable tray support frame Z section B26",
-                       0.5*ZssFrameSection26);
-    r = 0.25*(A26[0]->GetRmax1()+A26[0]->GetRmin1()+
-              A26[1]->GetRmax2()+A26[1]->GetRmin2());
-    B26->SetVertex(0,A26[0]->GetRmax2()-r,+0.5*WidthFrame26);
-    B26->SetVertex(1,A26[0]->GetRmax2()-r,-0.5*WidthFrame26);
-    B26->SetVertex(2,A26[0]->GetRmin2()-r,-0.5*WidthFrame26);
-    B26->SetVertex(3,A26[0]->GetRmin2()-r,+0.5*WidthFrame26);
-    B26->SetVertex(4,A26[1]->GetRmax1()-r,+0.5*WidthFrame26);
-    B26->SetVertex(5,A26[1]->GetRmax1()-r,-0.5*WidthFrame26);
-    B26->SetVertex(6,A26[1]->GetRmin1()-r,-0.5*WidthFrame26);
-    B26->SetVertex(7,A26[1]->GetRmin1()-r,+0.5*WidthFrame26);
-    for(i=0;i<NZsections26+1;i++) PrintConeSeg(A26[i]);
-    PrintConeSeg(M26);
-    PrintArb8(B26);
-    TGeoVolume *A26v[NZsections26+1],*B26v,*M26v;
-    //
-    for(i=0;i<NZsections26+1;i++){
+    sB26 = new TGeoArb8("ITS sup Cable tray support frame Z section B26",
+                       0.5*kfrm26ZssSection);
+    r = 0.25*(sA26[0]->GetRmax1()+sA26[0]->GetRmin1()+
+              sA26[1]->GetRmax2()+sA26[1]->GetRmin2());
+    sB26->SetVertex(0,sA26[0]->GetRmax2()-r,+0.5*kfrm26Width);
+    sB26->SetVertex(1,sA26[0]->GetRmax2()-r,-0.5*kfrm26Width);
+    sB26->SetVertex(2,sA26[0]->GetRmin2()-r,-0.5*kfrm26Width);
+    sB26->SetVertex(3,sA26[0]->GetRmin2()-r,+0.5*kfrm26Width);
+    sB26->SetVertex(4,sA26[1]->GetRmax1()-r,+0.5*kfrm26Width);
+    sB26->SetVertex(5,sA26[1]->GetRmax1()-r,-0.5*kfrm26Width);
+    sB26->SetVertex(6,sA26[1]->GetRmin1()-r,-0.5*kfrm26Width);
+    sB26->SetVertex(7,sA26[1]->GetRmin1()-r,+0.5*kfrm26Width);
+    for(i=0;i<kfrm26NZsections+1;i++) PrintConeSeg(sA26[i]);
+    PrintConeSeg(sM26);
+    PrintArb8(sB26);
+    TGeoVolume *vA26[kfrm26NZsections+1],*vB26,*vM26;
+    //
+    for(i=0;i<kfrm26NZsections+1;i++){
         sprintf(name,"ITSsupFrameA26[%d]",i);
-        A26v[i] = new TGeoVolume(name,A26[i],SUPss);
-        A26v[i]->SetVisibility(kTRUE);
-        A26v[i]->SetLineColor(1); // black
-        A26v[i]->SetLineWidth(1);
-        A26v[i]->SetFillColor(A26v[i]->GetLineColor());
-        A26v[i]->SetFillStyle(4000); // 0% transparent
+        vA26[i] = new TGeoVolume(name,sA26[i],medSUPss);
+        vA26[i]->SetVisibility(kTRUE);
+        vA26[i]->SetLineColor(1); // black
+        vA26[i]->SetLineWidth(1);
+        vA26[i]->SetFillColor(vA26[i]->GetLineColor());
+        vA26[i]->SetFillStyle(4000); // 0% transparent
     } // end for i
-    B26v = new TGeoVolume("ITSsupFrameB26",B26,SUPss);
-    B26v->SetVisibility(kTRUE);
-    B26v->SetLineColor(1); // black
-    B26v->SetLineWidth(1);
-    B26v->SetFillColor(B26v->GetLineColor());
-    B26v->SetFillStyle(4000); // 0% transparent
-    M26v = new TGeoVolume("ITSsupFrameM26",M26,SUPair);
-    M26v->SetVisibility(kTRUE);
-    M26v->SetLineColor(7); // light blue
-    M26v->SetLineWidth(1);
-    M26v->SetFillColor(M26v->GetLineColor());
-    M26v->SetFillStyle(4090); // 90% transparent
-    //
-    Int_t NcB26=1;
-    t0 = Phi0Frame26;
-    dt = (Phi1Frame26-Phi0Frame26)/((Double_t)NPhiSections26);
-    for(i=0;i<=NZsections26;i++){
-        di = ((Double_t) i)*(ZssFrameSection26+WidthFrame26);
-        z = -M26->GetDz()+A26[i]->GetDz() + di;
+    vB26 = new TGeoVolume("ITSsupFrameB26",sB26,medSUPss);
+    vB26->SetVisibility(kTRUE);
+    vB26->SetLineColor(1); // black
+    vB26->SetLineWidth(1);
+    vB26->SetFillColor(vB26->GetLineColor());
+    vB26->SetFillStyle(4000); // 0% transparent
+    vM26 = new TGeoVolume("ITSsupFrameM26",sM26,medSUPair);
+    vM26->SetVisibility(kTRUE);
+    vM26->SetLineColor(7); // light blue
+    vM26->SetLineWidth(1);
+    vM26->SetFillColor(vM26->GetLineColor());
+    vM26->SetFillStyle(4090); // 90% transparent
+    //
+    Int_t ncopyB26=1;
+    t0 = kfrm26Phi0;
+    dt = (kfrm26Phi1-kfrm26Phi0)/((Double_t)kfrm26NPhiSections);
+    for(i=0;i<=kfrm26NZsections;i++){
+        di = ((Double_t) i)*(kfrm26ZssSection+kfrm26Width);
+        z = -sM26->GetDz()+sA26[i]->GetDz() + di;
         tran = new TGeoTranslation("",0.0,0.0,z);
-        M26v->AddNode(A26v[i],1,tran);
-        z = z+B26->GetDz();
-        if(i<NZsections26)for(j=0;j<=NPhiSections26;j++){
-            r = 0.25*(A26[i]->GetRmax1()+A26[i]->GetRmin1()+
-                      A26[i+1]->GetRmax2()+A26[i+1]->GetRmin2());
+        vM26->AddNode(vA26[i],1,tran);
+        z = z+sB26->GetDz();
+        if(i<kfrm26NZsections)for(j=0;j<=kfrm26NPhiSections;j++){
+            r = 0.25*(sA26[i]->GetRmax1()+sA26[i]->GetRmin1()+
+                      sA26[i+1]->GetRmax2()+sA26[i+1]->GetRmin2());
             t = t0 + ((Double_t)j)*dt;
             rot = new TGeoRotation("",0.0,0.0,t);
             y = r*SinD(t);
             x = r*CosD(t);
             tranrot = new TGeoCombiTrans("",x,y,z,rot);
             delete rot; // rot not explicity used in AddNode functions.
-            M26v->AddNode(B26v,NcB26++,tranrot);
+            vM26->AddNode(vB26,ncopyB26++,tranrot);
         } // end for j
     } // end for i
-    tran = new TGeoTranslation("",0.0,0.0,Z026-M26->GetDz());
-    Moth->AddNode(M26v,1,tran);
-    for(i=1;i<NFramesPhi26;i++){
+    tran = new TGeoTranslation("",0.0,0.0,kfrm26Z0-sM26->GetDz());
+    moth->AddNode(vM26,1,tran);
+    for(i=1;i<kfrm26NPhi;i++){
         rot = new TGeoRotation("",0.0,0.0,90.0*((Double_t)i));
         tranrot = new TGeoCombiTrans(*tran,*rot);
         delete rot; // rot not explicity used in AddNode functions.
-        Moth->AddNode(M26v,i+1,tranrot);
+        moth->AddNode(vM26,i+1,tranrot);
     } // end for i
     if(GetDebug()){
-        for(i=0;i<NZsections26+1;i++) A26v[i]->PrintNodes();
-        B26v->PrintNodes();
-        M26v->PrintNodes();
+        for(i=0;i<kfrm26NZsections+1;i++) vA26[i]->PrintNodes();
+        vB26->PrintNodes();
+        vM26->PrintNodes();
     } // end if
 }
index 97e4c90..492b31a 100644 (file)
@@ -22,33 +22,6 @@ class AliITSv11GeometrySupport : public AliITSv11Geometry {
     virtual void ServicesCableSupport(TGeoVolume *Moth);
 
   private:
-    // some local useful functions
-    static Double_t RmaxFromZpCone(const Double_t *ar,const Double_t *az,
-                                   Double_t tc,Double_t z,
-                                   Double_t th=0.0){
-        return AliITSv11Geometry::RFromZpCone(ar,az,4,tc,z,th);};
-    static Double_t RminFromZpCone(const Double_t *ar,const Double_t *az,
-                                   Double_t tc,Double_t z,Double_t th=0.0){
-        return AliITSv11Geometry::RFromZpCone(ar,az,3,tc,z,th);};
-    static Double_t ZFromRmaxpCone(const Double_t *ar,const Double_t *az,
-                                   Double_t tc,Double_t r,
-                                   Double_t th=0.0){
-        return AliITSv11Geometry::ZFromRmaxpCone(ar,az,4,tc,r,th);};
-    //
-    static Double_t RmaxFromZpCone(const TGeoPcon *p,Double_t tc,Double_t z,
-                                   Double_t th=0.0){
-        return AliITSv11Geometry::RmaxFromZpCone(p,4,tc,z,th);};
-    static Double_t RminFromZpCone(const TGeoPcon *p,Double_t tc,Double_t z,
-                                   Double_t th=0.0){
-        return AliITSv11Geometry::RminFromZpCone(p,3,tc,z,th);};
-    static Double_t ZFromRmaxpCone(const TGeoPcon *p,Double_t tc,Double_t r,
-                                   Double_t th=0.0)
-        {return AliITSv11Geometry::ZFromRmaxpCone(p,4,tc,r,th);};
-    static Double_t ZFromRminpCone(const TGeoPcon *p,Double_t tc,Double_t r,
-                                   Double_t th=0.0)
-        {return AliITSv11Geometry::ZFromRminpCone(p,3,tc,r,th);};
-
-  private:
     ClassDef(AliITSv11GeometrySupport,1) // ITS v11 Support geometry
 };