From fa66b479d99d9183b54b9a555ad62096ff71760b Mon Sep 17 00:00:00 2001
From: ivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 19 Oct 2006 09:30:39 +0000
Subject: [PATCH] - AliMUONGeometryStore replaced with AliMpExMap (used as the
 type   of fDetElements data member) - Added static method
 GetModuleNamePrefix();

---
 MUON/AliMUONGeometryModuleTransformer.cxx |  7 ++++---
 MUON/AliMUONGeometryModuleTransformer.h   | 22 +++++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/MUON/AliMUONGeometryModuleTransformer.cxx b/MUON/AliMUONGeometryModuleTransformer.cxx
index cdb3d3f2e15..c0425032fc4 100644
--- a/MUON/AliMUONGeometryModuleTransformer.cxx
+++ b/MUON/AliMUONGeometryModuleTransformer.cxx
@@ -23,7 +23,8 @@
 
 #include "AliMUONGeometryModuleTransformer.h"
 #include "AliMUONGeometryDetElement.h"	
-#include "AliMUONGeometryStore.h"	
+
+#include "AliMpExMap.h"	
 
 #include "AliLog.h"	
 
@@ -54,7 +55,7 @@ AliMUONGeometryModuleTransformer::AliMUONGeometryModuleTransformer(Int_t moduleI
   fTransformation = new TGeoHMatrix("");
 
   // Det elements transformation stores
-  fDetElements = new AliMUONGeometryStore(true);
+  fDetElements = new AliMpExMap(true);
   
   // Compose module name
   fModuleName = fgkModuleNamePrefix;
@@ -199,7 +200,7 @@ AliMUONGeometryModuleTransformer::GetDetElement(Int_t detElemId, Bool_t warn) co
 
    // Get detection element
    AliMUONGeometryDetElement* detElement
-     = (AliMUONGeometryDetElement*) fDetElements->Get(detElemId, warn);
+     = (AliMUONGeometryDetElement*) fDetElements->GetValue(detElemId);
 
    if (!detElement) {
      if (warn)
diff --git a/MUON/AliMUONGeometryModuleTransformer.h b/MUON/AliMUONGeometryModuleTransformer.h
index c257441ddfa..9d99817ce03 100644
--- a/MUON/AliMUONGeometryModuleTransformer.h
+++ b/MUON/AliMUONGeometryModuleTransformer.h
@@ -20,7 +20,8 @@
 #include <TString.h>
 
 class AliMUONGeometryDetElement;
-class AliMUONGeometryStore;
+
+class AliMpExMap;
 
 class TGeoTranslation;
 class TGeoRotation;
@@ -35,6 +36,9 @@ class AliMUONGeometryModuleTransformer : public TObject
     AliMUONGeometryModuleTransformer();
     virtual ~AliMUONGeometryModuleTransformer();
 
+    // static methods
+    static TString GetModuleNamePrefix();
+
     // methods
     void Global2Local(Int_t detElemId,
                  Float_t xg, Float_t yg, Float_t zg, 
@@ -62,10 +66,9 @@ class AliMUONGeometryModuleTransformer : public TObject
     TString  GetMotherVolumeName() const;
 
     const TGeoHMatrix*  GetTransformation() const;    
-
-    AliMUONGeometryStore*       GetDetElementStore() const;
-    AliMUONGeometryDetElement*  GetDetElement(
-                                   Int_t detElemId, Bool_t warn = true) const;    
+    AliMpExMap*         GetDetElementStore() const; 
+    AliMUONGeometryDetElement*  
+                        GetDetElement(Int_t detElemId, Bool_t warn = true) const;    
 
   protected:
     AliMUONGeometryModuleTransformer(const AliMUONGeometryModuleTransformer& rhs);
@@ -83,13 +86,18 @@ class AliMUONGeometryModuleTransformer : public TObject
                                        /// or envelope in geometry
     TGeoHMatrix*          fTransformation;///< \brief the module transformation wrt to top
                                           /// volume (world)
-    AliMUONGeometryStore* fDetElements;   ///< detection elements
+    AliMpExMap*           fDetElements;   ///< detection elements
  
   ClassDef(AliMUONGeometryModuleTransformer,3) // MUON geometry module class
 };
 
 // inline functions
 
+/// Return module name prefix
+inline TString 
+AliMUONGeometryModuleTransformer::GetModuleNamePrefix()
+{ return fgkModuleNamePrefix; }
+
 /// Set the full path of aligned module volume or envelope in geometry
 inline void 
 AliMUONGeometryModuleTransformer::SetVolumePath(const TString& volumePath)
@@ -116,7 +124,7 @@ AliMUONGeometryModuleTransformer::GetTransformation() const
 { return fTransformation; }
 
 /// Return detection elements associated with this module
-inline  AliMUONGeometryStore* 
+inline  AliMpExMap* 
 AliMUONGeometryModuleTransformer::GetDetElementStore() const
 { return fDetElements; }
 
-- 
2.43.0