X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PMD%2FAliPMDDigitizer.cxx;h=52bd10831f2b07910b68d0085899e7afd9c2ee34;hb=0dd3d6f9d7876a16ad79c9d554510b3826e0e021;hp=8862302ea11b2ead3b4603fca72ec6e05d0381ff;hpb=4a33555084cf1018178fc1812bf6c899fe986145;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx
index 8862302ea11..52bd10831f2 100644
--- a/PMD/AliPMDDigitizer.cxx
+++ b/PMD/AliPMDDigitizer.cxx
@@ -1326,25 +1326,15 @@ AliPMDCalibData* AliPMDDigitizer::GetCalibData() const
   // The run number will be centralized in AliCDBManager,
   // you don't need to set it here!
   // Added this method by ZA
+  // Cleaned up by Alberto
   AliCDBEntry  *entry = AliCDBManager::Instance()->Get("PMD/Calib/Data");
   
-  if(!entry){
-    AliWarning("Calibration object retrieval failed! Dummy calibration will be used.");
-    
-    // this just remembers the actual default storage. No problem if it is null
-    AliCDBStorage *origStorage = AliCDBManager::Instance()->GetDefaultStorage();
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
-    
-    entry = AliCDBManager::Instance()->Get("PMD/Calib/Data");
-    
-    // now reset the original default storage to AliCDBManager...
-    AliCDBManager::Instance()->SetDefaultStorage(origStorage);
-  }
+  if(!entry) AliFatal("Calibration object retrieval failed!");
   
   AliPMDCalibData *calibdata=0;
   if (entry) calibdata = (AliPMDCalibData*) entry->GetObject();
   
-  if (!calibdata)  AliError("No calibration data from calibration database !");
+  if (!calibdata)  AliFatal("No calibration data from calibration database !");
   
   return calibdata;
 }