Corrected FMD data in the ESD (C.Holm)

[u/mrichter/AliRoot.git] / STEER / AliFMDFloatMap.cxx

diff --git a/STEER/AliFMDFloatMap.cxx b/STEER/AliFMDFloatMap.cxx
index 5251a30ce2f897bd24feb4c635af61d2f6fc6b68..dbe33866f9020e1ab2f9ff6c594d519d9d57da4c 100755 (executable)
--- a/STEER/AliFMDFloatMap.cxx
+++ b/STEER/AliFMDFloatMap.cxx
@@ -36,7 +36,8 @@ AliFMDFloatMap::AliFMDFloatMap(const AliFMDFloatMap& other)
     fData(0)
 {
   // Copy constructor
-  fData = new Float_t[fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips];
+  fTotal = fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips;
+  fData  = new Float_t[fTotal];
   for (size_t i = 0; i < fMaxDetectors * fMaxRings 
         * fMaxSectors * fMaxStrips; i++)
     fData[i] = other.fData[i];
@@ -56,7 +57,8 @@ AliFMDFloatMap::AliFMDFloatMap(size_t maxDet,
   //   maxRing Maximum number of rings per detector
   //   maxSec  Maximum number of sectors per ring
   //   maxStr  Maximum number of strips per sector
-  fData = new Float_t[fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips];
+  fTotal = fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips;
+  fData  = new Float_t[fTotal];
   Reset();
 }
 
@@ -69,11 +71,10 @@ AliFMDFloatMap::operator=(const AliFMDFloatMap& other)
   fMaxRings     = other.fMaxRings;
   fMaxSectors   = other.fMaxSectors;
   fMaxStrips    = other.fMaxStrips;
+  fTotal        = fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips;
   if (fData) delete [] fData;
-  fData = new Float_t[fMaxDetectors * fMaxRings * fMaxSectors * fMaxStrips];
-  for (size_t i = 0; i < fMaxDetectors * fMaxRings 
-        * fMaxSectors * fMaxStrips; i++)
-    fData[i] = other.fData[i];
+  fData = new Float_t[fTotal];
+  for (size_t i = 0; i < fTotal; i++) fData[i] = other.fData[i];
   return *this;
 }
 
@@ -82,9 +83,7 @@ void
 AliFMDFloatMap::Reset(const Float_t& val)
 {
   // Reset map to val
-  for (size_t i = 0; i < fMaxDetectors * fMaxRings 
-        * fMaxSectors * fMaxStrips; i++)
-    fData[i] = val;
+  for (size_t i = 0; i < fTotal; i++) fData[i] = val;
 }
 
 //__________________________________________________________