]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Memory leaks corrected.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 15 Aug 2008 15:15:12 +0000 (15:15 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 15 Aug 2008 15:15:12 +0000 (15:15 +0000)
STEER/AliAODEvent.cxx

index 72318e56e9c1ffb341ae4975709a7ae4398f9422..e0c8564064d3e265bc3ff49b4577d5fd234ea2c1 100644 (file)
@@ -328,14 +328,15 @@ void AliAODEvent::ResetStd(Int_t trkArrSize,
 void AliAODEvent::ClearStd()
 {
   // clears the standard arrays
-  fTracks        ->Clear();
-  fVertices      ->Clear();
-  fV0s           ->Clear();
+  fHeader        ->RemoveQTheta();
+  fTracks        ->Delete();
+  fVertices      ->Delete();
+  fV0s           ->Delete();
   fTracklets     ->DeleteContainer();
   fJets          ->Delete();
   fEmcalCells    ->DeleteContainer();
   fPhosCells     ->DeleteContainer();
-  fCaloClusters  ->Clear();
+  fCaloClusters  ->Delete();
   fFmdClusters   ->Clear();
   fPmdClusters   ->Clear();
 }
@@ -425,15 +426,18 @@ void AliAODEvent::ReadFromTree(TTree *tree, Option_t* opt /*= ""*/)
     // Check if already connected to tree
     TList* connectedList = (TList*) (tree->GetUserInfo()->FindObject("AODObjectsConnectedToTree"));
     if (connectedList && (strcmp(opt, "reconnect"))) {
-       // If connected use the connected list if objects
+       // If connected use the connected list of objects
+       printf("Delete and reconnect \n");
+       
        fAODObjects->Delete();
        fAODObjects = connectedList;
        GetStdContent(); 
        fConnected = kTRUE;
        return;
-    }
+    } 
     // Connect to tree
     // prevent a memory leak when reading back the TList
+    if (!(strcmp(opt, "reconnect"))) fAODObjects->Delete();
     delete fAODObjects;
     fAODObjects = 0;
     // create a new TList from the UserInfo TList...