- Added fMpSegmentations data member (used for deleting mapping

segmentations
  not included in DE segmentations)
- Using AliMUONGeometryStore instead of AliMUONGeometryDEIndexing
  (now removed)

diff --git a/MUON/AliMUONSegmentation.cxx b/MUON/AliMUONSegmentation.cxx
index 97d4b58ea21f43e0306ea077343df31007aea60f..bedb7e346a5f6454139377fefc067bf57bc93998 100644 (file)
--- a/MUON/AliMUONSegmentation.cxx
+++ b/MUON/AliMUONSegmentation.cxx
@@ -28,7 +28,10 @@
 #include "AliMUONSegmentation.h"
 #include "AliMUONVGeometryDESegmentation.h"
 #include "AliMUONGeometrySegmentation.h"
-#include "AliMUONGeometryDEIndexing.h"
+#include "AliMUONGeometryStore.h"
+
+#include "AliMpVSegmentation.h"
+
 #include "AliLog.h"
 
 
@@ -37,10 +40,15 @@ ClassImp(AliMUONSegmentation)
 //______________________________________________________________________________
 AliMUONSegmentation::AliMUONSegmentation(Int_t nofModules)
   : TObject(),
+    fMpSegmentations(0),
     fDESegmentations(0)
 {
 /// Standard constructor
 
+  // Create array for mapping segmentations
+  fMpSegmentations = new TObjArray();
+  fMpSegmentations->SetOwner(kTRUE);
+
   // Create array for DE segmentations
   fDESegmentations = new TObjArray();
   fDESegmentations->SetOwner(kTRUE);
@@ -60,6 +68,7 @@ AliMUONSegmentation::AliMUONSegmentation(Int_t nofModules)
 //______________________________________________________________________________
 AliMUONSegmentation::AliMUONSegmentation() 
   : TObject(),
+    fMpSegmentations(0),
     fDESegmentations(0)
 {
 /// Default constructor
@@ -86,6 +95,7 @@ AliMUONSegmentation::~AliMUONSegmentation()
 
   AliDebug(1, Form("dtor this = %p", this));
 
+  delete fMpSegmentations;
   delete fDESegmentations;
   delete fModuleSegmentations[0];
   delete fModuleSegmentations[1];
@@ -109,13 +119,38 @@ AliMUONSegmentation::operator=(const AliMUONSegmentation& right)
 // public functions
 //
 
+//_____________________________________________________________________________
+void AliMUONSegmentation::AddMpSegmentation(AliMpVSegmentation* segmentation)
+{
+/// Add the mapping segmentation to the array if not present
+
+  Bool_t isPresent = false;
+  for (Int_t i=0; i<fMpSegmentations->GetEntries(); i++) 
+    if ( (AliMpVSegmentation*)fMpSegmentations->At(i) == segmentation ) {
+      isPresent = true;
+      break;
+    }  
+
+  if (!isPresent) fMpSegmentations->Add(segmentation);
+}
+
 //_____________________________________________________________________________
 void AliMUONSegmentation::AddDESegmentation(
-                             AliMUONVGeometryDESegmentation* segmentation)
+                                AliMUONVGeometryDESegmentation* segmentation)
 {
 /// Add the DE segmentation to the array
 
   fDESegmentations->Add(segmentation);
+  
+  // Deregister the mapping segmentation contained in DE segmentation
+  // from fMpSegmentations, if present
+  const AliMpVSegmentation* kmpSeg = segmentation->GetMpSegmentation();
+  
+  for (Int_t i=0; i<fMpSegmentations->GetEntries(); i++) 
+    if ( (const AliMpVSegmentation*)fMpSegmentations->At(i) == kmpSeg ) {
+      fMpSegmentations->RemoveAt(i);
+      break;
+    }  
 }
 
 //_____________________________________________________________________________
@@ -190,7 +225,7 @@ AliMUONSegmentation::GetModuleSegmentationByDEId(
 /// Return the geometry module specified by detElemId/cathod
 
   // Get moduleId 
-  Int_t moduleId = AliMUONGeometryDEIndexing::GetModuleId(detElemId);
+  Int_t moduleId = AliMUONGeometryStore::GetModuleId(detElemId);
 
   return GetModuleSegmentation(moduleId, cathod, warn);
 }