Removal of useless dependencies via forward declarations

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

diff --git a/MUON/AliMUONSegmentationV01.h b/MUON/AliMUONSegmentationV01.h
index 486ed81c1c71ba81267523a0abba80ab78dcc677..f9a4a7680bbf79d69ee624a8aa74fdf28ab07637 100644 (file)
--- a/MUON/AliMUONSegmentationV01.h
+++ b/MUON/AliMUONSegmentationV01.h
@@ -10,15 +10,12 @@
 //  Segmentation and Response classes version 01   //
 /////////////////////////////////////////////////////
 class AliMUON;
-class TArrayF;
-class TArrayI;
 class TObjArray;
 
-
-
 #include "AliMUONSegmentationV0.h"
-#include "TArrayI.h"
-#include "TArrayF.h"
+#include "TArrayI.h" // because the object, and not the pointer,
+#include "TArrayF.h" // belongs to the class
+
 
 class AliMUONSegmentationV01 :
 public AliMUONSegmentationV0 {
@@ -37,13 +34,13 @@ public AliMUONSegmentationV0 {
     // Transform from pad (wire) to real coordinates and vice versa
     //
     // 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);}
     //
     // Initialisation
     virtual void Init(Int_t chamber);
@@ -51,11 +48,11 @@ public AliMUONSegmentationV0 {
     // Get member data
     //
     // Pad size in x by Sector
-    virtual Float_t Dpx(Int_t isec);
+    virtual Float_t Dpx(Int_t isec) const;
     // Pad size in y by Sector
-    virtual Float_t Dpy(Int_t isec);
+    virtual Float_t Dpy(Int_t isec) const;
     // Max number of Pads in x
-    virtual Int_t   Npx(){return fNpxS[fNsec-1][1]+1;}
+    virtual Int_t   Npx() const {return fNpxS[fNsec-1][1]+1;}
     //
     virtual void    SetPad(Int_t ix,Int_t iy);
     //
@@ -86,7 +83,7 @@ public AliMUONSegmentationV0 {
     void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
     //
     // Draw segmentation zones
-    virtual void Draw();
+    virtual void Draw(const char *opt="");
     // Function for systematic corrections
     // Set the correction function
     virtual void SetCorrFunc(Int_t dum, TF1* func);
@@ -108,10 +105,10 @@ public AliMUONSegmentationV0 {
     // Chamber region consideres during disintegration
     // (lower left and upper right corner)
     //
-    Float_t fxmin; // lower left  x
-    Float_t fxmax; // lower left  y
-    Float_t fymin; // upper right x
-    Float_t fymax; // upper right y 
+    Float_t fXmin; // lower left  x
+    Float_t fXmax; // lower left  y
+    Float_t fYmin; // upper right x
+    Float_t fYmax; // upper right y 
 
     //
     // Current pad during integration (cursor for disintegration)