Changeset 5101

Timestamp:

09/17/04 15:17:13 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MTask.cc (modified) (2 diffs)
• mbase/MTask.h (modified) (2 diffs)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
      - make sure that the correct number of executions is returned
        counter which cannot be reset properly)
+     - added GetNumExecutionsTotal
 
    * mdata/MDataArray.cc:
@@ -51 +52 @@
    * mhflux/MHFalseSource.cc:
      - made lines of 2D-Gauss smaller
+
+   * star.cc:
+     - fixed handling of commandline arguments in batch mode
 
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -202 +202 @@
 {
     // This does not reset the counter!
-    // fStopwatch->Reset();
-
-    delete fStopwatch;
-    fStopwatch = new TStopwatch;
+    fStopwatch->Reset();
+    fNumExec0 = GetNumExecutionsTotal();
 
     *fLog << all << fName << "... " << flush;
@@ -354 +352 @@
 // --------------------------------------------------------------------------
 //
+//  Return the total number of calls to since PreProcess(). If Process() was
+//  not called due to a set filter this is not counted.
+//
+UInt_t MTask::GetNumExecutions() const
+{
+    return GetNumExecutionsTotal()-fNumExec0;
+}
+
+// --------------------------------------------------------------------------
+//
 //  Return the total number of calls to Process(). If Process() was not
 //  called due to a set filter this is not counted.
 //
-UInt_t MTask::GetNumExecutions() const
+UInt_t MTask::GetNumExecutionsTotal() const
 {
     return (UInt_t)fStopwatch->Counter()-1;

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -31 +31 @@
 
     TStopwatch *fStopwatch; //! Count the execution time and number of executions
+    UInt_t      fNumExec0;  //! Total number of executions at PreProcess
 
     virtual Int_t PreProcess(MParList *pList);
@@ -92 +93 @@
     // Task execution statistics
     UInt_t   GetNumExecutions() const;
+    UInt_t   GetNumExecutionsTotal() const;
     Double_t GetCpuTime() const;
     Double_t GetRealTime() const;

trunk/MagicSoft/Mars/star.cc

@@ -74 +74 @@
     // Evaluate arguments
     //
-    MArgs arg(argc, argv, kFALSE);
+    MArgs arg(argc, argv, kTRUE);
 
     if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))