Changeset 666 for trunk/MagicSoft/Mars/mbase

Timestamp:

03/02/01 12:48:15 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MParList.cc (modified) (2 diffs)
• MParList.h (modified) (1 diff)
• MReadTree.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -18 +18 @@
 
 #include <TNamed.h>
+#include <TClass.h>
 
 #include "MLog.h"
@@ -111 +112 @@
 }
 
+MParContainer *MParList::FindCreateObj(const char *name)
+{
+    //
+    //  Find an object in the list.
+    //  'name' is the name of the object you are searching for.
+    //  If the object doesn't exist we try to create one from the
+    //  dictionary. If this isn't possible NULL is returned
+    //
+    MParContainer *pcont = (MParContainer*)FindObject(name);
+
+    if (pcont)
+        return pcont;
+
+    //
+    // if object is not existing in the list try to create one
+    //
+    *fLog << "MParList::CreateObject - Warning: '" << name << "' not found... creating." << endl;
+
+    //
+    // try to get class from root environment
+    //
+    TClass *cls = gROOT->GetClass(name);
+
+    if (!cls)
+    {
+        //
+        // if class is not existing in the root environment
+        //
+        *fLog << "MParList::CreateObject - Warning: Class '" << name << "' not existing in dictionary." << endl;
+        return NULL;
+    }
+
+    //
+    // create the container and add it to the list
+    //
+    pcont = (MParContainer*)cls->New();
+    AddToList(pcont);
+
+    //
+    //  Find an object in the list.
+    //  'name' is the name of the object you are searching for.
+    //
+    return pcont;
+}
 
 void MParList::Print(Option_t *t)

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -40 +40 @@
     void SetLogStream(MLog *log);
 
-    TObject *FindObject(const char *name) const;
+    TObject       *FindObject(const char *name) const;
+    MParContainer *FindCreateObj(const char *name);
 
     void Print(Option_t *t = NULL);

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -101 +101 @@
         // check if object is existing in the list
         //
-        MParContainer *pcont = (MParContainer*)pList->FindObject(name);
+        MParContainer *pcont = pList->FindCreateObj(name);
 
         if (!pcont)
         {
             //
-            // if object is not existing in the list try to create one
+            // if class is not existing in the (root) environment
+            // we cannot proceed reading this branch
             //
-            *fLog << "MReadTree::PreProcess - WARNING: '" << name << "' not found... creating." << endl;
-
-            //
-            // try to get class from root environment
-            //
-            TClass *cls = gROOT->GetClass(name);
-
-            if (!cls)
-            {
-                //
-                // if class is not existing in the root environment
-                // we cannot proceed reading this branch
-                //
-                *fLog << "MReadTree::PreProcess - Warning: Class '" << name << "' not existing in dictionary. Branch skipped." << endl;
-                continue;
-            }
-
-            //
-            // create the container and add it to the list
-            //
-            pcont = (MParContainer*)cls->New();
-            *fLog << pcont << endl;
-            pList->AddToList(pcont);
+            *fLog << "MReadTree::PreProcess - Warning: Class '" << name << "' not existing in dictionary. Branch skipped." << endl;
+            continue;
         }