Using AliLog (F.Carminati)

diff --git a/STEER/AliDetector.cxx b/STEER/AliDetector.cxx
index 58f2fd4..ffbf37f 100644 (file)
--- a/STEER/AliDetector.cxx
+++ b/STEER/AliDetector.cxx
@@ -167,7 +167,6 @@ TBranch* AliDetector::MakeBranchInTree(TTree *tree, const char* name,
 // 
 //
 //
-// if (GetDebug()>1)
     
  AliDebug(2,Form("Making Branch %s",name));
  if (tree == 0x0) 

diff --git a/STEER/AliESDpid.h b/STEER/AliESDpid.h
index d57ccc2..4ce5040 100644 (file)
--- a/STEER/AliESDpid.h
+++ b/STEER/AliESDpid.h
@@ -17,6 +17,7 @@ class AliESD;
 class AliESDpid {
 public:
   AliESDpid(){}
+  virtual ~AliESDpid() {}
   static Int_t MakePID(AliESD *event);
 private:
   ClassDef(AliESDpid,1)   // TPC PID class

diff --git a/STEER/AliLoader.cxx b/STEER/AliLoader.cxx
index daf6734..e719d63 100644 (file)
--- a/STEER/AliLoader.cxx
+++ b/STEER/AliLoader.cxx
@@ -903,7 +903,7 @@ Bool_t AliLoader::IsOptionWritable(const TString& opt)
 
 Int_t AliLoader::GetDebug()
 {
-  AliWarningClass("Don't use this method any more, use AliDebug instead");
+  AliFatalClass("Don't use this method any more, use AliDebug instead");
   return AliDebugLevelClass();
 }
 /*****************************************************************************/ 

diff --git a/STEER/AliLog.cxx b/STEER/AliLog.cxx
index 59d5480..8d63266 100644 (file)
--- a/STEER/AliLog.cxx
+++ b/STEER/AliLog.cxx
@@ -235,15 +235,15 @@ void AliLog::ReadEnvSettings()
     if (gEnv->Defined(name)) {
       TString stream = gEnv->GetValue(name, "Standard");
       if (stream.CompareTo("standard", TString::kIgnoreCase) == 0) {
-        SetStandardOutput(EType(iType));
+        SetStandardOutput(EType_t(iType));
         AliDebug(3, Form("output stream set to standard output for type %s",
                          typeNames[iType]));
       } else if (stream.CompareTo("error", TString::kIgnoreCase) == 0) {
-        SetErrorOutput(EType(iType));
+        SetErrorOutput(EType_t(iType));
         AliDebug(3, Form("output stream set to error output for type %s",
                          typeNames[iType]));
       } else if (!stream.IsNull()) {
-        SetFileOutput(EType(iType), stream);
+        SetFileOutput(EType_t(iType), stream);
         AliDebug(3, Form("output stream set to file %s for type %s", 
                          stream.Data(), typeNames[iType]));
       }
@@ -329,7 +329,7 @@ void AliLog::EnableDebug(Bool_t enabled)
 }
 
 //_____________________________________________________________________________
-void AliLog::SetGlobalLogLevel(EType type)
+void AliLog::SetGlobalLogLevel(EType_t type)
 {
 // set the global debug level
 
@@ -435,7 +435,7 @@ void AliLog::SetStandardOutput()
 }
 
 //_____________________________________________________________________________
-void AliLog::SetStandardOutput(EType type)
+void AliLog::SetStandardOutput(EType_t type)
 {
 // write log messages of the given type to the standard output (stdout)
 
@@ -458,7 +458,7 @@ void AliLog::SetErrorOutput()
 }
 
 //_____________________________________________________________________________
-void AliLog::SetErrorOutput(EType type)
+void AliLog::SetErrorOutput(EType_t type)
 {
 // write log messages of the given type to the error output (stderr)
 
@@ -487,7 +487,7 @@ void AliLog::SetFileOutput(const char* fileName)
 }
 
 //_____________________________________________________________________________
-void AliLog::SetFileOutput(EType type, const char* fileName)
+void AliLog::SetFileOutput(EType_t type, const char* fileName)
 {
 // write log messages of the given type to the given file
 
@@ -607,7 +607,7 @@ void AliLog::SetPrintType(Bool_t on)
 }
 
 //_____________________________________________________________________________
-void AliLog::SetPrintType(EType type, Bool_t on)
+void AliLog::SetPrintType(EType_t type, Bool_t on)
 {
 // switch on or off the printing of the message type for the given message type
 
@@ -628,7 +628,7 @@ void AliLog::SetPrintModule(Bool_t on)
 }
 
 //_____________________________________________________________________________
-void AliLog::SetPrintModule(EType type, Bool_t on)
+void AliLog::SetPrintModule(EType_t type, Bool_t on)
 {
 // switch on or off the printing of the module for the given message type
 
@@ -649,7 +649,7 @@ void AliLog::SetPrintScope(Bool_t on)
 }
 
 //_____________________________________________________________________________
-void AliLog::SetPrintScope(EType type, Bool_t on)
+void AliLog::SetPrintScope(EType_t type, Bool_t on)
 {
 // switch on or off the printing of the scope/class name
 // for the given message type
@@ -672,7 +672,7 @@ void AliLog::SetPrintLocation(Bool_t on)
 }
 
 //_____________________________________________________________________________
-void AliLog::SetPrintLocation(EType type, Bool_t on)
+void AliLog::SetPrintLocation(EType_t type, Bool_t on)
 {
 // switch on or off the printing of the file name and line number 
 // for the given message type
@@ -851,7 +851,7 @@ void AliLog::Debug(UInt_t level, const char* message,
 
 
 //_____________________________________________________________________________
-Int_t AliLog::RedirectStdoutTo(EType type, UInt_t level, const char* module, 
+Int_t AliLog::RedirectStdoutTo(EType_t type, UInt_t level, const char* module, 
                                const char* className, const char* function,
                                const char* file, Int_t line, Bool_t print)
 {
@@ -863,7 +863,7 @@ Int_t AliLog::RedirectStdoutTo(EType type, UInt_t level, const char* module,
 }
 
 //_____________________________________________________________________________
-Int_t AliLog::RedirectStderrTo(EType type, UInt_t level, const char* module, 
+Int_t AliLog::RedirectStderrTo(EType_t type, UInt_t level, const char* module, 
                                const char* className, const char* function,
                                const char* file, Int_t line, Bool_t print)
 {
@@ -875,7 +875,7 @@ Int_t AliLog::RedirectStderrTo(EType type, UInt_t level, const char* module,
 }
 
 //_____________________________________________________________________________
-Int_t AliLog::RedirectTo(FILE* stream, EType type, UInt_t level, 
+Int_t AliLog::RedirectTo(FILE* stream, EType_t type, UInt_t level, 
                          const char* module, const char* className,
                          const char* function, const char* file, Int_t line,
                         Bool_t print)
@@ -933,7 +933,7 @@ void AliLog::RestoreStderr(Int_t original)
 
 
 //_____________________________________________________________________________
-ostream& AliLog::Stream(EType type, UInt_t level,
+ostream& AliLog::Stream(EType_t type, UInt_t level,
                         const char* module, const char* className,
                         const char* function, const char* file, Int_t line)
 {
@@ -945,7 +945,7 @@ ostream& AliLog::Stream(EType type, UInt_t level,
 }
 
 //_____________________________________________________________________________
-ostream& AliLog::GetStream(EType type, UInt_t level,
+ostream& AliLog::GetStream(EType_t type, UInt_t level,
                            const char* module, const char* className,
                            const char* function, const char* file, Int_t line)
 {

diff --git a/STEER/AliLog.h b/STEER/AliLog.h
index aecf3a6..b3d828b 100644 (file)
--- a/STEER/AliLog.h
+++ b/STEER/AliLog.h
@@ -20,10 +20,10 @@ class AliLog: public TObject {
   virtual ~AliLog();
   static AliLog* Instance() {return fgInstance;}
 
-  enum EType {kFatal = 0, kError, kWarning, kInfo, kDebug, kMaxType};
+  enum EType_t {kFatal = 0, kError, kWarning, kInfo, kDebug, kMaxType};
 
   static void  EnableDebug(Bool_t enabled);
-  static void  SetGlobalLogLevel(EType type);
+  static void  SetGlobalLogLevel(EType_t type);
   static Int_t GetGlobalLogLevel();
   static void  SetGlobalDebugLevel(Int_t level);
   static Int_t GetGlobalDebugLevel();
@@ -33,23 +33,23 @@ class AliLog: public TObject {
   static void  ClearClassDebugLevel(const char* className);
 
   static void  SetStandardOutput();
-  static void  SetStandardOutput(EType type);
+  static void  SetStandardOutput(EType_t type);
   static void  SetErrorOutput();
-  static void  SetErrorOutput(EType type);
+  static void  SetErrorOutput(EType_t type);
   static void  SetFileOutput(const char* fileName);
-  static void  SetFileOutput(EType type, const char* fileName);
+  static void  SetFileOutput(EType_t type, const char* fileName);
   static void  Flush();
 
   static void  SetHandleRootMessages(Bool_t on);
 
   static void  SetPrintType(Bool_t on);
-  static void  SetPrintType(EType type, Bool_t on);
+  static void  SetPrintType(EType_t type, Bool_t on);
   static void  SetPrintModule(Bool_t on);
-  static void  SetPrintModule(EType type, Bool_t on);
+  static void  SetPrintModule(EType_t type, Bool_t on);
   static void  SetPrintScope(Bool_t on);
-  static void  SetPrintScope(EType type, Bool_t on);
+  static void  SetPrintScope(EType_t type, Bool_t on);
   static void  SetPrintLocation(Bool_t on);
-  static void  SetPrintLocation(EType type, Bool_t on);
+  static void  SetPrintLocation(EType_t type, Bool_t on);
 
   static void  SetPrintRepetitions(Bool_t on);
 
@@ -66,16 +66,16 @@ class AliLog: public TObject {
                      const char* module, const char* className,
                      const char* function, const char* file, Int_t line);
 
-  static Int_t RedirectStdoutTo(EType type, UInt_t level, const char* module, 
+  static Int_t RedirectStdoutTo(EType_t type, UInt_t level, const char* module, 
                                 const char* className, const char* function,
                                 const char* file, Int_t line, Bool_t print);
-  static Int_t RedirectStderrTo(EType type, UInt_t level, const char* module, 
+  static Int_t RedirectStderrTo(EType_t type, UInt_t level, const char* module, 
                                 const char* className, const char* function,
                                 const char* file, Int_t line, Bool_t print);
   static void  RestoreStdout(Int_t original);
   static void  RestoreStderr(Int_t original);
 
-  static ostream& Stream(EType type, UInt_t level,
+  static ostream& Stream(EType_t type, UInt_t level,
                          const char* module, const char* className,
                          const char* function, const char* file, Int_t line);
 
@@ -98,12 +98,12 @@ class AliLog: public TObject {
                               const char* file, Int_t line);
   void           PrintRepetitions();
 
-  Int_t          RedirectTo(FILE* stream, EType type, UInt_t level,
+  Int_t          RedirectTo(FILE* stream, EType_t type, UInt_t level,
                             const char* module, const char* className,
                             const char* function,
                             const char* file, Int_t line, Bool_t print);
 
-  ostream&       GetStream(EType type, UInt_t level,
+  ostream&       GetStream(EType_t type, UInt_t level,
                            const char* module, const char* className,
                            const char* function, const char* file, Int_t line);
 

diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx
index c59c983..6feee12 100644 (file)
--- a/STEER/AliModule.cxx
+++ b/STEER/AliModule.cxx
@@ -877,6 +877,6 @@ void AliModule::Digits2Raw()
 //_____________________________________________________________________________
 Int_t AliModule::GetDebug() const
 {
-  AliWarning("Don't use this method any more, use AliDebug instead");
+  AliFatal("Don't use this method any more, use AliDebug instead");
   return 0;
 }

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 3f5d5ce..ba1f90e 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -953,14 +953,14 @@ void AliRun::AddModule(AliModule* mod)
 //_______________________________________________________________________
 Int_t AliRun::GetDebug() const
 {
-  AliWarning("Don't use this method any more, use AliDebug instead");
+  AliFatal("Don't use this method any more, use AliDebug instead");
   return AliDebugLevel();
 }
 
 //_______________________________________________________________________
 void AliRun::SetDebug(Int_t level)
 {
-  AliWarning("Don't use this method any more, use AliLog instead");
+  AliFatal("Don't use this method any more, use AliLog instead");
   AliLog::SetClassDebugLevel("AliRun", level);
 }
 

diff --git a/STEER/ESDLinkDef.h b/STEER/ESDLinkDef.h
index ac58c24..57a9a4b 100644 (file)
--- a/STEER/ESDLinkDef.h
+++ b/STEER/ESDLinkDef.h
@@ -8,6 +8,8 @@
 #pragma link off all classes;
 #pragma link off all functions;
  
+#pragma link C++ enum   AliLog::EType_t;
+
 #pragma link C++ class  AliESD+;
 #pragma link C++ class  AliESDtrack+;
 #pragma link C++ class  AliESDMuonTrack+;