Default changed: SPD chips thickness is 150 microns

[u/mrichter/AliRoot.git] / TOF / AliTOFHitMap.cxx

diff --git a/TOF/AliTOFHitMap.cxx b/TOF/AliTOFHitMap.cxx
index 3e93c2ec74467d17170df0e910582bd0dd4ca191..498e168d73f715a440b2d9f6d55ee68ccb5fdf75 100644 (file)
--- a/TOF/AliTOFHitMap.cxx
+++ b/TOF/AliTOFHitMap.cxx
@@ -33,11 +33,8 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#include <Riostream.h>
-#include <TMath.h>
-
+#include "AliLog.h"
 #include "AliTOFHitMap.h"
-#include "AliTOFSDigit.h"
 #include "AliTOFGeometry.h"
 
 
@@ -55,7 +52,7 @@ AliTOFHitMap::AliTOFHitMap()
 }
 
 ////////////////////////////////////////////////////////////////////////
-AliTOFHitMap::AliTOFHitMap(TClonesArray *dig)
+AliTOFHitMap::AliTOFHitMap(TClonesArray *dig, AliTOFGeometry *tofGeom)
 {
 //
 // ctor
@@ -64,9 +61,11 @@ AliTOFHitMap::AliTOFHitMap(TClonesArray *dig)
 // of course, these constants must not be hardwired
 // change later
 
+  fTOFGeometry = tofGeom;
+
   fNSector = AliTOFGeometry::NSectors();
   fNplate = AliTOFGeometry::NPlates();
-  fNstrip = AliTOFGeometry::NStripC();
+  fNstrip = fTOFGeometry->NMaxNstrip();
   fNpx  = AliTOFGeometry::NpadX();
   fNpz  = AliTOFGeometry::NpadZ();
   fMaxIndex=fNSector*fNplate*fNstrip*fNpx*fNpz;
@@ -82,7 +81,7 @@ AliTOFHitMap::AliTOFHitMap(const AliTOFHitMap & /*hitMap*/)
 //
 // Dummy copy constructor
 //
-    ;
+  ;
 }
 
  
@@ -92,7 +91,10 @@ AliTOFHitMap::~AliTOFHitMap()
 //
 // Destructor
 //
-    if (fHitMap) delete[] fHitMap;
+  delete[] fHitMap;
+
+  fTOFGeometry = 0x0;
+
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -111,14 +113,14 @@ Int_t AliTOFHitMap::CheckedIndex(Int_t *vol) const
 // Return checked indices for vol
 //
   Int_t index=
-    (vol[0]/*-1*/)*fNplate*fNstrip*fNpx*fNpz+             // sector
-    (vol[1]/*-1*/)*fNstrip*fNpx*fNpz+                     // plate
-    (vol[2]/*-1*/)*fNpx*fNpz+                             // strip
-    (vol[3]/*-1*/)*fNpz+                                  // padx
-    (vol[4]/*-1*/);                                       // padz
+    vol[0]*fNplate*fNstrip*fNpx*fNpz+             // sector
+    vol[1]*fNstrip*fNpx*fNpz+                     // plate
+    vol[2]*fNpx*fNpz+                             // strip
+    vol[3]*fNpz+                                  // padx
+    vol[4];                                       // padz
 
     if (index >= fMaxIndex) {
-      Error("AliTOFHitMap","CheckedIndex - input outside bounds");
+      AliError("CheckedIndex - input outside bounds");
        return -1;
     } else {
        return index;
@@ -190,8 +192,3 @@ AliTOFHitMap & AliTOFHitMap::operator = (const AliTOFHitMap & /*rhs*/)
 // Dummy assignment operator
     return *this;
 }
-
-
-
-
-