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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Mar  4 14:02:38 2013
New Revision: 561

Log:
Adding PLOT section writing to WriterFLAT (and WriterYODA, although that might be a bad idea...)

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

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Mon Mar  4 13:29:12 2013	(r560)
+++ trunk/ChangeLog	Mon Mar  4 14:02:38 2013	(r561)
@@ -1,5 +1,8 @@
 2013-03-04  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Adding PLOT section writing to WriterFLAT (and WriterYODA,
+	although that might be a bad idea...)
+
 	* Adding aida2yoda and aida2flat converter scripts.
 
 2013-02-02  David Mallows  <dave.mallows at gmail.com>

Modified: trunk/src/ReaderAIDA.cc
==============================================================================
--- trunk/src/ReaderAIDA.cc	Mon Mar  4 13:29:12 2013	(r560)
+++ trunk/src/ReaderAIDA.cc	Mon Mar  4 14:02:38 2013	(r561)
@@ -53,7 +53,7 @@
         for (const TiXmlNode* dpN = dpsN->FirstChild("dataPoint"); dpN; dpN = dpN->NextSibling()) {
           const TiXmlNode* xMeasN = dpN->FirstChild("measurement");
           const TiXmlNode* yMeasN = xMeasN->NextSibling();
-          if (xMeasN && yMeasN)  {
+          if (xMeasN && yMeasN) {
             const TiXmlElement* xMeasE = xMeasN->ToElement();
             const TiXmlElement* yMeasE = yMeasN->ToElement();
             const string xcentreStr   = xMeasE->Attribute("value");

Modified: trunk/src/WriterFLAT.cc
==============================================================================
--- trunk/src/WriterFLAT.cc	Mon Mar  4 13:29:12 2013	(r560)
+++ trunk/src/WriterFLAT.cc	Mon Mar  4 14:02:38 2013	(r561)
@@ -40,7 +40,9 @@
 
 
   void WriterFLAT::writePlot(std::ostream& os, const Plot& p) {
+    os << "# BEGIN PLOT" << "\n";
     _writeAnnotations(os, p);
+    os << "# END PLOT" << "\n";
   }
 
 
@@ -52,7 +54,7 @@
 
 
   void WriterFLAT::writeHisto2D(std::ostream& os, const Histo2D& h) {
-    // FIXME: Currently not supported
+    /// @todo Currently not supported
     os << flush;
 
     //Scatter3D tmp = mkScatter(h);

Modified: trunk/src/WriterYODA.cc
==============================================================================
--- trunk/src/WriterYODA.cc	Mon Mar  4 13:29:12 2013	(r560)
+++ trunk/src/WriterYODA.cc	Mon Mar  4 14:02:38 2013	(r561)
@@ -40,7 +40,10 @@
 
 
   void WriterYODA::writePlot(std::ostream& os, const Plot& p) {
+    /// @todo Do we really want to write anything here?
+    os << "# BEGIN YODA_PLOT" << "\n";
     _writeAnnotations(os, p);
+    os << "# END YODA_PLOT\n\n";
   }