ValidateHit method added.

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

diff --git a/MUON/AliMUONHitMapA1.cxx b/MUON/AliMUONHitMapA1.cxx
index 4c1289be72384052fe44043f080d30aff2dc77d7..bda8df51b17ea1e5d66fd4e1795be99ee13e217e 100644 (file)
--- a/MUON/AliMUONHitMapA1.cxx
+++ b/MUON/AliMUONHitMapA1.cxx
@@ -15,6 +15,18 @@
 
 /*
 $Log$
+Revision 1.10  2001/11/02 12:43:21  jchudoba
+remove fNdigits data member, it could have wrong value if fDigits is updated. Make this class non-persistent
+
+Revision 1.9  2001/03/20 13:34:05  egangler
+Obvious small bug
+
+Revision 1.8  2001/01/26 21:47:21  morsch
+Use access functions to AliMUONDigit member data.
+
+Revision 1.7  2001/01/25 11:43:48  morsch
+Add a "real" default constructor.
+
 Revision 1.6  2000/10/06 09:05:42  morsch
 Correction on upper limits for x- and y- coordinates to make code work with slat chambers.
 
@@ -53,27 +65,23 @@ ClassImp(AliMUONHitMapA1)
     AliMUONHitMapA1::AliMUONHitMapA1()
 {
     // Default constructor
-    fSegmentation = 0;
     fNpx          = 0;
     fNpy          = 0;
     fMaxIndex     = 0;
     
     fHitMap       = 0;
     fDigits       = 0;
-    fNdigits      = 0;
 }
 
 AliMUONHitMapA1::AliMUONHitMapA1(AliSegmentation *seg, TObjArray *dig)
 {
 // Constructor
-    fSegmentation = seg;
-    fNpx  = fSegmentation->Npx()+1;
-    fNpy  = fSegmentation->Npy()+1;
+    fNpx  = seg->Npx()+1;
+    fNpy  = seg->Npy()+1;
     fMaxIndex=2*(fNpx+1)*2*(fNpy+1)+2*fNpy;
     
     fHitMap = new Int_t[fMaxIndex];
     fDigits =  dig;
-    fNdigits = fDigits->GetEntriesFast();
     Clear();
 }
 
@@ -87,7 +95,6 @@ AliMUONHitMapA1::AliMUONHitMapA1(const AliMUONHitMapA1 & hitMap)
 AliMUONHitMapA1::~AliMUONHitMapA1()
 {
 // Destructor
-//    if (fDigits) delete   fDigits;
     if (fHitMap) delete[] fHitMap;
 }
 
@@ -97,11 +104,21 @@ void AliMUONHitMapA1::Clear(const char *)
     memset(fHitMap,0,sizeof(int)*fMaxIndex);
 }
 
+Bool_t AliMUONHitMapA1::ValidateHit(Int_t ix, Int_t iy)
+{
+    //
+    // Check if pad coordinates are within boundaries
+    //
+//    printf("\n Validate %d %d %d %d", ix, iy, fNpx, fNpy);
+    
+    return (TMath::Abs(ix) <= fNpx && TMath::Abs(iy) <= fNpy); 
+}
+
 Int_t AliMUONHitMapA1::CheckedIndex(Int_t ix, Int_t iy) const
 {
 // Return checked indices ix, iy
     Int_t index=2*fNpy*(ix+fNpx)+(iy+fNpy);
-    if (index > fMaxIndex) {
+    if (index >= fMaxIndex) {
        printf("\n \n \n Try to read/write outside array !!!! \n \n %d %d %d %d %d %d",
               ix,iy, fMaxIndex, index, fNpx, fNpy);
        return  fMaxIndex-1;
@@ -119,9 +136,9 @@ void  AliMUONHitMapA1::FillHits()
     //printf("FindRawClusters -- ndigits %d \n",ndigits);
     if (!ndigits) return;
     AliMUONDigit *dig;
-    for (Int_t ndig=0; ndig<fNdigits; ndig++) {
+    for (Int_t ndig=0; ndig<ndigits; ndig++) {
        dig = (AliMUONDigit*)fDigits->UncheckedAt(ndig);
-       SetHit(dig->fPadX,dig->fPadY,ndig);
+       SetHit(dig->PadX(),dig->PadY(),ndig);
     }
 }