X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONGeometryBuilder.h;h=a55311ad8b45976232236422e9dba8643a996033;hb=285aba1798b12994193c39ae0f98a54006220298;hp=3744af28f253cb1c1585b9aaa15e4ef36589d3b7;hpb=71a2d3aa63e94daa0244d8d6d1c7c162ae29a374;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONGeometryBuilder.h b/MUON/AliMUONGeometryBuilder.h
index 3744af28f25..a55311ad8b4 100644
--- a/MUON/AliMUONGeometryBuilder.h
+++ b/MUON/AliMUONGeometryBuilder.h
@@ -44,9 +44,11 @@ class AliMUONGeometryBuilder : public TObject
 
     void  InitGeometry();
     void  InitGeometry(const TString& svmapFileName);
+    void  UpdateInternalGeometry();
 
     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,19 +66,18 @@ class AliMUONGeometryBuilder : public TObject
     AliMUONGeometryBuilder&  operator = (const AliMUONGeometryBuilder& right);
  
   private:
+    // static methods
+    static const TString& GetDefaultTransformFileName();    
+    static const TString& GetDefaultSVMapFileName();    
+    static const TString& GetOutFileNameExtension();        
+
     // method
     void PlaceVolume(const TString& name, const TString& mName, Int_t copyNo, 
              const TGeoHMatrix& matrix, Int_t npar, Double_t* param,
 	     const char* only, Bool_t makeAssembly = false) const;
     void CreateGeometryWithTGeo();
     void CreateGeometryWithoutTGeo();
-    void SetAlign(AliMUONVGeometryBuilder* builder);	     
-
-    // static data members
-    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					   
+    void SetAlignToBuilder(AliMUONVGeometryBuilder* builder) const;	     
 
     // data members
     AliModule*       fModule;              ///< the AliRoot module
@@ -100,7 +101,7 @@ inline void  AliMUONGeometryBuilder::InitGeometry()
 
 /// Write sensitive volume maps
 inline void  AliMUONGeometryBuilder::WriteSVMaps()
-{ WriteSVMaps(fSVMapFileName + fgkOutFileNameExtension); }
+{ WriteSVMaps(fSVMapFileName + GetOutFileNameExtension()); }
 
 /// Return geometry parametrisation
 inline