From ed66881df746056244851f6b88fb4cc5413a520b Mon Sep 17 00:00:00 2001
From: hristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 9 Jul 2009 09:41:52 +0000
Subject: [PATCH] Avoid setting the default storage in the normal
 reconstruction chain (Laurent, rev. 33627)

---
 MUON/AliMUONQADataMakerRec.cxx   |  7 +------
 MUON/AliMUONTrackerDataMaker.cxx | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/MUON/AliMUONQADataMakerRec.cxx b/MUON/AliMUONQADataMakerRec.cxx
index 1ccc80fca6e..0fd6ee3ff6a 100644
--- a/MUON/AliMUONQADataMakerRec.cxx
+++ b/MUON/AliMUONQADataMakerRec.cxx
@@ -466,11 +466,6 @@ void AliMUONQADataMakerRec::InitRaws()
  
   TString boardName = "Local board Id";
   
-	if ( ! AliCDBManager::Instance()->GetDefaultStorage() )
-	{
-		AliError("CDB default storage not set. Cannot work.");
-	}
-	
 	TH3F* h3 = new TH3F("hTriggerScalersBendPlane", "Trigger scaler counts in bending plane",
 			    4, 10.5, 14.5,
 			    234, 0.5, 234.5,
@@ -528,7 +523,7 @@ void AliMUONQADataMakerRec::InitRaws()
   fTrackerDataMaker = new AliMUONTrackerDataMaker(GetMUONRecoParam(),
                                                   AliCDBManager::Instance()->GetRun(),
                                                   0x0,
-                                                  AliCDBManager::Instance()->GetDefaultStorage()->GetURI(),
+                                                  "",
                                                   "NOGAIN",
                                                   histogram,
                                                   0.0,0.0);
diff --git a/MUON/AliMUONTrackerDataMaker.cxx b/MUON/AliMUONTrackerDataMaker.cxx
index 1af7f1f8809..76e62933bcc 100644
--- a/MUON/AliMUONTrackerDataMaker.cxx
+++ b/MUON/AliMUONTrackerDataMaker.cxx
@@ -211,12 +211,17 @@ AliMUONTrackerDataMaker::Ctor(const AliMUONRecoParam* recoParam,
     // out of sync)
     // But with the current CDBManager implementation, I don't know how to solve
     // this better (e.g. to avoid clearing cache messages and so on).
+
+    AliCDBStorage* storage(0x0);
     
-    AliCDBStorage* storage = AliCDBManager::Instance()->GetDefaultStorage();
-    
-    if ( storage->GetURI() != fOCDBPath.Data() ) 
+    if ( fOCDBPath.Length() > 0 )
     {
-      AliCDBManager::Instance()->SetDefaultStorage(fOCDBPath.Data());
+      storage = AliCDBManager::Instance()->GetDefaultStorage();
+
+      if ( storage && ( storage->GetURI() != fOCDBPath.Data() ) )
+      {
+        AliCDBManager::Instance()->SetDefaultStorage(fOCDBPath.Data());
+      }
     }
     
     fCalibrationData->Pedestals();
@@ -225,7 +230,7 @@ AliMUONTrackerDataMaker::Ctor(const AliMUONRecoParam* recoParam,
     fCalibrationData->HV();
     fCalibrationData->Capacitances();
     
-    if ( storage->GetURI() != fOCDBPath.Data() ) 
+    if ( storage && ( storage->GetURI() != fOCDBPath.Data() ) )
     {
       AliCDBManager::Instance()->SetDefaultStorage(storage);
     }
-- 
2.43.0