Changeset 2556 for trunk/MagicSoft/Mars/mbase

Timestamp:

11/22/03 15:31:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MParList.cc (modified) (1 diff)
• MTask.cc (modified) (1 diff)
• MTime.cc (modified) (1 diff)
• MTime.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -493 +493 @@
         {
         case 1:
-            *fLog << "gROOT->GetClass(\"" << cname << "\" returned NULL." << endl;
+            *fLog << "gROOT->GetClass() returned NULL." << endl;
             return NULL;
         case 2:

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -144 +144 @@
     TString s = str;
 
-    while (1)
+    while (!s.IsNull())
     {
         Int_t fst = s.First(',');
 
         if (fst<0)
-            return;
-
-        AddToBranchList(TString(s(0, fst)));
+            fst = s.Length();
+
+        AddToBranchList((const char*)TString(s(0, fst)));
 
         s.Remove(0, fst+1);

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -51 +51 @@
 void MTime::Print(Option_t *) const
 {
-    *fLog << GetDescriptor() << ": " << dec;
-    *fLog << setfill('0') << setw(2) << (int)fHour << ":";
-    *fLog << setfill('0') << setw(2) << (int)fMin  << ":";
-    *fLog << setfill('0') << setw(2) << (int)fSec  << ".";
-    *fLog << setfill('0') << setw(9) << fNanoSec << endl;
+    *fLog << GetDescriptor() << ": " << dec << setfill('0');
+    *fLog << setw(2) << (int)fHour << ":";
+    *fLog << setw(2) << (int)fMin  << ":";
+    *fLog << setw(2) << (int)fSec  << ".";
+    *fLog << setw(9) << fNanoSec << endl;
 } 

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -96 +96 @@
     }
 
-    MTime *GetTime()
-    {
-        return this;
-    }
-
     UInt_t GetDuration()
     {
@@ -108 +103 @@
     operator double() const //[s]
     {
-        return fNanoSec/1e9+(fHour*24*60*60+fMin*60+fSec);
+        return fNanoSec/1e9+(fHour*60*60+fMin*60+fSec);
     }
     double operator()() const //[s]