- data member was shadowed (fTree)

[u/mrichter/AliRoot.git] / STRUCT / AliPIPEv0.cxx

diff --git a/STRUCT/AliPIPEv0.cxx b/STRUCT/AliPIPEv0.cxx
index dd3f629f28e43168981c1d5784c9f47aca7d2ddb..23318df0d5c24d734dd95e5ead01b1f45db7a01f 100644 (file)
--- a/STRUCT/AliPIPEv0.cxx
+++ b/STRUCT/AliPIPEv0.cxx
@@ -23,6 +23,7 @@
 
 #include <Riostream.h>
 
+#include <TGeoGlobalMagField.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
 
@@ -33,20 +34,21 @@
 #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();
 }
 
  
@@ -114,8 +116,8 @@ 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;
@@ -350,8 +352,15 @@ void AliPIPEv0::CreateGeometry()
     ptube[2] =   hlenQb28;    
 
     gMC->Gsvolu("QB28","TUBE", idtmed[kInox], ptube, 3);
+//
+//
+// Air with high transport cuts outside QB28
+    ptube[0] =   25.;
+    ptube[1] =   100.;
+    ptube[2] =   hlenQb28;    
 
-
+    gMC->Gsvolu("QA28","TUBE", idtmed[kAirHigh], ptube, 3);
+    gMC->Gsatt("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)
@@ -537,6 +546,7 @@ void AliPIPEv0::CreateGeometry()
     //last inox section till 800 cm
     zpos = zpos + hlenQb29 + hlenQb28;
     gMC->Gspos("QB28", 1, "QBPM", 0.0, 0.0, zpos, 0, "ONLY"); 
+    gMC->Gspos("QA28", 1, "ALIC", 0.0, 0.0, zpos, 0, "ONLY"); 
     
 //******** end of placement on non-absorber side *********
     //
@@ -708,8 +718,8 @@ void AliPIPEv0::CreateMaterials()
   //
 
   AliDebugClass(1,"Create PIPEv0 materials");
-  Int_t   isxfld = gAlice->Field()->Integ();
-  Float_t sxmgmx = gAlice->Field()->Max();
+  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. };
@@ -731,7 +741,13 @@ void AliPIPEv0::CreateMaterials()
   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);
@@ -743,7 +759,8 @@ void AliPIPEv0::CreateMaterials()
   AliMaterial(9,  "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
   //
   //     Air 
-  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(15, "AIR$",      aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR_HIGH$", aAir, zAir, dAir, 4, wAir);
   //
   //     Vacuum 
   AliMixture(16, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
@@ -760,7 +777,9 @@ void AliPIPEv0::CreateMaterials()
   //   
   AliMixture(22, "PA$", aPA, zPA, 1.14, -4, wPA);
   //
-
+  //     Kapton
+  AliMixture(23, "KAPTON", aKapton, zKapton, dKapton, 4, wKapton);
+  //
   // **************** 
   //     Defines tracking media parameters. 
   //
@@ -782,7 +801,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);
@@ -798,6 +818,9 @@ void AliPIPEv0::CreateMaterials()
   //
   //   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);
 
 }