[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/525a9f6c4105
branches:  release-2-5-x
changeset: 5507:525a9f6c4105
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 20 21:21:19 2016 +0100
description:
Minor DressedLeptons code tidying

details:   https://rivet.hepforge.org/hg/rivet/rev/3ebbdd74e6eb
branches:  release-2-5-x
changeset: 5508:3ebbdd74e6eb
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 20 21:22:15 2016 +0100
description:
Mention make-plots fix in the ChangeLog

details:   https://rivet.hepforge.org/hg/rivet/rev/5db392c9017b
branches:  release-2-5-x
changeset: 5509:5db392c9017b
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Sep 21 10:55:01 2016 +0100
description:
Add deprecation comments, to reduce the number of constructor arg permutations/overloads

details:   https://rivet.hepforge.org/hg/rivet/rev/77b6a583aed5
branches:  release-2-5-x
changeset: 5510:77b6a583aed5
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Sep 21 10:55:07 2016 +0100
description:
Add a requirement to DressedLeptons that the FinalState passed as 'bareleptons' will be filtered to only contain charged leptons, if that is not already the case. Thanks to Markus Seidel for the suggestion.

details:   https://rivet.hepforge.org/hg/rivet/rev/bc18265a9b38
branches:  release-2-5-x
changeset: 5511:bc18265a9b38
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Sep 21 10:56:44 2016 +0100
description:
Merge

diffs (truncated from 922 to 50 lines):

--- a/ChangeLog	Tue Sep 20 13:47:14 2016 +0100
+++ b/ChangeLog	Wed Sep 21 10:56:44 2016 +0100
@@ -1,5 +1,24 @@
+2016-09-21  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add a requirement to DressedLeptons that the FinalState passed
+	as 'bareleptons' will be filtered to only contain charged leptons,
+	if that is not already the case. Thanks to Markus Seidel for the
+	suggestion.
+
+2016-09-21  Holger Schulz  <holger.schulz at cern.ch>
+
+	* Add Simone Amoroso's plugin for hadron spectra (ALEPH_1995_I382179) 
+
+2016-09-20  Holger Schulz  <holger.schulz at cern.ch>
+
+	* Add CMS ttbar analysis from contrib, mark validated (CMS_2016_I1473674)
+
+	* Extend rivet-mkhtml --booklet to also work with pdfmerge
+
 2016-09-20  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Fix make-plots automatic YMax calculation, which had a typo from code cleaning (mea culpa!).
+
 	* Fix ChargedLeptons projection, which failed to exclude neutrinos!!! Thanks to Markus Seidel.
 
 	* Add templated FN filtering arg versions of the Jet::*Tags() and
--- a/bin/rivet-mkhtml	Tue Sep 20 13:47:14 2016 +0100
+++ b/bin/rivet-mkhtml	Wed Sep 21 10:56:44 2016 +0100
@@ -71,7 +71,7 @@
 stygroup.add_option("--ps", dest="VECTORFORMAT", action="store_const", const="PS",
                     default="PDF", help="use PostScript as the vector plot format. DEPRECATED")
 stygroup.add_option("--booklet", dest="BOOKLET", action="store_true",
-                    default=False, help="create booklet (currently only available for PDF with pdftk).")
+                    default=False, help="create booklet (currently only available for PDF with pdftk or pdfmerge).")
 stygroup.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")
 stygroup.add_option("--palatino", dest="OUTPUT_FONT", action="store_const", const="palatino", default="palatino",
@@ -418,6 +418,24 @@
     index.write('<br>%s</body>\n</html>' % timestamp)
     index.close()
 
+# http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python
+def which(program):
+    import os
+    def is_exe(fpath):
+        return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+
+    fpath, fname = os.path.split(program)
+    if fpath: