Changeset 1666 for trunk/MagicSoft/Mars/mfilter

Timestamp:

11/22/02 09:23:54 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MF.cc (modified) (3 diffs)
• MF.h (modified) (1 diff)
• MFDataChain.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -155 +155 @@
 }
 
-MFilter *MF::ParseRule(TString &txt, MFilter *filter0) const
+MFilter *MF::ParseRule(TString &txt, MFilter *filter0, Int_t level) const
 {
     TString text;
@@ -243 +243 @@
     MFilter *newfilter;
     if (isrule)
+    {
         newfilter = new MFDataChain(text.Data(), c, num);
+        newfilter->SetName(Form("Chain%02d%c%f", level, c, num));
+    }
     else
+    {
         newfilter = new MFDataMember(text.Data(), c, num);
-
-    newfilter->SetName(Form("%s%c%f", text.Data(), c, num));
+        newfilter->SetName(Form("%s%c%f", text.Data(), c, num));
+    }
 
     return newfilter;
@@ -367 +371 @@
 
         default:
-            newfilter = ParseRule(txt, filter0);
+            newfilter = ParseRule(txt, filter0, level++);
             if (!newfilter)
             {

trunk/MagicSoft/Mars/mfilter/MF.h

@@ -25 +25 @@
     Int_t IsAlNum(TString txt) const;
 
-    MFilter *ParseRule(TString &txt, MFilter *filter0) const;
+    MFilter *ParseRule(TString &txt, MFilter *filter0, Int_t level) const;
     MFilter *ParseString(TString txt, Int_t level);
 

trunk/MagicSoft/Mars/mfilter/MFDataChain.cc

@@ -64 +64 @@
     fTitle = title ? title : "Filter using any data member of a class";
 
-    AddToBranchList(member);
+    //AddToBranchList(member);
 
     fFilterType = (type=='<' ? kELowerThan : kEGreaterThan);
@@ -111 +111 @@
 TString MFDataChain::GetRule() const
 {
-    TString ret = fData.GetRule();
+    TString ret = "{";
+    ret += fData.GetRule();
+    ret += "}";
     ret += fFilterType==kELowerThan?"<":">";