[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/84774ae28845
branches:  
changeset: 5917:84774ae28845
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 28 13:34:40 2017 +0100
description:
Note Karl's contribution to pair-smearing

details:   https://rivet.hepforge.org/hg/rivet/rev/c399fb4f4dd9
branches:  pair_smearing
changeset: 5918:c399fb4f4dd9
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 28 14:15:25 2017 +0100
description:
Closing pair-smearing feature development branch: feature has been implemented, with input from this, on default

details:   https://rivet.hepforge.org/hg/rivet/rev/80e2d00750a1
branches:  fastplot
changeset: 5919:80e2d00750a1
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 28 14:22:01 2017 +0100
description:
Merge with default

diffs (truncated from 52 to 50 lines):

--- a/ChangeLog	Wed Jun 28 13:32:52 2017 +0100
+++ b/ChangeLog	Wed Jun 28 14:22:01 2017 +0100
@@ -14,6 +14,8 @@
 	efficiency+smearing functions, with extra constructors and some
 	variadic template cleverness to allow implicit conversions from
 	single-operation eff and smearing function. Yay for C++11 ;-)
+	This work based on a macro-based version of combined eff/smear
+	functions by Karl Nordstrom -- thanks!
 
 	* Add *EffFn, *SmearFn, and *EffSmearFn types to SmearingFunctions.hh.
 
--- a/bin/make-plots	Wed Jun 28 13:32:52 2017 +0100
+++ b/bin/make-plots	Wed Jun 28 14:22:01 2017 +0100
@@ -649,6 +649,7 @@
         out += ('\\begin{document}\n')
         out += ('\\pagestyle{empty}\n')
         out += ('\\SpecialCoor\n')
+        #out += '\\begin{multipage}\n'
         out += ('\\begin{pspicture}(0,0)(0,0)\n')
         out += ('\\psset{xunit=%scm}\n' %(inputdata.description['PlotSizeX']))
         if inputdata.description['is2dim']:
@@ -663,6 +664,8 @@
     def write_footer(self):
         out = ""
         out += ('\\end{pspicture}\n')
+        #out += '\\end{multipage}\n'
+        #out += '%\n%\n'
         out += ('\\end{document}\n')
         return out
 
--- a/bin/rivet-mkanalysis	Wed Jun 28 13:32:52 2017 +0100
+++ b/bin/rivet-mkanalysis	Wed Jun 28 14:22:01 2017 +0100
@@ -205,7 +205,7 @@
     /// Book histograms and initialise projections before the run
     void init() {
 
-      // Initialise and register projections
+      // Initialise and declare projections
       declare(FinalState(Cuts::abseta < 5 && Cuts::pT > 100*MeV), "FS");
 
       // Book histograms
--- a/include/Rivet/Projections/NonPromptFinalState.hh	Wed Jun 28 13:32:52 2017 +0100
+++ b/include/Rivet/Projections/NonPromptFinalState.hh	Wed Jun 28 14:22:01 2017 +0100
@@ -20,7 +20,7 @@
     NonPromptFinalState(const FinalState& fsp, bool accepttaudecays=false, bool acceptmudecays=false);
 
     /// Constructor from a Cut (and implicit general FS).
-    NonPromptFinalState(const Cut& c, bool accepttaudecays=false, bool acceptmudecays=false);
+    NonPromptFinalState(const Cut& c=Cuts::open(), bool accepttaudecays=false, bool acceptmudecays=false);