Changeset 1661 for trunk/MagicSoft/Mars/mfilter

Timestamp:

11/21/02 15:04:04 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• FilterLinkDef.h (modified) (1 diff)
• MF.cc (modified) (7 diffs)
• MF.h (modified) (1 diff)
• MFDataChain.cc (added)
• MFDataChain.h (added)
• MFDataMember.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MFTriggerLvl1+;
 #pragma link C++ class MFParticleId+;
+#pragma link C++ class MFDataChain+;
 #pragma link C++ class MFDataMember+;
 

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -44 +44 @@
 //   "MHillas.fSize>200 || (MHillas.fWidth<0.5 && MHillas.fLength<0.6)"
 //
+// If you want to use mathematic expressions (as defined in MDataChain)
+// you must encapsulate it in {}-Brackets, eg:
+//   "{log10(MHillas.fSize)}>3"
+//
 // The allowed logigal conditionals are:
 //   &&: logical and
@@ -53 +57 @@
 // are allowed.
 //
+//
 // Warning: There is no priority rule build in. So better use brackets
 //   to get correct results. The rule is parsed/evaluated from the left
@@ -80 +85 @@
 
 #include "MFilterList.h"
+#include "MFDataChain.h"
 #include "MFDataMember.h"
 
@@ -139 +145 @@
 // in the given string
 //
-Int_t MF::IsAlNum(TString txt)
+Int_t MF::IsAlNum(TString txt) const
 {
     int l = txt.Length();
@@ -149 +155 @@
 }
 
+MFilter *MF::ParseRule(TString &txt, MFilter *filter0) const
+{
+    TString text;
+
+    Bool_t isrule = kFALSE;
+
+    if (txt[0]=='{')
+    {
+        //
+        // Search for the corresponding bracket
+        //
+        Int_t first=1;
+        for (int cnt=0; first<txt.Length(); first++)
+        {
+            if (txt[first]=='{')
+                cnt++;
+            if (txt[first]=='}')
+                cnt--;
+
+            if (cnt==-1)
+                break;
+        }
+
+        if (first==txt.Length())
+        {
+            *fLog << err << dbginf << "Syntax Error: '}' missing." << endl;
+            return NULL;
+        }
+
+        //
+        // Make a copy of the 'interieur' and delete the substringä
+        // including the brackets
+        //
+        TString sub = txt(1, first-1);
+        txt.Remove(0, first+1);
+
+        text=sub;
+        isrule = kTRUE;
+    }
+    else
+    {
+        int i = IsAlNum(txt);
+
+        if (i==0)
+        {
+            *fLog << err << dbginf << "Syntax Error: Name of data member missing in '" << txt << "'" << endl;
+            return NULL;
+        }
+
+        text = txt(0, i);
+
+        txt.Remove(0, i);
+    }
+
+    txt = txt.Strip(TString::kBoth);
+
+    if (txt.IsNull())
+    {
+        *fLog << err << dbginf << "Syntax Error: No conditional in '" << text << "'" << endl;
+        return NULL;
+    }
+
+    char c;
+    switch (txt[0])
+    {
+    case '>':
+    case '<':
+        c = txt[0];
+        txt.Remove(0, 1);
+        break;
+
+    default:
+        *fLog << err << dbginf << "Syntax Error: Conditional '" << txt[0] << "' unknown." << endl;
+        return NULL;
+    }
+
+    char *end;
+    Double_t num = strtod(txt.Data(), &end);
+    if (!end || txt.Data()==end)
+    {
+        *fLog << err << dbginf << "Error trying to convert '" << txt << "' to value." << endl;
+        return NULL;
+    }
+
+    txt.Remove(0, end-txt.Data());
+
+    MFilter *newfilter;
+    if (isrule)
+        newfilter = new MFDataChain(text.Data(), c, num);
+    else
+        newfilter = new MFDataMember(text.Data(), c, num);
+
+    newfilter->SetName(Form("%s%c%f", text.Data(), c, num));
+
+    return newfilter;
+}
 // --------------------------------------------------------------------------
 //
@@ -222 +324 @@
             return NULL;
 
+
         case '&':
         case '|':
@@ -264 +367 @@
 
         default:
-            int i = IsAlNum(txt);
-
-            if (i==0)
+            newfilter = ParseRule(txt, filter0);
+            if (!newfilter)
             {
-                *fLog << err << dbginf << "Syntax Error: Name of data member missing in '" << txt << "'" << endl;
                 if (filter0)
                     delete filter0;
                 return NULL;
             }
-
-            TString text = txt(0, i);
-
-            txt.Remove(0, i);
-            txt = txt.Strip(TString::kBoth);
-
-            if (txt.IsNull())
-            {
-                *fLog << err << dbginf << "Syntax Error: No conditional in '" << text << "'" << endl;
-                if (filter0)
-                    delete filter0;
-                return NULL;
-            }
-
-            char c;
-            switch (txt[0])
-            {
-            case '>':
-            case '<':
-                c = txt[0];
-                txt.Remove(0, 1);
-                break;
-
-            default:
-                *fLog << err << dbginf << "Syntax Error: Conditional '" << txt[0] << "' unknown." << endl;
-                if (filter0)
-                    delete filter0;
-                return NULL;
-            }
-
-            char *end;
-            Double_t num = strtod(txt.Data(), &end);
-            if (!end || txt.Data()==end)
-            {
-                *fLog << err << dbginf << "Error trying to convert '" << txt << "' to value." << endl;
-                if (filter0)
-                    delete filter0;
-                return NULL;
-            }
-
-            txt.Remove(0, end-txt.Data());
-
-            newfilter = new MFDataMember(text.Data(), c, num);
-            newfilter->SetName(Form("%s%c%f", text.Data(), c, num));
         }
 

trunk/MagicSoft/Mars/mfilter/MF.h

@@ -23 +23 @@
     MFilter *fFilter; // Filter
 
-    Int_t IsAlNum(TString txt);
+    Int_t IsAlNum(TString txt) const;
 
+    MFilter *ParseRule(TString &txt, MFilter *filter0) const;
     MFilter *ParseString(TString txt, Int_t level);
 

trunk/MagicSoft/Mars/mfilter/MFDataMember.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  01/2002 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz  01/2002 <mailto:tbretz@astro.uni-wueruburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2002

trunk/MagicSoft/Mars/mfilter/Makefile

@@ -35 +35 @@
            MFilterList.cc \
            MFEventSelector.cc \
+           MFDataChain.cc \
            MFDataMember.cc \
            MFParticleId.cc \