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

Timestamp:

Aug 13, 2006, 12:41:09 AM (19 years ago)

Author:

cmv

Message:

• changement nom variables internes Histo...Histo2D
• re-arrangement CreateOrResize et operator=
• protection dans methodes (VMIN etc..) pour Histo 1d+2d vides

cmv 13/8/2006

File:

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

trunk/SophyaLib/HiStats/histerr.cc

@@ -49 +49 @@
 {
   //cout<<"HistoErr::CreateOrResize()"<<endl;
+  bool samelen = (nBin==mBins)? true: false;
   Histo::CreateOrResize(xMin,xMax,nBin);
   Histo::Errors();
-  allocate_mNData(nBin);
+  if(mNData!=NULL && !samelen) {delete [] mNData; mNData=NULL;}
+  if(nBin>0 && mNData==NULL) mNData = new r_8[nBin];
+  if(mNData) memset(mNData,0,nBin*sizeof(r_8));
   mCorrel = 0;
-}
-
-/********* Methode *********/
-/*! Allocation du tableau mNData */
-void HistoErr::allocate_mNData(int nbin)
-{
-  if(mNData) {delete [] mNData; mNData=NULL;}
-  if(nbin<=0) return;
-  mNData = new r_8[nbin];
-  memset(mNData,0,nbin*sizeof(r_8));
 }
 
@@ -199 +192 @@
 {
   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(r_8));
+  CreateOrResize(h.mMin,h.mMax,h.mBins);
+  if(mData) memcpy(mData,h.mData,mBins*sizeof(r_8));
+  if(mErr2) memcpy(mErr2,h.mErr2,mBins*sizeof(r_8));
+  mUnder = h.mUnder; mOver = h.mOver;
+  nHist = h.nHist; nEntries = h.nEntries;
+  if(mNData) memcpy(mNData,h.mNData,mBins*sizeof(r_8));
   mCorrel = h.mCorrel;
 
@@ -244 +235 @@
 // Lecture des donnees HistoErr
 is.Get(dobj->mBins);
-  dobj->allocate_mNData(dobj->mBins);
+if(dobj->mBins>0) dobj->mNData = new r_8[dobj->mBins];
 is.Get(dobj->mNData, dobj->mBins);