]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STRUCT/AliPIPEv0.cxx
Merge branch 'feature-doxygen'
[u/mrichter/AliRoot.git] / STRUCT / AliPIPEv0.cxx
index 078b051690210b3551e5b946ce3bc4c0fe72a29e..cd197af496e37bf8ea78aa2399dc2e11b73c0021 100644 (file)
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.23  2002/10/14 14:57:39  hristov
-Merging the VirtualMC branch to the main development branch (HEAD)
-
-Revision 1.19.4.2  2002/10/11 08:04:28  hristov
-Updating VirtualMC to v3-09-02
-
-Revision 1.22  2002/09/02 15:29:20  morsch
-Gsbool calls to resolve MANY added (I.  Hrivnacova).
-
-Revision 1.19.4.1  2002/06/10 15:13:48  hristov
-Merged with v3-08-02
-
-Revision 1.21  2002/05/11 19:14:44  morsch
-PCONE QBEU had last z defined twice.
-
-Revision 1.20  2002/05/02 12:36:43  morsch
-New version of beam-pipe geometry. Ref. AL502206PL
-(used in production readiness report).
-
-Revision 1.19  2002/03/25 12:34:40  morsch
-Obsolete support rollers removed.
-
-Revision 1.18  2002/02/01 18:02:41  morsch
-Material of beam pipe between inner Be piece and forward detectors
-can be set by SetPipeMaterial(mat), mat = kInox, kAlu, kBe ...
-
-Revision 1.17  2001/09/24 13:11:50  morsch
-Ion pump and bellows moved out by 15 cm to make space for forward
-detectors.
-
-Revision 1.16  2001/05/16 14:57:22  alibrary
-New files for folders and Stack
-
-Revision 1.15  2001/05/02 11:50:18  morsch
-New layout of the non-absorber side provided by Y. Viyogi. Not the final design
-but the prsent most realistic.
+/* $Id$ */
 
-Revision 1.14  2001/01/20 16:56:33  morsch
-Put air in connecting tubes and flanges of vacuum pump.
+//-------------------------------------------------------------------------
+//  Beam pipe class
+//  Default version
+//  Author: A.Morsch
+//-------------------------------------------------------------------------
 
-Revision 1.13  2001/01/20 16:35:27  morsch
-Increase mother volume for bellows.
-
-Revision 1.12  2000/12/21 16:41:06  morsch
-Coding convention clean-up (RS3)
-
-Revision 1.11  2000/11/28 16:06:57  morsch
-Undulated beam-pipe replaced by Al-Be (40,60) pipe 1.5 mm thick.
-
-Revision 1.10  2000/11/24 13:00:37  morsch
-- Geometry and materials imported from euclid output
-- include comments
-- better struturing of volume tree
-- improved version of flange close to front absorber
-- more realistic pump materials
-- undulated beam pipe imported from v3.
-
-Revision 1.9  2000/10/02 21:28:15  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.8  2000/06/11 12:37:01  morsch
-Coding rule violations corrected
-
-Revision 1.7  2000/02/23 16:25:24  fca
-AliVMC and AliGeant3 classes introduced
-ReadEuclid moved from AliRun to AliModule
-
-Revision 1.6  1999/09/29 09:24:30  fca
-Introduction of the Copyright and cvs Log
-
-*/
+#include <Riostream.h>
 
-////////////////////////////////////////////////
-//  Beam pipe class                            /
-////////////////////////////////////////////////
+#include <TGeoManager.h>
+#include <TGeoGlobalMagField.h>
+#include <TSystem.h>
+#include <TVirtualMC.h>
+#include <TArrayI.h>
 
-#include "AliPIPEv0.h"
-#include "AliRun.h"
 #include "AliConst.h"
 #include "AliMagF.h"
-#include "AliMC.h"
-#include "TSystem.h"
-
-#include <Riostream.h>
+#include "AliPIPEv0.h"
+#include "AliRun.h"
+#include "AliLog.h"
  
 ClassImp(AliPIPEv0)
+
  
 //_____________________________________________________________________________
-AliPIPEv0::AliPIPEv0()
+AliPIPEv0::AliPIPEv0():
+    fPipeMaterial(kBe)   
 {
 // Constructor
-    SetPipeMaterial();
 }
 
 //_____________________________________________________________________________
 AliPIPEv0::AliPIPEv0(const char *name, const char *title)
-  : AliPIPE(name,title)
+    : AliPIPE(name,title),
+      fPipeMaterial(kBe)   
 {
 // Constructor
-    SetPipeMaterial();
 }
 
  
@@ -134,11 +70,11 @@ void AliPIPEv0::CreateGeometry()
 */
 //End_Html
 
-    if(fDebug) printf("%s: Create PIPEv0 geometry \n",ClassName());
+    AliDebugClass(1,"Create PIPEv0 geometry");
   
 
     Int_t *idtmed = fIdtmed->GetArray();
-    Float_t ppcon[84], ptube[3], pbox[3];
+    Float_t ppcon[90], ptube[3], pbox[3];
     Int_t i=0;
     
     
@@ -160,11 +96,18 @@ void AliPIPEv0::CreateGeometry()
 //  Bellow
 //
 //  distance between bellows
-    const Float_t dzbb =  9.0;
 //  total size of bellow section
-    const Float_t dzb  = 15.0;
+    const Float_t kdzb  = 14.6;
 //  size of undulated region 
-    const Float_t dzub =  2.0;
+//  
+//  Absorber side
+//   
+//  distance between bellows
+    const Float_t kdzbbA =  4.6;
+//  total size of bellow section
+    const Float_t kdzbA  = 14.6;
+//  size of undulated region 
+    const Float_t kdzubA =  3.75;
 
 // half-lengths of various beam pipe sections
 // central Be-Pipe
@@ -175,32 +118,39 @@ void AliPIPEv0::CreateGeometry()
 //
 //    Float_t hlenQbt1 = 5.5/2.;
 //
-//  Pipe outside central region (non-absober side)
-    Float_t hlenQbab = 157.5;
+//  Pipe outside central region (non-absorber side)
+    Float_t hlenQbab = 157.5 + 23./2.;
 //
 //  Flange non-absorber side
     Float_t hlenQb29 = 11.5/2.+1.75 + 5.0;
 //
 //  Bellow element 
-    Float_t hlenQbe0 = dzb;
+    Float_t hlenQbe0 = kdzbA;
 //
 //  Inox pipe between Be and Bellow (absorber side)
-    Float_t hlenQb24[3] = {10.5/2., 1.8, 3.3};
+    Float_t hlenQb24[3] = {11.3/2., 1.8, 3.3};
 //
 //
     Float_t hlenQb28 = (800.-hlenQbbe1-2.*hlenQbab-4.*hlenQb29-2.*hlenQbe0)/2.;
 //
 //  Position of the pump
-    Float_t zPump = hlenQbbe1+2.*hlenQbab+2.*hlenQb29+dzb;
+    Float_t zPump = hlenQbbe1+2.*hlenQbab+2.*hlenQb29+kdzb;
 //
 //  Inner beam pipe radius
-    Float_t RinBe = 2.9;
-    Float_t RinSt = 2.92;
-//
+//  Be
+    const Float_t kRinBe = 2.9;
+//  Steel
+    const Float_t kRinSt = 2.9;
+//  Bellow
+    const Float_t kRinSB = 2.92;
 //
-    Float_t RoutBe = 2.98;
-    Float_t RoutSt = 3.00;
-
+//  Outer beam pipe radius
+//  Be
+    const Float_t kRoutBe = 2.98;
+//  Steel
+    const Float_t kRoutSt = 2.98;
+//  Bellow
+    const Float_t kRoutSB = 3.00;
 
 //
     Float_t dz;
@@ -211,81 +161,89 @@ void AliPIPEv0::CreateGeometry()
 // Mother Volume QBPM
     ppcon[0]  =   0;
     ppcon[1]  = 360;
-    ppcon[2]  =  18;
-//  1: 
+    ppcon[2]  =  20;
+//  1 
     ppcon[3]  = -90.;
     ppcon[4]  =   0.;
-    ppcon[5]  =   4.4;
+    ppcon[5]  =   3.1;
 //  2
-    ppcon[6]  = -90+2.*hlenQb24[2]+2.8+2.*hlenQb24[1];
+    ppcon[6]  = -84.;
     ppcon[7]  =   0.;
-    ppcon[8]  =   4.4;
+    ppcon[8]  =   3.1;
 //  3
-    ppcon[9]  = ppcon[6];
+    ppcon[9]  = -84.;
     ppcon[10] =   0.;
-    ppcon[11] =   4.1;
-//  4 
-    ppcon[12] = ppcon[9] + 2. + 2.*dzub+0.2; 
+    ppcon[11] =   4.4;
+//  4
+    ppcon[12] = -90+2.*hlenQb24[2]+2.8+2.*hlenQb24[1];
     ppcon[13] =   0.;
-    ppcon[14] =   4.1;
-//  5 
-    ppcon[15] = ppcon[12];
+    ppcon[14] =   4.4;
+//  5
+    ppcon[15]  = ppcon[12];
     ppcon[16] =   0.;
-    ppcon[17] =   3.2;
+    ppcon[17] =   4.1;
 //  6 
-    ppcon[18] = ppcon[15] + 2.* dzbb-0.4
+    ppcon[18] = ppcon[15] + 2.5 + 2.*kdzubA+0.2
     ppcon[19] =   0.;
-    ppcon[20] =   3.2;
-//  7
-    ppcon[21] = ppcon[18]; 
+    ppcon[20] =   4.1;
+//  7 
+    ppcon[21] = ppcon[18];
     ppcon[22] =   0.;
-    ppcon[23] =   4.1;
-//  8
-    ppcon[24] = -44.;
+    ppcon[23] =   3.2;
+//  8 
+    ppcon[24] = ppcon[21] + 2.* kdzbbA-0.4; 
     ppcon[25] =   0.;
-    ppcon[26] =   4.1;
+    ppcon[26] =   3.2;
 //  9
-    ppcon[27] = -44.;
-    ppcon[28] =    0;
-    ppcon[29] =    3.0;
+    ppcon[27] = ppcon[24]; 
+    ppcon[28] =   0.;
+    ppcon[29] =   4.1;
 //  10
-    ppcon[30] =  38.;
-    ppcon[31] =    0;
-    ppcon[32] =    3.0;
+    ppcon[30] = -44.;
+    ppcon[31] =   0.;
+    ppcon[32] =   4.1;
 //  11
-    ppcon[33] =  38.;
+    ppcon[33] = -44.;
     ppcon[34] =    0;
-    ppcon[35] =    3.6;
+    ppcon[35] =    3.06;
 //  12
-    ppcon[36] = hlenQbbe1+2.*hlenQbab-0.1;
-    ppcon[37] =    0.;
-    ppcon[38] =    3.6;
+    ppcon[36] =  38.;
+    ppcon[37] =    0;
+    ppcon[38] =    3.06;
 //  13
-    ppcon[39] = ppcon[36];
-    ppcon[40] =    0.;
-    ppcon[41] =    3.6;
+    ppcon[39] =  38.;
+    ppcon[40] =    0;
+    ppcon[41] =    4.1;
 //  14
-    ppcon[42] = ppcon[39]+2.*hlenQb29-5.;
+    ppcon[42] = hlenQbbe1+2.*hlenQbab-0.1;
     ppcon[43] =    0.;
-    ppcon[44] =    3.6;
+    ppcon[44] =    4.1;
 //  15
     ppcon[45] = ppcon[42];
     ppcon[46] =    0.;
-    ppcon[47] =   56.;
+    ppcon[47] =    4.1;
 //  16
-    ppcon[48] = ppcon[45]+2.*dzb+10.;
+    ppcon[48] = ppcon[45]+2.*hlenQb29-5.;
     ppcon[49] =    0.;
-    ppcon[50] =   56.;
+    ppcon[50] =    4.1;
 //  17
-    ppcon[51] =   ppcon[48];
+    ppcon[51] = ppcon[48];
     ppcon[52] =    0.;
-    ppcon[53] =    3.6;
+    ppcon[53] =   56.;
 //  18
-    ppcon[54] =  800.;
+    ppcon[54] = ppcon[51]+2.*kdzb+10.;
     ppcon[55] =    0.;
-    ppcon[56] =    3.6;
+    ppcon[56] =   56.;
+//  19
+    ppcon[57] =   ppcon[54];
+    ppcon[58] =    0.;
+    ppcon[59] =    4.1;
+//  20
+    ppcon[60] =  800.;
+    ppcon[61] =    0.;
+    ppcon[62] =    4.1;
     
-    gMC->Gsvolu("QBPM", "PCON", idtmed[kAir], ppcon,57);
+    TVirtualMC::GetMC()->Gsvolu("QBPM", "PCON", idtmed[kAir], ppcon,63);
 
 
 //
@@ -294,71 +252,51 @@ void AliPIPEv0::CreateGeometry()
 
 //
 // The Vacuum 
-    gMC->Gsvolu("QBVA","TUBE", idtmed[kVac], ptube, 0);
+    TVirtualMC::GetMC()->Gsvolu("QBVA","TUBE", idtmed[kVac], ptube, 0);
     ptube[0] =   0.0;
-    ptube[1] =   RinSt;
+    ptube[1] =   kRinSt;
     ptube[2] =   (90.-hlenQbbe2)/2.;
     dz = -90. + ptube[2];
-    gMC->Gsposp ("QBVA", 1, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3);
+    TVirtualMC::GetMC()->Gsposp ("QBVA", 1, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3);
     dz = dz + ptube[2];
 
-    ptube[1] =   RinBe;
+    ptube[1] =   kRinBe;
     ptube[2] =   hlenQbbe+hlenQbab;
     dz = dz + ptube[2];
-    gMC->Gsposp ("QBVA", 2, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3);
+    TVirtualMC::GetMC()->Gsposp ("QBVA", 2, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3);
     dz = dz + ptube[2];
 
-    ptube[1] =   RinSt;
+    ptube[1] =   kRinSt;
     ptube[2] =   (800.-hlenQbbe1-2.*hlenQbab)/2.;
     dz = dz + ptube[2];
-    gMC->Gsposp ("QBVA", 3, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3);
+    TVirtualMC::GetMC()->Gsposp ("QBVA", 3, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3);
 
 //
 // Be Pipe in central Alice 
-    ptube[0] = RinBe;
-    ptube[1] = RoutBe;
+    ptube[0] = kRinBe;
+    ptube[1] = kRoutBe;
     ptube[2] = hlenQbbe;
     
-    gMC->Gsvolu("QBBE","TUBE", idtmed[kBe], ptube, 3);
+    TVirtualMC::GetMC()->Gsvolu("QBBE","TUBE", idtmed[kBe], ptube, 3);
     
 //
 //  Support Ring
 //
     //  Mother
-    ppcon[0]  =   0;
-    ppcon[1]  = 360;
-    ppcon[2]  =   6;
-//  1: 
-    ppcon[3]  = -1.;
-    ppcon[4]  = 3.0;
-    ppcon[5]  = 3.4;
-//  2
-    ppcon[6]  = -0.8;
-    ppcon[7]  = 3.0;
-    ppcon[8]  = 3.4;
-//  3
-    ppcon[9]  = -0.8;
-    ppcon[10] = 3.0;
-    ppcon[11] = 3.2;
-//  4 
-    ppcon[12] = 0.8;
-    ppcon[13] = 3.0;
-    ppcon[14] = 3.2;
-//  5 
-    ppcon[15] = 0.8;
-    ppcon[16] = 3.0;
-    ppcon[17] = 3.4;
-//  6 
-    ppcon[18] = 1.0;
-    ppcon[19] = 3.0;
-    ppcon[20] = 3.4;
+    ptube[0] = kRoutSB;
+    ptube[1] = 4.0;
+    ptube[2] = 0.6;
+    TVirtualMC::GetMC()->Gsvolu("QBSR", "TUBE", idtmed[kAlu], ptube,3);
+    // Inner support
+    ptube[0] = kRoutSB;
+    ptube[1] = 3.5;
+    TVirtualMC::GetMC()->Gsvolu("QBSS", "TUBE", idtmed[kPA], ptube,3);
+    TVirtualMC::GetMC()->Gspos("QBSS", 1, "QBSR", 0.0, 0.0,  0.0, 0, "ONLY");
 
-    
-    gMC->Gsvolu("QBSR", "PCON", idtmed[kC], ppcon,21);
-    gMC->Gspos("QBSR", 1, "QBPM", 0.0, 0.0,  40., 0, "ONLY");
-    gMC->Gspos("QBSR", 2, "QBPM", 0.0, 0.0, 150., 0, "ONLY");
-    gMC->Gspos("QBSR", 3, "QBPM", 0.0, 0.0, 260., 0, "ONLY");
-    gMC->Gspos("QBSR", 4, "QBPM", 0.0, 0.0,- 46., 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QBSR", 1, "QBPM", 0.0, 0.0,  40., 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QBSR", 2, "QBPM", 0.0, 0.0, 150., 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QBSR", 3, "QBPM", 0.0, 0.0, 260., 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QBSR", 4, "QBPM", 0.0, 0.0,- 46., 0, "ONLY");
 //
 // Flange and Fixed Point: non absorber side
 //
@@ -370,70 +308,77 @@ void AliPIPEv0::CreateGeometry()
     ppcon[2]  =   4;
 //  1: 
     ppcon[3]  = -hlenQb29;
-    ppcon[4]  = RinSt;
+    ppcon[4]  = kRinSt;
     ppcon[5]  = 5.8;
 //  2
     ppcon[6]  = ppcon[3]+3.6;
-    ppcon[7]  = RinSt;
+    ppcon[7]  = kRinSt;
     ppcon[8]  = 5.8;
 //  3
     ppcon[9]  = ppcon[6];
-    ppcon[10] = RinSt;
+    ppcon[10] = kRinSt;
     ppcon[11] = 3.6;
 //  4 
     ppcon[12] = hlenQb29;
-    ppcon[13] = RinSt;
+    ppcon[13] = kRinSt;
     ppcon[14] = 3.6;
     
-    gMC->Gsvolu("QB29", "PCON", idtmed[kAir], ppcon,15);
+    TVirtualMC::GetMC()->Gsvolu("QB29", "PCON", idtmed[kAir], ppcon,15);
     
 
 //    Flange
-    ptube[0] = RinSt;
+    ptube[0] = kRinSt;
     ptube[1] = 5.7;
     ptube[2] = 1.75;
-    gMC->Gsvolu("QF29","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QF29", 1, "QB29", 0.0, 0.0, -hlenQb29+1.75, 0, "ONLY");
+    TVirtualMC::GetMC()->Gsvolu("QF29","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gspos("QF29", 1, "QB29", 0.0, 0.0, -hlenQb29+1.75, 0, "ONLY");
 //    Pipe
-    ptube[0] = RinSt;
-    ptube[1] = 3.0;
+    ptube[0] = kRinSt;
+    ptube[1] = 3.06;
     ptube[2] = hlenQb29;
-    gMC->Gsvolu("QS29","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QS29", 1, "QB29", 0.0, 0.0, 0., 0, "ONLY");
+    TVirtualMC::GetMC()->Gsvolu("QS29","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gspos("QS29", 1, "QB29", 0.0, 0.0, 0., 0, "ONLY");
 //    Fixed point
-    ptube[0] = RinSt;
+    ptube[0] = kRinSt;
     ptube[1] = 3.5;
     ptube[2] = 0.3;
-    gMC->Gsvolu("QP29","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QP29", 1, "QB29", 0.0, 0.0, -hlenQb29+9.75+3., 0, "ONLY");
+    TVirtualMC::GetMC()->Gsvolu("QP29","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gspos("QP29", 1, "QB29", 0.0, 0.0, -hlenQb29+9.75+3., 0, "ONLY");
     
 //
 //
 // Inox beam pipe: final section on non-absorber side
 
-    ptube[0] =   RinSt;
-    ptube[1] =   RoutSt;
+    ptube[0] =   kRinSt;
+    ptube[1] =   kRoutSt;
     ptube[2] =   hlenQb28;    
 
-    gMC->Gsvolu("QB28","TUBE", idtmed[kInox], ptube, 3);
-
+    TVirtualMC::GetMC()->Gsvolu("QB28","TUBE", idtmed[kInox], ptube, 3);
+//
+//
+// Air with high transport cuts outside QB28
+    ptube[0] =   25.;
+    ptube[1] =   100.;
+    ptube[2] =   hlenQb28;    
 
+    TVirtualMC::GetMC()->Gsvolu("QA28","TUBE", idtmed[kAirHigh], ptube, 3);
+    gGeoManager->SetVolumeAttribute("QA28", "SEEN", 0);
 //  Al-Be (40-60 wgt%, rho=2.7 g/cm**3) beam pipe
 //
 //  This section is under study (A.M. 1/2/2002)
 //
 
-    ptube[0] = RinBe;
+    ptube[0] = kRinBe;
     if (fPipeMaterial == kAlu) {
-       ptube[1] = 3.0;
+       ptube[1] = 3.06;
     } else if (fPipeMaterial == kBe) {
-       ptube[1] = RoutBe;
+       ptube[1] = kRoutBe;
     } else if (fPipeMaterial == kInox){
-       ptube[1] = RoutSt;
+       ptube[1] = kRoutSt;
     }
     ptube[2] =   hlenQbab;    
 
-    gMC->Gsvolu("QBAB","TUBE", idtmed[fPipeMaterial], ptube, 3);
+    TVirtualMC::GetMC()->Gsvolu("QBAB","TUBE", idtmed[fPipeMaterial], ptube, 3);
 
 // 2.5 mm thick SS tube for hanging pump
 /*
@@ -441,7 +386,7 @@ void AliPIPEv0::CreateGeometry()
     ptube[1] = 3.15;
     ptube[2] = hlenQb26;
     
-    gMC->Gsvolu("QB26","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gsvolu("QB26","TUBE", idtmed[kInox], ptube, 3);
 */
 //
 // Bellows
@@ -451,62 +396,63 @@ void AliPIPEv0::CreateGeometry()
     Float_t pconQBE0[33];
     pconQBE0[ 0]= 0;
     pconQBE0[ 1]= 360;
-    pconQBE0[ 2]= 10;
+    pconQBE0[ 2]=  10;
 //  1
-    pconQBE0[ 3]= -dzb;
-    pconQBE0[ 4]= RinSt;
-    pconQBE0[ 5]= RoutSt;
-//  2    
-    pconQBE0[ 6]= -dzb+2.;
-    pconQBE0[ 7]= RinSt;
-    pconQBE0[ 8]= RoutSt;
+    pconQBE0[ 3] = -kdzbA;
+    pconQBE0[ 4] = kRinSB;
+    pconQBE0[ 5] = kRoutSB;
+//
+    pconQBE0[ 6] = -kdzbA+2.5;
+    pconQBE0[ 7] = kRinSB;
+    pconQBE0[ 8] = kRoutSB;
+//  2
+    pconQBE0[ 9] = -kdzbA+2.5;
+    pconQBE0[10] = kRinSB;
+    pconQBE0[11] = 3.60;
 //  3
-    pconQBE0[ 9]= -dzb+2.;
-    pconQBE0[10]= RinSt;
-    pconQBE0[11]= 4.00;
+    pconQBE0[12] = -kdzbA+2.5+2.*kdzubA;
+    pconQBE0[13] = kRinSB;
+    pconQBE0[14] = 3.60;
 //  4
-    pconQBE0[12]= -dzb+2.+2.*dzub;
-    pconQBE0[13]= RinSt;
-    pconQBE0[14]= 4.00;
-//  5
-    pconQBE0[15]= -dzb+2.+2.*dzub;
-    pconQBE0[16]= RinSt;
-    pconQBE0[17]= RoutSt;
+    pconQBE0[15] = -kdzbA+2.5+2.*kdzubA;
+    pconQBE0[16] = kRinSB;
+    pconQBE0[17] = kRoutSB;
+//  5    
+    pconQBE0[18] = -kdzbA+2.5+2.*kdzubA+2.*kdzbbA;
+    pconQBE0[19] = kRinSB;
+    pconQBE0[20] = kRoutSB;
 //  6    
-    pconQBE0[18]= -dzb+2.+2.*dzub+2.*dzbb;
-    pconQBE0[19]= RinSt;
-    pconQBE0[20]= RoutSt;
-//  7    
-    pconQBE0[21]= -dzb+2.+2.*dzub+2.*dzbb;
-    pconQBE0[22]= RinSt;
-    pconQBE0[23]= 4.00;
+    pconQBE0[21] = -kdzbA+2.5+2.*kdzubA+2.*kdzbbA;
+    pconQBE0[22] = kRinSB;
+    pconQBE0[23] = 3.60;
+//  7
+    pconQBE0[24] = -kdzbA+2.5+4.*kdzubA+2.*kdzbbA;
+    pconQBE0[25] = kRinSB;
+    pconQBE0[26] = 3.60;
 //  8
-    pconQBE0[24]= -dzb+2.+4.*dzub+2.*dzbb;
-    pconQBE0[25]= RinSt;
-    pconQBE0[26]= 4.00;
-//  9
-    pconQBE0[27]= -dzb+2.+4.*dzub+2.*dzbb;
-    pconQBE0[28]= RinSt;
-    pconQBE0[29]= RoutSt;
-//  10 
-    pconQBE0[30]= +dzb;
-    pconQBE0[31]= RinSt;
-    pconQBE0[32]= RoutSt;
-    gMC->Gsvolu("QBE0", "PCON", idtmed[kAir], pconQBE0, 33);
+    pconQBE0[27] = -kdzbA+2.5+4.*kdzubA+2.*kdzbbA;
+    pconQBE0[28] = kRinSB;
+    pconQBE0[29] = kRoutSB;
+// 9
+    pconQBE0[30] = -kdzbA+5.0+4.*kdzubA+2.*kdzbbA;
+    pconQBE0[31] = kRinSB;
+    pconQBE0[32] = kRoutSB;
+
+    TVirtualMC::GetMC()->Gsvolu("QBE0", "PCON", idtmed[kAir], pconQBE0, 33);
 //
 //  Undulated piece mother
-    ptube[0] =  RinSt;
-    ptube[1] =  4.00;
-    ptube[2] =  dzub;
-    gMC->Gsvolu("QBEM","TUBE", idtmed[kAir], ptube, 3);
-    dz = -dzb+2.+dzub;
-    gMC->Gspos("QBEM", 2 ,"QBE0", 0.0, 0.0,   dz, 0 , "ONLY");
-    gMC->Gspos("QBEM", 1 ,"QBE0", 0.0, 0.0,  -dz, idrotm[2012], "ONLY");
+    ptube[0] =  kRinSB;
+    ptube[1] =  3.60;
+    ptube[2] =  kdzubA;
+    TVirtualMC::GetMC()->Gsvolu("QBEM","TUBE", idtmed[kAir], ptube, 3);
+    dz = -kdzbA+kdzubA+2.5;
+    TVirtualMC::GetMC()->Gspos("QBEM", 2 ,"QBE0", 0.0, 0.0,   dz, 0 , "ONLY");
+    TVirtualMC::GetMC()->Gspos("QBEM", 1 ,"QBE0", 0.0, 0.0,  -dz, idrotm[2012], "ONLY");
 //  
     Float_t pund[30];
     Float_t uw = 0.02;
-    Float_t ur = 2.*dzub-12.*uw;
-    Float_t uz = ur/13.;
+    Float_t ur = 2.*kdzubA-36.*uw;
+    Float_t uz = ur/37.;
     Float_t ut = uz+uw;
     
     pund[ 0] = 0;
@@ -514,8 +460,8 @@ void AliPIPEv0::CreateGeometry()
     pund[ 2] =  8;
 
     pund[ 3] = -ut;
-    pund[ 4] = RinSt;
-    pund[ 5] = RinSt+uw;
+    pund[ 4] = kRinSB;
+    pund[ 5] = kRinSB+uw;
     
     pund[ 6] = -ut+uz;
     pund[ 7] = pund[4];
@@ -523,14 +469,14 @@ void AliPIPEv0::CreateGeometry()
     
     pund[ 9] = pund[6];
     pund[10] = pund[4];
-    pund[11] = 4.0;
+    pund[11] = 3.6;
     
     pund[12] = pund[9]+uw;
     pund[13] = pund[10];
     pund[14] = pund[11];
     
     pund[15] = pund[12];
-    pund[16] = 4.0-uw;
+    pund[16] = 3.6-uw;
     pund[17] = pund[14];
     
     pund[18] = pund[12]+uz;
@@ -538,38 +484,37 @@ void AliPIPEv0::CreateGeometry()
     pund[20] = pund[17];
     
     pund[21] = pund[18];
-    pund[22] = RinSt;
+    pund[22] = kRinSB;
     pund[23] = pund[20];
     
     pund[24] = pund[21]+uw;
     pund[25] = pund[22];
     pund[26] = pund[23];
 
-    gMC->Gsvolu("QBEU", "PCON", idtmed[kInox], pund, 27);
+    TVirtualMC::GetMC()->Gsvolu("QBEU", "PCON", idtmed[kInox], pund, 27);
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < 18; i++)
     {
-       dz = -dzub+(1+2*i)*ut;
-       gMC->Gspos("QBEU", i+1 ,"QBEM", 0.0, 0.0,   dz, 0 , "ONLY");
+       dz = -kdzubA+(1+2*i)*ut;
+       TVirtualMC::GetMC()->Gspos("QBEU", i+1 ,"QBEM", 0.0, 0.0,   dz, 0 , "ONLY");
     }
-    ptube[0] =  RinSt;
-    ptube[1] =  RinSt+uw;
+    ptube[0] =  kRinSB;
+    ptube[1] =  kRinSB+uw;
     ptube[2] =  uz;
-    gMC->Gsvolu("QBEW","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QBEW", 1 ,"QBEM", 0.0, 0.0,   dzub-uz, 0 , "ONLY");
+    TVirtualMC::GetMC()->Gsvolu("QBEW","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gspos("QBEW", 1 ,"QBEM", 0.0, 0.0,   kdzubA-uz, 0 , "ONLY");
+
 //
 //  BeamPipe
-    gMC->Gsvolu("QBEP","TUBE", idtmed[kInox], ptube, 0);
-    ptube[0] =  RinSt;
-    ptube[1] =  RoutSt;
-    ptube[2] =  1.;
-    gMC->Gsposp("QBEP", 1 ,"QBE0", 0.0, 0.0, -dzb+1., 0 , "ONLY", ptube, 3);
-    gMC->Gsposp("QBEP", 2 ,"QBE0", 0.0, 0.0,  dzb-1., 0 , "ONLY", ptube, 3);    
-    ptube[2] = dzbb;
-    gMC->Gsposp("QBEP", 3 ,"QBE0", 0.0, 0.0,  0., 0 , "ONLY", ptube, 3);    
+    TVirtualMC::GetMC()->Gsvolu("QBEP","TUBE", idtmed[kInox], ptube, 0);
+    ptube[0] =  kRinSB;
+    ptube[1] =  kRoutSB;
+    ptube[2] =  1.25;
+    TVirtualMC::GetMC()->Gsposp("QBEP", 1 ,"QBE0", 0.0, 0.0, -kdzbA+1.25, 0 , "ONLY", ptube, 3);
+    TVirtualMC::GetMC()->Gsposp("QBEP", 2 ,"QBE0", 0.0, 0.0,  kdzbA-1.25, 0 , "ONLY", ptube, 3);    
+    ptube[2] = kdzbbA;
+    TVirtualMC::GetMC()->Gsposp("QBEP", 3 ,"QBE0", 0.0, 0.0,  0., 0 , "ONLY", ptube, 3);    
 //  
-//  End undulated part
-//
 //
 //  ----> End Bellow
 //
@@ -578,151 +523,133 @@ void AliPIPEv0::CreateGeometry()
     //
     // first the beryllium section
     Float_t zpos = -(hlenQbbe2-hlenQbbe1)/2;
-    gMC->Gspos("QBBE", 1, "QBPM", 0., 0., zpos, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QBBE", 1, "QBPM", 0., 0., zpos, 0, "ONLY");
 
     // next meta-metal transition QBT1 on on-absorber side
 //    zpos = zpos + hlenQbbe + hlenQbt1;
-//    gMC->Gspos("QBT1", 1, "QBPM", 0., 0.,  zpos, 0, "ONLY");
+//    TVirtualMC::GetMC()->Gspos("QBT1", 1, "QBPM", 0., 0.,  zpos, 0, "ONLY");
     
     // Aluminium OR Al-be alloy section
     zpos = hlenQbbe1+hlenQbab;
-    gMC->Gspos("QBAB", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QBAB", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
     //
     // inox flange at the start of bellow
     zpos = zpos + hlenQbab + hlenQb29;
-    gMC->Gspos("QB29", 1, "QBPM", 0.0, 0.0, zpos, idrotm[2012], "ONLY");
+    TVirtualMC::GetMC()->Gspos("QB29", 1, "QBPM", 0.0, 0.0, zpos, idrotm[2012], "ONLY");
     //
     // bellow section
     zpos = zpos + hlenQb29 + hlenQbe0;
-    gMC->Gspos("QBE0", 2 ,"QBPM", 0.0, 0.0, zpos, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QBE0", 2 ,"QBPM", 0.0, 0.0, zpos, 0, "ONLY");
     // 
     // inox flange at the end of bellow and start of thick inox for pump
     zpos = zpos + hlenQbe0 + hlenQb29;
-    gMC->Gspos("QB29", 2, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QB29", 2, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
     //   
     //last inox section till 800 cm
     zpos = zpos + hlenQb29 + hlenQb28;
-    gMC->Gspos("QB28", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY"); 
+    TVirtualMC::GetMC()->Gspos("QB28", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY"); 
+    TVirtualMC::GetMC()->Gspos("QA28", 1, "ALIC", 0.0, 0.0, zpos, 0, "ONLY"); 
     
-//******** end of placement on no-absorber side *********
-
+//******** end of placement on non-absorber side *********
     //
     // **** Absorber side *****   
     //
     //
-/*
-    //  metal-metal transition :  Be-Alu on absorber side
-    //  Mother Volume
-    ptube[0] = 2.900;
-    ptube[1] = 4.200;
-    ptube[2] = 2.750;
-    gMC->Gsvolu("QBT2","TUBE", idtmed[kAir], ptube, 3);
-    // z  = 43.3 - 48.8
-    gMC->Gspos("QBT2", 1, "QBPM", 0., 0., -hlenQbbe-ptube[2], idrotm[2012], "ONLY");
-
-    ptube[0] = 2.900;
-    ptube[1] = 3.150;
-    ptube[2] = 0.375;
-    //
-    //  Be-part
-    gMC->Gsvolu("QB02","TUBE", idtmed[kAlu], ptube, 3);
-
-    ptube[1] = 3.000;
-    gMC->Gsvolu("QBA2","TUBE", idtmed[kBe], ptube, 3);
-
-    gMC->Gspos("QBA2", 1, "QB02", 0., 0., 0, 0, "ONLY");
-//  z = -2.75 -> -2.00
-    gMC->Gspos("QB02", 1, "QBT2", 0., 0.,-2.75+ptube[2], 0, "ONLY");
-
-    // Alu part    
-    ptube[0] = 2.900;
-    ptube[1] = 3.150;
-    ptube[2] = 2.375;
-// z = -2.00 -> 2.75
-    gMC->Gsvolu("QB04","TUBE", idtmed[kAlu], ptube, 3);
-    gMC->Gspos("QB04", 1, "QBT2", 0., 0.,-2.+ptube[2], 0, "ONLY");
-    
-    
-    ptube[0] = 3.15;
-    ptube[1] = 3.50;
-    ptube[2] = 0.10;
-// z = 2.55 -> 2.75
-    gMC->Gsvolu("QB06","TUBE", idtmed[kAlu], ptube, 3);
-    gMC->Gspos("QB06", 1, "QBT2", 0., 0., 2.55+ptube[2], 0, "ONLY");
-    
-    
-    // Fixation
-    ptube[0] = 0.0;
-    ptube[1] = 0.1;
-    ptube[2] = 0.5;
-    
-    gMC->Gsvolu("QBA8","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QBA8", 1 ,"QBT2",  0.000,  3.650, -1.25, idrotm[2002], "ONLY");
-    gMC->Gspos("QBA8", 2 ,"QBT2",  3.161, -1.825, -1.25, idrotm[2001], "ONLY");
-    gMC->Gspos("QBA8", 3 ,"QBT2", -3.161, -1.825, -1.25, idrotm[2003], "ONLY");
-    
-    // Carbon ring
-    ptube[0] = 3.15;
-    ptube[1] = 4.10;
-    ptube[2] = 0.55;
-    
-    gMC->Gsvolu("QB77","TUBE", idtmed[kC], ptube, 3);
-
-    ptube[0] = 3.15;
-    ptube[1] = 3.50;
-    ptube[2] = 0.10;
-    gMC->Gsvolu("QBB7","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QBB7", 1, "QB77", 0.0, 0.0, 0.55-0.2, 0, "ONLY");
-    gMC->Gspos("QB77", 1, "QBT2", 0.0, 0.0, 2., 0, "ONLY");
- */
 //
 // Beam pipes between elements
-//
-
-    gMC->Gsvolu("QB24","TUBE", idtmed[kInox], ptube, 0);
-    ptube[0] = RinSt;
-    ptube[1] = RoutSt;
+//    
+    TVirtualMC::GetMC()->Gsvolu("QB24","TUBE", idtmed[kInox], ptube, 0);
+    ptube[0] = kRinSt;
+    ptube[1] = kRoutSt;
     ptube[2] = hlenQb24[0];
-    dz = hlenQbbe2 + ptube[2];
-    gMC->Gsposp("QB24", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY", ptube, 3);
+    Float_t bpbe[33];
+    bpbe[ 0] =   0.;
+    bpbe[ 1] = 360.;
+    bpbe[ 2] =  10.;
+    // 1
+    bpbe[ 3] = -hlenQb24[0];
+    bpbe[ 4] = kRinSB;
+    bpbe[ 5] = kRoutSB;
+    // 2
+    bpbe[ 6] = hlenQb24[0] - 5.8;
+    bpbe[ 7] = kRinSB;
+    bpbe[ 8] = kRoutSB;
+    // 3
+    bpbe[ 9] = hlenQb24[0] - 5.8;
+    bpbe[10] = kRinSt;
+    bpbe[11] = 3.05;
+    // 4
+    bpbe[12] = hlenQb24[0] - 4.5;
+    bpbe[13] = kRinSt;
+    bpbe[14] = 3.05;
+    // 5
+    bpbe[15] = hlenQb24[0] - 4.5;
+    bpbe[16] = kRinSt;
+    bpbe[17] = kRoutSt ;
+    // 6
+    bpbe[18] = hlenQb24[0] - 3.5;
+    bpbe[19] = kRinSt;
+    bpbe[20] = kRoutSt ;
+    // 7
+    bpbe[21] = hlenQb24[0] - 3.5;
+    bpbe[22] = kRinSt;
+    bpbe[23] = 3.05;
+    // 8
+    bpbe[24] = hlenQb24[0] - 3.0;
+    bpbe[25] = kRinSt;
+    bpbe[26] = 3.05;
+    // 9
+    bpbe[27] = hlenQb24[0] - 3.0;
+    bpbe[28] = kRinSt;
+    bpbe[29] = kRoutSt;
+    // 10
+    bpbe[30] = hlenQb24[0];
+    bpbe[31] = kRinSt;
+    bpbe[32] = kRoutSt;
+
+    TVirtualMC::GetMC()->Gsvolu("QA24","PCON", idtmed[kInox], bpbe, 33);
+
+    dz = hlenQbbe2 + hlenQb24[0];
+    
+    TVirtualMC::GetMC()->Gspos("QA24", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY");
 //
 // Bellow on absorber side
-    dz = dz+hlenQb24[0] + dzb;
-    gMC->Gspos("QBE0", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY");
+
+    dz = dz+hlenQb24[0] + kdzbA;
+    TVirtualMC::GetMC()->Gspos("QBE0", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY");
 //
     ptube[2] = hlenQb24[1];
-    dz = dz + dzb + ptube[2];
-    gMC->Gsposp("QB24", 2 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY", ptube, 3);
+    dz = dz + kdzb + ptube[2];
+    TVirtualMC::GetMC()->Gsposp("QB24", 2 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY", ptube, 3);
     dz = dz + ptube[2];
     
 //
 // Flange
 // 
 //  Mother Volume
-    ptube[0] = RinSt;
+    ptube[0] = kRinSB;
     ptube[1] = 4.300;
     ptube[2] = 1.4;
     
-    gMC->Gsvolu("QFA0","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gsvolu("QFA0","TUBE", idtmed[kInox], ptube, 3);
     dz = dz + ptube[2];
-    gMC->Gspos("QFA0", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QFA0", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY");
     dz = dz + ptube[2];
 //
 //
-    ptube[0] = RinSt;
-    ptube[1] = RoutSt;
+    ptube[0] = kRinSB;
+    ptube[1] = kRoutSB;
     ptube[2] = hlenQb24[2];
     dz = dz + ptube[2];
-    gMC->Gsposp("QB24", 3 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY", ptube, 3);
-
+    TVirtualMC::GetMC()->Gsposp("QB24", 3 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY", ptube, 3);
 
 // --- Place the PIPE ghost volume (QBPM) in its mother volume (ALIC)
 //    by rotating it to 180 deg. and make it invisible
 // 
-    gMC->Gspos("QBPM",1,"ALIC",0,0,0,idrotm[2013], "ONLY");
-    gMC->Gsbool("QBPM", "L3DX");
-    gMC->Gsbool("QBPM", "L3O3");
-    gMC->Gsbool("QBPM", "L3O4");
+    TVirtualMC::GetMC()->Gspos("QBPM",1,"ALIC", 0, 0, 0, 0, "ONLY");
+    TVirtualMC::GetMC()->Gsbool("QBPM", "L3DX");
+    TVirtualMC::GetMC()->Gsbool("QBPM", "L3O3");
+    TVirtualMC::GetMC()->Gsbool("QBPM", "L3O4");
 
 
 //
@@ -733,54 +660,54 @@ void AliPIPEv0::CreateGeometry()
     pbox[0] =  6.50;
     pbox[1] =  6.75;
     pbox[2] = 15.60;
-    gMC->Gsvolu("QI32","BOX", idtmed[kInox], pbox, 3);
+    TVirtualMC::GetMC()->Gsvolu("QI32","BOX", idtmed[kInox], pbox, 3);
     
     pbox[0] =  5.90;
     pbox[1] =  6.15;
     pbox[2] = 15.00;
-    gMC->Gsvolu("QI42","BOX", idtmed[kGetter], pbox, 3);
-    gMC->Gspos("QI42", 1, "QI32", 0.0, 0.0, 0.0, 0, "ONLY");
+    TVirtualMC::GetMC()->Gsvolu("QI42","BOX", idtmed[kGetter], pbox, 3);
+    TVirtualMC::GetMC()->Gspos("QI42", 1, "QI32", 0.0, 0.0, 0.0, 0, "ONLY");
 // <-
 
     ptube[0] =  0.0;
     ptube[1] = 19.0;
     ptube[2] =  2.5;
-    gMC->Gsvolu("QI33","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gsvolu("QI33","TUBE", idtmed[kInox], ptube, 3);
 
 
     ptube[0] =  0.0;
     ptube[1] = 15.0;
     ptube[2] =  2.5;
-    gMC->Gsvolu("QI43","TUBE", idtmed[kAir], ptube, 3);
-    gMC->Gspos("QI43", 1, "QI33", 0.0, 0.0, 0.0, 0, "ONLY");
+    TVirtualMC::GetMC()->Gsvolu("QI43","TUBE", idtmed[kAir], ptube, 3);
+    TVirtualMC::GetMC()->Gspos("QI43", 1, "QI33", 0.0, 0.0, 0.0, 0, "ONLY");
 // 
 // Connecting tube ->
     ptube[0] =  0.0;
-    ptube[1] =  5.4;
+    ptube[1] =  4.5;
     ptube[2] = 14.6;
-    gMC->Gsvolu("QI34","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gsvolu("QI34","TUBE", idtmed[kInox], ptube, 3);
     
     ptube[0] =  0.0;
-    ptube[1] =  4.8;
+    ptube[1] =  3.9;
     ptube[2] = 14.6;
-    gMC->Gsvolu("QI44","TUBE", idtmed[kAir], ptube, 3);
-    gMC->Gspos("QI44", 1, "QI34", 0.0, 0.0, 0.0, 0, "ONLY");
+    TVirtualMC::GetMC()->Gsvolu("QI44","TUBE", idtmed[kAir], ptube, 3);
+    TVirtualMC::GetMC()->Gspos("QI44", 1, "QI34", 0.0, 0.0, 0.0, 0, "ONLY");
 // <-
 
   //
   // Flange ->
-    ptube[0] =  5.41;
+    ptube[0] =  4.6;
     ptube[1] =  7.30;
     ptube[2] =  2.15;
-    gMC->Gsvolu("QI35","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gsvolu("QI35","TUBE", idtmed[kInox], ptube, 3);
 // <-
-    gMC->Gspos("QI32", 1, "QBPM", 0.0, -44.25, zPump, 0, "ONLY");
-    gMC->Gspos("QI33", 1, "QBPM", 0.0, -35.00, zPump,idrotm[2002], "ONLY");
-    gMC->Gspos("QI34", 1, "QBPM", 0.0, -17.90, zPump,idrotm[2002], "ONLY");
-    gMC->Gspos("QI35", 1, "QBPM", 0.0, -24.35, zPump,idrotm[2002], "ONLY");
+    TVirtualMC::GetMC()->Gspos("QI32", 1, "QBPM", 0.0, -44.25, zPump, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("QI33", 1, "QBPM", 0.0, -35.00, zPump,idrotm[2002], "ONLY");
+    TVirtualMC::GetMC()->Gspos("QI34", 1, "QBPM", 0.0, -17.90, zPump,idrotm[2002], "ONLY");
+    TVirtualMC::GetMC()->Gspos("QI35", 1, "QBPM", 0.0, -24.35, zPump,idrotm[2002], "ONLY");
 
-    gMC->Gsatt("QBPM", "SEEN", 1);
-    gMC->Gsatt("QBEM", "SEEN", 1);
+    gGeoManager->SetVolumeAttribute("QBPM", "SEEN", 1);
+    gGeoManager->SetVolumeAttribute("QBEM", "SEEN", 1);
 }
 
 
@@ -792,9 +719,9 @@ void AliPIPEv0::CreateMaterials()
   // Define materials for beam pipe
   //
 
-  if(fDebug) printf("%s: Create PIPEv0 materials \n",ClassName());
-  Int_t   isxfld = gAlice->Field()->Integ();
-  Float_t sxmgmx = gAlice->Field()->Max();
+  AliDebugClass(1,"Create PIPEv0 materials");
+  Int_t   isxfld = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();
+  Float_t sxmgmx = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
   // Steel (Inox)  
   Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
   Float_t zsteel[4] = { 26.,24.,28.,14. };
@@ -803,7 +730,26 @@ void AliPIPEv0::CreateMaterials()
   Float_t aAlBe[2] = { 26.98, 9.01};
   Float_t zAlBe[2] = { 13.00, 4.00};
   Float_t wAlBe[2] = { 0.4, 0.6};
-
+  //
+  // Polyamid
+  Float_t aPA[4] = {16., 14., 12.,  1.};
+  Float_t zPA[4] = { 8.,  7.,  6.,  1.};
+  Float_t wPA[4] = { 1.,  1.,  6., 11.};
+  //
+  // Air 
+  //
+  Float_t aAir[4]={12.0107,14.0067,15.9994,39.948};
+  Float_t zAir[4]={6.,7.,8.,18.};
+  Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
+  Float_t dAir = 1.20479E-3;
+  Float_t dAir1 = 1.20479E-10;
+  //
+  // Kapton
+  //
+  Float_t aKapton[4]={1.00794,12.0107, 14.010,15.9994};
+  Float_t zKapton[4]={1.,6.,7.,8.};
+  Float_t wKapton[4]={0.026362,0.69113,0.07327,0.209235};
+  Float_t dKapton = 1.42;
   //
   //     Berillium 
   AliMaterial(5, "BERILLIUM$", 9.01, 4., 1.848, 35.3, 36.7);
@@ -815,10 +761,11 @@ void AliPIPEv0::CreateMaterials()
   AliMaterial(9,  "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
   //
   //     Air 
-  AliMaterial(15, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500.);
+  AliMixture(15, "AIR$",      aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR_HIGH$", aAir, zAir, dAir, 4, wAir);
   //
   //     Vacuum 
-  AliMaterial(16, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
+  AliMixture(16, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
   //
   //     stainless Steel 
   AliMixture(19, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
@@ -828,6 +775,12 @@ void AliPIPEv0::CreateMaterials()
   //     Al-Be alloy
   //     
   AliMixture(21, "AlBe$", aAlBe, zAlBe, 2.07, 2, wAlBe);
+  //     Polyamid
+  //   
+  AliMixture(22, "PA$", aPA, zPA, 1.14, -4, wPA);
+  //
+  //     Kapton
+  AliMixture(23, "KAPTON", aKapton, zKapton, dKapton, 4, wKapton);
   //
   // **************** 
   //     Defines tracking media parameters. 
@@ -850,7 +803,8 @@ void AliPIPEv0::CreateMaterials()
   AliMedium(9, "ALU",      9, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Air 
-  AliMedium(15, "AIR",    15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(15, "AIR",     15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(35, "AIR_HIFG",35, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   //
   //    Vacuum 
   AliMedium(16, "VACUUM", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
@@ -863,6 +817,12 @@ void AliPIPEv0::CreateMaterials()
   //
   //   AlBe - Aloy 
   AliMedium(21, "AlBe"  , 21, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  //
+  //   Polyamid
+  AliMedium(22, "PA"  ,   22, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  //
+  //   KAPTON
+  AliMedium(23, "KAPTON", 23, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
 }