[yoda-svn] yoda: 4 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/939332d111b8
branches:  release-1-6
changeset: 1323:939332d111b8
user:      Holger Schulz <holger.schulz at durham.ac.uk>
date:      Mon Dec 12 11:42:33 2016 +0000
description:
Bugfix self.edges.x - > self.xEdges and similar for y --- bugfix bins accessor

details:   https://yoda.hepforge.org/hg/yoda/rev/be892d43a04f
branches:  release-1-6
changeset: 1324:be892d43a04f
user:      Holger Schulz <holger.schulz at durham.ac.uk>
date:      Mon Dec 12 11:43:09 2016 +0000
description:
Bugfix self.edges.x - > self.xEdges and similar for y --- bugfix bins accessor

details:   https://yoda.hepforge.org/hg/yoda/rev/83adb12859a5
branches:  release-1-6
changeset: 1325:83adb12859a5
user:      Holger Schulz <holger.schulz at durham.ac.uk>
date:      Mon Dec 12 11:43:48 2016 +0000
description:
Bugfix attrgetter('edges') - > attrgetter('xEdges') and attrgetter('xRange') -> attrgetter('xWidth')

details:   https://yoda.hepforge.org/hg/yoda/rev/1d68363e7997
branches:  release-1-6
changeset: 1326:1d68363e7997
user:      Holger Schulz <holger.schulz at durham.ac.uk>
date:      Mon Dec 12 11:44:22 2016 +0000
description:
Merge

diffs (truncated from 67 to 50 lines):

--- a/bin/aida2flat	Fri Sep 30 13:40:59 2016 +0100
+++ b/bin/aida2flat	Mon Dec 12 11:44:22 2016 +0000
@@ -18,7 +18,7 @@
 parser.add_option("-M", "--unmatch", dest="UNMATCH", metavar="PATT", default=None,
                   help="exclude histograms whose path matches this regex")
 
-sys.stderr.write("WARNING: aida2flat is DEPRECATED.\n  It will die when AIDA does... *soon*\n"
+sys.stderr.write("WARNING: aida2flat is DEPRECATED.\n  It will die when AIDA does... *soon*\n")
 
 opts, args = parser.parse_args()
 in_out = parse_x2y_args(args, ".aida", ".dat")
--- a/bin/flat2yoda	Fri Sep 30 13:40:59 2016 +0100
+++ b/bin/flat2yoda	Mon Dec 12 11:44:22 2016 +0000
@@ -18,7 +18,7 @@
 parser.add_option("-M", "--unmatch", dest="UNMATCH", metavar="PATT", default=None,
                   help="exclude histograms whose path matches this regex")
 
-sys.stderr.write("WARNING: flat2yoda is DEPRECATED.\n  The flat/dat format is not intended as an interchange format.\n"
+sys.stderr.write("WARNING: flat2yoda is DEPRECATED.\n  The flat/dat format is not intended as an interchange format.\n")
 
 opts, args = parser.parse_args()
 in_out = parse_x2y_args(args, ".dat", ".yoda")
--- a/bin/yoda2aida	Fri Sep 30 13:40:59 2016 +0100
+++ b/bin/yoda2aida	Mon Dec 12 11:44:22 2016 +0000
@@ -18,7 +18,7 @@
 parser.add_option("-M", "--unmatch", dest="UNMATCH", metavar="PATT", default=None,
                   help="exclude histograms whose path matches this regex")
 
-sys.stderr.write("WARNING: yoda2aida is DEPRECATED.\n  It will die when AIDA does... *soon*\n"
+sys.stderr.write("WARNING: yoda2aida is DEPRECATED.\n  It will die when AIDA does... *soon*\n")
 
 opts, args = parser.parse_args()
 in_out = parse_x2y_args(args, ".yoda", ".aida")
--- a/pyext/yoda/include/Histo1D.pyx	Fri Sep 30 13:40:59 2016 +0100
+++ b/pyext/yoda/include/Histo1D.pyx	Mon Dec 12 11:44:22 2016 +0000
@@ -255,10 +255,10 @@
             self.h1ptr().addBins(cedges)
 
     def __addBins_bins(self, bins):
-        self.__addBins_tuples(imap(attrgetter('edges'), bins))
+        self.__addBins_tuples(imap(attrgetter('xEdges'), bins))
 
     def __addBins_points(self, points):
-        self.__addBins_tuples(imap(attrgetter('xRange'), points))
+        self.__addBins_tuples(imap(attrgetter('xWidth'), points))
 
     def __addBins_tuples(self, tuples):
         cdef double a, b
--- a/pyext/yoda/include/Histo2D.pyx	Fri Sep 30 13:40:59 2016 +0100
+++ b/pyext/yoda/include/Histo2D.pyx	Mon Dec 12 11:44:22 2016 +0000