changes for TTask implementation, some other small editing

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

diff --git a/MUON/AliMUONSegmentationTriggerY.h b/MUON/AliMUONSegmentationTriggerY.h
index 1fbfae1ae1ffb9d881d3d44ae40468ae03a9def9..6955ae4c8cd396ea84df6d79da5b1acaa1699d24 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerY.h
+++ b/MUON/AliMUONSegmentationTriggerY.h
@@ -19,18 +19,18 @@ public AliMUONSegmentationTrigger {
   AliMUONSegmentationTriggerY(){}
   virtual ~AliMUONSegmentationTriggerY(){}
   // Transform from pad to real coordinates
-  virtual void    GetPadIxy(Float_t x,Float_t y,Int_t &ix,Int_t &iy);
-  virtual void    GetPadIxy(Float_t x, Float_t y, Float_t z, Int_t &ix, Int_t &iy)
-      {GetPadIxy(x, y, ix, iy);}
+  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) 
+      {GetPadI(x, y, ix, iy);}
   // Transform from real to pad coordinates
-  virtual void    GetPadCxy(Int_t ix,Int_t iy,Float_t &x,Float_t &y);
-  virtual void    GetPadCxy(Int_t ix, Int_t iy, Float_t &x, Float_t &y, Float_t &z)
-      {z=0; GetPadCxy(ix, iy, x , y);}
+  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) 
+      {z=0; GetPadC(ix, iy, x , y);}
   // Pad size Dx*Dy 
   virtual void SetPadSize(Float_t dp1, Float_t dp2);
   // Strip size by Module
-  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
@@ -38,7 +38,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();
@@ -52,10 +52,10 @@ public AliMUONSegmentationTrigger {
   
   // 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
-  virtual void Init(AliMUONChamber* chamber);    
+  virtual void Init(Int_t chamber);    
   
   ClassDef(AliMUONSegmentationTriggerY,1) //Segmentation class for trigger X
     protected:    
@@ -66,13 +66,6 @@ public AliMUONSegmentationTrigger {
   float fXofysmax[126][16]; // x-max
   float fYofysmin[126][16]; // y-min
   float fYofysmax[126][16]; // 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