Bug fix (selection of RawReaderDate from Yuri was not correct)

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

diff --git a/MUON/AliMUONSt1GeometryBuilderV2.h b/MUON/AliMUONSt1GeometryBuilderV2.h
index 93c5a478d63a1ab9e9ed96c00ccdf0962c129ee6..acdba968d8d96b8a2b4d7b95b8245383bad88ca9 100644 (file)
--- a/MUON/AliMUONSt1GeometryBuilderV2.h
+++ b/MUON/AliMUONSt1GeometryBuilderV2.h
@@ -4,7 +4,7 @@
 // $Id$
 // Revision of includes 07/05/2004
 //
-/// \ingroup base
+/// \ingroup sim
 /// \class AliMUONSt1GeometryBuilderV2
 /// \brief MUON Station1 detailed geometry construction class
 ///
@@ -34,7 +34,7 @@
   typedef map<Int_t , AliMUONSt1SpecialMotif> SpecialMap;
 #endif
 
-//typedef Float_t GReal_t; // for AliGeant3
+// typedef Float_t GReal_t; // for AliGeant3
 typedef Double_t GReal_t;  // for VirtualMC
 
 class AliMUON;
@@ -48,7 +48,6 @@ class AliMUONSt1GeometryBuilderV2 : public AliMUONVGeometryBuilder
 {
   public:
     AliMUONSt1GeometryBuilderV2(AliMUON* muon);
-    AliMUONSt1GeometryBuilderV2(const AliMUONSt1GeometryBuilderV2& rMUON);
     AliMUONSt1GeometryBuilderV2();
     virtual ~AliMUONSt1GeometryBuilderV2();
 
@@ -58,9 +57,13 @@ class AliMUONSt1GeometryBuilderV2 : public AliMUONVGeometryBuilder
     virtual void SetSensitiveVolumes();
    
   protected:
-    AliMUONSt1GeometryBuilderV2& operator = (const AliMUONSt1GeometryBuilderV2& rhs);    
  
   private:
+    /// Not implemented
+    AliMUONSt1GeometryBuilderV2(const AliMUONSt1GeometryBuilderV2& rMUON);
+    /// Not implemented
+    AliMUONSt1GeometryBuilderV2& operator = (const AliMUONSt1GeometryBuilderV2& rhs);    
+
     // Constants
     //
     static const GReal_t fgkHzPadPlane;    ///< Pad plane
@@ -126,6 +129,8 @@ class AliMUONSt1GeometryBuilderV2 : public AliMUONVGeometryBuilder
     void CreateHole();
     void CreateDaughterBoard();
     void CreateInnerLayers();
+    void CreateSpacer0();
+    void CreateSpacer();
     void CreateQuadrant(Int_t chamber);
     void CreateFoamBox(Int_t segNumber, const TVector2& dimensions);
     void CreatePlaneSegment(Int_t segNumber, const TVector2& dimensions,
@@ -133,7 +138,8 @@ class AliMUONSt1GeometryBuilderV2 : public AliMUONVGeometryBuilder
     void CreateFrame(Int_t chamber);
 
     void PlaceInnerLayers(Int_t chamber);
-    void PlaceSector(AliMpSector* sector, SpecialMap specialMap,
+    void PlaceSpacer0(Int_t chamber);
+    void PlaceSector(const AliMpSector* sector, SpecialMap specialMap,
                      const TVector3& where, Bool_t reflectZ, Int_t chamber);
                     
     TString QuadrantEnvelopeName(Int_t chamber, Int_t quadrant) const;
@@ -145,12 +151,9 @@ class AliMUONSt1GeometryBuilderV2 : public AliMUONVGeometryBuilder
     TString FR4BoxName(Int_t segNumber) const;
     TString GasVolumeName(const TString& name, Int_t chamber) const;
 
-    void   AddChamberGid(Int_t id,Int_t volName,Int_t idx);
-    //Bool_t IsInChamber(Int_t ich, Int_t volGid) const;   
-
-    GReal_t TotalHzPlane() const ;         // Total mechanical plane half Size
-    GReal_t TotalHzDaughter() const ;      // Total daughter plane half Size
-    GReal_t TotalHz() const ;              // Total plane half Size
+    GReal_t TotalHzPlane() const ; 
+    GReal_t TotalHzDaughter() const ;
+    GReal_t TotalHz() const ;
        
     // Data members
     //
@@ -164,31 +167,40 @@ class AliMUONSt1GeometryBuilderV2 : public AliMUONVGeometryBuilder
 
 // inline functions
 
+/// Return total mechanical plane half Size
 inline GReal_t AliMUONSt1GeometryBuilderV2::TotalHzPlane() const 
 //{ return fgkHzPadPlane + fgkHzFoam + fgkHzFR4; }
 { return fgkHzFoam + fgkHzFR4; }
 
+/// Return total daughter plane half Size
 inline GReal_t AliMUONSt1GeometryBuilderV2::TotalHzDaughter() const 
 { return fgkHzBergPlastic + fgkHzDaughter; }
 
+/// Return total plane half Size
 inline GReal_t AliMUONSt1GeometryBuilderV2::TotalHz() const 
 { return TotalHzPlane() + TotalHzDaughter(); }
 
+/// Return middle quadrant layer name for chamber \a chamber
 inline TString AliMUONSt1GeometryBuilderV2::QuadrantMLayerName(Int_t chamber) const
 { return Form("%s%d",fgkQuadrantMLayerName,chamber); }
 
+/// Return nearer quadrant layer name for chamber \a chamber
 inline TString AliMUONSt1GeometryBuilderV2::QuadrantNLayerName(Int_t chamber) const
 { return Form("%s%d",fgkQuadrantNLayerName,chamber); }
 
+/// Return farther quadrant layer name for chamber \a chamber
 inline TString AliMUONSt1GeometryBuilderV2::QuadrantFLayerName(Int_t chamber) const
 { return Form("%s%d",fgkQuadrantFLayerName,chamber); }
 
+/// Return plane segment name for segment \a segNumber
 inline TString AliMUONSt1GeometryBuilderV2::PlaneSegmentName(Int_t segNumber) const
 { return Form("S%.3d", segNumber); }
 
+/// Return foam box name for segment \a segNumber
 inline TString AliMUONSt1GeometryBuilderV2::FoamBoxName(Int_t segNumber) const
 { return Form("S%.3d", segNumber + fgkFoamBoxNameOffset); }
 
+/// Return FR4 box name for segment \a segNumber
 inline TString AliMUONSt1GeometryBuilderV2::FR4BoxName(Int_t segNumber) const
 { return Form("S%.3d", segNumber + fgkFR4BoxNameOffset); }