Changeset 6932 for trunk/MagicSoft/Mars/mfbase

Timestamp:

04/12/05 17:05:49 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfbase

Files:

• MF.cc (modified) (2 diffs)
• MF.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -106 +106 @@
 // Default Constructor. Don't use.
 //
-MF::MF() : fF(NULL)
+MF::MF() : fF(NULL), fAllowEmpty(kFALSE)
 {
     fName  = gsDefName.Data();
@@ -117 +117 @@
 // the class description above.
 //
-MF::MF(const char *text, const char *name, const char *title)
+MF::MF(const char *text, const char *name, const char *title) : fAllowEmpty(kFALSE)
 {
     fName  = name  ? name  : gsDefName.Data();

trunk/MagicSoft/Mars/mfbase/MF.h

@@ -21 +21 @@
     static const TString gsDefTitle; //!
 
-    MFilter *fF; // Filter
+    MFilter *fF;                     // Filter
+    Bool_t fAllowEmpty;              // Not a Bit to be stored
 
     Int_t IsRule(TString &txt, TString &rule) const;
@@ -32 +33 @@
     void StreamPrimitive(ofstream &out) const;
 
-    enum { kAllowEmpty = BIT(14) };
-
 public:
     MF();
@@ -40 +39 @@
 
     // MF
-    void SetAllowEmpty(Bool_t b=kTRUE) { b ? SetBit(kAllowEmpty) : ResetBit(kAllowEmpty); }
-    Bool_t IsAllowEmpty() const { return TestBit(kAllowEmpty); }
+    void SetAllowEmpty(Bool_t b=kTRUE) { fAllowEmpty = b; }
+    Bool_t IsAllowEmpty() const { return fAllowEmpty; }
 
     // MFilter
@@ -61 +60 @@
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
 
-    ClassDef(MF, 0) // A Filter for cuts in any data member
+    ClassDef(MF, 1) // A Filter for cuts in any data member
 };