- data member was shadowed (fTree)

- avoiding crash in ReadFromTree when tree has been cleaned.

diff --git a/ANALYSIS/AliMultiEventInputHandler.cxx b/ANALYSIS/AliMultiEventInputHandler.cxx
index d3ba80ab943e88fc7cb0a4e336d5bd5fd9b16788..093bde13851ce92eb8572673828eb53b4d813eb1 100644 (file)
--- a/ANALYSIS/AliMultiEventInputHandler.cxx
+++ b/ANALYSIS/AliMultiEventInputHandler.cxx
@@ -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])
 {

diff --git a/ANALYSIS/AliMultiEventInputHandler.h b/ANALYSIS/AliMultiEventInputHandler.h
index 87d4287fe43592785be5157e82b3e03d79b65d30..76512c35a286597e54263761dd906fb4b42dfcc0 100644 (file)
--- a/ANALYSIS/AliMultiEventInputHandler.h
+++ b/ANALYSIS/AliMultiEventInputHandler.h
@@ -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);

diff --git a/STEER/AliAODEvent.cxx b/STEER/AliAODEvent.cxx
index 5603a210e14f6ecda718aa181b8d7c964783afa2..c4dcabcc880ed6d75903c1b2c6e1475455ddc499 100644 (file)
--- a/STEER/AliAODEvent.cxx
+++ b/STEER/AliAODEvent.cxx
@@ -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...