Improved messages and protections

diff --git a/PWGPP/CalibMacros/CPass0/AddTaskT0Calib.C b/PWGPP/CalibMacros/CPass0/AddTaskT0Calib.C
index 007db0337a5b7cefca26d50d4fae8a39713d6cd5..46f39aa454f841080df98ede6a6469bb10e34c69 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/AddTaskT0Calib.C
+++ b/PWGPP/CalibMacros/CPass0/AddTaskT0Calib.C
@@ -69,18 +69,23 @@ void    readCDB (TObject *task1,  Int_t runNumber) {
 
   AliCDBEntry* entry5 = AliCDBManager::Instance()->Get("GRP/GRP/Data");
   AliGRPObject* grpData = dynamic_cast<AliGRPObject*>(entry5->GetObject());
-  if (!grpData) {printf("Failed to get GRP data for run",runNumber); return;}
+  if (!grpData) {
+    ::Error("AddTaskT0Calib","Failed to get GRP data for run %d",runNumber);
+    return;
+  }
+
   TString LHCperiod = grpData->GetLHCPeriod();
   Bool_t isLHC10b =  LHCperiod.Contains("LHC10b");
   Bool_t isLHC10c =  LHCperiod.Contains("LHC10c");
-  printf("LHCperiod:%s\n isLHC10b:%d isLHC10c%d\n",
-  LHCperiod.Data(),(Int_t)isLHC10b, (Int_t)isLHC10c);
+
+  ::Info("AddTaskT0Calib","LHCperiod:%s  --->  isLHC10b:%d isLHC10c:%d",
+        LHCperiod.Data(),(Int_t)isLHC10b, (Int_t)isLHC10c);
 
   if(isLHC10b || isLHC10c) mytask-> SetRefPMT(12,2);
 
   AliCDBEntry *entryCalib0 = man->Get("T0/Calib/Latency");
   if(!entryCalib0) {
-    AliError::(Form("Cannot find any AliCDBEntry for [Calib, Latency]!"));
+    ::Error("AddTastT0Calib","Cannot find any AliCDBEntry for [Calib, Latency]!");
     return;
   }
   AliT0CalibLatency *calibda=(AliT0CalibLatency*)entryCalib0->GetObject();
@@ -89,7 +94,7 @@ void    readCDB (TObject *task1,  Int_t runNumber) {
  
   AliCDBEntry *entryCalib1 = man->Get("T0/Calib/TimeDelay");
   if(!entryCalib1) {
-    AliError::(Form("Cannot find any AliCDBEntry for [Calib, TimeDelay]!"));
+    ::Error("AddTaskT0Calib","Cannot find any AliCDBEntry for [Calib, TimeDelay]!");
     return;
   }
   else
@@ -111,7 +116,7 @@ void    readCDB (TObject *task1,  Int_t runNumber) {
 
   AliCDBEntry *entryCalib2 = man->Get("T0/Calib/TimeAdjust");
   if(!entryCalib2) {
-     AliError(Form("Cannot find any AliCDBEntry for [Calib, TimeAdjust]!"));
+    ::Error("AddTaskT0Calib","Cannot find any AliCDBEntry for [Calib, TimeAdjust]!");
   }
  else
     {

diff --git a/PWGPP/CalibMacros/CPass0/AddTaskTPCCalib.C b/PWGPP/CalibMacros/CPass0/AddTaskTPCCalib.C
index 2093a56bc754af6193eee165ad6d69714cf020eb..4bfb02d67ff096fc8b7d1f06ce8b7164393f8b07 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/AddTaskTPCCalib.C
+++ b/PWGPP/CalibMacros/CPass0/AddTaskTPCCalib.C
@@ -332,11 +332,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 -
@@ -345,7 +347,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)
@@ -353,7 +355,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);

diff --git a/PWGPP/CalibMacros/CPass1/AddTaskT0Calib.C b/PWGPP/CalibMacros/CPass1/AddTaskT0Calib.C
index 6770e7c6910e7a221603badad96660f82780b616..f4d53e9da1e01adcee4edb6154ee22753eed3afb 100755 (executable)
--- a/PWGPP/CalibMacros/CPass1/AddTaskT0Calib.C
+++ b/PWGPP/CalibMacros/CPass1/AddTaskT0Calib.C
@@ -71,7 +71,7 @@ void    readCDB (TObject *task1,  Int_t runNumber) {
 
   AliCDBEntry *entryCalib0 = man->Get("T0/Calib/Latency");
   if(!entryCalib0) {
-    AliError::(Form("Cannot find any AliCDBEntry for [Calib, Latency]!"));
+    ::Error("AddTaskT0Calib","Cannot find any AliCDBEntry for [Calib, Latency]!");
     return;
   }
   AliT0CalibLatency *calibda=(AliT0CalibLatency*)entryCalib0->GetObject();
@@ -80,7 +80,7 @@ void    readCDB (TObject *task1,  Int_t runNumber) {
  
   AliCDBEntry *entryCalib1 = man->Get("T0/Calib/TimeDelay");
   if(!entryCalib1) {
-    AliError::(Form("Cannot find any AliCDBEntry for [Calib, TimeDelay]!"));
+    ::Error("AddTaskT0Calib","Cannot find any AliCDBEntry for [Calib, TimeDelay]!");
     return;
   }
   else
@@ -102,7 +102,7 @@ void    readCDB (TObject *task1,  Int_t runNumber) {
 
   AliCDBEntry *entryCalib2 = man->Get("T0/Calib/TimeAdjust");
   if(!entryCalib2) {
-     AliError(Form("Cannot find any AliCDBEntry for [Calib, TimeAdjust]!"));
+    ::Error("AddTaskT0Calib","Cannot find any AliCDBEntry for [Calib, TimeAdjust]!");
   }
  else
     {

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);