[yoda-svn] yoda: 7 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/1a56dac20200
branches:  release-1-6
changeset: 1359:1a56dac20200
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 24 14:36:04 2017 +0100
description:
More pyplot import tweaks

details:   https://yoda.hepforge.org/hg/yoda/rev/e5145160d5d8
branches:  release-1-6
changeset: 1360:e5145160d5d8
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 24 14:57:01 2017 +0100
description:
Add AO as an alias for AnalysisObject.  Add annotationsDict to the Python AO interface.

details:   https://yoda.hepforge.org/hg/yoda/rev/b6d9c52ab297
branches:  release-1-6
changeset: 1361:b6d9c52ab297
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 24 14:57:48 2017 +0100
description:
Update yoda.plotting functions to treat plot-keys as args and AO annotations via case-insensitive keys.

details:   https://yoda.hepforge.org/hg/yoda/rev/581cbfacb64c
branches:  release-1-6
changeset: 1362:581cbfacb64c
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 24 16:47:08 2017 +0100
description:
Improvements to yodaplot, including two operating modes: the default CMP mode is suitable for plotting histos by path, from raw .yoda files.

details:   https://yoda.hepforge.org/hg/yoda/rev/cbc74ff8b478
branches:  release-1-6
changeset: 1363:cbc74ff8b478
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 24 17:01:51 2017 +0100
description:
Tweaks and fixes to plotting

details:   https://yoda.hepforge.org/hg/yoda/rev/019b8c234227
branches:  release-1-6
changeset: 1364:019b8c234227
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 15 16:21:17 2017 +0100
description:
Remove invalid y arguments from Scatter1D addPoint

details:   https://yoda.hepforge.org/hg/yoda/rev/2bc552f44f11
branches:  release-1-6
changeset: 1365:2bc552f44f11
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Aug 16 12:55:41 2017 +0100
description:
Explicitly load all ROOT objects as a list rather than generator. Patch from Dmitry Kalinkin.

diffs (truncated from 551 to 50 lines):

--- a/ChangeLog	Mon Jul 24 16:36:03 2017 +0200
+++ b/ChangeLog	Wed Aug 16 12:55:41 2017 +0100
@@ -1,3 +1,21 @@
+2017-08-16  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Explicitly load all ROOT objects as a list rather than
+	generator. Patch from Dmitry Kalinkin.
+
+2017-07-24  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Improvements to yodaplot, including two operating modes: the
+	default CMP mode is suitable for plotting histos by path, from raw
+	.yoda files.
+
+	* Update yoda.plotting functions to treat plot-keys as args and AO
+	annotations via case-insensitive keys.
+
+	* Add annotationsDict to the Python AO interface.
+
+	* Add AO as an alias for AnalysisObject.
+
 2017-07-23  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add parallel/compatibility yoda1 package to aid eventual transition to YODA v2.
--- a/bin/root2yoda	Mon Jul 24 16:36:03 2017 +0200
+++ b/bin/root2yoda	Wed Aug 16 12:55:41 2017 +0100
@@ -24,7 +24,7 @@
 import ROOT
 for i, o in in_out:
     rf = ROOT.TFile(i)
-    rootobjects_raw = yoda.root.getall(rf)
+    rootobjects_raw = list(yoda.root.getall(rf))
     rootobjects     = [(path, ro) for (path, ro) in rootobjects_raw if not isinstance(ro, ROOT.TH1F)]
     th1f            = [(path, ro) for (path, ro) in rootobjects_raw if     isinstance(ro, ROOT.TH1F)]
     # Conversion of TH1F into TH1D
--- a/bin/yodaplot	Mon Jul 24 16:36:03 2017 +0200
+++ b/bin/yodaplot	Wed Aug 16 12:55:41 2017 +0100
@@ -1,12 +1,18 @@
 #! /usr/bin/env python
 
 """\
-Usage: %prog 1.dat [2.dat ...]
+Usage: %prog data1 [data2 ...]
 
-Make a plot from each of the given plot data files.
+Make a plot from each of the given plot data files (can be .yoda or make-plots .dat).
 
 TODO:
  - Should be able to do default plotting of all plots loaded from a .yoda file
+ - Overlay option (print all plots from a file, overlaid)