X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFHitMap.cxx;h=a52af1dc7c86e871c4dd6058fe3811e04e4c71a4;hb=de6f809032712511748076a5d9a2d2d7f3eb3ff4;hp=a7cc4365ecdd36505acbc4446bb8b9c109311efe;hpb=da3d3acdb35a1789beb85ca161e018521ae64e65;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFHitMap.cxx b/TOF/AliTOFHitMap.cxx
index a7cc4365ecd..a52af1dc7c8 100644
--- a/TOF/AliTOFHitMap.cxx
+++ b/TOF/AliTOFHitMap.cxx
@@ -33,29 +33,40 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#include <Riostream.h>
-#include <TMath.h>
-
+#include "AliLog.h"
 #include "AliTOFHitMap.h"
-#include "AliTOFSDigit.h"
-#include "AliTOFConstants.h"
+#include "AliTOFGeometry.h"
 
 
 #include <TClonesArray.h>
 
 ClassImp(AliTOFHitMap)
 
-AliTOFHitMap::AliTOFHitMap()
+AliTOFHitMap::AliTOFHitMap():
+  fNSector(-1),
+  fNplate(-1),
+  fNstrip(-1),
+  fNpx(-1),
+  fNpz(-1),
+  fSDigits(0x0),
+  fMaxIndex(-1),
+  fHitMap(0x0)
 {
 //
 // Default ctor
 //
-  fHitMap = 0;
-  fSDigits = 0;
 }
 
 ////////////////////////////////////////////////////////////////////////
-AliTOFHitMap::AliTOFHitMap(TClonesArray *dig)
+AliTOFHitMap::AliTOFHitMap(TClonesArray *dig):
+  fNSector(-1),
+  fNplate(-1),
+  fNstrip(-1),
+  fNpx(-1),
+  fNpz(-1),
+  fSDigits(dig),
+  fMaxIndex(-1),
+  fHitMap(0x0)
 {
 //
 // ctor
@@ -64,25 +75,32 @@ 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;
-  fNpz  = AliTOFConstants::fgkNpadZ;
+  fNSector = AliTOFGeometry::NSectors();
+  fNplate = AliTOFGeometry::NPlates();
+  fNstrip = AliTOFGeometry::NStripC();//fTOFGeometry->NMaxNstrip();
+  fNpx  = AliTOFGeometry::NpadX();
+  fNpz  = AliTOFGeometry::NpadZ();
   fMaxIndex=fNSector*fNplate*fNstrip*fNpx*fNpz;
   fHitMap = new Int_t[fMaxIndex];
-  fSDigits =  dig;
   Clear();
 }
 
 ////////////////////////////////////////////////////////////////////////
 AliTOFHitMap::AliTOFHitMap(const AliTOFHitMap & /*hitMap*/)
-:TObject()
+  :TObject(),
+  fNSector(-1),
+  fNplate(-1),
+  fNstrip(-1),
+  fNpx(-1),
+  fNpz(-1),
+  fSDigits(0x0),
+  fMaxIndex(-1),
+  fHitMap(0x0)
 {
 //
 // Dummy copy constructor
 //
-    ;
+  ;
 }
 
  
@@ -92,7 +110,8 @@ AliTOFHitMap::~AliTOFHitMap()
 //
 // Destructor
 //
-    if (fHitMap) delete[] fHitMap;
+  delete[] fHitMap;
+
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -111,14 +130,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 +209,3 @@ AliTOFHitMap & AliTOFHitMap::operator = (const AliTOFHitMap & /*rhs*/)
 // Dummy assignment operator
     return *this;
 }
-
-
-
-
-