added slewing correction by data

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

diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx
index 36752602c3d22fefcf82da68d1ec3830fddfa27e..3b7a229479ef5b41fe1ffe30c768c2f83291ce27 100644 (file)
--- a/STRUCT/AliHALL.cxx
+++ b/STRUCT/AliHALL.cxx
@@ -36,7 +36,9 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TGeoGlobalMagField.h>
 #include <TVirtualMC.h>
+#include <TArrayI.h>
 
 #include "AliConst.h"
 #include "AliHALL.h"
@@ -272,7 +274,7 @@ void AliHALL::CreateMaterials()
   //
     
   Int_t   isxfld = 0;
-  Float_t sxmgmx = gAlice->Field()->Max();
+  Float_t sxmgmx = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
   
   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. };
@@ -303,6 +305,10 @@ void AliHALL::CreateMaterials()
   AliMixture(10, "STAINLESS STEEL1", asteel, zsteel, 7.88, 4, wsteel);
   AliMixture(30, "STAINLESS STEEL2", asteel, zsteel, 7.88, 4, wsteel);
   AliMixture(50, "STAINLESS STEEL3", asteel, zsteel, 7.88, 4, wsteel);
+  // Iron
+  //
+  AliMaterial(52, "IRON", 55.85, 26., 7.87, 1.76, 17.1);
+  
   
   // **************** 
   //     Defines tracking media parameters. 
@@ -331,6 +337,9 @@ void AliHALL::CreateMaterials()
   AliMedium(17, "CC_C0            ", 17, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   AliMedium(37, "CC_C1            ", 37, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   AliMedium(57, "CC_C2            ", 57, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+
+  // Iron
+  AliMedium(52, "FE_C2            ", 52, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 }
 
 //_____________________________________________________________________________
@@ -354,58 +363,3 @@ void AliHALL::Init()
   }
 }
 
-//_____________________________________________________________________________
-void AliHALL::DrawModule() const
-{
-  //
-  // Draw a shaded view of Experimental Hall
-  //
-
-  // Set everything unseen
-  gMC->Gsatt("*", "seen", -1);
-  // 
-  // Set ALIC mother transparent
-  gMC->Gsatt("ALIC","SEEN",0);
-  //
-  // Set the volumes visible
-  gMC->Gsatt("HUFL","seen",1);
-  gMC->Gsatt("HUWA","seen",1);
-  gMC->Gsatt("HUP2","seen",1);
-  gMC->Gsatt("HEW1","seen",1);
-  gMC->Gsatt("HHF1","seen",1);
-  gMC->Gsatt("HHW1","seen",1);
-  gMC->Gsatt("HBW1","seen",1);
-  gMC->Gsatt("HHW2","seen",1);
-  gMC->Gsatt("HHW3","seen",1);
-  gMC->Gsatt("HHC1","seen",1);
-  gMC->Gsatt("HHF2","seen",1);
-  gMC->Gsatt("HPIL","seen",1);
-  gMC->Gsatt("HMBS","seen",1);
-  gMC->Gsatt("HBBS","seen",1);
-  gMC->Gsatt("HPBS","seen",1);
-  gMC->Gsatt("HXFI","seen",1);
-  gMC->Gsatt("HXII","seen",1);
-  //
-  gMC->Gdopt("hide", "on");
-  gMC->Gdopt("shad", "on");
-  gMC->Gsatt("*", "fill", 7);
-  gMC->SetClipBox(".");
-  if (gAlice->GetModule("ZDC") == 0) {
-    //
-    // ZDC is not present
-    //
-    gMC->SetClipBox("*", 0, 3000, -3000, 3000, -6000, 6000);
-    gMC->DefaultRange();
-    gMC->Gdraw("alic", 40, 30, 0, 12, 7.5, .005, .005);
-  } else {
-    //
-    // ZDC is present
-    //
-    gMC->SetClipBox("*", 0, 2000, -2000, 2000, -2000, 16000);
-    gMC->DefaultRange();
-    gMC->Gdraw("alic", 40, 30, 0, 17.5, 10, .0019, .0019);
-  }
-  gMC->Gdhead(1111, "Experimental Hall");
-  gMC->Gdman(18, 2, "MAN");
-}
-