AliMUONSegmentation and AliMUONHitMap have been replaced by AliSegmentation and AliHi...

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

diff --git a/MUON/AliMUONSegmentationV0.h b/MUON/AliMUONSegmentationV0.h
index 7277c85f8df76df200bfabe9e947ca74d34f32d7..0012e6fc6436d8565db63ed9055e8d8633f3831d 100644 (file)
--- a/MUON/AliMUONSegmentationV0.h
+++ b/MUON/AliMUONSegmentationV0.h
@@ -5,15 +5,14 @@
 
 /* $Id$ */
 
-#include "AliMUONSegmentation.h"
+#include "AliSegmentation.h"
 
-class AliMUONChamber;
 //----------------------------------------------
 //
 // Chamber segmentation for homogeneously segmented circular chamber
 //
 class AliMUONSegmentationV0 :
-public AliMUONSegmentation {
+public AliSegmentation {
  public:
     AliMUONSegmentationV0(){}
     AliMUONSegmentationV0(const AliMUONSegmentationV0 & segmentation);
@@ -30,12 +29,16 @@ public AliMUONSegmentation {
     // Anod wire coordinate closest to xhit
     virtual Float_t GetAnod(Float_t xhit);
     // Transform from pad to real coordinates
-    virtual void    GetPadIxy(Float_t x ,Float_t y ,Int_t   &ix,Int_t   &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    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);}
     //
     // Initialisation
-    virtual void Init(AliMUONChamber* chamber);
+    virtual void Init(Int_t chamber);
     //
     // Get member data
     //
@@ -55,10 +58,14 @@ public AliMUONSegmentation {
     virtual void     SetPad(Int_t ix, Int_t iy);
     // Set hit position
     virtual void     SetHit(Float_t xhit, Float_t yhit);
+    virtual void     SetHit(Float_t xhit, Float_t yhit, Float_t zhit)
+       {SetHit(xhit, yhit);}
     //
     // Iterate over pads
     // Initialiser
     virtual void  FirstPad(Float_t xhit, Float_t yhit, Float_t dx, Float_t dy);
+    virtual void  FirstPad(Float_t xhit, Float_t yhit, Float_t zhit, Float_t dx, Float_t dy)
+       {FirstPad(xhit, yhit, dx, dy);}
     // Stepper
     virtual void  NextPad();
     // Condition