Corrected air and vacuum.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 12 Aug 2004 06:47:50 +0000 (06:47 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 12 Aug 2004 06:47:50 +0000 (06:47 +0000)
STRUCT/AliABSO.cxx
STRUCT/AliBODY.cxx
STRUCT/AliDIPOv2.cxx
STRUCT/AliFRAMEv2.cxx
STRUCT/AliHALL.cxx
STRUCT/AliMAG.cxx
STRUCT/AliSHIL.cxx

index 2ef2f94..ae8deff 100644 (file)
@@ -95,7 +95,7 @@ void AliABSO::CreateMaterials()
   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;
 //
 // Polyethylene
 //
@@ -139,6 +139,7 @@ void AliABSO::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};
+  
 //
   Float_t epsil, stmin, tmaxfd, deemax, stemax;
   //
@@ -183,9 +184,9 @@ void AliABSO::CreateMaterials()
   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);
-  AliMaterial(56, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
+  AliMixture(16, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(36, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(56, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
   //
   //     Concrete 
   AliMixture(17, "CONCRETE$", aconc, zconc, 2.35, 10, wconc);
index 8ee2a74..f74c0b1 100644 (file)
@@ -141,9 +141,17 @@ void AliBODY::CreateMaterials()
 // Create materials and media
   Int_t isxfld = gAlice->Field()->Integ();
   Float_t sxmgmx = gAlice->Field()->Max();
-  //
-  AliMaterial(1,"Vacuum  $",1.e-16,1.e-16,1.e-16,1.e16,1.e16);
-  AliMaterial(2,"Air     $",14.61,7.3,0.001205,30420,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;
+  Float_t dAir1 = 1.20479E-10;
+  //
+  AliMixture(1,"Vacuum  $",aAir,zAir,dAir1,4,wAir);
+  AliMixture(2,"Air     $",aAir,zAir,dAir,4,wAir);
   AliMaterial(3,"Be      $", 9.01,4 ,1.848   ,35.30,36.70);
   //
   AliMedium(1,"Vacuum  $",1,0,isxfld,sxmgmx,10,1,0.1,0.1,10);
index 46c99f3..3bf5892 100644 (file)
@@ -822,11 +822,6 @@ 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. };
@@ -847,6 +842,14 @@ void AliDIPOv2::CreateMaterials()
   Float_t aAlCon[2] = { 14.61, 26.98};
   Float_t zAlCon[2] = { 7.3, 13.};
   Float_t wAlCon[2] = { .0004,.9996};
+  
+    // 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;
 
   
   Float_t epsil, stmin, deemax, tmaxfd, stemax;
@@ -870,9 +873,9 @@ void AliDIPOv2::CreateMaterials()
   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);
-  AliMaterial(56, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
+  AliMixture(16, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(36, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(56, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
   
   //     stainless Steel 
   AliMixture(19, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
index 6026ed8..7ac0e0d 100644 (file)
@@ -1260,17 +1260,18 @@ void AliFRAMEv2::CreateMaterials()
   stmin  = -.8;
   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 };
+  
+  //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(65, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);
   AliMixture(5, "AIR$      ", aAir, zAir, dAir,4, wAir);
index 0ce57ea..c806ec5 100644 (file)
@@ -290,7 +290,6 @@ 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};
index 82fabd9..cd6885e 100644 (file)
@@ -230,7 +230,6 @@ void AliMAG::CreateMaterials()
   
   Int_t   isxfld = gAlice->Field()->Integ();
   Float_t sxmgmx = gAlice->Field()->Max();
-  
   Float_t epsil, stmin, deemax, tmaxfd, stemax;
 
 
index de5a54c..83928e1 100644 (file)
@@ -103,6 +103,7 @@ void AliSHIL::CreateMaterials()
   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;
 
   
   Float_t epsil, stmin, tmaxfd, deemax, stemax;
@@ -144,11 +145,11 @@ void AliSHIL::CreateMaterials()
   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);
-  AliMaterial(56, "VACUUM$ ", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
+  AliMixture(16, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(36, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
+  AliMixture(56, "VACUUM$ ", aAir, zAir, dAir1, 4, wAir);
   
   //     Stainless Steel 
   AliMixture(19, "STAINLESS STEEL$", asteel, zsteel, 7.88, 4, wsteel);