X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONGeometryEnvelopeStore.cxx;h=d03e601a76379ed071d66c4a4e0a8d164aa532df;hb=c241bfaaab5e5eb59cf98d6090b17ee3737af2ad;hp=cd9b863d53035d96d935e26aa7c908b677fbfec9;hpb=7183d52504b960adcc5149f4f2d1685ae735dbf2;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONGeometryEnvelopeStore.cxx b/MUON/AliMUONGeometryEnvelopeStore.cxx
index cd9b863d530..d03e601a763 100644
--- a/MUON/AliMUONGeometryEnvelopeStore.cxx
+++ b/MUON/AliMUONGeometryEnvelopeStore.cxx
@@ -15,19 +15,21 @@
 
 // $Id$
 
-// ----------------------------------
+//-----------------------------------------------------------------------------
 // Class AliMUONGeometryEnvelopeStore
 // ----------------------------------
 // Class for definititon of the temporary volume envelopes
 // used in geometry construction
 // Author: Ivana Hrivnacova, IPN Orsay
+//-----------------------------------------------------------------------------
 
 #include "AliMUONGeometryEnvelopeStore.h"
 #include "AliMUONGeometryEnvelope.h"
 #include "AliMUONGeometryDetElement.h"
-#include "AliMUONGeometryStore.h"
 #include "AliMUONGeometryBuilder.h"
 
+#include "AliMpExMap.h"
+
 #include "AliLog.h"
 
 #include <TGeoMatrix.h>
@@ -35,11 +37,13 @@
 #include <Riostream.h>
 #include <TString.h>
 
+/// \cond CLASSIMP
 ClassImp(AliMUONGeometryEnvelopeStore)
+/// \endcond
 
 //______________________________________________________________________________
 AliMUONGeometryEnvelopeStore::AliMUONGeometryEnvelopeStore(
-                                 AliMUONGeometryStore* detElements)
+                                    AliMpExMap* detElements)
  : TObject(),
    fEnvelopes(0),
    fDetElements(detElements),
@@ -66,13 +70,6 @@ AliMUONGeometryEnvelopeStore::AliMUONGeometryEnvelopeStore()
 }
 
 
-//______________________________________________________________________________
-AliMUONGeometryEnvelopeStore::AliMUONGeometryEnvelopeStore(const AliMUONGeometryEnvelopeStore& rhs)
-  : TObject(rhs)
-{
-  AliFatal("Copy constructor is not implemented.");
-}
-
 //______________________________________________________________________________
 AliMUONGeometryEnvelopeStore::~AliMUONGeometryEnvelopeStore() 
 {
@@ -86,20 +83,6 @@ AliMUONGeometryEnvelopeStore::~AliMUONGeometryEnvelopeStore()
   }  
 }
 
-//______________________________________________________________________________
-AliMUONGeometryEnvelopeStore& 
-AliMUONGeometryEnvelopeStore::operator = (const AliMUONGeometryEnvelopeStore& rhs) 
-{
-/// Protected assignement operator
-
-  // check assignement to self
-  if (this == &rhs) return *this;
-
-  AliFatal("Assignment operator is not implemented.");
-    
-  return *this;  
-}
-
 //
 // private methods
 //
@@ -108,7 +91,7 @@ AliMUONGeometryEnvelopeStore::operator = (const AliMUONGeometryEnvelopeStore& rh
 TGeoHMatrix 
 AliMUONGeometryEnvelopeStore::ConvertDETransform(const TGeoHMatrix& transform) const
 {
-// Convert transformation into the reference frame
+/// Convert transformation into the reference frame
 
   if ( fReferenceFrame.IsIdentity() )
     return transform;
@@ -146,7 +129,7 @@ Bool_t AliMUONGeometryEnvelopeStore::AlignEnvelope(
   if (detElemId == 0) return false;
   
   AliMUONGeometryDetElement* detElement 
-    = (AliMUONGeometryDetElement*) fDetElements->Get(detElemId);
+    = (AliMUONGeometryDetElement*) fDetElements->GetValue(detElemId);
   if (!detElement) {
     AliWarning("Transformation not found.");
     return false;
@@ -423,7 +406,7 @@ void  AliMUONGeometryEnvelopeStore::AddEnvelopeConstituent(const TString& name,
                                          const TString& envName, Int_t copyNo) 
 {
 /// Add the volume with the specified name and transformation
-/// to the list of envelopes.
+/// as a constituent of the envelope envName.
 
   if (fDebug) {
     cout << "... Adding constituent " << name
@@ -447,7 +430,7 @@ void  AliMUONGeometryEnvelopeStore::AddEnvelopeConstituent(const TString& name,
                                           const TGeoTranslation& translation)
 {
 /// Add the volume with the specified name and transformation
-/// to the list of envelopes.
+/// as a constituent of the envelope envName.
 
   if (fDebug) {
     cout << "... Adding constituent " << name
@@ -473,7 +456,7 @@ void  AliMUONGeometryEnvelopeStore::AddEnvelopeConstituent(const TString& name,
 		                          const TGeoRotation& rotation)
 {
 /// Add the volume with the specified name and transformation
-/// to the list of envelopes.
+/// as a constituent of the envelope envName.
 
   if (fDebug) {
     cout << "... Adding constituent " << name
@@ -498,7 +481,7 @@ void  AliMUONGeometryEnvelopeStore::AddEnvelopeConstituent(const TString& name,
                                           const TGeoCombiTrans& transform)
 {
 /// Add the volume with the specified name and transformation
-/// to the list of envelopes.
+/// as a constituent of the envelope envName.
 
   if (fDebug) {
     cout << "... Adding constituent " << name
@@ -523,7 +506,7 @@ void  AliMUONGeometryEnvelopeStore::AddEnvelopeConstituentParam(const TString& n
 					 Int_t npar, Double_t* param) 
 {
 /// Add the volume with the specified name and transformation
-/// to the list of envelopes.
+/// as a constituent of the envelope envName.
 
   if (fDebug) {
     cout << "... Adding parameterised constituent " << name
@@ -548,7 +531,7 @@ void  AliMUONGeometryEnvelopeStore::AddEnvelopeConstituentParam(const TString& n
 					  Int_t npar, Double_t* param)
 {
 /// Add the volume with the specified name and transformation
-/// to the list of envelopes.
+/// as a constituent of the envelope envName.
 
   if (fDebug) {
     cout << "... Adding parameterised constituent " << name
@@ -575,7 +558,7 @@ void  AliMUONGeometryEnvelopeStore::AddEnvelopeConstituentParam(const TString& n
 					  Int_t npar, Double_t* param)
 {
 /// Add the volume with the specified name and transformation
-/// to the list of envelopes.
+/// as a constituent of the envelope envName.
 
   if (fDebug) {
     cout << "... Adding parameterised constituent " << name
@@ -601,7 +584,7 @@ void  AliMUONGeometryEnvelopeStore::AddEnvelopeConstituentParam(const TString& n
 					  Int_t npar, Double_t* param)
 {
 /// Add the volume with the specified name and transformation
-/// to the list of envelopes.
+/// as a constituent of the envelope envName.
 
   if (fDebug) {
     cout << "... Adding parameterised constituent " << name