fca's changes -- take shelter -- optimising AOD tree handling

diff --git a/ANALYSIS/AliAnalysisSelector.cxx b/ANALYSIS/AliAnalysisSelector.cxx
index 5896e7faa8c7cdb460d3ecf66ac3e175ecddff81..4379c2fda6b2d19338c39b7993241b48b2ee0a93 100644 (file)
--- a/ANALYSIS/AliAnalysisSelector.cxx
+++ b/ANALYSIS/AliAnalysisSelector.cxx
@@ -141,7 +141,13 @@ Bool_t AliAnalysisSelector::Process(Long64_t entry)
    if (fAnalysis->GetDebugLevel() > 1) {
       cout << "->AliAnalysisSelector::Process()" << endl;
    }
-   Int_t nobjCount = TProcessID::GetObjectCount();
+   static Bool_t init=kTRUE;
+   static Int_t nobjCount = 0;
+   if(init) {
+     nobjCount = TProcessID::GetObjectCount();
+     init=kFALSE;
+   }
+   TProcessID::SetObjectCount(nobjCount);
    Int_t returnCode = fAnalysis->GetEntry(entry);
    if (returnCode <= 0) {
       cout << "Error retrieving event:" << entry << " Skipping ..." << endl;
@@ -153,7 +159,6 @@ Bool_t AliAnalysisSelector::Process(Long64_t entry)
       fAnalysis->ExecAnalysis();
       if (returnCode<100000000) fAnalysis->CountEvent(1,1,0,0);
    }   
-   TProcessID::SetObjectCount(nobjCount);
    if (fAnalysis->GetDebugLevel() > 1) {
       cout << "<-AliAnalysisSelector::Process()" << endl;
    }   

diff --git a/STEER/AliAODEvent.cxx b/STEER/AliAODEvent.cxx
index b6dde64f2969640e083854ed7fb6ea6bbf0c0cec..2a9111c70ac265b2ced59ec254f9d073efa935e0 100644 (file)
--- a/STEER/AliAODEvent.cxx
+++ b/STEER/AliAODEvent.cxx
@@ -216,14 +216,8 @@ AliAODEvent & AliAODEvent::operator=(const AliAODEvent& aod) {
 AliAODEvent::~AliAODEvent() 
 {
 // destructor
-    if(fAODObjects&&!fConnected)
-    {
-       delete fAODObjects;
-       fAODObjects = 0;
-    }
-
+    if(!fConnected) delete fAODObjects;
     delete fAODFolder;
-    fAODFolder = 0;
 }
 
 //______________________________________________________________________________
@@ -559,7 +553,7 @@ void AliAODEvent::ReadFromTree(TTree *tree, Option_t* opt /*= ""*/)
     TList* connectedList = (TList*) (tree->GetUserInfo()->FindObject("AODObjectsConnectedToTree"));
     if (connectedList && (strcmp(opt, "reconnect"))) {
         // If connected use the connected list of objects
-       fAODObjects->Delete();
+        delete fAODObjects;
        fAODObjects = connectedList;
        GetStdContent(); 
        fConnected = kTRUE;
@@ -571,7 +565,8 @@ void AliAODEvent::ReadFromTree(TTree *tree, Option_t* opt /*= ""*/)
     
       // create a new TList from the UserInfo TList... 
       // copy constructor does not work...
-    fAODObjects = (TList*)(aodEvent->GetList()->Clone());
+    //    fAODObjects = (TList*)(aodEvent->GetList()->Clone());
+    fAODObjects = (TList*)aodEvent->GetList();
     fAODObjects->SetOwner(kTRUE);
     if(fAODObjects->GetEntries()<kAODListN)
     {
@@ -591,7 +586,8 @@ void AliAODEvent::ReadFromTree(TTree *tree, Option_t* opt /*= ""*/)
           printf("No UserInfo on tree \n");
         } else {
           
-          TList* objL = (TList*)(aodEvent->GetList()->Clone());
+         //          TList* objL = (TList*)(aodEvent->GetList()->Clone());
+          TList* objL = (TList*)aodEvent->GetList();
           printf("Get list of object from tree %d !!\n", objL->GetEntries());
           TIter nextobject(objL);
           TObject* obj =  0;