From f37d970d39405521c25e9753ee52970a06cd051b Mon Sep 17 00:00:00 2001 From: tkuhr Date: Tue, 31 Aug 2004 13:26:06 +0000 Subject: [PATCH] use AliLog message scheme --- STEER/AliKalmanTrack.cxx | 28 ++++++++++++++-------------- STEER/AliReconstructor.cxx | 4 ++-- STEER/AliTracker.cxx | 5 +++-- STEER/AliVertexGenFile.cxx | 11 ++++++----- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/STEER/AliKalmanTrack.cxx b/STEER/AliKalmanTrack.cxx index 5d6dfb2fe23..b01f2d5b649 100644 --- 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 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 (dd512) { - 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 e8beac73488..4fe63ea5a0b 100644 --- a/STEER/AliReconstructor.cxx +++ b/STEER/AliReconstructor.cxx @@ -34,6 +34,7 @@ /////////////////////////////////////////////////////////////////////////////// +#include "AliLog.h" #include "AliReconstructor.h" #include @@ -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 e8da02f0ade..b287d035f7c 100644 --- 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 d274a56cea8..f3d8d7144f7 100644 --- a/STEER/AliVertexGenFile.cxx +++ b/STEER/AliVertexGenFile.cxx @@ -30,6 +30,7 @@ #include #include +#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); } -- 2.43.0