Changeset 9026

Timestamp:

07/21/08 09:18:18 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MParList.cc (modified) (2 diffs)
• mbase/MStatusArray.cc (modified) (4 diffs)
• mbase/MStatusArray.h (modified) (1 diff)
• mreport/MReportHelp.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/07/21 Thomas Bretz
+
+   * mbase/MParContainer.[h,cc]:
+     - adde new static ember functions GetClass
+
+   * mbase/MParList.[h,cc], mbase/MStatusArray.[h,cc],
+     mreport/MReportHelp.cc:
+     - use new GetClass function
+
+
 
  2008/07/20 Thomas Bretz

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -776 +776 @@
     // try to get class from root environment
     //
-    TClass *cls = GetClass(cname);
+    gLog << err;
+    TClass *cls = GetClass(cname, &gLog);
     if (!cls)
         return list;
@@ -782 +783 @@
     if (!cls->InheritsFrom(MParContainer::Class()))
     {
-        *fLog << err << dbginf << "Cannot create new instance of class '" << cname << "': " << endl;
-        *fLog << "Class doesn't inherit from MParContainer." << endl;
+        gLog << err << dbginf << "Cannot create new instance of class '" << cname << "': " << endl;
+        gLog << "Class doesn't inherit from MParContainer." << endl;
         return list;
     }

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -44 +44 @@
 #include "MStatusArray.h"
 
-#include <TH1.h>      // TH1::AddDirectoryStatus();
+#include <TH1.h>       // TH1::AddDirectoryStatus();
 #include <TClass.h>
 #include <TCanvas.h>
@@ -51 +51 @@
 #include "MLogManip.h"
 
+#include "MParContainer.h"   // MParContainer::GetClass
 #include "MStatusDisplay.h"
 
@@ -125 +126 @@
 }
 
-// FIXME: Move to a general class MMARS (TROOT) and unify with MParContainer
-TClass *MStatusArray::GetClass(const char *name) const
-{
-    TClass *cls = gROOT->GetClass(name);
-    Int_t rc = 0;
-    if (!cls)
-        rc =1;
-    else
-    {
-        if (!cls->Property())
-            rc = 5;
-        if (!cls->Size())
-            rc = 4;
-        if (!cls->IsLoaded())
-            rc = 3;
-        if (!cls->HasDefaultConstructor())
-            rc = 2;
-    }
-
-    if (rc==0)
-        return cls;
-
-    gLog << err << dbginf << "Class '" << name << "' not in dictionary: ";
-    switch (rc)
-    {
-    case 1:
-        gLog << "gROOT->GetClass() returned NULL." << endl;
-        return NULL;
-    case 2:
-        gLog << "no default constructor." << endl;
-        return NULL;
-    case 3:
-        gLog << "not loaded." << endl;
-        return NULL;
-    case 4:
-        gLog << "zero size." << endl;
-        return NULL;
-    case 5:
-        gLog << "no property." << endl;
-        return NULL;
-    }
-
-    gLog << "THIS SHOULD NEVER HAPPEN!" << endl;
-
-    return 0;
-}
-
 TCanvas *MStatusArray::FindCanvas(const char *name) const
 {
@@ -184 +138 @@
 TObject *MStatusArray::FindObjectInCanvas(const char *object, const char *base, const char *canvas) const
 {
-    TClass *cls = GetClass(base);
+    gLog << err;
+    TClass *cls = MParContainer::GetClass(base, &gLog);
     if (!cls)
         return 0;

trunk/MagicSoft/Mars/mbase/MStatusArray.h

@@ -24 +24 @@
     void     PrintObjectsInPad(const TCollection *list, const TString &name, Int_t lvl=0) const;
     TObject *FindObjectInPad(TVirtualPad *pad, const char *object, TClass *base) const;
-    TClass  *GetClass(const char *name) const;
 
 public:

trunk/MagicSoft/Mars/mreport/MReportHelp.cc

@@ -58 +58 @@
 MReportHelp::MReportHelp(const char *name, MLog *fLog) : fReport(NULL), fNumReports(0), fNumSkipped(0)
 {
-    TClass *cls = gROOT->GetClass(name);
-    Int_t rc = 0;
-    if (!cls)
-        rc =1;
-    else
-    {
-        if (!cls->Property())
-            rc = 5;
-        if (!cls->Size())
-            rc = 4;
-        if (!cls->IsLoaded())
-            rc = 3;
-        if (!cls->HasDefaultConstructor())
-            rc = 2;
-    }
-
-    if (rc)
-    {
-        *fLog << err << dbginf << "Cannot create new instance of class '" << name << "': ";
-        switch (rc)
-        {
-        case 1:
-            *fLog << "gROOT->GetClass() returned NULL." << endl;
-            return;
-        case 2:
-            *fLog << "no default constructor." << endl;
-            return;
-        case 3:
-            *fLog << "not loaded." << endl;
-            return;
-        case 4:
-            *fLog << "zero size." << endl;
-            return;
-        case 5:
-            *fLog << "no property." << endl;
-            return;
-        }
-    }
-
     //
     // create the parameter container of the the given class type
     //
-    fReport = (MReport*)cls->New();
+    *fLog << err;
+    TClass *cls = MParList::GetClass(name, fLog);
+
+    if (cls && cls->InheritsFrom(MReport::Class()))
+        fReport = static_cast<MReport*>(cls->New());
 }