Changeset 7413 for trunk/MagicSoft/Mars/mtools

Timestamp:

11/21/05 11:09:12 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtools

Files:

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

trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc

@@ -204 +204 @@
 }
 
+//------------------------------------------------------------------------
+//
+// Add all entries deriving from MFilter from list to PreCuts.
+// The ownership is not affected.
+//
+void MTFillMatrix::AddPreCuts(const TList &list)
+{
+    TIter Next(&list);
+    TObject *obj=0;
+    while ((obj=Next()))
+        if (obj->InheritsFrom(MFilter::Class()))
+            fPreCuts.Add(obj);
+}
 
 // --------------------------------------------------------------------------
@@ -209 +222 @@
 // Fill the matrix (FIXME: Flow diagram missing)
 //
-Bool_t MTFillMatrix::Process()
+Bool_t MTFillMatrix::Process(const MParList &parlist)
 {
     if (!fReader)
@@ -232 +245 @@
     // Create parameter list and task list, add tasklist to parlist
     //
-    MParList  plist;
+    parlist.Print();
+    MParList  plist(parlist);
     MTaskList tlist;
     plist.AddToList(&tlist);
@@ -372 +386 @@
     return WriteMatrix1(fname) && WriteMatrix2(fname);
 }
+
+Int_t MTFillMatrix::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "NumDestEvents1", print))
+    {
+        rc = kTRUE;
+        SetNumDestEvents1(GetEnvValue(env, prefix, "NumDestEvents1", fNumDestEvents1));
+    }
+    if (IsEnvDefined(env, prefix, "NumDestEvents2", print))
+    {
+        rc = kTRUE;
+        SetNumDestEvents2(GetEnvValue(env, prefix, "NumDestEvents2", fNumDestEvents2));
+    }
+    return rc;
+}

trunk/MagicSoft/Mars/mtools/MTFillMatrix.h

@@ -1 +1 @@
 #ifndef MARS_MTFillMatrix
 #define MARS_MTFillMatrix
+
+#ifndef MARS_MParList
+#include "MParList.h"
+#endif
 
 #ifndef MARS_MH3
@@ -27 +31 @@
 
     TList     fPreCuts;
+
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
     Bool_t CheckResult(MHMatrix *m, Int_t num) const;
@@ -72 +78 @@
     void AddPreCut(const char *rule);
     void AddPreCut(MFilter *f);
+    void AddPreCuts(const TList &list);
 
-    Bool_t Process();
+    Bool_t Process(const MParList &plist=MParList());
     Bool_t WriteMatrix1(const TString &fname) const { return WriteMatrix(fDestMatrix1, fname, 1); }
     Bool_t WriteMatrix2(const TString &fname) const { return WriteMatrix(fDestMatrix2, fname, 2); }