X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONGeometryModuleTransformer.h;h=12d3279c258a3883956d74529a539704a3425d8f;hb=f3f3617d888e7a59929c70ddbd73417d90cbaddf;hp=0b567e9acdb1c870d942b80f4b16679d6dcc637f;hpb=a9aad96e253c5dad5b74464038546a9bf4234ecc;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONGeometryModuleTransformer.h b/MUON/AliMUONGeometryModuleTransformer.h
index 0b567e9acdb..12d3279c258 100644
--- a/MUON/AliMUONGeometryModuleTransformer.h
+++ b/MUON/AliMUONGeometryModuleTransformer.h
@@ -8,7 +8,7 @@
 /// \class AliMUONGeometryModuleTransformer
 /// \brief Geometry transformer for a detector module
 ///
-/// Class for definition of the trasformation for adetector module
+/// Class for definition of the transformation for a detector module
 /// and its detection elements
 ///
 /// \author Ivana Hrivnacova, IPN Orsay
@@ -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, 
@@ -56,35 +60,46 @@ class AliMUONGeometryModuleTransformer : public TObject
  
     // get methods
     Int_t    GetModuleId() const;
+    TString  GetModuleName() const;
     TString  GetVolumePath() const;
     TString  GetVolumeName() const;
     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:
+    /// Not implemented
     AliMUONGeometryModuleTransformer(const AliMUONGeometryModuleTransformer& rhs);
+    /// Not implemented
     AliMUONGeometryModuleTransformer& 
       operator = (const AliMUONGeometryModuleTransformer& rhs);
 
   private:
+    // static data members
+    static const TString  fgkModuleNamePrefix; ///< Geometry module name prefix
+
     // data members
     Int_t                 fModuleId;   ///< the module Id
+    TString               fModuleName; ///< the module name
     TString               fVolumePath; ///< \brief the full path of aligned module volume
                                        /// 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)
@@ -95,6 +110,11 @@ inline Int_t
 AliMUONGeometryModuleTransformer::GetModuleId() const
 { return fModuleId; }
 
+/// Return module name
+inline TString
+AliMUONGeometryModuleTransformer::GetModuleName() const
+{ return fModuleName; }
+
 /// Return the full path of aligned module volume or envelope in geometry
 inline TString 
 AliMUONGeometryModuleTransformer::GetVolumePath() const
@@ -106,7 +126,7 @@ AliMUONGeometryModuleTransformer::GetTransformation() const
 { return fTransformation; }
 
 /// Return detection elements associated with this module
-inline  AliMUONGeometryStore* 
+inline  AliMpExMap* 
 AliMUONGeometryModuleTransformer::GetDetElementStore() const
 { return fDetElements; }