X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=STRUCT%2FAliHALL.cxx;h=081df85bd1fcc2f85be0474938e42818c6751ba9;hp=0ce57eab214eec33f8c11672c422da2a9965433f;hb=e939a978a98d29901b86bdb02cdcaf5157e717de;hpb=002b37381cc403ef996f2a9f2f5d6a5b6e3b1afe

diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx
index 0ce57eab214..081df85bd1f 100644
--- a/STRUCT/AliHALL.cxx
+++ b/STRUCT/AliHALL.cxx
@@ -42,6 +42,7 @@
 #include "AliHALL.h"
 #include "AliMagF.h"
 #include "AliRun.h"
+#include "AliLog.h"
  
 ClassImp(AliHALL)
  
@@ -60,9 +61,9 @@ AliHALL::AliHALL(const char *name, const char *title)
   //
   // Standard constructor for the experimental Hall
   //
-  SetMarkerColor(7);
-  SetMarkerStyle(2);
-  SetMarkerSize(0.4);
+  //PH  SetMarkerColor(7);
+  //PH  SetMarkerStyle(2);
+  //PH  SetMarkerSize(0.4);
 }
  
 //_____________________________________________________________________________
@@ -281,16 +282,14 @@ void AliHALL::CreateMaterials()
   //
   // Create materials for the experimental hall
   //
-  
-
-  Int_t   isxfld = gAlice->Field()->Integ();
+    
+  Int_t   isxfld = 0;
   Float_t sxmgmx = gAlice->Field()->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. };
   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};
@@ -300,17 +299,17 @@ void AliHALL::CreateMaterials()
 
   //     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(10, "IRON0$     ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(30, "IRON1$     ", 55.85, 26., 7.87, 1.76, 17.1);
+  AliMaterial(50, "IRON2$     ", 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(15, "AIR0$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(35, "AIR1$      ", aAir, zAir, dAir, 4, wAir);
+  AliMixture(55, "AIR2$      ", 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);
+  AliMixture(17, "CONCRETE0$", aconc, zconc, 2.35, 10, wconc);
+  AliMixture(37, "CONCRETE1$", aconc, zconc, 2.35, 10, wconc);
+  AliMixture(57, "CONCRETE2$", aconc, zconc, 2.35, 10, wconc);
   
   // **************** 
   //     Defines tracking media parameters. 
@@ -350,7 +349,7 @@ void AliHALL::Init()
   //
   Int_t i;
   //
-  if(fDebug) {
+  if(AliLog::GetGlobalDebugLevel()>0) {
     printf("\n%s: ",ClassName());
     for(i=0;i<35;i++) printf("*");
     printf(" HALL_INIT ");