Removing clustering from here as it is now driven by the tracking, whatever the track...

[u/mrichter/AliRoot.git] / MUON / AliMUONCalibrationData.cxx

diff --git a/MUON/AliMUONCalibrationData.cxx b/MUON/AliMUONCalibrationData.cxx
index 8d8086889edcde23357cd0df35e79104b717a684..b9fd9acd26ed2fc7c1ae94f975c6e955fee55142 100644 (file)
--- a/MUON/AliMUONCalibrationData.cxx
+++ b/MUON/AliMUONCalibrationData.cxx
@@ -19,14 +19,16 @@
 
 #include "AliCDBEntry.h"
 #include "AliCDBManager.h"
+#include "AliCodeTimer.h"
 #include "AliLog.h"
 #include "AliMUONTriggerEfficiencyCells.h"
 #include "AliMUONTriggerLut.h"
 #include "AliMUONVStore.h"
 #include "AliMUONVStore.h"
 #include "AliMUONVCalibParam.h"
-#include "Riostream.h"
-#include "TMap.h"
+#include <Riostream.h>
+#include <TClass.h>
+#include <TMap.h>
 
 //-----------------------------------------------------------------------------
 /// \class AliMUONCalibrationData
@@ -166,8 +168,16 @@ AliMUONCalibrationData::CreateObject(Int_t runNumber, const char* path)
   /// Access the CDB for a given path (e.g. MUON/Calib/Pedestals),
   /// and return the corresponding TObject.
   
+  AliCodeTimerAutoClass(Form("%d : %s",runNumber,path));
+  
   AliCDBManager* man = AliCDBManager::Instance();
   
+  if ( !man->IsDefaultStorageSet() )
+  {
+    AliErrorClass("CDB Storage not set. Must use AliCDBManager::Instance()->SetDefaultStorage() first.");
+    return 0x0;
+  }
+  
   Bool_t cacheStatus = man->GetCacheFlag();
   
   man->SetCacheFlag(kFALSE);
@@ -178,7 +188,10 @@ AliMUONCalibrationData::CreateObject(Int_t runNumber, const char* path)
   
   if (entry)
   {
-    return entry->GetObject();
+    TObject* object = entry->GetObject();
+    entry->SetOwner(kFALSE);
+    delete entry;
+    return object;
   }
   
   return 0x0;