X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2Fmapping%2FAliMpMotifPosition.h;h=4e14197b42e86c549900ef2637c4c6b37661cd45;hb=e12130d5dc9a50cb102d54ada03f7ec0be95f3cc;hp=3aea38be987ca3567c875f323b259b89714dc046;hpb=13e7956b8ab5b88a4cd989fa7a730705350b26b6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/mapping/AliMpMotifPosition.h b/MUON/mapping/AliMpMotifPosition.h
index 3aea38be987..4e14197b42e 100755
--- a/MUON/mapping/AliMpMotifPosition.h
+++ b/MUON/mapping/AliMpMotifPosition.h
@@ -16,14 +16,12 @@
 #include "AliMpVIndexed.h"
 #include "AliMpVMotif.h"
 
-#include <TVector2.h>
-
 class AliMpVPadIterator;
 
 class AliMpMotifPosition : public AliMpVIndexed
 {
  public:
-  AliMpMotifPosition(Int_t id, AliMpVMotif* motif, TVector2 position);
+  AliMpMotifPosition(Int_t id, AliMpVMotif* motif, Double_t x, Double_t y);
   AliMpMotifPosition();
   virtual ~AliMpMotifPosition();
 
@@ -33,44 +31,62 @@ class AliMpMotifPosition : public AliMpVIndexed
   // get methods
   Int_t        GetID() const;
   AliMpVMotif* GetMotif() const;
-  Bool_t       HasPad(const AliMpIntPair& indices) const;
+  Bool_t       HasPadByIndices(MpPair_t indices) const;
+  Bool_t       HasPadByManuChannel(Int_t manuChannel) const;
 
   // Geometry
-  TVector2 Position() const;
-  TVector2 Dimensions() const;
+  Double_t  GetPositionX() const;
+  Double_t  GetPositionY() const;
+  Double_t  GetDimensionX() const;
+  Double_t  GetDimensionY() const;
   
   // Sets the ID (which is the MANU ID)
   void SetID(Int_t id); 
   // Sets the position.
-  void SetPosition(const TVector2& pos);
+  void SetPosition(Double_t x, Double_t y);
 
   void Print(Option_t* option="") const;
 
  private:
+  /// Not implemented
   AliMpMotifPosition(const AliMpMotifPosition& right);
+  /// Not implemented
   AliMpMotifPosition&  operator = (const AliMpMotifPosition& right);
 
   // methods
   // data members 
-  Int_t         fID;       ///< identifier=manu id
-  AliMpVMotif*  fMotif;    ///< motif
-  TVector2      fPosition; ///< position
+  Int_t         fID;        ///< identifier=manu id
+  AliMpVMotif*  fMotif;     ///< motif
+  Double_t      fPositionX; ///< x position
+  Double_t      fPositionY; ///< y position
 
-  ClassDef(AliMpMotifPosition,1) // A motif position
+  ClassDef(AliMpMotifPosition,2) // A motif position
 };
 
 // inline functions
 
+/// Return motif position ID = manu id
 inline Int_t  AliMpMotifPosition::GetID() const 
 { return fID; }
 
+/// Return motif 
 inline AliMpVMotif*  AliMpMotifPosition::GetMotif() const
 { return fMotif; }
  
-inline TVector2 AliMpMotifPosition::Position() const
-{ return fPosition; }
+/// Return x position
+inline Double_t AliMpMotifPosition::GetPositionX() const
+{ return fPositionX; }
+
+/// Return y position
+inline Double_t AliMpMotifPosition::GetPositionY() const
+{ return fPositionY; }
+
+/// Return x dimension
+inline Double_t AliMpMotifPosition::GetDimensionX() const
+{ return fMotif->DimensionX(); }
 
-inline TVector2 AliMpMotifPosition::Dimensions() const
-{ return fMotif->Dimensions(); }
+/// Return y dimension
+inline Double_t AliMpMotifPosition::GetDimensionY() const
+{ return fMotif->DimensionY(); }
 
 #endif //ALI_MP_MOTIF_POSITION_H