Changeset 1116 for trunk/MagicSoft/Mars/mbase

Timestamp:

12/17/01 10:20:08 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MGList.cc (modified) (4 diffs)
• MReadTree.cc (modified) (9 diffs)
• MTask.cc (modified) (2 diffs)
• MWriteRootFile.cc (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -53 +53 @@
 #pragma link C++ class MTime+;
 
-#pragma link C++ class MHtml+;
-
-
 #endif

trunk/MagicSoft/Mars/mbase/MGList.cc

@@ -50 +50 @@
 //  objects in the list.
 //
-#include <TRefCnt.h>
-
 MGList::~MGList()
 {
@@ -91 +89 @@
     //  -fno-rtti, which could be used in 'plain' C++
     //
+
+    //
+    // FIXME: This should not be necessary but it is, why??
+    //
+    // TRY: TGPicture *pic = gClient->GetPicture("pic");
+    //      cout << pic->IsA()->DynamicCast(TGWidget::Class(), pic) << endl;
+    //
+    //      Is this another bug in root?
+    //
+    if (!obj->IsA()->InheritsFrom(TGWidget::Class()))
+        return NULL;
+
     return (TGWidget*)obj->IsA()->DynamicCast(TGWidget::Class(), obj);
 }
@@ -137 +147 @@
     if (IsExisting(obj))
     {
-        cout << "Widget with id #" << GetWidget(obj)->WidgetId() << " already in list... ignored." << endl;
+        const Int_t id = GetWidget(obj)->WidgetId();
+        cout << "Widget with id #" << id << " (";
+        cout << FindWidget(id)->ClassName() << ") already in list... ";
+        cout << obj->GetName() << " ignored." << endl;
         return;
     }
@@ -155 +168 @@
     if (IsExisting(obj))
     {
-        cout << "Widget with id #" << GetWidget(obj)->WidgetId() << " already in list... ignored." << endl;
+        Int_t id = GetWidget(obj)->WidgetId();
+        cout << "Widget with id #" << id << " (";
+        cout << FindWidget(id)->ClassName() << ") already in list... ";
+        cout << obj->GetName() << " ignored." << endl;
         return;
     }

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -259 +259 @@
 
     if (fChain->GetBranch(dot+1))
-        SetBranchStatus(dot+1, kTRUE);
+        SetBranchStatus(dot+1, status);
 }
 
@@ -294 +294 @@
     // check whether branch choosing must be switched on
     //
-    //EnableBranchChoosing();
+    EnableBranchChoosing();
 
     //
@@ -308 +308 @@
 
     //
-    // Loop over all tasks iand its filters n the task list.
-    //
+    // This loop is not necessary. We could do it like in the commented
+    // loop below. But this loop makes sure, that we don't try to enable
+    // one branch several times. This would not harm, but we would get
+    // an output for each attempt. To have several outputs for one subbranch
+    // may confuse the user, this we don't want.
+    // This loop creates a new list of subbranches and for each branch
+    // which is added we check before whether it already exists or not.
+    //
+    TList list;
+
     MTask *task;
     TIter NextTask(tlist->GetList());
     while ((task=(MTask*)NextTask()))
     {
+        TObject *obj;
+
+        TIter NextTBranch(task->GetListOfBranches());
+        while ((obj=NextTBranch()))
+            if (!list.FindObject(obj->GetName()))
+                list.Add(obj);
+
+        const MFilter *filter = task->GetFilter();
+
+        if (!filter)
+            continue;
+
+        TIter NextFBranch(filter->GetListOfBranches());
+        while ((obj=NextFBranch()))
+            if (!list.FindObject(obj->GetName()))
+                list.Add(obj);
+    }
+
+    SetBranchStatus(&list, kTRUE);
+/*
+    //
+    // Loop over all tasks iand its filters n the task list.
+    //
+    MTask *task;
+    TIter NextTask(tlist->GetList());
+    while ((task=(MTask*)NextTask()))
+    {
         SetBranchStatus(task->GetListOfBranches(), kTRUE);
+
         const MFilter *filter = task->GetFilter();
-
-        if (filter)
-            SetBranchStatus(filter->GetListOfBranches(), kTRUE);
-
-    }
+        if (!filter)
+           continue;
+
+        SetBranchStatus(filter->GetListOfBranches(), kTRUE);
+
+    }
+*/
 }
 
@@ -376 +414 @@
     *fLog << inf << fNumEntries << " entries found in file(s)." << endl;
 
-    *fLog << all << fChain->GetListOfBranches() << endl;
-
     //
     // Get all branches of this tree and
@@ -386 +422 @@
 
     Int_t num=0;
-
-
-    *fLog << "Start..." << endl;
     //
     // loop over all tasks for processing
@@ -399 +432 @@
         const char *bname = branch->GetName();
 
-        *fLog << all << bname << endl;
-
         TString oname(bname);
-
         if (oname.EndsWith("."))
             oname.Remove(oname.Length()-1);
@@ -412 +442 @@
         {
             *fLog << inf << "Master branch " << bname << " has veto... skipped." << endl;
-            DisableSubBranches(branch);
-            continue;
-        }
-
-        MParContainer *obj = pList->FindCreateObj(oname);
-
-        if (!obj)
-        {
-            //
-            // if class is not existing in the (root) environment
-            // we cannot proceed reading this branch
-            //
-            *fLog << warn << dbginf << "Warning: Class '" << oname << "' not existing in dictionary. Branch skipped." << endl;
             DisableSubBranches(branch);
             continue;
@@ -551 +568 @@
 {
     //
-    // This is necessary due to a bug in TCHain::LoadTree in root.
+    // This is necessary due to a bug in TChain::LoadTree in root.
+    // will be fixed in 3.03
     //
     if (fNumEntry >= fNumEntries)
@@ -644 +662 @@
 void MReadTree::VetoBranch(const char *name)
 {
-    TNamed *branch = new TNamed(name, "");
-    fVetoList->Add(branch);
+    fVetoList->Add(new TNamed(name, ""));
 }
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz <mailto:tbretz@uni-sw.gwdg.de>, 12/2000
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -113 +113 @@
 void MTask::AddToBranchList(const char *b)
 {
-    TNamed *name = new TNamed(b, "");
-    fListOfBranches->Add(name);
+    if (fListOfBranches->FindObject(b))
+        return;
+
+    fListOfBranches->Add(new TNamed(b, ""));
 }
 

trunk/MagicSoft/Mars/mbase/MWriteRootFile.cc

@@ -48 +48 @@
 ClassImp(MWriteRootFile);
 
-#define kFillTree BIT(14)
-
 // --------------------------------------------------------------------------
 //
@@ -315 +313 @@
 void MWriteRootFile::CheckAndWrite() const
 {
+    const Int_t kFillTree = BIT(14);
+
     TObject *obj;
 

trunk/MagicSoft/Mars/mbase/Makefile

@@ -51 +51 @@
            MArrayS.cc \
            MTime.cc \
-           MHtml.cc \
            MClone.cc \
            MPrint.cc \