[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/cd2eb13ca9ba
branches:  
changeset: 5135:cd2eb13ca9ba
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Apr 13 18:24:33 2016 +0100
description:
Adding smearing example kinematics and multiplicity plots for jets, electrons, muons, and taus

details:   https://rivet.hepforge.org/hg/rivet/rev/5515635c9ec8
branches:  
changeset: 5136:5515635c9ec8
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Apr 13 18:24:48 2016 +0100
description:
Resolve constructor ambiguity and tidy for loops

details:   https://rivet.hepforge.org/hg/rivet/rev/706ccb872c05
branches:  
changeset: 5137:706ccb872c05
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Apr 14 09:28:41 2016 +0100
description:
Removed tag rivet-2.5.0b1

details:   https://rivet.hepforge.org/hg/rivet/rev/4a096b5b02ae
branches:  
changeset: 5138:4a096b5b02ae
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Apr 14 09:32:46 2016 +0100
description:
Added tag rivet-2.5.0beta1 for changeset 706ccb872c05

diffs (truncated from 243 to 50 lines):

--- a/.hgtags	Wed Apr 13 15:27:50 2016 +0100
+++ b/.hgtags	Thu Apr 14 09:32:46 2016 +0100
@@ -60,3 +60,6 @@
 c77ff1b297a71e9ec14440cd2e549fb1c4924148 rivet-2.4.0
 6bec638a1eb96ff0b1e18b4f6d62ef96bff40888 rivet-2.4.1
 66e20000b87f2cbd6a5a6e42d3da6a711484ee6c rivet-2.5.0b1
+66e20000b87f2cbd6a5a6e42d3da6a711484ee6c rivet-2.5.0b1
+0000000000000000000000000000000000000000 rivet-2.5.0b1
+706ccb872c05fea7a7719915a01f56ca4c650419 rivet-2.5.0beta1
--- a/include/Rivet/Projections/DressedLeptons.hh	Wed Apr 13 15:27:50 2016 +0100
+++ b/include/Rivet/Projections/DressedLeptons.hh	Thu Apr 14 09:32:46 2016 +0100
@@ -62,7 +62,7 @@
     /// @deprecated Use the version with Cut c before cluster (i.e. with the most common non-default args first)
     DEPRECATED("Use the version with Cut c before cluster")
     DressedLeptons(const FinalState& photons, const FinalState& bareleptons,
-                   double dRmax, bool cluster=true, const Cut& cut=Cuts::open(),
+                   double dRmax, bool cluster, const Cut& cut=Cuts::open(),
                    bool useDecayPhotons=false);
 
     /// Constructor with numerical eta and pT cuts
--- a/src/Analyses/EXAMPLE_SMEAR.cc	Wed Apr 13 15:27:50 2016 +0100
+++ b/src/Analyses/EXAMPLE_SMEAR.cc	Thu Apr 14 09:32:46 2016 +0100
@@ -2,6 +2,7 @@
 #include "Rivet/Analysis.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Projections/IdentifiedFinalState.hh"
+#include "Rivet/Projections/DressedLeptons.hh"
 #include "Rivet/Projections/SmearedJets.hh"
 #include "Rivet/Projections/SmearedParticles.hh"
 
@@ -39,43 +40,154 @@
                       JET_EFF_ZERO);
       addProjection(sj3, "Jets3");
 
-      IdentifiedFinalState truthelectrons(Cuts::abseta < 2.5 && Cuts::pT > 10*GeV, {{PID::ELECTRON, PID::POSITRON}});
+      IdentifiedFinalState photons(Cuts::abseta < 5, {{PID::PHOTON}});
+
+      IdentifiedFinalState truthelectrons(Cuts::abseta < 5 && Cuts::pT > 10*GeV, {{PID::ELECTRON, PID::POSITRON}});
       addProjection(truthelectrons, "Electrons0");
-      SmearedParticles recoelectrons(truthelectrons, ELECTRON_EFF_ATLAS_RUN1);
-      addProjection(recoelectrons, "Electrons1");
+      DressedLeptons dressedelectrons(photons, truthelectrons, 0.2);
+      addProjection(dressedelectrons, "Electrons1");
+      SmearedParticles recoelectrons(dressedelectrons, ELECTRON_EFF_ATLAS_RUN1, ELECTRON_SMEAR_ATLAS_RUN1);
+      addProjection(recoelectrons, "Electrons2");
 
-      _h_njtrue = bookHisto1D("njets_true", 10, -0.5, 9.5);
-      _h_njreco = bookHisto1D("njets_reco", 10, -0.5, 9.5);
-      _h_netrue = bookHisto1D("nelec_true", 5, -0.5, 4.5);
-      _h_nereco = bookHisto1D("nelec_reco", 5, -0.5, 4.5);