Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / MUON / AliMUONGeometryModuleTransformer.h

diff --git a/MUON/AliMUONGeometryModuleTransformer.h b/MUON/AliMUONGeometryModuleTransformer.h
index c257441ddfa1b3e288429c99e4a92c8e3f69fdc7..2df899c0f5e7eb88f893f54a2a6365959af075c9 100644 (file)
--- 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;
@@ -32,9 +33,13 @@ class AliMUONGeometryModuleTransformer : public TObject
 {
   public:
     AliMUONGeometryModuleTransformer(Int_t moduleId);
-    AliMUONGeometryModuleTransformer();
+    AliMUONGeometryModuleTransformer(TRootIOCtor* /*ioCtor*/);
     virtual ~AliMUONGeometryModuleTransformer();
 
+    // static methods
+    static const TString& GetModuleNamePrefix();
+    static       TString  GetModuleName(Int_t moduleId);
+
     // methods
     void Global2Local(Int_t detElemId,
                  Float_t xg, Float_t yg, Float_t zg, 
@@ -62,20 +67,20 @@ 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:
+    /// Not implemented
+    AliMUONGeometryModuleTransformer();
+    /// 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
@@ -83,7 +88,7 @@ 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
 };
@@ -116,7 +121,7 @@ AliMUONGeometryModuleTransformer::GetTransformation() const
 { return fTransformation; }
 
 /// Return detection elements associated with this module
-inline  AliMUONGeometryStore* 
+inline  AliMpExMap* 
 AliMUONGeometryModuleTransformer::GetDetElementStore() const
 { return fDetElements; }