Fixes for reading from AOD, fetch the branches for each event, reduce printout

diff --git a/JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx b/JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx
index 63c53bb3160c570a1814eff1260b696715f4c826..5318f5c3aa462ea95fdcc1b9390d2d97d0ba732a 100644 (file)
--- a/JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx
+++ b/JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx
@@ -298,7 +298,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
     if(fDebug&&evBkg)Printf("%s:%d Backgroundbranch %s found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
   }
 
     if(fDebug&&evBkg)Printf("%s:%d Backgroundbranch %s found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
   }
 

-  if(!evBkg){
+  if(!evBkg&&(fSubtraction==kArea||fSubtraction==kRhoRecalc)){

     if(fDebug){
       Printf("%s:%d Backgroundbranch %s not found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
       PrintAODContents();
     if(fDebug){
       Printf("%s:%d Backgroundbranch %s not found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
       PrintAODContents();


@@ -307,7 +307,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
     return;
   }
 
     return;
   }
 

-  if(!bkgClusters){
+  if(!bkgClusters&&(fSubtraction==kRhoRecalc)){

     if(fDebug){
       Printf("%s:%d Background cluster branch %s not found",(char*)__FILE__,__LINE__,bkgClusterName.Data());
       PrintAODContents();
     if(fDebug){
       Printf("%s:%d Background cluster branch %s not found",(char*)__FILE__,__LINE__,bkgClusterName.Data());
       PrintAODContents();


@@ -316,7 +316,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
     return;
   }
 
     return;
   }
 

-  if(!bkgClustersRC){
+  if(!bkgClustersRC&&(fSubtraction==kRhoRC)){

     if(fDebug){
       Printf("%s:%d Background cluster RC branch %s not found",(char*)__FILE__,__LINE__,bkgClusterRCName.Data());
       PrintAODContents();
     if(fDebug){
       Printf("%s:%d Background cluster RC branch %s not found",(char*)__FILE__,__LINE__,bkgClusterRCName.Data());
       PrintAODContents();

diff --git a/JETAN/AliAnalysisTaskJetCluster.cxx b/JETAN/AliAnalysisTaskJetCluster.cxx
index 5e67a67fa0cf47a2de89bb65049b6a270625faea..fc6112685b02cf57708ba2257a6ab2cd25833d2a 100644 (file)
--- a/JETAN/AliAnalysisTaskJetCluster.cxx
+++ b/JETAN/AliAnalysisTaskJetCluster.cxx
@@ -668,7 +668,7 @@ void AliAnalysisTaskJetCluster::UserExec(Option_t */*option*/)
   AliAODJetEventBackground* externalBackground = 0;
   if(!externalBackground&&fBackgroundBranch.Length()){
     externalBackground =  (AliAODJetEventBackground*)(AODEvent()->FindListObject(fBackgroundBranch.Data()));
   AliAODJetEventBackground* externalBackground = 0;
   if(!externalBackground&&fBackgroundBranch.Length()){
     externalBackground =  (AliAODJetEventBackground*)(AODEvent()->FindListObject(fBackgroundBranch.Data()));

-    Printf("%s:%d Background branch not found %s",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());;
+    if(!externalBackground)Printf("%s:%d Background branch not found %s",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());;

   }
   //
   // Execute analysis for current event
   }
   //
   // Execute analysis for current event