Updated list of MUON libraries

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

diff --git a/MUON/AliMUONGeometryModuleTransformer.cxx b/MUON/AliMUONGeometryModuleTransformer.cxx
index 6c6ccd60ebce709329e3a5736dae399cf28fdc62..c0425032fc413050a0ecb386a060fe949c716494 100644 (file)
--- 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"    
 
@@ -33,12 +34,17 @@
 #include <TArrayI.h>
 #include <Riostream.h>
 
+/// \cond CLASSIMP
 ClassImp(AliMUONGeometryModuleTransformer)
+/// \endcond
+
+const TString AliMUONGeometryModuleTransformer::fgkModuleNamePrefix = "GM";
 
 //______________________________________________________________________________
 AliMUONGeometryModuleTransformer::AliMUONGeometryModuleTransformer(Int_t moduleId)
  : TObject(),
    fModuleId(moduleId),
+   fModuleName(),
    fVolumePath(),
    fTransformation(0),
    fDetElements(0)
@@ -49,7 +55,11 @@ 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;
+  fModuleName += moduleId;
 }
 
 
@@ -57,6 +67,7 @@ AliMUONGeometryModuleTransformer::AliMUONGeometryModuleTransformer(Int_t moduleI
 AliMUONGeometryModuleTransformer::AliMUONGeometryModuleTransformer()
  : TObject(),
    fModuleId(0),
+   fModuleName(),
    fVolumePath(),
    fTransformation(0),
    fDetElements(0)
@@ -65,16 +76,6 @@ AliMUONGeometryModuleTransformer::AliMUONGeometryModuleTransformer()
 }
 
 
-//______________________________________________________________________________
-AliMUONGeometryModuleTransformer::AliMUONGeometryModuleTransformer(
-                                    const AliMUONGeometryModuleTransformer& rhs)
-  : TObject(rhs)
-{
-/// Protected copy constructor
-
-  AliFatal("Copy constructor is not implemented.");
-}
-
 //______________________________________________________________________________
 AliMUONGeometryModuleTransformer::~AliMUONGeometryModuleTransformer() 
 {
@@ -84,21 +85,6 @@ AliMUONGeometryModuleTransformer::~AliMUONGeometryModuleTransformer()
   delete fDetElements;
 }
 
-//______________________________________________________________________________
-AliMUONGeometryModuleTransformer& 
-AliMUONGeometryModuleTransformer::operator = (
-                                    const AliMUONGeometryModuleTransformer& rhs) 
-{
-/// Protected assignement operator
-
-  // check assignement to self
-  if (this == &rhs) return *this;
-
-  AliFatal("Assignment operator is not implemented.");
-    
-  return *this;  
-}
-
 //
 // public methods
 //
@@ -193,7 +179,7 @@ TString AliMUONGeometryModuleTransformer::GetVolumeName() const
 //______________________________________________________________________________
 TString AliMUONGeometryModuleTransformer::GetMotherVolumeName() const
 { 
-/// Extract volume name from the path
+/// Extract mother volume name from the path
   
   std::string volPath = fVolumePath.Data();
   std::string::size_type first = volPath.rfind('/');
@@ -210,11 +196,11 @@ AliMUONGeometryDetElement*
 AliMUONGeometryModuleTransformer::GetDetElement(Int_t detElemId, Bool_t warn) const
 {
 /// Return the detection element specified by detElemId.
-/// Give error if detection element is not defined.
+/// Give error if detection element is not defined and warn is true.
 
    // Get detection element
    AliMUONGeometryDetElement* detElement
-     = (AliMUONGeometryDetElement*) fDetElements->Get(detElemId, warn);
+     = (AliMUONGeometryDetElement*) fDetElements->GetValue(detElemId);
 
    if (!detElement) {
      if (warn)