Decay of L0s, Lambda, Sigma, Xi and Omega switched off. To be handled by the\

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

diff --git a/TOF/AliTOFHitMap.cxx b/TOF/AliTOFHitMap.cxx
index 26d7e902d1b5304b2900c1ca101b5eb36564a75f..f657814ec5b5adb253f8714931325e0f1e9937e9 100644 (file)
--- a/TOF/AliTOFHitMap.cxx
+++ b/TOF/AliTOFHitMap.cxx
@@ -13,7 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/* $Log$ */
+/* $Id$ */
 
 ////////////////////////////////////////////////////////////////////////
 //
@@ -33,12 +33,12 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#include <iostream.h>
+#include <Riostream.h>
 #include <TMath.h>
 
 #include "AliTOFHitMap.h"
 #include "AliTOFSDigit.h"
-#include "AliTOFConstants.h"
+#include "AliTOFGeometry.h"
 
 
 #include <TClonesArray.h>
@@ -64,19 +64,20 @@ 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;
+  fNSector = AliTOFGeometry::NSectors();
+  fNplate = AliTOFGeometry::NPlates();
+  fNstrip = AliTOFGeometry::NStripC();
+  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)
+AliTOFHitMap::AliTOFHitMap(const AliTOFHitMap & /*hitMap*/)
+:TObject()
 {
 //
 // Dummy copy constructor
@@ -91,7 +92,7 @@ AliTOFHitMap::~AliTOFHitMap()
 //
 // Destructor
 //
-    if (fHitMap) delete[] fHitMap;
+    delete[] fHitMap;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -110,11 +111,11 @@ 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]/*-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
 
     if (index >= fMaxIndex) {
       Error("AliTOFHitMap","CheckedIndex - input outside bounds");
@@ -163,7 +164,7 @@ TObject* AliTOFHitMap::GetHit(Int_t *vol) const
 //
 // Get pointer to object at vol
 // return 0 if vol out of bounds
-    Int_t index=GetHitIndex(vol)-1;
+    Int_t index=GetHitIndex(vol);
     return (index <0) ? 0 : fSDigits->UncheckedAt(index);
 }
 
@@ -174,7 +175,7 @@ FlagType AliTOFHitMap::TestHit(Int_t *vol) const
 // Check if hit cell is empty, used or unused
 //
     Int_t inf=fHitMap[CheckedIndex(vol)];
-    if (inf < 0) {
+    if (inf > 0) {
        return kUsed;
     } else if (inf == 0) {
        return kEmpty;
@@ -184,7 +185,7 @@ FlagType AliTOFHitMap::TestHit(Int_t *vol) const
 }
 
 ////////////////////////////////////////////////////////////////////////
-AliTOFHitMap & AliTOFHitMap::operator = (const AliTOFHitMap & rhs) 
+AliTOFHitMap & AliTOFHitMap::operator = (const AliTOFHitMap & /*rhs*/) 
 {
 // Dummy assignment operator
     return *this;