Changes needed on Sun with Root v4-03-04

[u/mrichter/AliRoot.git] / STEER / AliVertexGenFile.cxx

diff --git a/STEER/AliVertexGenFile.cxx b/STEER/AliVertexGenFile.cxx
index f44023083f373542f6c6df428b7ef1b1be0f68ea..60c3d0af07c42273ebc91ec26aff90044eb58c60 100644 (file)
--- a/STEER/AliVertexGenFile.cxx
+++ b/STEER/AliVertexGenFile.cxx
@@ -26,12 +26,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
 

-#include "AliVertexGenFile.h"
-#include "AliHeader.h"
-#include "AliGenEventHeader.h"
+#include <TArrayF.h>

 #include <TFile.h>
 #include <TTree.h>
 #include <TFile.h>
 #include <TTree.h>

-#include <TArrayF.h>
+
+#include "AliVertexGenFile.h"
+#include "AliLog.h"
+#include "AliGenEventHeader.h"
+#include "AliHeader.h"

 
 
 ClassImp(AliVertexGenFile)
 
 
 ClassImp(AliVertexGenFile)


@@ -66,14 +68,14 @@ AliVertexGenFile::AliVertexGenFile(const char* fileName,
 
   fFile = TFile::Open(fileName);
   if (!fFile || !fFile->IsOpen()) {
 
   fFile = TFile::Open(fileName);
   if (!fFile || !fFile->IsOpen()) {

-    Error("AliVertexGenFile", "could not open file %s", fileName);
+    AliError(Form("could not open file %s", fileName));

     delete fFile;
     fFile = NULL;
     return;
   }
   fTree = (TTree*) fFile->Get("TE");
   if (!fTree) {
     delete fFile;
     fFile = NULL;
     return;
   }
   fTree = (TTree*) fFile->Get("TE");
   if (!fTree) {

-    Error("AliVertexGenFile", "no header tree found in file %s", fileName);
+    AliError(Form("no header tree found in file %s", fileName));

     dir->cd();
     return;
   }
     dir->cd();
     return;
   }


@@ -101,17 +103,17 @@ TVector3 AliVertexGenFile::GetVertex()
 
   Int_t entry = fEvent++ / fEventsPerEntry;
   if (!fTree) {
 
   Int_t entry = fEvent++ / fEventsPerEntry;
   if (!fTree) {

-    Error("GetVertex", "no header tree");
+    AliError("no header tree");

     return TVector3(0,0,0);
   }
 
   if (fTree->GetEntry(entry) <= 0) {
     return TVector3(0,0,0);
   }
 
   if (fTree->GetEntry(entry) <= 0) {

-    Error("GetVertex", "error loading entry %d", entry);
+    AliError(Form("error loading entry %d", entry));

     return TVector3(0,0,0);
   }
 
   if (!fHeader->GenEventHeader()) {
     return TVector3(0,0,0);
   }
 
   if (!fHeader->GenEventHeader()) {

-    Error("GetVertex", "no generator event header");
+    AliError("no generator event header");

     return TVector3(0,0,0);
   }
 
     return TVector3(0,0,0);
   }