Changeset 1053 in Sophya for trunk/SophyaLib/HiStats/histos.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/histos.h (modified) (3 diffs)

trunk/SophyaLib/HiStats/histos.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: histos.h,v 1.6 2000-04-18 13:38:17 ansari Exp $
+// $Id: histos.h,v 1.7 2000-06-30 13:21:53 ansari Exp $
 //
 
@@ -50 +50 @@
   Histo& operator += (double b);
   Histo& operator -= (double b);
-  friend Histo operator * (const Histo& a, double b);
-  friend Histo operator * (double b, const Histo& a);
-  friend Histo operator / (const Histo& a, double b);
-  friend Histo operator + (const Histo& a, double b);
-  friend Histo operator + (double b, const Histo& a);
-  friend Histo operator - (const Histo& a, double b);
-  friend Histo operator - (double b, const Histo& a);
   Histo& operator += (const Histo& a);
   Histo& operator -= (const Histo& a);
   Histo& operator *= (const Histo& a);
   Histo& operator /= (const Histo& a);
-  friend Histo operator + (const Histo& a, const Histo& b);
-  friend Histo operator - (const Histo& a, const Histo& b);
-  friend Histo operator * (const Histo& a, const Histo& b);
-  friend Histo operator / (const Histo& a, const Histo& b);
 
   // get/put dans/depuis un vector
@@ -191 +180 @@
 // ObjFileIO<Histo>
 
+/*! \ingroup HiStats \fn operator*(const Histo&,double)
+  \brief Operateur H2 = H1 * b */
+inline Histo operator * (const Histo& a, double b)
+{
+  Histo result(a);
+  return (result *= b);
+}
+
+/*! \ingroup HiStats \fn operator*(double,const Histo&)
+  \brief Operateur H2 = b * H1 */
+inline Histo operator * (double b, const Histo& a)
+{
+  Histo result(a);
+  return (result *= b);
+}
+
+/*! \ingroup HiStats \fn operator/(const Histo&,double)
+  \brief Operateur H2 = H1 / b */
+inline Histo operator / (const Histo& a, double b)
+{
+  Histo result(a);
+  return (result /= b);
+}
+
+/*! \ingroup HiStats \fn operator+(const Histo&,double)
+  \brief Operateur H2 = H1 + b */
+inline Histo operator + (const Histo& a, double b)
+{
+  Histo result(a);
+  return (result += b);
+}
+
+/*! \ingroup HiStats \fn operator+(double,const Histo&)
+  \brief Operateur H2 = b + H1 */
+inline Histo operator + (double b, const Histo& a)
+{
+  Histo result(a);
+  return (result += b);
+}
+
+/*! \ingroup HiStats \fn operator-(const Histo&,double)
+  \brief Operateur H2 = H1 - b */
+inline Histo operator - (const Histo& a, double b)
+{
+  Histo result(a);
+  return (result -= b);
+}
+
+/*! \ingroup HiStats \fn operator-(double,const Histo&)
+  \brief Operateur H2 = b - H1 */
+inline Histo operator - (double b, const Histo& a)
+{
+  Histo result(a);
+  result *= -1.;
+  return (result += b);
+}
+
+/*! \ingroup HiStats \fn operator+(const Histo&,const Histo&)
+  \brief Operateur H = H1 + H2 */
+inline Histo operator + (const Histo& a, const Histo& b)
+{
+if (b.NBins()!=a.NBins()) THROW(sizeMismatchErr);
+Histo c(a);
+return (c += b);
+}
+
+/*! \ingroup HiStats \fn operator-(const Histo&,const Histo&)
+  \brief Operateur H = H1 - H2 */
+inline Histo operator - (const Histo& a, const Histo& b)
+{
+if (b.NBins()!=a.NBins()) THROW(sizeMismatchErr);
+Histo c(a);
+return (c -= b);
+}
+
+/*! \ingroup HiStats \fn operator*(const Histo&,const Histo&)
+  \brief Operateur H = H1 * H2 */
+inline Histo operator * (const Histo& a, const Histo& b)
+{
+if (b.NBins()!=a.NBins()) THROW(sizeMismatchErr);
+Histo c(a);
+return (c *= b);
+}
+
+/*! \ingroup HiStats \fn operator/(const Histo&,const Histo&)
+  \brief Operateur H = H1 / H2 */
+inline Histo operator / (const Histo& a, const Histo& b)
+{
+if (b.NBins()!=a.NBins()) THROW(sizeMismatchErr);
+Histo c(a);
+return (c /= b);
+}
 
 } // Fin du namespace