[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/1a414e9c185d
branches:  release-2-4-x
changeset: 4982:1a414e9c185d
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Feb 17 23:33:20 2016 +0000
description:
Document AOPath methods

details:   https://rivet.hepforge.org/hg/rivet/rev/950d377bf006
branches:  release-2-4-x
changeset: 4983:950d377bf006
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Feb 17 23:37:42 2016 +0000
description:
Oops, add missing 'self' args to AOPath methods

details:   https://rivet.hepforge.org/hg/rivet/rev/cf8b5320615f
branches:  release-2-4-x
changeset: 4984:cf8b5320615f
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Feb 17 23:42:20 2016 +0000
description:
More fixes

details:   https://rivet.hepforge.org/hg/rivet/rev/5bd1fbc62d56
branches:  release-2-4-x
changeset: 4985:5bd1fbc62d56
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Feb 17 23:53:14 2016 +0000
description:
Various improvements and fixes in plotting machinery, toward proper histo variation handling

diffs (truncated from 249 to 50 lines):

--- a/bin/make-plots	Wed Feb 17 23:33:01 2016 +0000
+++ b/bin/make-plots	Wed Feb 17 23:53:14 2016 +0000
@@ -2418,7 +2418,7 @@
         logging.debug(os.listdir(tempdir))
 
     ## Copy results back to main dir
-    for fmt in in opts.OUTPUT_FORMAT:
+    for fmt in opts.OUTPUT_FORMAT:
         outname = "%s.%s" % (filename, fmt.lower())
         outpath = os.path.join(tempdir, outname)
         if os.path.exists(outpath):
@@ -2492,17 +2492,17 @@
     parser = OptionParser(usage=__doc__)
     parser.add_option("-n", "-j", "--num-threads", dest="NUM_THREADS", type="int",
                       default=numcores, help="max number of threads to be used [%s]" % numcores)
-    parser.add_option("--font", dest="OUTPUT_FONT", action="choice", choices="palatino,cm,times,helvetica,minion",
+    parser.add_option("--font", dest="OUTPUT_FONT", choices="palatino,cm,times,helvetica,minion".split(","),
                       default="palatino", help="choose the font to be used in the plots")
-    parser.add_option("--palatino", dest="OUTPUT_FONT", action="store_const", const="PALATINO", default="PALATINO",
+    parser.add_option("--palatino", dest="OUTPUT_FONT", action="store_const", const="palatino", default="palatino",
                       help="Use Palatino as font (default). DEPRECATED: Use --font")
-    parser.add_option("--cm", dest="OUTPUT_FONT", action="store_const", const="CM", default="PALATINO",
+    parser.add_option("--cm", dest="OUTPUT_FONT", action="store_const", const="cm", default="palatino",
                       help="Use Computer Modern as font. DEPRECATED: Use --font")
-    parser.add_option("--times", dest="OUTPUT_FONT", action="store_const", const="TIMES", default="PALATINO",
+    parser.add_option("--times", dest="OUTPUT_FONT", action="store_const", const="times", default="palatino",
                       help="Use Times as font. DEPRECATED: Use --font")
-    parser.add_option("--minion", dest="OUTPUT_FONT", action="store_const", const="MINION", default="PALATINO",
+    parser.add_option("--minion", dest="OUTPUT_FONT", action="store_const", const="minion", default="palatino",
                       help="Use Adobe Minion Pro as font. Note: You need to set TEXMFHOME first. DEPRECATED: Use --font")
-    parser.add_option("--helvetica", dest="OUTPUT_FONT", action="store_const", const="HELVETICA", default="PALATINO",
+    parser.add_option("--helvetica", dest="OUTPUT_FONT", action="store_const", const="helvetica", default="palatino",
                       help="Use Helvetica as font. DEPRECATED: Use --font")
     parser.add_option("--format", dest="OUTPUT_FORMAT", default="PDF",
                       help="Choose plot format, perhaps multiple comma-separated formats e.g. 'pdf' or 'tex,pdf,png' (default = PDF).")
--- a/bin/rivet-cmphistos	Wed Feb 17 23:33:01 2016 +0000
+++ b/bin/rivet-cmphistos	Wed Feb 17 23:53:14 2016 +0000
@@ -239,7 +239,7 @@
 
     if special is not None:
         output += "\n"
-        output += "# BEGIN SPECIAL %s\n" % h
+        output += "# BEGIN SPECIAL %s\n" % hpath
         output += special
         output += "# END SPECIAL\n\n"
 
@@ -348,8 +348,11 @@
         if not is2d:
             plot['Legend'] = '1'
             plot['LogY'] = '1'