Changeset d77b51d in git for external/fastjet/tools/Recluster.hh

Timestamp:

Sep 29, 2015, 2:08:10 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a98c7ef

Parents:

d870fc5 (diff), 06ec139 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master'

File:

• external/fastjet/tools/Recluster.hh (modified) (3 diffs)

external/fastjet/tools/Recluster.hh

@@ -2 +2 @@
 #define __FASTJET_TOOLS_RECLUSTER_HH__
 
-// $Id: Recluster.hh 3714 2014-09-30 09:47:31Z soyez $
+// $Id: Recluster.hh 3760 2014-12-19 10:05:10Z soyez $
 //
 // Copyright (c) 2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -50 +50 @@
 /// Alternatively, Recluster can be constructed from a jet algorithm
 /// and an optional radius. In that case the recombiner is
-/// systematically obtained fromn the jet being processed (unless you
+/// systematically obtained from the jet being processed (unless you
 /// call set_acquire_recombiner(false)). If only the jet algorithm is
 /// specified, a default radius of max_allowable_R will be assumed if
@@ -124 +124 @@
   /// parameter (like the genkt algorithm), please specify the jet
   /// definition fully using the constructor above.
-  Recluster(JetAlgorithm snew_jet_alg, double new_jet_radius, Keep keep_in = keep_only_hardest);
+  Recluster(JetAlgorithm new_jet_alg, double new_jet_radius, Keep keep_in = keep_only_hardest);
 
   /// constructor with just a jet algorithm, but no jet radius. If the