Fix for Coverity 10007: BAD_FREE

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

diff --git a/STEER/AliFMDFloatMap.h b/STEER/AliFMDFloatMap.h
index b9c33b55c288f6b3c39418b2c89aac63729d8355..c9a772f5d262f13c4e02102a52dc3b855760b420 100755 (executable)
--- a/STEER/AliFMDFloatMap.h
+++ b/STEER/AliFMDFloatMap.h
@@ -20,12 +20,14 @@
 class AliFMDFloatMap : public AliFMDMap
 {
 public:
-  AliFMDFloatMap(size_t  maxDet = kMaxDetectors, 
-                size_t  maxRing= kMaxRings, 
-                size_t  maxSec = kMaxSectors, 
-                size_t  maxStr = kMaxStrips);
+  AliFMDFloatMap();
+  AliFMDFloatMap(Int_t  maxDet, 
+                Int_t  maxRing= 0, 
+                Int_t  maxSec = 0, 
+                Int_t  maxStr = 0);
+  AliFMDFloatMap(const AliFMDMap& o);
   AliFMDFloatMap(const AliFMDFloatMap& o);
-  virtual ~AliFMDFloatMap() { delete [] fData; }
+  virtual ~AliFMDFloatMap() { delete [] fData;fData = 0; }
   AliFMDFloatMap& operator=(const AliFMDFloatMap& o);
   virtual void Reset(const Float_t& v=Float_t());
   virtual Float_t& operator()(UShort_t det,
@@ -36,12 +38,48 @@ public:
                                    Char_t   ring,
                                    UShort_t sec,
                                    UShort_t str) const;
+  Float_t* Data() const { return fData; }
+  void Print(Option_t* option="%8.4f") const;
 protected:
-  size_t   fTotal;  // Total number of entries
+  Int_t    MaxIndex() const { return fTotal; }
+  Float_t  AtAsFloat(Int_t i) const { return fData[i]; } 
+  Float_t& AtAsFloat(Int_t i)       { return fData[i]; } 
+  Bool_t   IsFloat() const { return kTRUE; }
+
+  Int_t   fTotal;  // Total number of entries
   Float_t* fData;   //[fTotal]
-  ClassDef(AliFMDFloatMap,1) // Map of floats
+  ClassDef(AliFMDFloatMap,3) // Map of floats
 };
 
+inline AliFMDFloatMap
+operator*(const AliFMDMap& lhs, const AliFMDMap& rhs)
+{
+  AliFMDFloatMap r(lhs);
+  r *= rhs;
+  return r;
+}
+inline AliFMDFloatMap
+operator/(const AliFMDMap& lhs, const AliFMDMap& rhs)
+{
+  AliFMDFloatMap r(lhs);
+  r /= rhs;
+  return r;
+}
+inline AliFMDFloatMap
+operator+(const AliFMDMap& lhs, const AliFMDMap& rhs)
+{
+  AliFMDFloatMap r(lhs);
+  r += rhs;
+  return r;
+}
+inline AliFMDFloatMap
+operator-(const AliFMDMap& lhs, const AliFMDMap& rhs)
+{
+  AliFMDFloatMap r(lhs);
+  r -= rhs;
+  return r;
+}
+
 #endif
 //____________________________________________________________________
 //