CMake: Changing DA detector name to DA0 to match DAQ settings

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

diff --git a/STRUCT/AliSHIL.cxx b/STRUCT/AliSHIL.cxx
index 70a9cc65d2e30def7502e520417cf9aed28024a4..a7f8efaefcf194b74ba43d50a53a774324feb196 100644 (file)
--- a/STRUCT/AliSHIL.cxx
+++ b/STRUCT/AliSHIL.cxx
@@ -29,6 +29,8 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TGeoGlobalMagField.h>
+
 #include "AliSHIL.h"
 #include "AliRun.h"
 #include "AliMagF.h"
@@ -71,10 +73,10 @@ void AliSHIL::CreateMaterials()
   //
   // Defines materials for the muon shield
   //
-  Int_t   isxfld1 = gAlice->Field()->Integ();
-  Int_t   isxfld2 = gAlice->Field()->PrecInteg();
+  Int_t   isxfld1 = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();
+  Int_t   isxfld2 = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->PrecInteg();
 
-  Float_t sxmgmx = gAlice->Field()->Max();
+  Float_t sxmgmx = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
 // Steel  
   Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
   Float_t zsteel[4] = { 26.,24.,28.,14. };
@@ -107,7 +109,12 @@ void AliSHIL::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;
-
+//
+// Cast iron
+//
+  Float_t acasti[4] = {55.847,12.011,28.085,54.938};
+  Float_t zcasti[4] = {26.,6.,14.,25.};
+  Float_t wcasti[4] = {0.929,0.035,0.031,0.005};
   
   Float_t epsil, stmin, tmaxfd, deemax, stemax;
   
@@ -179,6 +186,11 @@ void AliSHIL::CreateMaterials()
   AliMixture(14, "INSULATION1", ains, zins, 0.41, 4, wins);
   AliMixture(34, "INSULATION2", ains, zins, 0.41, 4, wins);
   AliMixture(54, "INSULATION3", ains, zins, 0.41, 4, wins);
+
+  //     Cast iron
+  AliMixture(18, "CAST IRON1", acasti, zcasti, 7.2, 4, wcasti);
+  AliMixture(38, "CAST IRON2", acasti, zcasti, 7.2, 4, wcasti);
+  AliMixture(58, "CAST IRON3", acasti, zcasti, 7.2, 4, wcasti);
   
   // **************** 
   //     Defines tracking media parameters. 
@@ -252,12 +264,11 @@ void AliSHIL::CreateMaterials()
   AliMedium(37, "CC_C1           ", 37, 0, 0,      sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   AliMedium(57, "CC_C2           ", 57, 0, 0,      sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
-}
-
-//_____________________________________________________________________________
-void AliSHIL::DrawModule () const
-{
-    // Drawing options
+  //    Cast iron 
+  AliMedium(18, "CAST_IRON0      ", 18, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(38, "CAST_IRON1      ", 38, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(58, "CAST_IRON2      ", 58, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
 }
 
 //_____________________________________________________________________________