[Rivet-svn] rivet: 5 new changesets

Rivet Mercurial rivet at projects.hepforge.org
Tue Jun 27 12:30:01 BST 2017


details:   https://rivet.hepforge.org/hg/rivet/rev/a959e7412d3c
branches:  
changeset: 5904:a959e7412d3c
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Jun 27 11:53:53 2017 +0100
description:
Tweaks failed!

details:   https://rivet.hepforge.org/hg/rivet/rev/3e5d0be41645
branches:  
changeset: 5905:3e5d0be41645
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Jun 27 12:00:04 2017 +0100
description:
Cleanup and documentation

details:   https://rivet.hepforge.org/hg/rivet/rev/408e6722e178
branches:  
changeset: 5906:408e6722e178
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Jun 27 12:17:32 2017 +0100
description:
Tweak comment

details:   https://rivet.hepforge.org/hg/rivet/rev/1ed2185ab3d7
branches:  
changeset: 5907:1ed2185ab3d7
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Jun 27 12:18:02 2017 +0100
description:
Replace template args with std::function typedefs

details:   https://rivet.hepforge.org/hg/rivet/rev/2e393f0582a9
branches:  
changeset: 5908:2e393f0582a9
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Jun 27 12:18:48 2017 +0100
description:
Add 'JetFinder' alias for JetAlg, by analogy with ParticleFinder.

diffs (truncated from 234 to 50 lines):

--- a/ChangeLog	Mon Jun 26 21:56:46 2017 +0100
+++ b/ChangeLog	Tue Jun 27 12:18:48 2017 +0100
@@ -1,3 +1,7 @@
+2017-06-27  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add 'JetFinder' alias for JetAlg, by analogy with ParticleFinder.
+
 2017-06-26  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Convert SmearedParticles to a more general list of combined
--- a/include/Rivet/Projections/JetAlg.hh	Mon Jun 26 21:56:46 2017 +0100
+++ b/include/Rivet/Projections/JetAlg.hh	Tue Jun 27 12:18:48 2017 +0100
@@ -222,6 +222,11 @@
   };
 
 
+  /// Compatibility typedef, for equivalence with ParticleFinder
+  /// @todo Should we make this the canonical name? Would "require" a header filename change -> breakage or ugly.
+  using JetFinder = JetAlg;
+
+
 }
 
 #endif
--- a/include/Rivet/Projections/SmearedJets.hh	Mon Jun 26 21:56:46 2017 +0100
+++ b/include/Rivet/Projections/SmearedJets.hh	Tue Jun 27 12:18:48 2017 +0100
@@ -12,8 +12,24 @@
 namespace Rivet {
 
 
+  // Recursive variadic template arg decoding
+  namespace {
+    template<typename T>
+    vector<JetEffSmearFn>& toEffSmearFns(vector<JetEffSmearFn>& v, const T& t) {
+      v.push_back(JetEffSmearFn(t));
+      return v;
+    }
+    template<typename T, typename... ARGS>
+    vector<JetEffSmearFn>& toEffSmearFns(vector<JetEffSmearFn>& v, const T& first, ARGS... args) {
+      v.push_back(JetEffSmearFn(first));
+      toEffSmearFns(v, args...);
+      return v;
+    }
+  }
+
+
+
   /// Wrapper projection for smearing {@link Jet}s with detector resolutions and efficiencies
-  /// @todo Chain constructors?
   class SmearedJets : public JetAlg {


More information about the Rivet-svn mailing list