Separating run-dependent mapping data from data, which are not

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

diff --git a/MUON/AliMUONGeometryBuilder.h b/MUON/AliMUONGeometryBuilder.h
index 4a3d32fec4424cc1d712d7a51499c9e90bcd23f9..a6b8a8c8f3280b01d07fd73dc62914bc273cb0db 100644 (file)
--- a/MUON/AliMUONGeometryBuilder.h
+++ b/MUON/AliMUONGeometryBuilder.h
@@ -7,16 +7,16 @@
 /// \class AliMUONGeometryBuilder
 /// \brief Manager class for geometry construction via geometry builders.
 ///
-/// Author: Ivana Hrivnacova, IPN Orsay
+/// \author Ivana Hrivnacova, IPN Orsay
 
 #ifndef ALI_MUON_GEOMETRY_BUILDER_H
 #define ALI_MUON_GEOMETRY_BUILDER_H
 
+#include "AliMUONGeometry.h"
+
 #include <TObject.h>
 #include <TGeoMatrix.h>
 
-#include "AliMUONGeometry.h"
-
 class TObjArray;
 
 class AliModule;
@@ -45,14 +45,9 @@ class AliMUONGeometryBuilder : public TObject
     void  InitGeometry();
     void  InitGeometry(const TString& svmapFileName);
 
-    void  ReadTransformations();
-    void  ReadTransformations(const TString& fileName);
-
-    void  WriteTransformations();
-    void  WriteTransformations(const TString& fileName);
-
     void  WriteSVMaps();
-    void  WriteSVMaps(const TString& fileName, Bool_t rebuild = true);
+    void  WriteSVMaps(const TString& fileName, 
+                      Bool_t rebuild = true, Bool_t writeEnvelopes = true);
     
     // Geometry parametrisation
     const AliMUONGeometry*            GetGeometry() const;
@@ -64,57 +59,61 @@ class AliMUONGeometryBuilder : public TObject
     virtual void    SetAlign(const TString& fileName, Bool_t align = true);
  
   protected:
+    /// Not implemented
     AliMUONGeometryBuilder(const AliMUONGeometryBuilder& right);
+    /// Not implemented
     AliMUONGeometryBuilder&  operator = (const AliMUONGeometryBuilder& right);
  
   private:
     // method
     void PlaceVolume(const TString& name, const TString& mName, Int_t copyNo, 
              const TGeoHMatrix& matrix, Int_t npar, Double_t* param,
-            const char* only) const;
+            const char* only, Bool_t makeAssembly = false) const;
+    void CreateGeometryWithTGeo();
+    void CreateGeometryWithoutTGeo();
     void SetAlign(AliMUONVGeometryBuilder* builder);        
 
     // static data members
-    static const TString  fgkDefaultTransformFileName; // default transformations file name                                       
-    static const TString  fgkDefaultSVMapFileName;     // default svmaps file name                                        
-    static const TString  fgkOutFileNameExtension;     // default output file name extension                                      
+    static const TString  fgkDefaultVolPathsFileName;  ///< default volume paths file name                                        
+    static const TString  fgkDefaultTransformFileName; ///< default transformations file name                                     
+    static const TString  fgkDefaultSVMapFileName;     ///< default svmaps file name                                      
+    static const TString  fgkOutFileNameExtension;     ///< default output file name extension                                    
 
     // data members
-    AliModule*       fModule;              // the AliRoot module
-    Bool_t           fAlign;               // option to read transformations 
-                                           // from a file
-    TString          fTransformFileName;   // transformations file name                                           
-    TString          fSVMapFileName;       // svmaps file name                                    
-    TGeoCombiTrans   fGlobalTransformation;// global transformation 
-                                           // applied to the whole geometry 
-    TObjArray*       fGeometryBuilders;    // list of Geometry Builders
-    AliMUONGeometry* fGeometry;            // geometry parametrisation
-
-  ClassDef(AliMUONGeometryBuilder,5)  // Geometry builder
+    AliModule*       fModule;              ///< the AliRoot module
+    Bool_t           fAlign;               ///< \brief option to read transformations 
+                                           /// from a file
+    TString          fTransformFileName;   ///< transformations file name                                         
+    TString          fSVMapFileName;       ///< svmaps file name                                          
+    TGeoCombiTrans   fGlobalTransformation;///< \brief global transformation 
+                                           /// applied to the whole geometry 
+    TObjArray*       fGeometryBuilders;    ///< list of Geometry Builders
+    AliMUONGeometry* fGeometry;            ///< geometry parametrisation
+
+  ClassDef(AliMUONGeometryBuilder,6)  // Geometry builder
 };
 
 // inline functions
 
+/// Initialize geometry
 inline void  AliMUONGeometryBuilder::InitGeometry()
 { InitGeometry(fSVMapFileName); }
 
-inline void  AliMUONGeometryBuilder::ReadTransformations()
-{ ReadTransformations(fTransformFileName); }
-
-inline void  AliMUONGeometryBuilder::WriteTransformations()
-{ WriteTransformations(fTransformFileName + fgkOutFileNameExtension); }
-
+/// Write sensitive volume maps
 inline void  AliMUONGeometryBuilder::WriteSVMaps()
 { WriteSVMaps(fSVMapFileName + fgkOutFileNameExtension); }
 
+/// Return geometry parametrisation
 inline 
 const AliMUONGeometry* AliMUONGeometryBuilder::GetGeometry() const
 { return fGeometry; }
 
+/// Return geometry transformer
 inline 
 const AliMUONGeometryTransformer* AliMUONGeometryBuilder::GetTransformer() const
 { return fGeometry->GetTransformer(); }
 
+/// Return option for reading transformations from a file
 inline Bool_t  AliMUONGeometryBuilder::GetAlign() const
 { return fAlign; }