From c98859dd5d49a1c7db39c10b27accdfcb1787350 Mon Sep 17 00:00:00 2001
From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 18 Aug 2009 13:57:52 +0000
Subject: [PATCH] - protection added (AM) - correct assigment of input event in
 case of aod input tree (M. Gheata)

---
 JETAN/AliAnalysisTaskJets.cxx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index f485ab049f9..29b1d2fe253 100644
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -107,7 +107,7 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
       fJetFinder->ConnectAODNonStd(AODEvent(), fNonStdBranch.Data()); 
     }
   AliAODJetEventBackground* evBkg = fJetFinder->GetEventBackground();
-  AddAODBranch("AliAODJetEventBackground",&evBkg);
+  if (evBkg) AddAODBranch("AliAODJetEventBackground",&evBkg);
 
   // Histograms
   OpenFile(1);
@@ -168,8 +168,14 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
     jarray = dynamic_cast<TClonesArray*>(AODEvent()->FindListObject(fNonStdBranch.Data()));
     jarray->Delete();    // this is our responsibility, clear before filling again
   }
+  if (dynamic_cast<AliAODEvent*>(InputEvent()) !=  0) {
+      fJetFinder->GetReader()->SetInputEvent(InputEvent(), InputEvent(), MCEvent());
+  } else {
+      fJetFinder->GetReader()->SetInputEvent(InputEvent(), AODEvent(), MCEvent());
+  }
+  
+  
 
-  fJetFinder->GetReader()->SetInputEvent(InputEvent(), AODEvent(), MCEvent());
   if(fOpt==0) fJetFinder->ProcessEvent();
   else fJetFinder->ProcessEvent2();    // V2
  
-- 
2.43.5