Changeset 1846
- Timestamp:
- 03/20/03 11:09:35 (22 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r1845 r1846 1 1 -*-*- END OF LINE -*-*- 2 3 2003/03/20: Thomas Bretz 4 5 * mfilter/MF.[h,cc]: 6 - changed fFilter (already used in base class MTask) to fF 7 8 2 9 3 10 2003/03/19: Abelardo Moralejo -
trunk/MagicSoft/Mars/mfilter/MF.cc
r1668 r1846 100 100 // Default Constructor. Don't use. 101 101 // 102 MF::MF() : fF ilter(NULL)102 MF::MF() : fF(NULL) 103 103 { 104 104 fName = gsDefName.Data(); … … 117 117 118 118 *fLog << inf << "Trying to resolve filter rule..." << endl; 119 if (!(fF ilter=ParseString(text, 1)))119 if (!(fF=ParseString(text, 1))) 120 120 { 121 121 *fLog << err << dbginf << "Parsing '" << text << "' failed." << endl; … … 124 124 125 125 *fLog << inf << endl; 126 *fLog << "Using Filter rule " << fF ilter->GetName();126 *fLog << "Using Filter rule " << fF->GetName(); 127 127 *fLog << " for " << fName << ":" << endl; 128 fF ilter->Print();128 fF->Print(); 129 129 *fLog << endl << endl; 130 130 } … … 136 136 MF::~MF() 137 137 { 138 if (fF ilter)139 delete fF ilter;138 if (fF) 139 delete fF; 140 140 } 141 141 … … 404 404 Bool_t MF::PreProcess(MParList *plist) 405 405 { 406 if (!fF ilter)406 if (!fF) 407 407 { 408 408 *fLog << err << dbginf << "No filter rule available." << endl; … … 410 410 } 411 411 412 if (!fF ilter->CallPreProcess(plist))412 if (!fF->CallPreProcess(plist)) 413 413 { 414 414 *fLog << err << dbginf << "PreProcessing filters in "; … … 426 426 Bool_t MF::Process() 427 427 { 428 return fF ilter->CallProcess();428 return fF->CallProcess(); 429 429 } 430 430 … … 435 435 Bool_t MF::PostProcess() 436 436 { 437 return fF ilter->CallPostProcess();437 return fF->CallPostProcess(); 438 438 } 439 439 … … 444 444 Bool_t MF::IsExpressionTrue() const 445 445 { 446 return fF ilter->IsExpressionTrue();446 return fF->IsExpressionTrue(); 447 447 } 448 448 … … 451 451 out << " MF " << GetUniqueName(); 452 452 453 if (!fF ilter)453 if (!fF) 454 454 { 455 455 out << ";" << endl; … … 457 457 } 458 458 459 out << "(\"" << fF ilter->GetRule() << "\"";459 out << "(\"" << fF->GetRule() << "\""; 460 460 if (fName!=gsDefName || fTitle!=gsDefTitle) 461 461 { -
trunk/MagicSoft/Mars/mfilter/MF.h
r1666 r1846 21 21 static const TString gsDefTitle; //! 22 22 23 MFilter *fF ilter; // Filter23 MFilter *fF; // Filter 24 24 25 25 Int_t IsAlNum(TString txt) const;
Note:
See TracChangeset
for help on using the changeset viewer.