[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/0569c0b66c80
branches:  
changeset: 5123:0569c0b66c80
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Apr 12 08:56:47 2016 +0100
description:
Remove now-unused includes

details:   https://rivet.hepforge.org/hg/rivet/rev/6b762d92fd5d
branches:  
changeset: 5124:6b762d92fd5d
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Apr 12 13:40:08 2016 +0100
description:
Add CMS smearing functions and convert the ATLAS tau efficiencies to match the reco papers

diffs (truncated from 275 to 50 lines):

--- a/include/Rivet/Event.hh	Tue Apr 12 08:48:22 2016 +0100
+++ b/include/Rivet/Event.hh	Tue Apr 12 13:40:08 2016 +0100
@@ -3,10 +3,10 @@
 #define RIVET_Event_HH
 
 #include "Rivet/Config/RivetCommon.hh"
-#include "Rivet/Particle.hh"
 #include "Rivet/Projection.hh"
-#include "Rivet/Math/Vector3.hh"
-#include "Rivet/Math/LorentzTrans.hh"
+// #include "Rivet/Particle.hh"
+// #include "Rivet/Math/Vector3.hh"
+// #include "Rivet/Math/LorentzTrans.hh"
 
 namespace Rivet {
 
--- a/include/Rivet/Tools/SmearingFunctions.hh	Tue Apr 12 08:48:22 2016 +0100
+++ b/include/Rivet/Tools/SmearingFunctions.hh	Tue Apr 12 13:40:08 2016 +0100
@@ -89,6 +89,54 @@
   }
 
 
+  inline double ELECTRON_TRKEFF_CMS_RUN1(const Particle& e) {
+    if (e.abseta() > 2.5) return 0;
+    if (e.pT() < 0.1*GeV) return 0;
+    if (e.abseta() < 1.5) {
+      return (e.pT() < 1*GeV) ? 0.70 : 0.95;
+    } else {
+      return (e.pT() < 1*GeV) ? 0.60 : 0.85;
+    }
+  }
+
+  inline double ELECTRON_EFF_CMS_RUN1(const Particle& e) {
+    if (e.abseta() > 2.5) return 0;
+    if (e.pT() < 10*GeV) return 0;
+    return (e.abseta() < 1.5) ? 0.95 : 0.85;
+  }
+
+
+  /// @brief CMS electron energy smearing, preserving direction
+  ///
+  /// Calculate resolution
+  /// for pT > 0.1 GeV, E resolution = |eta| < 0.5 -> sqrt(0.06^2 + pt^2 * 1.3e-3^2)
+  ///                                  |eta| < 1.5 -> sqrt(0.10^2 + pt^2 * 1.7e-3^2)
+  ///                                  |eta| < 2.5 -> sqrt(0.25^2 + pt^2 * 3.1e-3^2)
+  inline Particle ELECTRON_SMEAR_CMS_RUN1(const Particle& e) {
+    /// @todo Need to isolate random generators to a single thread
+    static random_device rd;
+    static mt19937 gen(rd());
+