Changeset 1657 for trunk/MagicSoft

Timestamp:

11/21/02 10:16:52 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (5 diffs)
• mbase/MAGIC.h (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (6 diffs)
• mbase/MEvtLoop.h (modified) (1 diff)
• mbase/MTask.cc (modified) (1 diff)
• mbase/MTaskList.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2002/11/21: Thomas Bretz
+
+   * mbase/MAGIC.h, mbase/MEvtLoop.[h,cc], MTask.cc, MTaskList.cc:
+     - introduced kERROR to stop an eventloop with an error
+
+
+
  2002/11/20: Abelardo Moralejo
 
@@ -6 +13 @@
        error message.
 
+
+
  2002/11/19: Abelardo Moralejo
 
@@ -11 +20 @@
      - Removed some strange pieces of text which somehow got into the
        file (anyone knows how?)
+
+
 
  2002/11/19: Thomas Bretz
@@ -24 +35 @@
      - removed also the corresponding AddToList for the tasklist
 
+
+
  2002/11/19: Abelardo Moralejo
 
@@ -29 +42 @@
      - Added 2nd argument to write an output file containing the 
        collection area histogram.
+
 
 

trunk/MagicSoft/Mars/mbase/MAGIC.h

@@ -18 +18 @@
 const Int_t kCONTINUE = 2;
 const Int_t kSKIP     = 2;
+const Int_t kERROR    = 3;
 
 //

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -191 +191 @@
 // for developers or use in special jobs only!
 //
-void MEvtLoop::Process(Int_t maxcnt) const
+Bool_t MEvtLoop::Process(Int_t maxcnt) const
 {
     //
@@ -233 +233 @@
     // else only maxcnt events are processed
     //
+    Bool_t rc = kTRUE;
     if (maxcnt<0)
         // process first and increment if sucessfull
         if (fProgress)
-            while (fTaskList->Process())
+            while ((rc=fTaskList->Process())==kTRUE)
             {
                 fProgress->SetPosition(++dummy);
@@ -246 +247 @@
             }
         else
-            while (fTaskList->Process()) dummy++;
+            while ((rc=fTaskList->Process())==kTRUE) dummy++;
     else
         // check for number and break if unsuccessfull
         if (fProgress)
-            while (dummy-- && fTaskList->Process())
+            while (dummy-- && (rc=fTaskList->Process())==kTRUE)
             {
                 fProgress->SetPosition(maxcnt - dummy);
@@ -260 +261 @@
             }
         else
-            while (dummy-- && fTaskList->Process());
+            while (dummy-- && (rc=fTaskList->Process())==kTRUE);
 
     //
@@ -279 +280 @@
         << " --> " << (maxcnt<0?dummy:maxcnt)/clock.RealTime() << " Events/s"
         << endl << endl;
+
+    return rc!=kERROR;
 }
 
@@ -306 +309 @@
     //
     if (rc)
-        Process(maxcnt);
+        rc = Process(maxcnt);
 
     //

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -52 +52 @@
 
     Bool_t PreProcess(const char *tlist="MTaskList");
-    void   Process(Int_t maxcnt) const;
+    Bool_t Process(Int_t maxcnt) const;
     Bool_t PostProcess() const;
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -56 +56 @@
 //                     are executed. A task can return kFALSE to           //
 //                     stop the execuition of the tasklist or              //
-//                     kCONTINUE to skip the pending tasks.                //
+//                     kCONTINUE to skip the pending tasks. If you want    //
+//                     to stop the eventloop and wants the eventloop to    //
+//                     return the status 'failed' return kERROR.           //
 //                                                                         //
 //   - PostProcess():  executed after the eventloop. Here you can close    //

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -426 +426 @@
             break;
 
+        case kERROR:
+            //
+            // an error occured: stop eventloop and return: failed
+            //
+            *fLog << err << dbginf << "Fatal error occured... stopped." << endl;
+            rc = kERROR;
+            break;
+
         case kCONTINUE:
             //
@@ -434 +442 @@
 
         default:
-            *fLog << warn << "MTaskList::Process: Unknown return value from MTask::Process()... ignored." << endl;
+            *fLog << warn << dbginf << "Unknown return value from MTask::Process()... ignored." << endl;
             continue;
         }