- data member was shadowed (fTree)
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 4 Nov 2009 15:52:28 +0000 (15:52 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 4 Nov 2009 15:52:28 +0000 (15:52 +0000)
- avoiding crash in ReadFromTree when tree has been cleaned.

ANALYSIS/AliMultiEventInputHandler.cxx
ANALYSIS/AliMultiEventInputHandler.h
STEER/AliAODEvent.cxx

index d3ba80a..093bde1 100644 (file)
@@ -40,7 +40,6 @@ AliMultiEventInputHandler::AliMultiEventInputHandler() :
     fNBuffered(0),
     fIndex(0),
     fCurrentBin(0),
-    fTree(0),
     fEventPool(0),
     fEventBuffer(0)
 {
@@ -55,7 +54,6 @@ AliMultiEventInputHandler::AliMultiEventInputHandler(Int_t size, Int_t format) :
     fNBuffered(0),
     fIndex(0),
     fCurrentBin(0),
-    fTree(0),
     fEventPool(0),
     fEventBuffer(new AliVEvent*[size])
 {
@@ -78,7 +76,6 @@ AliMultiEventInputHandler::AliMultiEventInputHandler(const char* name, const cha
     fNBuffered(0),
     fIndex(0),
     fCurrentBin(0),
-    fTree(0),
     fEventPool(0),
     fEventBuffer(new AliVEvent*[size])
 {
index 87d4287..76512c3 100644 (file)
@@ -47,7 +47,6 @@ class AliMultiEventInputHandler : public AliInputEventHandler {
     Int_t          fNBuffered;    // Number of events actually buffered
     Int_t          fIndex;        // Pointer to most recent event
     Int_t          fCurrentBin;   // Current bin from the pool
-    TTree*         fTree;         // Pointer to the tree
     AliVEventPool* fEventPool;    // Pointer to the pool
     AliVEvent**    fEventBuffer;  // The event buffer
     ClassDef(AliMultiEventInputHandler, 1);
index 5603a21..c4dcabc 100644 (file)
@@ -450,7 +450,7 @@ void AliAODEvent::ReadFromTree(TTree *tree, Option_t* opt /*= ""*/)
     } 
     // Connect to tree
     // prevent a memory leak when reading back the TList
-    if (!(strcmp(opt, "reconnect"))) fAODObjects->Delete();
+    // if (!(strcmp(opt, "reconnect"))) fAODObjects->Delete();
 
     // create a new TList from the UserInfo TList... 
     // copy constructor does not work...