Changeset 1053 in Sophya for trunk/SophyaLib/HiStats/histos2.h

Timestamp:

Jun 30, 2000, 3:21:53 PM (25 years ago)

Author:

ansari

Message:

les friend operator ne marche plus ? passage en inline cmv 30/06/00

File:

• trunk/SophyaLib/HiStats/histos2.h (modified) (2 diffs)

trunk/SophyaLib/HiStats/histos2.h

@@ -47 +47 @@
   Histo2D& operator += (double b);
   Histo2D& operator -= (double b);
-  friend Histo2D operator * (const Histo2D& a, double b);
-  friend Histo2D operator * (double b, const Histo2D& a);
-  friend Histo2D operator / (const Histo2D& a, double b);
-  friend Histo2D operator + (const Histo2D& a, double b);
-  friend Histo2D operator + (double b, const Histo2D& a);
-  friend Histo2D operator - (const Histo2D& a, double b);
-  friend Histo2D operator - (double b, const Histo2D& a);
   Histo2D& operator += (const Histo2D& a);
   Histo2D& operator -= (const Histo2D& a);
   Histo2D& operator *= (const Histo2D& a);
   Histo2D& operator /= (const Histo2D& a);
-  friend Histo2D operator + (const Histo2D& a, const Histo2D& b);
-  friend Histo2D operator - (const Histo2D& a, const Histo2D& b);
-  friend Histo2D operator * (const Histo2D& a, const Histo2D& b);
-  friend Histo2D operator / (const Histo2D& a, const Histo2D& b);
 
   // get/put dans/depuis une matrice / vector
@@ -261 +250 @@
 // ObjFileIO<Histo2D>
 
+/*! \ingroup HiStats \fn operator*(const Histo2D&,double)
+  \brief Operateur H2 = H1 * b */
+inline Histo2D operator * (const Histo2D& a, double b)
+{
+  Histo2D result(a);
+  return (result *= b);
+}
+
+/*! \ingroup HiStats \fn operator*(double,const Histo2D&)
+  \brief Operateur H2 = b * H1 */
+inline Histo2D operator * (double b, const Histo2D& a)
+{
+  Histo2D result(a);
+  return (result *= b);
+}
+
+/*! \ingroup HiStats \fn operator/(const Histo2D&,double)
+  \brief Operateur H2 = H1 / b */
+inline Histo2D operator / (const Histo2D& a, double b)
+{
+  Histo2D result(a);
+  return (result /= b);
+}
+
+/*! \ingroup HiStats \fn operator+(const Histo2D&,double)
+  \brief Operateur H2 = H1 + b */
+inline Histo2D operator + (const Histo2D& a, double b)
+{
+  Histo2D result(a);
+  return (result += b);
+}
+
+/*! \ingroup HiStats \fn operator+(double,const Histo2D&)
+  \brief Operateur H2 = b + H1 */
+inline Histo2D operator + (double b, const Histo2D& a)
+{
+  Histo2D result(a);
+  return (result += b);
+}
+
+/*! \ingroup HiStats \fn operator-(const Histo2D&,double)
+  \brief Operateur H2 = H1 - b */
+inline Histo2D operator - (const Histo2D& a, double b)
+{
+  Histo2D result(a);
+  return (result -= b);
+}
+
+/*! \ingroup HiStats \fn operator-(double,const Histo2D&)
+  \brief Operateur H2 = b - H1 */
+inline Histo2D operator - (double b, const Histo2D& a)
+{
+  Histo2D result(a);
+  result *= -1.;
+  return (result += b);
+}
+
+/*! \ingroup HiStats \fn operator+(const Histo2D&,const Histo2D&)
+  \brief Operateur H = H1 + H2 */
+
+inline Histo2D operator + (const Histo2D& a, const Histo2D& b)
+{
+if (b.NBinX()!=a.NBinX() || b.NBinY()!=a.NBinY()) THROW(sizeMismatchErr);
+Histo2D c(a);
+return (c += b);
+}
+
+/*! \ingroup HiStats \fn operator-(const Histo2D&,const Histo2D&)
+  \brief Operateur H = H1 - H2 */
+inline Histo2D operator - (const Histo2D& a, const Histo2D& b)
+{
+if (b.NBinX()!=a.NBinX() || b.NBinY()!=a.NBinY()) THROW(sizeMismatchErr);
+Histo2D c(a);
+return (c -= b);
+}
+
+/*! \ingroup HiStats \fn operator*(const Histo2D&,const Histo2D&)
+  \brief Operateur H = H1 * H2 */
+inline Histo2D operator * (const Histo2D& a, const Histo2D& b)
+{
+if (b.NBinX()!=a.NBinX() || b.NBinY()!=a.NBinY()) THROW(sizeMismatchErr);
+Histo2D c(a);
+return (c *= b);
+}
+
+/*! \ingroup HiStats \fn operator/(const Histo2D&,const Histo2D&)
+  \brief Operateur H = H1 / H2 */
+inline Histo2D operator / (const Histo2D& a, const Histo2D& b)
+{
+if (b.NBinX()!=a.NBinX() || b.NBinY()!=a.NBinY()) THROW(sizeMismatchErr);
+Histo2D c(a);
+return (c /= b);
+}
+
 } // Fin du namespace