Fixing some problems in the CDB access (Alberto)

[u/mrichter/AliRoot.git] / ITS / AliITSDetTypeSim.cxx

diff --git a/ITS/AliITSDetTypeSim.cxx b/ITS/AliITSDetTypeSim.cxx
index 6b5b2b1a7fe4c1d62d79f3b9878843aaa00189f7..0f695a7bb999ef0ab827ed1ad22c73f75816ae56 100644 (file)
--- a/ITS/AliITSDetTypeSim.cxx
+++ b/ITS/AliITSDetTypeSim.cxx
@@ -442,20 +442,22 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
   AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD", run);
 
   if(!entrySPD || !entrySDD || !entrySSD || !entry2SPD || !entry2SDD || !entry2SSD){
-    AliWarning("Calibration object retrieval failed! Dummy calibration will be used.");
-    AliCDBStorage *origStorage = AliCDBManager::Instance()->GetDefaultStorage();
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
-       
-    entrySPD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSPD", run);
-    entrySDD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSDD", run);
-    entrySSD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSSD", run);
-    entry2SPD = AliCDBManager::Instance()->Get("ITS/Calib/RespSPD", run);
-    entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD", run);
-    entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD", run);
+       AliWarning("Calibration object retrieval failed! Dummy calibration will be used.");
+       AliCDBStorage *localStor = 
+               AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT");
        
-    AliCDBManager::Instance()->SetDefaultStorage(origStorage);
+       entrySPD = localStor->Get("ITS/Calib/CalibSPD", run);
+       entrySDD = localStor->Get("ITS/Calib/CalibSDD", run);
+       entrySSD = localStor->Get("ITS/Calib/CalibSSD", run);
+       entry2SPD = localStor->Get("ITS/Calib/RespSPD", run);
+       entry2SDD = localStor->Get("ITS/Calib/RespSDD", run);
+       entry2SSD = localStor->Get("ITS/Calib/RespSSD", run);
   }
 
+  if(!entrySPD || !entrySDD || !entrySSD || !entry2SPD || !entry2SDD || !entry2SSD){
+    AliError("Calibration data was not found in $ALICE_ROOT!");
+    return kFALSE;
+  }
 
   TObjArray *calSPD = (TObjArray *)entrySPD->GetObject();
   if(!isCacheActive)entrySPD->SetObject(NULL);