X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=T0%2FAliT0v2.cxx;h=cc1b2097aec01553d45b2970b48d293192693920;hb=d3ffc389718a81571d4bc7ec3e30cf7151c7b96f;hp=91b1edc948ad4fd967633373c6dd6b82aa89cbe2;hpb=661663fae92c654b71c7242a96e02c20f702d9dd;p=u%2Fmrichter%2FAliRoot.git

diff --git a/T0/AliT0v2.cxx b/T0/AliT0v2.cxx
index 91b1edc948a..cc1b2097aec 100644
--- a/T0/AliT0v2.cxx
+++ b/T0/AliT0v2.cxx
@@ -34,11 +34,8 @@
 #include <Riostream.h>
 #include <stdlib.h>
 
-#include <TGeometry.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
-#include <TNode.h>
-#include <TTUBE.h>
 #include <TVirtualMC.h>
 
 #include "AliMagF.h"
@@ -46,8 +43,6 @@
 #include "AliT0hit.h"
 #include "AliT0v2.h"
 #include "AliMC.h"
-//#include "AliT0hitPhoton.h"
-//#include "TGeant3.h"
 
 ClassImp(AliT0v2)
 
@@ -153,11 +148,12 @@ void AliT0v2::CreateGeometry()
 //////////////////////////////////////////////////////////////////////
 void AliT0v2::CreateMaterials()
 {
-   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();
+   
+   Double_t a, z, d, radl, absl;
+   TArrayT par;
    
-   Float_t a, z, d, radl, absl, buf[1];
-   Int_t nbuf;
 
 // Scintillator CH
    Float_t 	ascin[2] = {1.01, 12.01};
@@ -198,11 +194,11 @@ void AliT0v2::CreateMaterials()
    
    AliMixture (3, "Al2O3   $", aal2o3, zal2o3, denscer, -2, wal2o3);
    AliMixture (4, "PMT glass   $", aglass, zglass, dglass, -2, wglass);
-   char namate[21]="";
-   gMC->Gfmate ((*fIdmate)[3], namate, a, z, d, radl, absl, buf, nbuf);
+   TString namate;
+   gMC->GetMaterial((*fIdmate)[3], namate, a, z, d, radl, absl, par);
    acer[0] = a;
    zcer[0] = z;
-   gMC->Gfmate ((*fIdmate)[4], namate, a, z, d, radl, absl, buf, nbuf);
+   gMC->GetMaterial((*fIdmate)[4], namate, a, z, d, radl, absl, par);
    acer[1] = a;
    zcer[1] = z;
    
@@ -222,28 +218,6 @@ void AliT0v2::CreateMaterials()
 }
 
 
-//////////////////////////////////////////////////////////////////////
-// Draw a shaded view of the Forward multiplicity detector version 2
-//////////////////////////////////////////////////////////////////////
-void AliT0v2::DrawModule() const
-{  
-  //Set ALIC mother transparent
-  gMC->Gsatt ("ALIC", "SEEN", 0);
-
-  //Set volumes visible
-  gMC->Gsatt ("0STA", "SEEN", 0);
-  gMC->Gsatt ("0PMT", "SEEN", 1);
-  gMC->Gsatt ("0DIV", "SEEN", 1);
-
-  gMC->Gdopt ("hide", "on");
-  gMC->Gdopt ("shad", "on");
-  gMC->SetClipBox (".");
-  gMC->SetClipBox ("*", 0, 1000, -1000, 1000, -1000, 1000);
-  gMC->DefaultRange();
-  gMC->Gdraw ("alic", 40, 30, 0, 12, 9.5, 0.7, 0.7);
-  gMC->Gdhead (1111, "T-Zero detector");
-  gMC->Gdopt ("hide", "off");
-}
 
 //////////////////////////////////////////////////////////////////////
 // Definition of optical properties for the Forward Multiplicity Detector