[Rivet-svn] rivet: Include 'unphysical' photon parents in PartonicTops' veto...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/3e277adb3a31
branches:  release-2-6-x
changeset: 6301:3e277adb3a31
user:      Andy Buckley <andy at insectnation.org>
date:      Tue May 22 18:05:01 2018 +0100
description:
Include 'unphysical' photon parents in PartonicTops' veto of prompt leptons from photon conversions.

diffs (truncated from 83 to 50 lines):

--- a/ChangeLog	Tue May 22 16:56:00 2018 +0100
+++ b/ChangeLog	Tue May 22 18:05:01 2018 +0100
@@ -1,3 +1,7 @@
+2018-05-22  Neil Warrack  <neil.warrack at cern.ch>
+
+	* Include 'unphysical' photon parents in PartonicTops' veto of prompt leptons from photon conversions.
+
 2018-05-20  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Make Particles and Jets into actual specialisations of
--- a/include/Rivet/Jet.fhh	Tue May 22 16:56:00 2018 +0100
+++ b/include/Rivet/Jet.fhh	Tue May 22 18:05:01 2018 +0100
@@ -20,7 +20,8 @@
   public:
     using base = std::vector<Jet>; //< using-declarations don't like template syntax
     using base::base; //< import base-class constructors
-    /// Add copy constructor from vector<Jet>
+    /// Copy constructor from vector<Jet>
+    Jets(const std::vector<Jet>& vjs);
     operator FourMomenta () const; //< implementation in Jet.cc
     /// @todo Add conversion to PseudoJets
   };
--- a/include/Rivet/Particle.fhh	Tue May 22 16:56:00 2018 +0100
+++ b/include/Rivet/Particle.fhh	Tue May 22 18:05:01 2018 +0100
@@ -19,7 +19,8 @@
   public:
     using base = std::vector<Particle>; //< using-declarations don't like template syntax
     using base::base; //< import base-class constructors
-    /// Add copy constructor from vector<Particle>
+    /// Copy constructor from vector<Particle>
+    Particles(const std::vector<Particle>& vps);
     operator FourMomenta () const; //< implementation in Particle.cc
     /// @todo Add conversion to PseudoJets?
   };
--- a/include/Rivet/Projections/PartonicTops.hh	Tue May 22 16:56:00 2018 +0100
+++ b/include/Rivet/Projections/PartonicTops.hh	Tue May 22 18:05:01 2018 +0100
@@ -68,18 +68,12 @@
       if (_decaymode != ALL) {
         const auto fn = [&](const Particle& t) {
           const Particles descendants = t.allDescendants();
-          const bool prompt_e = any(descendants, [&](const Particle& p){ return p.abspid() == PID::ELECTRON && p.isPrompt(_emu_from_prompt_tau) && !p.hasAncestor(PID::PHOTON); });
-          const bool prompt_mu = any(descendants, [&](const Particle& p){ return p.abspid() == PID::MUON && p.isPrompt(_emu_from_prompt_tau) && !p.hasAncestor(PID::PHOTON); });
-          // const bool prompt_e = any(descendants, [&](const Particle& p){ bool x = p.abspid() == PID::ELECTRON && p.isPrompt(_emu_from_prompt_tau) && !p.hasAncestor(PID::PHOTON);
-          //                                                                if (p.hasAncestor(PID::PHOTON)) MSG_WARNING("Top decay electron with photon ancestor");
-          //                                                                return x; });
-          // const bool prompt_mu = any(descendants, [&](const Particle& p){ bool x = p.abspid() == PID::MUON && p.isPrompt(_emu_from_prompt_tau) && !p.hasAncestor(PID::PHOTON);
-          //                                                                 if (p.hasAncestor(PID::PHOTON)) MSG_WARNING("Top decay muon with photon ancestor");
-          //                                                                 return x; });
+          const bool prompt_e = any(descendants, [&](const Particle& p){ return p.abspid() == PID::ELECTRON && p.isPrompt(_emu_from_prompt_tau) && !p.hasAncestor(PID::PHOTON, false); });
+          const bool prompt_mu = any(descendants, [&](const Particle& p){ return p.abspid() == PID::MUON && p.isPrompt(_emu_from_prompt_tau) && !p.hasAncestor(PID::PHOTON, false); });