[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/cd0eefabb18f
branches:  release-2-4-x
changeset: 4940:cd0eefabb18f
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Nov 30 11:29:20 2015 +0000
description:
Relax rivet/plotinfo.py pattern matching on .plot file components, to allow leading whitespace and around = signs, and to make the leading # optional on BEGIN/END blocks.

details:   https://rivet.hepforge.org/hg/rivet/rev/0199f2731854
branches:  release-2-4-x
changeset: 4941:0199f2731854
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Dec 02 17:01:06 2015 +0000
description:
Improvements to rivet-mkhtml behaviour re. consistency with rivet-cmphistos in how muti-part histo paths are decomposed into analysis-name + histo name, and removal of 'NONE' strings.

details:   https://rivet.hepforge.org/hg/rivet/rev/80141e548dc9
branches:  release-2-4-x
changeset: 4942:80141e548dc9
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Dec 02 23:46:52 2015 +0000
description:
Add handling of a command-line PLOT 'file' argument to rivet-mkhtml, cf. rivet-cmphistos

details:   https://rivet.hepforge.org/hg/rivet/rev/db679fa5b240
branches:  release-2-4-x
changeset: 4943:db679fa5b240
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Dec 02 23:47:54 2015 +0000
description:
Merge

diffs (truncated from 335 to 50 lines):

--- a/ChangeLog	Thu Nov 26 08:05:54 2015 +0000
+++ b/ChangeLog	Wed Dec 02 23:47:54 2015 +0000
@@ -1,3 +1,17 @@
+2015-12-02  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add handling of a command-line PLOT 'file' argument to rivet-mkhtml, cf. rivet-cmphistos
+
+	* Improvements to rivet-mkhtml behaviour re. consistency with
+	rivet-cmphistos in how muti-part histo paths are decomposed into
+	analysis-name + histo name, and removal of 'NONE' strings.
+
+2015-11-30  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Relax rivet/plotinfo.py pattern matching on .plot file
+	components, to allow leading whitespace and around = signs, and to
+	make the leading # optional on BEGIN/END blocks.
+
 2015-11-26  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Write out intermediate histogram files by default, with event interval of 10k.
--- a/bin/rivet-mkhtml	Thu Nov 26 08:05:54 2015 +0000
+++ b/bin/rivet-mkhtml	Wed Dec 02 23:47:54 2015 +0000
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 """\
-%prog [options] <yodafile1> [<yodafile2> <yodafile3>...]
+%prog [options] <yodafile1> [<yodafile2> <yodafile3>...] [PLOT:Key1=Val1:...]
 
 Make web pages from histogram files written out by Rivet.  You can specify
 multiple Monte Carlo YODA files to be compared in the same syntax as for
@@ -11,11 +11,7 @@
 automatically (if not, set the RIVET_ANALYSIS_PATH or similar variables
 appropriately).
 
-You can overwrite an existing output directory.
-
-TODO:
-  * Extend -m/-M options to veto histo names as well as analysis names, via
-  passing to rivet-cmphistos
+Any existing output directory will be overwritten.
 """
 
 import rivet, sys, os
@@ -38,7 +34,7 @@
                   default=False, help="ignore missing YODA files.")
 parser.add_option("-i", "--ignore-unvalidated", dest="IGNORE_UNVALIDATED", action="store_true",
                   default=False, help="ignore unvalidated analyses.")
-parser.add_option("--refid", dest="REF_ID",
+parser.add_option("--ref", "--refid", dest="REF_ID",