- In CreateGeometry() - virtual modules and envelopes placed
authorivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 8 Feb 2006 15:18:29 +0000 (15:18 +0000)
committerivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 8 Feb 2006 15:18:29 +0000 (15:18 +0000)
  as assemblies (with MC using TGeo geometry - TGeant3TGeo, TFluka)
- Removed  Read/WriteTransformations() methods - available
  via AliMUONGeometryTransformer
- Reordered includes, forward declarations

MUON/AliMUONGeometryBuilder.h

index 4a3d32f..3716fbc 100644 (file)
 #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,12 +45,6 @@ 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);
     
@@ -71,10 +65,13 @@ class AliMUONGeometryBuilder : public TObject
     // 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  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                                      
@@ -90,7 +87,7 @@ class AliMUONGeometryBuilder : public TObject
     TObjArray*       fGeometryBuilders;    // list of Geometry Builders
     AliMUONGeometry* fGeometry;            // geometry parametrisation
 
-  ClassDef(AliMUONGeometryBuilder,5)  // Geometry builder
+  ClassDef(AliMUONGeometryBuilder,6)  // Geometry builder
 };
 
 // inline functions
@@ -98,12 +95,6 @@ class AliMUONGeometryBuilder : public TObject
 inline void  AliMUONGeometryBuilder::InitGeometry()
 { InitGeometry(fSVMapFileName); }
 
-inline void  AliMUONGeometryBuilder::ReadTransformations()
-{ ReadTransformations(fTransformFileName); }
-
-inline void  AliMUONGeometryBuilder::WriteTransformations()
-{ WriteTransformations(fTransformFileName + fgkOutFileNameExtension); }
-
 inline void  AliMUONGeometryBuilder::WriteSVMaps()
 { WriteSVMaps(fSVMapFileName + fgkOutFileNameExtension); }