Changeset b7b836a in git for external/fastjet/contribs/RecursiveTools/SoftDrop.cc

Timestamp:

Jun 6, 2018, 10:05:10 PM (6 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

17d0ab8

Parents:

95e6b7a

Message:

update FastJet library to 3.3.1 and FastJet Contrib library to 1.036

File:

• external/fastjet/contribs/RecursiveTools/SoftDrop.cc (modified) (2 diffs)

external/fastjet/contribs/RecursiveTools/SoftDrop.cc

@@ -1 @@
-// $Id: SoftDrop.cc 686 2014-06-14 03:25:09Z jthaler $
+// $Id: SoftDrop.cc 1059 2017-09-07 20:48:00Z gsoyez $
 //
 // Copyright (c) 2014-, Gregory Soyez, Jesse. Thaler
@@ -57 +57 @@
 //----------------------------------------------------------------------
 double SoftDrop::symmetry_cut_fn(const PseudoJet & p1, 
-                                 const PseudoJet & p2) const{
-  return _symmetry_cut * pow(p1.squared_distance(p2)/_R0sqr, 0.5*_beta);
+                                 const PseudoJet & p2,
+                                 void *optional_R0sqr_ptr) const{
+  double R0sqr = (optional_R0sqr_ptr == 0) ? _R0sqr : *((double*) optional_R0sqr_ptr);
+  return _symmetry_cut * pow(squared_geometric_distance(p1,p2)/R0sqr, 0.5*_beta);
 }