Changeset 3053 in Sophya for trunk/SophyaLib/HiStats/histos.cc

Timestamp:

Aug 12, 2006, 7:29:29 PM (19 years ago)

Author:

cmv

Message:

correction bug + addaptation pour ecriture fits cmv 12/8/2006

File:

• trunk/SophyaLib/HiStats/histos.cc (modified) (8 diffs)

trunk/SophyaLib/HiStats/histos.cc

@@ -1 +1 @@
 //
-// $Id: histos.cc,v 1.22 2006-08-07 17:38:47 cmv Exp $
+// $Id: histos.cc,v 1.23 2006-08-12 17:29:29 cmv Exp $
 //
 
@@ -22 +22 @@
 /*! Constructeur par defaut */
 Histo::Histo()
-: mData(NULL), mErr2(NULL),
-  mUnder(0), mOver(0), nHist(0), nEntries(0),
-  mBins(0), mMin(0), mMax(0),
-  binWidth(0)
+: mData(NULL), mErr2(NULL)
+,  mUnder(0.), mOver(0.), nHist(0.), nEntries(0)
+,  mBins(0), mMin(0.), mMax(0.), binWidth(0.)
 {
 }
@@ -32 +31 @@
 /*! Constructeur d'un histo de nBin bins allant de xMin a xMax */
 Histo::Histo(r_8 xMin, r_8 xMax, int_4 nBin)
-: mData((nBin>0) ? new r_8[nBin] : NULL),
-  mErr2(NULL),
-  mUnder(0), mOver(0), nHist(0), nEntries(0),
-  mBins(nBin), mMin(xMin), mMax(xMax),
-  binWidth((nBin>0) ? (mMax-mMin)/nBin : 0)
-{
-  Zero();
+: mData(NULL), mErr2(NULL)
+{
+  CreateOrResize(xMin,xMax,nBin);
 }
 
@@ -44 +39 @@
 /*! Constructeur d'un histo de nBin bins allant de xMin a xMax */
 Histo::Histo(r_4 xMin, r_4 xMax, int_4 nBin)
-: mData((nBin>0) ? new r_8[nBin] : NULL),
-  mErr2(NULL),
-  mUnder(0), mOver(0), nHist(0), nEntries(0),
-  mBins(nBin), mMin((r_8)xMin), mMax((r_8)xMax),
-  binWidth((nBin>0) ? (mMax-mMin)/nBin : 0)
-{
-  Zero();
+: mData(NULL), mErr2(NULL)
+{
+  CreateOrResize((r_8)xMin,(r_8)xMax,nBin);
 }
 
@@ -68 +59 @@
 
 /********* Methode *********/
+/*! Destructeur */
+Histo::~Histo()
+{
+  Delete();
+}
+
+/********* Methode *********/
+/*! Gestion de l'allocation */
+void Histo::CreateOrResize(r_8 xMin, r_8 xMax, int_4 nBin)
+{
+  //cout<<"Histo::CreateOrResize()"<<endl;
+  if(mData != NULL) {delete[] mData; mData = NULL;}
+  if(mErr2 != NULL) {delete[] mErr2; mErr2 = NULL;}
+  if(nBin>0) {mData = new r_8[nBin]; memset(mData,0,nBin*sizeof(r_8));}
+  mBins = nBin;
+  mMin = xMin; mMax = xMax;
+  binWidth = (nBin>0) ? (mMax-mMin)/nBin : 0.;
+  mUnder = mOver = nHist = 0.;
+  nEntries = 0;
+}
+
+/********* Methode *********/
 /*! Gestion de la des-allocation */
 void Histo::Delete()
 {
-  if( mData != NULL ) { delete[] mData; mData = NULL;}
-  if( mErr2 != NULL ) { delete[] mErr2; mErr2 = NULL;}
-  mUnder = mOver = mMin = mMax = binWidth= 0.;
-  nHist = 0.;
-  mBins = 0;
-  nEntries = 0;
-}
-
-/********* Methode *********/
-/*! Destructeur */
-Histo::~Histo()
-{
-Delete();
+ //cout<<"Histo::Delete()"<<endl;
+ if(mData != NULL) {delete[] mData; mData = NULL;}
+ if(mErr2 != NULL) {delete[] mErr2; mErr2 = NULL;}
+ mUnder = mOver = mMin = mMax = binWidth = nHist = 0.;
+ mBins = 0;
+ nEntries = 0;
 }
 
@@ -94 +100 @@
   if(mBins<=0 || mData==NULL) return;
   memset(mData,0,mBins*sizeof(r_8));
-  mUnder = mOver = 0;
-  nHist = 0;
+  if(mErr2) memset(mErr2,0, mBins*sizeof(r_8));
+  mUnder = mOver = nHist = 0;
   nEntries = 0;
-  if(mErr2) memset(mErr2, 0, mBins*sizeof(r_8));
 }
 
@@ -106 +111 @@
 void Histo::Errors()
 {
+ if(mErr2 != NULL) {delete[] mErr2; mErr2 = NULL;}
  if(mBins<=0) return;
- if(mErr2==NULL) mErr2 = new r_8[mBins];
+ mErr2 = new r_8[mBins];
  memset(mErr2,0,mBins*sizeof(r_8));
 }
@@ -141 +147 @@
   mData = new r_8[h.mBins];
   if(h.mErr2) mErr2 = new r_8[h.mBins];
-  mUnder = h.mUnder;
-  mOver = h.mOver;
+  mUnder = h.mUnder; mOver = h.mOver;
   nHist = h.nHist;
   nEntries = h.nEntries;
   mBins = h.mBins;
-  mMin = h.mMin;
-  mMax = h.mMax;
+  mMin = h.mMin; mMax = h.mMax;
   binWidth = h.binWidth;