Fix reading from AOD and changed warnings to AliWarning

diff --git a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
index 0c3e072beb18ef3b36896a1300109d501e32afa0..d7c1a72d5a270477c8433102858dcc11d2b056b5 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
+++ b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
@@ -6,6 +6,7 @@
 #include "THnSparse.h"
 #include "TFile.h"
 #include "AliMCEvent.h"
+#include "AliLog.h"
 #include "AliAODJet.h"
 #include "AliStack.h"
 #include "AliGenEventHeader.h"
@@ -30,7 +31,8 @@ AliGenPythiaEventHeader*  AliAnalysisHelperJetTasks::GetPythiaEventHeader(AliMCE
     AliGenCocktailEventHeader* genCocktailHeader = dynamic_cast<AliGenCocktailEventHeader*>(genHeader);
     
     if (!genCocktailHeader) {
-      Printf("%s %d: Unknown header type (not Pythia or Cocktail)",(char*)__FILE__,__LINE__);
+      AliWarningGeneral(Form(" %s:%d",(char*)__FILE__,__LINE__),"Unknown header type (not Pythia or Cocktail)");
+      //      AliWarning(Form("%s %d: Unknown header type (not Pythia or Cocktail)",(char*)__FILE__,__LINE__));
       return 0;
     }
     TList* headerList = genCocktailHeader->GetHeaders();
@@ -40,7 +42,7 @@ AliGenPythiaEventHeader*  AliAnalysisHelperJetTasks::GetPythiaEventHeader(AliMCE
         break;
     }
     if(!pythiaGenHeader){
-      Printf("%s %d: PythiaHeader not found!",(char*)__FILE__,__LINE__);
+      AliWarningGeneral(Form(" %s:%d",(char*)__FILE__,__LINE__),"Pythia event header not found");
       return 0;
     }
   }
@@ -233,6 +235,7 @@ void  AliAnalysisHelperJetTasks::MergeOutput(char* cFiles, char* cList){
   while(in1>>cFile){
     fIn[ibTotal] = TFile::Open(cFile);
     lIn[ibTotal] = (TList*)fIn[ibTotal]->Get(cList);
+    Printf("Merging file %s",cFile);
     if(!lIn[ibTotal]){
       Printf("%s:%d No list %s found, exiting...",__FILE__,__LINE__,cList);
       fIn[ibTotal]->ls();

diff --git a/PWG4/JetTasks/AliAnalysisTaskJFSystematics.cxx b/PWG4/JetTasks/AliAnalysisTaskJFSystematics.cxx
index f07a9034600fd5376da526e9e4c04dea5afbd71c..570957f415405faec08a83bbfc3a94ba01632737 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJFSystematics.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJFSystematics.cxx
@@ -249,38 +249,6 @@ void AliAnalysisTaskJFSystematics::UserCreateOutputObjects()
   // Create the output container
   //
 
-  
-  // Connect the AOD
-
-  if(fUseAODInput){
-    fAOD = dynamic_cast<AliAODEvent*>(InputEvent());
-    if(!fAOD){
-      Printf("%s:%d AODEvent not found in Input Manager %d",(char*)__FILE__,__LINE__,fUseAODInput);
-      return;
-    }
-    // fetch the header
-    fJetHeaderRec = dynamic_cast<AliJetHeader*>(fInputHandler->GetTree()->GetUserInfo()->FindObject(Form("AliJetHeader_%s",fBranchRec.Data())));
-    if(!fJetHeaderRec){
-      Printf("%s:%d Jet Header not found in the Input",(char*)__FILE__,__LINE__);
-    }
-  }
-  else{
-    //  assume that the AOD is in the general output...
-    fAOD  = AODEvent();
-    if(!fAOD){
-      Printf("%s:%d AODEvent not found in the Output",(char*)__FILE__,__LINE__);
-      return;
-    }
-    fJetHeaderRec = dynamic_cast<AliJetHeader*>(OutputTree()->GetUserInfo()->FindObject(Form("AliJetHeader_%s",fBranchRec.Data())));    
-    if(!fJetHeaderRec){
-      Printf("%s:%d Jet Header not found in the Output",(char*)__FILE__,__LINE__);
-    }
-    else{
-      if(fDebug>10)fJetHeaderRec->Dump();
-    }
-  }
- 
-
 
   if (fDebug > 1) printf("AnalysisTaskJFSystematics::UserCreateOutputObjects() \n");
 
@@ -448,6 +416,24 @@ void AliAnalysisTaskJFSystematics::UserExec(Option_t */*option*/)
   //
   // Execute analysis for current event
   //
+ 
+  if(fUseAODInput){    
+    fAOD = dynamic_cast<AliAODEvent*>(InputEvent());
+    if(!fAOD){
+      Printf("%s:%d AODEvent not found in Input Manager %d",(char*)__FILE__,__LINE__,fUseAODInput);
+      return;
+    }
+    // fethc the header
+  }
+  else{
+    //  assume that the AOD is in the general output...
+    fAOD  = AODEvent();
+    if(!fAOD){
+      Printf("%s:%d AODEvent not found in the Output",(char*)__FILE__,__LINE__);
+      return;
+    }
+  }
+