use AliLog message scheme

diff --git a/STEER/AliKalmanTrack.cxx b/STEER/AliKalmanTrack.cxx
index 5d6dfb2fe233b1cef9ad73453f5afc2ccd91f000..b01f2d5b649c448e7c44785e343e2342b921e47b 100644 (file)
--- a/STEER/AliKalmanTrack.cxx
+++ b/STEER/AliKalmanTrack.cxx
@@ -22,6 +22,7 @@
 //-------------------------------------------------------------------------
 
 #include "AliKalmanTrack.h"
+#include "AliLog.h"
 #include "AliPDG.h"
 #include "TPDGCode.h"
 #include "TDatabasePDG.h"
@@ -41,7 +42,7 @@ AliKalmanTrack::AliKalmanTrack():
   // Default constructor
   //
     if (fgConvConst==0) {
-      Fatal("AliKalmanTrack()", "The magnetic field has not been set!");
+      AliFatal("The magnetic field has not been set!");
     }
     
     fStartTimeIntegral = kFALSE;
@@ -62,8 +63,7 @@ AliKalmanTrack::AliKalmanTrack(const AliKalmanTrack &t):
   // Copy constructor
   //
   if (fgConvConst==0) {
-    Fatal("AliKalmanTrack(const AliKalmanTrack&)", 
-           "The magnetic field has not been set!");
+    AliFatal("The magnetic field has not been set!");
   }
 
   fStartTimeIntegral = t.fStartTimeIntegral;
@@ -77,14 +77,14 @@ AliKalmanTrack::AliKalmanTrack(const AliKalmanTrack &t):
 Double_t AliKalmanTrack::GetX() const
 {
   // Returns the X coordinate of the current track position
-  Warning("GetX()","Method must be overloaded !\n");
+  AliWarning("Method must be overloaded !");
   return 0.;
 }
 //_______________________________________________________________________
 Double_t AliKalmanTrack::GetdEdx() const
 {
   // Returns the dE/dx of the track
-  Warning("GetdEdx()","Method must be overloaded !\n");
+  AliWarning("Method must be overloaded !");
   return 0.;
 }
 
@@ -267,7 +267,7 @@ void AliKalmanTrack::StartTimeIntegral()
   //
   
   //if (fStartTimeIntegral) 
-  //  Warning("StartTimeIntegral", "Reseting Recorded Time.");
+  //  AliWarning("Reseting Recorded Time.");
 
   fStartTimeIntegral = kTRUE;
   for(Int_t i=0; i<fgkTypes; i++) fIntegratedTime[i] = 0;  
@@ -342,7 +342,7 @@ Double_t AliKalmanTrack::GetIntegratedTime(Int_t pdg) const
 
 
   if (!fStartTimeIntegral) {
-    Warning("GetIntegratedTime","Time integration not started");
+    AliWarning("Time integration not started");
     return 0.;
   }
 
@@ -351,7 +351,7 @@ Double_t AliKalmanTrack::GetIntegratedTime(Int_t pdg) const
   for (Int_t i=0; i<fgkTypes; i++)
     if (pdgCode[i] == TMath::Abs(pdg)) return fIntegratedTime[i];
 
-  Warning(":GetIntegratedTime","Particle type [%d] not found", pdg);
+  AliWarning(Form("Particle type [%d] not found", pdg));
   return 0;
 }
 
@@ -476,10 +476,10 @@ GetDCA(const AliKalmanTrack *p, Double_t &xthis, Double_t &xp) const {
      if (TMath::Abs(dt1)/(TMath::Abs(t1)+1.e-3) < 1.e-4)
      if (TMath::Abs(dt2)/(TMath::Abs(t2)+1.e-3) < 1.e-4) {
         if ((gt1*gt1+gt2*gt2) > 1.e-4/dy2/dy2) 
-         Warning("GetDCA"," stopped at not a stationary point !\n");
+         AliWarning(" stopped at not a stationary point !");
         Double_t lmb=h11+h22; lmb=lmb-TMath::Sqrt(lmb*lmb-4*det);
         if (lmb < 0.) 
-         Warning("GetDCA"," stopped at not a minimum !\n");
+         AliWarning(" stopped at not a minimum !");
         break;
      }
 
@@ -492,7 +492,7 @@ GetDCA(const AliKalmanTrack *p, Double_t &xthis, Double_t &xp) const {
        if (dd<dm) break;
         dt1*=0.5; dt2*=0.5;
         if (div>512) {
-           Warning("GetDCA"," overshoot !\n"); break;
+           AliWarning(" overshoot !"); break;
         }   
      }
      dm=dd;
@@ -502,7 +502,7 @@ GetDCA(const AliKalmanTrack *p, Double_t &xthis, Double_t &xp) const {
 
   }
 
-  if (max<=0) Warning("GetDCA"," too many iterations !\n");  
+  if (max<=0) AliWarning(" too many iterations !");
 
   Double_t cs=TMath::Cos(GetAlpha());
   Double_t sn=TMath::Sin(GetAlpha());
@@ -526,12 +526,12 @@ PropagateToDCA(AliKalmanTrack *p, Double_t d, Double_t x0) {
   Double_t dca=GetDCA(p,xthis,xp);
 
   if (!PropagateTo(xthis,d,x0)) {
-    //Warning("PropagateToDCA"," propagation failed !\n");
+    //AliWarning(" propagation failed !");
     return 1e+33;
   }  
 
   if (!p->PropagateTo(xp,d,x0)) {
-    //Warning("PropagateToDCA"," propagation failed !\n";
+    //AliWarning(" propagation failed !";
     return 1e+33;
   }  
 

diff --git a/STEER/AliReconstructor.cxx b/STEER/AliReconstructor.cxx
index e8beac734882d79b4452e05074a2a3efb031341f..4fe63ea5a0b15597175323e51828c69ff5e50e1d 100644 (file)
--- a/STEER/AliReconstructor.cxx
+++ b/STEER/AliReconstructor.cxx
@@ -34,6 +34,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
+#include "AliLog.h"
 #include "AliReconstructor.h"
 #include <TString.h>
 
@@ -47,8 +48,7 @@ void AliReconstructor::Reconstruct(AliRunLoader* /*runLoader*/,
 {
 // run the local reconstruction with raw data input
 
-  Error("Reconstruct", 
-       "local reconstruction not implemented for raw data input");
+  AliError("local reconstruction not implemented for raw data input");
 }
 
 //_____________________________________________________________________________

diff --git a/STEER/AliTracker.cxx b/STEER/AliTracker.cxx
index e8da02f0adea5a4d79f05555ab9e0f860c7241fc..b287d035f7c6f21a087e865c9d96cba7a34968fe 100644 (file)
--- a/STEER/AliTracker.cxx
+++ b/STEER/AliTracker.cxx
@@ -26,6 +26,7 @@
 #include "AliTracker.h"
 #include "AliCluster.h"
 #include "AliKalmanTrack.h"
+#include "AliLog.h"
 #include "AliRun.h"
 #include "AliMagF.h"
 
@@ -49,7 +50,7 @@ AliTracker::AliTracker():
   // The default constructor.
   //--------------------------------------------------------------------
  AliMagF *field=gAlice->Field();
- if (field==0) Fatal("AliTracker()","Can't access the field map !");
+ if (field==0) AliFatal("Can't access the field map !");
  SetFieldMap(field);
 }
 
@@ -57,7 +58,7 @@ void AliTracker::SetFieldMap(const AliMagF* map) {
   //--------------------------------------------------------------------
   //This passes the field map to the reconstruction.
   //--------------------------------------------------------------------
-  if (map==0) ::Fatal("SetFieldMap","Can't access the field map !");
+  if (map==0) AliFatalClass("Can't access the field map !");
   AliKalmanTrack::SetConvConst(1000/0.299792458/map->SolenoidField());
   fgkFieldMap=map;
 }

diff --git a/STEER/AliVertexGenFile.cxx b/STEER/AliVertexGenFile.cxx
index d274a56cea85ae294f41ca4d0a395c179d53a611..f3d8d7144f7b109c9e1fe02f6e335296c7d1b983 100644 (file)
--- a/STEER/AliVertexGenFile.cxx
+++ b/STEER/AliVertexGenFile.cxx
@@ -30,6 +30,7 @@
 #include <TFile.h>
 #include <TTree.h>
 
+#include "AliLog.h"
 #include "AliGenEventHeader.h"
 #include "AliHeader.h"
 #include "AliVertexGenFile.h"
@@ -67,14 +68,14 @@ AliVertexGenFile::AliVertexGenFile(const char* fileName,
 
   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) {
-    Error("AliVertexGenFile", "no header tree found in file %s", fileName);
+    AliError(Form("no header tree found in file %s", fileName));
     dir->cd();
     return;
   }
@@ -102,17 +103,17 @@ TVector3 AliVertexGenFile::GetVertex()
 
   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) {
-    Error("GetVertex", "error loading entry %d", entry);
+    AliError(Form("error loading entry %d", entry));
     return TVector3(0,0,0);
   }
 
   if (!fHeader->GenEventHeader()) {
-    Error("GetVertex", "no generator event header");
+    AliError("no generator event header");
     return TVector3(0,0,0);
   }