[yoda-svn] yoda: 4 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/3e1fc5cabe21
branches:  
changeset: 1191:3e1fc5cabe21
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Dec 12 20:35:14 2015 +0000
description:
Allow new rebinTo() merging to restrict to a subset of the bin range, merging the outside bins into the overflow distributions.

details:   https://yoda.hepforge.org/hg/yoda/rev/906599af866b
branches:  
changeset: 1192:906599af866b
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Dec 12 20:45:11 2015 +0000
description:
Fix accidental use of S2D_MODE flag where S1D_MODE should have been used, in yodamerge. Thanks again to Radek Podskubka.

details:   https://yoda.hepforge.org/hg/yoda/rev/d11196b456b8
branches:  
changeset: 1193:d11196b456b8
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Dec 12 20:57:15 2015 +0000
description:
Add a flag to yoda2root to change whether the conversion is to 'proper' types or to (more robustly) TGraphAsymmErrors objects.

details:   https://yoda.hepforge.org/hg/yoda/rev/64e780643b6e
branches:  
changeset: 1194:64e780643b6e
user:      Andy Buckley <andy at insectnation.org>
date:      Sun Dec 13 12:11:08 2015 +0000
description:
Remove accidental debug cout

diffs (truncated from 133 to 50 lines):

--- a/ChangeLog	Fri Dec 11 23:27:42 2015 +0000
+++ b/ChangeLog	Sun Dec 13 12:11:08 2015 +0000
@@ -1,3 +1,14 @@
+2015-12-12  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add a flag to yoda2root to change whether the conversion is to
+	'proper' types or to (more robustly) TGraphAsymmErrors objects.
+
+	* Fix accidental use of S2D_MODE flag where S1D_MODE should have
+	been used, in yodamerge. Thanks again to Radek Podskubka.
+
+	* Allow new rebinTo() merging to restrict to a subset of the bin
+	range, merging the outside bins into the overflow distributions.
+
 2015-12-11  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add a rebinTo() method on Axis1D, allowing rebinning to a new
@@ -16,6 +27,7 @@
 	and Profile classes.
 
 	* Fix Counter::numEntries to return an unsigned long rather than double.
+	Thanks to Radek Podskubka for the bug discovery and detective work.
 
 	* Improve sortedvector to insert new elements into the sorted
 	position, rather than resorting the whole vector. This should be a
--- a/bin/yoda2root	Fri Dec 11 23:27:42 2015 +0000
+++ b/bin/yoda2root	Sun Dec 13 12:11:08 2015 +0000
@@ -10,6 +10,8 @@
 from yoda.script_helpers import parse_x2y_args, filter_aos
 
 parser = optparse.OptionParser(usage=__doc__)
+parser.add_option("-g", "--as-graphs", dest="AS_GRAPHS", action="store_true", default=False,
+                  help="Convert to ROOT TGraphs rather than native types")
 parser.add_option("-m", "--match", dest="MATCH", metavar="PATT", default=None,
                   help="Only write out histograms whose path matches this regex")
 parser.add_option("-M", "--unmatch", dest="UNMATCH", metavar="PATT", default=None,
@@ -26,7 +28,7 @@
     of = ROOT.TFile(o, "recreate")
     analysisobjects = yoda.readYODA(i)
     filter_aos(analysisobjects, opts.MATCH, opts.UNMATCH)
-    rootobjects = [yoda.root.to_root(ao) for ao in analysisobjects.values()]
+    rootobjects = [yoda.root.to_root(ao, asgraph=opts.AS_GRAPHS) for ao in analysisobjects.values()]
 
     ## Protect against "/" in the histogram name, which ROOT does not like
     for obj in rootobjects:
--- a/bin/yodamerge	Fri Dec 11 23:27:42 2015 +0000
+++ b/bin/yodamerge	Sun Dec 13 12:11:08 2015 +0000
@@ -201,7 +201,7 @@
         if aotype is yoda.Scatter1D: