Changeset 3682 for trunk/MagicSoft/Mars/mfbase

Timestamp:

04/08/04 19:52:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfbase

Files:

• MF.cc (modified) (7 diffs)
• MFilterList.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -41 +41 @@
 //   "MHillas.fWidth<0.5 && MHillas.fLength<0.6"
 //
-// You can also use brackets:
+// You can also use parantheses:
 //   "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:
+// you must encapsulate it in {}-parantheses, eg:
 //   "{log10(MHillas.fSize)}>3"
 //
@@ -60 +60 @@
 //
 //
-// Warning: There is no priority rule build in. So better use brackets
+// Warning: There is no priority rule build in. So better use parantheses
 //   to get correct results. The rule is parsed/evaluated from the left
 //   to the right, which means:
@@ -120 +120 @@
     fTitle = title ? title : gsDefTitle.Data();
 
-    *fLog << inf << "Trying to resolve filter rule..." << endl;
+    *fLog << inf << "Trying to resolve filter rule... " << flush;
     if (!(fF=ParseString(text, 1)))
     {
@@ -127 +127 @@
     }
 
-    *fLog << inf << endl;
-    *fLog << "Using Filter rule " << fF->GetName();
-    *fLog << " for " << fName << ":" << endl;
+    *fLog << inf << "found: ";
     fF->Print();
-    *fLog << endl << endl;
+    *fLog << endl;
 }
 
@@ -178 +176 @@
     {
         *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;
+        *fLog << "Currently you have to enclose all conditions in parantheses, like: \"(x<y) && (z<5)\"" << endl;
         return NULL;
     }
@@ -226 +224 @@
             {
                 //
-                // Search for the corresponding bracket
+                // Search for the corresponding parantheses
                 //
                 Int_t first=1;
@@ -250 +248 @@
                 //
                 // Make a copy of the 'interieur' and delete the substringä
-                // including the brackets
+                // including the parantheses
                 //
                 TString sub = txt(1, first-1);

trunk/MagicSoft/Mars/mfbase/MFilterList.cc

@@ -79 +79 @@
 //
 //   Options:
-//      and, &   : is a bitwise and
-//      or, |    : is a bitwise or
-//      xor, ^   : is a bitwise exclusive or
+//      and,  &  : is a bitwise and
+//      or,   |  : is a bitwise or
+//      xor,  ^  : is a bitwise exclusive or
 //      land, && : is a logical and
-//      lor, ||  : is a logical or
+//      lor,  || : is a logical or
+//
+//   The bitwise operators are implemented for convinience. They may not
+//   make much sense. Maybe IsExpressionTrue should change its return
+//   type from Bool_t to Int_t.
 //
 MFilterList::MFilterList(const char *type, const char *name, const char *title)