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

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.cc (modified) (2 diffs)

trunk/SophyaLib/HiStats/histos2.cc

@@ -390 +390 @@
 ///////////////////////////////////////////////////////////////////
 /*!
-  Operateur H2 = H1 * b
-*/
-Histo2D operator * (const Histo2D& a, double b)
-{
-  Histo2D result(a);
-  return (result *= b);
-}
-
-/*!
-  Operateur H2 = b * H1
-*/
-Histo2D operator * (double b, const Histo2D& a)
-{
-  Histo2D result(a);
-  return (result *= b);
-}
-
-/*!
-  Operateur H2 = H1 / b
-*/
-Histo2D operator / (const Histo2D& a, double b)
-{
-  Histo2D result(a);
-  return (result /= b);
-}
-
-/*!
-  Operateur H2 = H1 + b
-*/
-Histo2D operator + (const Histo2D& a, double b)
-{
-  Histo2D result(a);
-  return (result += b);
-}
-
-/*!
-  Operateur H2 = b + H1
-*/
-Histo2D operator + (double b, const Histo2D& a)
-{
-  Histo2D result(a);
-  return (result += b);
-}
-
-/*!
-  Operateur H2 = H1 - b
-*/
-Histo2D operator - (const Histo2D& a, double b)
-{
-  Histo2D result(a);
-  return (result -= b);
-}
-
-/*!
-  Operateur H2 = b - H1
-*/
-Histo2D operator - (double b, const Histo2D& a)
-{
-  Histo2D result(a);
-  result *= -1.;
-  return (result += b);
-}
-
-///////////////////////////////////////////////////////////////////
-/*!
   Operateur H += H1
 */
@@ -555 +490 @@
 
 return *this;
-}
-
-///////////////////////////////////////////////////////////////////
-/*!
-  Operateur H = H1 + H2
-*/
-
-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);
-}
-
-/*!
-  Operateur H = H1 - H2
-*/
-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);
-}
-
-/*!
-  Operateur H = H1 * H2
-*/
-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);
-}
-
-/*!
-  Operateur H = H1 / H2
-*/
-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);
 }