- Moving fDetElements data member from AliMpDDLStore to AliMpSegmentation

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpSegmentation.cxx

diff --git a/MUON/mapping/AliMpSegmentation.cxx b/MUON/mapping/AliMpSegmentation.cxx
index fbd301cc079e2376e430ffc1dc2794f3642eb2c5..3c36e27b0c9edc792478cff9f528b9ff8e403ec9 100644 (file)
--- a/MUON/mapping/AliMpSegmentation.cxx
+++ b/MUON/mapping/AliMpSegmentation.cxx
@@ -28,6 +28,7 @@
 #include "AliMpSegmentation.h"
 
 #include "AliMpDetElement.h"
+#include "AliMpDEStore.h"
 #include "AliMpDEManager.h"
 #include "AliMpDEIterator.h"
 #include "AliMpExMap.h"
@@ -99,6 +100,7 @@ AliMpSegmentation* AliMpSegmentation::ReadData(Bool_t warn)
 //______________________________________________________________________________
 AliMpSegmentation::AliMpSegmentation()
 : TObject(),
+  fDetElements(0),
   fMpSegmentations(true),
   fElCardsMap(true),
   fSlatMotifMap()
@@ -107,6 +109,11 @@ AliMpSegmentation::AliMpSegmentation()
 
   AliDebug(1,"");
   fElCardsMap.SetOwner(true);
+  
+  // Load DE data
+  if ( ! AliMpDEStore::Instance(false) )  
+    AliMpDEStore::ReadData();
+  fDetElements = AliMpDEStore::Instance();  
 
   // Create mapping segmentations for all detection elements
   for ( Int_t cath = AliMp::kCath0; cath <= AliMp::kCath1; cath ++ ) { 
@@ -129,6 +136,7 @@ AliMpSegmentation::AliMpSegmentation()
 //______________________________________________________________________________
 AliMpSegmentation::AliMpSegmentation(TRootIOCtor* /*ioCtor*/)
 : TObject(),
+  fDetElements(0),
   fMpSegmentations(),
   fElCardsMap(),
   fSlatMotifMap()
@@ -147,6 +155,8 @@ AliMpSegmentation::~AliMpSegmentation()
 
   AliDebug(1,"");
 
+  delete fDetElements;
+
   // Segmentations are deleted with fMpSegmentations 
   // El cards arrays are deleted with fElCardsMap