X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=VZERO%2FAliVZEROReconstructor.cxx;h=d06422a0ea45fb2f2fcbdbb42438397682e80042;hp=41169f27cb47be9d33ce414b8d7d73d77659e55c;hb=c0b82b5a7f5545d4db451c2636c2ae41a77e7520;hpb=df34b21e0ad9366e52f6fed19dd3e141530f959b;ds=sidebyside

diff --git a/VZERO/AliVZEROReconstructor.cxx b/VZERO/AliVZEROReconstructor.cxx
index 41169f27cb4..d06422a0ea4 100644
--- a/VZERO/AliVZEROReconstructor.cxx
+++ b/VZERO/AliVZEROReconstructor.cxx
@@ -86,10 +86,28 @@ AliVZEROCalibData* AliVZEROReconstructor::GetCalibData() const
 
   // Getting calibration object for VZERO set
 
-  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("VZERO/Calib/Data");
-  AliVZEROCalibData *calibdata = (AliVZEROCalibData*) entry->GetObject();
+  AliCDBManager *man = AliCDBManager::Instance();
 
-  if (!calibdata)  AliWarning("No calibration data from calibration database !");
+  AliCDBEntry *entry=0;
+
+  entry = man->Get("VZERO/Calib/Data");
+
+  if(!entry){
+    AliWarning("Load of calibration data from default storage failed!");
+    AliWarning("Calibration data will be loaded from local storage ($ALICE_ROOT)");
+    Int_t runNumber = man->GetRun();
+    entry = man->GetStorage("local://$ALICE_ROOT")
+      ->Get("VZERO/Calib/Data",runNumber);
+	
+  }
+
+  // Retrieval of data in directory VZERO/Calib/Data:
+
+
+  AliVZEROCalibData *calibdata = 0;
+
+  if (entry) calibdata = (AliVZEROCalibData*) entry->GetObject();
+  if (!calibdata)  AliError("No calibration data from calibration database !");
 
   return calibdata;
 }