[yoda-svn] yoda: merged 1.6 to trunk

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/b580b1759f10
branches:  
changeset: 1267:b580b1759f10
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Jun 09 09:27:31 2016 +0100
description:
merged 1.6 to trunk

diffs (truncated from 98 to 50 lines):

--- a/ChangeLog	Thu Apr 28 21:35:44 2016 +0100
+++ b/ChangeLog	Thu Jun 09 09:27:31 2016 +0100
@@ -1,3 +1,7 @@
+2016-06-06  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Re-enable the disabled-for-some-reason Scatter1D combineWith Python mappings.
+
 2016-04-28  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Version 1.6.1 release!
--- a/configure.ac	Thu Apr 28 21:35:44 2016 +0100
+++ b/configure.ac	Thu Jun 09 09:27:31 2016 +0100
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([YODA],[1.6.1],[yoda at projects.hepforge.org],[YODA])
+AC_INIT([YODA],[1.7.dev],[yoda at projects.hepforge.org],[YODA])
 
 ## Check and block installation into the src/build dir
 if test "$prefix" = "$PWD"; then
--- a/pyext/yoda/declarations.pxd	Thu Apr 28 21:35:44 2016 +0100
+++ b/pyext/yoda/declarations.pxd	Thu Jun 09 09:27:31 2016 +0100
@@ -737,8 +737,8 @@
 
         void addPoints(const sortedvector[Point1D]&) #except +yodaerr
 
-        #void combineWith(const Scatter1D&) #except +yodaerr
-        #void combineWith(const vector[Scatter1D]&) #except +yodaerr
+        void combineWith(const Scatter1D&) #except +yodaerr
+        void combineWith(const vector[Scatter1D]&) #except +yodaerr
 
         void scaleX(double) except +yodaerr
 
--- a/pyext/yoda/include/Scatter1D.pyx	Thu Apr 28 21:35:44 2016 +0100
+++ b/pyext/yoda/include/Scatter1D.pyx	Thu Jun 09 09:27:31 2016 +0100
@@ -83,18 +83,18 @@
         for row in iterable:
             self.addPoint(*row)
 
-    # def combineWith(self, others):
-    #     """Try to add points from other Scatter1Ds into this one."""
-    #     cdef Scatter1D other
-    #     try:
-    #         # Can we type it as a Scatter1D?
-    #         other = others
-    #     except TypeError:
-    #         # Could be an iterable...
-    #         for other in others:
-    #             self.s1ptr().combineWith(deref(other.s1ptr()))