Changeset 3057 in Sophya for trunk/SophyaLib/HiStats/hisprof.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/hisprof.cc (modified) (14 diffs)

trunk/SophyaLib/HiStats/hisprof.cc

@@ -19 +19 @@
 HProf::HProf()
 : Histo(), mSumY(NULL), mSumY2(NULL), mSumW(NULL)
-, Ok(false), YMin(1.), YMax(-1.), Opt(0)
+, mOk(false), mYMin(1.), mYMax(-1.), mOpt(0)
 {
 }
@@ -56 +56 @@
 , mSumY2((H.mBins>0) ? new r_8[H.mBins] : NULL)
 , mSumW((H.mBins>0)  ? new r_8[H.mBins] : NULL)
-, Ok(H.Ok), YMin(H.YMin), YMax(H.YMax), Opt(H.Opt)
+, mOk(H.mOk), mYMin(H.mYMin), mYMax(H.mYMax), mOpt(H.mOpt)
 {
   if(mBins>0) {
@@ -73 +73 @@
 {
   //cout<<"HProf::CreateOrResize()"<<endl;
+  bool samelen = (nBin==mBins)? true: false;
   Histo::CreateOrResize(xMin,xMax,nBin);
   Histo::Errors();
-  if(mSumY !=NULL) {delete[] mSumY;  mSumY = NULL;}
-  if(mSumY2!=NULL) {delete[] mSumY2; mSumY2= NULL;}
-  if(mSumW !=NULL) {delete[] mSumW;  mSumW = NULL;}
-  if(nBin>0) {
-    mSumY  = new r_8[nBin]; memset(mSumY, 0, nBin*sizeof(r_8));
-    mSumY2 = new r_8[nBin]; memset(mSumY2,0, nBin*sizeof(r_8));
-    mSumW  = new r_8[nBin]; memset(mSumW, 0, nBin*sizeof(r_8));
-  }
-  YMin = yMin; YMax = yMax;
-  Ok = false;
-  Opt = 0;
+  if(mSumW!=NULL && !samelen) { //si un est alloue alors les autres aussi
+    delete[] mSumY;  mSumY = NULL;
+    delete[] mSumY2; mSumY2= NULL;
+    delete[] mSumW;  mSumW = NULL;
+  }
+  if(nBin>0 && mSumW==NULL) {
+    mSumY  = new r_8[nBin];
+    mSumY2 = new r_8[nBin];
+    mSumW  = new r_8[nBin];
+  }
+  if(mSumW) {
+    memset(mSumY, 0, nBin*sizeof(r_8));
+    memset(mSumY2,0, nBin*sizeof(r_8));
+    memset(mSumW, 0, nBin*sizeof(r_8));
+  }
+  mYMin = yMin; mYMax = yMax;
+  mOk = false;
+  mOpt = 0;
 }
 
@@ -99 +107 @@
   if(mSumY2!= NULL) {delete[] mSumY2; mSumY2 = NULL;}
   if(mSumW != NULL) {delete[] mSumW;  mSumW = NULL;}
-  Ok = false;
+  mOk = false;
 }
 
@@ -117 +125 @@
 void HProf::UpdateHisto(bool force) const
 {
-if(!Ok || force) updatehisto();
+if(!mOk || force) updatehisto();
 }
 
@@ -130 +138 @@
   memset(mSumY2, 0, mBins*sizeof(r_8));
   memset(mSumW,  0, mBins*sizeof(r_8));
-  Ok = false;
+  mOk = false;
 }
 
@@ -153 +161 @@
 {
 uint_2 opt = (spread) ? 0 : 1;
-if(opt!=Opt) {Opt=opt; Ok=false;}
+if(opt!=mOpt) {mOpt=opt; mOk=false;}
 }
 
@@ -177 +185 @@
     m  = mSumY[i]/mSumW[i];
     e2 = mSumY2[i]/mSumW[i] - m*m;
-    if(Opt) e2 /= mSumW[i];
+    if(mOpt) e2 /= mSumW[i];
   }
   mData[i] = m;
   mErr2[i] = e2;
 }
-Ok = true;
+mOk = true;
 // Attention, a cause de "WriteSelf const" updatehisto doit etre "const".
-// Comme on veut modifier Ok, on est oblige de faire cette entourloupe:
+// Comme on veut modifier mOk, on est oblige de faire cette entourloupe:
 HProf *buff = (HProf *) this;
-buff->Ok = true;
+buff->mOk = true;
 }
 
@@ -195 +203 @@
 void HProf::Add(r_8 x, r_8 y, r_8 w)
 {
-  if(YMax>YMin && (y<YMin || YMax<y)) return;
+  if(mYMax>mYMin && (y<mYMin || mYMax<y)) return;
   int_4 numBin = FindBin(x);
   if (numBin<0) mUnder += w;
   else if (numBin>=mBins) mOver += w;
   else {
-    Ok = false;
+    mOk = false;
     mSumY[numBin]  += y*w;
     mSumY2[numBin] += y*y*w;
@@ -215 +223 @@
 void HProf::AddBin(int_4 numBin, r_8 y, r_8 w)
 {
-  if(YMax>YMin && (y<YMin || YMax<y)) return;
+  if(mYMax>mYMin && (y<mYMin || mYMax<y)) return;
   if (numBin<0) mUnder += w;
   else if (numBin>=mBins) mOver += w;
   else {
-    Ok = false;
+    mOk = false;
     mSumY[numBin]  += y*w;
     mSumY2[numBin] += y*y*w;
@@ -234 +242 @@
 HProf& HProf::operator = (const HProf& h)
 {
-if(this == &h) return *this;
-if( h.mBins > mBins ) Delete();
-Histo *hthis = (Histo *) this;
-*hthis = (Histo) h;
-if(!mSumY)  mSumY  = new r_8[mBins];
-if(!mSumY2) mSumY2 = new r_8[mBins];
-if(!mSumW)  mSumW  = new r_8[mBins];
-memcpy(mSumY,  h.mSumY,  mBins*sizeof(r_8));
-memcpy(mSumY2, h.mSumY2, mBins*sizeof(r_8));
-memcpy(mSumW,  h.mSumW,  mBins*sizeof(r_8));
-Ok = h.Ok;
-YMin = h.YMin;
-YMax = h.YMax;
-Opt = h.Opt;
-
-return *this;
+ if(this == &h) return *this;
+ CreateOrResize(h.mMin,h.mMax,h.mBins,h.mYMin,h.mYMax);
+ 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(mSumY)  memcpy(mSumY,  h.mSumY,  mBins*sizeof(r_8));
+ if(mSumY2) memcpy(mSumY2, h.mSumY2, mBins*sizeof(r_8));
+ if(mSumW)  memcpy(mSumW,  h.mSumW,  mBins*sizeof(r_8));
+ mOk = h.mOk;
+ mOpt = h.mOpt;
+
+ return *this;
 }
 
@@ -331 +336 @@
   UpdateHisto();
   Histo::Show(os);
-  os <<"       ymin="<<YMin<<" ymax="<<YMax<<"  opt="<<Opt<< endl;
+  os <<"       ymin="<<mYMin<<" ymax="<<mYMax<<"  opt="<<mOpt<< endl;
 }
 
@@ -354 +359 @@
 // Lecture des valeurs
 is.Get(dobj->mBins);
-is.Get(dobj->YMin);
-is.Get(dobj->YMax);
-is.Get(dobj->Opt);
-dobj->Ok = true;
+is.Get(dobj->mYMin);
+is.Get(dobj->mYMax);
+is.Get(dobj->mOpt);
+dobj->mOk = true;
 
 // Lecture des donnees propres a l'histogramme de profil.
 is.GetLine(strg,255);
-dobj->mSumY  = new r_8[dobj->mBins];
-dobj->mSumY2 = new r_8[dobj->mBins];
-dobj->mSumW  = new r_8[dobj->mBins];
+if(dobj->mBins>0) {
+  dobj->mSumY  = new r_8[dobj->mBins];
+  dobj->mSumY2 = new r_8[dobj->mBins];
+  dobj->mSumW  = new r_8[dobj->mBins];
+}
 is.Get(dobj->mSumY,  dobj->mBins);
 is.Get(dobj->mSumY2, dobj->mBins);
@@ -383 +390 @@
 
 // Ecriture entete pour identifier facilement
-sprintf(strg,"HProf: YMin=%f  YMax=%f  Opt=%1d",dobj->YMin,dobj->YMax,dobj->Opt);
+sprintf(strg,"HProf: YMin=%f  YMax=%f  Opt=%1d",dobj->mYMin,dobj->mYMax,dobj->mOpt);
 os.PutLine(strg);
 
 // Ecriture des valeurs
 os.Put(dobj->mBins);
-os.Put(dobj->YMin);
-os.Put(dobj->YMax);
-os.Put(dobj->Opt);
+os.Put(dobj->mYMin);
+os.Put(dobj->mYMax);
+os.Put(dobj->mOpt);
 
 // Ecriture des donnees propres a l'histogramme de profil.