Changeset 1211 for trunk/MagicSoft/Mars/mfilter

Timestamp:

01/22/02 20:50:06 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MFAlpha.cc (modified) (1 diff)
• MFAlpha.h (modified) (1 diff)
• MFTriggerLvl1.cc (modified) (1 diff)
• MFTriggerLvl1.h (modified) (1 diff)

trunk/MagicSoft/Mars/mfilter/MFAlpha.cc

@@ -44 +44 @@
 // --------------------------------------------------------------------------
 //
-MFAlpha::MFAlpha(const char *cname, const char type, const Float_t val) : fHillas(NULL)
+MFAlpha::MFAlpha(const char *cname, const char type, const Float_t val,
+                 const char *name, const char *title) : fHillas(NULL)
 {
     fContName = cname;
-    Init(type, val);
+    Init(type, val, name, title);
 }
 
 // --------------------------------------------------------------------------
 //
-MFAlpha::MFAlpha(const MHillasSrc *hillas, const char type, const Float_t val) : fHillas(hillas)
+MFAlpha::MFAlpha(const MHillasSrc *hillas, const char type, const Float_t val,
+                 const char *name, const char *title) : fHillas(hillas)
 {
-    Init(type, val);
+    Init(type, val, name, title);
 }
 
 // --------------------------------------------------------------------------
 //
-void MFAlpha::Init(const char type, const Int_t val)
+void MFAlpha::Init(const char type, const Int_t val,
+                   const char *name, const char *title)
 {
+    fName  = name  ? name  : "MFAlpha";
+    fTitle = title ? title : "Filter using the alpha angle";
+
     fFilterType = (type=='<' ? kELowerThan : kEGreaterThan);
 

trunk/MagicSoft/Mars/mfilter/MFAlpha.h

@@ -27 +27 @@
     Float_t fValue; // [deg]
 
-    void Init(const char type, const Int_t val);
+    void Init(const char type, const Int_t val,
+              const char *name, const char *title);
 
 public:
-    MFAlpha(const char       *cname="MHillas", const char type='>', const Float_t deg=15);
-    MFAlpha(const MHillasSrc *hillas,          const char type='>', const Float_t deg=15);
+    MFAlpha(const char       *cname="MHillas", const char type='>', const Float_t deg=15,
+            const char *name=NULL, const char *title=NULL);
+    MFAlpha(const MHillasSrc *hillas,          const char type='>', const Float_t deg=15,
+            const char *name=NULL, const char *title=NULL);
 
     Bool_t IsExpressionTrue() const;

trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.cc

@@ -42 +42 @@
 // --------------------------------------------------------------------------
 //
-MFTriggerLvl1::MFTriggerLvl1(const char *cname, const char type, const Int_t val) : fMcTrig(NULL)
+MFTriggerLvl1::MFTriggerLvl1(const char *cname, const char type, const Int_t val,
+                             const char *name, const char *title) : fMcTrig(NULL)
 {
     fContName = cname;
-    Init(type, val);
+    Init(type, val, name, title);
 }
 
 // --------------------------------------------------------------------------
 //
-MFTriggerLvl1::MFTriggerLvl1(const MMcTrig *mctrig, const char type, const Int_t val) : fMcTrig(mctrig)
+MFTriggerLvl1::MFTriggerLvl1(const MMcTrig *mctrig, const char type, const Int_t val,
+                             const char *name, const char *title) : fMcTrig(mctrig)
 {
-    Init(type, val);
+    Init(type, val, name, title);
 }
 
 // --------------------------------------------------------------------------
 //
-void MFTriggerLvl1::Init(const char type, const Int_t val)
+void MFTriggerLvl1::Init(const char type, const Int_t val,
+                         const char *name, const char *title)
 {
+    fName  = name  ? name  : "MFTriggerLvl1";
+    fTitle = title ? title : "Filter using number of 1st level triggers";
+
     fFilterType = (type=='<' ? kELowerThan : kEGreaterThan);
 

trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.h

@@ -27 +27 @@
     Int_t  fValue;
 
-    void Init(const char type, const Int_t val);
+    void Init(const char type, const Int_t val,
+              const char *name, const char *title);
 
 public:
-    MFTriggerLvl1(const char *cname="MMcTrig", const char type='>', const Int_t val=0);
-    MFTriggerLvl1(const MMcTrig *mctrig,       const char type='>', const Int_t val=0);
+    MFTriggerLvl1(const char *cname="MMcTrig", const char type='>', const Int_t val=0,
+                  const char *name=NULL, const char *title=NULL);
+    MFTriggerLvl1(const MMcTrig *mctrig,       const char type='>', const Int_t val=0,
+                  const char *name=NULL, const char *title=NULL);
 
     Bool_t IsExpressionTrue() const;