[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/536e52602ab6
branches:  
changeset: 6161:536e52602ab6
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Dec 04 21:23:17 2017 +0000
description:
Extra Higgs PID aliases

details:   https://rivet.hepforge.org/hg/rivet/rev/ce5d8e57f223
branches:  
changeset: 6162:ce5d8e57f223
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Dec 04 21:23:43 2017 +0000
description:
Fix dressed-lepton dR short-circuit bug

diffs (truncated from 94 to 50 lines):

--- a/analyses/pluginATLAS/ATLAS_2011_I925932.cc	Tue Nov 28 21:02:34 2017 +0000
+++ b/analyses/pluginATLAS/ATLAS_2011_I925932.cc	Mon Dec 04 21:23:43 2017 +0000
@@ -20,13 +20,13 @@
       // Set up projections
       FinalState fs;
       Cut cuts = Cuts::abseta < 2.4 && Cuts::pT > 20*GeV;
-      WFinder wfinder_dressed_el(fs, cuts, PID::ELECTRON, 0*GeV, 1000*GeV, 25*GeV, 0.2, WFinder::CLUSTERNODECAY);
+      WFinder wfinder_dressed_el(fs, cuts, PID::ELECTRON, 0*GeV, 1000*GeV, 25*GeV, 0.2);
       declare(wfinder_dressed_el, "WFinder_dressed_el");
-      WFinder wfinder_bare_el(fs, cuts, PID::ELECTRON, 0*GeV, 1000*GeV, 25*GeV, 0.0, WFinder::NOCLUSTER);
+      WFinder wfinder_bare_el(fs, cuts, PID::ELECTRON, 0*GeV, 1000*GeV, 25*GeV, 0.0);
       declare(wfinder_bare_el, "WFinder_bare_el");
-      WFinder wfinder_dressed_mu(fs, cuts, PID::MUON, 0*GeV, 1000*GeV, 25*GeV, 0.2, WFinder::CLUSTERNODECAY);
+      WFinder wfinder_dressed_mu(fs, cuts, PID::MUON, 0*GeV, 1000*GeV, 25*GeV, 0.2);
       declare(wfinder_dressed_mu, "WFinder_dressed_mu");
-      WFinder wfinder_bare_mu(fs, cuts, PID::MUON, 0*GeV, 1000*GeV, 25*GeV, 0.0, WFinder::NOCLUSTER);
+      WFinder wfinder_bare_mu(fs, cuts, PID::MUON, 0*GeV, 1000*GeV, 25*GeV, 0.0);
       declare(wfinder_bare_mu, "WFinder_bare_mu");
 
       // Book histograms
@@ -45,6 +45,8 @@
       const WFinder& wfinder_bare_el    = apply<WFinder>(event, "WFinder_bare_el");
       const WFinder& wfinder_dressed_mu = apply<WFinder>(event, "WFinder_dressed_mu");
       const WFinder& wfinder_bare_mu    = apply<WFinder>(event, "WFinder_bare_mu");
+      MSG_DEBUG("Found " << wfinder_dressed_el.size() + wfinder_dressed_mu.size() << " dressed W -> e/mu nu");
+      MSG_DEBUG("Found " << wfinder_bare_el.size() + wfinder_bare_mu.size() << " bare W -> e/mu nu");
 
       if (wfinder_dressed_el.empty() && wfinder_bare_el.empty() &&
           wfinder_dressed_mu.empty() && wfinder_bare_mu.empty()) {
--- a/include/Rivet/Tools/ParticleName.hh	Tue Nov 28 21:02:34 2017 +0000
+++ b/include/Rivet/Tools/ParticleName.hh	Mon Dec 04 21:23:43 2017 +0000
@@ -54,6 +54,8 @@
     static const PdgId Z0 = Z0BOSON;
     static const PdgId HIGGSBOSON = 25;
     static const PdgId HIGGS = HIGGSBOSON;
+    static const PdgId H0BOSON = HIGGSBOSON;
+    static const PdgId HBOSON = HIGGSBOSON;
     //@}
 
     /// @name Quarks
--- a/src/Projections/DressedLeptons.cc	Tue Nov 28 21:02:34 2017 +0000
+++ b/src/Projections/DressedLeptons.cc	Mon Dec 04 21:23:43 2017 +0000
@@ -61,29 +61,29 @@
       allClusteredLeptons += DressedLepton(bl);
 
     // If the radius is 0 or negative, don't even attempt to cluster
-    if (_dRmax <= 0) return;
-
-    // Match each photon to its closest charged lepton within the dR cone
-    const FinalState& photons = applyProjection<FinalState>(e, "Photons");