Double defined data members corrected.

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

diff --git a/MUON/AliMUONSegmentationTriggerX.h b/MUON/AliMUONSegmentationTriggerX.h
index 39118c5ceebfd6ad8fc7d1645a05ddceea15b3e2..ace6b5c21c3d0f6c52ff9859ecb29a308313d46a 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerX.h
+++ b/MUON/AliMUONSegmentationTriggerX.h
@@ -20,20 +20,20 @@ public AliMUONSegmentationTrigger {
   virtual ~AliMUONSegmentationTriggerX(){}
   // Transform from pad to real coordinates
   virtual void    GetPadI(Float_t x, Float_t y, Int_t &ix, Int_t &iy);
-  virtual void    GetPadI(Float_t x, Float_t y, Float_t z, Int_t &ix, Int_t &iy)
+  virtual void    GetPadI(Float_t x, Float_t y, Float_t z, Int_t &ix, Int_t &iy) 
       {GetPadI(x, y, ix, iy);}
   // Transform from real to pad coordinates
   virtual void    GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y);
-  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, Float_t &z) 
       {z=0; GetPadC(ix, iy, x , y);}
-
-  virtual void Draw(const char *opt="") {}
+  // Draw the segmentation zones
+  virtual void Draw(const char *opt = "") const;
 
   // Pad size Dx*Dy 
   virtual void SetPadSize(Float_t dp1, Float_t dp2);
   // Strip size 
-  virtual Float_t Dpx(Int_t imodule);
-  virtual Float_t Dpy(Int_t imodule);
+  virtual Float_t Dpx(Int_t imodule) const;
+  virtual Float_t Dpy(Int_t imodule) const;
   // Set pad position
   virtual void     SetPad(Int_t ix, Int_t iy);
   // Set hit position
@@ -41,7 +41,7 @@ public AliMUONSegmentationTrigger {
   virtual void     SetHit(Float_t xhit, Float_t yhit, Float_t zhit)
       {SetHit(xhit, yhit);}
   // Current integration parameters
-  virtual void IntegrationLimits(Float_t& x1, Float_t& x2, Float_t& x3, Float_t& width);
+  virtual void IntegrationLimits(Float_t& x1, Float_t& x2, Float_t& x3, Float_t& x4);
   // Current Pad during Integration
   // x-coordinate
   virtual Int_t  Ix();
@@ -53,7 +53,7 @@ public AliMUONSegmentationTrigger {
   virtual Int_t Sector(Int_t ix, Int_t iy);
   // Get next neighbours 
   virtual void Neighbours
-    (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[2], Int_t Ylist[2]);
+    (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10]);
   
   //
   // Initialisation
@@ -68,13 +68,6 @@ public AliMUONSegmentationTrigger {
   float fXofxsmax[126][64];    // x-max
   float fYofxsmin[126][64];    // y-min
   float fYofxsmax[126][64];    // y-max
-
-// Current pad during integration (cursor for disintegration)
-  Int_t fIx;  // pad coord.  x 
-  Int_t fIy;  // pad coord.  y 
-  Float_t fX; // real coord. x
-  Float_t fY; // real ccord. y
-
 };
 #endif