Removing extra semicolons (FedoraCore3, gcc 3.4.2)

[u/mrichter/AliRoot.git] / MUON / AliMUONSegmentationSlatN.cxx

diff --git a/MUON/AliMUONSegmentationSlatN.cxx b/MUON/AliMUONSegmentationSlatN.cxx
index 7a9e7a6ecba2cd5e7672cbc62ecb77a9cd47fca7..d5d075b148e5b4421908b71b9872ead4d48c1a4b 100644 (file)
--- a/MUON/AliMUONSegmentationSlatN.cxx
+++ b/MUON/AliMUONSegmentationSlatN.cxx
@@ -13,30 +13,32 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-*/
+/* $Id$ */
+
+#include <TArrayI.h>
+#include <TMath.h>
 
 #include "AliMUONSegmentationSlatN.h"
 #include "AliMUONSegmentationSlatModuleN.h"
-#include "TArrayI.h"
-#include "TArrayF.h"
-#include "TObjArray.h"
-#include <TMath.h>
-#include <iostream.h>
 
 //___________________________________________
-ClassImp(AliMUONSegmentationSlatN);
-
-
+ClassImp(AliMUONSegmentationSlatN)
 
 AliMUONSegmentationSlatN::AliMUONSegmentationSlatN()
+  : AliMUONSegmentationSlat()
 {
 // Default constructor
 }
 
 
-Float_t AliMUONSegmentationSlatN::Dpx(Int_t isec) const
+AliMUONSegmentationSlatN::AliMUONSegmentationSlatN(Int_t nsec)
+    : AliMUONSegmentationSlat(nsec)
+{
+// Non default constructor
+}
+
+
+Float_t AliMUONSegmentationSlatN::Dpx(Int_t /*isec*/) const
 {
 //
 // Returns y-pad size for given sector isec
@@ -58,12 +60,12 @@ Float_t AliMUONSegmentationSlatN::Dpy(Int_t isec) const
 
 
 void AliMUONSegmentationSlatN::GlobalToLocal(
-    Int_t ix, Int_t iy, Int_t &islat, Int_t &ixlocal, Int_t &iylocal)
+    Int_t ix, Int_t iy, Int_t &islat, Int_t &ixlocal, Int_t &iylocal) const
 {
 //
 // Perform local to global transformation for pad coordinates
 //
-    Int_t iytemp = TMath::Abs(iy); 
+    Int_t iytemp = iy; 
     Int_t index  = 0;
     
     iylocal = iytemp;
@@ -82,11 +84,10 @@ void AliMUONSegmentationSlatN::GlobalToLocal(
     }
     ixlocal=ix;
     islat=index;
-// Done !
 }
 
 void AliMUONSegmentationSlatN::LocalToGlobal(
-    Int_t islat, Int_t ixlocal, Int_t iylocal, Int_t &ix, Int_t &iy)
+    Int_t islat, Int_t ixlocal, Int_t iylocal, Int_t &ix, Int_t &iy) const
 {
 // Local to global transformation for pad coordinates
     
@@ -103,8 +104,7 @@ void AliMUONSegmentationSlatN::LocalToGlobal(
     }
 //
 // Perform symmetry transformation
-    ix=ixlocal*fSym[0];
-    iy=iy*fSym[1];
+    ix=ixlocal*fSym;
 }
 
 
@@ -126,16 +126,14 @@ GetPadI(Float_t x, Float_t y, Float_t z, Int_t &ix, Int_t &iy)
        }
     }
 // Determine sign depending on quadrant
-    ix=ix*Int_t(TMath::Sign(1.,x));
-    iy=iy*Int_t(TMath::Sign(1.,y));    
-
+    ix=ix*Int_t(TMath::Sign((Float_t)1.,x));
 }
 
 AliMUONSegmentationSlatModule* AliMUONSegmentationSlatN::
-CreateSlatModule()
+CreateSlatModule() const
 {
     // Factory method for slat module
-    return new AliMUONSegmentationSlatModuleN();
+    return new AliMUONSegmentationSlatModuleN(4);
 }