Changes needed on Sun with Root v4-03-04

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

diff --git a/MUON/AliMUONSegmentationSlatModule.cxx b/MUON/AliMUONSegmentationSlatModule.cxx
index b26f9b65e18a8cc392e3994bac1fae81eecc1792..8b599d82c7efc75d1c17a114a356f99c7d64fb25 100644 (file)
--- a/MUON/AliMUONSegmentationSlatModule.cxx
+++ b/MUON/AliMUONSegmentationSlatModule.cxx
@@ -13,48 +13,73 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.4  2000/10/25 19:56:55  morsch
-Handle correctly slats with less than 3 segmentation zones.
-
-Revision 1.3  2000/10/22 16:56:32  morsch
-- Store chamber number as slat id.
-
-Revision 1.2  2000/10/18 11:42:06  morsch
-- AliMUONRawCluster contains z-position.
-- Some clean-up of useless print statements during initialisations.
-
-Revision 1.1  2000/10/06 08:59:03  morsch
-Segmentation classes for bending and non bending plane slat modules (A. de Falco, A. Morsch)
-
-*/
+/* $Id$ */
 
 /////////////////////////////////////////////////////
 //  Segmentation classes for slat modules          //
 //  to be used with AluMUONSegmentationSlat        //
 /////////////////////////////////////////////////////
 
+#include <TArrayI.h>
+#include <TArrayF.h>
 
 #include "AliMUONSegmentationSlatModule.h"
-#include <TMath.h>
-#include <iostream.h>
-
-#include "AliMUONSegmentationV01.h"
+#include "AliLog.h"
 
 //___________________________________________
 ClassImp(AliMUONSegmentationSlatModule)
 
-AliMUONSegmentationSlatModule::AliMUONSegmentationSlatModule() 
+AliMUONSegmentationSlatModule::AliMUONSegmentationSlatModule()  
+  : AliMUONSegmentationV0()
 {
 // Default constructor
-    fNsec=4;
+    fNDiv = 0;      
+    fDpxD = 0;  
+}
+
+AliMUONSegmentationSlatModule::AliMUONSegmentationSlatModule(Int_t nsec) 
+  : AliMUONSegmentationV0()
+{
+// Non default constructor
+    fNsec = nsec;
     fNDiv = new TArrayI(fNsec);      
     fDpxD = new TArrayF(fNsec);      
     (*fNDiv)[0]=(*fNDiv)[1]=(*fNDiv)[2]=(*fNDiv)[3]=0;     
     (*fDpxD)[0]=(*fDpxD)[1]=(*fDpxD)[2]=(*fDpxD)[3]=0;     
 }
 
+//----------------------------------------------------------------------
+AliMUONSegmentationSlatModule::AliMUONSegmentationSlatModule(
+                                  const AliMUONSegmentationSlatModule& rhs)
+  :  AliMUONSegmentationV0(rhs) 
+{
+// Protected copy constructor
+
+  AliFatal("Not implemented.");
+}
+
+
+AliMUONSegmentationSlatModule::~AliMUONSegmentationSlatModule() 
+{
+// Destructor
+    if (fNDiv) delete fNDiv;
+    if (fDpxD) delete fDpxD;
+}
+
+//----------------------------------------------------------------------
+AliMUONSegmentationSlatModule& 
+AliMUONSegmentationSlatModule::operator=(        
+                                 const AliMUONSegmentationSlatModule& rhs)
+{
+// Protected assignement operator
+
+  if (this == &rhs) return *this;
+
+  AliFatal("Not implemented.");
+    
+  return *this;  
+}    
+          
 void AliMUONSegmentationSlatModule::SetPcbBoards(Int_t n[4])
 {
 //
@@ -83,7 +108,7 @@ Float_t AliMUONSegmentationSlatModule::Dpx(Int_t isec) const
 } 
 
 
-Float_t AliMUONSegmentationSlatModule::Dpy(Int_t isec) const
+Float_t AliMUONSegmentationSlatModule::Dpy(Int_t /*isec*/) const
 {
 // Return y-strip width
 
@@ -139,7 +164,12 @@ GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y)
        x=y=0;
     }
 }
-
+//-------------------------------------------------------------------------
+void AliMUONSegmentationSlatModule::GetPadI(Float_t x, Float_t y , Float_t /*z*/, Int_t &ix, Int_t &iy)
+{
+  GetPadI(x, y, ix, iy);
+}
+//-------------------------------------------------------------------------
 void AliMUONSegmentationSlatModule::
 SetPad(Int_t ix, Int_t iy)
 {
@@ -153,6 +183,8 @@ SetPad(Int_t ix, Int_t iy)
 void AliMUONSegmentationSlatModule::
 SetHit(Float_t x, Float_t y)
 {
+// Set current hit 
+//
     fXhit = x;
     fYhit = y;
     
@@ -164,8 +196,12 @@ SetHit(Float_t x, Float_t y)
 
     
 }
-
-
+//----------------------------------------------------------
+void AliMUONSegmentationSlatModule::SetHit(Float_t xhit, Float_t yhit, Float_t /*zhit*/)
+{
+  SetHit(xhit, yhit);
+}
+//----------------------------------------------------------
 void AliMUONSegmentationSlatModule::
 FirstPad(Float_t xhit, Float_t yhit, Float_t dx, Float_t dy)
 {
@@ -229,7 +265,12 @@ FirstPad(Float_t xhit, Float_t yhit, Float_t dx, Float_t dy)
           fIymin, fIymax, fYmin, fYmax,  fNpyS[isec], fId, isec, Dpy(isec));
 */
 }
-
+//----------------------------------------------------------------------
+void AliMUONSegmentationSlatModule::FirstPad(Float_t xhit, Float_t yhit, Float_t /*zhit*/, Float_t dx, Float_t dy)
+{
+  FirstPad(xhit, yhit, dx, dy);
+}
+//----------------------------------------------------------------------
 void AliMUONSegmentationSlatModule::NextPad()
 {
 // Stepper for the iteration over pads
@@ -256,10 +297,10 @@ void AliMUONSegmentationSlatModule::NextPad()
 
 
 Int_t AliMUONSegmentationSlatModule::MorePads()
+{
 // Stopping condition for the iterator over pads
 //
 // Are there more pads in the integration region
-{
     
     return  (fIx != -1  || fIy != -1);
 }
@@ -337,7 +378,6 @@ Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10])
 
 void AliMUONSegmentationSlatModule::Init(Int_t chamber)
 {
-    printf("\n Initialise Segmentation SlatModule \n");
 //
 //  Fill the arrays fCx (x-contour) and fNpxS (ix-contour) for each sector
 //  These arrays help in converting from real to pad co-ordinates and
@@ -347,6 +387,8 @@ void AliMUONSegmentationSlatModule::Init(Int_t chamber)
 //  concentric circles as shown below
 //
 //  PCB module size in cm
+  // printf("\n Initialise Segmentation SlatModule \n");
+
     fDxPCB=40;
     fDyPCB=40;
 //
@@ -385,7 +427,6 @@ void AliMUONSegmentationSlatModule::Init(Int_t chamber)
     fNpx=fNpxS[3];
 //
     fId = chamber;
-    
 }