Changeset 959 for trunk/MagicSoft/Mars/mbase

Timestamp:

10/02/01 14:46:56 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MClone.cc (added)
• MClone.h (added)
• MEvtLoop.cc (modified) (1 diff)
• MEvtLoop.h (modified) (1 diff)
• MParList.cc (modified) (1 diff)
• MParList.h (modified) (2 diffs)
• MTaskList.cc (modified) (3 diffs)
• MTaskList.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -31 +31 @@
 #pragma link C++ class MInputStreamID;
 
+#pragma link C++ class MClone;
+
 #pragma link C++ class MReadTree;
 #pragma link C++ class MWriteFile;

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -81 +81 @@
 MEvtLoop::~MEvtLoop()
 {
+    if (TestBit(kIsOwner) && fParList)
+        delete fParList;
+}
+
+// --------------------------------------------------------------------------
+//
+//  if you set the Eventloop as owner the destructor of the given parameter
+//  list is calles by the destructor of MEvtLoop, otherwise not.
+//
+inline void MEvtLoop::SetOwner(Bool_t enable=kTRUE)
+{
+    enable ? SetBit(kIsOwner) : ResetBit(kIsOwner);
 }
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -27 +27 @@
     MTaskList *fTaskList;
 
+    enum { kIsOwner = BIT(14) };
+
 public:
     MEvtLoop();
     virtual ~MEvtLoop();
 
-    void SetParList(MParList *p)  { fParList = p; }
+    void SetParList(MParList *p)        { fParList = p; }
+    MParList *GetParList() const        { return fParList; }
+
+    void SetOwner(Bool_t enable=kTRUE);
 
     Bool_t PreProcess(const char *tlist="MTaskList");

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -81 +81 @@
 // --------------------------------------------------------------------------
 //
+//  If the 'IsOwner' bit is set (via SetOwner()) all containers are deleted
+//  by the destructor
+//
+MParList::~MParList()
+{
+    if (TestBit(kIsOwner))
+        fContainer.SetOwner();
+}
+
+// --------------------------------------------------------------------------
+//
+//  If the 'IsOwner' bit is set (via SetOwner()) all containers are deleted
+//  by the destructor
+//
+inline void MParList::SetOwner(Bool_t enable=kTRUE)
+{
+    enable ? SetBit(kIsOwner) : ResetBit(kIsOwner);
+}
+
+// --------------------------------------------------------------------------
+//
 //  Set the logging streamer of the parameter list and all contained
 //  parameter containers

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -32 +32 @@
     static TString GetObjectName(const char *classname, const char *objname);
 
+    enum { kIsOwner = BIT(14) };
+
 public:
     MParList(const char *name=NULL, const char *title=NULL);
     MParList(MParList &ts);
 
-    ~MParList()
-    {
-    }
+    ~MParList();
 
     Bool_t AddToList(MParContainer *obj, MParContainer *where = NULL);
@@ -57 +57 @@
     void SetReadyToSave(Bool_t flag=kTRUE);
 
+    void SetOwner(Bool_t enable=kTRUE);
+
     void Print(Option_t *t = NULL);
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -80 +80 @@
 // --------------------------------------------------------------------------
 //
+//  If the 'IsOwner' bit is set (via SetOwner()) all tasks are deleted
+//  by the destructor
+//
+MTaskList::~MTaskList()
+{
+    if (TestBit(kIsOwner))
+        fTasks.SetOwner();
+}
+
+// --------------------------------------------------------------------------
+//
+//  If the 'IsOwner' bit is set (via SetOwner()) all containers are deleted
+//  by the destructor
+//
+inline void MTaskList::SetOwner(Bool_t enable=kTRUE)
+{
+    enable ? SetBit(kIsOwner) : ResetBit(kIsOwner);
+}
+
+
+// --------------------------------------------------------------------------
+//
 //  Set the logging stream for the all tasks in the list and the tasklist
 //  itself.
@@ -169 +191 @@
 // --------------------------------------------------------------------------
 //
+//  Find an object in the list.
+//  'name' is the name of the object you are searching for.
+//
+TObject *MTaskList::FindObject(const char *name) const
+{
+    return fTasks.FindObject(name);
+}
+
+// --------------------------------------------------------------------------
+//
+//  check if the object is in the list or not
+//
+TObject *MTaskList::FindObject(TObject *obj) const
+{
+    return fTasks.FindObject(obj);
+}
+
+// --------------------------------------------------------------------------
+//
 // do pre processing (before eventloop) of all tasks in the task-list
 //
@@ -187 +228 @@
     // loop over all tasks for preproccesing
     //
-    while ( (task=(MTask*)Next()) )
+    while ((task=(MTask*)Next()))
     {
         *fLog << task->GetName() << "... " << flush;

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -27 +27 @@
     MParList      *fParList;
 
+    enum { kIsOwner = BIT(14) };
+
 public:
     MTaskList(const char *name=NULL, const char *title=NULL);
+    MTaskList(MTaskList &ts);
 
-    MTaskList(MTaskList &ts);
+    ~MTaskList();
 
     void SetLogStream(MLog *log);
 
     Bool_t AddToList(MTask *task, const char *tType="All", MTask *where = NULL);
+
+    TObject *FindObject(const char *name) const;
+    TObject *FindObject(TObject *obj) const;
 
     Bool_t PreProcess(MParList *pList);
@@ -41 +47 @@
 
     void Print(Option_t *opt = "");
+    void SetOwner(Bool_t enable=kTRUE);
 
     ClassDef(MTaskList, 0)      //collection of tasks to be performed in the eventloop

trunk/MagicSoft/Mars/mbase/Makefile

@@ -49 +49 @@
            MLog.cc \
            MHtml.cc \
+           MClone.cc \
            MLogManip.cc