[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/294d889b81cc
branches:  fastplot
changeset: 5692:294d889b81cc
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Feb 14 16:02:48 2017 +0000
description:
Add missing HasCTag functor

details:   https://rivet.hepforge.org/hg/rivet/rev/3dad020a9729
branches:  fastplot
changeset: 5693:3dad020a9729
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Feb 14 16:04:26 2017 +0000
description:
Add missing ChangeLog entries for tag-checking functors

details:   https://rivet.hepforge.org/hg/rivet/rev/dde6af1ad42f
branches:  release-2-5-x
changeset: 5694:dde6af1ad42f
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Feb 18 13:52:05 2017 +0000
description:
Try to tidy a mess of commits with the fastplot branch, including resurrecting the HasB/CTag functors. Plus: Add getEnvParam function, for neater use of environment variable parameters with a required default.

details:   https://rivet.hepforge.org/hg/rivet/rev/09fb279d10e1
branches:  fastplot
changeset: 5695:09fb279d10e1
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Feb 18 14:05:39 2017 +0000
description:
Merging

diffs (truncated from 612 to 50 lines):

--- a/ChangeLog	Wed Jan 25 13:47:25 2017 +0000
+++ b/ChangeLog	Sat Feb 18 14:05:39 2017 +0000
@@ -1,3 +1,7 @@
+2017-02-05  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add HasBTag and HasCTag jet functors, with lower-case aliases.
+
 2017-01-18  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Use std::function in functor-expanded method signatures on JetAlg.
--- a/bin/make-plots	Wed Jan 25 13:47:25 2017 +0000
+++ b/bin/make-plots	Sat Feb 18 14:05:39 2017 +0000
@@ -576,80 +576,21 @@
 
 
     def write_header(self,inputdata):
-        if inputdata.description.has_key('LeftMargin') and inputdata.description['LeftMargin']!='':
-            inputdata.description['LeftMargin'] = float(inputdata.description['LeftMargin'])
-        else:
-            inputdata.description['LeftMargin'] = 1.4
-        if inputdata.description.has_key('RightMargin') and inputdata.description['RightMargin']!='':
-            inputdata.description['RightMargin'] = float(inputdata.description['RightMargin'])
-        else:
-            inputdata.description['RightMargin'] = 0.35
-        if inputdata.description.has_key('TopMargin') and inputdata.description['TopMargin']!='':
-            inputdata.description['TopMargin'] = float(inputdata.description['TopMargin'])
-        else:
-            inputdata.description['TopMargin'] = 0.65
-        if inputdata.description.has_key('BottomMargin') and inputdata.description['BottomMargin']!='':
-            inputdata.description['BottomMargin'] = float(inputdata.description['BottomMargin'])
-        else:
-            inputdata.description['BottomMargin'] = 0.95
+        out = '\\begin{multipage}\n'
+        out += '\\begin{pspicture}(0,0)(0,0)\n'
+        out += '\\psset{xunit=%scm}\n' %(inputdata.description['PlotSizeX'])
         if inputdata.description['is2dim']:
-            inputdata.description['RightMargin'] += 1.7
-        papersizex = inputdata.description['PlotSizeX'] + 0.1 + \
-                     inputdata.description['LeftMargin'] + inputdata.description['RightMargin']
-        papersizey = inputdata.description['PlotSizeY'] + inputdata.description['RatioPlotSizeY'] + 0.1 + \
-                     inputdata.description['TopMargin'] + inputdata.description['BottomMargin']
-        #
-        out = ""
-        out += '\\documentclass{article}\n'
-        if opts.OUTPUT_FONT == "MINION":
-            out += ('\\usepackage{minion}\n')
-        elif opts.OUTPUT_FONT == "PALATINO_OSF":
-            out += ('\\usepackage[osf,sc]{mathpazo}\n')
-        elif opts.OUTPUT_FONT == "PALATINO":
-            out += ('\\usepackage{mathpazo}\n')