Changeset 8906

Timestamp:

06/01/08 20:19:43 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MTaskList.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
    * mbase/MContinue.cc:
      - improved output
+
+   * mbase/MTaskList.cc:
+     - fixed broken FindTaskList
 
 
@@ -143 +146 @@
      - contped has been removed from the tasklist
 
+   * mhbase/MH3.cc:
+     - fixed a bug introduced with the lables (it must be !(x&y) 
+       instead of !x&y
+
+   * mjobs/MDataSet.cc:
+     - shortened a line of output to fit into 80 characters
+
 
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2007
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -420 +420 @@
 MTaskList *MTaskList::FindTaskList(const char *task)
 {
-    if (FindObject(task))
-        return this;
-
     TIter Next(fTasks);
     TObject *o = 0;
     while ((o=Next()))
     {
+        if (strcmp(o->GetName(), task)==0)
+           return this;
+
         MTaskList *l = dynamic_cast<MTaskList*>(o);
         if (!l)
             continue;
 
-        if (l->FindObject(task))
+        if ((l=l->FindTaskList(task)))
             return l;
     }
@@ -443 +443 @@
 MTaskList *MTaskList::FindTaskList(const MTask *task)
 {
-    if (FindObject(task))
-        return this;
-
     TIter Next(fTasks);
     TObject *o = 0;
     while ((o=Next()))
     {
+       if (o==task)
+          return this;
+
         MTaskList *l = dynamic_cast<MTaskList*>(o);
         if (!l)
             continue;
 
-        if (l->FindObject(task))
+        if ((l=l->FindTaskList(task)))
             return l;
     }