changing from printf to AliDebug

diff --git a/PWG0/AliSelector.cxx b/PWG0/AliSelector.cxx
index ff1ddccb9da02088b04a5e7c8ad1ae1eb44ca9fb..40ec47aca2489d322a2922e8969a65ba61e4f42f 100644 (file)
--- a/PWG0/AliSelector.cxx
+++ b/PWG0/AliSelector.cxx
@@ -23,15 +23,14 @@
 //
 
 #include "AliSelector.h"
+
 #include <TStyle.h>
 #include <TSystem.h>
 #include <TCanvas.h>
 #include <TRegexp.h>
+#include <TTime.h>
 
-#include <TFriendElement.h>
-
-#include <iostream>
-using namespace std;
+#include <AliLog.h>
 
 ClassImp(AliSelector)
 
@@ -73,11 +72,11 @@ void AliSelector::SlaveBegin(TTree * tree)
 
   Init(tree);
 
-  printf("=======SLAVEBEGIN========\n");
-  gSystem->Exec("hostname");
-  gSystem->Exec("date");
+  AliDebug(AliLog::kDebug, "=======SLAVEBEGIN========");
+  AliDebug(AliLog::kDebug, Form("Hostname: %s", gSystem->HostName()));
+  AliDebug(AliLog::kDebug, Form("Time: %s", gSystem->Now().AsString()));
   TFile *f = fChain->GetCurrentFile();
-  printf("%s\n",f->GetName());
+  AliDebug(AliLog::kDebug, f->GetName());
 
   TString option = GetOption();
 }
@@ -90,30 +89,29 @@ void AliSelector::Init(TTree *tree)
   // generated code, but the routine can be extended by the user if needed.
   // Init() will be called many times when running with PROOF.
 
-  printf("=========Init==========\n");
+  AliDebug(AliLog::kDebug, "=========Init==========");
 
   // Set branch addresses
   if (tree == 0)
   {
-    printf("ERROR: tree argument is 0.\n");
+    AliDebug(AliLog::kError, "ERROR: tree argument is 0.");
     return;
   }
 
   fChain = dynamic_cast<TChain*> (tree);
   if (fChain == 0)
   {
-    printf("ERROR: tree argument could not be casted to TChain.\n");
+    AliDebug(AliLog::kDebug, "ERROR: tree argument could not be casted to TChain.");
     return;
   }
 
   fChain->SetBranchAddress("ESD", &fESD);
   if (fESD != 0)
-    printf("INFO: Found ESD branch in chain.\n");
+    AliDebug(AliLog::kInfo, "INFO: Found ESD branch in chain.");
 
   fChain->SetBranchAddress("Header", &fHeader);
   if (fHeader != 0)
-    printf("INFO: Found event header branch in chain.\n");
-
+    AliDebug(AliLog::kInfo, "INFO: Found event header branch in chain.");
 }
 
 Bool_t AliSelector::Notify()
@@ -125,12 +123,12 @@ Bool_t AliSelector::Notify()
   // to the generated code, but the routine can be extended by the
   // user if needed.
 
-  printf("=========NOTIFY==========\n");
-  gSystem->Exec("hostname");
-  gSystem->Exec("date");
+  AliDebug(AliLog::kDebug, "=========NOTIFY==========");
+  AliDebug(AliLog::kDebug, Form("Hostname: %s", gSystem->HostName()));
+  AliDebug(AliLog::kDebug, Form("Time: %s", gSystem->Now().AsString()));
+  
   TFile *f = fChain->GetCurrentFile();
-  TString fileName(f->GetName());
-  printf("%s\n",fileName.Data());
+  AliDebug(AliLog::kDebug, f->GetName());
 
   DeleteKinematicsFile();
   DeleteRunLoader();
@@ -158,27 +156,25 @@ Bool_t AliSelector::Process(Long64_t entry)
   //  Assuming that fChain is the pointer to the TChain being processed,
   //  use fChain->GetTree()->GetEntry(entry).
 
-  printf("=========PROCESS========== Entry %lld\n", entry);
+  AliDebug(AliLog::kDebug, Form("=========PROCESS========== Entry %lld", entry));
 
   if (!fChain)
   {
-    printf("ERROR: fChain is 0.\n");
+    AliDebug(AliLog::kError, "ERROR: fChain is 0.");
     return kFALSE;
   }
 
   fChain->GetTree()->GetEntry(entry);
 
   if (fESD)
-    printf("ESD: We have %d tracks.\n", fESD->GetNumberOfTracks());
+    AliDebug(AliLog::kDebug, Form("ESD: We have %d tracks.", fESD->GetNumberOfTracks()));
 
   if (fHeader)
-    printf("Header: We have %d primaries.\n", fHeader->GetNprimary());
+    AliDebug(AliLog::kDebug, Form("Header: We have %d primaries.", fHeader->GetNprimary()));
 
   TTree* kinematics = GetKinematics();
   if (kinematics)
-    printf("Kinematics from folder: We have %lld particles.\n", kinematics->GetEntries());
-
-  printf("\n");
+    AliDebug(AliLog::kDebug, Form("Kinematics: We have %lld particles.", kinematics->GetEntries()));
 
   return kTRUE;
 }
@@ -199,7 +195,7 @@ void AliSelector::Terminate()
   // a query. It always runs on the client, it can be used to present
   // the results graphically or save the results to file.
 
-  printf("=========TERMINATE==========\n");
+  AliDebug(AliLog::kDebug, "=========TERMINATE==========");
 }
 
 TTree* AliSelector::GetKinematics()
@@ -300,10 +296,11 @@ void AliSelector::DeleteRunLoader()
   //
   // deletes the runloader
   //
-  
+
   if (fRunLoader)
   {
     fRunLoader->Delete();
     fRunLoader = 0;
   }
 }
+

diff --git a/PWG0/dNdEta/AlidNdEtaAnalysisSelector.cxx b/PWG0/dNdEta/AlidNdEtaAnalysisSelector.cxx
index 96173809953523e7cb0c21ece6aa72b37f344ef5..a782072c2aa2577d07cabbb7559efd730d55b18a 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaAnalysisSelector.cxx
+++ b/PWG0/dNdEta/AlidNdEtaAnalysisSelector.cxx
@@ -56,10 +56,10 @@ void AlidNdEtaAnalysisSelector::SlaveBegin(TTree * tree)
   }
 
   if (!fEsdTrackCuts)
-    printf("ERROR: Could not read EsdTrackCuts from user info\n");
+     AliDebug(AliLog::kError, "ERROR: Could not read EsdTrackCuts from user info.");
 
   if (!fEsdTrackCuts)
-    printf("ERROR: Could not read dNdEtaCorrection from user info\n");
+     AliDebug(AliLog::kError, "ERROR: Could not read dNdEtaCorrection from user info.");
 
   AliLog::SetClassDebugLevel("AliESDtrackCuts", 1);
 }
@@ -119,7 +119,7 @@ Bool_t AlidNdEtaAnalysisSelector::Process(Long64_t entry)
     AliESDtrack* esdTrack = fESD->GetTrack(t);
     if (!esdTrack)
     {
-      printf("ERROR: Could not retrieve track %d.\n", t);
+      AliDebug(AliLog::kError, Form("ERROR: Could not retrieve track %d.", t));
       continue;
     }
 
@@ -157,7 +157,7 @@ void AlidNdEtaAnalysisSelector::SlaveTerminate()
   // Add the histograms to the output on each slave server
   if (!fOutput)
   {
-    printf("ERROR: Output list not initialized\n");
+    AliDebug(AliLog::kError, Form("ERROR: Output list not initialized."));
     return;
   }
 
@@ -183,7 +183,7 @@ void AlidNdEtaAnalysisSelector::Terminate()
 
   if (!etaVsVtxHistogram || !vtxHistogram || !etaVsVtxUncorrectedHistogram)
   {
-    printf("ERROR: Histograms not available %p %p %p\n", (void*) etaVsVtxHistogram, (void*) etaVsVtxUncorrectedHistogram, (void*) vtxHistogram);
+     AliDebug(AliLog::kError, Form("ERROR: Histograms not available %p %p %p", (void*) etaVsVtxHistogram, (void*) etaVsVtxUncorrectedHistogram, (void*) vtxHistogram));
     return;
   }
 

diff --git a/PWG0/dNdEta/AlidNdEtaCorrectionSelector.cxx b/PWG0/dNdEta/AlidNdEtaCorrectionSelector.cxx
index 83e3fbe3bfc24cca4c37461013dd9ecd4ccd920e..238a066bfe4b68adf1d10046742b3305582e0c16 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaCorrectionSelector.cxx
+++ b/PWG0/dNdEta/AlidNdEtaCorrectionSelector.cxx
@@ -59,9 +59,7 @@ void AlidNdEtaCorrectionSelector::SlaveBegin(TTree * tree)
     fEsdTrackCuts = dynamic_cast<AliESDtrackCuts*> (fChain->GetUserInfo()->FindObject("AliESDtrackCuts"));
 
   if (!fEsdTrackCuts)
-    printf("ERROR: Could not read EsdTrackCuts from user info\n");
-
-  AliLog::SetClassDebugLevel("ESDtrackQualityCuts",1);
+    AliDebug(AliLog::kError, "ERROR: Could not read EsdTrackCuts from user info");
 }
 
 Bool_t AlidNdEtaCorrectionSelector::Notify()
@@ -122,8 +120,24 @@ Bool_t AlidNdEtaCorrectionSelector::Process(Long64_t entry)
   if (AliSelector::Process(entry) == kFALSE)
     return kFALSE;
 
-  if (!fESD || !fHeader)
+  // check prerequesites
+  if (!fESD)
+  {
+    AliDebug(AliLog::kError, "ESD branch not available");
+    return kFALSE;
+  }
+
+  if (!fHeader)
+  {
+    AliDebug(AliLog::kError, "Header branch not available");
+    return kFALSE;
+  }
+
+  if (!fEsdTrackCuts)
+  {
+    AliDebug(AliLog::kError, "fESDTrackCuts not available");
     return kFALSE;
+  }
 
   // ########################################################
   // get the EDS vertex
@@ -167,7 +181,7 @@ Bool_t AlidNdEtaCorrectionSelector::Process(Long64_t entry)
 
     if (strcmp(particle->GetName(),"XXX") == 0)
     {
-      printf("WARNING: There is a particle named XXX (%d).\n", i_mc);
+       AliDebug(AliLog::kWarning, Form("WARNING: There is a particle named XXX (%d).", i_mc));
       continue;
     }
 
@@ -175,7 +189,7 @@ Bool_t AlidNdEtaCorrectionSelector::Process(Long64_t entry)
 
     if (strcmp(pdgPart->ParticleClass(),"Unknown") == 0)
     {
-      printf("WARNING: There is a particle with an unknown particle class (%d pdg code %d).\n", i_mc, particle->GetPdgCode());
+       AliDebug(AliLog::kError, Form("WARNING: There is a particle with an unknown particle class (%d pdg code %d).", i_mc, particle->GetPdgCode()));
       continue;
     }
 
@@ -204,7 +218,7 @@ Bool_t AlidNdEtaCorrectionSelector::Process(Long64_t entry)
     Int_t label = TMath::Abs(esdTrack->GetLabel());
     if (label == 0)
     {
-      printf("WARNING: cannot find corresponding mc part for track %d.", t);
+      AliDebug(AliLog::kWarning, Form("WARNING: cannot find corresponding mc part for track %d.", t));
       continue;
     }
     particleTree->GetEntry(nTotal - nPrim + label);
@@ -227,7 +241,7 @@ void AlidNdEtaCorrectionSelector::SlaveTerminate()
   // Add the histograms to the output on each slave server
   if (!fOutput)
   {
-    printf("ERROR: Output list not initialized\n");
+    AliDebug(AliLog::kError, "ERROR: Output list not initialized");
     return;
   }
 
@@ -248,7 +262,7 @@ void AlidNdEtaCorrectionSelector::Terminate()
   TH2F* generatedHistogram = dynamic_cast<TH2F*> (fOutput->FindObject("etaVsVtx_gene"));
   if (!measuredHistogram || !generatedHistogram)
   {
-    printf("ERROR: Histograms not available %p %p\n", (void*) generatedHistogram, (void*) measuredHistogram);
+     AliDebug(AliLog::kError, Form("ERROR: Histograms not available %p %p", (void*) generatedHistogram, (void*) measuredHistogram));
     return;
   }
   fdNdEtaCorrectionFinal->SetGeneratedHistogram(generatedHistogram);

diff --git a/PWG0/dNdEta/makeCorrection2.C b/PWG0/dNdEta/makeCorrection2.C
index 5f1e6472d9a54157f0b776d61f6683cfdc42cdf9..dcf5bcf7953520cbe17718de500d84b4322c808f 100644 (file)
--- a/PWG0/dNdEta/makeCorrection2.C
+++ b/PWG0/dNdEta/makeCorrection2.C
@@ -26,5 +26,6 @@ void makeCorrection2(Char_t* dataDir, Int_t nRuns=20)
 
   chain->GetUserInfo()->Add(fEsdTrackCuts);
 
+  AliLog::SetClassDebugLevel("AlidNdEtaCorrectionSelector", AliLog::kWarning);
   chain->Process("AlidNdEtaCorrectionSelector.cxx+");
 }

diff --git a/PWG0/dNdEta/testAnalysis2.C b/PWG0/dNdEta/testAnalysis2.C
index c61012d6d312d000890f769ff1413c90d96e3803..c4d0c282bd1063838fd067953fbd962e95a1f3f9 100644 (file)
--- a/PWG0/dNdEta/testAnalysis2.C
+++ b/PWG0/dNdEta/testAnalysis2.C
@@ -35,5 +35,7 @@ testAnalysis2(Char_t* dataDir, Int_t nRuns=20)
 
   chain->GetUserInfo()->Add(dNdEtaCorrection);
 
+  AliLog::SetClassDebugLevel("AlidNdEtaAnalysisSelector", AliLog::kWarning);
+  
   chain->Process("AlidNdEtaAnalysisSelector.cxx+");
 }