[yoda-svn] yoda: 3 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/ef693bb39bcc
branches:  
changeset: 1112:ef693bb39bcc
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Aug 17 22:54:56 2015 +0100
description:
Don't expose mplot by default yet, due to problems

details:   https://yoda.hepforge.org/hg/yoda/rev/4cae6bac94fd
branches:  
changeset: 1113:4cae6bac94fd
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Aug 17 22:55:14 2015 +0100
description:
Fix missing newline in Scatter1D YODA format writing

details:   https://yoda.hepforge.org/hg/yoda/rev/6010bc16ecfc
branches:  
changeset: 1114:6010bc16ecfc
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Aug 17 22:57:14 2015 +0100
description:
Bump YODA version to 1.5.0 due to rewrite of YODA & FLAT parsers, etc.

diffs (46 lines):

--- a/configure.ac	Mon Aug 17 00:37:22 2015 +0100
+++ b/configure.ac	Mon Aug 17 22:57:14 2015 +0100
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([YODA],[1.4.0],[yoda at projects.hepforge.org],[YODA])
+AC_INIT([YODA],[1.5.0],[yoda at projects.hepforge.org],[YODA])
 
 ## Check and block installation into the src/build dir
 if test "$prefix" = "$PWD"; then
--- a/pyext/yoda/__init__.py	Mon Aug 17 00:37:22 2015 +0100
+++ b/pyext/yoda/__init__.py	Mon Aug 17 22:57:14 2015 +0100
@@ -2,7 +2,7 @@
 from yoda.core import *
 
 ## Try to pull in plotting tools
-from yoda.plotting import plot, mplot
+from yoda.plotting import plot #, mplot
 
 ## Try to pull in optional ROOT compatibility
 try:
--- a/pyext/yoda/plotting.py	Mon Aug 17 00:37:22 2015 +0100
+++ b/pyext/yoda/plotting.py	Mon Aug 17 22:57:14 2015 +0100
@@ -17,6 +17,7 @@
         ## Convert to Scatter and set dimensionality & recarray column names
         s = ao.mkScatter()
         names = ['x', 'y', 'exminus', 'explus', 'eyminus', 'eyplus']
+        # TODO: also Scatter1D
         if type(s) is yoda.Scatter2D:
             self.dim = 2
         elif type(s) is yoda.Scatter3D:
--- a/src/WriterYODA.cc	Mon Aug 17 00:37:22 2015 +0100
+++ b/src/WriterYODA.cc	Mon Aug 17 22:57:14 2015 +0100
@@ -227,9 +227,9 @@
     _writeAnnotations(os, s);
     os << "# xval\t xerr-\t xerr+\n";
     BOOST_FOREACH (const Point1D& pt, s.points()) {
-      os << pt.x() << "\t" << pt.xErrMinus() << "\t" << pt.xErrMinus() << "\t";
+      os << pt.x() << "\t" << pt.xErrMinus() << "\t" << pt.xErrMinus() << "\n";
     }
-    os << "END YODA_SCATTER1D\n";
+    os << "END YODA_SCATTER1D\n\n";
 
     os << flush;
     os.flags(oldflags);