]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STRUCT/AliABSOv0.cxx
Corrected for a bug in the geometry: the last scintillator layer is now taken into...
[u/mrichter/AliRoot.git] / STRUCT / AliABSOv0.cxx
index 0f30c55ea4a378f582e577ad89b7805217e4b3db..53db49b04e2de834cfc25f7f4220445b9569c4a2 100644 (file)
 
 /*
 $Log$
+Revision 1.15  2002/10/29 09:53:40  morsch
+Constants start with k. Warnings corrected.
+
+Revision 1.14  2002/10/21 09:09:33  alibrary
+Removing unused variables
+
+Revision 1.13  2002/10/14 14:57:34  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+
+Revision 1.11.6.1  2002/07/24 10:08:27  alibrary
+Updating VirtualMC
+
+Revision 1.12  2002/07/15 07:56:41  morsch
+Steel rear and  Al ring.
+
+Revision 1.11  2001/11/29 14:16:51  morsch
+- truncated inner W-cone
+- new support structure
+
+Revision 1.10  2001/10/25 08:50:57  morsch
+New beamshield geometry with increased tolerances and insulation thickness.
+
+Revision 1.9  2001/05/16 14:57:22  alibrary
+New files for folders and Stack
+
+Revision 1.8  2001/01/12 13:16:09  morsch
+Store absorber composition information in fMLayers and fZLayers
+Rear 25 cm Fe + 35 cm Cu
+
 Revision 1.7  2000/10/02 21:28:15  fca
 Removal of useless dependecies via forward declarations
 
@@ -62,7 +91,6 @@ Standard version of ABSO
 
 #include "AliABSOv0.h"
 #include "AliRun.h"
-#include "AliMC.h"
 #include "AliConst.h"
 
 ClassImp(AliABSOv0)
@@ -108,13 +136,14 @@ void AliABSOv0::CreateGeometry()
     //
 
     enum {kC=1605, kAl=1608, kFe=1609, kCu=1610, kW=1611, kPb=1612,
-                 kNiCuW=1620, kVacuum=1615, kAir=1614, kConcrete=1616,
-                 kPolyCH2=1617, kSteel=1609, kInsulation=1613, kPolyCc=1619};    
+         kNiCuW=1620, kVacuum=1615, kAir=1614, kConcrete=1616,
+         kPolyCH2=1617, kSteel=1609, kInsulation=1613, kPolyCc=1619};    
     
     Int_t *idtmed = fIdtmed->GetArray()-1599;
     
     Float_t par[24], cpar[5], cpar0[5], pcpar[12], tpar[3], tpar0[3]; 
     Float_t dz;
+    Int_t idrotm[1699];
 #include "ABSOSHILConst.h"
 #include "ABSOConst.h"
 //
@@ -124,24 +153,26 @@ void AliABSOv0::CreateGeometry()
 
 // 3 < theta < 9
     fNLayers[0] = 5; 
-    fMLayers[0][0]  = kAir;              fZLayers[0][0] = zAbsStart;
-    fMLayers[0][1]  = kC;                fZLayers[0][1] = zAbsCc;             
-    fMLayers[0][2]  = kConcrete;         fZLayers[0][2] = zRear-dRear-dzFe;
-    fMLayers[0][3]  = kFe;               fZLayers[0][3] = zRear-dRear;
-    fMLayers[0][4]  = kCu;               fZLayers[0][4] = zRear;
+    fMLayers[0][0]  = kAir;              fZLayers[0][0] = kZAbsStart;
+    fMLayers[0][1]  = kC;                fZLayers[0][1] = kZAbsCc;             
+    fMLayers[0][2]  = kConcrete;         fZLayers[0][2] = kZRear-kDRear-dzFe;
+    fMLayers[0][3]  = kSteel;            fZLayers[0][3] = kZRear-kDRear;
+    fMLayers[0][4]  = kSteel;            fZLayers[0][4] = kZRear;
 // 2 < theta < 3
-    fNLayers[1] = 5; 
-    fMLayers[1][0] = fMLayers[0][0];      fZLayers[1][0] = fZLayers[0][0];
-    fMLayers[1][1] = fMLayers[0][1];      fZLayers[1][1] = fZLayers[0][1];
-    fMLayers[1][2] = fMLayers[0][2];      fZLayers[1][2] = fZLayers[0][2];
-    fMLayers[1][3] = fMLayers[0][3];      fZLayers[1][3] = fZLayers[0][3];
-    fMLayers[1][4] = kNiCuW;              fZLayers[1][4] = fZLayers[0][4];
+    fNLayers[1] = 6; 
+
+    fMLayers[1][0] = kAir          ;      fZLayers[1][0] = fZLayers[0][0]-10.;
+    fMLayers[1][1] = kAl           ;      fZLayers[1][1] = fZLayers[0][0];
+    fMLayers[1][2] = fMLayers[0][1];      fZLayers[1][2] = fZLayers[0][1];
+    fMLayers[1][3] = fMLayers[0][2];      fZLayers[1][3] = fZLayers[0][2];
+    fMLayers[1][4] = fMLayers[0][3];      fZLayers[1][4] = fZLayers[0][3];
+    fMLayers[1][5] = kNiCuW;              fZLayers[1][5] = fZLayers[0][4];
 //    
 
     Float_t dTube=0.1;                     // tube thickness
     Float_t dInsu=0.5;                     // insulation thickness
     Float_t dEnve=0.1;                     // protective envelope thickness
-    Float_t dFree=0.5;                     // clearance thickness
+    //    Float_t dFree=0.5;                     // clearance thickness
 
 
 // Mother volume and outer shielding: Pb
@@ -149,33 +180,33 @@ void AliABSOv0::CreateGeometry()
   par[1]  = 360.;
   par[2]  = 7.;
     
-  par[3]  = -(zRear-zAbsStart)/2.;
-  par[4]  = rAbs;
-  par[5]  = zAbsStart * TMath::Tan(theta1);
+  par[3]  = -(kZRear-kZAbsStart)/2.;
+  par[4]  = kRAbs;
+  par[5]  = kZAbsStart * TMath::Tan(kTheta1);
 
-  par[6]  = par[3]+(zNose-zAbsStart);
-  par[7]  = rAbs;
-  par[8]  = zNose * TMath::Tan(theta1);
+  par[6]  = par[3]+(kZNose-kZAbsStart);
+  par[7]  = kRAbs;
+  par[8]  = kZNose * TMath::Tan(kTheta1);
 
-  par[9]  = par[3]+(zConeTPC-zAbsStart);
-  par[10] = rAbs;
-  par[11] = par[8] + (par[9] - par[6]) * TMath::Tan(theta2);
+  par[9]  = par[3]+(kZConeTPC-kZAbsStart);
+  par[10] = kRAbs;
+  par[11] = par[8] + (par[9] - par[6]) * TMath::Tan(kTheta2);
 
-  par[12]  = par[3]+(zOpen-zAbsStart);
-  par[13] = rAbs;
-  par[14] = par[11] + (par[12] - par[9]) * TMath::Tan(accMax);
+  par[12]  = par[3]+(kZOpen-kZAbsStart);
+  par[13] = kRAbs;
+  par[14] = par[11] + (par[12] - par[9]) * TMath::Tan(kAccMax);
 
-  par[15] = par[3]+(zRear-dRear-zAbsStart);
-  par[16] = rAbs   + (par[15] - par[12]) * TMath::Tan(thetaOpen1) ;
-  par[17] = par[14] + (par[15] - par[12]) * TMath::Tan(accMax);
+  par[15] = par[3]+(kZRear-kDRear-kZAbsStart);
+  par[16] = kRAbs   + (par[15] - par[12]) * TMath::Tan(kThetaOpen1) ;
+  par[17] = par[14] + (par[15] - par[12]) * TMath::Tan(kAccMax);
 
-  par[18] = par[3]+(zRear-dRear-zAbsStart);
-  par[19] = (zRear-dRear) * TMath::Tan(accMin);
-  par[20] = par[14] + (par[18] - par[12]) * TMath::Tan(accMax);
+  par[18] = par[3]+(kZRear-kDRear-kZAbsStart);
+  par[19] = (kZRear-kDRear) * TMath::Tan(kAccMin);
+  par[20] = par[14] + (par[18] - par[12]) * TMath::Tan(kAccMax);
 
   par[21] = -par[3];
-  par[22] =  zRear* TMath::Tan(accMin);
-  par[23] = par[20] + (par[21] - par[18]) * TMath::Tan(accMax);
+  par[22] =  kZRear* TMath::Tan(kAccMin);
+  par[23] = par[20] + (par[21] - par[18]) * TMath::Tan(kAccMax);
   gMC->Gsvolu("ABSS", "PCON", idtmed[kPb], par, 24);
   { // Begin local scope for i
       for (Int_t i=4; i<18; i+=3) par[i]  = 0;
@@ -186,111 +217,135 @@ void AliABSOv0::CreateGeometry()
 //
 // Steel envelope
 //
-  par[4] = par[5] -dSteel;
-  par[7] = par[8] -dSteel;
-  par[10]= par[11]-dSteel;  
-  par[13]= par[14]-dSteel;  
-  par[16]= par[17]-dSteel;  
-  par[19]= par[20]-dSteel;  
-  par[22]= par[23]-dSteel;  
+  par[4] = par[5] -kDSteel;
+  par[7] = par[8] -kDSteel;
+  par[10]= par[11]-kDSteel;  
+  par[13]= par[14]-kDSteel;  
+  par[16]= par[17]-kDSteel;  
+  par[19]= par[20]-kDSteel;  
+  par[22]= par[23]-kDSteel;  
   gMC->Gsvolu("ABST", "PCON", idtmed[kSteel], par, 24);
   gMC->Gspos("ABST", 1, "ABSS", 0., 0., 0., 0, "ONLY");
 //
 // Polyethylene shield
 // 
-  cpar[0] = (zRear - zConeTPC) / 2.;
-  cpar[1] = zConeTPC * TMath::Tan(accMax);
-  cpar[2] = cpar[1] + dPoly;
-  cpar[3] = zRear * TMath::Tan(accMax);
-  cpar[4] = cpar[3] + dPoly;
+  cpar[0] = (kZRear - kZConeTPC) / 2.;
+  cpar[1] = kZConeTPC * TMath::Tan(kAccMax);
+  cpar[2] = cpar[1] + kDPoly;
+  cpar[3] = kZRear * TMath::Tan(kAccMax);
+  cpar[4] = cpar[3] + kDPoly;
   gMC->Gsvolu("APOL", "CONE", idtmed[kPolyCH2+40], cpar, 5);
-  dz = (zRear-zAbsStart)/2.-cpar[0];
+  dz = (kZRear-kZAbsStart)/2.-cpar[0];
   gMC->Gspos("APOL", 1, "ABSS", 0., 0., dz, 0, "ONLY");
 
 //
 // Tungsten nose to protect TPC
 // 
-  cpar[0] = (zNose - zAbsStart) / 2.;
-  cpar[1] = zAbsStart * TMath::Tan(accMax);
-  cpar[2] = zAbsStart * TMath::Tan(theta1)-dSteel;
-  cpar[3] = zNose * TMath::Tan(accMax);
-  cpar[4] = zNose * TMath::Tan(theta1)-dSteel;
+  cpar[0] = (kZNose - kZAbsStart) / 2.;
+  cpar[1] = kZAbsStart * TMath::Tan(kAccMax);
+  cpar[2] = kZAbsStart * TMath::Tan(kTheta1)-kDSteel;
+  cpar[3] = kZNose * TMath::Tan(kAccMax);
+  cpar[4] = kZNose * TMath::Tan(kTheta1)-kDSteel;
   gMC->Gsvolu("ANOS", "CONE", idtmed[kW], cpar, 5);
-//
-  dz = -(zRear-zAbsStart)/2.+cpar[0];
+  //
+  dz = -(kZRear-kZAbsStart)/2.+cpar[0];
   gMC->Gspos("ANOS", 1, "ABSS", 0., 0., dz, 0, "ONLY");
-//
-// Tungsten inner shield
-//
-  Float_t zW=zTwoDeg+.1;
-  Float_t dZ = zW+(zRear-dRear-zW)/2.;
+  //
+  // Tungsten inner shield
+  //
+  Float_t zW = kZTwoDeg+.1;
+  Float_t dZ = zW+(kZRear-kDRear-zW)/2.;
   //
   pcpar[0]  = 0.;
   pcpar[1]  = 360.;
   pcpar[2]  = 3.;
   pcpar[3]  = zW-dZ;
-  pcpar[4]  = rAbs;
-  pcpar[5]  = zW * TMath::Tan(accMin);
-  pcpar[6]  = zOpen-dZ;
-  pcpar[7]  = rAbs;
-  pcpar[8]  = zOpen * TMath::Tan(accMin);
-  pcpar[9]  = zRear-dRear-dZ;
-  pcpar[10] = rAbs+(zRear-dRear-zOpen) * TMath::Tan(thetaOpen1);
-  pcpar[11] = (zRear-dRear) * TMath::Tan(accMin);
+  pcpar[4]  = kRAbs;
+  pcpar[5]  = zW * TMath::Tan(kAccMin);
+  pcpar[6]  = kZOpen-dZ;
+  pcpar[7]  = kRAbs;
+  pcpar[8]  = kZOpen * TMath::Tan(kAccMin);
+  pcpar[9]  = kZRear-kDRear-dZ;
+  pcpar[10] = kRAbs+(kZRear-kDRear-kZOpen) * TMath::Tan(kThetaOpen1);
+  pcpar[11] = (kZRear-kDRear) * TMath::Tan(kAccMin);
   
   gMC->Gsvolu("AWIN", "PCON", idtmed[kNiCuW+40], pcpar, 12);
-  //
-  dz=(zW+zRear-dRear)/2-(zAbsStart+zRear)/2.;
+  dz=(zW+kZRear-kDRear)/2-(kZAbsStart+kZRear)/2.;
   gMC->Gspos("AWIN", 1, "ABSS", 0., 0., dz, 0, "ONLY");
-
+//
+// First part replaced by Carbon  
+//
+  cpar[0] = (200.-zW)/2.;
+  cpar[1] = kRAbs;
+  cpar[2] = pcpar[5];
+  cpar[3] = kRAbs;
+  cpar[4] = 200. * TMath::Tan(kAccMin);
+  gMC->Gsvolu("ACNO", "CONE", idtmed[kC], cpar, 5);
+  dz = zW-dZ+cpar[0];
+  gMC->Gspos("ACNO", 1, "AWIN", 0., 0., dz, 0, "ONLY");
+
+/*  
+  Float_t zWW = 383.5;
+  cpar[0] = (kZRear-kDRear-zWW)/2.;
+  cpar[1] = kRAbs + (zWW-kZOpen) *  TMath::Tan(kThetaOpen1);
+  cpar[2] =  zWW * TMath::Tan(kAccMin);
+  cpar[3] = pcpar[10];
+  cpar[4] = pcpar[11];
+  gMC->Gsvolu("AWNO", "CONE", idtmed[kCu+40], cpar, 5);
+  dz = zWW-dZ+cpar[0];
+  
+  gMC->Gspos("AWNO", 1, "AWIN", 0., 0., dz, 0, "ONLY");
+*/
+  //
   //     Inner tracking region
   //
   //     mother volume: Cu
   //
+  //
   pcpar[0]  = 0.;
   pcpar[1]  = 360.;
   pcpar[2]  = 3.;
-  pcpar[3]  = -(zRear-zAbsStart)/2.;
-  pcpar[4]  = rAbs;
-  pcpar[5]  = zAbsStart * TMath::Tan(accMax);
-  pcpar[6]  = pcpar[3]+(zTwoDeg-zAbsStart);
-  pcpar[7]  = rAbs;
-  pcpar[8]  = zTwoDeg * TMath::Tan(accMax);
+  pcpar[3]  = -(kZRear-kZAbsStart)/2.;
+  pcpar[4]  = kRAbs;
+  pcpar[5]  = kZAbsStart * TMath::Tan(kAccMax);
+  pcpar[6]  = pcpar[3]+(kZTwoDeg-kZAbsStart);
+  pcpar[7]  = kRAbs;
+  pcpar[8]  = kZTwoDeg * TMath::Tan(kAccMax);
   pcpar[9]  = -pcpar[3];
-  pcpar[10] = zRear * TMath::Tan(accMin);
-  pcpar[11] = zRear * TMath::Tan(accMax);
+  pcpar[10] = kZRear * TMath::Tan(kAccMin);
+  pcpar[11] = kZRear * TMath::Tan(kAccMax);
   gMC->Gsvolu("AITR", "PCON", idtmed[fMLayers[0][4]], pcpar, 12);
   //
   // special Pb medium for last 5 cm of Pb
-  Float_t zr=zRear-2.-0.001;
+  Float_t zr=kZRear-2.-0.001;
   cpar[0] = 1.0;
-  cpar[1] = zr * TMath::Tan(thetaR);
-  cpar[2] = zr * TMath::Tan(accMax);
-  cpar[3] = cpar[1] + TMath::Tan(thetaR) * 2;
-  cpar[4] = cpar[2] + TMath::Tan(accMax) * 2;
+  cpar[1] = zr * TMath::Tan(kThetaR);
+  cpar[2] = zr * TMath::Tan(kAccMax);
+  cpar[3] = cpar[1] + TMath::Tan(kThetaR) * 2;
+  cpar[4] = cpar[2] + TMath::Tan(kAccMax) * 2;
   gMC->Gsvolu("ARPB", "CONE", idtmed[fMLayers[0][4]], cpar, 5);
-  dz=(zRear-zAbsStart)/2.-cpar[0]-0.001;
+  dz=(kZRear-kZAbsStart)/2.-cpar[0]-0.001;
   gMC->Gspos("ARPB", 1, "AITR", 0., 0., dz, 0, "ONLY");
   //
   //     concrete cone: concrete 
   //
-  pcpar[9]  = pcpar[3]+(zRear-dRear-zAbsStart);
-  pcpar[10] = (zRear-dRear) * TMath::Tan(accMin);
-  pcpar[11] = (zRear-dRear) * TMath::Tan(accMax);
+  pcpar[9]  = pcpar[3]+(kZRear-kDRear-kZAbsStart);
+  pcpar[10] = (kZRear-kDRear) * TMath::Tan(kAccMin);
+  pcpar[11] = (kZRear-kDRear) * TMath::Tan(kAccMax);
   gMC->Gsvolu("ACON", "PCON", idtmed[fMLayers[0][2]+40], pcpar, 12);
   gMC->Gspos("ACON", 1, "AITR", 0., 0., 0., 0, "ONLY");
 //
 //    Fe Cone 
 //
-  zr = zRear-dRear-dzFe;
+  zr = kZRear-kDRear-dzFe;
   cpar[0]  = dzFe/2.;
-  cpar[1] = zr * TMath::Tan(accMin);
-  cpar[2] = zr * TMath::Tan(accMax);
-  cpar[3] = cpar[1] + TMath::Tan(thetaR) * dzFe;
-  cpar[4] = cpar[2] + TMath::Tan(accMax) * dzFe;
+  cpar[1] = zr * TMath::Tan(kAccMin);
+  cpar[2] = zr * TMath::Tan(kAccMax);
+  cpar[3] = cpar[1] + TMath::Tan(kAccMin) * dzFe;
+  cpar[4] = cpar[2] + TMath::Tan(kAccMax) * dzFe;
   gMC->Gsvolu("ACFE", "CONE",idtmed[fMLayers[0][3]], cpar, 5);
 
-  dz = (zRear-zAbsStart)/2.-dRear-dzFe/2.;
+  dz = (kZRear-kZAbsStart)/2.-kDRear-dzFe/2.;
 
   gMC->Gspos("ACFE", 1, "ACON", 0., 0., dz, 0, "ONLY");
 
@@ -299,67 +354,67 @@ void AliABSOv0::CreateGeometry()
   //
   //     carbon cone: carbon
   //
-  pcpar[9]  = pcpar[3]+(zAbsCc-zAbsStart);
-  pcpar[10]  = zAbsCc * TMath::Tan(accMin);
-  pcpar[11]  = zAbsCc * TMath::Tan(accMax);
+  pcpar[9]  = pcpar[3]+(kZAbsCc-kZAbsStart);
+  pcpar[10]  = kZAbsCc * TMath::Tan(kAccMin);
+  pcpar[11]  = kZAbsCc * TMath::Tan(kAccMax);
   gMC->Gsvolu("ACAR", "PCON", idtmed[fMLayers[0][1]+40], pcpar, 12);
   gMC->Gspos("ACAR", 1, "ACON", 0., 0., 0., 0, "ONLY");
  //
  //     carbon cone outer region
  //
   cpar[0]  = 10.;
-  cpar[1]  = rAbs;
-  cpar[2]  = zAbsStart* TMath::Tan(accMax);
-  cpar[3]  = rAbs;
-  cpar[4]  = cpar[2]+2. * cpar[0] * TMath::Tan(accMax);
+  cpar[1]  = kRAbs;
+  cpar[2]  = kZAbsStart* TMath::Tan(kAccMax);
+  cpar[3]  = kRAbs;
+  cpar[4]  = cpar[2]+2. * cpar[0] * TMath::Tan(kAccMax);
 
   gMC->Gsvolu("ACAO", "CONE", idtmed[fMLayers[0][1]], cpar, 5);
-  dz=-(zRear-zAbsStart)/2.+cpar[0];
+  dz=-(kZRear-kZAbsStart)/2.+cpar[0];
   gMC->Gspos("ACAO", 1, "ACAR", 0., 0., dz, 0, "ONLY");
   //
   //     inner W shield
   Float_t epsi=0.;
   Float_t repsi=1.;
   
-  zr=zRear-(dRear-epsi);
-  cpar[0] = (dRear-epsi)/2.;
-  cpar[1] = zr * TMath::Tan(accMin);
-  cpar[2] = zr * TMath::Tan(thetaR*repsi);
-  cpar[3] = cpar[1] + TMath::Tan(accMin) * (dRear-epsi);
-  cpar[4] = cpar[2] + TMath::Tan(thetaR*repsi) * (dRear-epsi);
+  zr=kZRear-(kDRear-epsi);
+  cpar[0] = (kDRear-epsi)/2.;
+  cpar[1] = zr * TMath::Tan(kAccMin);
+  cpar[2] = zr * TMath::Tan(kThetaR*repsi);
+  cpar[3] = cpar[1] + TMath::Tan(kAccMin) * (kDRear-epsi);
+  cpar[4] = cpar[2] + TMath::Tan(kThetaR*repsi) * (kDRear-epsi);
   gMC->Gsvolu("ARW0", "CONE", idtmed[fMLayers[1][4]+40], cpar, 5);
-  dz=(zRear-zAbsStart)/2.-cpar[0];
+  dz=(kZRear-kZAbsStart)/2.-cpar[0];
   gMC->Gspos("ARW0", 1, "AITR", 0., 0., dz, 0, "ONLY");
   //
   // special W medium for last 5 cm of W
-  zr=zRear-5;
+  zr=kZRear-5;
   cpar[0] = 2.5;
-  cpar[1] = zr * TMath::Tan(accMin);
-  cpar[2] = zr * TMath::Tan(thetaR*repsi);
-  cpar[3] = cpar[1] + TMath::Tan(accMin) * 5.;
-  cpar[4] = cpar[2] + TMath::Tan(thetaR*repsi) * 5.;
+  cpar[1] = zr * TMath::Tan(kAccMin);
+  cpar[2] = zr * TMath::Tan(kThetaR*repsi);
+  cpar[3] = cpar[1] + TMath::Tan(kAccMin) * 5.;
+  cpar[4] = cpar[2] + TMath::Tan(kThetaR*repsi) * 5.;
   gMC->Gsvolu("ARW1", "CONE", idtmed[fMLayers[1][4]+20], cpar, 5);
-  dz=(dRear-epsi)/2.-cpar[0];
+  dz=(kDRear-epsi)/2.-cpar[0];
   gMC->Gspos("ARW1", 1, "ARW0", 0., 0., dz, 0, "ONLY");
   //
   // Cu
-  Float_t drMin=TMath::Tan(thetaR) * 5;
-  Float_t drMax=TMath::Tan(accMax) * 5;
+  Float_t drMin=TMath::Tan(kThetaR) * 5;
+  Float_t drMax=TMath::Tan(kAccMax) * 5;
   gMC->Gsvolu("ARPE", "CONE", idtmed[fMLayers[0][4]], cpar, 0);
   cpar[0]=2.5;
   { // Begin local scope for i
       for (Int_t i=0; i<3; i++) {
-         zr=zRear-dRear+5+i*10.;
-         cpar[1] = zr * TMath::Tan(thetaR);
-         cpar[2] = zr * TMath::Tan(accMax);
+         zr=kZRear-kDRear+5+i*10.;
+         cpar[1] = zr * TMath::Tan(kThetaR);
+         cpar[2] = zr * TMath::Tan(kAccMax);
          cpar[3] = cpar[1] + drMin;
          cpar[4] = cpar[2] + drMax;
-         dz=(zRear-zAbsStart)/2.-cpar[0]-5.-(2-i)*10;
+         dz=(kZRear-kZAbsStart)/2.-cpar[0]-5.-(2-i)*10;
          gMC->Gsposp("ARPE", i+1, "AITR", 0., 0., dz, 0, "ONLY",cpar,5);
       }
   } // End local scope for i
   gMC->Gspos("AITR", 1, "ABSS", 0., 0., 0., 0, "ONLY");        
-  dz = (zRear-zAbsStart)/2.+zAbsStart;
+  dz = (kZRear-kZAbsStart)/2.+kZAbsStart;
   gMC->Gspos("ABSM", 1, "ALIC", 0., 0., dz, 0, "ONLY");        
 //
 //
@@ -369,34 +424,28 @@ void AliABSOv0::CreateGeometry()
 //
 //
 // cylindrical piece
-  tpar0[2]=(zOpen-zAbsStart)/2;
-  tpar0[0]=rVacu;
-  tpar0[1]=rAbs;
+  tpar0[2]=(kZOpen-kZAbsStart)/2;
+  tpar0[0]=kRVacu;
+  tpar0[1]=kRVacu+dTube+dInsu+dEnve;
   gMC->Gsvolu("AV11", "TUBE", idtmed[kSteel+40], tpar0, 3);
 //
 // insulation
 
   tpar[2]=tpar0[2];
-  tpar[0]=rVacu+dTube;
+  tpar[0]=kRVacu+dTube;
   tpar[1]=tpar[0]+dInsu;
   gMC->Gsvolu("AI11", "TUBE", idtmed[kInsulation+40], tpar, 3);
   gMC->Gspos("AI11", 1, "AV11", 0., 0., 0., 0, "ONLY"); 
 //
-// clearance 
-  tpar[0]=tpar[1]+dEnve;
-  tpar[1]=tpar[0]+dFree;
-  gMC->Gsvolu("AP11", "TUBE", idtmed[kAir+40], tpar, 3);
-  gMC->Gspos("AP11", 1, "AV11", 0., 0., 0., 0, "ONLY"); 
-//
-  dz=-(zRear-zAbsStart)/2.+tpar0[2];
+  dz=-(kZRear-kZAbsStart)/2.+tpar0[2];
   gMC->Gspos("AV11", 1, "ABSM", 0., 0., dz, 0, "ONLY"); 
 //
 // conical piece
 
-  cpar0[0]=(zRear-dRear-zOpen)/2;
-  cpar0[1]=rVacu-0.05;
-  cpar0[2]=rAbs;
-  Float_t dR=2.*cpar0[0]*TMath::Tan(thetaOpen1);
+  cpar0[0]=(kZRear-kDRear-kZOpen)/2;
+  cpar0[1]= kRVacu-0.05;
+  cpar0[2]= kRVacu+dTube+dInsu+dEnve;
+  Float_t dR=2.*cpar0[0]*TMath::Tan(kThetaOpen1);
   cpar0[3]=cpar0[1]+dR;
   cpar0[4]=cpar0[2]+dR;
   gMC->Gsvolu("AV21", "CONE", idtmed[kSteel+40], cpar0, 5);
@@ -411,46 +460,57 @@ void AliABSOv0::CreateGeometry()
   cpar[4]=cpar0[3]+dTube+dInsu;
   gMC->Gsvolu("AI21", "CONE", idtmed[kInsulation+40], cpar, 5);
   gMC->Gspos("AI21", 1, "AV21", 0., 0., 0., 0, "ONLY"); 
-//
-// clearance
-  cpar[1]=cpar0[1]+dTube+dInsu+dEnve;
-  cpar[2]=rAbs;
-  cpar[3]=cpar0[1]+dTube+dInsu+dEnve+dR;
-  cpar[4]=rAbs+dR;
-
-  gMC->Gsvolu("AP21", "CONE", idtmed[kAir+40], cpar, 5);
-  gMC->Gspos("AP21", 1, "AV21", 0., 0., 0., 0, "ONLY"); 
   
-  dz=(zRear-zAbsStart)/2.-cpar0[0]-dRear;
+  dz=(kZRear-kZAbsStart)/2.-cpar0[0]-kDRear;
   gMC->Gspos("AV21", 1, "ABSM", 0., 0., dz, 0, "ONLY"); 
 //
 // Support cone 
 
-  par[0]  = 0.;
-  par[1]  = 360.;
-  par[2]  = 4.;
+  par[0]  =  22.5;
+  par[1]  = 360.0;
+  par[2]  =   8.0;
+  par[3]  =   4.0;
     
-  par[3]  = zRear;
-  par[4]  = 100.;
-  par[5]  = 170.;
+  par[4]  = kZRear;
+  par[5]  = 100.;
+  par[6]  = 180.;
   
-  par[6]  = zRear+2.;
-  par[7]  = 100.;
-  par[8]  = 170.;
+  par[7]  = kZRear+20.;
+  par[8]  = 100.;
+  par[9]  = 180.;
 
-  par[9]  = zRear+2.;
-  par[10] = 168.;
-  par[11] = 170.;
+  par[10] = kZRear+20.;
+  par[11] = 178.;
+  par[12] = 180.;
 
-  par[12]  = 600.;
-  par[13] = 168.;
-  par[14] = 170.;
+  par[13] = 600.;
+  par[14] = 178.;
+  par[15] = 180.;
   
 
-  gMC->Gsvolu("ASSS", "PCON", idtmed[kSteel], par, 25);
+  gMC->Gsvolu("ASSS", "PGON", idtmed[kAl], par, 16);
   gMC->Gspos("ASSS", 1, "ALIC", 0., 0., 0., 0, "ONLY");
 
-
+  Float_t trap[11];
+  trap[ 0] = (530.-170.)/2.;
+  trap[ 2] = 0.;
+  trap[ 3] = 2.; 
+  trap[ 4] = (600.-(kZRear+2.))/2.;;
+  trap[ 5] = trap[4];
+  trap[ 6] = 0.;
+  trap[ 7] = 2.;
+  trap[ 8] = 5.;
+  trap[ 9] = 5.;
+  trap[10] = 0.;
+  trap[ 1] = -TMath::ATan((trap[4]-trap[8])/2./trap[0])*180./TMath::Pi();
+  AliMatrix(idrotm[1600], 180., 0., 90., 0., 90., 90.);
+  AliMatrix(idrotm[1601], 180., 0., 90., 0., 90., 270.);
+  gMC->Gsvolu("ASST", "TRAP", idtmed[kSteel], trap, 11);
+  dz = (600.+kZRear+2.)/2.+(trap[4]-trap[8])/2.;
+  //  Float_t dy =  170.+trap[0];
+  
+//  gMC->Gspos("ASST", 1, "ALIC", 0.,  dy, dz, idrotm[1600], "ONLY");
+//  gMC->Gspos("ASST", 2, "ALIC", 0., -dy, dz, idrotm[1601], "ONLY");
 }
 
 //_____________________________________________________________________________
@@ -461,14 +521,16 @@ void AliABSOv0::Init()
   // Initialisation of the muon absorber after it has been built
   Int_t i;
   //
-  printf("\n");
-  for(i=0;i<35;i++) printf("*");
-  printf(" ABSOv0_INIT ");
-  for(i=0;i<35;i++) printf("*");
-  printf("\n");
-  //
-  for(i=0;i<80;i++) printf("*");
-  printf("\n");
+  if(fDebug) {
+    printf("\n%s: ",ClassName());
+    for(i=0;i<35;i++) printf("*");
+    printf(" ABSOv0_INIT ");
+    for(i=0;i<35;i++) printf("*");
+    printf("\n%s: ",ClassName());
+    //
+    for(i=0;i<80;i++) printf("*");
+    printf("\n");
+  }
 }