Adopt to const declaration of some of the methods in AliSegmentation.

diff --git a/MUON/AliMUONSegmentationTrigger.h b/MUON/AliMUONSegmentationTrigger.h
index 790a3bc152e0863e3be7e44784f82850d5acf023..d6056f7fe8fde04ef68a4654adedbf9c686efdaf 100644 (file)
--- a/MUON/AliMUONSegmentationTrigger.h
+++ b/MUON/AliMUONSegmentationTrigger.h
@@ -15,28 +15,28 @@ class AliMUONChamber;
 class AliMUONSegmentationTrigger :
 public AliMUONSegmentationV0 {
  public:
-  AliMUONSegmentationTrigger(){};
-  virtual ~AliMUONSegmentationTrigger(){}  
-  virtual void Init(Int_t chamber);         // Initialization
-  Int_t ModuleNumber(Int_t imodule);  // returns module number of ModuleId
-  // Set pad position -> in SegRes X & Y
-  //       virtual void     SetPad(Int_t, Int_t);
-  // 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);}
-
-  virtual void Draw(const char *opt="") {}
+    AliMUONSegmentationTrigger(){};
+    virtual ~AliMUONSegmentationTrigger(){}  
+    virtual void Init(Int_t chamber);         // Initialization
+    Int_t ModuleNumber(Int_t imodule);  // returns module number of ModuleId
+    // Set pad position -> in SegRes X & Y
+    //       virtual void     SetPad(Int_t, Int_t);
+    // 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);}
+    
+    virtual void Draw(const char *opt="") const {}
   
-  ClassDef(AliMUONSegmentationTrigger,1) //Segmentation class for trigger
-    protected:
-  Float_t StripSizeX(Int_t imodule);
-  Float_t StripSizeY(Int_t imodule);    
+
+ protected:
+    Float_t StripSizeX(Int_t imodule);
+    Float_t StripSizeY(Int_t imodule);    
  protected:
   Float_t fYcmin[126];       // y min position of modules
   Float_t fYcmax[126];       // y max position of modules
   Float_t fZscale;            // scaling factor (Zx/Z1, x=1,2,3,4)
-
+  
 // Current pad during integration (cursor for disintegration)
   Int_t fIx;  // pad coord.  x 
   Int_t fIy;  // pad coord.  y 
@@ -47,6 +47,7 @@ public AliMUONSegmentationV0 {
   Float_t fYhit;  // y-position of hit
   Int_t   fSector;// Segmentation Sector
   
+  ClassDef(AliMUONSegmentationTrigger,1) //Segmentation class for trigger  
 };
 
 #endif

diff --git a/MUON/AliMUONSegmentationTriggerX.cxx b/MUON/AliMUONSegmentationTriggerX.cxx
index 730b37a2325e216ba9a51ee2ce81eee7cf962e26..e0ed5de8a7d352f0888cbce7e92b7a28ee861ae4 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerX.cxx
+++ b/MUON/AliMUONSegmentationTriggerX.cxx
@@ -15,6 +15,12 @@
 
 /*
 $Log$
+Revision 1.6  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.5  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.
@@ -86,7 +92,8 @@ void AliMUONSegmentationTriggerX::Init(Int_t chamber)
 }
 
 //------------------------------------------------------------------
-void AliMUONSegmentationTriggerX::GetPadI(Float_t x,Float_t y,Int_t &ix,Int_t &iy){
+void AliMUONSegmentationTriggerX::GetPadI(Float_t x,Float_t y,Int_t &ix,Int_t &iy) 
+{
 //  Returns pad coordinates (ix,iy) for given real coordinates (x,y)
 //  x,y = real coordinates; ix = module number , iy = strip number
   ix = 0;    
@@ -105,7 +112,8 @@ void AliMUONSegmentationTriggerX::GetPadI(Float_t x,Float_t y,Int_t &ix,Int_t &i
 }
 
 //------------------------------------------------------------------
-void AliMUONSegmentationTriggerX::GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y){
+void AliMUONSegmentationTriggerX::GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y) 
+{
 //  Returns real coordinates (x,y) for given pad coordinates (ix,iy)
 //  ix = module number , iy = strip number;  x,y = center of strip
   x = 0.;    
@@ -131,7 +139,8 @@ void AliMUONSegmentationTriggerX::SetPadSize(Float_t p1, Float_t p2)
 
 //------------------------------------------------------------------
 void AliMUONSegmentationTriggerX::
-Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[2], Int_t Ylist[2]){
+Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[2], Int_t Ylist[2]) 
+{
 // Returns list of next neighbours for given Pad (ix, iy)  
 
   Int_t absiX=TMath::Abs(iX); 
@@ -169,7 +178,7 @@ void AliMUONSegmentationTriggerX::SetPad(Int_t ix, Int_t iy)
 }
 
 //------------------------------------------------------------------   
-Int_t AliMUONSegmentationTriggerX::ISector()
+Int_t AliMUONSegmentationTriggerX::ISector() 
 { return fSector;}
 
 //------------------------------------------------------------------   
@@ -177,11 +186,12 @@ Int_t AliMUONSegmentationTriggerX::Ix()
 { return fIx;}
 
 //------------------------------------------------------------------   
+
 Int_t AliMUONSegmentationTriggerX::Iy()
 { return fIy;}
 
 //------------------------------------------------------------------
-Float_t AliMUONSegmentationTriggerX::Dpx(Int_t isec)
+Float_t AliMUONSegmentationTriggerX::Dpx(Int_t isec) const
 { 
 // returns x size of x strips for sector isec
     
@@ -203,7 +213,7 @@ Float_t AliMUONSegmentationTriggerX::Dpx(Int_t isec)
 }
 
 //------------------------------------------------------------------
-Float_t AliMUONSegmentationTriggerX::Dpy(Int_t isec)
+Float_t AliMUONSegmentationTriggerX::Dpy(Int_t isec) const
 { 
 // returns y size of x strips for sector isec
 
@@ -232,7 +242,7 @@ AliMUONSegmentationTrigger::SetHit(xhit,yhit);
 }
 
 //------------------------------------------------------------------   
-Int_t AliMUONSegmentationTriggerX::Sector(Int_t ix, Int_t iy)
+Int_t AliMUONSegmentationTriggerX::Sector(Int_t ix, Int_t iy) 
 {
 // Returns sector number for given module
 // 

diff --git a/MUON/AliMUONSegmentationTriggerX.h b/MUON/AliMUONSegmentationTriggerX.h
index 39118c5ceebfd6ad8fc7d1645a05ddceea15b3e2..00c01b8ee6ec3ea2ce35186d16a22acca352af75 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerX.h
+++ b/MUON/AliMUONSegmentationTriggerX.h
@@ -20,20 +20,20 @@ public AliMUONSegmentationTrigger {
   virtual ~AliMUONSegmentationTriggerX(){}
   // 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)
+  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    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)
+  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);}
 
-  virtual void Draw(const char *opt="") {}
+  virtual void Draw(const char *opt="") const {}
 
   // Pad size Dx*Dy 
   virtual void SetPadSize(Float_t dp1, Float_t dp2);
   // Strip size 
-  virtual Float_t Dpx(Int_t imodule);
-  virtual Float_t Dpy(Int_t imodule);
+  virtual Float_t Dpx(Int_t imodule) const;
+  virtual Float_t Dpy(Int_t imodule) const;
   // Set pad position
   virtual void     SetPad(Int_t ix, Int_t iy);
   // Set hit position

diff --git a/MUON/AliMUONSegmentationTriggerY.cxx b/MUON/AliMUONSegmentationTriggerY.cxx
index cd6eff4cad81a8d8aa0a9180027b90b1128c4b75..b8b820fbff4df2aa5502c4025a26d3827a45f8ed 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerY.cxx
+++ b/MUON/AliMUONSegmentationTriggerY.cxx
@@ -15,6 +15,12 @@
 
 /*
 $Log$
+Revision 1.6  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.5  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.
@@ -92,7 +98,8 @@ void AliMUONSegmentationTriggerY::Init(Int_t chamber)
 }
 
 //------------------------------------------------------------------
-void AliMUONSegmentationTriggerY::GetPadI(Float_t x,Float_t y,Int_t &ix,Int_t &iy){
+void AliMUONSegmentationTriggerY::GetPadI(Float_t x,Float_t y,Int_t &ix,Int_t &iy) 
+{
 //  Returns pad coordinates (ix,iy) for given real coordinates (x,y)
 //  x,y = real coordinates; ix = module number , iy = strip number
 
@@ -112,7 +119,8 @@ void AliMUONSegmentationTriggerY::GetPadI(Float_t x,Float_t y,Int_t &ix,Int_t &i
 }
 
 //------------------------------------------------------------------
-void AliMUONSegmentationTriggerY::GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y){
+void AliMUONSegmentationTriggerY::GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y)
+{
 //  Returns real coordinates (x,y) for given pad coordinates (ix,iy)
 //  ix = module number , iy = strip number;  x,y = center of strip
   x = 0.;    
@@ -137,7 +145,8 @@ void AliMUONSegmentationTriggerY::SetPadSize(Float_t p1, Float_t p2)
 
 //------------------------------------------------------------------
 void AliMUONSegmentationTriggerY::
-Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[2], Int_t Ylist[2]){
+Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[2], Int_t Ylist[2])
+{
 // Returns list of next neighbours for given Pad (ix, iy)  
   Int_t absiX=TMath::Abs(iX); 
   *Nlist = 0;
@@ -186,19 +195,21 @@ void AliMUONSegmentationTriggerY::SetPad(Int_t ix, Int_t iy)
 }
 
 //------------------------------------------------------------------   
-Int_t AliMUONSegmentationTriggerY::ISector()
+Int_t AliMUONSegmentationTriggerY::ISector() 
 { return fSector;}
 
 //------------------------------------------------------------------   
+
 Int_t AliMUONSegmentationTriggerY::Ix()
 { return fIx;}
 
 //------------------------------------------------------------------   
+
 Int_t AliMUONSegmentationTriggerY::Iy()
 { return fIy;}
 
 //------------------------------------------------------------------
-Float_t AliMUONSegmentationTriggerY::Dpx(Int_t isec)
+Float_t AliMUONSegmentationTriggerY::Dpx(Int_t isec) const
 { 
 // returns x size of y strips for sector isec
   if (isec==1) {
@@ -215,7 +226,7 @@ Float_t AliMUONSegmentationTriggerY::Dpx(Int_t isec)
 }
 
 //------------------------------------------------------------------
-Float_t AliMUONSegmentationTriggerY::Dpy(Int_t isec)
+Float_t AliMUONSegmentationTriggerY::Dpy(Int_t isec) const
 { 
 // returns y size of y strips for sector isec
   if (isec==1) {

diff --git a/MUON/AliMUONSegmentationTriggerY.h b/MUON/AliMUONSegmentationTriggerY.h
index 020fc95957a4757d532113c296e9aad1216851fb..b44e19ce9c16eaf08696f20688202739ae2cb2db 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerY.h
+++ b/MUON/AliMUONSegmentationTriggerY.h
@@ -20,17 +20,17 @@ public AliMUONSegmentationTrigger {
   virtual ~AliMUONSegmentationTriggerY(){}
   // 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)
+  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    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)
+  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);}
   // Pad size Dx*Dy 
   virtual void SetPadSize(Float_t dp1, Float_t dp2);
   // Strip size by Module
-  virtual Float_t Dpx(Int_t imodule);
-  virtual Float_t Dpy(Int_t imodule);
+  virtual Float_t Dpx(Int_t imodule) const;
+  virtual Float_t Dpy(Int_t imodule) const;
   // Set pad position
   virtual void     SetPad(Int_t ix, Int_t iy);
   // Set hit position

diff --git a/MUON/AliMUONSegmentationV0.cxx b/MUON/AliMUONSegmentationV0.cxx
index 27fbea3c4abc4ef4152ac26af4309a35a4530fd6..bb8544f856b08a68c7285486a0f413c0d0c08c50 100644 (file)
--- a/MUON/AliMUONSegmentationV0.cxx
+++ b/MUON/AliMUONSegmentationV0.cxx
@@ -14,6 +14,12 @@
  **************************************************************************/
 /*
 $Log$
+Revision 1.6  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.5  2000/07/13 16:19:44  fca
 Mainly coding conventions + some small bug fixes
 
@@ -66,11 +72,10 @@ ClassImp(AliMUONSegmentationV0)
     fRmin=iChamber->RInner();
     fRmax=iChamber->ROuter();    
     fCorr=0;
-    
 }
 
 
-Float_t AliMUONSegmentationV0::GetAnod(Float_t xhit)
+Float_t AliMUONSegmentationV0::GetAnod(Float_t xhit) const
 {
 // Returns for a hit position xhit the position of the nearest anode wire    
     Float_t wire= (xhit>0)? Int_t(xhit/fWireD)+0.5:Int_t(xhit/fWireD)-0.5;
@@ -84,8 +89,9 @@ void AliMUONSegmentationV0::SetPadSize(Float_t p1, Float_t p2)
     fDpx=p1;
     fDpy=p2;
 }
+
 void AliMUONSegmentationV0::
-    GetPadI(Float_t x, Float_t y, Int_t &ix, Int_t &iy)
+    GetPadI(Float_t x, Float_t y, Int_t &ix, Int_t &iy) 
 {
 //  Returns pad coordinates (ix,iy) for given real coordinates (x,y)
 //
@@ -96,8 +102,9 @@ void AliMUONSegmentationV0::
     if (ix >  fNpx) ix= fNpx;
     if (ix < -fNpx) ix=-fNpx;
 }
+
 void AliMUONSegmentationV0::
-GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y)
+GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y) 
 {
 //  Returns real coordinates (x,y) for given pad coordinates (ix,iy)
 //
@@ -202,8 +209,8 @@ void AliMUONSegmentationV0::SigGenInit(Float_t x,Float_t y,Float_t z)
     GetPadI(x,y,fIxt,fIyt);
     fIwt= (x>0) ? Int_t(x/fWireD)+1 : Int_t(x/fWireD)-1 ;
 }
-
-Int_t AliMUONSegmentationV0::SigGenCond(Float_t x,Float_t y,Float_t z)
+ 
+Int_t AliMUONSegmentationV0::SigGenCond(Float_t x,Float_t y,Float_t z) 
 {
 //  Signal generation condition during stepping 
 //  0: don't generate signal
@@ -239,7 +246,7 @@ IntegrationLimits(Float_t& x1,Float_t& x2,Float_t& y1, Float_t& y2)
 }
 
 void AliMUONSegmentationV0::
-Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10])
+Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10]) 
 {
 // Returns list of next neighbours for given Pad (iX, iY)
 //
@@ -267,7 +274,7 @@ Float_t AliMUONSegmentationV0::Distance2AndOffset(Int_t iX, Int_t iY, Float_t X,
 }
 
 
-void  AliMUONSegmentationV0::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
+void  AliMUONSegmentationV0::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const
 {
 // Returns test point on the pad plane.
 // Used during determination of the segmoid correction of the COG-method
@@ -276,7 +283,7 @@ void  AliMUONSegmentationV0::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
     y[0]=x[0];
 }
 
-void AliMUONSegmentationV0::Draw(const char *)
+void AliMUONSegmentationV0::Draw(const char *) const
 {
 // Draws the segmentation zones
 //

diff --git a/MUON/AliMUONSegmentationV0.h b/MUON/AliMUONSegmentationV0.h
index 17c4ee167b5f2caca4c793e7c71f7d104e4e01bd..8937da2b3e7fdd9bbb34a8b692e3e3c90178253f 100644 (file)
--- a/MUON/AliMUONSegmentationV0.h
+++ b/MUON/AliMUONSegmentationV0.h
@@ -29,14 +29,14 @@ public AliSegmentation {
     // Transform from pad (wire) to real coordinates and vice versa
     //
     // Anod wire coordinate closest to xhit
-    virtual Float_t GetAnod(Float_t xhit);
+    virtual Float_t GetAnod(Float_t xhit) const;
     // 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)
+    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    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)
+    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
@@ -82,34 +82,34 @@ dummy);
         Int_t *Nparallel, Int_t *Offset) {*Nparallel=1;*Offset=0;}
     // Get next neighbours 
     virtual void Neighbours
-       (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10]);
+       (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10]) ;
     //
     // Current Pad during Integration
     // x-coordinaten
-    virtual Int_t  Ix() const {return fIx;}
+    virtual Int_t  Ix() {return fIx;}
     // y-coordinate
-    virtual Int_t  Iy() const {return fIy;}
+    virtual Int_t  Iy() {return fIy;}
     // current sector
     virtual Int_t  ISector() const {return 1;}
     // calculate sector from pad coordinates
-    virtual Int_t  Sector(Int_t ix, Int_t iy) const {return 1;}
+    virtual Int_t  Sector(Int_t ix, Int_t iy)  {return 1;}
     //
     // Signal Generation Condition during Stepping
-    virtual Int_t SigGenCond(Float_t x, Float_t y, Float_t z);
+    virtual Int_t SigGenCond(Float_t x, Float_t y, Float_t z) ;
     // Initialise signal gneration at coord (x,y,z)
     virtual void  SigGenInit(Float_t x, Float_t y, Float_t z);
     // Current integration limits
     virtual void IntegrationLimits
        (Float_t& x1, Float_t& x2, Float_t& y1, Float_t& y2);
     // Test points for auto calibration
-    virtual void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
+    virtual void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const;
     // Draw segmentation zones
-    virtual void Draw(const char *opt="");
+    virtual void Draw(const char *opt="") const;
     // Function for systematic corrections
     // Set the correction function
     virtual void SetCorrFunc(Int_t dum, TF1* func) {fCorr=func;}
     // Get the correction Function
-    virtual TF1* CorrFunc(Int_t) {return fCorr;}
+    virtual TF1* CorrFunc(Int_t) const {return fCorr;}
     // assignment operator
     AliMUONSegmentationV0& operator=(const AliMUONSegmentationV0& rhs);
     

diff --git a/MUON/AliMUONSegmentationV01.cxx b/MUON/AliMUONSegmentationV01.cxx
index de2f89c193292929b10a15a73ba363eaf78a4fa6..91055bfdc4a15b13f8893acdc10ddf9ca9d8440f 100644 (file)
--- a/MUON/AliMUONSegmentationV01.cxx
+++ b/MUON/AliMUONSegmentationV01.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.7  2000/10/02 21:28:09  fca
+Removal of useless dependecies via forward declarations
+
 Revision 1.6  2000/10/02 16:58:29  egangler
 Cleaning of the code :
 -> coding conventions
@@ -68,12 +71,12 @@ AliMUONSegmentationV01::AliMUONSegmentationV01()
 {
 // Default constructor
     fNsec=4;
-    fRSec.Set(fNsec);    
-    fNDiv.Set(fNsec);      
-    fDpxD.Set(fNsec);      
-    fRSec[0]=fRSec[1]=fRSec[2]=fRSec[3]=0;     
-    fNDiv[0]=fNDiv[1]=fNDiv[2]=fNDiv[3]=0;     
-    fDpxD[0]=fDpxD[1]=fDpxD[2]=fDpxD[3]=0;     
+    fRSec = new TArrayF(fNsec);
+    fNDiv = new TArrayI(fNsec);      
+    fDpxD = new TArrayF(fNsec);      
+    (*fRSec)[0]=(*fRSec)[1]=(*fRSec)[2]=(*fRSec)[3]=0;     
+    (*fNDiv)[0]=(*fNDiv)[1]=(*fNDiv)[2]=(*fNDiv)[3]=0;     
+    (*fDpxD)[0]=(*fDpxD)[1]=(*fDpxD)[2]=(*fDpxD)[3]=0;     
     fCorr = new TObjArray(3);
     (*fCorr)[0]=0;
     (*fCorr)[1]=0;
@@ -84,7 +87,8 @@ Float_t AliMUONSegmentationV01::Dpx(Int_t isec) const
 {
 //
 // Returns x-pad size for given sector isec
-   return fDpxD.At(isec);
+   Float_t dpx = (*fDpxD)[isec];
+   return dpx;
 }
 
 Float_t AliMUONSegmentationV01::Dpy(Int_t isec) const
@@ -99,8 +103,8 @@ void   AliMUONSegmentationV01::SetSegRadii(Float_t  r[4])
 //
 // Set the radii of the segmentation zones 
     for (Int_t i=0; i<4; i++) {
-       fRSec[i]=r[i];
-       printf("\n R %d %f \n",i,fRSec[i]);
+       (*fRSec)[i]=r[i];
+       printf("\n R %d %f \n",i,(*fRSec)[i]);
        
     }
 }
@@ -114,8 +118,8 @@ void AliMUONSegmentationV01::SetPadDivision(Int_t ndiv[4])
 // fDpx
 // 
     for (Int_t i=0; i<4; i++) {
-       fNDiv[i]=ndiv[i];
-       printf("\n Ndiv %d %d \n",i,fNDiv[i]);
+       (*fNDiv)[i]=ndiv[i];
+       printf("\n Ndiv %d %d \n",i,(*fNDiv)[i]);
     }
     ndiv[0]=ndiv[1];
 }
@@ -131,13 +135,13 @@ void AliMUONSegmentationV01::Init(Int_t chamber)
 //
     Int_t isec;
     printf("\n Initialise segmentation v01 -- test !!!!!!!!!!!!!! \n");
-    fNpy=Int_t(fRSec[fNsec-1]/fDpy)+1;
+    fNpy=Int_t((*fRSec)[fNsec-1]/fDpy)+1;
 
-    fDpxD[fNsec-1]=fDpx;
+    (*fDpxD)[fNsec-1]=fDpx;
     if (fNsec > 1) {
        for (Int_t i=fNsec-2; i>=0; i--){
-           fDpxD[i]=fDpxD[fNsec-1]/fNDiv[i];
-           printf("\n test ---dx %d %f \n",i,fDpxD[i]);
+           (*fDpxD)[i]=(*fDpxD)[fNsec-1]/(*fNDiv)[i];
+           printf("\n test ---dx %d %f \n",i,(*fDpxD)[i]);
        }
     }
 //
@@ -153,29 +157,29 @@ void AliMUONSegmentationV01::Init(Int_t chamber)
        for (Int_t iy=1; iy<=fNpy; iy++) {
 //
            Float_t x=iy*fDpy-fDpy/2;
-           if (x > fRSec[isec]) {
+           if (x > (*fRSec)[isec]) {
                fNpxS[isec][iy]=0;
                fCx[isec][iy]=0;
            } else {
-               ry=TMath::Sqrt(fRSec[isec]*fRSec[isec]-x*x);
+               ry=TMath::Sqrt((*fRSec)[isec]*(*fRSec)[isec]-x*x);
                if (isec > 1) {
-                   dnx= Int_t((ry-fCx[isec-1][iy])/fDpxD[isec]);
+                   dnx= Int_t((ry-fCx[isec-1][iy])/(*fDpxD)[isec]);
                    if (isec < fNsec-1) {
                        if (TMath::Odd((Long_t)dnx)) dnx++;             
                    }
                     fNpxS[isec][iy]=fNpxS[isec-1][iy]+dnx;
-                   fCx[isec][iy]=fCx[isec-1][iy]+dnx*fDpxD[isec];
+                   fCx[isec][iy]=fCx[isec-1][iy]+dnx*(*fDpxD)[isec];
                } else if (isec == 1) {
-                   dnx= Int_t((ry-fCx[isec-1][iy])/fDpxD[isec]);
+                   dnx= Int_t((ry-fCx[isec-1][iy])/(*fDpxD)[isec]);
                    fNpxS[isec][iy]=fNpxS[isec-1][iy]+dnx;
                     add=4 - (fNpxS[isec][iy])%4;
                     if (add < 4) fNpxS[isec][iy]+=add; 
                    dnx=fNpxS[isec][iy]-fNpxS[isec-1][iy];
-                   fCx[isec][iy]=fCx[isec-1][iy]+dnx*fDpxD[isec];
+                   fCx[isec][iy]=fCx[isec-1][iy]+dnx*(*fDpxD)[isec];
                } else {
-                   dnx=Int_t(ry/fDpxD[isec]);
+                   dnx=Int_t(ry/(*fDpxD)[isec]);
                     fNpxS[isec][iy]=dnx;
-                   fCx[isec][iy]=dnx*fDpxD[isec];
+                   fCx[isec][iy]=dnx*(*fDpxD)[isec];
                }
            }
        } // y-pad loop
@@ -218,10 +222,10 @@ GetPadI(Float_t x, Float_t y, Int_t &ix, Int_t &iy)
        }
     }
     if (isec>0) {
-       ix= Int_t((absx-fCx[isec-1][absiy])/fDpxD[isec])
+       ix= Int_t((absx-fCx[isec-1][absiy])/(*fDpxD)[isec])
            +fNpxS[isec-1][absiy]+1;
     } else if (isec == 0) {
-       ix= Int_t(absx/fDpxD[isec])+1;
+       ix= Int_t(absx/(*fDpxD)[isec])+1;
     } else {
        ix=fNpxS[fNsec-1][absiy]+1;     
     }
@@ -241,8 +245,8 @@ GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y)
     Int_t absix=TMath::Abs(ix);
     Int_t absiy=TMath::Abs(iy);
     if (isec) {
-       x=fCx[isec-1][absiy]+(absix-fNpxS[isec-1][absiy])*fDpxD[isec];
-       x=(ix>0) ?  x-fDpxD[isec]/2 : -x+fDpxD[isec]/2;
+       x=fCx[isec-1][absiy]+(absix-fNpxS[isec-1][absiy])*(*fDpxD)[isec];
+       x=(ix>0) ?  x-(*fDpxD)[isec]/2 : -x+(*fDpxD)[isec]/2;
     } else {
        x=y=0;
     }
@@ -278,6 +282,7 @@ FirstPad(Float_t xhit, Float_t yhit, Float_t dx, Float_t dy)
     Float_t y02=yhit + dy;
     //
     // find the pads over which the charge distributes
+
     GetPadI(x01,y01,fIxmin,fIymin);
     GetPadI(x02,y02,fIxmax,fIymax);
     fXmin=x01;
@@ -306,6 +311,7 @@ void AliMUONSegmentationV01::NextPad()
     Int_t   iyc;
     
 //  step from left to right    
+
     if (fX < fXmax && fX != 0) {
        if (fIx==-1) fIx++;
        fIx++;
@@ -452,21 +458,21 @@ Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10])
     *Nlist=i;
 }
 
-void AliMUONSegmentationV01::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
+void AliMUONSegmentationV01::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const
 {
 // Returns test point on the pad plane.
 // Used during determination of the segmoid correction of the COG-method
 
     n=3;
-    x[0]=(fRSec[0]+fRSec[1])/2/TMath::Sqrt(2.);
+    x[0]=((*fRSec)[0]+(*fRSec)[1])/2/TMath::Sqrt(2.);
     y[0]=x[0];
-    x[1]=(fRSec[1]+fRSec[2])/2/TMath::Sqrt(2.);
+    x[1]=((*fRSec)[1]+(*fRSec)[2])/2/TMath::Sqrt(2.);
     y[1]=x[1];
-    x[2]=(fRSec[2]+fRSec[3])/2/TMath::Sqrt(2.);
+    x[2]=((*fRSec)[2]+(*fRSec)[3])/2/TMath::Sqrt(2.);
     y[2]=x[2];
 }
 
-void AliMUONSegmentationV01::Draw(const char *)
+void AliMUONSegmentationV01::Draw(const char *) const
 {
 // Draws the segmentation zones
 //
@@ -513,7 +519,7 @@ void AliMUONSegmentationV01::SetCorrFunc(Int_t isec, TF1* func)
     (*fCorr)[isec]=func;
 }
 
-TF1* AliMUONSegmentationV01::CorrFunc(Int_t isec)
+TF1* AliMUONSegmentationV01::CorrFunc(Int_t isec) const
 { 
     return (TF1*) (*fCorr)[isec];
 }

diff --git a/MUON/AliMUONSegmentationV01.h b/MUON/AliMUONSegmentationV01.h
index f9a4a7680bbf79d69ee624a8aa74fdf28ab07637..19ce5ad0efc551f02b98903589a4fb846d0c6ac7 100644 (file)
--- a/MUON/AliMUONSegmentationV01.h
+++ b/MUON/AliMUONSegmentationV01.h
@@ -35,11 +35,11 @@ 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)
+    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    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)
+    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
@@ -80,25 +80,25 @@ public AliMUONSegmentationV0 {
      virtual void IntegrationLimits
        (Float_t& x1, Float_t& x2, Float_t& y1, Float_t& y2);
     // Test points for auto calibration
-    void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
+    void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const;
     //
     // Draw segmentation zones
-    virtual void Draw(const char *opt="");
+    virtual void Draw(const char *opt="") const;
     // Function for systematic corrections
     // Set the correction function
     virtual void SetCorrFunc(Int_t dum, TF1* func);
     // Get the correction function
-    virtual TF1* CorrFunc(Int_t iZone);
+    virtual TF1* CorrFunc(Int_t iZone) const;
     // 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
-    TArrayF    fRSec;           // Sector outer radia
-    TArrayI    fNDiv;           // Pad size division
-    TArrayF    fDpxD;           // y pad width per sector
+    Int_t       fNsec;           // Number of sectors
+    TArrayF*    fRSec;           // Sector outer radia
+    TArrayI*    fNDiv;           // Pad size division
+    TArrayF*    fDpxD;           // y pad width per sector
     // Segmentation map
     Int_t      fNpxS[10][1000]; // Number of pads per sector in x
     Float_t    fCx[10][1000];   // pad-sector contour x vs y  

diff --git a/MUON/AliMUONSegmentationV02.cxx b/MUON/AliMUONSegmentationV02.cxx
index b2df158b2cc82d9c105623e668e45409c1cc502a..0e609b85069e744546ca531a99e4f53200db6a33 100644 (file)
--- a/MUON/AliMUONSegmentationV02.cxx
+++ b/MUON/AliMUONSegmentationV02.cxx
@@ -15,6 +15,12 @@
 
 /*
 $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.
@@ -48,39 +54,39 @@ void AliMUONSegmentationV02::SetPadSize(Float_t p1, Float_t p2)
     fDpx=p2;
 }
 
-Int_t AliMUONSegmentationV02::Npx()
+Int_t AliMUONSegmentationV02::Npx() const
 // Returns maximum number if pads in x
 {return AliMUONSegmentationV01::Npy();}
 
-Int_t AliMUONSegmentationV02::Npy()
+Int_t AliMUONSegmentationV02::Npy() const
 // Returns maximum number if pads in y
 {return AliMUONSegmentationV01::Npx();}
 
 
-Float_t AliMUONSegmentationV02::Dpx(Int_t isec)
+Float_t AliMUONSegmentationV02::Dpx(Int_t isec) const
 // Returns pad-size in x
 {return fDpy;}
 
-Float_t AliMUONSegmentationV02::Dpy(Int_t isec)
+Float_t AliMUONSegmentationV02::Dpy(Int_t isec) const
 // Returns pad-size in y
-{return fDpxD[isec];}
-Int_t AliMUONSegmentationV02::Sector(Int_t ix, Int_t iy)
+{return (*fDpxD)[isec];}
+
+Int_t AliMUONSegmentationV02::Sector(Int_t ix, Int_t iy) 
 // Returns sector number for given pad position
 //
 {return AliMUONSegmentationV01::Sector(iy, ix);}
 
 void AliMUONSegmentationV02::
-
-GetPadI(Float_t x, Float_t y, Int_t &ix, Int_t &iy)
+GetPadI(Float_t x, Float_t y, Int_t &ix, Int_t &iy) 
 //  Returns pad coordinates (ix,iy) for given real coordinates (x,y)
 //
 {
-AliMUONSegmentationV01::GetPadI(y, x, iy, ix);
+AliMUONSegmentationV01::GetPadI(y, x, iy, ix); 
 // printf("\n x,y,ix,iy %f %f %d %d", x,y,ix,iy);
 }
 
 void AliMUONSegmentationV02::
-GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y)
+GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y) 
 //  Returns real coordinates (x,y) for given pad coordinates (ix,iy)
 //
 {
@@ -144,7 +150,7 @@ Int_t AliMUONSegmentationV02::MorePads()
 }
 
 void AliMUONSegmentationV02::
-Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10])
+Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10]) 
 {
 // Returns list of next neighbours for given Pad (iX, iY)
 //

diff --git a/MUON/AliMUONSegmentationV02.h b/MUON/AliMUONSegmentationV02.h
index 3accc66c3b784e6075a53c272deb13252c676a51..d022239b16cd561e757f086d6f27710b0e679b1f 100644 (file)
--- a/MUON/AliMUONSegmentationV02.h
+++ b/MUON/AliMUONSegmentationV02.h
@@ -23,29 +23,29 @@ public AliMUONSegmentationV01 {
     //
     // Get member data
     // Pad size in x
-    virtual Float_t Dpx() {return fDpy;}
+    virtual Float_t Dpx() const {return fDpy;}
     // Pad size in y
-    virtual Float_t Dpy() {return fDpx;}
+    virtual Float_t Dpy() const {return fDpx;}
     // 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();
+    virtual Int_t   Npx()  const;
      // max number of Pads in y
-    virtual Int_t   Npy();
+    virtual Int_t   Npy()  const;
     // calculate sector from pad coordinates
     virtual Int_t   Sector(Int_t ix, Int_t iy);
-    virtual void Draw(const char *opt="") {}
+    virtual void Draw(const char *opt="") const {}
     //
     // Transform from pad (wire) to real coordinates and vice versa
     // Transform from pad to real 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)
+    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);}
     // Transform from pad to real coordinates
     virtual void    GetPadI(Float_t x ,Float_t y , Int_t &ix, Int_t &iy);
-    virtual void    GetPad(Float_t x, Float_t y , Float_t z, Int_t &ix, Int_t &iy)
+    virtual void    GetPad(Float_t x, Float_t y , Float_t z, Int_t &ix, Int_t &iy) 
        {GetPadI(x, y, ix, iy);}
     // Set pad position
     virtual void    SetPad(Int_t ix,Int_t iy);

diff --git a/MUON/AliMUONSegmentationV04.cxx b/MUON/AliMUONSegmentationV04.cxx
index e05ae7a72432c1f748f7573da1944dde4564a958..048357bc892a76357811b97a2dde8d37062ad615 100644 (file)
--- a/MUON/AliMUONSegmentationV04.cxx
+++ b/MUON/AliMUONSegmentationV04.cxx
@@ -15,6 +15,12 @@
 
 /*
 $Log$
+Revision 1.3  2000/06/29 12:34:09  morsch
+AliMUONSegmentation class has been made independent of AliMUONChamber. This makes
+it usable with any other geometry class. The link to the object to which it belongs is
+established via an index. This assumes that there exists a global geometry manager
+from which the pointer to the parent object can be obtained (in our case gAlice).
+
 Revision 1.2  2000/06/15 07:58:48  morsch
 Code from MUON-dev joined
 
@@ -86,8 +92,8 @@ void AliMUONSegmentationV04::Init(Int_t chamber)
     fDpxD[fNsec-1]=fDpx;
     if (fNsec > 1) {
        for (Int_t i=fNsec-2; i>=0; i--){
-           fDpxD[i]=fDpxD[fNsec-1]/fNDiv[i];
-           printf("\n test ---dx %d %f \n",i,fDpxD[i]);
+           (*fDpxD)[i]=(*fDpxD)[fNsec-1]/(*fNDiv)[i];
+           printf("\n test ---dx %d %f \n",i,(*fDpxD)[i]);
        }
     }
 //
@@ -104,11 +110,11 @@ void AliMUONSegmentationV04::Init(Int_t chamber)
 //  Loop over sectors (isec=0 is the dead space surounding the beam pipe)
            for (Int_t isec=0; isec<4; isec++) {
                if (isec==0) {
-                   fNpxS[0][iy]=kpcb[irow][0]*Int_t(kDxPCB/fDpxD[0]);
+                   fNpxS[0][iy]=kpcb[irow][0]*Int_t(kDxPCB/(*fDpxD)[0]);
                    fCx[0][iy]=kpcb[irow][0]*kDxPCB;
                } else {
                    fNpxS[isec][iy]=fNpxS[isec-1][iy]
-                       +kpcb[irow][isec]*Int_t(kDxPCB/fDpxD[isec]);
+                       +kpcb[irow][isec]*Int_t(kDxPCB/(*fDpxD)[isec]);
 
                    fCx[isec][iy]=fCx[isec-1][iy]
                    +kpcb[irow][isec]*kDxPCB;
@@ -118,7 +124,7 @@ void AliMUONSegmentationV04::Init(Int_t chamber)
     } // PCB rows
 }
 
-void AliMUONSegmentationV04::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
+void AliMUONSegmentationV04::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const
 {
 // Returns test point on the pad plane.
 // Used during determination of the segmoid correction of the COG-method

diff --git a/MUON/AliMUONSegmentationV04.h b/MUON/AliMUONSegmentationV04.h
index bd026a8d1a967356b17c78a192c53188b9aaa5b3..45f1ebe0c0af5da8507665c9bd4a4fae3c055655 100644 (file)
--- a/MUON/AliMUONSegmentationV04.h
+++ b/MUON/AliMUONSegmentationV04.h
@@ -19,7 +19,7 @@ public AliMUONSegmentationV01 {
     // Initialisation
     virtual void Init(Int_t chamber);
     // Test points for auto calibration
-    void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
+    void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const;
     ClassDef(AliMUONSegmentationV04,1) // Segmentation zones are rectangular modules
 };
        
@@ -31,3 +31,4 @@ public AliMUONSegmentationV01 {
 
 
 
+

diff --git a/MUON/AliMUONSegmentationV05.cxx b/MUON/AliMUONSegmentationV05.cxx
index 387d078296c2262320a410514052543d97c13a4a..3ddcc56f2f190df8492f93dbffbb5d601b4bb121 100644 (file)
--- a/MUON/AliMUONSegmentationV05.cxx
+++ b/MUON/AliMUONSegmentationV05.cxx
@@ -15,6 +15,12 @@
 
 /*
 $Log$
+Revision 1.3  2000/06/29 12:34:09  morsch
+AliMUONSegmentation class has been made independent of AliMUONChamber. This makes
+it usable with any other geometry class. The link to the object to which it belongs is
+established via an index. This assumes that there exists a global geometry manager
+from which the pointer to the parent object can be obtained (in our case gAlice).
+
 Revision 1.2  2000/06/15 07:58:48  morsch
 Code from MUON-dev joined
 
@@ -82,11 +88,11 @@ void AliMUONSegmentationV05::Init(Int_t chamber)
     fNpy=7*nPyPCB;
 //
 //  Calculate padsize along x
-    fDpxD[fNsec-1]=fDpx;
+    (*fDpxD)[fNsec-1]=fDpx;
     if (fNsec > 1) {
        for (Int_t i=fNsec-2; i>=0; i--){
-           fDpxD[i]=fDpxD[fNsec-1]/fNDiv[i];
-           printf("\n test ---dx %d %f \n",i,fDpxD[i]);
+           (*fDpxD)[i]=(*fDpxD)[fNsec-1]/(*fNDiv)[i];
+           printf("\n test ---dx %d %f \n",i,(*fDpxD)[i]);
        }
     }
 //
@@ -103,11 +109,11 @@ void AliMUONSegmentationV05::Init(Int_t chamber)
 //  Loop over sectors (isec=0 is the dead space surounding the beam pipe)
            for (Int_t isec=0; isec<4; isec++) {
                if (isec==0) {
-                   fNpxS[0][iy]=kpcb[irow][0]*Int_t(kDxPCB/fDpxD[0]);
+                   fNpxS[0][iy]=kpcb[irow][0]*Int_t(kDxPCB/(*fDpxD)[0]);
                    fCx[0][iy]=kpcb[irow][0]*kDxPCB;
                } else {
                    fNpxS[isec][iy]=fNpxS[isec-1][iy]
-                       +kpcb[irow][isec]*Int_t(kDxPCB/fDpxD[isec]);
+                       +kpcb[irow][isec]*Int_t(kDxPCB/(*fDpxD)[isec]);
 
                    fCx[isec][iy]=fCx[isec-1][iy]
                    +kpcb[irow][isec]*kDxPCB;
@@ -127,7 +133,7 @@ void AliMUONSegmentationV05::Init(Int_t chamber)
 */
 }
 
-void AliMUONSegmentationV05::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
+void AliMUONSegmentationV05::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const
 {
 // Returns test point on the pad plane.
 // Used during determination of the segmoid correction of the COG-method

diff --git a/MUON/AliMUONSegmentationV05.h b/MUON/AliMUONSegmentationV05.h
index ec256fc639a529e7a6a2eeb2031c7d34f3fc2ad0..ef8e4059efb39585af3918dc2592d7c737b32eeb 100644 (file)
--- a/MUON/AliMUONSegmentationV05.h
+++ b/MUON/AliMUONSegmentationV05.h
@@ -19,7 +19,7 @@ public AliMUONSegmentationV02 {
     // Initialisation
     virtual void Init(Int_t chamber);
     // Test points for auto calibration
-    void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
+    void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const;
     ClassDef(AliMUONSegmentationV05,1)// Segmentation zones are rectangular modules 
 };
 #endif

diff --git a/MUON/AliMUONSegmentationV1.cxx b/MUON/AliMUONSegmentationV1.cxx
index 83d5e451f6e0a90fa4f7d9e3ac7b67d0a5461be1..f1f37150941d146e7abc7250cc932551d6e3f317 100644 (file)
--- a/MUON/AliMUONSegmentationV1.cxx
+++ b/MUON/AliMUONSegmentationV1.cxx
@@ -15,6 +15,12 @@
 
 /*
 $Log$
+Revision 1.5  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.4  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.
@@ -110,7 +116,7 @@ Int_t AliMUONSegmentationV1::GetiAnod(Float_t xhit)
     return (xhit>0) ? kwire : -kwire ;
 }
 
-Float_t AliMUONSegmentationV1::GetAnod(Float_t xhit)
+Float_t AliMUONSegmentationV1::GetAnod(Float_t xhit) const
 {
 // Get anode position
     Int_t kwire=Int_t((TMath::Abs(xhit)-fSensOffset)/fDAnod)+1; // to be compatible ...
@@ -359,14 +365,14 @@ Int_t AliMUONSegmentationV1::Ix(Int_t trueX, Int_t trueY)
     return -1;
 }
 
-Int_t AliMUONSegmentationV1::Ix()
+Int_t AliMUONSegmentationV1::Ix() 
 {
 // returns the X number of pad which has to increment charge
 // due to parallel read-out
-return Ix(fIx,fIy);
+    return Ix(fIx,fIy);
 }
 
-Int_t AliMUONSegmentationV1::ISector()
+Int_t AliMUONSegmentationV1::ISector() 
 {
 // This function is of no use for this kind of segmentation.
     return GetZone(fIx,fIy);
@@ -548,7 +554,7 @@ NeighboursDiag(iX,iY,Nlist,Xlist,Ylist);
 }
 
 
-void AliMUONSegmentationV1::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
+void AliMUONSegmentationV1::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const
 {
 // Return a test point
     n=1;

diff --git a/MUON/AliMUONSegmentationV1.h b/MUON/AliMUONSegmentationV1.h
index 9593a060f5a065a049df32d5566a93f34e42e185..f47a37a9ec93257b777df014434488f26d88901b 100644 (file)
--- a/MUON/AliMUONSegmentationV1.h
+++ b/MUON/AliMUONSegmentationV1.h
@@ -58,7 +58,7 @@ public AliSegmentation {
     // Transform from pad (wire) to real coordinates and vice versa  
     virtual Int_t GetiAnod(Float_t xhit);
     // Anod wire coordinate closest to xhit
-    virtual Float_t GetAnod(Float_t xhit);
+    virtual Float_t GetAnod(Float_t xhit) const;
     // 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)
@@ -99,7 +99,7 @@ public AliSegmentation {
     virtual Int_t Ix(Int_t trueX, Int_t trueY);
     virtual Int_t Ix();
     // y-coordinate
-    virtual Int_t Iy(){return fIy;}
+    virtual Int_t Iy() {return fIy;}
     // current sector
     virtual Int_t ISector();
     // calculate sector from pad coordinates
@@ -122,17 +122,17 @@ public AliSegmentation {
     // Initialise signal generation at coord (x,y,z)
     void  SigGenInit(Float_t x, Float_t y, Float_t z);
     // Test points for auto calibration
-    void  GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
+    void  GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const;
     // Current integration limits 
     virtual void IntegrationLimits
        (Float_t& x1, Float_t& x2, Float_t& y1, Float_t& y2);
     // Draw the segmentation zones
-    virtual void Draw(const char * = ""){}
+    virtual void Draw(const char * = "") const {}
     // Function for systematic corrections
     // Set the correction function
     virtual void SetCorrFunc(Int_t dum, TF1* func) {fCorr=func;}
     // Get the correction function
-    virtual TF1* CorrFunc(Int_t) {return fCorr;}
+    virtual TF1* CorrFunc(Int_t) const {return fCorr;}
     //
     AliMUONSegmentationV1& operator=(const AliMUONSegmentationV1& rhs);
     ClassDef(AliMUONSegmentationV1,1) // Implementation of the Lyon type chamber segmentation with parallel read-out