Fix fixed-string length bug

[u/mrichter/AliRoot.git] / STEER / AliAODEvent.cxx

diff --git a/STEER/AliAODEvent.cxx b/STEER/AliAODEvent.cxx
index 7c0264fe71db879f5f7ea51cdca33d0123678657..72318e56e9c1ffb341ae4975709a7ae4398f9422 100644 (file)
--- a/STEER/AliAODEvent.cxx
+++ b/STEER/AliAODEvent.cxx
@@ -26,7 +26,7 @@
 #include <TFriendElement.h>
 #include <TProcessID.h>
 #include <TCollection.h>
-
+#include "Riostream.h"
 #include "AliAODEvent.h"
 #include "AliAODHeader.h"
 #include "AliAODTrack.h"
@@ -51,6 +51,7 @@ AliAODEvent::AliAODEvent() :
   AliVEvent(),
   fAODObjects(new TList()),
   fAODFolder(0),
+  fConnected(kFALSE),
   fHeader(0),
   fTracks(0),
   fVertices(0),
@@ -71,6 +72,7 @@ AliAODEvent::AliAODEvent(const AliAODEvent& aod):
   AliVEvent(aod),
   fAODObjects(new TList()),
   fAODFolder(new TFolder()),
+  fConnected(kFALSE),
   fHeader(new AliAODHeader(*aod.fHeader)),
   fTracks(new TClonesArray(*aod.fTracks)),
   fVertices(new TClonesArray(*aod.fVertices)),
@@ -95,7 +97,7 @@ AliAODEvent::AliAODEvent(const AliAODEvent& aod):
   AddObject(fCaloClusters);
   AddObject(fFmdClusters);
   AddObject(fPmdClusters);
-
+  fConnected = aod.fConnected;
   GetStdContent();
 }
 
@@ -109,6 +111,7 @@ AliAODEvent & AliAODEvent::operator=(const AliAODEvent& aod) {
 
     fAODObjects      = new TList();
     fAODFolder       = new TFolder();
+    fConnected       = aod.fConnected;
     fHeader          = new AliAODHeader(*aod.fHeader);
     fTracks          = new TClonesArray(*aod.fTracks);
     fVertices        = new TClonesArray(*aod.fVertices);
@@ -143,7 +146,12 @@ AliAODEvent & AliAODEvent::operator=(const AliAODEvent& aod) {
 AliAODEvent::~AliAODEvent() 
 {
 // destructor
-    delete fAODObjects;
+    if(fAODObjects&&!fConnected)
+    {
+       delete fAODObjects;
+       fAODObjects = 0;
+    }
+
     delete fAODFolder;
 }
 
@@ -340,12 +348,16 @@ Int_t AliAODEvent::GetPHOSClusters(TRefArray *clusters) const
   clusters->Clear();
   
   AliAODCaloCluster *cl = 0;
+  Bool_t first = kTRUE;
   for (Int_t i = 0; i < GetNCaloClusters() ; i++) {
-    
     if ( (cl = GetCaloCluster(i)) ) {
       if (cl->IsPHOSCluster()){
+       if(first) {
+         new (clusters) TRefArray(TProcessID::GetProcessWithUID(cl)); 
+         first=kFALSE;
+       }
        clusters->Add(cl);
-       //AliDebug(1,Form("IsPHOS cluster %d Size: %d \n",i,clusters->GetEntriesFast()));
+       //printf("IsPHOS cluster %d, E %2.3f Size: %d \n",i,cl->E(),clusters->GetEntriesFast());
       }
     }
   }
@@ -358,14 +370,18 @@ Int_t AliAODEvent::GetEMCALClusters(TRefArray *clusters) const
   // fills the provided TRefArray with all found emcal clusters
 
   clusters->Clear();
-
+  cout<<"AOD event 1: nclus "<<GetNCaloClusters()<<endl;
   AliAODCaloCluster *cl = 0;
+  Bool_t first = kTRUE;
   for (Int_t i = 0; i < GetNCaloClusters(); i++) {
-
     if ( (cl = GetCaloCluster(i)) ) {
       if (cl->IsEMCALCluster()){
+       if(first) {
+         new (clusters) TRefArray(TProcessID::GetProcessWithUID(cl)); 
+         first=kFALSE;
+       }
        clusters->Add(cl);
-       //AliDebug(1,Form("IsEMCAL cluster %d Size: %d \n",i,clusters->GetEntriesFast()));
+       //printf("IsEMCal cluster %d, E %2.3f Size: %d \n",i,cl->E(),clusters->GetEntriesFast());
       }
     }
   }
@@ -391,9 +407,9 @@ Int_t AliAODEvent::GetMuonTracks(TRefArray *muonTracks) const
 }
 
 
-void AliAODEvent::ReadFromTree(TTree *tree)
+void AliAODEvent::ReadFromTree(TTree *tree, Option_t* opt /*= ""*/)
 {
-  // connects aod event to tree
+  // Connects aod event to tree
   
   if(!tree){
     Printf("%s %d AliAODEvent::ReadFromTree() Zero Pointer to Tree \n",(char*)__FILE__,__LINE__);
@@ -408,12 +424,13 @@ void AliAODEvent::ReadFromTree(TTree *tree)
   if(aodEvent){
     // Check if already connected to tree
     TList* connectedList = (TList*) (tree->GetUserInfo()->FindObject("AODObjectsConnectedToTree"));
-    if (connectedList) {
-      // If connected use the connected list if objects
-      fAODObjects->Delete();
-      fAODObjects = connectedList;
-      GetStdContent(); 
-      return;
+    if (connectedList && (strcmp(opt, "reconnect"))) {
+       // If connected use the connected list if objects
+       fAODObjects->Delete();
+       fAODObjects = connectedList;
+       GetStdContent(); 
+       fConnected = kTRUE;
+       return;
     }
     // Connect to tree
     // prevent a memory leak when reading back the TList
@@ -460,7 +477,6 @@ void AliAODEvent::ReadFromTree(TTree *tree)
     while((el=(TNamed*)next())){
       TString bname(el->GetName());
       // check if branch exists under this Name
-      printf("Trying to connect branch %s\n", bname.Data());
       TBranch *br = tree->GetTree()->GetBranch(bname.Data());
       if(br){
        tree->SetBranchAddress(bname.Data(),fAODObjects->GetObjectRef(el));
@@ -483,6 +499,7 @@ void AliAODEvent::ReadFromTree(TTree *tree)
     // we are not owner of the list objects 
     // must not delete it
     tree->GetUserInfo()->Add(fAODObjects);
+    fConnected = kTRUE;
   }// no aodEvent
   else {
     // we can't get the list from the user data, create standard content