Replacing materials by correct mixtures

diff --git a/MUON/AliMUONv0.cxx b/MUON/AliMUONv0.cxx
index 5c66c7dbab934e6968a04bb5bc452ee5bb793580..d45f60db1e27e367c088707dfe70a9c8144e76b1 100644 (file)
--- a/MUON/AliMUONv0.cxx
+++ b/MUON/AliMUONv0.cxx
@@ -111,23 +111,29 @@ void AliMUONv0::CreateGeometry()
 void AliMUONv0::CreateMaterials()
 {
 // Creates materials for coarse geometry
-    AliMaterial(15, "AIR$      ", 14.61,  7.3, .001205, 30423.24, 67500);
-    AliMaterial( 9, "ALUMINIUM$", 26.98, 13. , 2.7, 8.9, 37.2);
-
-    Float_t epsil  = .001; // Tracking precision, 
-    Float_t stemax = -1.;  // Maximum displacement for multiple scat 
-    Float_t tmaxfd = -20.; // Maximum angle due to field deflection 
-    Float_t deemax = -.3;  // Maximum fractional energy loss, DLS 
-    Float_t stmin  = -.8;
-    Int_t isxfld   = gAlice->Field()->Integ();
-    Float_t sxmgmx = gAlice->Field()->Max();
-
-    //
-    //    Air 
-    AliMedium(1, "AIR_CH_US         ", 15, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(4, "ALU_CH_US         ",  9, 0, isxfld, sxmgmx, tmaxfd, fMaxStepAlu, 
+// 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;
+  AliMixture(15, "AIR$      ", aAir,  zAir, dAir,4, wAir);
+  //  AliMaterial(15, "AIR$      ", 14.61,  7.3, .001205, 30423.24, 67500);
+  AliMaterial( 9, "ALUMINIUM$", 26.98, 13. , 2.7, 8.9, 37.2);
+
+  Float_t epsil  = .001; // Tracking precision, 
+  Float_t stemax = -1.;  // Maximum displacement for multiple scat 
+  Float_t tmaxfd = -20.; // Maximum angle due to field deflection 
+  Float_t deemax = -.3;  // Maximum fractional energy loss, DLS 
+  Float_t stmin  = -.8;
+  Int_t isxfld   = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
+  
+  //
+  //    Air 
+  AliMedium(1, "AIR_CH_US         ", 15, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(4, "ALU_CH_US         ",  9, 0, isxfld, sxmgmx, tmaxfd, fMaxStepAlu, 
            fMaxDestepAlu, epsil, stmin);
-
+  
 }
 
 void AliMUONv0::Init()

diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index 354760ca45c4c5d275e453dfc2c561e070c0cb87..9436d92382455d03ecec6aa613ee2110e01f64bb 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -297,7 +297,13 @@ void AliMUONv1::CreateMaterials()
     // --- Define the various materials for GEANT --- 
     AliMaterial(9, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
     AliMaterial(10, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
-    AliMaterial(15, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
+    // 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;
+    AliMixture(15, "AIR$      ", aAir,  zAir, dAir,4, wAir);
+    //    AliMaterial(15, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
     AliMixture(19, "Bakelite$", abak, zbak, dbak, -3, wbak);
     AliMixture(20, "ArC4H10 GAS$", ag, zg, dg, 3, wg);
     AliMixture(21, "TRIG GAS$", atrig, ztrig, dtrig, -5, wtrig);

diff --git a/MUON/AliMUONv3.cxx b/MUON/AliMUONv3.cxx
index 71a67650ade24ad741fa5ff1945d41ea5729b8e8..748c2da1044c99ad540ef1a7ec84f53c6abd5526 100644 (file)
--- a/MUON/AliMUONv3.cxx
+++ b/MUON/AliMUONv3.cxx
@@ -1539,7 +1539,13 @@ void AliMUONv3::CreateMaterials()
     // --- Define the various materials for GEANT --- 
     AliMaterial(9, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
     AliMaterial(10, "ALUMINIUM$", 26.98, 13., 2.7, 8.9, 37.2);
-    AliMaterial(15, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
+    // 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;
+    AliMixture(15, "AIR$      ", aAir,  zAir, dAir,4, wAir);
+    //    AliMaterial(15, "AIR$      ", 14.61, 7.3, .001205, 30423.24, 67500);
     AliMixture(19, "Bakelite$", abak, zbak, dbak, -3, wbak);
     AliMixture(20, "ArC4H10 GAS$", ag, zg, dg, 3, wg);
     AliMixture(21, "TRIG GAS$", atrig, ztrig, dtrig, -5, wtrig);