Changeset 2630 in Sophya for trunk/SophyaLib/HiStats

Timestamp:

Oct 26, 2004, 6:26:39 PM (21 years ago)

Author:

cmv

Message:

gestion des param par default, cmv+rz 26/10/04

Location:

trunk/SophyaLib/HiStats

Files:

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

trunk/SophyaLib/HiStats/histerr.cc

@@ -72 +72 @@
  Histo::Zero();
  if(mNData) memset(mNData,0,mBins*sizeof(r_8));
-}
-
-/********* Methode *********/
-/*!
- Addition du contenu de l'histo pour abscisse x poids w et l'erreur e
-*/
-void HistoErr::Add(r_8 x, r_8 w, r_8 e)
-{
- int_4 numBin = (int_4)floor((x-mMin)/binWidth);
- if(numBin<0) mUnder += w;
- else if(numBin>=mBins) mOver += w;
- else {
-   mData[numBin] += w; mNData[numBin] += 1.; mErr2[numBin] += e*e;
-   nHist += w; nEntries++;
- }
-}
-
-/********* Methode *********/
-/*!
- Addition du contenu de l'histo pour le bin numBin poids w et l'erreur e
-*/
-void HistoErr::AddBin(int_4 numBin, r_8 w, r_8 e)
-{
- if(numBin<0) mUnder += w;
- else if(numBin>=mBins) mOver += w;
- else {
-   mData[numBin] += w; mNData[numBin] += 1.; mErr2[numBin] += e*e;
-   nHist += w; nEntries++;
- }
 }
 

trunk/SophyaLib/HiStats/histerr.h

@@ -23 +23 @@
   void Zero(void);
   //! Addition du contenu de l'histo pour abscisse x poids w et l'erreur e
-  void Add(r_8 x, r_8 w=1., r_8 e=1.);
+  inline void Add(r_8 x, r_8 w, r_8 e)
+  {
+  int_4 numBin = (int_4)floor((x-mMin)/binWidth);
+  if(numBin<0) mUnder += w;
+  else if(numBin>=mBins) mOver += w;
+  else {
+    mData[numBin] += w; mNData[numBin] += 1.; mErr2[numBin] += e*e;
+    nHist += w; nEntries++;
+  }
+  }
+  inline void Add(r_8 x, r_8 w) {Add(x,w,1.);}
+  inline void Add(r_8 x) {Add(x,1.,1.);}
   //! Addition du contenu de l'histo pour le bin numBin poids w et l'erreur e
-  void AddBin(int_4 numBin, r_8 w=1., r_8 e=1.);
+  inline void AddBin(int_4 numBin, r_8 w, r_8 e)
+  {
+  if(numBin<0) mUnder += w;
+  else if(numBin>=mBins) mOver += w;
+  else {
+    mData[numBin] += w; mNData[numBin] += 1.; mErr2[numBin] += e*e;
+    nHist += w; nEntries++;
+  }
+  }
+  inline void AddBin(int_4 numBin, r_8 w) {AddBin(numBin,w,1.);}
+  inline void AddBin(int_4 numBin) {AddBin(numBin,1.,1.);}
   //! remplissage contenu de l'histo pour le bin numBin poids w et l'erreur e
-  void SetBin(int_4 numBin, r_8 w=1., r_8 e=1., r_8 nb=1.);
+  void SetBin(int_4 numBin, r_8 w, r_8 e, r_8 nb);
+  inline void SetBin(int_4 numBin, r_8 w, r_8 e) {SetBin(numBin,w,e,1.);}
+  inline void SetBin(int_4 numBin, r_8 w) {SetBin(numBin,w,1.,1.);}
+  inline void SetBin(int_4 numBin) {SetBin(numBin,1.,1.,1.);}
   //! remplissage nombre d'entrees pour le bin numBin
   void SetNentB(int_4 numBin, r_8 nb=1.);

trunk/SophyaLib/HiStats/histos.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: histos.h,v 1.19 2004-10-13 16:41:33 cmv Exp $
+// $Id: histos.h,v 1.20 2004-10-26 16:26:39 cmv Exp $
 //
 
@@ -34 +34 @@
   // UPDATING or SETTING
   void Zero();
-  void Add(r_8 x, r_8 w = 1.);
-  void AddBin(int_4 numBin, r_8 w = 1.);
-  void SetBin(r_8 x, r_8 w = 1.);
-  void SetBin(int_4 numBin, r_8 w = 1.);
+  void Add(r_8 x, r_8 w);
+  inline void Add(r_8 x) {Add(x,1.);}
+  void AddBin(int_4 numBin, r_8 w);
+  inline void AddBin(int_4 numBin) {AddBin(numBin,1.);}
+  void SetBin(r_8 x, r_8 w);
+  inline void SetBin(r_8 x) {SetBin(x,1.);}
+  void SetBin(int_4 numBin, r_8 w);
+  inline void SetBin(int_4 numBin) {SetBin(numBin,1.);}
   void SetErr2(r_8 x, r_8 e2);
   void SetErr2(int_4 numBin, r_8 e2);