Changeset 1413 in Sophya

Timestamp:

Feb 20, 2001, 7:29:48 PM (25 years ago)

Author:

ansari

Message:

Methode Show et operateur << pour Histos - Reza 20/2/2001

Location:

trunk/SophyaLib/HiStats

Files:

• hisprof.cc (modified) (1 diff)
• hisprof.h (modified) (1 diff)
• histos.cc (modified) (3 diffs)
• histos.h (modified) (3 diffs)
• histos2.cc (modified) (1 diff)
• histos2.h (modified) (2 diffs)
• ntuple.h (modified) (1 diff)

trunk/SophyaLib/HiStats/hisprof.cc

@@ -315 +315 @@
 }
 
+void HProf::Show(ostream & os) const
+{
+  UpdateHisto();
+  Histo::Show(os);
+}
+
 ///////////////////////////////////////////////////////////
 // --------------------------------------------------------

trunk/SophyaLib/HiStats/hisprof.h

@@ -61 +61 @@
   virtual void HRebin(int_4 nbinew);
 
+  virtual void Show(ostream& os) const;
   //! Print, voir detail dans Histo::Print
   inline void Print(int_4 dyn=100,r_8 hmin=1.,r_8 hmax=-1.

trunk/SophyaLib/HiStats/histos.cc

@@ -1 +1 @@
 //
-// $Id: histos.cc,v 1.14 2000-09-26 15:53:34 ansari Exp $
+// $Id: histos.cc,v 1.15 2001-02-20 18:29:48 ansari Exp $
 //
 
@@ -1276 +1276 @@
   \endverbatim
 */
+
+void Histo::Show(ostream & os) const
+{
+ os << " Histo::Show  "
+      << " nHist=" << nHist << "  nEntries=" << nEntries
+      << "  mUnder=" << mUnder << "  mOver=" << mOver << endl;
+ os << "       mBins=" << mBins
+      << "  min=" << mMin << "  mMax=" << mMax
+      << "  binWidth=" << binWidth << endl;
+ os << "       mean=" << Mean() << " r.m.s=" << Sigma() 
+      << "  Errors="<<HasErrors()<< endl;
+}
+
 void Histo::Print(int_4 hdyn,r_8 hmin, r_8 hmax,int_4 pflag,
                   int_4 il, int_4 ih) const
@@ -1290 +1303 @@
  if(hdyn==0) hdyn = 100;
 
- cout << "~Histo::Print  "
-      << " nHist=" << nHist << "  nEntries=" << nEntries
-      << "  mUnder=" << mUnder << "  mOver=" << mOver << endl;
- cout << "       mBins=" << mBins
-      << "  min=" << mMin << "  mMax=" << mMax
-      << "  binWidth=" << binWidth << endl;
- cout << "       mean=" << Mean() << " r.m.s=" << Sigma() 
-      << "  Errors="<<HasErrors()<< endl;
+ Show(cout);
 
  if(hdyn<0 || pflag<0 ) return;

trunk/SophyaLib/HiStats/histos.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: histos.h,v 1.14 2000-09-26 15:53:34 ansari Exp $
+// $Id: histos.h,v 1.15 2001-02-20 18:29:48 ansari Exp $
 //
 
@@ -143 +143 @@
 
   // Print et Display ASCII
+  virtual void Show(ostream& os) const;
+  inline  void Show() const { Show(cout); }
   void Print(int_4 dyn = 100, r_8 hmin = 1., r_8 hmax = -1.,
              int_4 pflag = 0, int_4 il = 1, int_4 ih = -1) const;
-
+  
 protected:
   void Delete();
@@ -161 +163 @@
 };
 
+/*! Prints histogram information on stream \b s (h.Show(s)) */
+inline ostream& operator << (ostream& s, Histo const & h)
+  {  h.Show(s);  return(s);  }
 
 /*! \ingroup HiStats \fn operator<<(POuttPersist&,Histo)

trunk/SophyaLib/HiStats/histos2.cc

@@ -936 +936 @@
   Impression des informations sur l'histogramme.
 */
-void Histo2D::PrintStatus() const
-{
-printf("~Histo::Print    nHist=%g nEntries=%d",nHist,nEntries);
-if(HasErrors()) printf("  Errors=1\n"); else printf("  Errors=0\n");
-printf("mOver: [ %g %g %g // %g %g %g  // %g %g %g ]\n"
-      ,mOver[2][0],mOver[2][1],mOver[2][2]
-      ,mOver[1][0],mOver[1][1],mOver[1][2]
-      ,mOver[0][0],mOver[0][1],mOver[0][2]);
-printf("  nx=%d xmin=%g xmax=%g binx=%g  ",mNx,mXmin,mXmax,mWBinx);
-printf("  ny=%d ymin=%g ymax=%g biny=%g\n",mNy,mYmin,mYmax,mWBiny);
+void Histo2D::Show(ostream & os) const
+{
+  os << "Histo2D::Show    nHist=" << nHist << " nEntries=" << nEntries;
+  if(HasErrors()) os << "  Errors=Y \n"; else os << "  Errors=N\n";
+  os << "mOver: [ " ;
+  for(int j=2; j>=0; j--) {
+    for(int i=0; i<3; i++) 
+      os << mOver[j][i] << " " ;
+    if (j != 0) os << "// ";
+  }
+  os << "]\n";
+  os << "  nx=" << mNx << " xmin=" << mXmin << " xmax=" << mXmax 
+     << " binx=" << mWBinx ;
+  os << "  ny=" << mNy << " ymin=" << mYmin << " ymax=" << mYmax 
+     << " biny=" << mWBiny << endl;
+   
+  //printf("mOver: [ %g %g %g // %g %g %g  // %g %g %g ]\n"
+  //      ,mOver[2][0],mOver[2][1],mOver[2][2]
+  //      ,mOver[1][0],mOver[1][1],mOver[1][2]
+  //      ,mOver[0][0],mOver[0][1],mOver[0][2]);
+  //printf("  nx=%d xmin=%g xmax=%g binx=%g  ",mNx,mXmin,mXmax,mWBinx);
+  //printf("  ny=%d ymin=%g ymax=%g biny=%g\n",mNy,mYmin,mYmax,mWBiny);
 }
 

trunk/SophyaLib/HiStats/histos2.h

@@ -138 +138 @@
 
   // Print et Display ASCII
-  void PrintStatus() const;
+  virtual void Show(ostream& os) const;
+  inline void  PrintStatus() const { Show(cout); }
+  
   void Print(r_8 min=1.,r_8 max=-1.
             ,int_4 il=1,int_4 ih= -1,int_4 jl=1,int_4 jh= -1) const;
@@ -237 +239 @@
 };
 
+/*! Prints histogram information on stream \b s (h.Show(s)) */
+inline ostream& operator << (ostream& s, Histo2D const & h)
+  {  h.Show(s);  return(s);  }
+
 /////////////////////////////////////////////////////////////////////////
 // Classe pour la gestion de persistance

trunk/SophyaLib/HiStats/ntuple.h

@@ -97 +97 @@
 };
 
-/*! Prints table information on stream \b s (nt.Show(os)) */
+/*! Prints table information on stream \b s (nt.Show(s)) */
 inline ostream& operator << (ostream& s, NTuple const & nt)
   {  nt.Show(s);  return(s);  }