[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/afc174aadb89
branches:  release-2-4-x
changeset: 5219:afc174aadb89
user:      Andy Buckley <andy at insectnation.org>
date:      Mon May 30 19:24:48 2016 +0100
description:
bin/rivet: add -o as a more standard 'output' option flag alias to -H.

details:   https://rivet.hepforge.org/hg/rivet/rev/9f0a57a61089
branches:  release-2-4-x
changeset: 5220:9f0a57a61089
user:      Andy Buckley <andy at insectnation.org>
date:      Mon May 30 21:19:03 2016 +0100
description:
pyext/rivet/util.py: Add pandoc --wrap/--no-wrap CLI detection and batch conversion.

diffs (truncated from 87 to 50 lines):

--- a/ChangeLog	Fri May 27 17:07:53 2016 +0100
+++ b/ChangeLog	Mon May 30 21:19:03 2016 +0100
@@ -1,3 +1,10 @@
+2016-05-30  Andy Buckley  <andy.buckley at cern.ch>
+
+	* pyext/rivet/util.py: Add pandoc --wrap/--no-wrap CLI detection
+	and batch conversion.
+
+	* bin/rivet: add -o as a more standard 'output' option flag alias to -H.
+
 2016-05-23  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Remove the last ref-data bin from table 16 of
--- a/bin/rivet	Fri May 27 17:07:53 2016 +0100
+++ b/bin/rivet	Mon May 30 21:19:03 2016 +0100
@@ -65,7 +65,7 @@
 
 
 extragroup = OptionGroup(parser, "Extra run settings")
-extragroup.add_option("-H", "--histo-file", dest="HISTOFILE",
+extragroup.add_option("-o", "-H", "--histo-file", dest="HISTOFILE",
                       default="Rivet.yoda", help="specify the output histo file path (default = %default)")
 extragroup.add_option("-x", "--cross-section", dest="CROSS_SECTION",
                       default=None, metavar="XS",
--- a/pyext/rivet/util.py	Fri May 27 17:07:53 2016 +0100
+++ b/pyext/rivet/util.py	Mon May 30 21:19:03 2016 +0100
@@ -88,10 +88,10 @@
         .replace(r"\pt", r"\ensuremath{p_\mathrm{T}}\xspace") \
         .replace(r"\sqrts", r"\ensuremath{\sqrt{s}}\xspace") \
         .replace(r"\sqrtS", r"\ensuremath{\sqrt{s}}\xspace") \
-        .replace(r"\MeV", r"\ensuremath{\text{M\eV}}\xspace") \
-        .replace(r"\GeV", r"\ensuremath{\text{G\eV}}\xspace") \
-        .replace(r"\TeV", r"\ensuremath{\text{T\eV}}\xspace") \
-        .replace(r"\eV", r"\ensuremath{\text{e\kern-0.15ex{}V}}\xspace")
+        .replace(r"\MeV", r"\text{M\eV}\xspace") \
+        .replace(r"\GeV", r"\text{G\eV}\xspace") \
+        .replace(r"\TeV", r"\text{T\eV}\xspace") \
+        .replace(r"\eV", r"\text{e\kern-0.15ex{}V}\xspace")
     return t
 
 
@@ -99,7 +99,10 @@
     """Use pandoc (if available) to modify LaTeX text strings from
     analysis metadata for use as plain text, e.g. as printed to the terminal.
 
-    TODO: Maybe group many strings to be processed together, to save on system call / pandoc startup?
+    The argument can either be a string or an iterable of strings.
+
+    TODO: Replace \gamma, \mu, \tau, \Upsilon, \rho, \psi, \pi, \eta, \Delta, \Omega, \omega -> no-\ form?
+    TODO: Replace e^+- -> e+-?