X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONCDB.cxx;h=d99eba4b0fc0bd9719a9bfc5da81ca091d943b34;hb=0cea21e43334636b76f8b4df6fbbfd732064ff1c;hp=8bca56f1dd0d99853442484e433ccc0b8888dc0a;hpb=cdffeaea701fbd9e9680151faeb669ee0f89bd6a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONCDB.cxx b/MUON/AliMUONCDB.cxx
index 8bca56f1dd0..d99eba4b0fc 100644
--- a/MUON/AliMUONCDB.cxx
+++ b/MUON/AliMUONCDB.cxx
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 /* $Id$ */
-
+ 
 //-----------------------------------------------------------------------------
 /// \namespace AliMUONCDB
 ///
@@ -97,6 +97,12 @@
 #include <sstream>
 #include <set>
 
+using std::endl;
+using std::cout;
+using std::cerr;
+using std::ostringstream;
+using std::ifstream;
+
 namespace
 {
   //_____________________________________________________________________________
@@ -288,7 +294,7 @@ AliMUONRecoParam* AliMUONCDB::LoadRecoParam()
   
   AliInfoGeneral("AliMUONCDB", "Loading RecoParam from OCDB...");
   
-  if (!AliMUONCDB::CheckOCDB()) return kFALSE;
+  if (!AliMUONCDB::CheckOCDB()) return 0x0;
   
   AliMUONRecoParam* recoParam = 0x0;
   AliCDBEntry* entry = AliCDBManager::Instance()->Get("MUON/Calib/RecoParam");
@@ -324,7 +330,7 @@ TClonesArray* AliMUONCDB::LoadAlignmentData()
   
   AliInfoGeneral("AliMUONCDB", "Loading Alignemnt from OCDB...");
   
-  if (!AliMUONCDB::CheckOCDB()) return kFALSE;
+  if (!AliMUONCDB::CheckOCDB()) return 0x0;
   
   TClonesArray* alignmentArray = 0x0;
   AliCDBEntry* entry = AliCDBManager::Instance()->Get("MUON/Align/Data");
@@ -1534,6 +1540,12 @@ AliMUONCDB::ShowConfig(Bool_t withStatusMap)
 
     AliMUONRecoParam* recoParam = AliMUONCDB::LoadRecoParam();
   
+    if (!recoParam)
+    {
+      AliErrorGeneral("AliMUONCDB::ShowConfig","Cannot get recoParams from OCDB !");
+      return;
+    }
+    
     statusMaker->SetLimits(*recoParam);
   
     UInt_t mask = recoParam->PadGoodnessMask();
@@ -1871,7 +1883,7 @@ void AliMUONCDB::CheckHV(Int_t runNumber, Int_t verbose)
     
     TString name(static_cast<TObjString*>(a->At(0))->String());
     
-    if ( name.Contains("sw") || name.Contains("SUMMARY") ) continue;
+    if ( name.Contains("sw") || name.Contains("SUMMARY") ) {delete a; continue;}
     
     Int_t index = hvNamer.DCSIndexFromDCSAlias(name.Data());
     
@@ -1882,6 +1894,7 @@ void AliMUONCDB::CheckHV(Int_t runNumber, Int_t verbose)
     if (!de)
     {
       AliErrorGeneral("AliMUONCDB::CheckHV",Form("Could not get detElemId from dcsAlias %s",name.Data()));
+      delete a;
       continue;
     }