Changeset 3136 in Sophya for trunk/SophyaLib/HiStats

Timestamp:

Jan 16, 2007, 4:36:45 PM (19 years ago)

Author:

cmv

Message:

intro operator+=double HistoErr Histo2DErr cmv 16/01/07

Location:

trunk/SophyaLib/HiStats

Files:

• hist2err.cc (modified) (1 diff)
• hist2err.h (modified) (1 diff)
• histerr.cc (modified) (1 diff)
• histerr.h (modified) (1 diff)

trunk/SophyaLib/HiStats/hist2err.cc

@@ -193 +193 @@
 /********* Methode *********/
 /*!
+  Operateur de multiplication par une constante
+*/
+Histo2DErr& Histo2DErr::operator *= (r_8 b)
+{
+r_8 b2 = b*b;
+for(int_4 i=0;i<nx_;i++) {
+  for(int_4 j=0;j<ny_;j++) {
+    data_(i,j) *= b;
+    err2_(i,j) *= b2;
+  }
+}
+return *this;
+}
+
+/********* Methode *********/
+/*!
   Print info
 */

trunk/SophyaLib/HiStats/hist2err.h

@@ -136 +136 @@
 
   //! Recuperation des matrices elementaires
-  inline void GetData(TMatrix<r_8>& data) {data = data_;}
-  inline void GetError2(TMatrix<r_8>& err2) {err2 = err2_;}
-  inline void GetNData(TMatrix<r_8>& ndata) {ndata = ndata_;}
+  void GetData(TMatrix<r_8>& data) {data = data_;}
+  void GetError2(TMatrix<r_8>& err2) {err2 = err2_;}
+  void GetNData(TMatrix<r_8>& ndata) {ndata = ndata_;}
 
   // Operators
   Histo2DErr& operator = (const Histo2DErr& h);
+  Histo2DErr& operator *= (r_8 b);
 
   // Print
-  virtual void Show(ostream& os) const;
-  inline  void Show() const { Show(cout); }
+  void Show(ostream& os) const;
+  void Show() const { Show(cout); }
 
 protected:

trunk/SophyaLib/HiStats/histerr.cc

@@ -169 +169 @@
 /********* Methode *********/
 /*!
+  Operateur de multiplication par une constante
+*/
+HistoErr& HistoErr::operator *= (r_8 b)
+{
+r_8 b2 = b*b;
+for(int_4 i=0;i<nx_;i++) {
+  data_(i) *= b;
+  err2_(i) *= b2;
+}
+return *this;
+}
+
+/********* Methode *********/
+/*!
   Print info
 */

trunk/SophyaLib/HiStats/histerr.h

@@ -127 +127 @@
 
   //! Recuperation des matrices elementaires
-  inline void GetData(TVector<r_8>& data) {data = data_;}
-  inline void GetError2(TVector<r_8>& err2) {err2 = err2_;}
-  inline void GetNData(TVector<r_8>& ndata) {ndata = ndata_;}
+  void GetData(TVector<r_8>& data) {data = data_;}
+  void GetError2(TVector<r_8>& err2) {err2 = err2_;}
+  void GetNData(TVector<r_8>& ndata) {ndata = ndata_;}
 
   // Operators
   HistoErr& operator = (const HistoErr& h);
+  HistoErr& operator *= (r_8 b);
 
   // Print
-  virtual void Show(ostream& os) const;
-  inline  void Show() const { Show(cout); }
+  void Show(ostream& os) const;
+  void Show() const { Show(cout); }
 
 protected: