Changeset 3147 in Sophya for trunk/SophyaLib/HiStats/histerr.h

Timestamp:

Jan 18, 2007, 7:20:16 PM (19 years ago)

Author:

cmv

Message:

correct bug, intro ToVariance et changement nom ToCorrel->ToMean cmv 18/01/2007

File:

• trunk/SophyaLib/HiStats/histerr.h (modified) (5 diffs)

trunk/SophyaLib/HiStats/histerr.h

@@ -81 +81 @@
     data_(i) += w; ndata_(i) += 1.; err2_(i) += e*e;
     }
-  inline void Add(r_8 x, r_8 w) {Add(x,w,1.);}
-  inline void Add(r_8 x) {Add(x,1.,1.);}
+  inline void Add(r_8 x, r_8 w) {Add(x,w,w);}
 
   //! Addition du contenu de l'histo pour le bin i poids w et l'erreur e
@@ -90 +89 @@
     data_(i) += w; ndata_(i) += 1.; err2_(i) += e*e;
     }
-  inline void AddBin(int_4 i, r_8 w) {AddBin(i,w,1.);}
-  inline void AddBin(int_4 i) {AddBin(i,1.,1.);}
+  inline void AddBin(int_4 i, r_8 w) {AddBin(i,w,w);}
 
   //! remplissage contenu de l'histo pour le bin i poids w et l'erreur e
@@ -101 +99 @@
     ndata_(i) = nb;
     }
-  inline void SetBin(int_4 i, r_8 w, r_8 e) {SetBin(i,w,e,1.);}
-  inline void SetBin(int_4 i, r_8 w) {SetBin(i,w,1.,1.);}
-  inline void SetBin(int_4 i) {SetBin(i,1.,1.,1.);}
+  //! remplissage de la valeur pour le bin i
+  inline void SetBin(int_4 i, r_8 w)
+    {
+    if(i<0 || i>=nx_) return;
+    data_(i)  = w;
+    }
   //! remplissage de l'erreur carree pour le bin i
   void SetErr2(int_4 i, r_8 e2)
@@ -117 +118 @@
     }
 
-  //! Compute the correlation histogram
-  void ToCorrel(void);
-  void FromCorrel(void);
-  int_4 NCorrel(void) {return mCorrel;}
-  void SetCorrel(int_4 mcorrel) {mCorrel = mcorrel;}
+  //! Compute the mean histogram
+  void ToMean(void);
+  void FromMean(void);
+  int_4 NMean(void) {return mMean;}
+  void SetMean(int_4 nmean) {mMean = nmean;}
+
+  //! Replace the errors by the variance
+  void ToVariance(void);
+  void FromVariance(void);
 
   //! Fill an histogram with an histogram
@@ -147 +152 @@
   TVector<r_8> err2_;
   TVector<r_8> ndata_;
-  int_4 mCorrel;  //!< Nombre d'appels a ToCorrel(+1) ou FromCorrel(-1)
+  int_4 mMean;  //!< Nombre d'appels a ToMean/Variance(+1) ou FromMean/Variance(-1)
 };