[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/c9dfcd5082e6
branches:  
changeset: 4804:c9dfcd5082e6
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Jul 06 10:21:59 2015 +0100
description:
Minimal change to WFinder to remove neutrino reliance.

The WFinder needs a major rethink. For now, I have only removed the
reliance on enumerated neutrinos, and replaced it with the missing
momentum 4-vector. Any reference to neutrinos is now taken to be the total
missing momentum rather than the hardest neutrino.

Watch out:
 * The particles() method returns no neutrinos.
 * If there is more than one lepton in the event, no W will be found.

details:   https://rivet.hepforge.org/hg/rivet/rev/142bead50319
branches:  
changeset: 4805:142bead50319
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 07 11:07:59 2015 +0100
description:
fix 4-momentum conservation mistake

details:   https://rivet.hepforge.org/hg/rivet/rev/65d037873812
branches:  
changeset: 4806:65d037873812
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Jul 08 12:59:50 2015 +0100
description:
re-allow guessing of best W if more than one lepton available

details:   https://rivet.hepforge.org/hg/rivet/rev/6ef7318c87ce
branches:  
changeset: 4807:6ef7318c87ce
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Jul 08 13:16:10 2015 +0100
description:
merged WFinder changes

diffs (truncated from 5050 to 50 lines):

--- a/bin/make-plots	Mon Jul 06 10:12:13 2015 +0100
+++ b/bin/make-plots	Wed Jul 08 13:16:10 2015 +0100
@@ -573,15 +573,15 @@
             for i in range(len(FOO)):
                 xcustomminorticks.append({'Value': float(FOO[i])})
         xticks = XTicks(inputdata.description, self.coors)
-        if (inputdata.description.has_key('RatioPlot') and inputdata.description['RatioPlot']=='1') or (inputdata.description.has_key('PlotTickLabels') and inputdata.description['PlotTickLabels']=='0'):
-            drawlabels=False
+        if (inputdata.description.has_key('RatioPlot') and inputdata.description['RatioPlot']=='1') or (inputdata.description.has_key('PlotXTickLabels') and inputdata.description['PlotXTickLabels']=='0'):
+            drawxlabels=False
         else:
-            drawlabels=True
+            drawxlabels=True
         out += xticks.draw(custommajortickmarks=xcustommajortickmarks,\
                            customminortickmarks=xcustomminortickmarks,\
                            custommajorticks=xcustommajorticks,\
                            customminorticks=xcustomminorticks,\
-                           drawlabels=drawlabels)
+                           drawlabels=drawxlabels)
 
         if inputdata.description.has_key('YMajorTickMarks') and inputdata.description['YMajorTickMarks']!='':
             ycustommajortickmarks=int(inputdata.description['YMajorTickMarks'])
@@ -609,10 +609,15 @@
             for i in range(len(FOO)):
                 ycustomminorticks.append({'Value': float(FOO[i])})
         yticks = YTicks(inputdata.description, self.coors)
+        if (inputdata.description.has_key('PlotYTickLabels') and inputdata.description['PlotYTickLabels']=='0'):
+            drawylabels=False
+        else:
+            drawylabels=True
         out += yticks.draw(custommajortickmarks=ycustommajortickmarks,\
                            customminortickmarks=ycustomminortickmarks,\
                            custommajorticks=ycustommajorticks,\
-                           customminorticks=ycustomminorticks)
+                           customminorticks=ycustomminorticks,
+                           drawlabels=drawylabels)
 
         labels = Labels(inputdata.description)
         if inputdata.description.has_key('RatioPlot') and inputdata.description['RatioPlot']=='1':
@@ -1010,11 +1015,16 @@
             FOO=self.description['ZCustomMinorTicks'].strip().split('\t')
             for i in range(len(FOO)):
                 zcustomminorticks.append({'Value': float(FOO[i])})
+        if (self.description.has_key('PlotZTickLabels') and self.description['PlotZTickLabels']=='0'):
+            drawzlabels=False
+        else:
+            drawzlabels=True
         zticks = ZTicks(self.description, self.coors)
         out += zticks.draw(custommajortickmarks=zcustommajortickmarks,\
                            customminortickmarks=zcustomminortickmarks,\