[Rivet-svn] rivet: Add ChargedLeptons enum and mode argument to ZFinder and ...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6a5994cad0f8
branches:  
changeset: 6042:6a5994cad0f8
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 26 16:33:19 2017 +0100
description:
Add ChargedLeptons enum and mode argument to ZFinder and WFinder constructors, to allow control over whether the selected charged leptons are prompt. This is mostly cosmetic/for symmetry in the case of ZFinder, since the same can be achieved by passing a PromptFinalState as the fs argument, but for WFinder it's essential since passing a prompt final state screws up the MET calculation. Both are slightly different in the treatment of the lepton dressing, although conventionally this is an area where only prompt photons are used.

diffs (truncated from 160 to 50 lines):

--- a/ChangeLog	Mon Sep 25 23:27:21 2017 +0100
+++ b/ChangeLog	Tue Sep 26 16:33:19 2017 +0100
@@ -1,3 +1,15 @@
+2017-09-26  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add ChargedLeptons enum and mode argument to ZFinder and WFinder
+	constructors, to allow control over whether the selected charged
+	leptons are prompt. This is mostly cosmetic/for symmetry in the
+	case of ZFinder, since the same can be achieved by passing a
+	PromptFinalState as the fs argument, but for WFinder it's
+	essential since passing a prompt final state screws up the MET
+	calculation. Both are slightly different in the treatment of the
+	lepton dressing, although conventionally this is an area where
+	only prompt photons are used.
+
 2017-09-25  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add deltaR2 functions for squared distances.
--- a/include/Rivet/Projections/WFinder.hh	Mon Sep 25 23:27:21 2017 +0100
+++ b/include/Rivet/Projections/WFinder.hh	Tue Sep 26 16:33:19 2017 +0100
@@ -16,6 +16,7 @@
   class WFinder : public ParticleFinder {
   public:
 
+    enum ChargedLeptons { PROMPTCHLEPTONS=0, ALLCHLEPTONS };
     enum ClusterPhotons { NOCLUSTER=0, CLUSTERNODECAY=1, CLUSTERALL };
     enum PhotonTracking { NOTRACK=0, TRACK=1 };
     enum MassWindow { MASS=0, TRANSMASS=1 };
@@ -32,6 +33,7 @@
     /// @param missingET Minimal amount of missing ET (neutrinos) required
     /// @param dRmax Maximum dR of photons around charged lepton to take into account
     ///  for W reconstruction (only relevant if one of the following are true)
+    /// @param chLeptons Only use prompt charged leptons, or any charged leptons?
     /// @param clusterPhotons Whether such photons are supposed to be
     ///  clustered to the lepton object and thus W mom
     /// @param trackPhotons Whether such photons should be added to _theParticles
@@ -44,11 +46,28 @@
             double minmass, double maxmass,
             double missingET,
             double dRmax=0.1,
+            ChargedLeptons chLeptons=PROMPTCHLEPTONS,
             ClusterPhotons clusterPhotons=CLUSTERNODECAY,
             PhotonTracking trackPhotons=NOTRACK,
             MassWindow masstype=MASS,
             double masstarget=80.4*GeV);
 
+    /// Backward-compatible constructor with implicit chLeptons mode = PROMPTCHLEPTONS
+    /// @deprecated Remove this and always use the constructor with chLeptons argument.
+    WFinder(const FinalState& inputfs,
+            const Cut& leptoncuts,