Changeset 858

Timestamp:

07/06/01 14:31:04 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MArray.cc (modified) (1 diff)
• MArrayB.cc (modified) (1 diff)
• MArrayS.cc (modified) (1 diff)
• MEvtLoop.cc (modified) (1 diff)
• MFilter.cc (added)
• MFilter.h (added)
• MFilterList.cc (added)
• MFilterList.h (added)
• MLog.cc (modified) (2 diffs)
• MLog.h (modified) (1 diff)
• MParContainer.h (modified) (1 diff)
• MParList.cc (modified) (4 diffs)
• MParList.h (modified) (1 diff)
• MReadTree.cc (modified) (1 diff)
• MTask.cc (modified) (1 diff)
• MTask.h (modified) (1 diff)
• MTaskList.cc (modified) (8 diffs)
• MTaskList.h (modified) (1 diff)
• MTime.cc (modified) (1 diff)
• MWriteAsciiFile.cc (modified) (1 diff)
• MWriteFile.cc (modified) (1 diff)
• MWriteRootFile.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -24 +24 @@
 #pragma link C++ class MParList;
 
+#pragma link C++ class MFilter;
+#pragma link C++ class MFilterList;
+
 #pragma link C++ class MEvtLoop;
 

trunk/MagicSoft/Mars/mbase/MArray.cc

@@ -38 +38 @@
 #include "MArray.h"
 
-ClassImp(MArray)
+ClassImp(MArray);
 

trunk/MagicSoft/Mars/mbase/MArrayB.cc

@@ -19 +19 @@
 #include "MArrayB.h"
 
-ClassImp(MArrayB)
+ClassImp(MArrayB);
 

trunk/MagicSoft/Mars/mbase/MArrayS.cc

@@ -35 +35 @@
 #include "MArrayS.h"
 
-ClassImp(MArrayS)
+ClassImp(MArrayS);
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -59 +59 @@
 #include "MTaskList.h"
 
-ClassImp(MEvtLoop)
+ClassImp(MEvtLoop);
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -48 +48 @@
 #include "MLogManip.h"
 
-ClassImp(MLog)
+ClassImp(MLog);
 
 //
@@ -108 +108 @@
     AllocateFile(fname);
     CheckFlag(eFile, flag);
+}
+
+// --------------------------------------------------------------------------
+//
+// copyt constructor
+//
+MLog::MLog(MLog &log)
+{
+    fOutputLevel  = log.fOutputLevel;
+    fDebugLevel   = log.fDebugLevel;
+    fDevice       = log.fDevice;
 }
 

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -51 +51 @@
     MLog(const char *fname, int flag=-1);
 
-    MLog(MLog &log) { }
+    MLog(MLog &log);
 
     ~MLog()

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -48 +48 @@
     MParContainer& operator=(const MParContainer& rhs);
 
-    void SetLogStream(MLog *log) { fLog = log; }
+    void SetLogStream(MLog *lg) { fLog = lg; }
 
     virtual ~MParContainer() { 

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -47 +47 @@
 #include "MLogManip.h"
 
-ClassImp(MParList)
+ClassImp(MParList);
 
 // --------------------------------------------------------------------------
@@ -144 +144 @@
 TObject *MParList::FindObject(const char *name) const
 {
-    return (TObject*)fContainer.FindObject(name);
+    return fContainer.FindObject(name);
+}
+
+// --------------------------------------------------------------------------
+//
+//  check if the object is in the list or not
+//
+TObject *MParList::FindObject(TObject *obj) const
+{
+    return fContainer.FindObject(obj);
 }
 
@@ -282 +291 @@
 void MParList::Reset()
 {
-    return;
     TIter Next(&fContainer);
 
@@ -290 +298 @@
     // loop over all tasks for preproccesing
     //
-    while ( (cont=(MParContainer*)Next()) )
+    while ((cont=(MParContainer*)Next()))
         cont->Reset();
 }

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -42 +42 @@
 
     TObject       *FindObject(const char *name) const;
+    TObject       *FindObject(TObject *obj) const;
     MParContainer *FindCreateObj(const char *classname, const char *objname=NULL);
 

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -55 +55 @@
 #include "MParList.h"
 
-ClassImp(MReadTree)
+ClassImp(MReadTree);
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -61 +61 @@
 #include "MTask.h"
 
-ClassImp(MTask)
+ClassImp(MTask);
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -14 +14 @@
 #endif
 
+class MFilter;
 class MParList;
 
 class MTask : public MInputStreamID
 {
+private:
+    const MFilter *fFilter;
+
 public:
+    MTask() : fFilter(NULL) {}
     ~MTask()
     {
     }
+
+    const MFilter *GetFilter() const { return fFilter; }
+    void SetFilter(const MFilter *filter) { fFilter=filter; }
 
     virtual Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -34 +34 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
+#include "MFilter.h"
 #include "MParList.h"
 #include "MInputStreamID.h"
 
-ClassImp(MTaskList)
+ClassImp(MTaskList);
 
 // --------------------------------------------------------------------------
@@ -79 +81 @@
     // loop over all tasks for preproccesing
     //
-    while ( (task=(MTask*)Next()) )
+    while ((task=(MTask*)Next()))
         task->SetLogStream(log);
 
@@ -102 +104 @@
     if (fTasks.FindObject(task))
     {
-        *fLog << "WARNING: MTaskList::AddToList: Task already existing." << endl;
+        *fLog << dbginf << "Task already existing." << endl;
         return kTRUE;
     }
@@ -108 +110 @@
     if (fTasks.FindObject(name))
     {
-        *fLog << "WARNING: MTaskList::AddToList: '" << name << "' exists in List already." << endl;
+        *fLog << dbginf << "'" << name << "' exists in List already." << endl;
         return kTRUE;
     }
@@ -116 +118 @@
         if (!fTasks.FindObject(where))
         {
-            printf("ERROR: MTaskList::AddToList: Cannot find task after which the new task should be scheduled!\n");
+            *fLog << dbginf << "Cannot find task after which the new task should be scheduled!" << endl;
             return kFALSE;
         }
@@ -135 +137 @@
 // do pre processing (before eventloop) of all tasks in the task-list
 //
-Bool_t MTaskList::PreProcess( MParList *pList )
+Bool_t MTaskList::PreProcess(MParList *pList)
 { 
     *fLog << "Preprocessing... " << flush;
@@ -199 +201 @@
 
         //
+        // Check for the existance of a filter. If a filter is existing
+        // check for its value. If the value is kFALSE don't execute
+        // this task.
+        //
+        const MFilter *filter = task->GetFilter();
+
+        const Bool_t rc = filter ? filter->IsExpressionTrue() : kTRUE;
+
+        if (!rc)
+            continue;
+
+        //
         // if it has the right stream id execute the Process() function
         // and check what the result of it is.
@@ -273 +287 @@
 void MTaskList::Print(Option_t *t)
 {
-  *fLog << "TaskList: " << this->GetName() << " <" <<  this->GetTitle() << ">" << endl;
-  
-  fTasks.Print();
-
-  *fLog << endl;
-}
-
+    *fLog << "TaskList: " << this->GetName() << " <" <<  this->GetTitle() << ">" << endl;
+
+    fTasks.Print();
+
+    *fLog << endl;
+}
+

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -40 +40 @@
     Bool_t PostProcess();
 
-    void Print(Option_t *t = NULL);
+    void Print(Option_t *opt = "");
 
     ClassDef(MTaskList, 0)      //collection of tasks to be performed in the eventloop

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -37 +37 @@
 #include "MLog.h"
 
-ClassImp(MTime)
+ClassImp(MTime);
 
 void MTime::Print(Option_t *)

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -46 +46 @@
 #include "MParList.h"
 
-ClassImp(MWriteAsciiFile)
+ClassImp(MWriteAsciiFile);
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MWriteFile.cc

@@ -44 +44 @@
 #include "MParList.h"
 
-ClassImp(MWriteFile)
+ClassImp(MWriteFile);
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MWriteRootFile.cc

@@ -43 +43 @@
 #include "MParList.h"
 
-ClassImp(MWriteRootFile)
+ClassImp(MWriteRootFile);
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/Makefile

@@ -35 +35 @@
            MParContainer.cc \
            MParList.cc \
+           MFilter.cc \
+           MFilterList.cc \
            MInputStreamID.cc \
            MEvtLoop.cc \