Changeset 5910 for trunk/MagicSoft/Mars/mbase

Timestamp:

01/20/05 14:21:25 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MContinue.cc (modified) (5 diffs)
• MContinue.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MContinue.cc

@@ -55 +55 @@
 // --------------------------------------------------------------------------
 //
+// Default constructor.
+//
 // Use this constructor if a rule (see MF for more details) shell be used.
 // MContinue will create a MF object and use it as a filter for the
@@ -67 +69 @@
 // is added to the tasklist in front of MContinue.
 //
+// Use the default constructor (or an empty rule) if you want to read the
+// rule from a resource file.
+//
 MContinue::MContinue(const TString rule, const char *name, const char *title)
 {
@@ -147 +152 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Propagate display to filter (if set)
+//
 void MContinue::SetDisplay(MStatusDisplay *d)
 {
@@ -155 +164 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Propagate log stream to filter (if set)
+//
 void MContinue::SetLogStream(MLog *lg)
 {
@@ -181 +194 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// If a filter is setup, call its 'IsInverted' to invert its meaning
+// (boolean "not")
+//
 void MContinue::SetInverted(Bool_t i)
 {
-    GetFilter()->SetInverted(i);
-}
-
+    if (GetFilter())
+        GetFilter()->SetInverted(i);
+}
+
+// --------------------------------------------------------------------------
+//
+// If a filter is setup, its IsInverted status is returned. If now filter
+// has been setup yet, kFALSE is returned.
+//
 Bool_t MContinue::IsInverted() const
 {
-    return GetFilter()->IsInverted();
-}
+    return GetFilter() ? GetFilter()->IsInverted() : kFALSE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Check for corresponding entries in resource file and setup filters.
+// Avoid trailing 0's!
+//
+// Example:
+//   test.C:
+//     MContinue cont("", "MyContinue");
+//
+//   test.rc:
+//     MyContinue.Condition: {0} && {1}
+//     MyContinue.Inverted: yes
+//     MyContinue.0: MHillas.fSize>1000
+//     MyContinue.1: MHillas.fSize<10000
+//
+// For more details see MF::ReadEnv
+//
+Int_t MContinue::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    MF *f = new MF;
+    f->SetName(fName);
+
+    const Bool_t rc = f->ReadEnv(env, prefix, print);
+    if (rc!=kTRUE)
+    {
+        delete f;
+        return rc;
+    }
+
+    if (TestBit(kIsOwner))
+        delete GetFilter();
+
+    SetBit(kIsOwner);
+    MTask::SetFilter(f);
+
+    f->SetName(Form("MF:%s", fName.Data()));
+
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mbase/MContinue.h

@@ -25 +25 @@
     MTaskList *fTaskList;  //! pointer to the present tasklist
 
+    // MTask
     Int_t PreProcess(MParList *list);
     Int_t Process() { return kCONTINUE; }
@@ -39 +40 @@
     Bool_t IsInverted() const;
 
+    // MParContainer
     void SetDisplay(MStatusDisplay *d);
     void SetLogStream(MLog *lg);
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
 
     ClassDef(MContinue, 1) //Task returning kCONTINUE