Changeset 2710 for trunk/MagicSoft/Mars/mfilter

Timestamp:

12/18/03 12:05:36 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MF.cc (modified) (1 diff)
• MFDataMember.cc (modified) (5 diffs)
• MFDataMember.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -85 +85 @@
 #include <ctype.h>        // isalnum, ...
 #include <stdlib.h>       // strtod, ...
-#include <fstream>      // ofstream, ...
+#include <fstream>        // ofstream, ...
 
 #include <TMethodCall.h>

trunk/MagicSoft/Mars/mfilter/MFDataMember.cc

@@ -41 +41 @@
 //   MFDataMember filter("MHillas.fLength", '<', 150);
 //
+// You can test '<', '>' and '='. Warning: Using '=' may give strange results
+// in case you are comparing floating point values.
+//
+// In case the data member is detected to be an integer value, both
+// the data member and the val given as argument in the constructor
+// are castet to Long_t.
+//
+// To test != use the SetInverted() member function.
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MFDataMember.h"
@@ -68 +77 @@
     AddToBranchList(member);
 
-    fFilterType = (type=='<' ? kELowerThan : kEGreaterThan);
+    switch (type)
+    {
+    case '>': fFilterType = kEGreaterThan; break;
+    case '<': fFilterType = kELowerThan;   break;
+    case '=': fFilterType = kEEqual;       break;
+    default:  fFilterType = kEGreaterThan; break;
+    }
 
-    if (type!='<' && type!='>')
-        *fLog << warn << dbginf << "Warning: Neither '<' nor '>' specified... using '>'." << endl;
+    if (type!='<' && type!='=' && type!='>')
+        *fLog << warn << dbginf << "Warning: Neither '<' nor '=' nor '>' specified... using '>'." << endl;
 }
 
@@ -85 +100 @@
 Int_t MFDataMember::Process()
 {
-    switch (fFilterType)
+    if (fData.IsInt())
     {
-    case kELowerThan:
-        fResult = (fData.GetValue() < fValue);
-        return kTRUE;
-    case kEGreaterThan:
-        fResult = (fData.GetValue() > fValue);
-        return kTRUE;
+        switch (fFilterType)
+        {
+        case kELowerThan:
+            fResult = ((Long_t)fData.GetValue() < (Long_t)fValue);
+            return kTRUE;
+        case kEGreaterThan:
+            fResult = ((Long_t)fData.GetValue() > (Long_t)fValue);
+            return kTRUE;
+        case kEEqual:
+            fResult = ((Long_t)fData.GetValue() == (Long_t)fValue);
+            return kTRUE;
+        }
+    }
+    else
+    {
+        switch (fFilterType)
+        {
+        case kELowerThan:
+            fResult = (fData.GetValue() < fValue);
+            return kTRUE;
+        case kEGreaterThan:
+            fResult = (fData.GetValue() > fValue);
+            return kTRUE;
+        case kEEqual:
+            fResult = (fData.GetValue() == fValue);
+            return kTRUE;
+        }
     }
 
@@ -107 +143 @@
     out << "   MFDataMember " << GetUniqueName() << "(\"";
     out << fData.GetRule() << "\", '";
-    out << (fFilterType==kELowerThan?"<":">");
+    switch (fFilterType)
+    {
+    case kEGreaterThan: out << '>'; break;
+    case kELowerThan:   out << '<'; break;
+    case kEEqual:       out << '='; break;
+    }
     out << "', " << fValue << ");" << endl;
 }
@@ -114 +155 @@
 {
     TString ret = fData.GetRule();
-    ret += fFilterType==kELowerThan?"<":">";
+    switch (fFilterType)
+    {
+    case kEGreaterThan: ret +='>'; break;
+    case kELowerThan:   ret +='<'; break;
+    case kEEqual:       ret +='='; break;
+    }
 
     TString str;

trunk/MagicSoft/Mars/mfilter/MFDataMember.h

@@ -1 +1 @@
 #ifndef MARS_MFDataMember
 #define MARS_MFDataMember
-
-/////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-// MFDataMember                                                                 //
-//                                                                         //
-/////////////////////////////////////////////////////////////////////////////
 
 #ifndef MARS_MFilter
@@ -22 +16 @@
     MDataMember fData;
 
-    typedef enum { kELowerThan, kEGreaterThan } FilterType_t;
+    typedef enum { kELowerThan, kEGreaterThan, kEEqual } FilterType_t;
     FilterType_t fFilterType;
 
@@ -34 +28 @@
 
 public:
+    enum {
+        kIsInt = BIT(14)
+    };
     MFDataMember(const char *member, const char type, const Double_t val,
                  const char *name=NULL, const char *title=NULL);