[Rivet-svn] rivet: 6 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/7a0ac916b87f
branches:  release-2-4-x
changeset: 4970:7a0ac916b87f
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Feb 15 20:20:43 2016 +0000
description:
Add pyext/rivet/aopaths.py, containing AOPath object for central & standard decoding of Rivet-standard analysis object path structures.

details:   https://rivet.hepforge.org/hg/rivet/rev/166b3e54d7aa
branches:  release-2-4-x
changeset: 4971:166b3e54d7aa
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Feb 15 20:21:53 2016 +0000
description:
Modify rivet-cmphistos and rivet-mkhtml to apply plot hiding if *any* path component is hidden by an underscore prefix, as implemented in AOPath, plus other tidying using new AOPath methods.

details:   https://rivet.hepforge.org/hg/rivet/rev/e11f88ed297d
branches:  release-2-4-x
changeset: 4972:e11f88ed297d
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Feb 15 21:38:44 2016 +0000
description:
Add new plot styling options to rivet-cmphistos and rivet-mkhtml. Thanks to Gavin Hesketh.

details:   https://rivet.hepforge.org/hg/rivet/rev/59726c927d0a
branches:  release-2-4-x
changeset: 4973:59726c927d0a
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Feb 15 22:04:29 2016 +0000
description:
Disable --refid on rivet-mkhtml: it doesn't work because rivet-cmphistos doesn't support it (and clearly no-one is using it...)

details:   https://rivet.hepforge.org/hg/rivet/rev/db8f2095e724
branches:  release-2-4-x
changeset: 4974:db8f2095e724
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Feb 15 22:31:32 2016 +0000
description:
Add --font and --format options to rivet-mkhtml and make-plots, to replace the individual flags used for that purpose. Not fully cleaned up, but a necessary step.

details:   https://rivet.hepforge.org/hg/rivet/rev/d41a212b9c78
branches:  release-2-4-x
changeset: 4975:d41a212b9c78
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Feb 15 22:51:50 2016 +0000
description:
Add Analysis::bookCounter and some machinery in rivet-cmphistos to avoid getting tripped up by unplottable (for now) data types.

diffs (truncated from 602 to 50 lines):

--- a/ChangeLog	Fri Feb 12 12:16:44 2016 +0000
+++ b/ChangeLog	Mon Feb 15 22:51:50 2016 +0000
@@ -1,3 +1,24 @@
+2016-02-15  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add Analysis::bookCounter and some machinery in rivet-cmphistos
+	to avoid getting tripped up by unplottable (for now) data types.
+
+	* Add --font and --format options to rivet-mkhtml and make-plots,
+	to replace the individual flags used for that purpose. Not fully
+	cleaned up, but a necessary step.
+
+	* Add new plot styling options to rivet-cmphistos and
+	rivet-mkhtml. Thanks to Gavin Hesketh.
+
+	* Modify rivet-cmphistos and rivet-mkhtml to apply plot hiding if
+	*any* path component is hidden by an underscore prefix, as
+	implemented in AOPath, plus other tidying using new AOPath
+	methods.
+
+	* Add pyext/rivet/aopaths.py, containing AOPath object for central
+	& standard decoding of Rivet-standard analysis object path
+	structures.
+
 2016-02-12  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Update ParticleIdUtils.hh (i.e. PID:: functions) to use the
--- a/bin/make-plots	Fri Feb 12 12:16:44 2016 +0000
+++ b/bin/make-plots	Mon Feb 15 22:51:50 2016 +0000
@@ -2311,7 +2311,7 @@
     texfile.write(p.write_footer())
     texfile.close()
 
-    if opts.OUTPUT_FORMAT != "TEX":
+    if opts.OUTPUT_FORMAT != ["TEX"]:
 
         ## Check for the required programs
         latexavailable = have_cmd("latex")
@@ -2356,12 +2356,12 @@
 
         ## Choose format
         # TODO: Rationalise... this is a mess! Maybe we can use tex2pix?
-        if opts.OUTPUT_FORMAT == "PS":
+        if "PS" in opts.OUTPUT_FORMAT:
             dvcmd += ["-o", "%s.ps" % filename]
             logging.debug(" ".join(dvcmd))
             dvproc = subprocess.Popen(dvcmd, stdout=subprocess.PIPE, cwd=tempdir)
             dvproc.wait()
-        elif opts.OUTPUT_FORMAT == "PDF":
+        if "PDF" in opts.OUTPUT_FORMAT: