X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFHitMap.cxx;h=498e168d73f715a440b2d9f6d55ee68ccb5fdf75;hb=e0f871201a8bfbb2828f99c411ffa0cb8a32a454;hp=569d304371a92e4ff63b33d3816d7365d16fa5f7;hpb=5c016a7bf1a2dc79a3e07bf227767f5ba04a4beb;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFHitMap.cxx b/TOF/AliTOFHitMap.cxx
index 569d304371a..498e168d73f 100644
--- a/TOF/AliTOFHitMap.cxx
+++ b/TOF/AliTOFHitMap.cxx
@@ -33,12 +33,9 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#include <Riostream.h>
-#include <TMath.h>
-
+#include "AliLog.h"
 #include "AliTOFHitMap.h"
-#include "AliTOFSDigit.h"
-#include "AliTOFConstants.h"
+#include "AliTOFGeometry.h"
 
 
 #include <TClonesArray.h>
@@ -55,7 +52,7 @@ AliTOFHitMap::AliTOFHitMap()
 }
 
 ////////////////////////////////////////////////////////////////////////
-AliTOFHitMap::AliTOFHitMap(TClonesArray *dig)
+AliTOFHitMap::AliTOFHitMap(TClonesArray *dig, AliTOFGeometry *tofGeom)
 {
 //
 // ctor
@@ -64,12 +61,14 @@ AliTOFHitMap::AliTOFHitMap(TClonesArray *dig)
 // of course, these constants must not be hardwired
 // change later
 
-  fNSector = AliTOFConstants::fgkNSectors;
-  fNplate = AliTOFConstants::fgkNPlates;
-  fNstrip = AliTOFConstants::fgkNStripC;
-  fNpx  = AliTOFConstants::fgkNpadX;
-  fNpy  = AliTOFConstants::fgkNpadZ;
-  fMaxIndex=fNSector*fNplate*fNstrip*fNpx*fNpy;
+  fTOFGeometry = tofGeom;
+
+  fNSector = AliTOFGeometry::NSectors();
+  fNplate = AliTOFGeometry::NPlates();
+  fNstrip = fTOFGeometry->NMaxNstrip();
+  fNpx  = AliTOFGeometry::NpadX();
+  fNpz  = AliTOFGeometry::NpadZ();
+  fMaxIndex=fNSector*fNplate*fNstrip*fNpx*fNpz;
   fHitMap = new Int_t[fMaxIndex];
   fSDigits =  dig;
   Clear();
@@ -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*fNpy+             // sector
-    (vol[1]-1)*fNstrip*fNpx*fNpy+                     // plate
-    (vol[2]-1)*fNpx*fNpy+                             // strip
-    (vol[3]-1)*fNpy+                                  // padx
-    (vol[4]-1);                                        // pady (=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;
 }
-
-
-
-
-