[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/0c9c2c1af5fc
branches:  release-2-5-x
changeset: 5370:0c9c2c1af5fc
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 02 19:36:00 2016 +0100
description:
Include base truth-level projections in SmearedParticles/Jets compare() methods.

details:   https://rivet.hepforge.org/hg/rivet/rev/19618f583a34
branches:  release-2-5-x
changeset: 5371:19618f583a34
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 02 19:37:35 2016 +0100
description:
Tidying

details:   https://rivet.hepforge.org/hg/rivet/rev/cec96374b986
branches:  release-2-5-x
changeset: 5372:cec96374b986
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 02 19:38:46 2016 +0100
description:
Create and use momentum-smearing functions in particle and jet smearing, also for use in custom smearing

details:   https://rivet.hepforge.org/hg/rivet/rev/0313f4a6ad85
branches:  release-2-5-x
changeset: 5373:0313f4a6ad85
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 02 19:39:40 2016 +0100
description:
Add SmearedMET projection, wrapping MissingMomentum.

details:   https://rivet.hepforge.org/hg/rivet/rev/623bc0d3f31a
branches:  release-2-5-x
changeset: 5374:623bc0d3f31a
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Aug 02 19:45:36 2016 +0100
description:
Adding MET smearing to EXAMPLE_SMEAR

diffs (truncated from 462 to 50 lines):

--- a/ChangeLog	Tue Aug 02 15:39:45 2016 +0100
+++ b/ChangeLog	Tue Aug 02 19:45:36 2016 +0100
@@ -1,3 +1,9 @@
+2016-08-02  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add SmearedMET projection, wrapping MissingMomentum.
+
+	* Include base truth-level projections in SmearedParticles/Jets compare() methods.
+
 2016-07-29  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Rename TOTEM_2012_002 to proper TOTEM_2012_I1220862 name.
--- a/include/Rivet/Makefile.am	Tue Aug 02 15:39:45 2016 +0100
+++ b/include/Rivet/Makefile.am	Tue Aug 02 19:45:36 2016 +0100
@@ -68,6 +68,7 @@
   Projections/PromptFinalState.hh \
   Projections/SmearedParticles.hh \
   Projections/SmearedJets.hh \
+  Projections/SmearedMET.hh \
   Projections/Sphericity.hh \
   Projections/Spherocity.hh \
   Projections/TauFinder.hh \
--- a/include/Rivet/Projection.hh	Tue Aug 02 15:39:45 2016 +0100
+++ b/include/Rivet/Projection.hh	Tue Aug 02 19:45:36 2016 +0100
@@ -131,6 +131,8 @@
 
     /// Shortcut to make a named Cmp<Projection> comparison with the @c *this
     /// object automatically passed as one of the parent projections.
+    ///
+    /// @note Alias for mkNamedPCmp
     Cmp<Projection> mkPCmp(const Projection& otherparent, const std::string& pname) const;
 
     /// Block Projection copying
--- a/include/Rivet/Projections/SmearedJets.hh	Tue Aug 02 15:39:45 2016 +0100
+++ b/include/Rivet/Projections/SmearedJets.hh	Tue Aug 02 19:45:36 2016 +0100
@@ -83,8 +83,11 @@
                 "b-tag hashes = " << get_address(_bTagEffFn) << "," << get_address(other._bTagEffFn) << "; " <<
                 "c-tag hashes = " << get_address(_cTagEffFn) << "," << get_address(other._cTagEffFn));
       return
-        cmp(get_address(_jetEffFn), get_address(other._jetEffFn)) || cmp(get_address(_jetSmearFn), get_address(other._jetSmearFn)) ||
-        cmp(get_address(_bTagEffFn), get_address(other._bTagEffFn)) || cmp(get_address(_cTagEffFn), get_address(other._cTagEffFn));
+        mkPCmp(other, "TruthJets") ||
+        cmp(get_address(_jetEffFn), get_address(other._jetEffFn)) ||
+        cmp(get_address(_jetSmearFn), get_address(other._jetSmearFn)) ||
+        cmp(get_address(_bTagEffFn), get_address(other._bTagEffFn)) ||
+        cmp(get_address(_cTagEffFn), get_address(other._cTagEffFn));
     }
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000