Changeset 8706 for trunk/MagicSoft/Mars/mfbase

Timestamp:

08/24/07 13:58:50 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfbase

Files:

• MFDataPhrase.cc (modified) (2 diffs)
• MFDataPhrase.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mfbase/MFDataPhrase.cc

@@ -107 +107 @@
 // the class description above.
 //
-MFDataPhrase::MFDataPhrase(const char *text, const char *name, const char *title) : fAllowEmpty(kFALSE)
+MFDataPhrase::MFDataPhrase(const char *text, const char *name, const char *title) : fData(NULL), fAllowEmpty(kFALSE)
 {
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
+
+    if (!text)
+        return;
 
     *fLog << inf << "Parsing filter rule... " << flush;
@@ -162 +165 @@
 Int_t MFDataPhrase::Process()
 {
-    if (fData)
-        fResult = fData->GetValue()>0.5;
+    fResult = fData ? fData->GetValue()>0.5 : fDefault;
 
     return kTRUE;

trunk/MagicSoft/Mars/mfbase/MFDataPhrase.h

@@ -18 +18 @@
     MData *fData;
     Bool_t fAllowEmpty;              // Not a Bit to be stored
+    Bool_t fDefault;                 // Default for empty case
 
     Bool_t fResult; //!
@@ -38 +39 @@
     void SetAllowEmpty(Bool_t b=kTRUE) { fAllowEmpty = b; }
     Bool_t IsAllowEmpty() const { return fAllowEmpty; }
+
+    void SetDefault(Bool_t b) { fDefault = b;    }
+    Bool_t GetDefault() const { return fDefault; }
 
     // MFilter