[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/42c90e54b38f
branches:  release-2-5-x
changeset: 5568:42c90e54b38f
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Oct 20 11:49:16 2016 +0100
description:
foreach replacement

details:   https://rivet.hepforge.org/hg/rivet/rev/c1bf443d6979
branches:  release-2-5-x
changeset: 5569:c1bf443d6979
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Oct 24 15:30:11 2016 +0100
description:
Add rough ATLAS and CMS photon reco efficiency functions from Delphes (ATLAS and CMS versions are identical, hmmm)

diffs (truncated from 82 to 50 lines):

--- a/ChangeLog	Mon Oct 17 10:59:33 2016 +0100
+++ b/ChangeLog	Mon Oct 24 15:30:11 2016 +0100
@@ -1,3 +1,8 @@
+2016-10-24  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add rough ATLAS and CMS photon reco efficiency functions from
+	Delphes (ATLAS and CMS versions are identical, hmmm)
+
 2016-10-12  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Tidying/fixing make-plots custom z-ticks code. Thanks to Dmitry Kalinkin.
--- a/include/Rivet/Tools/SmearingFunctions.hh	Mon Oct 17 10:59:33 2016 +0100
+++ b/include/Rivet/Tools/SmearingFunctions.hh	Mon Oct 24 15:30:11 2016 +0100
@@ -370,7 +370,31 @@
   /// @name Photon efficiency and smearing functions
   //@{
 
-  /// @todo Photon efficiency and smearing
+  /// ATLAS Run 1 photon reco efficiency
+  /// @todo Currently identical to CMS, cf. Delphes
+  inline double PHOTON_EFF_ATLAS_RUN1(const Particle& y) {
+    if (y.pT() < 10*GeV || y.abseta() > 2.5) return 0;
+    return (y.abseta() < 1.5) ? 0.95 : 0.85;
+  }
+
+  /// ATLAS Run 2 photon reco efficiency
+  /// @todo Currently just a copy of Run 1: fix!
+  inline double PHOTON_EFF_ATLAS_RUN2(const Particle& y) {
+    return PHOTON_EFF_ATLAS_RUN1(y);
+  }
+
+  /// CMS Run 1 photon reco efficiency
+  /// @todo Currently identical to ATLAS, cf. Delphes
+  inline double PHOTON_EFF_CMS_RUN1(const Particle& y) {
+    if (y.pT() < 10*GeV || y.abseta() > 2.5) return 0;
+    return (y.abseta() < 1.5) ? 0.95 : 0.85;
+  }
+
+  /// CMS Run 2 photon reco efficiency
+  /// @todo Currently just a copy of Run 1: fix!
+  inline double PHOTON_EFF_CMS_RUN2(const Particle& y) {
+    return PHOTON_EFF_CMS_RUN1(y);
+  }
 
   //@}
 
@@ -380,7 +404,6 @@
   //@{
 
   /// ATLAS Run 1 muon reco efficiency