Changeset 1540 for trunk/MagicSoft/Mars/mbase

Timestamp:

10/15/02 17:02:46 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MClone.h (modified) (1 diff)
• MEvtLoop.cc (modified) (2 diffs)
• MEvtLoop.h (modified) (2 diffs)
• MTask.cc (modified) (3 diffs)
• MTaskList.cc (modified) (4 diffs)
• MTaskList.h (modified) (1 diff)
• Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -35 +35 @@
 #pragma link C++ class MClone+;
 #pragma link C++ class MPrint+;
+#pragma link C++ class MContinue+;
 
 #pragma link C++ class MArray;

trunk/MagicSoft/Mars/mbase/MClone.h

@@ -30 +30 @@
     Bool_t Process();
 
-    TObject *GetClone() const { return fClone; }
+    TObject *GetClone() const  { return fClone; }
+    const TObject *GetObject() const { return fObject; }
 
     void Clear(Option_t *opt=NULL);

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -86 +86 @@
 #ifdef __MARS__
 #include "MReadTree.h"       // for setting progress bar
+#include "MProgressBar.h"    // MProgressBar::GetBar
 #endif
 
@@ -126 +127 @@
     enable ? SetBit(kIsOwner) : ResetBit(kIsOwner);
 }
+
+#ifdef __MARS__
+// --------------------------------------------------------------------------
+//
+//  Specify an existing MProgressBar object. It will display the progress
+//  graphically. This will make thing about 1-2% slower.
+//
+void MEvtLoop::SetProgressBar(MProgressBar *bar)
+{
+    fProgress = bar->GetBar();
+}
+#endif
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -17 +17 @@
 class MTaskList;
 class TGProgressBar;
+#ifdef __MARS__
+class MProgressBar;
+#endif
 
 class MEvtLoop : public MParContainer
@@ -44 +47 @@
 
     void SetProgressBar(TGProgressBar *bar) { fProgress = bar; }
+#ifdef __MARS__
+    void SetProgressBar(MProgressBar *bar);
+#endif
 
     Bool_t PreProcess(const char *tlist="MTaskList");

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -252 +252 @@
 // --------------------------------------------------------------------------
 //
-// Prints the number of times this task has been processed.
-// For convinience the lvl argument results in a number of spaces at the
-// beginning of the line. So that the structur of a tasklist can be
-// identified.
+//  Prints the number of times all the tasks in the list has been.
+//  For convinience the lvl argument results in a number of spaces at the
+//  beginning of the line. So that the structur of a tasklist can be
+//  identified. If a Tasklist or task has filter applied the name of the
+//  filter is printer in <>-brackets behind the number of executions.
+//  Use MTaskList::PrintStatistics without an argument.
 //
 void MTask::PrintStatistics(const Int_t lvl, Bool_t title) const
@@ -261 +263 @@
     *fLog << all << setw(lvl) << " " << GetDescriptor() << "\t";
     *fLog << dec << fNumExecutions;
+    if (fFilter)
+        *fLog << " <" << fFilter->GetName() << ">";
     if (title)
         *fLog << "\t" << fTitle;
@@ -280 +284 @@
     /*
      If we don't stream filter which are not in the task list itself
-     (which means: alrteady streamed) we may be able to use the
-     primitive streamer as some kind of validity check for the macros
+     (which means: already streamed) we may be able to use
+     SavePrimitive as some kind of validity check for the macros
 
      fFilter->SavePrimitive(out);

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -66 +66 @@
 #include "MLogManip.h"
 
+#include "MFilter.h"
 #include "MParList.h"
 #include "MInputStreamID.h"
@@ -71 +72 @@
 ClassImp(MTaskList);
 
-static const TString gsDefName  = "MTaskList";
-static const TString gsDefTitle = "A list for tasks to be executed";
+const TString MTaskList::gsDefName  = "MTaskList";
+const TString MTaskList::gsDefTitle = "A list for tasks to be executed";
+
 // --------------------------------------------------------------------------
 //
@@ -492 +494 @@
 //  For convinience the lvl argument results in a number of spaces at the
 //  beginning of the line. So that the structur of a tasklist can be
-//  identified. Use MTaskList::PrintStatistics without an argument.
+//  identified. If a Tasklist or task has filter applied the name of the
+//  filter is printer in <>-brackets behind the number of executions.
+//  Use MTaskList::PrintStatistics without an argument.
 //
 void MTaskList::PrintStatistics(const Int_t lvl, Bool_t title) const
@@ -502 +506 @@
         *fLog << "---------------------" << endl;
         *fLog << GetDescriptor();
+        if (GetFilter())
+            *fLog << " <" << GetFilter()->GetName() << ">";
         if (title)
             *fLog << "\t" << fTitle;

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -21 +21 @@
 {
 private:
-    TList    *fTasks;       // Container for the ordered list of different tasks
-    TList    fTasksProcess; //!
-    MParList *fParList;     //!
+    static const TString gsDefName;  // default name
+    static const TString gsDefTitle; // default title
 
-    UInt_t *fCntContinue;   //!
-    UInt_t *fCntTrue;       //!
+    TList    *fTasks;        // Container for the ordered list of different tasks
+    TList     fTasksProcess; //! Task which overload the Process function
+    MParList *fParList;      //! The parameter list given in PreProcess
 
     enum { kIsOwner = BIT(14) };

trunk/MagicSoft/Mars/mbase/Makefile

@@ -20 +20 @@
 # @endcode 
 
-INCLUDES = -I. -I../mraw -I../MRawFormat -I../mmc -I../mfileio
+INCLUDES = -I. -I../mraw -I../MRawFormat -I../mmc -I../mfileio -I../mmain
 
 # @code 
@@ -48 +48 @@
            MTime.cc \
            MClone.cc \
+           MContinue.cc \
            MPrint.cc \
            MLogManip.cc