merging post-CVS changes into SVN:

[u/mrichter/AliRoot.git] / FMD / AliFMDEdepMap.cxx

diff --git a/FMD/AliFMDEdepMap.cxx b/FMD/AliFMDEdepMap.cxx
index aa8cd817bd8c376851a80bb9983331d99d4fbe96..843a9ca299bb5ed9faef62fe6fe80c08cf7ced4b 100644 (file)
--- a/FMD/AliFMDEdepMap.cxx
+++ b/FMD/AliFMDEdepMap.cxx
@@ -40,22 +40,24 @@ ClassImp(AliFMDEdepMap)
 AliFMDEdepMap::AliFMDEdepMap(const AliFMDEdepMap& other)
   : AliFMDMap(other.fMaxDetectors, other.fMaxRings, other.fMaxSectors, 
              other.fMaxStrips), 
+    fTotal(0),
     fData(0)
 {
   // Copy constructor 
   fTotal = fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips;
   fData  = new AliFMDEdepHitPair[fTotal];
-  for (size_t i = 0; i < fTotal; i++) fData[i] = other.fData[i];
+  for (Int_t i = 0; i < fTotal; i++) fData[i] = other.fData[i];
 }
 
   
 
 //____________________________________________________________________
-AliFMDEdepMap::AliFMDEdepMap(size_t maxDet, 
-                            size_t maxRing, 
-                            size_t maxSec, 
-                            size_t maxStr)
+AliFMDEdepMap::AliFMDEdepMap(UShort_t maxDet, 
+                            UShort_t maxRing, 
+                            UShort_t maxSec, 
+                            UShort_t maxStr)
   : AliFMDMap(maxDet, maxRing, maxSec, maxStr), 
+    fTotal(0),
     fData(0)
 {
   // Construct a map
@@ -81,7 +83,7 @@ AliFMDEdepMap::operator=(const AliFMDEdepMap& other)
   if (fData) delete [] fData;
   fTotal = fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips;
   fData  = new AliFMDEdepHitPair[fTotal];
-  for (size_t i = 0; i < fTotal; i++) fData[i] = other.fData[i];
+  for (Int_t i = 0; i < fTotal; i++) fData[i] = other.fData[i];
   return *this;
 }
 
@@ -90,7 +92,7 @@ void
 AliFMDEdepMap::Reset() 
 {
   // Reset to zero
-  for (size_t i = 0; i < fTotal; i++) { 
+  for (Int_t i = 0; i < fTotal; i++) { 
     fData[i].fEdep = 0; 
     fData[i].fN = 0; 
   };
@@ -101,7 +103,7 @@ void
 AliFMDEdepMap::Reset(const AliFMDEdepHitPair& val) 
 {
   // Reset to val
-  for (size_t i = 0; i < fTotal; i++) { 
+  for (Int_t i = 0; i < fTotal; i++) { 
     fData[i].fEdep = val.fEdep; 
     fData[i].fN = val.fN; 
   };