move AliCaloRawAnalyzerPeakFinder from Utils to base due to OCDB access

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

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index 3d028937f00a0c9121ab0ea520c7177b2fb4521b..1acf4b07b96ded65589ed1788a94ee8b4269c807 100644 (file)
--- a/MUON/AliMUONReconstructor.cxx
+++ b/MUON/AliMUONReconstructor.cxx
@@ -142,12 +142,19 @@ fTriggerProcessor(0x0)
   /// normal ctor
 
   AliDebug(1,"");
+  
+  // Unload mapping objects
+  // if they have been loaded from the obsolete OCDB mapping objects
+
+  if ( AliMpDDLStore::Instance(false) ) {
+    AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/DDLStore");
+    delete AliMpDDLStore::Instance();
+  }  
 
-  // Unload and delete old mapping
-  AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/Mapping");
-  AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/DDLStore");
-  delete AliMpDDLStore::Instance();
-  delete AliMpSegmentation::Instance();
+  if ( AliMpSegmentation::Instance(false) ) { 
+    AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/Mapping");
+    delete AliMpSegmentation::Instance();
+  }  
 
   // Load mapping
   if ( ! AliMpCDB::LoadDDLStore() ) {