Changeset 3573 for trunk/MagicSoft/Mars/mfbase/MF.cc

Timestamp:

03/22/04 14:30:09 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfbase/MF.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -71 +71 @@
 //
 //
-//  If you intend to use Data Chains in filters enclose the chains in
-//  this {}-parenthesis, eg.
-//
-//   "{MHillas.fSize*MHillas.fWidth}<0.5"
-//
 // FIXME: The possibility to use also complete filters is missing.
 //        Maybe we can use gInterpreter->Calc("") for this.
@@ -166 +161 @@
 MFilter *MF::ParseRule(TString &txt, MFilter *filter0, Int_t level) 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;
+    // For backward compatibility
+    txt.ReplaceAll("{", "(");
+    txt.ReplaceAll("}", ")");
+
+    const Int_t fg = txt.First('>');
+    const Int_t lg = txt.First('>');
+    const Int_t fl = txt.First('<');
+    const Int_t ll = txt.First('<');
+
+    if (fg<0 && fl<0)
+    {
+        *fLog << err << dbginf << "Syntax Error: No coditional sign found in " << txt << 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;
+    if (fg>=0 && fl>=0)
+    {
+        *fLog << err << dbginf << "Syntax Error: Two coditional signs found in " << txt << endl;
+        *fLog << "Currently you have to enclose all conditions in brackets, like: \"(x<y) && (z<5)\"" << 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;
+    if (fg!=lg || fl!=ll)
+    {
+        *fLog << err << dbginf << "Syntax Error: Coditional sign found twice " << txt << endl;
         return NULL;
     }
 
-    txt.Remove(0, end-txt.Data());
-
-    MFilter *newfilter;
-    if (isrule)
-    {
-        Int_t lvl = gLog.GetDebugLevel();
-        gLog.SetDebugLevel(1);
-        newfilter = new MFDataChain(text.Data(), c, num);
-        newfilter->SetName(Form("Chain%02d%c%f", level, c, num));
-        gLog.SetDebugLevel(lvl);
-    }
-    else
-    {
-        newfilter = new MFDataMember(text.Data(), c, num);
-        newfilter->SetName(Form("%s%c%f", text.Data(), c, num));
-    }
-
-    return newfilter;
+    const Int_t cond = fg<0 ? fl : fg;
+
+    const TString rule1 = txt(0, cond);
+    const TString rule2 = txt(cond+1, txt.Length());
+
+    Int_t lvl = gLog.GetDebugLevel();
+    gLog.SetDebugLevel(1);
+    MFilter *f = new MFDataChain(rule1.Data(), txt[cond], rule2.Data());
+    f->SetName(Form("Chain%02d%c", level, txt[cond]));
+    gLog.SetDebugLevel(lvl);
+
+    txt = "";
+
+    return f;
 }
 // --------------------------------------------------------------------------