[yoda-svn] yoda: 3 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/e2b6db56587e
branches:  
changeset: 1188:e2b6db56587e
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 11 16:50:01 2015 +0000
description:
Stage 1 in rebinning / binning implementation tweaks and addition of Axis1D rebinTo method

details:   https://yoda.hepforge.org/hg/yoda/rev/888320e80460
branches:  
changeset: 1189:888320e80460
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 11 23:15:30 2015 +0000
description:
Add a rebinTo() method on Axis1D, allowing rebinning to a new given set of bin edges. Add an explicitly named rebinBy(), and overloaded rebin() aliases for both, and pass through to Histo1D and Profile1D APIs. Plus other internal tweaks to binning functionality... anticipating/fuelling the fundamental rewrite.

details:   https://yoda.hepforge.org/hg/yoda/rev/741af51c0e1d
branches:  
changeset: 1190:741af51c0e1d
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Dec 11 23:27:42 2015 +0000
description:
Map new rebinning methods into Python

diffs (truncated from 791 to 50 lines):

--- a/ChangeLog	Thu Dec 10 23:08:24 2015 +0000
+++ b/ChangeLog	Fri Dec 11 23:27:42 2015 +0000
@@ -1,3 +1,11 @@
+2015-12-11  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add a rebinTo() method on Axis1D, allowing rebinning to a new
+	given set of bin edges. Add an explicitly named rebinBy(), and
+	overloaded rebin() aliases for both, and pass through to Histo1D
+	and Profile1D APIs. Plus other internal tweaks to binning
+	functionality... anticipating/fuelling the fundamental rewrite.
+
 2015-12-10  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Improve ReaderYODA to use temporary bin containers, to minimise
--- a/bin/yoda-config.in	Thu Dec 10 23:08:24 2015 +0000
+++ b/bin/yoda-config.in	Fri Dec 11 23:27:42 2015 +0000
@@ -24,8 +24,8 @@
     echo "  --libdir      : show the path to the directory containing the YODA libraries"
     echo "  --pythonpath  : show the path(s) to the directory containing YODA's Python package"
     echo
-    echo "  --cppflags    : returns a '-I' string for insertion into CPPFLAGS"
-    echo "  --libs        : returns a '-L/-l' string for insertion into LIBS or LIBADD"
+    echo "  --cflags|--cppflags : returns a '-I' string for insertion into CPPFLAGS or CXXFLAGS"
+    echo "  --ldflags|libs      : returns a '-L/-l' string for insertion into LIBS or LIBADD"
     echo
     echo "  --version     : returns the YODA release version number"
     exit 0
@@ -47,7 +47,7 @@
 test -n "$tmp" && OUT="$OUT @YODA_PYTHONPATH@"
 
 ## "Pre-rolled" build info
-tmp=$( echo "$*" | egrep -- '--\<cppflags|cxxflags\>')
+tmp=$( echo "$*" | egrep -- '--\<cflags|cppflags|cxxflags\>')
 test -n "$tmp" && OUT="$OUT -I at includedir@ @BOOST_CPPFLAGS@"
 
 tmp=$( echo "$*" | egrep -- '--\<ldflags|libs\>')
--- a/include/YODA/Axis1D.h	Thu Dec 10 23:08:24 2015 +0000
+++ b/include/YODA/Axis1D.h	Fri Dec 11 23:27:42 2015 +0000
@@ -204,212 +204,12 @@
     }
 
 
-    /// Merge together the bin range with indices from @a from to @a to, inclusive.
-    /// Merge a series of bins, between the bins identified by indices @a from and @a to
-    void mergeBins(size_t from, size_t to) {
-      // Correctness checking
-      if (from >= numBins())
-        throw RangeError("Initial merge index is out of range");
-      if (to >= numBins())
-        throw RangeError("Final merge index is out of range");