Bug Correction: simultanous cut on particles and tracks

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

diff --git a/MUON/AliMUONSegmentationV04.cxx b/MUON/AliMUONSegmentationV04.cxx
index 048357bc892a76357811b97a2dde8d37062ad615..647240b8c56336d9365d69f21b94b5125f69304a 100644 (file)
--- a/MUON/AliMUONSegmentationV04.cxx
+++ b/MUON/AliMUONSegmentationV04.cxx
@@ -15,6 +15,19 @@
 
 /*
 $Log$
+Revision 1.7  2000/12/21 22:12:41  morsch
+Clean-up of coding rule violations,
+
+Revision 1.6  2000/10/18 11:42:06  morsch
+- AliMUONRawCluster contains z-position.
+- Some clean-up of useless print statements during initialisations.
+
+Revision 1.5  2000/10/04 18:50:05  morsch
+In Init(): (*fDpxD)[fNsec-1]=fDpx;
+
+Revision 1.4  2000/10/03 21:48:07  morsch
+Adopt to const declaration of some of the methods in AliSegmentation.
+
 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
@@ -35,6 +48,10 @@ AliMUONSegmentationV04 code  from  AliMUONSegResV04.cxx
 
 
 #include "AliMUONSegmentationV04.h"
+#include "AliMUONChamber.h"
+#include "AliMUON.h"
+#include "AliRun.h"
+
 #include <TMath.h>
 
 //___________________________________________
@@ -43,7 +60,7 @@ ClassImp(AliMUONSegmentationV04)
 
 void AliMUONSegmentationV04::Init(Int_t chamber)
 {
-    printf("\n Initialise segmentation v04 \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
@@ -53,6 +70,8 @@ void AliMUONSegmentationV04::Init(Int_t chamber)
 //  concentric circles as shown below
 //
 //  PCB module size in cm
+  //printf("\n Initialise Segmentation V04 \n");
+
     const Float_t kDxPCB=40, kDyPCB=40;
 //  PCB distribution (7 rows with 1+3 segmentation regions)
     const Int_t kpcb[7][4] = {{1, 2, 2, 2}, 
@@ -89,11 +108,10 @@ void AliMUONSegmentationV04::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]);
        }
     }
 //
@@ -122,6 +140,10 @@ void AliMUONSegmentationV04::Init(Int_t chamber)
            } // sectors
        } // pad raws in module
     } // PCB rows
+
+    AliMUON *pMUON  = (AliMUON *) gAlice->GetModule("MUON");
+    fChamber=&(pMUON->Chamber(chamber));
+    fZ = fChamber->Z();
 }
 
 void AliMUONSegmentationV04::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) const