Option for customized binning (as in AliUEHist), EventMixing binning now derived...

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

diff --git a/MUON/AliMUONTrackerConditionDataMaker.cxx b/MUON/AliMUONTrackerConditionDataMaker.cxx
index 868c2e35f2efbc23695b2e1af677f29800009a92..beaf3c1ec2a469ff63e9d6fcfdf0aa0f526d3ecf 100644 (file)
--- a/MUON/AliMUONTrackerConditionDataMaker.cxx
+++ b/MUON/AliMUONTrackerConditionDataMaker.cxx
@@ -100,15 +100,14 @@ fIsOwnerOfData(kTRUE)
   else
   {
     Int_t startOfValidity;
-  AliMUONVStore* store = CreateStore(runNumber,ocdbPath,type,startOfValidity);
+    AliMUONVStore* store = CreateStore(runNumber,ocdbPath,type,startOfValidity);
     AliDebug(1,Form("runNumber=%d ocdbPath=%s type=%s startOfValidity=%d store=%p",
                     runNumber,ocdbPath,type,startOfValidity,store));
     if ( store )
     {
       fData = CreateData(type,*store,startOfValidity);
-    }  
-    
-    delete store;
+    }
+    // we do not delete the store, as it's supposedly part of the OCDB cache...
   }
   
   AliCDBManager::Instance()->SetDefaultStorage(storage);
@@ -298,7 +297,7 @@ AliMUONTrackerConditionDataMaker::CreateHVStore(TMap& m)
       
       if ( nPCBs ) 
       {
-        TString switchName(hvNamer.DCSSwitchName(detElemId,i));
+        TString switchName(hvNamer.DCSSwitchAliasName(detElemId,i));
 
         TPair* p = static_cast<TPair*>(m.FindObject(switchName.Data()));
         TObjArray* a = static_cast<TObjArray*>(p->Value());
@@ -482,6 +481,7 @@ AliMUONTrackerConditionDataMaker::CreateStore(Int_t runNumber,
     if ( ocdb ) 
     {
       store = AliMUONCalibrationData::CreateOccupancyMap(runNumber,&startOfValidity);
+      if (store) store = static_cast<AliMUONVStore*>(store->Clone());
     }
     else
     {