Changeset 2628 in Sophya for trunk/SophyaLib/HiStats

Timestamp:

Oct 13, 2004, 6:41:33 PM (21 years ago)

Author:

cmv

Message:

NEntries goes from int_4 to uint_8 cmv 13/10/04

Location:

trunk/SophyaLib/HiStats

Files:

• histerr.cc (modified) (1 diff)
• histerr.h (modified) (1 diff)
• histos.cc (modified) (5 diffs)
• histos.h (modified) (3 diffs)

trunk/SophyaLib/HiStats/histerr.cc

@@ -185 +185 @@
 /********* Methode *********/
 /*!
+ Fill the histogram with an other histogram
+*/
+void HistoErr::FillFrHErr(HistoErr& hfrom)
+{
+ if(mBins<=0) return;
+ if(hfrom.mBins<=0) return;
+
+ Zero();
+
+ for(int_4 i=0;i<hfrom.mBins;i++) {
+   int numBin = FindBin(hfrom.BinCenter(i));
+   if(numBin<0) mUnder += hfrom.mData[i];
+   else if(numBin>=mBins) mOver += hfrom.mData[i];
+   else {
+     mData[numBin]  += hfrom.mData[i];
+     mNData[numBin] += hfrom.mNData[i];
+     mErr2[numBin]  += hfrom.mErr2[i];
+     nHist          += hfrom.mData[i];
+     nEntries++;
+   }
+ }
+
+}
+
+/********* Methode *********/
+/*!
   Operateur egal HistoErr = HistoErr
 */

trunk/SophyaLib/HiStats/histerr.h

@@ -44 +44 @@
   void ToCorrel(void);
 
+  //! Fill an histogram with an histogram
+  void FillFrHErr(HistoErr& hfrom);
+
   // Operators
   HistoErr& operator = (const HistoErr& h);

trunk/SophyaLib/HiStats/histos.cc

@@ -1 +1 @@
 //
-// $Id: histos.cc,v 1.19 2004-09-15 15:36:54 cmv Exp $
+// $Id: histos.cc,v 1.20 2004-10-13 16:41:33 cmv Exp $
 //
 
@@ -75 +75 @@
   mUnder = mOver = mMin = mMax = binWidth= 0.;
   nHist = 0.;
-  nEntries = mBins = 0;
+  mBins = 0;
+  nEntries = 0;
 }
 
@@ -1446 +1447 @@
 // Lecture entete
 is.GetLine(strg, 255);
+bool nentries_en_8_bytes=false;
+if(strg[0]=='V' && strg[1]=='_' && strg[2]=='2') nentries_en_8_bytes=true;
 is.GetLine(strg, 255);
 is.GetLine(strg, 255);
@@ -1451 +1454 @@
 // Lecture des valeurs
 is.Get(dobj->mBins);
-is.Get(dobj->nEntries);
+if(nentries_en_8_bytes) is.Get(dobj->nEntries);
+ else {int_4 dum; is.Get(dum); dobj->nEntries=(uint_8)dum;}
 int_4 errok;
 is.Get(errok);
@@ -1488 +1492 @@
 
 // Ecriture entete pour identifier facilement
-sprintf(strg,"mBins=%6d  NEnt=%15d  errok=%1d",dobj->mBins,dobj->nEntries,errok);
+sprintf(strg,"V_2 mBins=%6d  NEnt=%15d  errok=%1d",dobj->mBins,dobj->nEntries,errok);
 os.PutLine(strg);
 sprintf(strg,"binw=%g  mMin=%g mMax=%g",dobj->binWidth,dobj->mMin,dobj->mMax);

trunk/SophyaLib/HiStats/histos.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: histos.h,v 1.18 2004-03-15 16:47:20 ansari Exp $
+// $Id: histos.h,v 1.19 2004-10-13 16:41:33 cmv Exp $
 //
 
@@ -96 +96 @@
   inline r_8 NData() const            {return nHist;}
   //! Retourne le nombre d'entrees
-  inline r_8 NEntries() const         {return nEntries;}
+  inline uint_8 NEntries() const         {return nEntries;}
   //! Retourne le nombre d'overflow
   inline r_8 NOver() const            {return mOver;}
@@ -156 +156 @@
   r_8    mOver;    //!< overflow
   r_8    nHist;    //!< somme ponderee des entrees
-  int_4  nEntries; //!< nombre d'entrees
+  uint_8 nEntries; //!< nombre d'entrees
   int_4  mBins;    //!< nombre de bins
   r_8    mMin;     //!< abscisse minimum