Changeset 1846 for trunk/MagicSoft

Timestamp:

03/20/03 11:09:35 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfilter/MF.cc (modified) (11 diffs)
• mfilter/MF.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/03/20: Thomas Bretz
+
+    * mfilter/MF.[h,cc]:
+      - changed fFilter (already used in base class MTask) to fF
+
+
 
  2003/03/19: Abelardo Moralejo

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -100 +100 @@
 // Default Constructor. Don't use.
 //
-MF::MF() : fFilter(NULL)
+MF::MF() : fF(NULL)
 {
     fName  = gsDefName.Data();
@@ -117 +117 @@
 
     *fLog << inf << "Trying to resolve filter rule..." << endl;
-    if (!(fFilter=ParseString(text, 1)))
+    if (!(fF=ParseString(text, 1)))
     {
         *fLog << err << dbginf << "Parsing '" << text << "' failed." << endl;
@@ -124 +124 @@
 
     *fLog << inf << endl;
-    *fLog << "Using Filter rule " << fFilter->GetName();
+    *fLog << "Using Filter rule " << fF->GetName();
     *fLog << " for " << fName << ":" << endl;
-    fFilter->Print();
+    fF->Print();
     *fLog << endl << endl;
 }
@@ -136 +136 @@
 MF::~MF()
 {
-    if (fFilter)
-        delete fFilter;
+    if (fF)
+        delete fF;
 }
 
@@ -404 +404 @@
 Bool_t MF::PreProcess(MParList *plist)
 {
-    if (!fFilter)
+    if (!fF)
     {
         *fLog << err << dbginf << "No filter rule available." << endl;
@@ -410 +410 @@
     }
 
-    if (!fFilter->CallPreProcess(plist))
+    if (!fF->CallPreProcess(plist))
     {
         *fLog << err << dbginf << "PreProcessing filters in ";
@@ -426 +426 @@
 Bool_t MF::Process()
 {
-    return fFilter->CallProcess();
+    return fF->CallProcess();
 }
 
@@ -435 +435 @@
 Bool_t MF::PostProcess()
 {
-    return fFilter->CallPostProcess();
+    return fF->CallPostProcess();
 }
 
@@ -444 +444 @@
 Bool_t MF::IsExpressionTrue() const
 {
-    return fFilter->IsExpressionTrue();
+    return fF->IsExpressionTrue();
 }
 
@@ -451 +451 @@
     out << "   MF " << GetUniqueName();
 
-    if (!fFilter)
+    if (!fF)
     {
         out << ";" << endl;
@@ -457 +457 @@
     }
 
-    out << "(\"" << fFilter->GetRule() << "\"";
+    out << "(\"" << fF->GetRule() << "\"";
         if (fName!=gsDefName || fTitle!=gsDefTitle)
     {

trunk/MagicSoft/Mars/mfilter/MF.h

@@ -21 +21 @@
     static const TString gsDefTitle; //!
 
-    MFilter *fFilter; // Filter
+    MFilter *fF; // Filter
 
     Int_t IsAlNum(TString txt) const;