X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliBODY.cxx;h=5c17449687e4261922ebc088cfea724ef5049dee;hb=3180457c101ae34bb345b7cd0e69b085a1e6b3d9;hp=0a85365ad8c6ab950c536b581e9365d2d3067e54;hpb=e158117c89428974a25e5e21fdf51dfd303f65ec;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STRUCT/AliBODY.cxx b/STRUCT/AliBODY.cxx
index 0a85365ad8c..5c17449687e 100644
--- a/STRUCT/AliBODY.cxx
+++ b/STRUCT/AliBODY.cxx
@@ -13,18 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.8  2000/10/02 21:28:15  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.7  2000/06/11 12:32:51  morsch
-Coding rule violations corrected
-
-Revision 1.6  1999/09/29 09:24:30  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -47,10 +36,11 @@ Introduction of the Copyright and cvs Log
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "AliRun.h"
-#include "AliMC.h"
-#include "AliMagF.h"
+#include <TVirtualMC.h>
+
 #include "AliBODY.h"
+#include "AliMagF.h"
+#include "AliRun.h"
 
 ClassImp(AliBODY)
  
@@ -69,9 +59,9 @@ AliBODY::AliBODY(const char *name, const char *title)
   //
   // Standard constructor of the Alice external volume
   //
-  SetMarkerColor(7);
-  SetMarkerStyle(2);
-  SetMarkerSize(0.4);
+  //PH  SetMarkerColor(7);
+  //PH  SetMarkerStyle(2);
+  //PH  SetMarkerSize(0.4);
 }
  
 //_____________________________________________________________________________
@@ -115,26 +105,28 @@ void AliBODY::CreateGeometry()
     dALIC[1]=360;
     dALIC[2]=4;
     dALIC[3]=2;
-    dALIC[4]=-3000;
+
+    dALIC[4]=-15000;
     dALIC[5]=0;
     dALIC[6]=2000;
-    dALIC[7]=15000;
+
+    dALIC[7]=3000;
     dALIC[8]=0;
     dALIC[9]=2000;
     gMC->Gsvolu("ALIC","PGON",idtmed[1],dALIC,10);
-  } else if ( gAlice->GetModule("CRT")) {
+  } else if ( gAlice->GetModule("ACORDE")) {
     //
     // If the Cosmic Ray Trigger  is present we need a large box
     // 
     //
-    dALIC[0]=5000.;
+    dALIC[0]=13000.;
     dALIC[1]=5000.;
-    dALIC[2]=15000.;
+    dALIC[2]=13000.;
     gMC->Gsvolu("ALIC","BOX ",idtmed[1],dALIC,3);
       
   } else {
     //
-    // If the ZDC and CRT are not present make just a BOX
+    // If the ZDC and ACORDE are not present make just a BOX
     //
     dALIC[0]=2000;
     dALIC[1]=2000;
@@ -149,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);
@@ -160,7 +160,7 @@ void AliBODY::CreateMaterials()
 }
  
 //_____________________________________________________________________________
-void AliBODY::DrawModule()
+void AliBODY::DrawModule() const
 {
   //
   // Draw a view of the Alice outside box