Replacement of AliMpIntPair object with algoritmic

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpRowSegment.h

diff --git a/MUON/mapping/AliMpRowSegment.h b/MUON/mapping/AliMpRowSegment.h
index 2ad308ca8aea2ce5ff6feca07d3908f68a7e498b..eec9dd217924f858412f40bb11d855c1cc790a0f 100755 (executable)
--- a/MUON/mapping/AliMpRowSegment.h
+++ b/MUON/mapping/AliMpRowSegment.h
@@ -2,29 +2,29 @@
  * See cxx source for full Copyright notice                               */
 
 // $Id$
-// $MpId: AliMpRowSegment.h,v 1.7 2005/08/26 15:43:36 ivana Exp $
+// $MpId: AliMpRowSegment.h,v 1.10 2006/05/24 13:58:21 ivana Exp $
 
 /// \ingroup sector
 /// \class AliMpRowSegment
 /// \brief A row segment composed of the the identic motifs.
 ///
-/// Authors: David Guez, Ivana Hrivnacova; IPN Orsay
+/// \author David Guez, Ivana Hrivnacova; IPN Orsay
 
 #ifndef ALI_MP_ROW_SEGMENT_H
 #define ALI_MP_ROW_SEGMENT_H
 
-#include <TVector2.h>
-
 #include "AliMpVRowSegment.h"
 
+#include <TVector2.h>
+
 class AliMpRow;
 class AliMpVMotif;
-class AliMpIntPair;
 
 class AliMpRowSegment : public AliMpVRowSegment
 {
   public:
-    AliMpRowSegment(AliMpRow* row, AliMpVMotif* motif, AliMpIntPair padOffset, 
+    AliMpRowSegment(AliMpRow* row, AliMpVMotif* motif, 
+                Int_t padOffsetX, Int_t padOffsetY, 
                 Int_t nofMotifs, Int_t motifPositionId, Int_t motifPositionDId);
     AliMpRowSegment();
     virtual ~AliMpRowSegment();
@@ -47,8 +47,7 @@ class AliMpRowSegment : public AliMpVRowSegment
     // set methods
     virtual void      SetOffset(const TVector2& offset);
     virtual void      SetGlobalIndices(AliMpRow* rowBefore);
-    virtual Int_t     SetIndicesToMotifPosition(Int_t i, 
-                                const AliMpIntPair& indices);
+    virtual Int_t     SetIndicesToMotifPosition(Int_t i, MpPair_t indices);
 
     // get methods
     virtual AliMpRow*     GetRow() const;
@@ -56,11 +55,12 @@ class AliMpRowSegment : public AliMpVRowSegment
     virtual AliMpVMotif*  GetMotif(Int_t /*i*/) const;
     virtual Int_t         GetMotifPositionId(Int_t i) const;
 
-  protected:
-   AliMpRowSegment(const AliMpRowSegment& right);
-   AliMpRowSegment&  operator = (const AliMpRowSegment& right);
-
   private:
+    /// Not implemented
+    AliMpRowSegment(const AliMpRowSegment& right);
+    /// Not implemented
+    AliMpRowSegment&  operator = (const AliMpRowSegment& right);
+
     // methods
     Double_t  FirstMotifCenterX() const;
     Double_t  LastMotifCenterX() const;
@@ -69,16 +69,16 @@ class AliMpRowSegment : public AliMpVRowSegment
     Bool_t    IsInside(const TVector2& position, Bool_t warn = true) const;
 
     // data members
-    Int_t         fNofMotifs;  //number of motifs
-    AliMpIntPair  fPadOffset;  //the offset in nof pads 
-    TVector2      fOffset;     //the position of the centre of the first motif
-                               //(x wtr to left border, y wtr to row center)
-    AliMpRow*     fRow;        //the row containing this segment 
-    AliMpVMotif*  fMotif;      //the motif 
-    Int_t   fMotifPositionId;  // the first motif position id
-    Int_t   fMotifPositionDId; // +1 if ids are increasing, -1 if decreasing
+    Int_t         fNofMotifs;  ///< number of motifs
+    MpPair_t      fLPadOffset; ///< the offset in nof pads 
+    TVector2      fOffset;     ///< \brief the position of the centre of the first motif
+                               /// (x wtr to left border, y wtr to row center)
+    AliMpRow*     fRow;        ///< the row containing this segment 
+    AliMpVMotif*  fMotif;      ///< the motif 
+    Int_t   fMotifPositionId;  ///< the first motif position id
+    Int_t   fMotifPositionDId; ///< +1 if ids are increasing, -1 if decreasing
     
-  ClassDef(AliMpRowSegment,1)  //Row segment
+  ClassDef(AliMpRowSegment,1)  // Row segment
 };
 
 #endif //ALI_MP_ROW_SEGMENT_H