X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONSt12QuadrantSegmentation.h;h=59b890c07e2fa975f33a6e5ba621d34103250267;hb=45a58699f4de7d0f9a122352abf868b0913801fb;hp=cf5bccdee7bb56eb298a20806cdc6bb31f49b609;hpb=f5ed789012eecc0eb13baddc077a21c173e263d7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONSt12QuadrantSegmentation.h b/MUON/AliMUONSt12QuadrantSegmentation.h
index cf5bccdee7b..59b890c07e2 100644
--- a/MUON/AliMUONSt12QuadrantSegmentation.h
+++ b/MUON/AliMUONSt12QuadrantSegmentation.h
@@ -7,6 +7,10 @@
 /* $Id$ */
 // Revision of includes 07/05/2004
 
+/// \ingroup base
+/// \class AliMUONSt12QuadrantSegmentation
+/// \brief Segmentation for MUON quadrants of stations 1 and 2
+
 // Class AliMUONSt12QuadrantSegmentation
 // -------------------------------------
 // Segmentation for MUON quadrants of stations 1 and 2 using 
@@ -25,14 +29,14 @@ class AliMpSector;
 class AliMpSectorSegmentation;
 class AliMpVPadIterator;
 class AliMpPad;
-class AliMUONSegmentManuIndex;
 
 class AliMUONChamber;
 
 class AliMUONSt12QuadrantSegmentation : public AliMUONVGeometryDESegmentation 
 {
   public:
-    AliMUONSt12QuadrantSegmentation(AliMpStationType stationType,
+    AliMUONSt12QuadrantSegmentation(AliMpVSegmentation* segmentation,
+                                    AliMpStationType stationType, 
                                     AliMpPlaneType planeType);
     AliMUONSt12QuadrantSegmentation();
     
@@ -61,7 +65,7 @@ class AliMUONSt12QuadrantSegmentation : public AliMUONVGeometryDESegmentation
     virtual AliMUONGeometryDirection  GetDirection();
                        // Returns the direction with a constant pad size
     // Access to mapping
-    virtual const AliMpSectorSegmentation* GetMpSegmentation() const; 		       
+    virtual const AliMpVSegmentation* GetMpSegmentation() const; 		       
 
     // Transform from pad (wire) to real coordinates and vice versa
     //
@@ -73,10 +77,7 @@ class AliMUONSt12QuadrantSegmentation : public AliMUONVGeometryDESegmentation
     virtual void  GetPadC(Int_t ix, Int_t iy, Float_t& x, Float_t& y, Float_t& z);
     virtual void  GetPadC(Int_t ix, Int_t iy, Float_t& x, Float_t& y);
                        // Transform from real to pad coordinates
-                       // get pad for a given connection
-    virtual void  GetPadE(Int_t &/*ix*/, Int_t &/*iy*/,  AliMUONSegmentManuIndex* /*connect*/) {return;}
-    virtual AliMUONSegmentManuIndex*     GetMpConnection(Int_t /*ix*/, Int_t /*iy*/) {return 0x0;}
-                       // get electronics connection for given pad
+  
     // Initialisation
     //
     virtual void Init(Int_t chamber);
@@ -162,20 +163,15 @@ class AliMUONSt12QuadrantSegmentation : public AliMUONVGeometryDESegmentation
   private:
     // methods
     void UpdateCurrentPadValues(const AliMpPad& pad);
-    void ReadMappingData();
   
-    // constants
-    static const Float_t  fgkWireD;     // default wire pitch
-    static const Float_t  fgkLengthUnit;// conversion between length units
-                                        // from mapping (mm) to AliRoot (cm)
     // data members
 
     // From mapping
     //
     AliMpStationType         fStationType;       // station type
     AliMpPlaneType           fPlaneType;         // plane type
-    AliMpSector*             fSector;            // ! sector (from mapping)
-    AliMpSectorSegmentation* fSectorSegmentation;// ! sector segmentation (from mapping)
+    const AliMpSector*       fSector;            // sector (from mapping)
+    AliMpSectorSegmentation* fSectorSegmentation;// sector segmentation (from mapping)
     AliMpVPadIterator*       fSectorIterator;    // ! iterator over pads
 
     // Wire pitch
@@ -214,7 +210,7 @@ class AliMUONSt12QuadrantSegmentation : public AliMUONVGeometryDESegmentation
 
     TObjArray* fCorrA; // ! Array of correction functions
 
-  ClassDef(AliMUONSt12QuadrantSegmentation,1) // Station1 segmentation
+  ClassDef(AliMUONSt12QuadrantSegmentation,2) // Station1 segmentation
 };
 
 #endif //ALI_MUON_ST12_QUADRANT_SEGMENTATION_H