Changeset 2619 in Sophya

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

Location:

trunk/SophyaLib/HiStats

Files:

• histerr.cc (modified) (4 diffs)
• histerr.h (modified) (1 diff)
• histos.cc (modified) (6 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;
+}
+
 ///////////////////////////////////////////////////////////
 // --------------------------------------------------------

trunk/SophyaLib/HiStats/histerr.h

@@ -44 +44 @@
   void ToCorrel(void);
 
+  // Operators
+  HistoErr& operator = (const HistoErr& h);
+
 protected:
   void allocate_mNData(int nbin);
+  void Delete(void);
+
   uint_4* mNData;    //!< nombre d'entrees dans chaque bin
 };

trunk/SophyaLib/HiStats/histos.cc

@@ -1 +1 @@
 //
-// $Id: histos.cc,v 1.18 2004-09-10 09:52:19 cmv Exp $
+// $Id: histos.cc,v 1.19 2004-09-15 15:36:54 cmv Exp $
 //
 
@@ -57 +57 @@
 Histo::Histo(const Histo& H)
 : mData((H.mBins>0)? new r_8[H.mBins] : NULL),
-  mErr2(NULL),
+  mErr2((H.mBins>0 && H.mErr2!=NULL)? new r_8[H.mBins]: NULL),
   mUnder(H.mUnder), mOver(H.mOver), nHist(H.nHist), nEntries(H.nEntries),
   mBins(H.mBins), mMin(H.mMin), mMax(H.mMax),
   binWidth(H.binWidth)
 {
-  if(mBins>0) {
-    memcpy(mData, H.mData, mBins*sizeof(r_8));
-    if( H.mErr2 != NULL ) {
-      mErr2 = new r_8[mBins];
-      memcpy(mErr2, H.mErr2, mBins*sizeof(r_8));
-    }
-  }
+  if(mBins<=0) return;
+  memcpy(mData,H.mData,mBins*sizeof(r_8));
+  if(H.mErr2) memcpy(mErr2, H.mErr2, mBins*sizeof(r_8));
 }
 
@@ -95 +91 @@
 void Histo::Zero()
 {
-  if(mBins<=0) return;
-  memset(mData, 0, mBins*sizeof(r_8));
+  if(mBins<=0 || mData==NULL) return;
+  memset(mData,0,mBins*sizeof(r_8));
   mUnder = mOver = 0;
   nHist = 0;
   nEntries = 0;
-  if( mErr2 != NULL ) memset(mErr2, 0, mBins*sizeof(r_8));
+  if(mErr2) memset(mErr2, 0, mBins*sizeof(r_8));
 }
 
@@ -111 +107 @@
  if(mBins<=0) return;
  if(mErr2==NULL) mErr2 = new r_8[mBins];
- memset(mErr2, 0, mBins*sizeof(r_8));
+ memset(mErr2,0,mBins*sizeof(r_8));
 }
 
@@ -121 +117 @@
 {
   if(this == &h) return *this;
-  if( h.mBins <= 0 ) {Delete(); return *this;}
-  if( h.mBins > mBins ) Delete();
-  if(!h.mErr2 && mErr2 ) { delete [] mErr2; mErr2=NULL;}
-  if(!mData) mData = new r_8[h.mBins];
-  if(h.mErr2 && !mErr2 ) mErr2 = new r_8[h.mBins];
-
+  Delete();
+  if(h.mBins<=0 || h.mData==NULL) return *this;
+
+  mData = new r_8[h.mBins];
+  if(h.mErr2) mErr2 = new r_8[h.mBins];
   mUnder = h.mUnder;
   mOver = h.mOver;
@@ -136 +131 @@
   binWidth = h.binWidth;
   
-  memcpy(mData, h.mData, mBins*sizeof(r_8));
-  if(mErr2) memcpy(mErr2, h.mErr2, mBins*sizeof(r_8));
+  memcpy(mData,h.mData,mBins*sizeof(r_8));
+  if(mErr2) memcpy(mErr2,h.mErr2,mBins*sizeof(r_8));
 
   return *this;