Changeset 9314 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/11/09 11:57:57 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEnv.cc (modified) (2 diffs)
• MTask.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MEnv.cc

@@ -60 +60 @@
 
 #include "MArgs.h"
+#include "MString.h"
 
 ClassImp(MEnv);
@@ -541 +542 @@
 
     if (style>3999 && style<4101)
-        val = Form("%d%%", style-4000);
+        val = MString::Format("%d%%", style-4000);
 
     switch (style)

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -233 +233 @@
     // This does not reset the counter!
     fStopwatch->Reset();
-    fNumExecutions = 0;
-    fNumExec0 = GetNumExecutionsTotal();
+    fNumExec0 = fNumExecutions;
 
     *fLog << all << GetDescriptor() << "... " << flush;
@@ -400 +399 @@
 UInt_t MTask::GetNumExecutions() const
 {
-    return GetNumExecutionsTotal()-fNumExec0;
-}
-
-// --------------------------------------------------------------------------
-//
-//  Return the total number of calls to Process(). If Process() was not
+    return fNumExecutions-fNumExec0;
+}
+
+// --------------------------------------------------------------------------
+//
+//  Return the total number of calls to Process() ever. If Process() was not
 //  called due to a set filter this is not counted.
 //
 UInt_t MTask::GetNumExecutionsTotal() const
 {
-    return fNumExecutions-1;
+    return fNumExecutions;
 }
 
@@ -467 +466 @@
     *fLog << GetDescriptor();
 
-    if (GetNumExecutions()!=(UInt_t)-1)
+    if (GetNumExecutions()>0)
         *fLog << "\t" << dec << GetNumExecutions();