[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/771cba36b77a
branches:  release-2-5-x
changeset: 5490:771cba36b77a
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Sep 17 13:42:18 2016 +0100
description:
More code tidying, and fix double-plotting of Title above the ratio plot

details:   https://rivet.hepforge.org/hg/rivet/rev/62a5077490fd
branches:  release-2-5-x
changeset: 5491:62a5077490fd
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Sep 17 15:54:09 2016 +0100
description:
Add has{Ancestor,Parent,Child,Descendant}With functions and HasParticle{Ancestor,Parent,Child,Descendant}With functors.

details:   https://rivet.hepforge.org/hg/rivet/rev/ff21f2d1394b
branches:  release-2-5-x
changeset: 5492:ff21f2d1394b
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Sep 17 16:04:01 2016 +0100
description:
Move ParticleUtils and JetUtils non-inline implementations into new, more intuitive src/Tools files, and add implementations of hasParticle*With* Cut constructors

details:   https://rivet.hepforge.org/hg/rivet/rev/0de8f3244867
branches:  release-2-5-x
changeset: 5493:0de8f3244867
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Sep 17 19:37:56 2016 +0100
description:
Fix bug with Legend double-plotting on the ratio plot

diffs (truncated from 603 to 50 lines):

--- a/ChangeLog	Fri Sep 16 15:20:10 2016 +0100
+++ b/ChangeLog	Sat Sep 17 19:37:56 2016 +0100
@@ -1,3 +1,8 @@
+2016-09-17  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add has{Ancestor,Parent,Child,Descendant}With functions and
+	HasParticle{Ancestor,Parent,Child,Descendant}With functors.
+
 2016-09-16  Holger Schulz  <holger.schulz at cern.ch>
 
 	* Add ATLAS 8TeV ttbar analysis from contrib (ATLAS_2015_I1404878)
--- a/bin/make-plots	Fri Sep 16 15:20:10 2016 +0100
+++ b/bin/make-plots	Sat Sep 17 19:37:56 2016 +0100
@@ -804,20 +804,22 @@
                     color=colordefs[i]
             return color
 
-        inputdata.description.setdefault('GofLegend','0')
-        inputdata.description.setdefault('GofFrame','')
-        inputdata.description.setdefault('FrameColor',None)
+        inputdata.description.setdefault('GofLegend', '0')
+        inputdata.description.setdefault('GofFrame', '')
+        inputdata.description.setdefault('FrameColor', None)
 
         for i in inputdata.description['DrawOnly']:
-            if i==refdata: continue
-            if inputdata.description['GofLegend']!='1' and i!=inputdata.description['GofFrame']: continue
+            if i == refdata:
+                continue
+            if inputdata.description['GofLegend']!='1' and i!=inputdata.description['GofFrame']:
+                continue
 
             if inputdata.description.has_key('GofType') and inputdata.description['GofType']!='chi2':
                 return
             gof = inputdata.histos[i].getChi2(inputdata.histos[refdata])
-            if i==inputdata.description['GofFrame'] and inputdata.description['FrameColor'] is None:
-                inputdata.description['FrameColor']=pickcolor(gof)
-            if inputdata.histos[i].description.setdefault('Title', '')!='':
+            if i == inputdata.description['GofFrame'] and inputdata.description['FrameColor'] is None:
+                inputdata.description['FrameColor'] = pickcolor(gof)
+            if inputdata.histos[i].description.setdefault('Title', '') != '':
                 inputdata.histos[i].description['Title'] += ', '
             inputdata.histos[i].description['Title'] += '$\\chi^2/n={}$%1.2f' %gof
 
@@ -845,42 +847,49 @@
 class RatioPlot(Plot):
 
     def __init__(self, inputdata):
+
         self.refdata = inputdata.description['RatioPlotReference']