Fixed a typo and disabled some wagons that do not work.

[u/mrichter/AliRoot.git] / VZERO / AliVZEROv2.cxx

diff --git a/VZERO/AliVZEROv2.cxx b/VZERO/AliVZEROv2.cxx
index 0976af45c4c8f1cc0ce0bade152343ddbd1acdf9..ec6242ee65df09a894ec7142ac6c494b5169137b 100755 (executable)
--- a/VZERO/AliVZEROv2.cxx
+++ b/VZERO/AliVZEROv2.cxx
@@ -37,15 +37,12 @@
 
 // --- ROOT libraries ---
 #include <TClonesArray.h>
-#include <TGeometry.h>
+#include <TGeoGlobalMagField.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
-#include <TNode.h>
 #include <TObjectTable.h>
-#include <TTUBE.h>
-#include <TTUBS.h>
-#include <TVirtualMC.h>
 #include <TParticle.h>
+#include <TVirtualMC.h>
 
 // --- AliRoot header files ---
 #include "AliRun.h"
@@ -432,8 +429,8 @@ void AliVZEROv2::CreateMaterials()
     AliMixture( 6, "Scintillator$",ascin,zscin,denscin,-2,wscin);
     
      
-    Int_t   iSXFLD = gAlice->Field()->Integ();
-    Float_t sXMGMX = gAlice->Field()->Max();
+    Int_t   iSXFLD = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();     // Field type  
+    Float_t sXMGMX = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();       // Field max.
     
     Float_t tmaxfd, stemax, deemax, epsil, stmin;
         
@@ -703,8 +700,8 @@ void AliVZEROv2::MakeBranch(Option_t *option)
   
   const char *cH = strstr(option,"H");
   
-  if (fHits   && TreeH() && cH) {
-    TreeH()->Branch(branchname,&fHits, fBufferSize);
+  if (fHits   && fLoader->TreeH() && cH) {
+    fLoader->TreeH()->Branch(branchname,&fHits, fBufferSize);
     AliDebug(2,Form("Making Branch %s for hits",branchname));
   }