Changeset 2710 for trunk/MagicSoft

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mdata/MDataMember.cc (modified) (2 diffs)
• mdata/MDataMember.h (modified) (2 diffs)
• merpp.cc (modified) (3 diffs)
• mfilter/MF.cc (modified) (1 diff)
• mfilter/MFDataMember.cc (modified) (5 diffs)
• mfilter/MFDataMember.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
      - added a first implementation to be able searching report
        files for the run number
+
+   * mdata/MDataMember.[h,cc]:
+     - implemented a way to determin whether the data member is 
+       a floating point value or an integer
+
+   * mfilter/MFDataMember.[h,cc]:
+     - use the information to treat integer values more accuratly
 
 

trunk/MagicSoft/Mars/mdata/MDataMember.cc

@@ -63 +63 @@
     fCall   = call;
 
+    if (fCall->ReturnType()==TMethodCall::kLong)
+        SetBit(kIsInt);
+    else
+        ResetBit(kIsInt);
+
     fDataMember = (TString)obj->GetName() + "." + call->GetName();
 }
@@ -77 +82 @@
     fObject = obj;
     fCall   = obj->GetterMethod(call);
+
+    if (fCall->ReturnType()==TMethodCall::kLong)
+        SetBit(kIsInt);
+    else
+        ResetBit(kIsInt);
 
     fDataMember = (TString)obj->GetName() + "." + call;

trunk/MagicSoft/Mars/mdata/MDataMember.h

@@ -20 +20 @@
     TMethodCall   *fCall;
 
+    enum { kIsInt = BIT(14) };
+
 public:
     MDataMember(const char *member=NULL) : fObject(NULL), fCall(NULL)
@@ -39 +41 @@
     TString GetDataMember() const;
 
+    Bool_t IsInt() const { return TestBit(kIsInt); }
+
     ClassDef(MDataMember, 1) // MData object corresponding to a single data member of a Mars container
 };

trunk/MagicSoft/Mars/merpp.cc

@@ -22 +22 @@
 #include "MRawCrateArray.h"
 
-#include "MFilterList.h"
 #include "MFDataMember.h"
 
@@ -225 +224 @@
     // be created by MRawFileRead::PreProcess
     //
-    MTask       *read   = 0;
-    MFilterList *filter = 0;
-    MTask       *write  = 0;
+    MTask   *read   = 0;
+    MFilter *filter = 0;
+    MTask   *write  = 0;
 
     const TString option(kUpdate ? "UPDATE" : "RECREATE");
@@ -278 +277 @@
             {
                 r->AddToList("MReportRun");
-                // FIXME: Too difficult!
-                filter = new MFilterList;
-                filter->SetOwner();
-                filter->AddToList(new MFDataMember("MReportRun.fRunNumber", '>', kRunNumber-0.5));
-                filter->AddToList(new MFDataMember("MReportRun.fRunNumber", '<', kRunNumber+0.5));
+                filter = new MFDataMember("MReportRun.fRunNumber", '=', kRunNumber-0.5);
+                filter->SetInverted();
                 w->SetFilter(filter);
             }

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);