Log replaced by Id

[u/mrichter/AliRoot.git] / RICH / AliRICHHitMapA1.cxx

diff --git a/RICH/AliRICHHitMapA1.cxx b/RICH/AliRICHHitMapA1.cxx
index 390ced07fdc9a7fa5260e4ff22b08837da932028..b680992f6bfa4b9ad1ed3000a8308f39ee0eb0f6 100644 (file)
--- a/RICH/AliRICHHitMapA1.cxx
+++ b/RICH/AliRICHHitMapA1.cxx
@@ -13,13 +13,11 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-  $Log $
-*/
+/* $Id$ */
 
 
 #include "AliRICHHitMapA1.h"
-#include "AliRICHSegmentation.h"
+#include "AliSegmentation.h"
 #include "AliRICHDigit.h"
 
 #include <TObjArray.h>
@@ -27,8 +25,20 @@
 
 ClassImp(AliRICHHitMapA1)
 
+AliRICHHitMapA1::AliRICHHitMapA1()
+{
+// Default constructor
+    fSegmentation = 0;
+    fNpx          = 0;
+    fNpy          = 0;
+    fMaxIndex     = 0;
+    
+    fHitMap       = 0;
+    fDigits       = 0;
+}
+
 
-AliRICHHitMapA1::AliRICHHitMapA1(AliRICHSegmentation *seg, TObjArray *dig)
+AliRICHHitMapA1::AliRICHHitMapA1(AliSegmentation *seg, TObjArray *dig)
 {
 
 // Constructor for AliRICHMapA1
@@ -52,7 +62,7 @@ AliRICHHitMapA1::~AliRICHHitMapA1()
     if (fHitMap) delete[] fHitMap;
 }
 
-void AliRICHHitMapA1::Clear()
+void AliRICHHitMapA1::Clear(const char *opt)
 {
 
 // Clear contents of hit map
@@ -60,7 +70,7 @@ void AliRICHHitMapA1::Clear()
     memset(fHitMap,0,sizeof(int)*fMaxIndex);
 }
 
-Int_t AliRICHHitMapA1::CheckedIndex(Int_t ix, Int_t iy)
+Int_t AliRICHHitMapA1::CheckedIndex(Int_t ix, Int_t iy) const
 {
 
 // Check if index is valid
@@ -87,7 +97,7 @@ void  AliRICHHitMapA1::FillHits()
     AliRICHDigit *dig;
     for (Int_t ndig=0; ndig<fNdigits; ndig++) {
        dig = (AliRICHDigit*)fDigits->UncheckedAt(ndig);
-       SetHit(dig->fPadX,dig->fPadY,ndig);
+       SetHit(dig->PadX(),dig->PadY(),ndig);
     }
 }
 
@@ -117,18 +127,18 @@ void AliRICHHitMapA1::FlagHit(Int_t ix, Int_t iy)
        -TMath::Abs(fHitMap[CheckedIndex(ix, iy)]);
 }
 
-Int_t AliRICHHitMapA1::GetHitIndex(Int_t ix, Int_t iy)
+Int_t AliRICHHitMapA1::GetHitIndex(Int_t ix, Int_t iy) const
 {
 
 // Return hit coordinates from index
 
-  printf("ix:%d, iy:%d, index:%d\n",ix,iy,CheckedIndex(ix, iy));
+  //printf("ix:%d, iy:%d, index:%d\n",ix,iy,CheckedIndex(ix, iy));
    
   return TMath::Abs(fHitMap[CheckedIndex(ix, iy)])-1;
     
 }
 
-TObject* AliRICHHitMapA1::GetHit(Int_t ix, Int_t iy)
+TObject* AliRICHHitMapA1::GetHit(Int_t ix, Int_t iy) const
 {
 
 // Return index from coordinates