Changeset 894

Timestamp:

07/23/01 14:37:44 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MReadTree.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -10 +10 @@
    * mhist/HistLinkDef.h:
      - removed MEnergies.cc
+   
+   * mbase/MReadTree.cc:
+     - removed a bug which causes MReadTree to show strange behaviour.
+       We cannot use GetBranch()->SetAddress() we have to use
+       SetBranchAddress.
 
 

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -48 +48 @@
 #include <TArrayC.h>
 #include <TObjArray.h>
+#include <TChainElement.h>
 
 #include "MLog.h"
@@ -87 +88 @@
 MReadTree::~MReadTree()
 {
+    //
+    // Delete all the pointers to pointers to the objects where the
+    // branche data gets stored.
+    //
+    TIter Next(fChain->GetStatus());
+
+    TChainElement *element = NULL;
+    while ((element=(TChainElement*)Next()))
+        delete (MParContainer**)element->GetBaddress();
+
+    //
+    // Delete the chain and the veto list
+    //
     delete fChain;
     delete fVetoList;
@@ -161 +175 @@
             continue;
 
+
+        //
+        // Create a pointer to the pointer to the object in which the
+        // branch data is stored. The pointers are stored in the TChain
+        // object and we get the pointers from there to delete it.
+        //
+        MParContainer **pcont = new MParContainer*;
+
         //
         // check if object is existing in the list
         //
-        MParContainer *pcont = pList->FindCreateObj(name);
-        
-
-        if (!pcont)
+        *pcont=pList->FindCreateObj(name);
+
+        if (!*pcont)
         {
             //
@@ -182 +203 @@
         //
         // FIXME: is it correct, that the pointer is deleted immediatly afterwards?
-        branch->SetAddress(&pcont);
+        fChain->SetBranchAddress(name, pcont);
     }
 
@@ -207 +228 @@
     //
     fChain->GetEntry(fNumEntry);
+    cout << " " << fChain->LoadTree(fNumEntry) << " "<<flush;
 
     fNumEntry++;