Changeset 9336 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/15/09 13:24:59 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MLog.cc (modified) (3 diffs)
• MTask.cc (modified) (4 diffs)
• MTask.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.62 2009-02-07 20:40:07 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.63 2009-02-15 13:24:59 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -814 +814 @@
         gLog << ": " << msg << std::endl;
     else
-        if (!location || strlen(location) == 0)
+        if (location==0 || location[0]==0)
             gLog << ": " << msg << std::endl;
         else
@@ -830 +830 @@
     if (ErrorHandlerIgnore(level))
         return;
+
+    // This is a really stupid hack/workaround to suppress these
+    // annoying errors in case of a log-scale set too early
+    if (level==kError && !strcmp(location, "THistPainter::PaintInit"))
+        level=kInfo;
 
     gLog << std::flush;

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -452 +452 @@
 void MTask::PrintStatistics(const Int_t lvl, Bool_t title, Double_t time) const
 {
-    if (!OverwritesProcess() && IsA()!=MTask::Class())
+    if (!Overwrites("Process") && IsA()!=MTask::Class())
         return;
 
@@ -511 +511 @@
 // leave out the argument.
 //
-Bool_t MTask::OverwritesProcess(TClass *cls) const
+Bool_t MTask::Overwrites(const char *name, TClass *cls) const
 {
     if (!cls)
@@ -525 +525 @@
     // Check whether the class cls overwrites Process
     //
-    if (cls->GetMethodAny("Process"))
+    if (cls->GetMethodAny(name))
         return kTRUE;
 
@@ -535 +535 @@
     while ((base=(TBaseClass*)NextBase()))
     {
-        if (OverwritesProcess(base->GetClassPointer()))
+        if (Overwrites(name, base->GetClassPointer()))
             return kTRUE;
     }

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -79 +79 @@
 
     const TList *GetListOfBranches() const { return fListOfBranches; }
-    Bool_t OverwritesProcess(TClass *cls=NULL) const;
+    Bool_t Overwrites(const char *name, TClass *cls=NULL) const;
 
     // Filter functions