Changeset 1936 for trunk/MagicSoft/Mars/mbase

Timestamp:

04/10/03 10:43:24 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MFilter.cc (modified) (1 diff)
• MFilter.h (modified) (1 diff)
• MTask.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MFilter.cc

@@ -72 +72 @@
 ClassImp(MFilter);
 
-MFilter::MFilter(const char *name, const char *title)
+MFilter::MFilter(const char *name, const char *title) : fInverted(kFALSE)
 {
     fName  = name  ? name  : "MFilter";
     fTitle = title ? title : "Base Class for a filter";
-}
-
-// --------------------------------------------------------------------------
-//
-Bool_t MFilter::PreProcess(MParList *pList)
-{
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-Bool_t MFilter::Process()
-{
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-Bool_t MFilter::PostProcess()
-{
-    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mbase/MFilter.h

@@ -11 +11 @@
 {
 private:
-    virtual Bool_t PreProcess(MParList *pList);
-    virtual Bool_t Process();
-    virtual Bool_t PostProcess();
+    Bool_t fInverted;
+
+    virtual Bool_t IsExpressionTrue() const = 0;
 
 public:
     MFilter(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t IsExpressionTrue() const = 0;
     virtual TString GetRule() const;
+
+    Bool_t IsConditionTrue() const { return fInverted ? !IsExpressionTrue() : IsExpressionTrue(); }
+
+    void SetInverted(Bool_t i) { fInverted=i; }
+    Bool_t IsInverted() const  { return fInverted; }
 
     ClassDef(MFilter, 0)                // Abstract base class for the filters

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -198 +198 @@
     // this task.
     //
-    const Bool_t exec = fFilter ? fFilter->IsExpressionTrue() : kTRUE;
+    const Bool_t exec = fFilter ? fFilter->IsConditionTrue() : kTRUE;
 
     if (!exec)