[yoda-svn] yoda: 6 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/98d8b65a8577
branches:  
changeset: 1143:98d8b65a8577
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Oct 05 16:02:28 2015 +0100
description:
yodamerge: add a fix for empty-in-all-runs histo merging; thanks to Daniel Rauch.

details:   https://yoda.hepforge.org/hg/yoda/rev/3e743dca1c8b
branches:  
changeset: 1144:3e743dca1c8b
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Oct 05 23:45:28 2015 +0100
description:
yodamerge: further tidying of Daniel's patch

details:   https://yoda.hepforge.org/hg/yoda/rev/83538a19659a
branches:  
changeset: 1145:83538a19659a
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Oct 06 00:09:34 2015 +0100
description:
yodamerge: add merging heuristics for Scatter1D and Scatter3D (needs unification)

details:   https://yoda.hepforge.org/hg/yoda/rev/0718a7d9c55b
branches:  
changeset: 1146:0718a7d9c55b
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Oct 06 00:31:40 2015 +0100
description:
Tweak yodamerge warnings on to stderr and add tests/mkmerginginputs script

details:   https://yoda.hepforge.org/hg/yoda/rev/633d360cc398
branches:  
changeset: 1147:633d360cc398
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Oct 06 00:33:32 2015 +0100
description:
Important! Typo fix in ReaderYODA Counter filling of sumW.

details:   https://yoda.hepforge.org/hg/yoda/rev/6141bfdaeb4a
branches:  
changeset: 1148:6141bfdaeb4a
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Oct 06 00:44:05 2015 +0100
description:
Another ReaderYODA bugfix, this time re. Scatter3D reading setting the Scatter2D state by accident

diffs (truncated from 333 to 50 lines):

--- a/ChangeLog	Sun Oct 04 09:59:38 2015 +0100
+++ b/ChangeLog	Tue Oct 06 00:44:05 2015 +0100
@@ -1,3 +1,14 @@
+2015-10-06  Andy Buckley  <andy.buckley at cern.ch>
+
+	* ReaderYODA: Typo fixes in Counter filling of sumW and Scatter3D reader state flag.
+
+	* yodamerge: add merging heuristics for Scatter1D and Scatter3D (needs unification)
+
+2015-10-05  Andy Buckley  <andy.buckley at cern.ch>
+
+	* yodamerge: add a fix for empty-in-all-runs histo merging; thanks
+	to Daniel Rauch.
+
 2015-10-04  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Adding dim() function and corresponding Python attribute to AnalysisObject.
--- a/bin/yodamerge	Sun Oct 04 09:59:38 2015 +0100
+++ b/bin/yodamerge	Tue Oct 06 00:44:05 2015 +0100
@@ -103,12 +103,17 @@
 
 parser = optparse.OptionParser(usage=__doc__)
 parser.add_option('-o', '--output', default='-', dest='OUTPUT_FILE')
-parser.add_option('--s2dmode', default="assume_ratio", dest='S2D_MODE',
-                  help="choose strategy for combining Scatter2D objects: one of 'first', 'combine', 'assume_ratio'")
+parser.add_option('--s1dmode', default="assume_mean", dest='S1D_MODE',
+                  help="choose strategy for combining Scatter1D objects: one of 'first', 'combine', 'assume_mean'")
+parser.add_option('--s2dmode', default="assume_mean", dest='S2D_MODE',
+                  help="choose strategy for combining Scatter2D objects: one of 'first', 'combine', 'assume_mean'")
+parser.add_option('--s3dmode', default="assume_mean", dest='S3D_MODE',
+                  help="choose strategy for combining Scatter3D objects: one of 'first', 'combine', 'assume_mean'")
 parser.add_option('--assume-normalized', action="store_true", default=False, dest='ASSUME_NORMALIZED',
                   help="DEPRECATED, AND DOES NOTHING. This option _used_ to bypass the detection heuristic for unnormalized histograms")
 opts, fileargs = parser.parse_args()
 
+
 ## Put the incoming objects into a dict from each path to a list of histos and scalings
 analysisobjects_in = {}
 for fa in fileargs:
@@ -124,32 +129,44 @@
         ao.setAnnotation("yodamerge_scale", scale)
         analysisobjects_in.setdefault(aopath, []).append(ao)
 
+
 analysisobjects_out = {}
 for p, aos in analysisobjects_in.iteritems():
 
-
     # TODO: Move merging tool code blocks into Python library