Fix in the file open option

[u/mrichter/AliRoot.git] / T0 / AliT0v2.cxx

diff --git a/T0/AliT0v2.cxx b/T0/AliT0v2.cxx
index d04abed19759e88ba3ef648859929b31379e4c45..077c662ef8f9c1a1930630cf252b333d78db2894 100644 (file)
--- 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,8 +148,8 @@ 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();
    
    Float_t a, z, d, radl, absl, buf[1];
    Int_t nbuf;
@@ -245,16 +240,12 @@ void AliT0v2::DrawModule() const
   gMC->Gdopt ("hide", "off");
 }
 
-
 //////////////////////////////////////////////////////////////////////
-// Initialises version 2 of the Forward Multiplicity Detector
+// Definition of optical properties for the Forward Multiplicity Detector
 //////////////////////////////////////////////////////////////////////
-void AliT0v2::Init()
+void AliT0v2::DefineOpticalProperties()
 {
-//Int_t *idtmed  = gAlice->Idtmed();
-
-  AliT0::Init();
-  fIdSens1 = gMC->VolId ("0REG");
+// Optical properties definition.
 // Definition Cherenkov parameters
   const Int_t NUMENTRIES = 32;
 
@@ -303,7 +294,15 @@ void AliT0v2::Init()
 
    gMC->SetCerenkov (idtmed[6], NUMENTRIES, ppckov, absor_qwarz, effic_all, rindex_qwarz);
    gMC->SetCerenkov (idtmed[1], NUMENTRIES, ppckov, absor_air, effic_all, rindex_air);
+}
 
+//////////////////////////////////////////////////////////////////////
+// Initialises version 2 of the Forward Multiplicity Detector
+//////////////////////////////////////////////////////////////////////
+void AliT0v2::Init()
+{
+  AliT0::Init();
+  fIdSens1 = gMC->VolId ("0REG");
   printf ("*** T0 version 2 initialized ***\n");
 }