Air defined as mixture.

diff --git a/STRUCT/AliABSO.cxx b/STRUCT/AliABSO.cxx
index 6943700fb9d67341b9dc1094c9da5593f60d8324..2ef2f94a6708585e037290d458f3aa4514f41f3c 100644 (file)
--- a/STRUCT/AliABSO.cxx
+++ b/STRUCT/AliABSO.cxx
@@ -88,15 +88,31 @@ void AliABSO::CreateMaterials()
   //
   Int_t   isxfld = gAlice->Field()->Integ();
   Float_t sxmgmx = gAlice->Field()->Max();
-  
+//
+// 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;
+
+//
+// Polyethylene
+//
   Float_t apoly[2]  = { 12.01,1. };
   Float_t zpoly[2]  = { 6.,1. };
   Float_t wpoly[2]  = { .33,.67 };
+//
+// Concrete
+//
   Float_t aconc[10] = { 1.,12.01,15.994,22.99,24.305,26.98,
                        28.086,39.1,40.08,55.85 };
   Float_t zconc[10] = { 1.,6.,8.,11.,12.,13.,14.,19.,20.,26. };
   Float_t wconc[10] = { .01,.001,.529107,.016,.002,.033872,
                        .337021,.013,.044,.014 };
+//
+// Steel
+//  
   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 };
@@ -162,9 +178,9 @@ void AliABSO::CreateMaterials()
   AliMaterial(53, "LEAD$     ", 207.19, 82., 11.35, .56, 18.5);
   //
   //     Air 
-  AliMaterial(15, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500.);
-  AliMaterial(35, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500.);
-  AliMaterial(55, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500.);
+  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(55, "AIR$      ", aAir, zAir, dAir, 4, wAir);
   //
   //     Vacuum 
   AliMaterial(16, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);

diff --git a/STRUCT/AliDIPOv2.cxx b/STRUCT/AliDIPOv2.cxx
index 12c1fff152b7a849008ae8e6d79b7a6580327418..46c99f35c18a82aeab1cec2bd91707e4aed265b5 100644 (file)
--- a/STRUCT/AliDIPOv2.cxx
+++ b/STRUCT/AliDIPOv2.cxx
@@ -822,6 +822,12 @@ void AliDIPOv2::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 };
@@ -859,11 +865,10 @@ void AliDIPOv2::CreateMaterials()
   AliMaterial(17, "COPPER$   ", 63.55, 29., 8.96, 1.43, 15.1);
   AliMaterial(37, "COPPER$   ", 63.55, 29., 8.96, 1.43, 15.1);
   AliMaterial(57, "COPPER$   ", 63.55, 29., 8.96, 1.43, 15.1);
-    //     Air 
-  AliMaterial(15, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
-  AliMaterial(35, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
-  AliMaterial(55, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
-  
+  //     Air 
+  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(55, "AIR$      ", aAir, zAir, dAir, 4, wAir);
   //     Vacuum 
   AliMaterial(16, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
   AliMaterial(36, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);

diff --git a/STRUCT/AliFRAMEv2.cxx b/STRUCT/AliFRAMEv2.cxx
index f1d00504f00bd97d50350e2dc14814d4317a4bbf..439638fa25ea89317ac9ed3d491e5ff77ac17400 100644 (file)
--- a/STRUCT/AliFRAMEv2.cxx
+++ b/STRUCT/AliFRAMEv2.cxx
@@ -1261,6 +1261,13 @@ 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 };
@@ -1268,7 +1275,8 @@ void AliFRAMEv2::CreateMaterials()
   AliMixture(65, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
   AliMaterial(5, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500.);
   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);
+  AliMixture(5, "AIR$      ", aAir, zAir, dAir,4, wAir);
+
 }
 
 //_____________________________________________________________________________

diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx
index d577d6ac1543bcc8807e2035c17865bf19dbf8f7..0ce57eab214eec33f8c11672c422da2a9965433f 100644 (file)
--- a/STRUCT/AliHALL.cxx
+++ b/STRUCT/AliHALL.cxx
@@ -290,16 +290,24 @@ void AliHALL::CreateMaterials()
   Float_t zconc[10] = { 1.,6.,8.,11.,12.,13.,14.,19.,20.,26. };
   Float_t wconc[10] = { .01,.001,.529107,.016,.002,.033872,.337021,.013,.044,.014 };
   
+
+  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 epsil, stmin, deemax, tmaxfd, stemax;
 
   //     FOR CONCRETE 
   
   AliMaterial(10, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
   AliMaterial(30, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
-  AliMaterial(50, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1);
-  AliMaterial(15, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
-  AliMaterial(35, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
-  AliMaterial(55, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
+  AliMaterial(50, "IRON$     ", 55.85, 26., 7.87, 1.76, 17.1); 
+
+  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(55, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+
   AliMixture(17, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);
   AliMixture(37, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);
   AliMixture(57, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);

diff --git a/STRUCT/AliMAG.cxx b/STRUCT/AliMAG.cxx
index e8178294f4fe7b200b1ac6caaecbf708070ad546..82fabd9a3c7bbe21bad7d95edec35b120dd91921 100644 (file)
--- a/STRUCT/AliMAG.cxx
+++ b/STRUCT/AliMAG.cxx
@@ -232,8 +232,16 @@ void AliMAG::CreateMaterials()
   Float_t sxmgmx = gAlice->Field()->Max();
   
   Float_t epsil, stmin, deemax, tmaxfd, stemax;
+
+
   // --- Define the various materials for GEANT --- 
   
+  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;
+
+
   //     Aluminum 
   AliMaterial(9, "Al$", 26.98, 13., 2.7, 8.9, 37.2);
   AliMaterial(29, "Al$", 26.98, 13., 2.7, 8.9, 37.2);
@@ -243,8 +251,8 @@ void AliMAG::CreateMaterials()
   AliMaterial(30, "Fe$", 55.85, 26., 7.87, 1.76, 17.1);
   
   //     Air 
-  AliMaterial(15, "Air$", 14.61, 7.3, .001205, 30420., 67500);
-  AliMaterial(35, "Air$", 14.61, 7.3, .001205, 30420., 67500);
+  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR$      ", aAir, zAir, dAir, 4, wAir);
   
   // **************** 
   //     Defines tracking media parameters. 

diff --git a/STRUCT/AliPIPEv0.cxx b/STRUCT/AliPIPEv0.cxx
index f283cf7febaf29434a0405e275f59f70eb1f3e0d..1b8b7762e3c852aa9f291c361764e71287006f44 100644 (file)
--- a/STRUCT/AliPIPEv0.cxx
+++ b/STRUCT/AliPIPEv0.cxx
@@ -722,7 +722,14 @@ void AliPIPEv0::CreateMaterials()
   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;
+
   //
   //     Berillium 
   AliMaterial(5, "BERILLIUM$", 9.01, 4., 1.848, 35.3, 36.7);
@@ -734,7 +741,7 @@ 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);
   //
   //     Vacuum 
   AliMaterial(16, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);

diff --git a/STRUCT/AliSHIL.cxx b/STRUCT/AliSHIL.cxx
index f014a69f7621d6c01124b9ec3a17a2e89c3e5eeb..de5a54cb385cdc479e9811767e320af489f95cb3 100644 (file)
--- a/STRUCT/AliSHIL.cxx
+++ b/STRUCT/AliSHIL.cxx
@@ -96,7 +96,15 @@ void AliSHIL::CreateMaterials()
   Float_t ains[4] ={28.0855, 15.9994, 47.867,  26.982};
   Float_t zins[4] ={14.,      8.    , 22.   ,  13.   };
   Float_t wins[4] ={ 0.3019,  0.4887,  0.1914,  0.018};
+//
+// 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 epsil, stmin, tmaxfd, deemax, stemax;
   
   //     STEEL 
@@ -133,10 +141,10 @@ void AliSHIL::CreateMaterials()
   AliMaterial(53, "LEAD$     ", 207.19, 82., 11.35, .56, 18.5);
   
   //     Air 
-  AliMaterial(15, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
-  AliMaterial(35, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
-  AliMaterial(55, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
-  
+  AliMixture(15, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(55, "AIR$      ", aAir, zAir, dAir, 4, wAir);
+  //
   //     Vacuum 
   AliMaterial(16, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
   AliMaterial(36, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);