Changeset 2619 in Sophya for trunk/SophyaLib/HiStats/histerr.cc

Timestamp:

Sep 15, 2004, 5:36:54 PM (21 years ago)

Author:

cmv

Message:

correc bug HistoErr::operator=() + remise en forme createur/destructeur Histos cmv 15/9/04

File:

• trunk/SophyaLib/HiStats/histerr.cc (modified) (4 diffs)

trunk/SophyaLib/HiStats/histerr.cc

@@ -44 +44 @@
 HistoErr::~HistoErr(void)
 {
- if(mNData) {delete [] mNData; mNData=NULL;}
-}
+ Delete();
+}
+
 /********* Methode *********/
 /*! Allocation du tableau mNData */
@@ -56 +57 @@
 
 /********* Methode *********/
+/*! Delete des tableaux */
+void HistoErr::Delete(void)
+{
+ Histo::Delete();
+ if(mNData) {delete [] mNData; mNData=NULL;}
+}
+
+/********* Methode *********/
 /*!
   Remise a zero
@@ -61 +70 @@
 void HistoErr::Zero(void)
 {
- if(mNData != NULL) memset(mNData,0,mBins*sizeof(uint_4));
  Histo::Zero();
+ if(mNData) memset(mNData,0,mBins*sizeof(uint_4));
 }
 
@@ -172 +181 @@
 }
 
+/********* Methode *********/
+/*!
+  Operateur egal HistoErr = HistoErr
+*/
+HistoErr& HistoErr::operator = (const HistoErr& h)
+{
+  if(this==&h) return *this;
+  Delete();
+  if(h.mBins<=0) return *this;
+
+  // Copy the "Histo" part
+  (Histo)(*this) = Histo::operator=(h);
+  // Copy the "entries by bin" table
+  allocate_mNData(h.mBins);
+  memcpy(mNData,h.mNData,mBins*sizeof(uint_4));
+
+  return *this;
+}
+
 ///////////////////////////////////////////////////////////
 // --------------------------------------------------------