[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/b6dc92b4b0df
branches:  release-2-5-x
changeset: 5437:b6dc92b4b0df
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Sep 02 13:03:15 2016 +0100
description:
Extend last/first particle classification functors too accept Cuts as well as functors

details:   https://rivet.hepforge.org/hg/rivet/rev/fd2be050cc9c
branches:  release-2-5-x
changeset: 5438:fd2be050cc9c
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Sep 02 15:51:10 2016 +0100
description:
Code tidying

details:   https://rivet.hepforge.org/hg/rivet/rev/b6df8854e002
branches:  release-2-5-x
changeset: 5439:b6df8854e002
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Sep 02 16:08:51 2016 +0100
description:
Code tidying

details:   https://rivet.hepforge.org/hg/rivet/rev/708bf1b6d0dd
branches:  release-2-5-x
changeset: 5440:708bf1b6d0dd
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 06 12:50:01 2016 +0100
description:
Update configure scripts to use newer (Py3-safe) Python testing macros.

diffs (truncated from 1530 to 50 lines):

--- a/ChangeLog	Fri Sep 02 10:40:59 2016 +0100
+++ b/ChangeLog	Tue Sep 06 12:50:01 2016 +0100
@@ -1,8 +1,11 @@
+2016-09-06  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Update configure scripts to use newer (Py3-safe) Python testing macros.
+
 2016-09-02  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add isFirstWith(out), isLastWith(out) functions, and functor
-	wrappers -- not Cut-based, for now, but easily extended via .cc
-	files to avoid circular references.
+	wrappers, using Cut and templated function/functor args.
 
 	* Add Particle::parent() method.
 
--- a/bin/make-plots	Fri Sep 02 10:40:59 2016 +0100
+++ b/bin/make-plots	Tue Sep 06 12:50:01 2016 +0100
@@ -169,6 +169,7 @@
         self.apply_config_files(opts.CONFIGFILES)
 
         ## Plot (and subplot) sizing
+        # TODO: Use attr functions and bools properly
         self.description.setdefault('PlotSizeX', 10.)
         if self.description['is2dim']:
             self.description['PlotSizeX'] -= 1.7
@@ -627,9 +628,9 @@
         out += ('\\usepackage{amssymb}\n')
         out += ('\\usepackage{relsize}\n')
         out += ('\\usepackage[dvips,\n')
-        out += ('  left=%4.3fcm, right=0cm,\n' %(inputdata.description['LeftMargin']-0.45,))
-        out += ('  top=%4.3fcm,  bottom=0cm,\n' %(inputdata.description['TopMargin']-0.30,))
-        out += ('  paperwidth=%scm,paperheight=%scm\n' %(papersizex,papersizey))
+        out += ('  left=%4.3fcm, right=0cm,\n' % (inputdata.description['LeftMargin']-0.45,))
+        out += ('  top=%4.3fcm,  bottom=0cm,\n' % (inputdata.description['TopMargin']-0.30,))
+        out += ('  paperwidth=%scm,paperheight=%scm\n' % (papersizex,papersizey))
         out += (']{geometry}\n')
         out += ('\\begin{document}\n')
         out += ('\\pagestyle{empty}\n')
@@ -679,52 +680,49 @@
 
     def _draw(self, inputdata):
         out = ""
-        if inputdata.description.has_key('DrawSpecialFirst') and inputdata.description['DrawSpecialFirst']=='1':
-            for i in inputdata.special.keys():
-                out += inputdata.special[i].draw(self.coors)
-            if inputdata.description.has_key('DrawFunctionFirst') and inputdata.description['DrawFunctionFirst']=='1':
-                for i in inputdata.functions.keys():
-                    out += inputdata.functions[i].draw(self.coors)
+