found mem leak in IsInFidutialCut() method, so replaced it with a local check for...

[u/mrichter/AliRoot.git] / JETAN / AliAnalysisTaskJets.cxx

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index 33ea51207090e04e2f322a383af4b026dab9dce0..e860031aabc616987646129a27cd6ec6b72f4e57 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -54,7 +54,8 @@ AliAnalysisTaskJets::AliAnalysisTaskJets():
   fAODExtension(0x0),
   fListOfHistos(0x0),
   fChain(0x0),
-  fOpt(0)
+  fOpt(0),
+  fReadAODFromOutput(0)
 {
   // Default constructor
 }
@@ -69,7 +70,8 @@ AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name):
   fAODExtension(0x0),
   fListOfHistos(0x0),
   fChain(0x0),
-  fOpt(0)
+  fOpt(0),
+  fReadAODFromOutput(0)
 {
   // Default constructor
   DefineOutput(1, TList::Class());
@@ -85,7 +87,8 @@ AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name, TChain* chain):
   fAODExtension(0x0),
   fListOfHistos(0x0),
   fChain(chain),
-  fOpt(0)
+  fOpt(0),
+  fReadAODFromOutput(0)
 {
   // Default constructor
   DefineOutput(1, TList::Class());
@@ -138,7 +141,10 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
          TIter next(extArray);
          while ((fAODExtension=(AliAODExtension*)next())){
            TObject *obj = fAODExtension->GetAOD()->FindListObject(fNonStdBranch.Data());
-           fAODExtension->GetAOD()->Dump();
+           if(fDebug>10){
+             Printf("%s:%d Dumping..",(char*)__FILE__,__LINE__);
+             fAODExtension->GetAOD()->Dump();
+           }
            if(obj){
              if(fDebug>1)Printf("AODExtension found for %s",fNonStdBranch.Data());
              break;
@@ -194,9 +200,6 @@ void AliAnalysisTaskJets::Init()
   // Initialise Jet Analysis
   if(fOpt == 0) fJetFinder->Init();
   else fJetFinder->InitTask(fChain); // V2
-  
-  // Write header information to local file
-  fJetFinder->WriteHeaders();
 }
 
 
@@ -223,9 +226,11 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
     evBkg->Reset();
   }
 
-  if (dynamic_cast<AliAODEvent*>(InputEvent()) !=  0) {
+  if (dynamic_cast<AliAODEvent*>(InputEvent()) !=  0 && !fReadAODFromOutput) {
+// AOD is input event..........................................V                                       
       fJetFinder->GetReader()->SetInputEvent(InputEvent(), InputEvent(), MCEvent());
   } else {
+// AOD is read from output ....................................V      
       fJetFinder->GetReader()->SetInputEvent(InputEvent(), AODEvent(), MCEvent());
   }