Changeset 9041 for trunk/MagicSoft/Mars/mtools

Timestamp:

07/25/08 15:17:20 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtools

Files:

• MTFillMatrix.cc (modified) (4 diffs)
• MTFillMatrix.h (modified) (5 diffs)

trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc

@@ -76 +76 @@
 // fill.WriteMatrices("myfile.root");
 //
+//
+// Task List execution
+// ----------------------------------------------
+//
+// The tasklist is excuted in the follwowing order:
+//   - fReader      set by SetReader
+//   - fPreTasks    in the order as set with the SetPreTask functions
+//   - fPreCuts     in the order as set with the SetPreCut  functions
+//   - Selection    the event selection
+//   - fPostTasks   in the order as set with the SetPostTask functions
+//   - Fill Matrix
+//   - Write output
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MTFillMatrix.h"
@@ -163 +176 @@
 MTFillMatrix::MTFillMatrix(const char *name, const char *title)
 : fReference(0), fReader(0), fDestMatrix1(0), fDestMatrix2(0),
-  fNumDestEvents1(0), fNumDestEvents2(0), fWriteFile1(0), fWriteFile2(0)
+  fNumDestEvents1(0), fNumDestEvents2(0), fNumMaxEvents(0),
+  fWriteFile1(0), fWriteFile2(0)
 {
     Init(name, title);
@@ -180 +194 @@
 MTFillMatrix::MTFillMatrix(const MH3 *ref, const char *name, const char *title)
 : fReference(0), fReader(0), fDestMatrix1(0), fDestMatrix2(0),
-  fNumDestEvents1(0), fNumDestEvents2(0), fWriteFile1(0), fWriteFile2(0)
+  fNumDestEvents1(0), fNumDestEvents2(0), fNumMaxEvents(0),
+  fWriteFile1(0), fWriteFile2(0)
 {
     Init(name, title);
@@ -413 +428 @@
     evtloop.SetLogStream(fLog);
 
-    const Bool_t rc = evtloop.Eventloop();
+    const Bool_t rc = evtloop.Eventloop(fNumMaxEvents);
 
     if (selector)

trunk/MagicSoft/Mars/mtools/MTFillMatrix.h

@@ -27 +27 @@
     Int_t     fNumDestEvents2;
 
+    Int_t     fNumMaxEvents;
+
     MTask    *fWriteFile1;
     MTask    *fWriteFile2;
@@ -52 +54 @@
         fDestMatrix1 = matrix;
         if (num>0)
-            fNumDestEvents1 = num;
+            SetNumDestEvents1(num);
     }
     void SetWriteFile1(MTask *write, UInt_t num=0)
@@ -58 +60 @@
         fWriteFile1 = write;
         if (num>0)
-            fNumDestEvents1 = num;
-    }
-    void SetNumDestEvents1(UInt_t num)
-    {
-        fNumDestEvents1 = num;
+            SetNumDestEvents1(num);
     }
     void SetDestMatrix2(MHMatrix *matrix, UInt_t num=0)
@@ -68 +66 @@
         fDestMatrix2 = matrix;
         if (num>0)
-            fNumDestEvents2 = num;
+            SetNumDestEvents2(num);
     }
     void SetWriteFile2(MTask *write, UInt_t num=0)
@@ -74 +72 @@
         fWriteFile2 = write;
         if (num>0)
-            fNumDestEvents2 = num;
+            SetNumDestEvents2(num);
     }
-    void SetNumDestEvents2(UInt_t num)
-    {
-        fNumDestEvents2 = num;
-    }
+    void SetNumDestEvents1(UInt_t num) { fNumDestEvents1 = num; }
+    void SetNumDestEvents2(UInt_t num) { fNumDestEvents2 = num; }
+    void SetMaxEvents(UInt_t num)      { fNumMaxEvents = num; }
 
     void SetReader(MRead *task) { fReader = task; }