modification in task to filter events

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

diff --git a/STRUCT/AliBODY.cxx b/STRUCT/AliBODY.cxx
index f74c0b1f4a63f2e45dfdf7d6250d619e23824eea..3ad9eb975749e8989097860fa9757111a7aa9d87 100644 (file)
--- a/STRUCT/AliBODY.cxx
+++ b/STRUCT/AliBODY.cxx
@@ -36,7 +36,9 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TGeoGlobalMagField.h>
 #include <TVirtualMC.h>
+#include <TArrayI.h>
 
 #include "AliBODY.h"
 #include "AliMagF.h"
@@ -59,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);
 }
  
 //_____________________________________________________________________________
@@ -108,13 +110,13 @@ void AliBODY::CreateGeometry()
 
     dALIC[4]=-15000;
     dALIC[5]=0;
-    dALIC[6]=2000;
+    dALIC[6]=2500;
 
-    dALIC[7]=3000;
+    dALIC[7]=15000;
     dALIC[8]=0;
-    dALIC[9]=2000;
+    dALIC[9]=2500;
     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
     // 
@@ -126,7 +128,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;
@@ -139,15 +141,15 @@ void AliBODY::CreateGeometry()
 void AliBODY::CreateMaterials()
 {
 // Create materials and media
-  Int_t isxfld = gAlice->Field()->Integ();
-  Float_t sxmgmx = gAlice->Field()->Max();
+  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;
+  Float_t dAir = 1.20479E-3 * 960./1014.;
   Float_t dAir1 = 1.20479E-10;
   //
   AliMixture(1,"Vacuum  $",aAir,zAir,dAir1,4,wAir);
@@ -159,36 +161,3 @@ void AliBODY::CreateMaterials()
   AliMedium(3,"Be pipe $",3,0,isxfld,sxmgmx,10,0.1,0.1,0.01,0.01);
 }
  
-//_____________________________________________________________________________
-void AliBODY::DrawModule() const
-{
-  //
-  // 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");
-}
- 
-