[yoda-svn] r417 - in trunk: . src

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Dec  7 11:32:47 2011
New Revision: 417

Log:
Writing out total dbn lines for Histo1D and Profile1D in the YODA format, and now writing out the 'cross-terms' for Profile1D, too.

Modified:
   trunk/ChangeLog
   trunk/src/WriterYODA.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed Dec  7 11:28:34 2011	(r416)
+++ trunk/ChangeLog	Wed Dec  7 11:32:47 2011	(r417)
@@ -1,5 +1,9 @@
 2011-12-07  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Writing out total dbn lines for Histo1D and Profile1D in the
+	YODA format, and now writing out the 'cross-terms' for Profile1D,
+	too.
+
 	* Properly adding Dbn1D accessors for Histo1D.
 
 	* Updating the Cython mappings to provide the totalDbn() methods

Modified: trunk/src/WriterYODA.cc
==============================================================================
--- trunk/src/WriterYODA.cc	Wed Dec  7 11:28:34 2011	(r416)
+++ trunk/src/WriterYODA.cc	Wed Dec  7 11:32:47 2011	(r417)
@@ -47,6 +47,10 @@
     os << "# Mean: " << h.mean() << "\n";
     os << "# Area: " << h.integral() << "\n";
     os << "# xlow\t xhigh\t sumw\t sumw2\t sumwx\t sumwx2\t numEntries\n";
+    os << "Total\tTotal\t";
+    os << h.totalDbn().sumW()  << "\t" << h.totalDbn().sumW2()  << "\t";
+    os << h.totalDbn().sumWX() << "\t" << h.totalDbn().sumWX2() << "\t";
+    os << h.totalDbn().numEntries() << "\n";
     os << "Underflow\tUnderflow\t";
     os << h.underflow().sumW()  << "\t" << h.underflow().sumW2()  << "\t";
     os << h.underflow().sumWX() << "\t" << h.underflow().sumWX2() << "\t";
@@ -75,15 +79,20 @@
     os << "# BEGIN YODA_PROFILE1D\n";
     _writeAnnotations(os, p);
     os << "# xlow\t xhigh\t sumw\t sumw2\t sumwx\t sumwx2\t sumwy\t sumwy2\t numEntries\n";
+    os << "Total\tTotal\t";
+    os << p.totalDbn().sumW()  << "\t" << p.totalDbn().sumW2()  << "\t";
+    os << p.totalDbn().sumWX() << "\t" << p.totalDbn().sumWX2() << "\t";
+    os << p.totalDbn().sumWY() << "\t" << p.totalDbn().sumWY2() << "\t";
+    os << p.totalDbn().numEntries() << "\n";
     os << "Underflow\tUnderflow\t";
     os << p.underflow().sumW()  << "\t" << p.underflow().sumW2()  << "\t";
     os << p.underflow().sumWX() << "\t" << p.underflow().sumWX2() << "\t";
-    //os << p.underflow().sumWY() << "\t" << p.underflow().sumWY2() << "\t"; // FIXME: This needs Dbn2D in the axis
+    os << p.underflow().sumWY() << "\t" << p.underflow().sumWY2() << "\t";
     os << p.underflow().numEntries() << "\n";
     os << "Overflow\tOverflow\t";
     os << p.overflow().sumW()  << "\t" << p.overflow().sumW2()  << "\t";
     os << p.overflow().sumWX() << "\t" << p.overflow().sumWX2() << "\t";
-    //os << p.overflow().sumWY() << "\t" << p.overflow().sumWY2() << "\t"; // FIXME: This needs Dbn2D in the axis
+    os << p.overflow().sumWY() << "\t" << p.overflow().sumWY2() << "\t";
     os << p.overflow().numEntries() << "\n";
     for (vector<ProfileBin1D>::const_iterator b = p.bins().begin(); b != p.bins().end(); ++b) {
       os << b->lowEdge() << "\t" << b->highEdge() << "\t";
@@ -115,7 +124,8 @@
     os << flush;
     os.flags(oldflags);
   }
-  
+
+
   /*void WriterYODA::writeScatter3D(std::ostream& os, const Scatter3D& s) {
     ios_base::fmtflags oldflags = os.flags();
     const int precision = 6;
@@ -134,4 +144,6 @@
     os << flush;
     os.flags(oldflags);
   }*/
+
+
 }