X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONSegmentationV02.cxx;h=7e2264ab54f65e12df5547ef5d90d383582ec4cb;hb=58d6a7132f38d6bdd049f99faa501db8e66c66db;hp=0e609b85069e744546ca531a99e4f53200db6a33;hpb=c3eff6ad79d33ab459a3d9c7fb371dd365d33e2f;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONSegmentationV02.cxx b/MUON/AliMUONSegmentationV02.cxx
index 0e609b85069..7e2264ab54f 100644
--- a/MUON/AliMUONSegmentationV02.cxx
+++ b/MUON/AliMUONSegmentationV02.cxx
@@ -13,27 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.4  2000/10/02 16:58:29  egangler
-Cleaning of the code :
--> coding conventions
--> void Streamers
--> some useless includes removed or replaced by "class" statement
-
-Revision 1.3  2000/07/03 11:54:57  morsch
-AliMUONSegmentation and AliMUONHitMap have been replaced by AliSegmentation and AliHitMap in STEER
-The methods GetPadIxy and GetPadXxy of AliMUONSegmentation have changed name to GetPadI and GetPadC.
-
-Revision 1.2  2000/06/15 07:58:48  morsch
-Code from MUON-dev joined
-
-Revision 1.1.2.1  2000/06/09 21:37:56  morsch
-AliMUONSegmentationV02 code  from  AliMUONSegResV02.cxx
-
-*/
-
-
+/* $Id$ */
 
 /////////////////////////////////////////////////////
 //  Segmentation and Response classes version 02   //
@@ -41,11 +21,18 @@ AliMUONSegmentationV02 code  from  AliMUONSegResV02.cxx
 
 
 #include "AliMUONSegmentationV02.h"
-#include "iostream.h"
+#include "Riostream.h"
 
 //___________________________________________
 ClassImp(AliMUONSegmentationV02)
 
+    
+AliMUONSegmentationV02::AliMUONSegmentationV02(Int_t nsec): 
+    AliMUONSegmentationV01(nsec) 
+{
+// Non default constructor
+}
+
 void AliMUONSegmentationV02::SetPadSize(Float_t p1, Float_t p2)
 {
 //  Sets the padsize 
@@ -63,7 +50,7 @@ Int_t AliMUONSegmentationV02::Npy() const
 {return AliMUONSegmentationV01::Npx();}
 
 
-Float_t AliMUONSegmentationV02::Dpx(Int_t isec) const
+Float_t AliMUONSegmentationV02::Dpx(Int_t /*isec*/) const
 // Returns pad-size in x
 {return fDpy;}
 
@@ -71,6 +58,9 @@ Float_t AliMUONSegmentationV02::Dpy(Int_t isec) const
 // Returns pad-size in y
 {return (*fDpxD)[isec];}
 
+void  AliMUONSegmentationV02::Draw(const char * /*opt*/) const 
+{}
+
 Int_t AliMUONSegmentationV02::Sector(Int_t ix, Int_t iy) 
 // Returns sector number for given pad position
 //
@@ -85,11 +75,17 @@ AliMUONSegmentationV01::GetPadI(y, x, iy, ix);
 // printf("\n x,y,ix,iy %f %f %d %d", x,y,ix,iy);
 }
 
+void AliMUONSegmentationV02::GetPad(Float_t x, Float_t y , Float_t /*z*/, Int_t &ix, Int_t &iy) 
+{
+  GetPadI(x, y, ix, iy);
+}
+
 void AliMUONSegmentationV02::
 GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y) 
+{
 //  Returns real coordinates (x,y) for given pad coordinates (ix,iy)
 //
-{
+
     AliMUONSegmentationV01::GetPadC(iy, ix, y, x);
 }
 void AliMUONSegmentationV02::SetPad(Int_t ix,Int_t iy)
@@ -125,7 +121,7 @@ void AliMUONSegmentationV02::NextPad()
 //      get x-pad coordiante for 1 pad in row (fIx)
 	GetPadI(xc,fYmin,ixc,fIy);
     } else {
-	printf("\n Error: Stepping outside integration region\n ");
+	fIx=fIy=-1;
     }
     GetPadC(fIx,fIy,fX,fY);
     fSector=Sector(fIx,fIy);
@@ -137,16 +133,20 @@ void AliMUONSegmentationV02::NextPad()
 }
 
 Int_t AliMUONSegmentationV02::MorePads()
+{
 // Stopping condition for the iterator over pads
 //
 //
 // Are there more pads in the integration region
-{
+
+    return  (fIx != -1  || fIy != -1);
+/*
     if ((fY >= fYmax  && fIx >= fIxmax) || fX==0) {
 	return 0;
     } else {
 	return 1;
     }
+*/
 }
 
 void AliMUONSegmentationV02::