X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSpList.h;h=fec0b4cada50809e0f035925f99911faf8330c8a;hb=cdfad0cfec9a7d62925b5cdd3735c9ff6bff10cb;hp=37be74a34d153cd38786e21e06292dbd19b8aeb8;hpb=5ff02a9ab5cf389ac49801d1339f5e070f699982;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSpList.h b/ITS/AliITSpList.h
index 37be74a34d1..fec0b4cada5 100644
--- a/ITS/AliITSpList.h
+++ b/ITS/AliITSpList.h
@@ -14,6 +14,7 @@
 // ***********************************************************************
 #include "TArrayI.h"
 #include "TClonesArray.h"
+#include "AliLog.h"
 #include "AliITSMap.h"
 #include "AliITSpListItem.h"
 
@@ -105,8 +106,8 @@ class AliITSpList: public AliITSMap {
     // returns "hit" AliITSpListItem as a TObject.
     TObject * GetHit(Int_t i,Int_t j) const {return (TObject*)GetpListItem(i,j);}
     // tests hit status.
-    virtual FlagType TestHit(Int_t i,Int_t j){if(GetpListItem(i,j)==0) return kEmpty;
-    else if(GetSignal(i,j)<=0) return kUnused; else return kUsed;}
+    virtual FlagTypeITS TestHit(Int_t i,Int_t j){if(GetpListItem(i,j)==0) return kEmptyITS;
+    else if(GetSignal(i,j)<=0) return kUnusedITS; else return kUsedITS;}
     // returns the pList Item stored in the TClonesArray
     AliITSpListItem* GetpListItem(Int_t index) { if((fa[index]).IsUsed())
       return &(fa[index]);
@@ -127,13 +128,18 @@ class AliITSpList: public AliITSMap {
     // Flags a hit. Not of relavence in this case.
     virtual void FlagHit(Int_t /* i */,Int_t /* j */){NotImplemented("FlagHit");}
     virtual void GetCell(Int_t index,Int_t &i,Int_t &j) const;
+ // GetIndex returns the TClonesArray index for a given set of map indexes.
+    static Int_t GetIndex(Int_t i,Int_t j,Int_t maxj){
+      return maxj*i+j;}
 
  private:
 
 // private methods
-    Int_t GetIndex(Int_t i,Int_t j) const;
+    Int_t GetIndex(Int_t i,Int_t j) const {
+      if(i<0||i>=fNi || j<0||j>=fNj){AliWarning(Form("Index out of range 0<i=%d<%d and 0<0j=%d<%d",i,fNi,j,fNj)); return -1;}
+      return GetIndex(i,j,fNj);}
     void NotImplemented(const char *method) const {if(gDebug>0)
-         Warning(method,"This method is not implemented for this class");}
+	Warning(method,"This method is not implemented for this class");}
 // data members
     Int_t     fNi,fNj;   // The max index in i,j.
     AliITSpListItem *fa;       // array of pList items