[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6d5d64accacd
branches:  
changeset: 5913:6d5d64accacd
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 28 11:08:52 2017 +0100
description:
Various EffSmear fixes and renaming/aliasing for better consistency

details:   https://rivet.hepforge.org/hg/rivet/rev/5dde8a31ee07
branches:  
changeset: 5914:5dde8a31ee07
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 28 11:32:18 2017 +0100
description:
Split the smearing functions into separate header files for generic/momentum, Particle, Jet, and experiment-specific smearings & efficiencies

details:   https://rivet.hepforge.org/hg/rivet/rev/c141d7a39c80
branches:  
changeset: 5915:c141d7a39c80
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 28 13:20:51 2017 +0100
description:
Typo fixes

details:   https://rivet.hepforge.org/hg/rivet/rev/bc7d88796d04
branches:  
changeset: 5916:bc7d88796d04
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 28 13:32:52 2017 +0100
description:
Fix ambiguities between JET_BTAG_EFFS constructors

diffs (truncated from 661 to 50 lines):

--- a/ChangeLog	Tue Jun 27 17:17:46 2017 +0100
+++ b/ChangeLog	Wed Jun 28 13:32:52 2017 +0100
@@ -1,3 +1,9 @@
+2017-06-28  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Split the smearing functions into separate header files for
+	generic/momentum, Particle, Jet, and experiment-specific smearings
+	& efficiencies.
+
 2017-06-27  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add 'JetFinder' alias for JetAlg, by analogy with ParticleFinder.
--- a/analyses/pluginMC/EXAMPLE_SMEAR.cc	Tue Jun 27 17:17:46 2017 +0100
+++ b/analyses/pluginMC/EXAMPLE_SMEAR.cc	Wed Jun 28 13:32:52 2017 +0100
@@ -46,7 +46,7 @@
 
       SmearedJets sj3(fj,
                       [](const Jet& j){ return j; },
-                      [](const Jet& j){ return j.bTagged() ? 0.7*(1 - exp(-j.pT()/(10*GeV))) : 0.01; },
+                      JET_BTAG_EFFS(0.7, 0.1, 0.01),
                       JET_CTAG_PERFECT,
                       [](const Jet& j){ return 0.8; });
       declare(sj3, "Jets3");
--- a/include/Rivet/Makefile.am	Tue Jun 27 17:17:46 2017 +0100
+++ b/include/Rivet/Makefile.am	Wed Jun 28 13:32:52 2017 +0100
@@ -122,6 +122,9 @@
   Tools/RivetYODA.hh \
   Tools/RivetMT2.hh \
   Tools/SmearingFunctions.hh \
+  Tools/MomentumSmearingFunctions.hh \
+  Tools/ParticleSmearingFunctions.hh \
+  Tools/JetSmearingFunctions.hh \
   Tools/TypeTraits.hh \
   Tools/Utils.hh
 nobase_dist_noinst_HEADERS += \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/Rivet/Tools/JetSmearingFunctions.hh	Wed Jun 28 13:32:52 2017 +0100
@@ -0,0 +1,135 @@
+// -*- C++ -*-
+#ifndef RIVET_JetSmearingFunctions_HH
+#define RIVET_JetSmearingFunctions_HH
+
+#include "Rivet/Jet.hh"
+#include "Rivet/Tools/MomentumSmearingFunctions.hh"
+#include "Rivet/Tools/ParticleSmearingFunctions.hh"
+#include "Rivet/Tools/Random.hh"
+
+namespace Rivet {
+
+