[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/87a3a0c5bbdb
branches:  release-2-5-x
changeset: 5752:87a3a0c5bbdb
user:      Andy Buckley <andy at insectnation.org>
date:      Mon May 08 12:09:31 2017 +0100
description:
Cosmetic

details:   https://rivet.hepforge.org/hg/rivet/rev/4e99d63af57e
branches:  release-2-5-x
changeset: 5753:4e99d63af57e
user:      Andy Buckley <andy at insectnation.org>
date:      Mon May 08 13:38:13 2017 +0100
description:
Add new mkClusterInputs, mkJet and mkJets static methods to FastJets, to help with direct calls to FastJet where particle lookup for constituents and ghost tags are required.

details:   https://rivet.hepforge.org/hg/rivet/rev/6c3ff6889460
branches:  release-2-5-x
changeset: 5754:6c3ff6889460
user:      Andy Buckley <andy at insectnation.org>
date:      Mon May 08 13:46:02 2017 +0100
description:
Code cleanups with lambdas and ifilter functions in FastJets.cc

details:   https://rivet.hepforge.org/hg/rivet/rev/32e0934f4b40
branches:  release-2-5-x
changeset: 5755:32e0934f4b40
user:      Andy Buckley <andy at insectnation.org>
date:      Mon May 08 14:00:36 2017 +0100
description:
Reimplement FastJets methods in terms of new static helper functions.

diffs (truncated from 360 to 50 lines):

--- a/ChangeLog	Mon May 08 12:05:07 2017 +0100
+++ b/ChangeLog	Mon May 08 14:00:36 2017 +0100
@@ -1,5 +1,11 @@
 2017-05-08  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Reimplement FastJets methods in terms of new static helper functions.
+
+	* Add new mkClusterInputs, mkJet and mkJets static methods to
+	FastJets, to help with direct calls to FastJet where particle
+	lookup for constituents and ghost tags are required.
+
 	* Fix Doxygen config and Makefile target to allow working with
 	out-of-source builds. Thanks to Christian Holm Christensen.
 
--- a/configure.ac	Mon May 08 12:05:07 2017 +0100
+++ b/configure.ac	Mon May 08 14:00:36 2017 +0100
@@ -272,6 +272,7 @@
 AC_SUBST(AM_CXXFLAGS)
 
 AC_EMPTY_SUBST
+AC_CONFIG_FILES(Makefile Doxyfile)
 AC_CONFIG_FILES(include/Makefile include/Rivet/Makefile)
 AC_CONFIG_FILES(src/Makefile)
 AC_CONFIG_FILES(src/Core/Makefile src/Core/yamlcpp/Makefile)
@@ -284,7 +285,6 @@
 AC_CONFIG_FILES(doc/Makefile)
 AC_CONFIG_FILES(doc/rivetversion.sty doc/diffanas)
 AC_CONFIG_FILES(bin/Makefile bin/rivet-config bin/rivet-buildplugin)
-AC_CONFIG_FILES(Makefile Doxyfile)
 AC_CONFIG_FILES(rivetenv.sh rivetenv.csh rivet.pc)
 
 AC_OUTPUT
--- a/include/Rivet/Projections/FastJets.hh	Mon May 08 12:05:07 2017 +0100
+++ b/include/Rivet/Projections/FastJets.hh	Mon May 08 14:00:36 2017 +0100
@@ -150,6 +150,16 @@
     //@}
 
 
+    /// @name Static helper functions for FastJet interaction, with tagging
+    //@{
+
+    static PseudoJets mkClusterInputs(const Particles& fsparticles, const Particles& tagparticles=Particles());
+    static Jet mkJet(const PseudoJet& pj, const Particles& fsparticles, const Particles& tagparticles=Particles());
+    static Jets mkJets(const PseudoJets& pjs, const Particles& fsparticles, const Particles& tagparticles=Particles());
+
+    //@}
+
+
     /// Reset the projection. Jet def, etc. are unchanged.
     void reset();