Updates to AddTask macro from Chris

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

diff --git a/MUON/AliMUONGeometryEnvelopeStore.h b/MUON/AliMUONGeometryEnvelopeStore.h
index 1d96a24675a49334da57aebdd83a8d4e787d5413..2a1b82da54f7f5f5fa99a49144e24ddb58525841 100644 (file)
--- 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,40 +119,55 @@ 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; // the envelopes names and transformations
-                           // wrt to the chamber position in mother volume                                 
-    AliMUONGeometryStore*  fDetElements; // detection elements
-                            // used for alignement of enevelopes
-    TGeoCombiTrans fReferenceFrame; // the transformation from the builder 
-                                    // reference frame to that of the transform 
-                                   // data files
-    Bool_t      fDebug;     // Switch for debugging  
-    Bool_t      fAlign;     // option to read transformations from a file
+    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  \deprecated - use AliLog instead
+    Bool_t      fAlign;     ///< option to read transformations from a file
  
   ClassDef(AliMUONGeometryEnvelopeStore,2) // Geometry envelope store
 };
 
 // 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; }