From 392d3d6e863dcf1211e714afa9665ae6d5103b27 Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 30 Jul 2014 09:38:12 +0200 Subject: [PATCH] Improved messages and protections --- PWGPP/CalibMacros/CPass0/AddTaskT0Calib.C | 17 +++++++++++------ PWGPP/CalibMacros/CPass0/AddTaskTPCCalib.C | 10 ++++++---- PWGPP/CalibMacros/CPass1/AddTaskT0Calib.C | 6 +++--- PWGPP/CalibMacros/CPass1/AddTaskTPCCalib.C | 10 ++++++---- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/PWGPP/CalibMacros/CPass0/AddTaskT0Calib.C b/PWGPP/CalibMacros/CPass0/AddTaskT0Calib.C index 007db0337a5..46f39aa454f 100644 --- 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(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 2093a56bc75..4bfb02d67ff 100644 --- 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(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 6770e7c6910..f4d53e9da1e 100755 --- 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 8e907801956..9996a6ca584 100644 --- 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(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); -- 2.43.0