]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STRUCT/AliPIPEv0.cxx
made const array arguments of GetPredictedChi2 methods
[u/mrichter/AliRoot.git] / STRUCT / AliPIPEv0.cxx
index 2d31de5d698e162b07e56f3a8ba7fbd58564cb80..cd197af496e37bf8ea78aa2399dc2e11b73c0021 100644 (file)
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-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.
-
-Revision 1.14  2001/01/20 16:56:33  morsch
-Put air in connecting tubes and flanges of vacuum pump.
-
-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.
+/* $Id$ */
 
-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.
+//-------------------------------------------------------------------------
+//  Beam pipe class
+//  Default version
+//  Author: A.Morsch
+//-------------------------------------------------------------------------
 
-Revision 1.9  2000/10/02 21:28:15  fca
-Removal of useless dependecies via forward declarations
+#include <Riostream.h>
 
-Revision 1.8  2000/06/11 12:37:01  morsch
-Coding rule violations corrected
+#include <TGeoManager.h>
+#include <TGeoGlobalMagField.h>
+#include <TSystem.h>
+#include <TVirtualMC.h>
+#include <TArrayI.h>
 
-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
-
-*/
-
-////////////////////////////////////////////////
-//  Beam pipe class                            /
-////////////////////////////////////////////////
-
-#include "AliPIPEv0.h"
-#include "AliRun.h"
 #include "AliConst.h"
 #include "AliMagF.h"
-#include "AliMC.h"
-#include "TSystem.h"
-
-#include <iostream.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();
 }
 
  
@@ -108,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;
     
     
@@ -130,665 +92,564 @@ void AliPIPEv0::CreateGeometry()
     idrotm[2011] = 0;
     AliMatrix(idrotm[2012],90.,180., 90., 90.,180.,  0.);
     AliMatrix(idrotm[2013],90.,  0., 90., 90.,180.,  0.);
-
+//
+//  Bellow
+//
+//  distance between bellows
+//  total size of bellow section
+    const Float_t kdzb  = 14.6;
+//  size of undulated region 
+//  
+//  Absorber side
+//   
 //  distance between bellows
-    const Float_t dzbb =  8.0;
-//  size of bellow
-    const Float_t dzb  = 11.4;
+    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
+    Float_t hlenQbbe1 = 40.;
+    Float_t hlenQbbe2 = 36.5;
+    Float_t hlenQbbe  = (hlenQbbe1+hlenQbbe2)/2.;
+//
+//
+//    Float_t hlenQbt1 = 5.5/2.;
+//
+//  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 = kdzbA;
+//
+//  Inox pipe between Be and Bellow (absorber side)
+    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+kdzb;
+//
+//  Inner beam pipe radius
+//  Be
+    const Float_t kRinBe = 2.9;
+//  Steel
+    const Float_t kRinSt = 2.9;
+//  Bellow
+    const Float_t kRinSB = 2.92;
+//
+//  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;
     
 //
 // The peam pipe up to the Front Absorber
 //
 // Mother Volume QBPM
-    const Float_t dbe1 = 15.;
-    const Float_t dbe2 = 15.;
-    ppcon[0]  =    0;
-    ppcon[1]  =  360;
-    ppcon[2]  =   25;
-//  1: 
-    ppcon[3]  = - 90;
-    ppcon[4]  =    0;
-    ppcon[5]  =    5.8;
+    ppcon[0]  =   0;
+    ppcon[1]  = 360;
+    ppcon[2]  =  20;
+//  1 
+    ppcon[3]  = -90.;
+    ppcon[4]  =   0.;
+    ppcon[5]  =   3.1;
 //  2
-    ppcon[6]  = - 81.6;
-    ppcon[7]  =    0.;
-    ppcon[8]  =    5.8;
+    ppcon[6]  = -84.;
+    ppcon[7]  =   0.;
+    ppcon[8]  =   3.1;
 //  3
-    ppcon[9]  = - 81.6;
-    ppcon[10]  =    0.;
-    ppcon[11] =    4.22;
-//  4 
-    ppcon[12] = - 81.6 + dzb; 
-    ppcon[13] =    0;
-    ppcon[14] =    4.22;
-//  5 
-    ppcon[15] = - 81.6 + dzb; 
-    ppcon[16] =    0;
-    ppcon[17] =    3.2;
+    ppcon[9]  = -84.;
+    ppcon[10] =   0.;
+    ppcon[11] =   4.4;
+//  4
+    ppcon[12] = -90+2.*hlenQb24[2]+2.8+2.*hlenQb24[1];
+    ppcon[13] =   0.;
+    ppcon[14] =   4.4;
+//  5
+    ppcon[15]  = ppcon[12];
+    ppcon[16] =   0.;
+    ppcon[17] =   4.1;
 //  6 
-    ppcon[18] = - 81.6 + dzb + dzbb
-    ppcon[19] =    0;
-    ppcon[20] =    3.2;
-//  7
-    ppcon[21] = - 81.6 + dzb + dzbb; 
-    ppcon[22] =    0;
-    ppcon[23] =    4.22;
-//  8
-    ppcon[24] = - 28.00-dbe2;
-    ppcon[25] =    0;
-    ppcon[26] =    4.22;
+    ppcon[18] = ppcon[15] + 2.5 + 2.*kdzubA+0.2
+    ppcon[19] =   0.;
+    ppcon[20] =   4.1;
+//  7 
+    ppcon[21] = ppcon[18];
+    ppcon[22] =   0.;
+    ppcon[23] =   3.2;
+//  8 
+    ppcon[24] = ppcon[21] + 2.* kdzbbA-0.4; 
+    ppcon[25] =   0.;
+    ppcon[26] =   3.2;
 //  9
-    ppcon[27] = - 28.00-dbe2;
-    ppcon[28] =    0;
-    ppcon[29] =    3.2;
+    ppcon[27] = ppcon[24]; 
+    ppcon[28] =   0.;
+    ppcon[29] =   4.1;
 //  10
-    ppcon[30] =    0;
-    ppcon[31] =    0;
-    ppcon[32] =    3.2;
+    ppcon[30] = -44.;
+    ppcon[31] =   0.;
+    ppcon[32] =   4.1;
 //  11
-    ppcon[33] =    28.+dbe1;
+    ppcon[33] = -44.;
     ppcon[34] =    0;
-    ppcon[35] =    3.2;
+    ppcon[35] =    3.06;
 //  12
-    ppcon[36] =   28.+dbe1;
+    ppcon[36] =  38.;
     ppcon[37] =    0;
-    ppcon[38] =    4.22;
-//  13 
-    ppcon[39] =   28.+dbe1+6.0;
+    ppcon[38] =    3.06;
+//  13
+    ppcon[39] =  38.;
     ppcon[40] =    0;
-    ppcon[41] =    4.22;
+    ppcon[41] =    4.1;
 //  14
-    ppcon[42] =   28.+dbe1+6.0;
-    ppcon[43] =    0;
-    ppcon[44] =    3.2;
-//  15 
-    ppcon[45] =   250.;
-    ppcon[46] =    0;
-    ppcon[47] =    3.2;
+    ppcon[42] = hlenQbbe1+2.*hlenQbab-0.1;
+    ppcon[43] =    0.;
+    ppcon[44] =    4.1;
+//  15
+    ppcon[45] = ppcon[42];
+    ppcon[46] =    0.;
+    ppcon[47] =    4.1;
 //  16
-    ppcon[48] =  250.;
-    ppcon[49] =    0;
-    ppcon[50] =    5;
+    ppcon[48] = ppcon[45]+2.*hlenQb29-5.;
+    ppcon[49] =    0.;
+    ppcon[50] =    4.1;
 //  17
-    ppcon[51] =   250.+4.4*2;
+    ppcon[51] = ppcon[48];
     ppcon[52] =    0.;
-    ppcon[53] =    5.;
+    ppcon[53] =   56.;
 //  18
-    ppcon[54] =   250.+4.4*2;
+    ppcon[54] = ppcon[51]+2.*kdzb+10.;
     ppcon[55] =    0.;
-    ppcon[56] =    3.2;
+    ppcon[56] =   56.;
 //  19
-    ppcon[57] =   365.4;
-    ppcon[58] =    0;
-    ppcon[59] =    3.2;
+    ppcon[57] =   ppcon[54];
+    ppcon[58] =    0.;
+    ppcon[59] =    4.1;
 //  20
-    ppcon[60] =   365.4;
-    ppcon[61] =    0;
-    ppcon[62] =    5.;
-//  21
-    ppcon[63] =   390.;
-    ppcon[64] =    0;
-    ppcon[65] =    5.;
-//  22
-    ppcon[66] =  390.;
-    ppcon[67] =    0.;
-    ppcon[68] =   56.;
-//  23
-    ppcon[69] =  435.;
-    ppcon[70] =    0.;
-    ppcon[71] =   56.;
-//  24
-    ppcon[72] =  435.;
-    ppcon[73] =    0.;
-    ppcon[74] =   5.;
-//  25
-    ppcon[75] =  800.;
-    ppcon[76] =    0.;
-    ppcon[77] =    5.;
+    ppcon[60] =  800.;
+    ppcon[61] =    0.;
+    ppcon[62] =    4.1;
     
-    gMC->Gsvolu("QBPM", "PCON", idtmed[kAir], ppcon, 78);
+    TVirtualMC::GetMC()->Gsvolu("QBPM", "PCON", idtmed[kAir], ppcon,63);
+
 
-//
-// The Vacuum 
-    ptube[0] =   0.0;
-    ptube[1] =   2.9;
-    ptube[2] = 445.0;
-    
-    gMC->Gsvolu("QBVA","TUBE", idtmed[kVac], ptube, 3);
-    gMC->Gspos ("QBVA", 1, "QBPM", 0., 0., 355., 0, "ONLY");
 //
 // volume definitions of various sections
 //
 
-    //half-lengths of various beam pipe sections
-    Float_t hlenQbbe = 43.3;
-    Float_t hlenQbt1 = 5.5/2.;
-    Float_t hlenQbab = (286.6+30.)/2.;
-    Float_t hlenQb29 = 4.4/2.;
-    Float_t hlenQbe0 = (2.* dzb + dzbb)/2.;
-    Float_t hlenQb26 = 20./2.;
-    Float_t hlenQb28 = (400.6-30.)/2.;
+//
+// The Vacuum 
+    TVirtualMC::GetMC()->Gsvolu("QBVA","TUBE", idtmed[kVac], ptube, 0);
+    ptube[0] =   0.0;
+    ptube[1] =   kRinSt;
+    ptube[2] =   (90.-hlenQbbe2)/2.;
+    dz = -90. + ptube[2];
+    TVirtualMC::GetMC()->Gsposp ("QBVA", 1, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3);
+    dz = dz + ptube[2];
+
+    ptube[1] =   kRinBe;
+    ptube[2] =   hlenQbbe+hlenQbab;
+    dz = dz + ptube[2];
+    TVirtualMC::GetMC()->Gsposp ("QBVA", 2, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3);
+    dz = dz + ptube[2];
+
+    ptube[1] =   kRinSt;
+    ptube[2] =   (800.-hlenQbbe1-2.*hlenQbab)/2.;
+    dz = dz + ptube[2];
+    TVirtualMC::GetMC()->Gsposp ("QBVA", 3, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3);
 
-// Be Pipe in central Alice : length 43.3 * 2
-    ptube[0] =  2.90;
-    ptube[1] =  3.00;
+//
+// Be Pipe in central Alice 
+    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);
     
 //
-// Metal-Metal Transitions : non-absorber side
+//  Support Ring
 //
-//  Be-Al (or Be to Be-Al alloy)
-//  Mother Volume
-    ptube[0] = 2.900;
-    ptube[1] = 4.200;
-    ptube[2] = hlenQbt1;
-    gMC->Gsvolu("QBT1","TUBE", idtmed[kAir], ptube, 3);
-
-    ptube[0] = 2.900;
-    ptube[1] = 3.150;
-    ptube[2] = 0.375;
-    //
-    //  Be-part
-    gMC->Gsvolu("QB01","TUBE", idtmed[kAlu], ptube, 3);
-
-    ptube[1] = 3.000;
-    gMC->Gsvolu("QBA1","TUBE", idtmed[kBe], ptube, 3);
-
-    gMC->Gspos("QBA1", 1, "QB01", 0., 0., 0, 0, "ONLY");
-    gMC->Gspos("QB01", 1, "QBT1", 0., 0.,-2.75+ptube[2], 0, "ONLY");
-
-    //  Al-part
-    //
-    ptube[0] = 2.900;
-    ptube[1] = 3.150;
-    ptube[2] = 2.375;
-
-    gMC->Gsvolu("QB03","TUBE", idtmed[kAlu], ptube, 3);
-    gMC->Gspos("QB03", 1, "QBT1", 0., 0.,-2.+ptube[2], 0, "ONLY");
-    
-    
-    ptube[0] = 3.15;
-    ptube[1] = 3.50;
-    ptube[2] = 0.10;
-
-    gMC->Gsvolu("QB05","TUBE", idtmed[kAlu], ptube, 3);
-    gMC->Gspos("QB05", 1, "QBT1", 0., 0., 2.55+ptube[2], 0, "ONLY");
-    
-    
-    // Fixations
-    ptube[0] = 0.0;
-    ptube[1] = 0.1;
-    ptube[2] = 0.5;
-    
-    gMC->Gsvolu("QB08","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QB08", 1 ,"QBT1",  0.000,  3.650, -1.25, idrotm[2002], "ONLY");
-    gMC->Gspos("QB08", 2 ,"QBT1",  3.161, -1.825, -1.25, idrotm[2001], "ONLY");
-    gMC->Gspos("QB08", 3 ,"QBT1", -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("QB07","TUBE", idtmed[kC], ptube, 3);
-
-    ptube[0] = 3.15;
-    ptube[1] = 3.50;
-    ptube[2] = 0.10;
-    gMC->Gsvolu("QBA7","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QBA7", 1, "QB07", 0.0, 0.0, 0.55-0.2, 0, "ONLY");
-    gMC->Gspos("QB07", 1, "QBT1", 0.0, 0.0, 2., 0, "ONLY");
-
-
+    //  Mother
+    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");
+
+    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");
 //
-// Support rollers: non absorber side
+// Flange and Fixed Point: non absorber side
 //
-//  Mother volume
-    
-    ptube[0] = 3.2;
-    ptube[1] = 4.8;
-    ptube[2] = 3.0;
-    gMC->Gsvolu("QBRM","TUBE", idtmed[kAir], ptube, 3);
-
-    ptube[0] = 0.0;
-    ptube[1] = 0.7;
-    ptube[2] = 3.0;
-    
-    gMC->Gsvolu("QB30","TUBE", idtmed[kInox], ptube, 3);
-    
-    for (i=0; i<8; i++) {
-       Float_t phi = 45.+i*45.*kDegrad;
-       Float_t xpos = 4.*TMath::Sin(phi);
-       Float_t ypos = 4.*TMath::Cos(phi);
-       gMC->Gspos("QB30", i+1, "QBRM", xpos, ypos, 0, idrotm[2004+i], "ONLY");
-    }
-
+// ---------->
 //
-// Flanges: non absorber side
-    ptube[0] = 3.0;
-    ptube[1] = 4.9;
+//  Mother
+    ppcon[0]  =   0;
+    ppcon[1]  = 360;
+    ppcon[2]  =   4;
+//  1: 
+    ppcon[3]  = -hlenQb29;
+    ppcon[4]  = kRinSt;
+    ppcon[5]  = 5.8;
+//  2
+    ppcon[6]  = ppcon[3]+3.6;
+    ppcon[7]  = kRinSt;
+    ppcon[8]  = 5.8;
+//  3
+    ppcon[9]  = ppcon[6];
+    ppcon[10] = kRinSt;
+    ppcon[11] = 3.6;
+//  4 
+    ppcon[12] = hlenQb29;
+    ppcon[13] = kRinSt;
+    ppcon[14] = 3.6;
+    
+    TVirtualMC::GetMC()->Gsvolu("QB29", "PCON", idtmed[kAir], ppcon,15);
+    
+
+//    Flange
+    ptube[0] = kRinSt;
+    ptube[1] = 5.7;
+    ptube[2] = 1.75;
+    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] = kRinSt;
+    ptube[1] = 3.06;
     ptube[2] = hlenQb29;
+    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] = kRinSt;
+    ptube[1] = 3.5;
+    ptube[2] = 0.3;
+    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");
     
-    gMC->Gsvolu("QB29","TUBE", idtmed[kInox], ptube, 3);
-    
+//
 //
 // Inox beam pipe: final section on non-absorber side
 
-    ptube[0] =   2.90;
-    ptube[1] =   2.98;
+    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);
 //
-//  Undulated beam pipe
-// 
-/*
-    Float_t pitch=0.25;
-    Float_t thick=0.015;
-    Float_t zundul=171;
-    Float_t rundul=3.0;
-    char cn48[][5]={"QN21","QN22","QN23","QN24","QN25","QN26","QN27","QN28"};
-
-    Undulation("QUND",pitch,thick,zundul,rundul,cn48);
-    gMC->Gspos("QUND", 1, "QBPM", 0., 0., 335.+zundul, 0, "ONLY");
-*/
+//
+// 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)
+//  This section is under study (A.M. 1/2/2002)
 //
 
-    ptube[0] = 2.9;
+    ptube[0] = kRinBe;
     if (fPipeMaterial == kAlu) {
-       ptube[1] = 3.0;
+       ptube[1] = 3.06;
     } else if (fPipeMaterial == kBe) {
-       ptube[1] = 3.02;
+       ptube[1] = kRoutBe;
     } else if (fPipeMaterial == kInox){
-       ptube[1] = 2.98;
+       ptube[1] = kRoutSt;
     }
     ptube[2] =   hlenQbab;    
 
-    gMC->Gsvolu("QBAB","TUBE", idtmed[fPipeMaterial], ptube, 3);
-
-    
-//
-//  last piece : inox pipe from pump till end 
-//
-    //ptube[0] =   2.90;
-    //ptube[1] =   2.98;
-    //ptube[2] =  61.55;    
-
-    //gMC->Gsvolu("QB48","TUBE", idtmed[kInox], ptube, 3);
-
-/*
-    ptube[0] = 2.90;
-    ptube[1] = 2.98;
-    ptube[2] = 1.0;
-    
-    gMC->Gsvolu("QB27","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QB27", 1, "QBPM", 0.0, 0.0, 208.1, 0, "ONLY");
-*/
-//
-// Aluminium collar for support rollers
-    
-    gMC->Gsvolu("QB25","TUBE", idtmed[kAlu], ptube, 0);
-
+    TVirtualMC::GetMC()->Gsvolu("QBAB","TUBE", idtmed[fPipeMaterial], ptube, 3);
 
 // 2.5 mm thick SS tube for hanging pump
-    ptube[0] = 2.90;
+/*
+    ptube[0] = Rin;
     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
 //
 //
 // Mother Volume
-
-    Float_t pconQBE0[21];
-    pconQBE0[0]= 0;
-    pconQBE0[1]= 360;
-    pconQBE0[2]= 6;
-
-    pconQBE0[3]= -(2.*dzb+dzbb)/2.;
-    pconQBE0[4]= 0;
-    pconQBE0[5]= 4.22;
-    
-    pconQBE0[6]= -(2.*dzb+dzbb)/2.+dzb;
-    pconQBE0[7]= 0;
-    pconQBE0[8]= 4.22;
-    
-    pconQBE0[9]= -(2.*dzb+dzbb)/2.+dzb;
-    pconQBE0[10]= 0;
-    pconQBE0[11]= 3.2;
-    
-    pconQBE0[12]= -(2.*dzb+dzbb)/2.+dzb+dzbb;
-    pconQBE0[13]= 0;
-    pconQBE0[14]= 3.2;
-    
-    pconQBE0[15]= -(2.*dzb+dzbb)/2.+dzb+dzbb;
-    pconQBE0[16]= 0;
-    pconQBE0[17]= 4.22;
-    
-    pconQBE0[18]= -(2.*dzb+dzbb)/2.+dzb+dzbb+dzb;
-    pconQBE0[19]= 0;
-    pconQBE0[20]= 4.22;
-
-    gMC->Gsvolu("QBE0", "PCON", idtmed[kAir], pconQBE0, 21);
-
-    ptube[0] =  2.90;
-    ptube[1] =  3.75;
-    ptube[2] = dzb/2.;
-
-    gMC->Gsvolu("QBEM","TUBE", idtmed[kAir], ptube, 3);
-    Float_t dz = (dzb+dzbb)/2.;
-    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] = 2.90;
-    ptube[1] = 3.25;
-    ptube[2] = 3.70;
-    
-    gMC->Gsvolu("QB19","TUBE", idtmed[kVac], ptube, 3);
-    gMC->Gspos("QB19", 1 ,"QBEM", 0.0, 0.0, 0.5, 0 , "ONLY");
-    
-    ptube[0] = 3.25;
-    ptube[1] = 3.74;
-    ptube[2] = 0.095;
-    
-    gMC->Gsvolu("QB18","TUBE", idtmed[kVac], ptube, 3);
-    for (i=0; i<15; i++) {
-       gMC->Gspos("QB18", i+1, "QBEM", 0.0, 0.0, 3.3-i*0.4, 0, "ONLY");
-    }
-    
-    ptube[0] = 2.90;
-    ptube[1] = 3.00;
-    ptube[2] = 1.20;
-    
-    gMC->Gsvolu("QB21","TUBE", idtmed[kVac], ptube, 3);
-    gMC->Gspos("QB21", 1 ,"QBEM", 0.0, 0.0, -4.5, 0 , "ONLY");
-    
-    ptube[0] = 3.250;
-    ptube[1] = 3.750;
-    ptube[2] = 0.005;
-    
-    gMC->Gsvolu("QB15","TUBE", idtmed[kInox], ptube, 3);
-    for (i=0; i<30; i++) {
-       gMC->Gspos("QB15", i+1, "QBEM", 0.0, 0.0, 3.4-i*0.2, 0, "ONLY");
-    }
-    
-    ptube[0] = 3.740;
-    ptube[1] = 3.750;
-    ptube[2] = 0.095;
-    
-    gMC->Gsvolu("QB16","TUBE", idtmed[kInox], ptube, 3);
-    for (i=0; i<15; i++) {
-       gMC->Gspos("QB16", i+1, "QBEM", 0.0, 0.0, 3.3-i*0.4, 0, "ONLY");
-    }
-    
-    ptube[0] = 3.250;
-    ptube[1] = 3.260;
-    ptube[2] = 0.095;
-    
-    gMC->Gsvolu("QB17","TUBE", idtmed[kInox], ptube, 3);
-    for (i=0; i<14; i++) {
-       gMC->Gspos("QB17", i+1, "QBEM", 0.0, 0.0, 3.1-i*0.4, 0, "ONLY");
+    Float_t pconQBE0[33];
+    pconQBE0[ 0]= 0;
+    pconQBE0[ 1]= 360;
+    pconQBE0[ 2]=  10;
+//  1
+    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[12] = -kdzbA+2.5+2.*kdzubA;
+    pconQBE0[13] = kRinSB;
+    pconQBE0[14] = 3.60;
+//  4
+    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[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[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] =  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.*kdzubA-36.*uw;
+    Float_t uz = ur/37.;
+    Float_t ut = uz+uw;
+    
+    pund[ 0] = 0;
+    pund[ 1] = 360;
+    pund[ 2] =  8;
+
+    pund[ 3] = -ut;
+    pund[ 4] = kRinSB;
+    pund[ 5] = kRinSB+uw;
+    
+    pund[ 6] = -ut+uz;
+    pund[ 7] = pund[4];
+    pund[ 8] = pund[5];
+    
+    pund[ 9] = pund[6];
+    pund[10] = pund[4];
+    pund[11] = 3.6;
+    
+    pund[12] = pund[9]+uw;
+    pund[13] = pund[10];
+    pund[14] = pund[11];
+    
+    pund[15] = pund[12];
+    pund[16] = 3.6-uw;
+    pund[17] = pund[14];
+    
+    pund[18] = pund[12]+uz;
+    pund[19] = pund[16];
+    pund[20] = pund[17];
+    
+    pund[21] = pund[18];
+    pund[22] = kRinSB;
+    pund[23] = pund[20];
+    
+    pund[24] = pund[21]+uw;
+    pund[25] = pund[22];
+    pund[26] = pund[23];
+
+    TVirtualMC::GetMC()->Gsvolu("QBEU", "PCON", idtmed[kInox], pund, 27);
+
+    for (i = 0; i < 18; i++)
+    {
+       dz = -kdzubA+(1+2*i)*ut;
+       TVirtualMC::GetMC()->Gspos("QBEU", i+1 ,"QBEM", 0.0, 0.0,   dz, 0 , "ONLY");
     }
-    
-    ptube[0] = 3.250;
-    ptube[1] = 3.260;
-    ptube[2] = 0.3975;
-
-    gMC->Gsvolu("QB14","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QB14", 2 ,"QBEM", 0.0, 0.0, -2.8025, 0 , "ONLY");
-    gMC->Gspos("QB14", 1 ,"QBEM", 0.0, 0.0,  3.8025, 0 , "ONLY");
-    
-    ptube[0] = 2.900;
-    ptube[1] = 3.260;
-    ptube[2] = 0.050;
-    
-    gMC->Gsvolu("QB13","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QB13", 2 ,"QBEM", 0.0, 0.0, -3.25, 0 , "ONLY");
-    gMC->Gspos("QB13", 1 ,"QBEM", 0.0, 0.0,  4.25, 0 , "ONLY");
-    
-    ptube[0] = 2.900;
-    ptube[1] = 3.000;
-    ptube[2] = 0.700;
-    
-    gMC->Gsvolu("QB12","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QB12", 1 ,"QBEM", 0.0, 0.0, 5.0, 0, "ONLY");
-
+    ptube[0] =  kRinSB;
+    ptube[1] =  kRinSB+uw;
+    ptube[2] =  uz;
+    TVirtualMC::GetMC()->Gsvolu("QBEW","TUBE", idtmed[kInox], ptube, 3);
+    TVirtualMC::GetMC()->Gspos("QBEW", 1 ,"QBEM", 0.0, 0.0,   kdzubA-uz, 0 , "ONLY");
 
 //
-//  pipe between Bellows
-    ptube[0] = 2.9;
-    ptube[1] = 3.0;
-    ptube[2] = dzbb/2.;
-    gMC->Gsvolu("QB23","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QB23", 1 ,"QBE0", 0.0, 0.0, 0.0, 0, "ONLY");
-    
+//  BeamPipe
+    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 Bellow
+//
+// **** Placement of various sections on non-absorber side ****
 //
-// End Bellow
-
-// **** placement of various sections on non-absorber side ****
     //
-    // first the beryllium section : 43.3 cm long on both sides of IP
-    // zstart=0, zend=43.3, length=43.3 on one side
-    Float_t zpos=0;
-    gMC->Gspos("QBBE", 1, "QBPM", 0., 0., zpos, 0, "ONLY");
+    // first the beryllium section
+    Float_t zpos = -(hlenQbbe2-hlenQbbe1)/2;
+    TVirtualMC::GetMC()->Gspos("QBBE", 1, "QBPM", 0., 0., zpos, 0, "ONLY");
 
     // next meta-metal transition QBT1 on on-absorber side
-    // zstart=43.3, zend=48.8, length=5.5
-    zpos = zpos + hlenQbbe + hlenQbt1;
-    gMC->Gspos("QBT1", 1, "QBPM", 0., 0.,  zpos, 0, "ONLY");
+//    zpos = zpos + hlenQbbe + hlenQbt1;
+//    TVirtualMC::GetMC()->Gspos("QBT1", 1, "QBPM", 0., 0.,  zpos, 0, "ONLY");
     
     // Aluminium OR Al-be alloy section
-    //zpos=zpos + hlenQbt1 + hlenQb10;
-    //gMC->Gspos("QB10", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
-    // zstart= 48.8, zend=335.4, length=286.6
-    zpos = zpos + hlenQbt1 + hlenQbab;
-    gMC->Gspos("QBAB", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
-
+    zpos = hlenQbbe1+hlenQbab;
+    TVirtualMC::GetMC()->Gspos("QBAB", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
+    //
     // inox flange at the start of bellow
-    // zstart=335.4, zend=339.8, length=4.4
-    cout<<" zpos 1 "<<zpos<<" hlenQbab "<<hlenQbab<<
-      " hlenQb29 "<< hlenQb29<<endl;
     zpos = zpos + hlenQbab + hlenQb29;
-     cout<<" zstart 1 "<<zpos-hlenQb29<<" zend 2 "<<zpos+hlenQb29<<endl;
-    gMC->Gspos("QB29", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
-
+    TVirtualMC::GetMC()->Gspos("QB29", 1, "QBPM", 0.0, 0.0, zpos, idrotm[2012], "ONLY");
+    //
     // bellow section
-    // zstart=339.8, zend=370.6, length=30.9
-    //    zpos = zpos + hlenQb29 + hlenQbe0;
     zpos = zpos + hlenQb29 + hlenQbe0;
-     cout<<" zstart "<<zpos-hlenQbe0<<" zend "<<zpos-hlenQbe0<<endl;
-   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
-    // zstart=370.6, zend=375.0, length=4.4
     zpos = zpos + hlenQbe0 + hlenQb29;
-     cout<<" zstart 1 "<<zpos-hlenQb29<<" zend 2 "<<zpos+hlenQb29<<endl;
-     gMC->Gspos("QB29", 2, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
-
-    // 2.5mm thick inox section to hang the pump
-    // zstart=375.0, zend=395.0, length=20.0
-    zpos = zpos + hlenQb29 + hlenQb26;
-     cout<<" zstart 1 "<<zpos-hlenQb29<<" zend 2 "<<zpos+hlenQb29<<endl;
-     gMC->Gspos("QB26", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY");
-
-    //inox flange at the end of pump section to join to next pipe
-    // zstart=395.0, zend=399.4, length=4.4
-    zpos = zpos + hlenQb26 + hlenQb29;
-    gMC->Gspos("QB29", 3, "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
-    // zstart=399.4, zend=800., length=400.6
     zpos = zpos + hlenQb29 + hlenQb28;
-    gMC->Gspos("QB28", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY"); 
-
-
-    // aluminium collars and support rollers at two places
-
-    ptube[0] = 3.0;
-    ptube[1] = 3.15;
-    ptube[2] = 2.75;
-
-    gMC->Gsposp("QB25", 1, "QBPM", 0., 0., 654.8, 0, "ONLY", ptube, 3);
-    gMC->Gspos("QBRM", 1, "QBPM", 0., 0., 654.8, 0, "ONLY");
-
-    ptube[0] = 3.05;
-    ptube[1] = 3.20;
-    gMC->Gsposp("QB25", 2, "QBPM", 0., 0., 254.8, 0, "ONLY", ptube, 3);
-    gMC->Gspos("QBRM", 2, "QBPM", 0., 0., 254.8, 0, "ONLY");
-
-
-
-//******** end of placement on no-absorber side *********
-
+    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 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
+//    
+    TVirtualMC::GetMC()->Gsvolu("QB24","TUBE", idtmed[kInox], ptube, 0);
+    ptube[0] = kRinSt;
+    ptube[1] = kRoutSt;
+    ptube[2] = hlenQb24[0];
+    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
 
-// beam pipe between metal-metal transition and bellows
-    ptube[0] = 2.9;
-    ptube[1] = 3.0;
-    ptube[2] = (81.7-(2.*dzb+dzbb)-(hlenQbbe+5.5))/2.;
+    dz = dz+hlenQb24[0] + kdzbA;
+    TVirtualMC::GetMC()->Gspos("QBE0", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY");
+//
+    ptube[2] = hlenQb24[1];
+    dz = dz + kdzb + ptube[2];
+    TVirtualMC::GetMC()->Gsposp("QB24", 2 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY", ptube, 3);
+    dz = dz + ptube[2];
     
-
-    gMC->Gsvolu("QB24","TUBE", idtmed[kInox], ptube, 3);
-//  z = 48.8 - 50.9    
-    dz = (hlenQbbe+5.5)+ptube[2];
-    gMC->Gspos("QB24", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY");
 //
-// beam pipe between flange and bellows    
-    ptube[0] = 2.90;
-    ptube[1] = 3.00;
-    ptube[2] = 0.45;
-
-    gMC->Gsvolu("QB22","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QB22", 1 ,"QBPM", 0.0, 0.0, -82.15, 0, "ONLY");
-
-// 
 // Flange
 // 
 //  Mother Volume
-    ptube[0] = 2.900;
+    ptube[0] = kRinSB;
     ptube[1] = 4.300;
-    ptube[2] = 1.400;
-    
-    gMC->Gsvolu("QFA0","TUBE", idtmed[kAlu], ptube, 3);
-    gMC->Gspos("QFA0", 1 ,"QBPM", 0.0, 0.0, -84.0, 0, "ONLY");
-//
-//  inner Inox piece
-    ptube[0] = 2.900;
-    ptube[1] = 3.500;
-    ptube[2] = 0.450;
-    gMC->Gsvolu("QFA1","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QFA1", 1 ,"QFA0", 0.0, 0.0, 0.225, 0, "ONLY");
-//
-//  8 x M5 Inox
-    ptube[0] = 0.000;
-    ptube[1] = 0.250;
-    ptube[2] = 1.400;
-    gMC->Gsvolu("QFA2","TUBE", idtmed[kInox], ptube, 3);
-    for (i=0; i<8; i++) {
-       Float_t phi = i*45.*kDegrad;
-       Float_t xpos = 3.9*TMath::Sin(phi);
-       Float_t ypos = 3.9*TMath::Cos(phi);
-       gMC->Gspos("QFA2", i+1, "QFA0", xpos, ypos, 0., 0, "ONLY");
-    }
-
-
-    ptube[0] = 2.900;
-    ptube[1] = 3.000;
-    ptube[2] = 2.300;
+    ptube[2] = 1.4;
     
-    gMC->Gsvolu("QB32","TUBE", idtmed[kInox], ptube, 3);
-    gMC->Gspos("QB32", 1 ,"QBPM", 0.0, 0.0, -90.+2.3, 0, "ONLY");
-
-    //bellow on absorber side
-    ptube[2] = (2.*dzb+dzbb)/2.;
-    dz = (81.7-ptube[2]);
-    gMC->Gspos("QBE0", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY");
-
+    TVirtualMC::GetMC()->Gsvolu("QFA0","TUBE", idtmed[kInox], ptube, 3);
+    dz = dz + ptube[2];
+    TVirtualMC::GetMC()->Gspos("QFA0", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY");
+    dz = dz + ptube[2];
+//
+//
+    ptube[0] = kRinSB;
+    ptube[1] = kRoutSB;
+    ptube[2] = hlenQb24[2];
+    dz = dz + ptube[2];
+    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");
+    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");
 
 
 //
@@ -799,55 +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);
 // <-
-    Float_t zPump = 415.;
-    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");
-
-    gMC->Gsatt("QBPM", "SEEN", 1);
-    gMC->Gsatt("QBEM", "SEEN", 1);
+    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");
+
+    gGeoManager->SetVolumeAttribute("QBPM", "SEEN", 1);
+    gGeoManager->SetVolumeAttribute("QBEM", "SEEN", 1);
 }
 
 
@@ -859,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. };
@@ -870,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);
@@ -882,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);
@@ -895,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. 
@@ -917,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);
@@ -930,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);
 
 }