Changeset 1187

Timestamp:

01/16/02 13:29:10 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MParList.cc (modified) (1 diff)
• mbase/MWriteAsciiFile.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -10 +10 @@
    * manalysis/MMcPedestalNSBAdd.cc:
      - small changes to output
+ 
+   * mbase/MParList.[h,cc]:
+     - added FindObject with class type argument
+   
+   * mbase/MWriteAsciiFile.cc
+     - replaced call to InheritsFrom by new FindObject
  
  

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -234 +234 @@
 // --------------------------------------------------------------------------
 //
+//  Find an object in the list and check for the correct inheritance.
+//  'name' is the name of the object you are searching for.
+//
+TObject *MParList::FindObject(const char *name, const char *classname) const
+{
+    TObject *obj = fContainer->FindObject(name);
+
+    if (!obj)
+        return NULL;
+
+    if (obj->InheritsFrom(classname))
+        return obj;
+
+    *fLog << dbginf << warn << "Found object '" << name << "' doesn't ";
+    *fLog << "inherit from " << "'" << classname << "'" << endl;
+    return NULL;
+}
+
+// --------------------------------------------------------------------------
+//
+//  check if the object is in the list or not and check for the correct
+//  inheritance
+//
+TObject *MParList::FindObject(const TObject *obj, const char *classname) const
+{
+    TObject *nobj = fContainer->FindObject(obj);
+
+    if (!nobj)
+        return NULL;
+
+    if (nobj->InheritsFrom(classname))
+        return nobj;
+
+    *fLog << dbginf << warn << "Found object '" << nobj->GetName() << "' ";
+    *fLog << "doesn't inherit from " << "'" << classname << "'" << endl;
+    return NULL;
+}
+
+// --------------------------------------------------------------------------
+//
 //  returns the ClassName without anything which is behind that last ';' in
 //  string.

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -176 +176 @@
         const char *name = obj->GetName();
 
-        MParContainer *cont = (MParContainer*)pList->FindObject(name);
+        MParContainer *cont = (MParContainer*)pList->FindObject(name, "MParContainer");
         if (!cont)
         {
@@ -183 +183 @@
         }
 
-        if (!cont->InheritsFrom(MParContainer::Class()))
-        {
-            *fLog << err << dbginf << "'" << name << "' doesn't inherit from MParContainer." << endl;
-            return kFALSE;
-
-        }
-
         AddContainer(cont);
     }