Changeset 1092 in Sophya for trunk/SophyaLib/HiStats/hisprof.cc

Timestamp:

Jul 26, 2000, 3:15:52 PM (25 years ago)

Author:

ansari

Message:

Histos/Hprof/Histo2D en r_8 cmv 26/7/00

File:

• trunk/SophyaLib/HiStats/hisprof.cc (modified) (17 diffs)

trunk/SophyaLib/HiStats/hisprof.cc

@@ -31 +31 @@
   SetErrOpt(1) permet de demander de calculer l'erreur sur la moyenne.
 */
-HProf::HProf(float xMin, float xMax, int nBin, float yMin, float yMax)
+HProf::HProf(r_8 xMin, r_8 xMax, int_4 nBin, r_8 yMin, r_8 yMax)
 : Histo(xMin,xMax,nBin)
-, SumY(new double[nBin]), SumY2(new double[nBin]), SumW(new double[nBin])
+, SumY( (nBin>0) ? new r_8[nBin] : NULL)
+, SumY2((nBin>0) ? new r_8[nBin] : NULL)
+, SumW( (nBin>0) ? new r_8[nBin] : NULL)
 , Ok(false), YMin(yMin), YMax(yMax), Opt(0)
 {
@@ -43 +45 @@
 /********* Methode *********/
 /*!
+  Constructeur.
+*/
+HProf::HProf(r_4 xMin, r_4 xMax, int_4 nBin, r_4 yMin, r_4 yMax)
+: Histo((r_8)xMin,(r_8)xMax,nBin)
+, SumY( (nBin>0) ? new r_8[nBin] : NULL)
+, SumY2((nBin>0) ? new r_8[nBin] : NULL)
+, SumW( (nBin>0) ? new r_8[nBin] : NULL)
+, Ok(false), YMin((r_8)yMin), YMax((r_8)yMax), Opt(0)
+{
+  Histo::Errors();
+  Zero();
+  END_CONSTRUCTOR
+}
+
+/********* Methode *********/
+/*!
   Constructeur par copie.
 */
 HProf::HProf(const HProf& H)
 : Histo(H)
-, SumY((H.bins>0)  ? new double[H.bins] : NULL)
-, SumY2((H.bins>0) ? new double[H.bins] : NULL)
-, SumW((H.bins>0)  ? new double[H.bins] : NULL)
+, SumY((H.mBins>0)  ? new r_8[H.mBins] : NULL)
+, SumY2((H.mBins>0) ? new r_8[H.mBins] : NULL)
+, SumW((H.mBins>0)  ? new r_8[H.mBins] : NULL)
 , Ok(H.Ok), YMin(H.YMin), YMax(H.YMax), Opt(H.Opt)
 {
-  if(bins>0) {
-    memcpy(SumY,  H.SumY,  bins*sizeof(double));
-    memcpy(SumY2, H.SumY2, bins*sizeof(double));
-    memcpy(SumW,  H.SumW,  bins*sizeof(double));
+  if(mBins>0) {
+    memcpy(SumY,  H.SumY,  mBins*sizeof(r_8));
+    memcpy(SumY2, H.SumY2, mBins*sizeof(r_8));
+    memcpy(SumW,  H.SumW,  mBins*sizeof(r_8));
   }
   UpdateHisto();
@@ -88 +106 @@
 void HProf::Zero()
 {
-  memset(SumY,  0, bins*sizeof(double));
-  memset(SumY2, 0, bins*sizeof(double));
-  memset(SumW,  0, bins*sizeof(double));
+  memset(SumY,  0, mBins*sizeof(r_8));
+  memset(SumY2, 0, mBins*sizeof(r_8));
+  memset(SumW,  0, mBins*sizeof(r_8));
   Ok = false;
   Histo::Zero();
@@ -112 +130 @@
 void HProf::SetErrOpt(bool spread)
 {
-int opt = (spread) ? 0 : 1;
+uint_2 opt = (spread) ? 0 : 1;
 if(opt!=Opt) {Opt=opt; Ok=false;}
 }
@@ -130 +148 @@
 void HProf::updatehisto() const
 {
-float m,e2;
-if(bins>0) for(int i=0;i<bins;i++) {
+r_8 m,e2;
+if(mBins>0) for(int_4 i=0;i<mBins;i++) {
   if(SumW[i]<=0.) {
     m = e2 = 0.;
@@ -139 +157 @@
     if(Opt) e2 /= SumW[i];
   }
-  data[i] = m;
-  err2[i] = e2;
+  mData[i] = m;
+  mErr2[i] = e2;
 }
 Ok = true;
@@ -153 +171 @@
   Addition au contenu de l'histo pour abscisse x de la valeur y et poids w
 */
-void HProf::Add(float x, float y, float w)
+void HProf::Add(r_8 x, r_8 y, r_8 w)
 {
   if(YMax>YMin && (y<YMin || YMax<y)) return;
-  int numBin = FindBin(x);
-  if (numBin<0) under += w;
-  else if (numBin>=bins) over += w;
+  int_4 numBin = FindBin(x);
+  if (numBin<0) mUnder += w;
+  else if (numBin>=mBins) mOver += w;
   else {
     Ok = false;
@@ -173 +191 @@
   Addition au contenu de l'histo bin numBin de la valeur y poids w
 */
-void HProf::AddBin(int numBin, float y, float w)
+void HProf::AddBin(int_4 numBin, r_8 y, r_8 w)
 {
   if(YMax>YMin && (y<YMin || YMax<y)) return;
-  if (numBin<0) under += w;
-  else if (numBin>=bins) over += w;
+  if (numBin<0) mUnder += w;
+  else if (numBin>=mBins) mOver += w;
   else {
     Ok = false;
@@ -195 +213 @@
 {
 if(this == &h) return *this;
-if( h.bins > bins ) Delete();
+if( h.mBins > mBins ) Delete();
 Histo *hthis = (Histo *) this;
 *hthis = (Histo) h;
-if(!SumY)  SumY  = new double[bins];
-if(!SumY2) SumY2 = new double[bins];
-if(!SumW)  SumW  = new double[bins];
-memcpy(SumY,  h.SumY,  bins*sizeof(double));
-memcpy(SumY2, h.SumY2, bins*sizeof(double));
-memcpy(SumW,  h.SumW,  bins*sizeof(double));
+if(!SumY)  SumY  = new r_8[mBins];
+if(!SumY2) SumY2 = new r_8[mBins];
+if(!SumW)  SumW  = new r_8[mBins];
+memcpy(SumY,  h.SumY,  mBins*sizeof(r_8));
+memcpy(SumY2, h.SumY2, mBins*sizeof(r_8));
+memcpy(SumW,  h.SumW,  mBins*sizeof(r_8));
 Ok = h.Ok;
 YMin = h.YMin;
@@ -222 +240 @@
 HProf& HProf::operator += (const HProf& a)
 {
-if(bins!=a.bins) THROW(sizeMismatchErr);
+if(mBins!=a.mBins) THROW(sizeMismatchErr);
 Histo *hthis = (Histo *) this;
 *hthis += (Histo) a;
-if(bins>0) for(int i=0;i<bins;i++) {
+if(mBins>0) for(int_4 i=0;i<mBins;i++) {
   SumY[i]  += a.SumY[i];
   SumY2[i] += a.SumY2[i];
@@ -239 +257 @@
   Pour rebinner l'histogramme de profile sur nbinew bins
 */
-void HProf::HRebin(int nbinew)
-{
-  if( bins <= 0 ) return; // createur par default
+void HProf::HRebin(int_4 nbinew)
+{
+  if( mBins <= 0 ) return; // createur par default
   if( nbinew <= 0 ) return;
 
@@ -248 +266 @@
 
   // Rebin de la partie Histo
-  int binold = bins;
+  int_4 binold = mBins;
   Histo::HRebin(nbinew);
 
   // Le nombre de bins est il plus grand ??
-  if( bins > binold ) {
-    delete [] SumY;  SumY  = new double[nbinew]; memset(SumY, 0,bins*sizeof(double));
-    delete [] SumY2; SumY2 = new double[nbinew]; memset(SumY2,0,bins*sizeof(double));
-    delete [] SumW;  SumW  = new double[nbinew]; memset(SumW, 0,bins*sizeof(double));
+  if( mBins > binold ) {
+    delete [] SumY;  SumY  = new r_8[nbinew]; memset(SumY, 0,mBins*sizeof(r_8));
+    delete [] SumY2; SumY2 = new r_8[nbinew]; memset(SumY2,0,mBins*sizeof(r_8));
+    delete [] SumW;  SumW  = new r_8[nbinew]; memset(SumW, 0,mBins*sizeof(r_8));
   }
 
   // Remplissage des parties propres au HPprof
-  for(int i=0;i<bins;i++) {
-    float xmi = BinLowEdge(i);
-    float xma = BinHighEdge(i);
-    int imi =  H.FindBin(xmi);
+  for(int_4 i=0;i<mBins;i++) {
+    r_8 xmi = BinLowEdge(i);
+    r_8 xma = BinHighEdge(i);
+    int_4 imi =  H.FindBin(xmi);
     if( imi < 0 ) imi = 0;
-    int ima =  H.FindBin(xma);
-    if( ima >= H.bins ) ima = H.bins-1;
-    double wY = 0., wY2 = 0., wW = 0.;
+    int_4 ima =  H.FindBin(xma);
+    if( ima >= H.mBins ) ima = H.mBins-1;
+    r_8 wY = 0., wY2 = 0., wW = 0.;
     if( ima == imi ) {
       wY  = H.SumY[imi]  * binWidth/H.binWidth;
@@ -278 +296 @@
       wW  += H.SumW[imi]  * (H.BinHighEdge(imi)-xmi)/H.binWidth;
       wW  += H.SumW[ima]  * (xma -H.BinLowEdge(ima))/H.binWidth;
-      if(ima>imi+1) for(int ii=imi+1;ii<ima;ii++)
+      if(ima>imi+1) for(int_4 ii=imi+1;ii<ima;ii++)
         {wY += H.SumY[ii]; wY2 += H.SumY2[ii]; wW += H.SumW[ii];}
     }
@@ -305 +323 @@
 
 // Lecture des valeurs
-is.Get(dobj->bins);
+is.Get(dobj->mBins);
 is.Get(dobj->YMin);
 is.Get(dobj->YMax);
@@ -313 +331 @@
 // Lecture des donnees propres a l'histogramme de profil.
 is.GetLine(strg,255);
-dobj->SumY  = new double[dobj->bins];
-dobj->SumY2 = new double[dobj->bins];
-dobj->SumW  = new double[dobj->bins];
-is.Get(dobj->SumY,  dobj->bins);
-is.Get(dobj->SumY2, dobj->bins);
-is.Get(dobj->SumW,  dobj->bins);
+dobj->SumY  = new r_8[dobj->mBins];
+dobj->SumY2 = new r_8[dobj->mBins];
+dobj->SumW  = new r_8[dobj->mBins];
+is.Get(dobj->SumY,  dobj->mBins);
+is.Get(dobj->SumY2, dobj->mBins);
+is.Get(dobj->SumW,  dobj->mBins);
 
 // Lecture de l'histogramme
@@ -337 +355 @@
 
 // Ecriture des valeurs
-os.Put(dobj->bins);
+os.Put(dobj->mBins);
 os.Put(dobj->YMin);
 os.Put(dobj->YMax);
@@ -345 +363 @@
 sprintf(strg,"HProf: SumY SumY2 SumW");
 os.PutLine(strg);
-os.Put(dobj->SumY,  dobj->bins);
-os.Put(dobj->SumY2, dobj->bins);
-os.Put(dobj->SumW,  dobj->bins);
+os.Put(dobj->SumY,  dobj->mBins);
+os.Put(dobj->SumY2, dobj->mBins);
+os.Put(dobj->SumW,  dobj->mBins);
 
 // Ecriture de l'histogramme