Bug fix (Yu.Belikov)

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

diff --git a/MUON/AliMUONHitMapA1.cxx b/MUON/AliMUONHitMapA1.cxx
index 523aef3df76255d74c1b1e186044ad4fd9447040..9573067de43d4e61b378e49ae4c634c659e82d2d 100644 (file)
--- a/MUON/AliMUONHitMapA1.cxx
+++ b/MUON/AliMUONHitMapA1.cxx
@@ -13,19 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.2  2000/06/15 07:58:48  morsch
-Code from MUON-dev joined
-
-Revision 1.1.2.2  2000/06/12 07:58:06  morsch
-include TMath.h
-
-Revision 1.1.2.1  2000/06/09 22:01:09  morsch
-Code from AliMUONHitMap.h
-Most coding rule violations corrected.
-
-*/
+/* $Id$ */
 
 #include "AliMUONHitMapA1.h"
 #include "AliSegmentation.h"
@@ -37,22 +25,30 @@ Most coding rule violations corrected.
 
 ClassImp(AliMUONHitMapA1)
 
+    AliMUONHitMapA1::AliMUONHitMapA1()
+{
+    // Default constructor
+    fNpx          = 0;
+    fNpy          = 0;
+    fMaxIndex     = 0;
+    
+    fHitMap       = 0;
+    fDigits       = 0;
+}
 
 AliMUONHitMapA1::AliMUONHitMapA1(AliSegmentation *seg, TObjArray *dig)
 {
 // Constructor
-    fSegmentation = seg;
-    fNpx  = fSegmentation->Npx();
-    fNpy  = fSegmentation->Npy();
+    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();
 }
 
-AliMUONHitMapA1::AliMUONHitMapA1(const AliMUONHitMapA1 & hitMap)
+AliMUONHitMapA1::AliMUONHitMapA1(const AliMUONHitMapA1 & hitMap):AliHitMap(hitMap)
 {
 // Dummy copy constructor
     ;
@@ -62,22 +58,32 @@ AliMUONHitMapA1::AliMUONHitMapA1(const AliMUONHitMapA1 & hitMap)
 AliMUONHitMapA1::~AliMUONHitMapA1()
 {
 // Destructor
-//    if (fDigits) delete   fDigits;
     if (fHitMap) delete[] fHitMap;
 }
 
-void AliMUONHitMapA1::Clear()
+void AliMUONHitMapA1::Clear(const char *)
 {
 // Clear hitmap
     memset(fHitMap,0,sizeof(int)*fMaxIndex);
 }
 
-Int_t AliMUONHitMapA1::CheckedIndex(Int_t ix, Int_t iy)
+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) {
-       printf("\n \n \n Try to read/write outside array !!!! \n \n %d %d %d %d %d %d",ix,iy, fMaxIndex, index, fNpx, fNpy);
+    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;
     } else {
        return index;
@@ -93,9 +99,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);
     }
 }
 
@@ -121,13 +127,13 @@ void AliMUONHitMapA1::FlagHit(Int_t ix, Int_t iy)
        -TMath::Abs(fHitMap[CheckedIndex(ix, iy)]);
 }
 
-Int_t AliMUONHitMapA1::GetHitIndex(Int_t ix, Int_t iy)
+Int_t AliMUONHitMapA1::GetHitIndex(Int_t ix, Int_t iy) const
 {
 // Get absolute value of contents of hit cell ix,iy
     return TMath::Abs(fHitMap[CheckedIndex(ix, iy)])-1;
 }
 
-TObject* AliMUONHitMapA1::GetHit(Int_t ix, Int_t iy)
+TObject* AliMUONHitMapA1::GetHit(Int_t ix, Int_t iy) const
 {
     // Get pointer to object at hit cell ix, iy
     // Force crash if index does not exist ! (Manu)
@@ -149,10 +155,13 @@ FlagType AliMUONHitMapA1::TestHit(Int_t ix, Int_t iy)
     }
 }
 
-AliMUONHitMapA1 & AliMUONHitMapA1::operator = (const AliMUONHitMapA1 & rhs) 
+AliMUONHitMapA1 & AliMUONHitMapA1::operator = (const AliMUONHitMapA1 & /*rhs*/) 
 {
 // Dummy assignment operator
     return *this;
 }
 
 
+
+
+