Changeset 958 in Sophya for trunk/SophyaLib/HiStats

Timestamp:

Apr 18, 2000, 3:38:53 PM (25 years ago)

Author:

ansari

Message:

doc + vire warning cmv 18/04/00

Location:

trunk/SophyaLib/HiStats

Files:

• hisprof.h (modified) (1 diff)
• histos.cc (modified) (7 diffs)
• histos.h (modified) (2 diffs)
• histos2.cc (modified) (6 diffs)
• histos2.h (modified) (1 diff)

trunk/SophyaLib/HiStats/hisprof.h

@@ -83 +83 @@
 
 
+/*! \ingroup HiStats \fn operator<<(POuttPersist&, HProf)
+  \brief Persistance management */
 inline POutPersist& operator << (POutPersist& os, HProf & obj)
 { ObjFileIO<HProf> fio(&obj);  fio.Write(os);  return(os); }
+/*! \ingroup HiStats \fn operator>>(PInPersist&, HProf)
+  \brief Persistance management */
 inline PInPersist& operator >> (PInPersist& is, HProf & obj)
 { ObjFileIO<HProf> fio(&obj);  fio.Read(is);  return(is); }

trunk/SophyaLib/HiStats/histos.cc

@@ -1 +1 @@
 //
-// $Id: histos.cc,v 1.4 2000-04-15 11:06:27 ansari Exp $
+// $Id: histos.cc,v 1.5 2000-04-18 13:38:16 ansari Exp $
 //
 
@@ -432 +432 @@
 void Histo::PutValue(TVector<r_8> &v, int ierr)
 {
-if(v.NElts()<bins) THROW(sizeMismatchErr);
+if(v.NElts()<(uint_4) bins) THROW(sizeMismatchErr);
 for(int i=0;i<bins;i++) {
   data[i] = v(i);
@@ -445 +445 @@
 void Histo::PutValueAdd(TVector<r_8> &v, int ierr)
 {
-if(v.NElts()<bins) THROW(sizeMismatchErr);
+if(v.NElts()<(uint_4) bins) THROW(sizeMismatchErr);
 for(int i=0;i<bins;i++) {
   data[i] += v(i);
@@ -458 +458 @@
 void Histo::PutError2(TVector<r_8> &v)
 {
-if(v.NElts()<bins) THROW(sizeMismatchErr);
+if(v.NElts()<(uint_4) bins) THROW(sizeMismatchErr);
 if(!err2) Errors();
 for(int i=0;i<bins;i++) err2[i] = v(i);
@@ -469 +469 @@
 void Histo::PutError2Add(TVector<r_8> &v)
 {
-if(v.NElts()<bins) THROW(sizeMismatchErr);
+if(v.NElts()<(uint_4) bins) THROW(sizeMismatchErr);
 if(!err2) Errors();
 for(int i=0;i<bins;i++) if(v(i)>0.) err2[i] += v(i);
@@ -480 +480 @@
 void Histo::PutError(TVector<r_8> &v)
 {
-if(v.NElts()<bins) THROW(sizeMismatchErr);
+if(v.NElts()<(uint_4) bins) THROW(sizeMismatchErr);
 if(!err2) Errors();
 for(int i=0;i<bins;i++)
@@ -1360 +1360 @@
   double f = (double) (*this)(i);
   double saf = sqrt(fabs((double) f)); if(saf<1.) saf=1.;
-  double e;
+  double e=0.;
   if(typ_err==0)      {if(HasErrors()) e=Error(i); else e=1.;}
   else if(typ_err==1) {if(HasErrors()) e=Error(i); else e=saf;}

trunk/SophyaLib/HiStats/histos.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: histos.h,v 1.5 2000-04-15 11:06:28 ansari Exp $
+// $Id: histos.h,v 1.6 2000-04-18 13:38:17 ansari Exp $
 //
 
@@ -179 +179 @@
 
 
+/*! \ingroup HiStats \fn operator<<(POuttPersist&,Histo)
+  \brief Persistance management */
 inline POutPersist& operator << (POutPersist& os, Histo & obj)
 { ObjFileIO<Histo> fio(&obj);  fio.Write(os);  return(os); }
+/*! \ingroup HiStats \fn operator<<(POuttPersist&,Histo)
+  \brief Persistance management */
 inline PInPersist& operator >> (PInPersist& is, Histo & obj)
 { ObjFileIO<Histo> fio(&obj);  fio.Read(is);  return(is); }

trunk/SophyaLib/HiStats/histos2.cc

@@ -666 +666 @@
 {
 int i,j;
-if(v.NRows()!=nx || v.NCol()!=ny) THROW(sizeMismatchErr);
+if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr);
 for(i=0;i<nx;i++) for(j=0;j<ny;j++) {
   (*this)(i,j) = v(i,j);
@@ -680 +680 @@
 {
 int i,j;
-if(v.NRows()!=nx || v.NCol()!=ny) THROW(sizeMismatchErr);
+if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr);
 for(i=0;i<nx;i++) for(j=0;j<ny;j++) {
   (*this)(i,j) += v(i,j);
@@ -695 +695 @@
 {
 int i,j;
-if(v.NRows()!=nx || v.NCol()!=ny) THROW(sizeMismatchErr);
+if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr);
 if(!err2) Errors();
 for(i=0;i<nx;i++) for(j=0;j<ny;j++) Error2(i,j) = v(i,j);
@@ -708 +708 @@
 {
 int i,j;
-if(v.NRows()!=nx || v.NCol()!=ny) THROW(sizeMismatchErr);
+if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr);
 if(!err2) Errors();
 for(i=0;i<nx;i++) for(j=0;j<ny;j++)
@@ -721 +721 @@
 {
 int i,j;
-if(v.NRows()!=nx || v.NCol()!=ny) THROW(sizeMismatchErr);
+if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr);
 if(!err2) Errors();
 for(i=0;i<nx;i++) for(j=0;j<ny;j++)
@@ -1046 +1046 @@
   double f = (double) (*this)(i,j);
   double saf = sqrt(fabs(f)); if(saf<1.) saf=1.;
-  double e;
+  double e=0.;
   if(typ_err==0)      {if(HasErrors()) e=Error(i,j); else e=1.;}
   else if(typ_err==1) {if(HasErrors()) e=Error(i,j); else e=saf;}

trunk/SophyaLib/HiStats/histos2.h

@@ -249 +249 @@
 // Classe pour la gestion de persistance
 
+/*! \ingroup HiStats \fn operator<<(POuttPersist&,Histo2D)
+  \brief Persistance management */
 inline POutPersist& operator << (POutPersist& os, Histo2D & obj)
 { ObjFileIO<Histo2D> fio(&obj);  fio.Write(os);  return(os); }
+/*! \ingroup HiStats \fn operator<<(POuttPersist&,Histo2D)
+  \brief Persistance management */
 inline PInPersist& operator >> (PInPersist& is, Histo2D & obj)
 { ObjFileIO<Histo2D> fio(&obj);  fio.Read(is);  return(is); }