X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONSegmentationV01.h;h=5094bac57b45b7e2f0cd1202086f8d00992f7f21;hb=a8e80ce5218a65c83fc9389828f7ab85caadf10e;hp=87b4dc32e6bc33ec6b4e4a931cc0938c5f654d9a;hpb=e9e4cdf2518cc0cbebcbac77fe4edce14aa9dc32;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONSegmentationV01.h b/MUON/AliMUONSegmentationV01.h
index 87b4dc32e6b..5094bac57b4 100644
--- a/MUON/AliMUONSegmentationV01.h
+++ b/MUON/AliMUONSegmentationV01.h
@@ -5,25 +5,26 @@
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
+// Revision of includes 07/05/2004
 
 /////////////////////////////////////////////////////
 //  Segmentation and Response classes version 01   //
 /////////////////////////////////////////////////////
-class AliMUON;
-class TObjArray;
+
+#include <TArrayF.h>  // needed for CINT
+#include <TArrayI.h>  // needed for CINT
 
 #include "AliMUONSegmentationV0.h"
-#include "TArrayI.h" // because the object, and not the pointer,
-#include "TArrayF.h" // belongs to the class
 
+class TObjArray;
 
-class AliMUONSegmentationV01 :
-public AliMUONSegmentationV0 {
+class AliMUON;
+
+class AliMUONSegmentationV01 : public AliMUONSegmentationV0 
+{
  public:
     AliMUONSegmentationV01();
     AliMUONSegmentationV01(Int_t nsec);
-    AliMUONSegmentationV01(const AliMUONSegmentationV01 & segmentation);
-    
     virtual ~AliMUONSegmentationV01();
     
     //    
@@ -38,12 +39,10 @@ public AliMUONSegmentationV0 {
     //
     // 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) 
-	{GetPadI(x, y, ix, iy);}
+    virtual void    GetPadI(Float_t x, Float_t y , Float_t z, Int_t &ix, Int_t &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) 
-	{z=fZ; GetPadC(ix, iy, x , y);}
+    virtual void    GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y, Float_t &z);
     //
     // Initialisation
     virtual void Init(Int_t chamber);
@@ -62,8 +61,7 @@ public AliMUONSegmentationV0 {
     // 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);}
+    virtual void  FirstPad(Float_t xhit, Float_t yhit, Float_t zhit, Float_t dx, Float_t dy);
     // Stepper
     virtual void  NextPad();
     // Condition
@@ -92,10 +90,13 @@ public AliMUONSegmentationV0 {
     virtual void SetCorrFunc(Int_t dum, TF1* func);
     // Get the correction function
     virtual TF1* CorrFunc(Int_t iZone) const;
+    ClassDef(AliMUONSegmentationV01,1) // Segmentation approximating circular zones with different pad size
+
+  protected:
+    AliMUONSegmentationV01(const AliMUONSegmentationV01 & segmentation);
     // assignment operator
     AliMUONSegmentationV01& operator=(const AliMUONSegmentationV01& rhs);
-    ClassDef(AliMUONSegmentationV01,1) // Segmentation approximating circular zones with different pad size
- protected:
+
     //  Geometry
     //
     Int_t       fNsec;           // Number of sectors