Changeset 7401 for trunk/MagicSoft/Mars/mtools

Timestamp:

11/15/05 11:36:17 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 12/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2005
 !
 !
@@ -81 +81 @@
 #include <TFile.h>
 
+// environment
 #include "MHMatrix.h"
 
@@ -86 +87 @@
 #include "MLogManip.h"
 
+// eventloop
 #include "MParList.h"
 #include "MTaskList.h"
 #include "MEvtLoop.h"
 
+// tasks
 #include "MRead.h"
 #include "MFillH.h"
 #include "MContinue.h"
+
+// filters
+#include "MF.h"
 #include "MFilterList.h"
 #include "MFEventSelector.h"
@@ -174 +180 @@
         delete fReference;
 }
+
+//------------------------------------------------------------------------
+//
+// Add a cut which is used to fill the matrix, eg "MMcEvt.fOartId<1.5"
+// (The rule is applied, nit inverted: The matrix is filled with
+// the events fullfilling the condition)
+//
+void MTFillMatrix::AddPreCut(const char *rule)
+{
+    MFilter *f = new MF(rule);
+    f->SetBit(kCanDelete);
+    AddPreCut(f);
+}
+
+//------------------------------------------------------------------------
+//
+// Add a cut which is used to fill the matrix. If kCanDelete is set
+// MJOptimize takes the ownership.
+//
+void MTFillMatrix::AddPreCut(MFilter *f)
+{
+    fPreCuts.Add(f);
+}
+
 
 // --------------------------------------------------------------------------
@@ -236 +266 @@
 
     //
+    // Continue for PreCuts
+    //
+    MFilterList list;
+    list.SetName("PreCuts");
+    if (!list.AddToList(fPreCuts))
+        *fLog << err << "ERROR - Calling MFilterList::AddToList for fPreCuts failed!" << endl;
+
+    MContinue cont0(&list);
+    cont0.SetInverted();
+
+    //
     // Continue for all events which are not (SetInverted())
     // selected by the 'selector'
@@ -268 +309 @@
     // entries in MTaskList
     tlist.AddToList(fReader);        // Read events
+    if (fPreCuts.GetEntries()>0)
+        tlist.AddToList(&cont0);     // PreCuts
     if (fReference && selector)
         tlist.AddToList(&cont);      // select a sample of events