X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2Fmapping%2FAliMpCDB.cxx;h=90efa14a61bf4314074dbf6b6b5cbefd39ad5b5c;hb=e12130d5dc9a50cb102d54ada03f7ec0be95f3cc;hp=a1ad6b353ae6c2911d6880b3a73eb697ed1aa40e;hpb=877f7c6ee143d10d93612128bb67aad15818670c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/mapping/AliMpCDB.cxx b/MUON/mapping/AliMpCDB.cxx
index a1ad6b353ae..90efa14a61b 100644
--- a/MUON/mapping/AliMpCDB.cxx
+++ b/MUON/mapping/AliMpCDB.cxx
@@ -217,7 +217,8 @@ Bool_t AliMpCDB::LoadManuStore(Bool_t warn)
       << "Loading Manu store from MUON/Calib/MappingRunData" << endl;
   
     // Load segmentation
-    LoadMpSegmentation(warn); 
+    if ( ! AliMpSegmentation::Instance(false) ) 
+      LoadMpSegmentation(warn); 
 
     TObject* cdbEntryObject = GetCDBEntryObject("MUON/Calib/MappingRunData");
     if ( ! cdbEntryObject ) return kFALSE;
@@ -400,10 +401,9 @@ Bool_t AliMpCDB::WriteMpRunData()
 }
 
 //______________________________________________________________________________
-Bool_t AliMpCDB::WriteMpSegmentation(Bool_t readData, Bool_t empty)
+Bool_t AliMpCDB::WriteMpSegmentation(Bool_t readData)
 {
-/// Write mapping segmentation in OCDB;
-/// if empty is true then a non-valid object of minimum size is written
+/// Write mapping segmentation in OCDB
 
   if ( ! readData && ! AliMpSegmentation::Instance() ) return false;
 
@@ -419,18 +419,17 @@ Bool_t AliMpCDB::WriteMpSegmentation(Bool_t readData, Bool_t empty)
 
   if ( readData ) {
     AliMpDataStreams dataStreams;
-    AliMpSegmentation::ReadData(dataStreams, false, empty);
-    AliMpDDLStore::ReadData(dataStreams, false, empty);
+    AliMpSegmentation::ReadData(dataStreams, false);
+    AliMpDDLStore::ReadData(dataStreams, false);
   }
   
   return cdbManager->Put(AliMpSegmentation::Instance(), id, cdbData);
 }
 
 //______________________________________________________________________________
-Bool_t AliMpCDB::WriteDDLStore(Bool_t readData, Bool_t empty)
+Bool_t AliMpCDB::WriteDDLStore(Bool_t readData)
 {
 /// Write mapping DDL store in OCDB
-/// if empty is true then a non-valid object of minimum size is written
 
   if ( ! readData && ! AliMpDDLStore::Instance() ) return false;
 
@@ -446,17 +445,16 @@ Bool_t AliMpCDB::WriteDDLStore(Bool_t readData, Bool_t empty)
 
   if ( readData ) {
     AliMpDataStreams dataStreams;
-    AliMpSegmentation::ReadData(dataStreams, false, empty);
-    AliMpDDLStore::ReadData(dataStreams, false, empty);
+    AliMpSegmentation::ReadData(dataStreams, false);
+    AliMpDDLStore::ReadData(dataStreams, false);
   }
   return cdbManager->Put(AliMpDDLStore::Instance(), id, cdbData);
 }   
 
 //______________________________________________________________________________
-Bool_t AliMpCDB::WriteManuStore(Bool_t readData, Bool_t empty)
+Bool_t AliMpCDB::WriteManuStore(Bool_t readData)
 {
 /// Write mapping Manu store in OCDB
-/// if empty is true then a non-valid object of minimum size is written
 
   if ( ! readData && ! AliMpManuStore::Instance() ) return false;
 
@@ -472,8 +470,8 @@ Bool_t AliMpCDB::WriteManuStore(Bool_t readData, Bool_t empty)
 
   if ( readData ) {
     AliMpDataStreams dataStreams;
-    AliMpSegmentation::ReadData(dataStreams, false, empty);
-    AliMpManuStore::ReadData(dataStreams, false, empty);
+    AliMpSegmentation::ReadData(dataStreams, false);
+    AliMpManuStore::ReadData(dataStreams, false);
   }
   return cdbManager->Put(AliMpManuStore::Instance(), id, cdbData);
 }