Fixed some memory leaks, deletes before returning from eventloop, properly reset...

diff --git a/JETAN/AliAnalysisTaskJets.h b/JETAN/AliAnalysisTaskJets.h
index 607cb2145ab0a128321c0b610c9266ccd76987dc..d8f2e1161f03cf4cab9c618b0f80b3552e77b62e 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.h
+++ b/JETAN/AliAnalysisTaskJets.h
@@ -5,13 +5,17 @@
  * See cxx source for full Copyright notice                               */
  
 #include "AliAnalysisTaskSE.h"
+
+
 class AliJetFinder;
 class AliESDEvent;
-class TTree;
-class TChain;
 class AliAODEvent;
 class AliJetHistos;
 class AliAODExtension;
+class TTree;
+class TChain;
+class TString;
+
 
 
 class AliAnalysisTaskJets : public AliAnalysisTaskSE

diff --git a/JETAN/AliCdfJetFinder.cxx b/JETAN/AliCdfJetFinder.cxx
index 93eb6c90de57fba6dc19b6e65b7be079122136d5..3da21c5cc56fafbb2810717e01335c994f0d22db 100644 (file)
--- a/JETAN/AliCdfJetFinder.cxx
+++ b/JETAN/AliCdfJetFinder.cxx
@@ -78,6 +78,7 @@ AliCdfJetFinder::AliCdfJetFinder():
 //______________________________________________________________________________
 AliCdfJetFinder::~AliCdfJetFinder()
   {
+    Clean();
   // destructor
   }
 
@@ -357,20 +358,27 @@ if (fAODwrite)
 
 InitData();
 
-if (!fNPart) { if (fDebug) {cout << "entries = 0 ; Event empty !!!" << endl ;} return; } // if event empty then exit
-
-FindCones();
-
-ComputeConesWeight();
-
-if (fAODwrite) { 
-  if(fDebug)cout << "Writing AOD" << endl ; 
-  WriteJets();
+ if (!fNPart) { 
+  if (fDebug) {
+    cout << "entries = 0 ; Event empty !!!" << endl ;
+  }
+  // no need to call clean, InitData does not 
+  // create pointers if npart == 0
+  return; 
+ } // if event empty then exit
+
+ FindCones();
+ 
+ ComputeConesWeight();
+ 
+ if (fAODwrite) { 
+   if(fDebug)cout << "Writing AOD" << endl ; 
+   WriteJets();
  }
-
-if (fAnalyseJets) AnalizeJets();
-
-Clean();
+ 
+ if (fAnalyseJets) AnalizeJets();
+ 
+ Clean();
 
 }
 
@@ -594,6 +602,7 @@ for(  Int_t jetnr = 0 ; jetnr < fNJets ; jetnr++ )
     }
   // tracks REFs written in AOD
   AddJet(jet);
+
   }
 //jets vector parsed and written to AOD
 }
@@ -889,10 +898,20 @@ for(  Int_t part = 0 ; part < fNPart ; part++ )
 void AliCdfJetFinder::Clean()
 {
 // CLEANING SECTION
-  delete [] fVectParticle;
-  delete [] fVectJet;
-  delete [] fPtArray;
-  delete [] fIdxArray;
+  for (  Int_t i = 0 ; i < fNPart ; i++ ){
+    delete fVectParticle[i];
+    fVectParticle[i] = 0;
+  }
+  delete [] fVectParticle;fVectParticle = 0;
+
+  for (  Int_t i = 0 ; i < fNJets ; i++ ){
+    delete fVectJet[i];
+    fVectJet[i] = 0;
+  } 
+  delete [] fVectJet;fVectJet = 0;
+
+  delete [] fPtArray;fPtArray = 0;
+  delete [] fIdxArray;fIdxArray = 0;
 
   Reset();
 }

diff --git a/JETAN/AliDAJetFinder.cxx b/JETAN/AliDAJetFinder.cxx
index c60b1b95cd38aecbe889b41e3379ff4ef4025582..d1581d9fd49a1c99df2acf618bf34e5a9bff9fae 100644 (file)
--- a/JETAN/AliDAJetFinder.cxx
+++ b/JETAN/AliDAJetFinder.cxx
@@ -70,8 +70,14 @@ void AliDAJetFinder::FindJets()
        TMatrixD *mPyx= new TMatrixD();
        TMatrixD *mY  = new TMatrixD();
        InitDetAnn(dEtSum,xData,vPx,vPy,mPyx,mY);
-       if (fNin < fNclustMax) return;
-
+       if (fNin < fNclustMax){
+         delete [] xData[0], delete [] xData[1];
+         delete vPx;
+         delete vPy;
+         delete mPyx;
+         delete mY;
+         return;
+       }
        Int_t nc=1, nk;
        DoubleClusters(nc,nk,vPy,mY);
        do{                                     //loop over beta

diff --git a/JETAN/AliSISConeJetFinder.cxx b/JETAN/AliSISConeJetFinder.cxx
index 73e493da90b6c9a6d82dfb26540bcdffe20855e1..75fdc2939ad1b16b24a3f161923d587f01794700 100644 (file)
--- a/JETAN/AliSISConeJetFinder.cxx
+++ b/JETAN/AliSISConeJetFinder.cxx
@@ -122,12 +122,14 @@ void AliSISConeJetFinder::FindJets()
        if(lvArray == 0)
          {
            cout << "Could not get the momentum array" << endl;
+           delete plugin;
            return;
          }
        
        if(nIn == 0)// nIn = Number of particles in the event
          {
            if (debug) cout << "entries = 0 ; Event empty !!!" << endl ;
+           delete plugin;
            return;
          }
        
@@ -150,9 +152,9 @@ void AliSISConeJetFinder::FindJets()
       }
     else {
       TClonesArray* fUnit = fReader->GetUnitArray();
-      if(fUnit == 0) { cout << "Could not get the momentum array" << endl; return; }
+      if(fUnit == 0) { cout << "Could not get the momentum array" << endl;         delete plugin; return; }
       Int_t         nIn = fUnit->GetEntries();
-      if(nIn == 0) { if (debug) cout << "entries = 0 ; Event empty !!!" << endl ; return; }
+      if(nIn == 0) { if (debug) cout << "entries = 0 ; Event empty !!!" << endl ;          delete plugin; return; }
         // Information extracted from fUnitArray
       // load input vectors and calculate total energy in array
       Float_t pt,eta,phi,theta,px,py,pz,en;
@@ -319,6 +321,9 @@ void AliSISConeJetFinder::FindJets()
       AddJet(aodjet);
     }
   }
+
+  delete plugin;
+
 }
  
 //____________________________________________________________________________