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

trunk/SophyaLib/HiStats/histos.cc

@@ -1 +1 @@
 //
-// $Id: histos.cc,v 1.5 2000-04-18 13:38:16 ansari Exp $
+// $Id: histos.cc,v 1.6 2000-06-30 13:21:52 ansari Exp $
 //
 
@@ -192 +192 @@
 /********* Methode *********/
 /*!
-  Operateur H2 = H1 * b
-*/
-Histo operator * (const Histo& a, double b)
-{
-  Histo result(a);
-  return (result *= b);
-}
-
-/*!
-  Operateur H2 = b * H1
-*/
-Histo operator * (double b, const Histo& a)
-{
-  Histo result(a);
-  return (result *= b);
-}
-
-/*!
-  Operateur H2 = H1 / b
-*/
-Histo operator / (const Histo& a, double b)
-{
-  Histo result(a);
-  return (result /= b);
-}
-
-/*!
-  Operateur H2 = H1 + b
-*/
-Histo operator + (const Histo& a, double b)
-{
-  Histo result(a);
-  return (result += b);
-}
-
-/*!
-  Operateur H2 = b + H1
-*/
-Histo operator + (double b, const Histo& a)
-{
-  Histo result(a);
-  return (result += b);
-}
-
-/*!
-  Operateur H2 = H1 - b
-*/
-Histo operator - (const Histo& a, double b)
-{
-  Histo result(a);
-  return (result -= b);
-}
-
-/*!
-  Operateur H2 = b - H1
-*/
-Histo operator - (double b, const Histo& a)
-{
-  Histo result(a);
-  result *= -1.;
-  return (result += b);
-}
-
-/********* Methode *********/
-/*!
   Operateur H += H1
 */
@@ -265 +200 @@
   data[i] += a(i);
   if(err2 && a.err2) err2[i] += a.Error2(i);
-    else err2[i] = 0.;
 }
 under += a.under;
@@ -284 +218 @@
   data[i] -= a(i);
   if(err2 && a.err2) err2[i] += a.Error2(i);
-    else err2[i] = 0.;
 }
 under -= a.under;
@@ -304 +237 @@
   if(err2 && a.err2)
       err2[i] = a(i)*a(i)*err2[i] + data[i]*data[i]*a.Error2(i);
-    else err2[i] = 0.;
   data[i] *= a(i);
   nHist += data[i];
@@ -331 +263 @@
       err2[i] = (err2[i] + data[i]/a(i)*data[i]/a(i)*a.Error2(i))
                 /(a(i)*a(i));
-    else err2[i] = 0.;
   data[i] /= a(i);
   nHist += data[i];
@@ -340 +271 @@
 
 return *this;
-}
-
-/********* Methode *********/
-/*!
-  Operateur H = H1 + H2
-*/
-Histo operator + (const Histo& a, const Histo& b)
-{
-if (b.NBins()!=a.NBins()) THROW(sizeMismatchErr);
-Histo c(a);
-return (c += b);
-}
-
-/*!
-  Operateur H = H1 - H2
-*/
-Histo operator - (const Histo& a, const Histo& b)
-{
-if (b.NBins()!=a.NBins()) THROW(sizeMismatchErr);
-Histo c(a);
-return (c -= b);
-}
-
-/*!
-  Operateur H = H1 * H2
-*/
-Histo operator * (const Histo& a, const Histo& b)
-{
-if (b.NBins()!=a.NBins()) THROW(sizeMismatchErr);
-Histo c(a);
-return (c *= b);
-}
-
-/*!
-  Operateur H = H1 / H2
-*/
-Histo operator / (const Histo& a, const Histo& b)
-{
-if (b.NBins()!=a.NBins()) THROW(sizeMismatchErr);
-Histo c(a);
-return (c /= b);
 }
 
@@ -448 +338 @@
 for(int i=0;i<bins;i++) {
   data[i] += v(i);
-  if(err2&&ierr) err2[i] += fabs(v(i));
+  if(err2 && ierr) err2[i] += fabs(v(i));
 }
 return;