The access to several data members was changed from public to protected. The digitisa...

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

diff --git a/RICH/AliRICHHitMapA1.cxx b/RICH/AliRICHHitMapA1.cxx
index 2e54890f06744f905db8854cfdc9d7987182c330..b9e6d592ea756150fd5c0f9e9868ad611f0ca594 100644 (file)
--- a/RICH/AliRICHHitMapA1.cxx
+++ b/RICH/AliRICHHitMapA1.cxx
@@ -19,7 +19,7 @@
 
 
 #include "AliRICHHitMapA1.h"
-#include "AliRICHSegmentation.h"
+#include "AliSegmentation.h"
 #include "AliRICHDigit.h"
 
 #include <TObjArray.h>
@@ -27,8 +27,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 +64,7 @@ AliRICHHitMapA1::~AliRICHHitMapA1()
     if (fHitMap) delete[] fHitMap;
 }
 
-void AliRICHHitMapA1::Clear()
+void AliRICHHitMapA1::Clear(const char *opt)
 {
 
 // Clear contents of hit map
@@ -60,7 +72,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 +99,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,7 +129,7 @@ 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
@@ -128,7 +140,7 @@ Int_t AliRICHHitMapA1::GetHitIndex(Int_t ix, Int_t iy)
     
 }
 
-TObject* AliRICHHitMapA1::GetHit(Int_t ix, Int_t iy)
+TObject* AliRICHHitMapA1::GetHit(Int_t ix, Int_t iy) const
 {
 
 // Return index from coordinates