HLTcalo module

[u/mrichter/AliRoot.git] / HLT / BASE / AliHLTIndexGrid.h

diff --git a/HLT/BASE/AliHLTIndexGrid.h b/HLT/BASE/AliHLTIndexGrid.h
index e19ff3024cc5cb85394efd41ca994f11cd972d93..0fdda2067249c66d4e19a33b5f37d3a0ae62c6de 100644 (file)
--- a/HLT/BASE/AliHLTIndexGrid.h
+++ b/HLT/BASE/AliHLTIndexGrid.h
@@ -16,6 +16,8 @@
 #include <iostream>
 #include <iomanip>
 #include <memory>
+#include <cerrno>
+#include <cmath>
 
 template <typename T, typename V>
 class AliHLTIndexGrid {
@@ -87,30 +89,30 @@ class AliHLTIndexGrid {
     return xindex*fDimY*fDimZ + yindex*fDimZ + zindex;
   }
   T GetLowerBoundX(int cell) const {
-    if (fDimX==0 || fDimY==0 ||fDimZ==0) return 0.;
+    if (fDimX==0 || fDimY==0 ||fDimZ==0) return (T)0;
     int index=cell/(fDimY*fDimZ);
     return index*fStepX;
   }
   T GetCenterX(int cell) const {
-    if (fDimX==0 || fDimY==0 ||fDimZ==0) return 0.;
+    if (fDimX==0 || fDimY==0 ||fDimZ==0) return (T)0;
     return GetLowerBoundX(cell)+fStepX/2;
   }
   T GetLowerBoundY(int cell) const {
-    if (fDimX==0 || fDimY==0 ||fDimZ==0) return 0.;
+    if (fDimX==0 || fDimY==0 ||fDimZ==0) return (T)0;
     int index=cell%(fDimY*fDimZ); index/=fDimZ;
     return index*fStepY;
   }
   T GetCenterY(int cell) const {
-    if (fDimX==0 || fDimY==0 ||fDimZ==0) return 0.;
+    if (fDimX==0 || fDimY==0 ||fDimZ==0) return (T)0;
     return GetLowerBoundY(cell)+fStepY/2;
   }
   T GetLowerBoundZ(int cell) const {
-    if (fDimX==0 || fDimY==0 ||fDimZ==0) return 0.;
+    if (fDimX==0 || fDimY==0 ||fDimZ==0) return (T)0;
     int index=cell%(fDimY*fDimZ); index%=fDimZ;
     return index*fStepZ;
   }
   T GetCenterZ(int cell) const {
-    if (fDimX==0 || fDimY==0 ||fDimZ==0) return 0.;
+    if (fDimX==0 || fDimY==0 ||fDimZ==0) return (T)0;
     return GetLowerBoundZ(cell)+fStepZ/2;
   }
   int GetCellIndex(T x, T y, T z) const {
@@ -199,7 +201,7 @@ class AliHLTIndexGrid {
   iterator(const iterator& i)
     : fData(i.fData) {}
     iterator& operator=(const iterator& i)
-      { fData=i.fData; return *this;}
+      { if (this!=&i) {fData=i.fData;} return *this;}
     ~iterator() {fData=NULL;}
 
     bool operator==(const iterator& i) const  {return (fData!=NULL) && (fData==i.fData);}
@@ -216,6 +218,8 @@ class AliHLTIndexGrid {
     const ValueType& Data() const {return *fData;}
     ValueType& Data() {return *fData;}
 
+    ValueType operator*() {return *fData;}
+
   protected:
   private:
     ValueType* fData; //! data
@@ -247,8 +251,8 @@ class AliHLTIndexGrid {
     // get the range end position
     int endCell=cell+1;
     if (x<0) endCell=fCellDimension;
-    else if (y<0) endCell=GetCellIndex(x+fStepX, -1., -1.); // all entries for fixed x
-    else if (z<0) endCell=GetCellIndex(x, y+fStepY, -1.); // all entries for fixed x and y
+    else if (y<0) endCell=GetCellIndex(x+fStepX, (T)-1, (T)-1); // all entries for fixed x
+    else if (z<0) endCell=GetCellIndex(x, y+fStepY, (T)-1); // all entries for fixed x and y
     if (endCell<=cell) {
       // cell index returned is never outside the array
       // so this is a special case where we get to the bounds of the array