[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/7eb52257f78a
branches:  release-2-4-x
changeset: 4948:7eb52257f78a
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Dec 09 23:27:26 2015 +0000
description:
Make sure there's a leading / on the histo name, now that YODA enforces that

details:   https://rivet.hepforge.org/hg/rivet/rev/89455739b551
branches:  release-2-4-x
changeset: 4949:89455739b551
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Dec 10 13:10:36 2015 +0000
description:
make-plots: improve custom tick attribute handling, allowing empty lists. Also, any whitespace now counts as a tick separator -- explicit whitespace in labels should be done via ~ or similar LaTeX markup.

details:   https://rivet.hepforge.org/hg/rivet/rev/192392fef913
branches:  release-2-4-x
changeset: 4950:192392fef913
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Dec 10 13:12:28 2015 +0000
description:
Write output histo file location to the end of the rivet run log

details:   https://rivet.hepforge.org/hg/rivet/rev/d49a317ac229
branches:  release-2-4-x
changeset: 4951:d49a317ac229
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Dec 15 21:03:14 2015 +0000
description:
Add a new Particle::setMomentum(E,x,y,z) method, and an origin position member which is automatically populated from the GenParticle, with access methods corresponding to the momentum ones.

details:   https://rivet.hepforge.org/hg/rivet/rev/dbaa9b8d816a
branches:  release-2-4-x
changeset: 4952:dbaa9b8d816a
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Dec 15 21:16:49 2015 +0000
description:
Add Beam::pv() method for finding the beam interaction primary vertex 4-position.

diffs (truncated from 1552 to 50 lines):

--- a/ChangeLog	Fri Dec 04 17:05:39 2015 +0000
+++ b/ChangeLog	Tue Dec 15 21:16:49 2015 +0000
@@ -1,3 +1,20 @@
+2015-12-15  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add Beam::pv() method for finding the beam interaction primary
+	vertex 4-position.
+
+	* Add a new Particle::setMomentum(E,x,y,z) method, and an origin
+	position member which is automatically populated from the
+	GenParticle, with access methods corresponding to the momentum
+	ones.
+
+2015-12-10  Andy Buckley  <andy.buckley at cern.ch>
+
+	* make-plots: improve custom tick attribute handling, allowing
+	empty lists. Also, any whitespace now counts as a tick separator
+	-- explicit whitespace in labels should be done via ~ or similar
+	LaTeX markup.
+
 2015-12-04  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Pro-actively use -m/-M arguments when initially loading
--- a/bin/make-plots	Fri Dec 04 17:05:39 2015 +0000
+++ b/bin/make-plots	Tue Dec 15 21:16:49 2015 +0000
@@ -126,17 +126,26 @@
             del self.description['PlotSize']
 
         if self.description.get('MainPlot', '1') == '0':
+            ## Ratio, no main
             self.description['RatioPlot'] = '1' #< don't allow both to be zero!
             self.description['PlotSizeY'] = 0.
             self.description.setdefault('RatioPlotSizeY', 9.)
         else:
             if self.description.get('RatioPlot', '0') == '1':
+                ## Main and ratio
                 self.description.setdefault('PlotSizeY', 6.)
                 self.description.setdefault('RatioPlotSizeY', self.description.get('RatioPlotYSize', 3.))
             else:
-                self.description.setdefault('PlotSizeY', self.description.get('RatioPlotYSize', 9.))
+                ## Main, no ratio
+                self.description.setdefault('PlotSizeY', self.description.get('PlotYSize', 9.))
                 self.description['RatioPlotSizeY'] = 0.
 
+        ## Ensure numbers, not strings
+        self.description['PlotSizeX'] = float(self.description['PlotSizeX'])
+        self.description['PlotSizeY'] = float(self.description['PlotSizeY'])
+        self.description['RatioPlotSizeY'] = float(self.description['RatioPlotSizeY'])
+        # self.description['TopMargin'] = float(self.description['TopMargin'])
+        # self.description['BottomMargin'] = float(self.description['BottomMargin'])