New comparison macros (M.Ivanov)

[u/mrichter/AliRoot.git] / STEER / AliSegmentation.h

diff --git a/STEER/AliSegmentation.h b/STEER/AliSegmentation.h
index 929863f544175c37f74072c672a8477e0a5e860d..3d0eca37595323ac3e504b7beeb0db5107ebb1ea 100644 (file)
--- a/STEER/AliSegmentation.h
+++ b/STEER/AliSegmentation.h
@@ -19,31 +19,31 @@ public TObject {
     // Set Chamber Segmentation Parameters
     //
     virtual ~AliSegmentation() {}
-    // Pad size Dx*Dy 
-    virtual void    SetPadSize(Float_t p1, Float_t p2)                                   = 0;
+    // Pad size Dx*Dy
+    virtual void    SetPadSize(Float_t p1, Float_t p2)                                 = 0;
     // Anod Pitch
-    virtual void    SetDAnod(Float_t D)                                                  = 0;
+    virtual void    SetDAnod(Float_t D)                                                = 0;
     // Transform from pad (wire) to real coordinates and vice versa
     //
     // Anod wire coordinate closest to xhit
-    virtual Float_t GetAnod(Float_t xhit)                                                = 0;
+    virtual Float_t GetAnod(Float_t xhit) const                                        = 0;
     // Transform from pad to real coordinates
-    virtual void    GetPadI(Float_t x, Float_t y, Float_t  z, Int_t   &ix, Int_t  &iy)   = 0;
-    // Transform from real to pad coordinates
-    virtual void    GetPadC(Int_t  ix, Int_t  iy, Float_t &x, Float_t  &y, Float_t &z)   = 0;
+    virtual void    GetPadI(Float_t x, Float_t y, Float_t  z, Int_t   &ix, Int_t  &iy) = 0;
+    // Transform from real to pad coordinatesi
+    virtual void    GetPadC(Int_t  ix, Int_t  iy, Float_t &x, Float_t  &y, Float_t &z) = 0;
     //
     // Initialisation
-    virtual void Init(Int_t chamber)                                                     = 0;
+    virtual void Init(Int_t chamber)                                                   = 0;
     //
     // Get member data
     //
     // Pad size in x
     virtual Float_t Dpx() const                                                         = 0;
-    // Pad size in y 
+    // Pad size in y
     virtual Float_t Dpy() const                                                         = 0;
-    // Pad size in x by Sector 
+    // Pad size in x by Sector
     virtual Float_t Dpx(Int_t) const                                                    = 0;
-    // Pad size in y by Sector 
+    // Pad size in y by Sector
     virtual Float_t Dpy(Int_t) const                                                    = 0;
     // Maximum number of Pads in x
     virtual Int_t    Npx() const                                                        = 0;
@@ -53,7 +53,7 @@ public TObject {
     virtual void     SetPad(Int_t, Int_t)                                               = 0;
     // Set hit position
     virtual void     SetHit(Float_t, Float_t, Float_t )                                 = 0;
-    
+
     //
     // Iterate over pads
     // Initialiser
@@ -65,41 +65,42 @@ public TObject {
     //
     // Distance between 1 pad and a position
     virtual Float_t Distance2AndOffset(Int_t iX, Int_t iY, Float_t X, Float_t Y, Int_t *dummy) = 0;
-    // Number of pads read in parallel and offset to add to x 
+    // Number of pads read in parallel and offset to add to x
     // (specific to LYON, but mandatory for display)
     virtual void GetNParallelAndOffset(Int_t iX, Int_t iY,
                                       Int_t *Nparallel, Int_t *Offset)                 = 0;
-    // Get next neighbours 
+    // Get next neighbours
     virtual void Neighbours
        (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10])            = 0;
     //
     // Current pad cursor during disintegration
     // x-coordinate
-    virtual Int_t  Ix() const                                                           = 0;
+    virtual Int_t  Ix()                                                           = 0;
     // y-coordinate
-    virtual Int_t  Iy() const                                                           = 0;
+    virtual Int_t  Iy()                                                           = 0;
     // current sector
-    virtual Int_t  ISector() const                                                      = 0;
+    virtual Int_t  ISector()                                                      = 0;
     // calculate sector from pad coordinates
-    virtual Int_t  Sector(Int_t ix, Int_t iy) const                                     = 0;
+    virtual Int_t  Sector(Int_t ix, Int_t iy)                                     = 0;
+    virtual Int_t  Sector(Float_t x, Float_t y)                                   = 0;
     //
     // Signal Generation Condition during Stepping
     virtual Int_t SigGenCond(Float_t x, Float_t y, Float_t z)                           = 0;
     // Initialise signal generation at coord (x,y,z)
     virtual void  SigGenInit(Float_t x, Float_t y, Float_t z)                           = 0;
-    // Current integration limits 
+    // Current integration limits
     virtual void  IntegrationLimits
        (Float_t& x1, Float_t& x2, Float_t& y1, Float_t& y2)                            = 0;
     // Test points for auto calibration
-    virtual void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)                       = 0;
+    virtual void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const                 = 0;
     // Draw the segmentation zones
     virtual void Draw(const char *opt = "")                                             = 0;
     // Function for systematic corrections
     // Set the correction function
-    virtual void SetCorrFunc(Int_t, TF1*)                                               = 0;
+    virtual void SetCorrFunc(Int_t,  TF1*)                                               = 0;
     // Get the correction Function
-    virtual TF1* CorrFunc(Int_t)                                                        = 0;
-           
-    ClassDef(AliSegmentation,1) //Segmentation abstract base class 
+    virtual TF1* CorrFunc(Int_t)  const                                                 = 0;
+
+    ClassDef(AliSegmentation,1) //Segmentation abstract base class
 };
 #endif