Fix for coverity 17562

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

diff --git a/FMD/AliFMDEdepMap.cxx b/FMD/AliFMDEdepMap.cxx
index aa8cd817bd8c376851a80bb9983331d99d4fbe96..634161935fa39500a396f9d0052c2791676fb8eb 100644 (file)
--- a/FMD/AliFMDEdepMap.cxx
+++ b/FMD/AliFMDEdepMap.cxx
@@ -40,22 +40,35 @@ ClassImp(AliFMDEdepMap)
 AliFMDEdepMap::AliFMDEdepMap(const AliFMDEdepMap& other)
   : AliFMDMap(other.fMaxDetectors, other.fMaxRings, other.fMaxSectors, 
              other.fMaxStrips), 
+    fTotal(fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips),
     fData(0)
 {
   // Copy constructor 
-  fTotal = fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips;
+  if (fTotal == 0) fTotal = 51200;
   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()
+  : AliFMDMap(), 
+    fTotal(0),
+    fData(0)
+{
+  // Construct a map
+  //
+  // Parameters:
+  //   None
+}
 
 //____________________________________________________________________
-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(fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips),
     fData(0)
 {
   // Construct a map
@@ -65,7 +78,7 @@ AliFMDEdepMap::AliFMDEdepMap(size_t maxDet,
   //     maxRinf      Maximum # of rings
   //     maxSec       Maximum # of sectors
   //     maxStr       Maximum # of strips
-  fTotal = fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips;
+  if (fTotal == 0) fTotal = 51200;
   fData  = new AliFMDEdepHitPair[fTotal];
 }
 
@@ -80,8 +93,9 @@ AliFMDEdepMap::operator=(const AliFMDEdepMap& other)
   fMaxStrips    = other.fMaxStrips;
   if (fData) delete [] fData;
   fTotal = fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips;
+  if (fTotal == 0) fTotal = 51200;
   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,9 +104,11 @@ void
 AliFMDEdepMap::Reset() 
 {
   // Reset to zero
-  for (size_t i = 0; i < fTotal; i++) { 
-    fData[i].fEdep = 0; 
-    fData[i].fN = 0; 
+  for (Int_t i = 0; i < fTotal; i++) { 
+    fData[i].fEdep  = 0; 
+    fData[i].fN     = 0; 
+    fData[i].fNPrim = 0;
+    fData[i].fLabels.Reset();
   };
 }
 
@@ -101,15 +117,18 @@ void
 AliFMDEdepMap::Reset(const AliFMDEdepHitPair& val) 
 {
   // Reset to val
-  for (size_t i = 0; i < fTotal; i++) { 
-    fData[i].fEdep = val.fEdep; 
-    fData[i].fN = val.fN; 
+  for (Int_t i = 0; i < fTotal; i++) { 
+    fData[i].fEdep   = val.fEdep; 
+    fData[i].fN      = val.fN; 
+    fData[i].fNPrim  = val.fNPrim;
+    fData[i].fLabels = val.fLabels;
   };
 }
 
 //____________________________________________________________________
 AliFMDEdepHitPair& 
-AliFMDEdepMap::operator()(UShort_t det, Char_t ring, UShort_t sec, UShort_t str) 
+AliFMDEdepMap::operator()(UShort_t det, Char_t ring, 
+                         UShort_t sec, UShort_t str) 
 {
   // Get data 
   // 
@@ -126,7 +145,8 @@ AliFMDEdepMap::operator()(UShort_t det, Char_t ring, UShort_t sec, UShort_t str)
 
 //____________________________________________________________________
 const AliFMDEdepHitPair& 
-AliFMDEdepMap::operator()(UShort_t det, Char_t ring, UShort_t sec, UShort_t str) const
+AliFMDEdepMap::operator()(UShort_t det, Char_t ring, 
+                         UShort_t sec, UShort_t str) const
 {
   // Get data 
   //