Correction in defintion of air.

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

diff --git a/STRUCT/AliFRAMEv2.cxx b/STRUCT/AliFRAMEv2.cxx
index c356c341afb9e21b4e1ce5703b1e74b085fdf810..6026ed84baf4bd47194ce6953b3d4d968bd9cb92 100644 (file)
--- a/STRUCT/AliFRAMEv2.cxx
+++ b/STRUCT/AliFRAMEv2.cxx
@@ -463,7 +463,7 @@ void AliFRAMEv2::CreateGeometry()
 
 // The internal frame
 //
-  char*  module[3] = {"B071\0", "B074\0", "B075\0"};
+  const char*  module[3] = {"B071\0", "B074\0", "B075\0"};
 //
 //
 //  Mother Volumes
@@ -849,70 +849,41 @@ void AliFRAMEv2::CreateGeometry()
       gMC->Gspos("B056", 2*jmod+1, module[jmod],  61.9607, 0.0, 27.2, 0           , "ONLY");
       gMC->Gspos("B056", 2*jmod+2, module[jmod], -61.9607, 0.0, 27.2, idrotm[2085], "ONLY");
   }
-//
-// Mother volumes for TRD and TOF 
-// 
-  if (!fHoles) {
-      printf("\n FRAME Version without Holes !");
-      ptrd1[0] = 49.8065;
-      ptrd1[1] = 62.8535;
-      ptrd1[2] = 375.5;
-      ptrd1[3] = 37.;
-      gMC->Gsvolu("BTR1", "TRD1", kAir, ptrd1, 4);
-      gMC->Gsvolu("BTR2", "TRD1", kAir, ptrd1, 4);
-      gMC->Gsvolu("BTR3", "TRD1", kAir, ptrd1, 4);  
-      
-      ptrd1[0] = 63.2061;
-      ptrd1[1] = 68.3192;
-      ptrd1[2] = 375.5;
-      ptrd1[3] = 14.5;
-      gMC->Gsvolu("BTO1", "TRD1", kAir, ptrd1, 4);
-      gMC->Gsvolu("BTO2", "TRD1", kAir, ptrd1, 4);
-      gMC->Gsvolu("BTO3", "TRD1", kAir, ptrd1, 4);  
-      
-      gMC->Gspos("BTR1", 1, "B071", 0., 0., -10.8, 0, "ONLY");
-      gMC->Gspos("BTR2", 1, "B074", 0., 0., -10.8, 0, "ONLY");
-      gMC->Gspos("BTR3", 1, "B075", 0., 0., -10.8, 0, "ONLY");
+
+  //
+  // TRD mother volumes
+  //
+  ptrd1[0] = 49.8065;
+  ptrd1[1] = 62.8535;
+  ptrd1[2] = 375.5;
+  ptrd1[3] = 37.;
+
+  gMC->Gsvolu("BTR1", "TRD1", kAir, ptrd1, 4);
+  gMC->Gsvolu("BTR2", "TRD1", kAir, ptrd1, 4);
+  gMC->Gsvolu("BTR3", "TRD1", kAir, ptrd1, 4);  
+
       
-      gMC->Gspos("BTO1", 1, "B071", 0., 0.,  42.69, 0, "ONLY");
-      gMC->Gspos("BTO2", 1, "B074", 0., 0.,  42.69, 0, "ONLY");
-      gMC->Gspos("BTO3", 1, "B075", 0., 0.,  42.69, 0, "ONLY");
-  } else {
-      printf("\n FRAME Version with Holes !");
-      ptrd1[0] = 49.8065;
-      ptrd1[1] = 62.8535;
-      ptrd1[2] = 375.5;
-      ptrd1[3] = 37;
-      gMC->Gsvolu("BTR1", "TRD1", kAir, ptrd1, 4);
-      ptrd1[2] = 156.75;
-      gMC->Gsvolu("BTR2", "TRD1", kAir, ptrd1, 4);
-      ptrd1[2] =  79.75;
-      gMC->Gsvolu("BTR3", "TRD1", kAir, ptrd1, 4);  
-
-      ptrd1[0] = 63.2061;
-      ptrd1[1] = 68.3192;
-      ptrd1[2] = 375.5;
-      ptrd1[3] = 14.5;
-      gMC->Gsvolu("BTO1", "TRD1", kAir, ptrd1, 4);
-      ptrd1[2] = 156.75;
-      gMC->Gsvolu("BTO2", "TRD1", kAir, ptrd1, 4);
-      ptrd1[2] =  79.75;
-      gMC->Gsvolu("BTO3", "TRD1", kAir, ptrd1, 4);  
+  gMC->Gspos("BTR1", 1, "B071", 0., 0., -10.8, 0, "ONLY");
+  gMC->Gspos("BTR2", 1, "B074", 0., 0., -10.8, 0, "ONLY");
+  gMC->Gspos("BTR3", 1, "B075", 0., 0., -10.8, 0, "ONLY");
+
+
+//
+// TOF  mother volumes
+//
+  ptrd1[0] = 63.2061;
+  ptrd1[1] = 68.3192;
+  ptrd1[2] = 375.5;
+  ptrd1[3] = 14.5;
+  gMC->Gsvolu("BTO1", "TRD1", kAir, ptrd1, 4);
+  gMC->Gsvolu("BTO2", "TRD1", kAir, ptrd1, 4);
+  gMC->Gsvolu("BTO3", "TRD1", kAir, ptrd1, 4);  
       
+     
+  gMC->Gspos("BTO1", 1, "B071", 0., 0.,  42.69, 0, "ONLY");
+  gMC->Gspos("BTO2", 1, "B074", 0., 0.,  42.69, 0, "ONLY");
+  gMC->Gspos("BTO3", 1, "B075", 0., 0.,  42.69, 0, "ONLY");
 
-      gMC->Gspos("BTR1", 1, "B071", 0.,    0.00, -10.8,            0, "ONLY");
-      gMC->Gspos("BTR2", 1, "B074", 0., -218.75, -10.8, idrotm[2070], "ONLY");
-      gMC->Gspos("BTR2", 2, "B074", 0.,  218.75, -10.8,            0, "ONLY");
-      gMC->Gspos("BTR3", 1, "B075", 0., -295.75, -10.8, idrotm[2070], "ONLY");
-      gMC->Gspos("BTR3", 2, "B075", 0.,  295.75, -10.8,            0, "ONLY");
-
-      gMC->Gspos("BTO1", 1, "B071", 0.,    0.00, 42.69,            0, "ONLY");
-      gMC->Gspos("BTO2", 1, "B074", 0., -218.75, 42.69, idrotm[2070], "ONLY");
-      gMC->Gspos("BTO2", 2, "B074", 0.,  218.75, 42.69,            0, "ONLY");
-      gMC->Gspos("BTO3", 1, "B075", 0., -295.75, 42.69, idrotm[2070], "ONLY");
-      gMC->Gspos("BTO3", 2, "B075", 0.,  295.75, 42.69,            0, "ONLY");
-  }
-  
 //
 //    Geometry of Rails starts here
 //
@@ -1290,14 +1261,23 @@ void AliFRAMEv2::CreateMaterials()
   Int_t   isxfld = gAlice->Field()->Integ();
   Float_t sxmgmx = gAlice->Field()->Max();
   
+  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 asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
   Float_t zsteel[4] = { 26.,24.,28.,14. };
   Float_t wsteel[4] = { .715,.18,.1,.005 };
 
   AliMixture(65, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
-  AliMaterial(5, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500.);
+  AliMixture(5, "AIR$      ", aAir, zAir, dAir,4, wAir);
+
   AliMedium(65, "Stainless Steel", 65, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium( 5, "Air            ", 5, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium( 5, "Air", 5, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+
 }
 
 //_____________________________________________________________________________