X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliBODY.cxx;h=3347e42fbf37116405e860cfb29e3b701a6ecaa1;hb=6337857a4d6e859eb09c171b7a71d0197a04c8df;hp=1138b67882ac012e922dbb1b210e851d9e657489;hpb=b9d0a01d7a0723a09071b0b56200d72f59a9c2b6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STRUCT/AliBODY.cxx b/STRUCT/AliBODY.cxx
index 1138b67882a..3347e42fbf3 100644
--- a/STRUCT/AliBODY.cxx
+++ b/STRUCT/AliBODY.cxx
@@ -13,27 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.8.12.1  2002/07/24 10:08:27  alibrary
-Updating VirtualMC
-
-Revision 1.10  2002/07/10 10:16:15  morsch
-Bigger volume for CRT.
-
-Revision 1.9  2002/06/20 15:33:13  morsch
-Larger BOX in case CRT is present.
-
-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$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -56,10 +36,13 @@ Introduction of the Copyright and cvs Log
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "AliRun.h"
-#include "AliMC.h"
-#include "AliMagF.h"
+#include <TGeoGlobalMagField.h>
+#include <TVirtualMC.h>
+#include <TArrayI.h>
+
 #include "AliBODY.h"
+#include "AliMagF.h"
+#include "AliRun.h"
 
 ClassImp(AliBODY)
  
@@ -78,9 +61,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);
 }
  
 //_____________________________________________________________________________
@@ -117,21 +100,11 @@ void AliBODY::CreateGeometry()
   //
   if(gAlice->GetModule("ZDC")) {
     //
-    // If the ZDC is present we have an asymmetric box
-    // made by a four sides polygone
-    //
-    dALIC[0]=45;
-    dALIC[1]=360;
-    dALIC[2]=4;
-    dALIC[3]=2;
-    dALIC[4]=-3000;
-    dALIC[5]=0;
-    dALIC[6]=2000;
-    dALIC[7]=15000;
-    dALIC[8]=0;
-    dALIC[9]=2000;
-    gMC->Gsvolu("ALIC","PGON",idtmed[1],dALIC,10);
-  } else if ( gAlice->GetModule("CRT")) {
+    dALIC[0]=2500.;
+    dALIC[1]=2500.;
+    dALIC[2]=15000.;
+    gMC->Gsvolu("ALIC","BOX ",idtmed[1],dALIC,3);
+  } else if ( gAlice->GetModule("ACORDE")) {
     //
     // If the Cosmic Ray Trigger  is present we need a large box
     // 
@@ -143,7 +116,7 @@ void AliBODY::CreateGeometry()
       
   } 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;
@@ -156,11 +129,19 @@ void AliBODY::CreateGeometry()
 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);
+  Int_t isxfld = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();
+  Float_t sxmgmx = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
+  
+  // 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 * 960./1014.;
+  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);
@@ -168,36 +149,3 @@ void AliBODY::CreateMaterials()
   AliMedium(3,"Be pipe $",3,0,isxfld,sxmgmx,10,0.1,0.1,0.01,0.01);
 }
  
-//_____________________________________________________________________________
-void AliBODY::DrawModule()
-{
-  //
-  // Draw a view of the Alice outside box
-  //
-  // Set everything unseen
-  gMC->Gsatt("*", "seen", -1);
-  // 
-  // Set ALIC mother visible
-  gMC->Gsatt("ALIC","SEEN",1);
-  //
-  // Set the volumes visible
-  //
-  gMC->Gdopt("hide","off");
-  if(gAlice->GetModule("ZDC")) {
-    //
-    // ZDC is present
-    //
-    gMC->DefaultRange();
-    gMC->Gdraw("alic", 40, 30, 0, 15, 10, .0014, .0014);
-    gMC->Gdhead(1111, "Aice Main body with Zero Degree Calorimeter");
-  } else {
-    //
-    // ZDC is not present
-    //
-    gMC->Gdraw("alic", 40, 30, 0, 10, 9, .0027, .0027);
-    gMC->Gdhead(1111, "Aice Main body");
-  }
-  gMC->Gdman(18, 4, "MAN");
-}
- 
-