Changeset 1600 for trunk/MagicSoft/Mars/mfilter

Timestamp:

11/13/02 17:03:19 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MFEventSelector.cc (modified) (5 diffs)
• MFEventSelector.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mfilter/MFEventSelector.cc

@@ -40 +40 @@
 // To get around 2000 events from all events use (Remark: This will only
 // work if the parlist has an entry called MTaskList which has a task
-// MRTeadTree inheriting from MReadTree):
+// MRead inheriting from MRead):
 //   MFEventSelector sel;
-//   sel.SetNumSelectEvents(2000);
+//   sel.SetNumSelectEvts(2000);
 //   MFillH filler(...);
 //   filler.SetFilter(&sel);
@@ -48 +48 @@
 //   tlist.AddToList(&filler);
 //
-// If you don't have MReadTree available you have to set the number of
+// If you don't have MRead available you have to set the number of
 // total events manually, using sel.SetNumTotalEvts(10732);
 //
@@ -67 +67 @@
 #include "MParList.h"
 #include "MTaskList.h"
-#include "MReadTree.h"
+#include "MRead.h"
 
 #include "MLog.h"
@@ -127 +127 @@
             return kFALSE;
         }
-        MReadTree *read = (MReadTree*)tlist->FindObject("MReadTree");
-        if (!read)
-            read = (MReadTree*)tlist->FindObject("MReadMarsFile");
+        MRead *read = (MRead*)tlist->FindObject("MRead");
         if (!read)
         {
-            *fLog << err << dbginf << "Sorry can't determin total number of events from 'MReadTree/MReadMarsFile'." << endl;
+            *fLog << err << dbginf << "Sorry can't determin total number of events from 'MRead'." << endl;
             return kFALSE;
         }
         fNumTotalEvts = read->GetEntries();
+
+        SetBit(kNumTotalFromFile);
     }
 
@@ -166 +166 @@
 Bool_t MFEventSelector::PostProcess()
 {
+    if (TestBit(kNumTotalFromFile))
+        fNumTotalEvts = -1;
     return kTRUE;
 }

trunk/MagicSoft/Mars/mfilter/MFEventSelector.h

@@ -27 +27 @@
     void StreamPrimitive(ofstream &out) const;
 
+    enum { kNumTotalFromFile = BIT(14) };
     /*
      enum { kUseFixedRatio=BIT(14) }
@@ -38 +39 @@
     Bool_t IsExpressionTrue() const { return fResult; }
 
-    void SetNumTotalEvts(Int_t n) { fNumTotalEvts = n; }
+    void SetNumTotalEvts(Int_t n) { fNumTotalEvts = n; ResetBit(kNumTotalFromFile); }
     void SetNumSelectEvts(Int_t n) { fNumSelectEvts = n; }
     void SetSelectionRatio(Float_t f) { fSelRatio = f; }