Changeset 2117 for trunk/MagicSoft/Mars/mbase

Timestamp:

05/16/03 13:11:23 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MContinue.cc (modified) (1 diff)
• MEvtLoop.cc (modified) (3 diffs)
• MTask.cc (modified) (1 diff)
• MTask.h (modified) (1 diff)
• MTaskList.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MContinue.cc

@@ -137 +137 @@
     }
 
+    GetFilter()->SetDisplay(fDisplay);
+    GetFilter()->SetLogStream(fLog);
+
     SetBit(kFilterIsPrivate);
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -171 +171 @@
 Bool_t MEvtLoop::PreProcess(const char *tlist)
 {
+    fTaskList = NULL;
+
     //
     // check if the needed parameter list is set.
@@ -328 +330 @@
 Bool_t MEvtLoop::Process(Int_t maxcnt)
 {
+    if (!fTaskList)
+        return kFALSE;
+
     //
     //   loop over all events and process all tasks for
@@ -440 +445 @@
     //  execute the post process of all tasks
     //
-    return fTaskList->PostProcess();
+    return fTaskList ? fTaskList->PostProcess() : kTRUE;
 }
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -364 +364 @@
     return kFALSE;
 }
+
+void MTask::SetDisplay(MStatusDisplay *d)
+{
+    if (fFilter)
+        fFilter->SetDisplay(d);
+    MParContainer::SetDisplay(d);
+}

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -68 +68 @@
     const MFilter *GetFilter() const      { return fFilter; }
     MFilter *GetFilter()  { return fFilter; } // for MContinue only
+    void SetDisplay(MStatusDisplay *d);
     virtual void PrintStatistics(const Int_t lvl=0, Bool_t title=kFALSE) const;
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -134 +134 @@
 {
     fTasks->ForEach(MTask, SetLogStream)(log);
-    MParContainer::SetLogStream(log);
+    MTask::SetLogStream(log);
 }
 
@@ -140 +140 @@
 {
     fTasks->ForEach(MTask, SetDisplay)(d);
-    MParContainer::SetDisplay(d);
+    MTask::SetDisplay(d);
 }