Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGPP / CalibMacros / CPass1 / AddTaskTPCCalib.C

diff --git a/PWGPP/CalibMacros/CPass1/AddTaskTPCCalib.C b/PWGPP/CalibMacros/CPass1/AddTaskTPCCalib.C
index 8e907801956ff45f762163963b563f5d842596a7..9996a6ca5847c135e9ef4fcc0ebacd479f57edd5 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/AddTaskTPCCalib.C
+++ b/PWGPP/CalibMacros/CPass1/AddTaskTPCCalib.C
@@ -335,11 +335,13 @@ void ConfigOCDB(Int_t run){
   //
   AliCDBEntry* entry = AliCDBManager::Instance()->Get("TPC/Calib/RecoParam");
   if (!entry){
-    printf("TPC reco param not available");
+    ::Error("AddTaskTPCCalib","TPC reco param not available");
+    return;
   }
   TObjArray * array = (TObjArray*)entry->GetObject();
   if (!array){
-    printf("TPC reco param not available");
+    ::Error("AddTaskTPCCalib","TPC reco param not available");
+    return;
   }
   
   //get the beam type from OCDB to decide which type of reco param we need -
@@ -348,7 +350,7 @@ void ConfigOCDB(Int_t run){
   AliGRPObject* grpData = dynamic_cast<AliGRPObject*>(entry->GetObject());  // new GRP entry
   TString beamType = grpData->GetBeamType();
   if (beamType==AliGRPObject::GetInvalidString()) {
-    AliError("GRP/GRP/Data entry:  missing value for the beam type ! Using UNKNOWN");
+    ::Error("AddTaskTPCCalib","GRP/GRP/Data entry:  missing value for the beam type ! Using UNKNOWN");
     beamType = "UNKNOWN";
   }
   // 0 - Low Flux (pp), 1- High Flux (Pb-Pb)
@@ -356,7 +358,7 @@ void ConfigOCDB(Int_t run){
   if (beamType.Contains("p-p")) {fluxType=0;}
   if (beamType.Contains("A-A")) {fluxType=1;}
   AliTPCRecoParam * tpcRecoParam = (AliTPCRecoParam*)array->At(fluxType);
-  printf("beam type: %s, using fluxType=%i\n",beamType.Data(),fluxType);
+  ::Info("AddTaskTPCCalib","Beam type: %s, using fluxType=%i",beamType.Data(),fluxType);
   tpcRecoParam->Print();
 
   transform->SetCurrentRecoParam(tpcRecoParam);