Changeset b9ae4c3 in git for external/fastjet/JetDefinition.cc

Timestamp:

Sep 2, 2016, 3:46:14 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fa068d3

Parents:

ec5e04b (diff), 23389ff (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.

git-author:

Pavel Demin <pavel-demin@…> (09/02/16 15:46:14)

git-committer:

GitHub <noreply@…> (09/02/16 15:46:14)

Message:

Merge pull request #32 from delphes/dev_01

Dev 01

File:

• external/fastjet/JetDefinition.cc (modified) (3 diffs)

external/fastjet/JetDefinition.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: JetDefinition.cc 3677 2014-09-09 22:45:25Z soyez $
+// $Id: JetDefinition.cc 4074 2016-03-08 09:09:25Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -45 +45 @@
 JetDefinition::JetDefinition(JetAlgorithm jet_algorithm_in, 
                              double R_in, 
+                             RecombinationScheme recomb_scheme_in,
                              Strategy strategy_in,
-                             RecombinationScheme recomb_scheme_in,
                              int nparameters) :
   _jet_algorithm(jet_algorithm_in), _Rparam(R_in), _strategy(strategy_in) {
@@ -185 +185 @@
 
   // do not forget to delete the existing recombiner if needed
-  if (_shared_recombiner()) _shared_recombiner.reset();
+  if (_shared_recombiner) _shared_recombiner.reset();
 
   _recombiner = 0;