X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONGeometryEnvelopeStore.h;h=2a1b82da54f7f5f5fa99a49144e24ddb58525841;hb=08b801a6de165ef29fb388dc4fc9c0516b7b9486;hp=1e73b8f45d8db45d4abaaab1b320dcb16775114c;hpb=829425a512355433c2b59d05ddb13e541094c2ea;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONGeometryEnvelopeStore.h b/MUON/AliMUONGeometryEnvelopeStore.h
index 1e73b8f45d8..2a1b82da54f 100644
--- a/MUON/AliMUONGeometryEnvelopeStore.h
+++ b/MUON/AliMUONGeometryEnvelopeStore.h
@@ -10,7 +10,7 @@
 /// Class for definititon of the temporary volume envelopes
 /// used in geometry construction
 ///
-/// Author: Ivana Hrivnacova, IPN Orsay
+/// \author Ivana Hrivnacova, IPN Orsay
 
 #ifndef ALI_MUON_GEOMETRY_ENVELOPE_STORE_H
 #define ALI_MUON_GEOMETRY_ENVELOPE_STORE_H
@@ -27,20 +27,15 @@ class TString;
 
 class AliMUONChamber;
 class AliMUONGeometryEnvelope;
-class AliMUONGeometryStore;
+class AliMpExMap;
 
 class AliMUONGeometryEnvelopeStore : public TObject
 {
   public:
-    AliMUONGeometryEnvelopeStore(AliMUONGeometryStore* detElements);
+    AliMUONGeometryEnvelopeStore(AliMpExMap* detElements);
     AliMUONGeometryEnvelopeStore();
-    AliMUONGeometryEnvelopeStore(const AliMUONGeometryEnvelopeStore& rhs);
     virtual ~AliMUONGeometryEnvelopeStore();
 
-    // operators  
-    AliMUONGeometryEnvelopeStore& 
-    operator = (const AliMUONGeometryEnvelopeStore& rhs);
-  
     // methods
         
           // adding virtual envelopes 	
@@ -124,21 +119,28 @@ class AliMUONGeometryEnvelopeStore : public TObject
     const TObjArray*  GetEnvelopes() const;
     Int_t             GetNofDetElements() const;
 
+    AliMUONGeometryEnvelope* FindEnvelope(const TString& name) const;
+
+  protected:
+    /// Not implemented
+    AliMUONGeometryEnvelopeStore(const AliMUONGeometryEnvelopeStore& rhs);
+    /// Not implemented
+    AliMUONGeometryEnvelopeStore& operator = (const AliMUONGeometryEnvelopeStore& rhs);
+
   private:
     // methods
     TGeoHMatrix ConvertDETransform(const TGeoHMatrix& transform) const;
-    AliMUONGeometryEnvelope* FindEnvelope(const TString& name) const;
     Bool_t AlignEnvelope(AliMUONGeometryEnvelope* envelope) const;
  
     // data members
-    TObjArray*  fEnvelopes; ///< \brief the envelopes names and transformations
-		            /// wrt to the chamber position in mother volume                                 
-    AliMUONGeometryStore*  fDetElements; ///< \brief detection elements
-                            /// used for alignement of enevelopes
+    TObjArray*   fEnvelopes; ///< \brief the envelopes names and transformations
+		             /// wrt to the chamber position in mother volume                                 
+    AliMpExMap*  fDetElements; ///< \brief detection elements
+                               /// used for alignement of envelopes
     TGeoCombiTrans fReferenceFrame; ///< \brief the transformation from the builder 
                                     /// reference frame to that of the transform 
 				    /// data files
-    Bool_t      fDebug;     ///< Switch for debugging  
+    Bool_t      fDebug;     ///< Switch for debugging  \deprecated - use AliLog instead
     Bool_t      fAlign;     ///< option to read transformations from a file
  
   ClassDef(AliMUONGeometryEnvelopeStore,2) // Geometry envelope store
@@ -146,18 +148,26 @@ class AliMUONGeometryEnvelopeStore : public TObject
 
 // inline functions
 
+/// Set debug option
+/// \deprecated - use AliLog instead
 inline void  AliMUONGeometryEnvelopeStore::SetDebug(Bool_t debug)
 { fDebug = debug; }
 
+/// Return align option - if true, transformations are read from a file
 inline Bool_t  AliMUONGeometryEnvelopeStore::GetAlign() const
 { return fAlign; }
 
+/// Set align option - if true, transformations are read from a file
 inline void AliMUONGeometryEnvelopeStore::SetAlign(Bool_t align)
 { fAlign = align; }
 
+/// Return the array of the envelopes names and transformations
+/// wrt to the chamber position in mother volume
 inline const TObjArray* AliMUONGeometryEnvelopeStore::GetEnvelopes() const
 { return fEnvelopes; }
 
+/// Set the transformation from the builder reference frame to that of the transform 
+/// data files
 inline void 
 AliMUONGeometryEnvelopeStore::SetReferenceFrame(const TGeoCombiTrans& referenceFrame)
 { fReferenceFrame = referenceFrame; }