[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6794ac60deae
branches:  
changeset: 5171:6794ac60deae
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Apr 19 14:43:16 2016 +0100
description:
Fix enormous gotcha in efficiency sampling! D'oh

details:   https://rivet.hepforge.org/hg/rivet/rev/af77fa6d1c64
branches:  
changeset: 5172:af77fa6d1c64
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Apr 19 16:32:08 2016 +0100
description:
Various clean-ups and fixes in ATLAS analyses using isolated photons with median pT density correction.

diffs (truncated from 802 to 50 lines):

--- a/ChangeLog	Tue Apr 19 11:44:18 2016 +0100
+++ b/ChangeLog	Tue Apr 19 16:32:08 2016 +0100
@@ -1,3 +1,8 @@
+2016-04-19  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Various clean-ups and fixes in ATLAS analyses using isolated
+	photons with median pT density correction.
+
 2016-04-18  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add transformBy(LT) methods to Particle and Jet.
--- a/include/Rivet/Projections/SmearedJets.hh	Tue Apr 19 11:44:18 2016 +0100
+++ b/include/Rivet/Projections/SmearedJets.hh	Tue Apr 19 16:32:08 2016 +0100
@@ -102,7 +102,7 @@
                   << "pT=" << j.pT()/GeV << ", eta=" << j.eta()
                   << " : " << 100*jeff << "%");
         if (jeff == 0) continue; //< no need to roll expensive dice
-        if (jeff == 1 || jeff < rand01()) {
+        if (jeff == 1 || rand01() < jeff) {
           _recojets.push_back(_jetSmearFn ? _jetSmearFn(j) : j); //< smearing
         }
       }
--- a/include/Rivet/Projections/SmearedParticles.hh	Tue Apr 19 11:44:18 2016 +0100
+++ b/include/Rivet/Projections/SmearedParticles.hh	Tue Apr 19 16:32:08 2016 +0100
@@ -71,7 +71,7 @@
                   << "pT=" << p.pT()/GeV << ", eta=" << p.eta()
                   << " : " << 100*peff << "%");
         if (peff == 0) continue; //< no need to roll expensive dice
-        if (peff == 1 || peff < rand01()) {
+        if (peff == 1 || rand01() < peff) {
           _theParticles.push_back(_smearFn ? _smearFn(p) : p); //< smearing
         }
       }
--- a/src/Analyses/ATLAS_2010_S8914702.cc	Tue Apr 19 11:44:18 2016 +0100
+++ b/src/Analyses/ATLAS_2010_S8914702.cc	Tue Apr 19 16:32:08 2016 +0100
@@ -12,9 +12,7 @@
 
     /// Constructor
     ATLAS_2010_S8914702()
-      : Analysis("ATLAS_2010_S8914702"),
-        _eta_bins{0.00, 0.60, 1.37, 1.52, 1.81},
-        _eta_bins_areaoffset{0.0, 1.5, 3.0}
+      : Analysis("ATLAS_2010_S8914702")
     {    }
 
 
@@ -24,8 +22,7 @@
       addProjection(fs, "FS");
 
       FastJets fj(fs, FastJets::KT, 0.5);