remove commented line

[u/mrichter/AliRoot.git] / PWG / CaloTrackCorrBase / AliAnalysisTaskCaloTrackCorrelationM.cxx

diff --git a/PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx b/PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx
index aa74c050ca416474923c3b99dc745ae131916e5e..a22af87fe97099e805122076e84bea49c3edcafb 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx
+++ b/PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx
@@ -43,6 +43,7 @@
 #include "AliAODEvent.h"
 #include "AliESDEvent.h"
 #include "AliAnalysisDataSlot.h"
+#include "AliLog.h"
 
 ClassImp(AliAnalysisTaskCaloTrackCorrelationM)
 
@@ -93,17 +94,20 @@ AliAnalysisTaskCaloTrackCorrelationM::~AliAnalysisTaskCaloTrackCorrelationM()
 void AliAnalysisTaskCaloTrackCorrelationM::UserCreateOutputObjects()
 {
   // Create the output container
-  if (DebugLevel() > 1) printf("AliAnalysisTaskCaloTrackCorrelationM::UserCreateOutputObjects() - Begin\n");
+  AliDebug(1,"Begin");
   
   //Get list of aod arrays, add each aod array to analysis frame 
   TClonesArray *array = 0;
   TList * list = fAna->FillAndGetAODBranchList();
-  if (DebugLevel() >= 1) printf("AliAnalysisTaskCaloTrackCorrelationM::UserCreateOutputObjects() - n AOD branches %d\n",list->GetEntries());
+
+  AliDebug(1,Form("n AOD branches %d",list->GetEntries()));
   
   //Put the delta AODs in output file, std or delta
-  if((fAna->GetReader())->WriteDeltaAODToFile()){
+  if((fAna->GetReader())->WriteDeltaAODToFile())
+  {
     TString deltaAODName = (fAna->GetReader())->GetDeltaAODFileName();
-    for(Int_t iaod = 0; iaod < list->GetEntries(); iaod++){
+    for(Int_t iaod = 0; iaod < list->GetEntries(); iaod++)
+    {
       array = (TClonesArray*) list->At(iaod);
       if(deltaAODName!="") AddAODBranch("TClonesArray", &array, deltaAODName);//Put it in DeltaAOD file
       else AddAODBranch("TClonesArray", &array);//Put it in standard AOD file
@@ -114,11 +118,11 @@ void AliAnalysisTaskCaloTrackCorrelationM::UserCreateOutputObjects()
   OpenFile(1);
   fOutputContainer = fAna->GetOutputContainer();
   
-  if (DebugLevel() >= 1) printf("AliAnalysisTaskCaloTrackCorrelationM::UserCreateOutputObjects() - n histograms %d\n",fOutputContainer->GetEntries());
+  AliDebug(1,Form("n histograms %d",fOutputContainer->GetEntries()));
   
   fOutputContainer->SetOwner(kTRUE);
   
-  if (DebugLevel() > 1) printf("AliAnalysisTaskCaloTrackCorrelationM::UserCreateOutputObjects() - End\n");
+  AliDebug(1,"End");
   
   PostData(1,fOutputContainer);
        
@@ -132,13 +136,6 @@ void AliAnalysisTaskCaloTrackCorrelationM::LocalInit()
        //Call the Init to initialize the configuration of the analysis
        Init();
        
-       // Create cuts/param objects and publish to slot
-       fCuts = fAna->GetListOfAnalysisCuts();
-  fCuts ->SetOwner(kTRUE);
-  
-       // Post Data
-       PostData(2, fCuts);
-       
 }
 
 //_______________________________________________
@@ -146,21 +143,23 @@ void AliAnalysisTaskCaloTrackCorrelationM::Init()
 {
   // Initialization
   
-  if (DebugLevel() > 1) printf("AliAnalysisTaskCaloTrackCorrelationM::Init() - Begin\n");
+  AliDebug(1,"Begin");
   
   fInputEvent = new AliMixedEvent() ; 
   
   // Call configuration file if specified
   
-  if (fConfigName.Length()) {
-    printf("AliAnalysisTaskCaloTrackCorrelationM::Init() - ### Configuration file is %s.C ###\n", fConfigName.Data());
+  if (fConfigName.Length())
+  {
+    AliInfo(Form("### Configuration file is %s.C ###", fConfigName.Data()));
     gROOT->LoadMacro(fConfigName+".C");
     fAna = (AliAnaCaloTrackCorrMaker*) gInterpreter->ProcessLine("ConfigAnalysis()");
   }
   
-  if(!fAna) {
-    printf("AliAnalysisTaskCaloTrackCorrelationM::Init() - Analysis maker pointer not initialized, no analysis specified, STOP !\n");
-    abort();
+  if(!fAna)
+  {
+    AliFatal("Analysis maker pointer not initialized, no analysis specified, STOP!");
+    return; // coverity
   }
   
   // Add different generator particles to PDG Data Base 
@@ -177,7 +176,7 @@ void AliAnalysisTaskCaloTrackCorrelationM::Init()
   if((fAna->GetReader())->GetDeltaAODFileName()!="")
          AliAnalysisManager::GetAnalysisManager()->RegisterExtraFile((fAna->GetReader())->GetDeltaAODFileName());
   
-  if (DebugLevel() > 1) printf("AliAnalysisTaskCaloTrackCorrelationM::Init() - End\n");
+  AliDebug(1,"End");
   
 }
 
@@ -187,27 +186,32 @@ void AliAnalysisTaskCaloTrackCorrelationM::UserExec(Option_t */*option*/)
 {
   // Execute analysis for current event
   
-  if (DebugLevel() > 1) printf("AliAnalysisTaskCaloTrackCorrelationM::UserExec() - Begin\n");
+  AliDebug(1,"Begin");
   
   //Get the type of data, check if type is correct
   Int_t  datatype = fAna->GetReader()->GetDataType();
   if(datatype != AliCaloTrackReader::kESD && datatype != AliCaloTrackReader::kAOD &&
-     datatype != AliCaloTrackReader::kMC){
-    printf("AliAnalysisTaskCaloTrackCorrelationM::UserExec() - Wrong type of data\n");
+     datatype != AliCaloTrackReader::kMC)
+  {
+    AliError("Wrong type of data");
     return ;
   }
   
   Int_t nev = fInputHandler->GetBufferSize();
   fInputEvent->Reset();
   
-  for (Int_t iev = 0; iev < nev; iev++) {
-    if (datatype == AliCaloTrackReader::kESD) {
+  for (Int_t iev = 0; iev < nev; iev++) 
+  {
+    if (datatype == AliCaloTrackReader::kESD) 
+    {
       AliESDEvent* esd = dynamic_cast<AliESDEvent*>(GetEvent(iev));
       fInputEvent->AddEvent(esd);
-    } else if (datatype == AliCaloTrackReader::kAOD) {
+    } else if (datatype == AliCaloTrackReader::kAOD) 
+    {
       AliAODEvent* aod = dynamic_cast<AliAODEvent*>(GetEvent(iev));
       fInputEvent->AddEvent(aod);
-    } else {
+    } else 
+    {
       AliFatal("need to implement mixed event for MC") ; 
     }
   }
@@ -219,14 +223,13 @@ void AliAnalysisTaskCaloTrackCorrelationM::UserExec(Option_t */*option*/)
   //Process event
   fAna->ProcessEvent((Int_t) Entry(), CurrentFileName());
   
-  //printf("AliAnalysisTaskCaloTrackCorrelationM::Current Event %d; Current File Name : %s\n",(Int_t) Entry(), CurrentFileName());
-  if (DebugLevel() > 1) printf("AliAnalysisTaskCaloTrackCorrelationM::UserExec() - End\n");
-  
   PostData(1, fOutputContainer);
        
   AliAnalysisDataSlot *out0 = GetOutputSlot(0);
   if (out0 && out0->IsConnected()) PostData(0, fTreeA);  
   
+  AliDebug(1,"End");
+
   //gObjectTable->Print();
   
 }
@@ -240,6 +243,13 @@ void AliAnalysisTaskCaloTrackCorrelationM::Terminate(Option_t */*option*/)
   // Get merged histograms from the output container
   // Propagate histagrams to maker
   fAna->Terminate((TList*)GetOutputData(1));
-       
+
+  // Create cuts/param objects and publish to slot
+       fCuts = fAna->GetListOfAnalysisCuts();
+  fCuts ->SetOwner(kTRUE);
+  
+       // Post Data
+       PostData(2, fCuts);
+  
 }