Removed CDB in /home/basanta/ALISOFT/AliRoot

[u/mrichter/AliRoot.git] / PMD / AliPMDDigitizer.cxx

diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx
index 1dedf8fc5d21fad48e635c4d4c7c01549d606da3..52bd10831f2b07910b68d0085899e7afd9c2ee34 100644 (file)
--- a/PMD/AliPMDDigitizer.cxx
+++ b/PMD/AliPMDDigitizer.cxx
@@ -1318,7 +1318,6 @@ Float_t AliPMDDigitizer::Gain(Int_t det, Int_t smn, Int_t row, Int_t col) const
 
   Float_t GainFact;
   GainFact = fCalibData->GetGainFact(det,smn,row,col);
-  printf("\t gain=%10.3f\n",GainFact);
   return GainFact;
 }
 //----------------------------------------------------------------------
@@ -1327,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;
 }