Changeset 599 for trunk

Timestamp:

02/19/01 16:36:16 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• .rootrc (added)
• Changelog (modified) (1 diff)
• Makefile (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (6 diffs)
• mbase/MEvtLoop.h (modified) (3 diffs)
• mgui/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
  
+ 2000/02/19: Thomas Bretz
+
+   *  .rootrc: added
+
+   * MEvtLoop.[h,cc]: split eventloop in its three parts, this should
+     be used for debugging only.
+
+
  2000/02/06: Harald Kornmayer
 

trunk/MagicSoft/Mars/Makefile

@@ -64 +64 @@
 
 $(LIBRARIES):
-        @echo " ++++++++++++++++++++++++++++++ "  
+        @echo " "  
         @echo " Creating lib$@:"
         (cd $*; make; cd ..; mv $*/$@ lib/lib$@) 

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -46 +46 @@
 }
 
-void MEvtLoop::Eventloop(Int_t maxcnt, const char *ftasks)
+Bool_t MEvtLoop::PreProcess(const char *tlist)
 {
-    // See class description above.
+    //
+    // The proprocessing part of the eventloop. Be careful, this is
+    // for developers use only!
+    //
 
     //
@@ -56 +59 @@
     {
         cout << "MEvtLoop::Eventloop - Error: Parlist not initialized." << endl;
-        return;
+        return kFALSE;
     }
 
@@ -63 +66 @@
     //  the default name is "MTaskList"
     //
-    MTaskList *tasks = (MTaskList*)fParlist->FindObject(ftasks);
-    if (!tasks)
+    fTaskList = (MTaskList*)fParlist->FindObject(tlist);
+    if (!fTaskList)
     {
-        cout << "MEvtLoop::Eventloop - Error: Cannot find tasklist '" << ftasks << "' in parameter list." << endl;
-        return;
+        cout << "MEvtLoop::Eventloop - Error: Cannot find tasklist '" << tlist << "' in parameter list." << endl;
+        return kFALSE;
     }
 
@@ -75 +78 @@
     //  the parameter list
     //
-    if (!tasks->PreProcess(fParlist))
+    if (!fTaskList->PreProcess(fParlist))
     {
         cout << "Error detected while PreProcessing" << endl;
-        return;
+        return kFALSE;
     }
+
+    return kTRUE;
+}
+
+void MEvtLoop::Process(Int_t maxcnt) const
+{
+    //
+    // The processing part of the eventloop. Be careful, this is
+    // for developers use only!
+    //
 
     //
@@ -108 +121 @@
     //
     if (maxcnt<0)
-        while (tasks->Process() && ++dummy);
+        while (fTaskList->Process() && ++dummy);
     else
-        while (tasks->Process() && dummy--);
+        while (fTaskList->Process() && dummy--);
 
     //
@@ -127 +140 @@
         << endl << endl;
 
+}
+
+void MEvtLoop::PostProcess() const
+{
+    //
+    // The postprocessing part of the eventloop. Be careful, this is
+    // for developers use only!
+    //
+
     //
     //  execute the post process of all tasks
     //
-    tasks->PostProcess();
+    fTaskList->PostProcess();
 }
 
+void MEvtLoop::Eventloop(Int_t maxcnt, const char *tlist)
+{
+    // See class description above.
+
+    if (!PreProcess(tlist))
+        return;
+
+    Process(maxcnt);
+
+    PostProcess();
+}
+

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -15 +15 @@
 
 class MParList;
+class MTaskList;
 
 class MEvtLoop
@@ -20 +21 @@
 private:
     MParList  *fParlist;
+    MTaskList *fTaskList;
 
 public:
@@ -27 +29 @@
     void SetParList(MParList *p);
 
+    Bool_t PreProcess(const char *tlist="MTaskList");
+    void   Process(Int_t maxcnt) const;
+    void   PostProcess() const;
+
     void Eventloop(Int_t maxcnt=-1, const char *tlist="MTaskList");
 

trunk/MagicSoft/Mars/mgui/Makefile

@@ -59 +59 @@
            MHexagon.cc \
            MCamGeom.cc \
-           MCamNeighbor.cc \
-           MCamDisplay.cc 
+           MCamNeighbor.cc