Changeset 973b92a in git for external/fastjet/ClusterSequence_Delaunay.cc

Timestamp:

Oct 9, 2015, 2:47:38 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8713dee

Parents:

f118021

Message:

update FastJet library to 3.1.3 and Nsubjettiness library to 2.2.1

File:

• external/fastjet/ClusterSequence_Delaunay.cc (modified) (6 diffs)

external/fastjet/ClusterSequence_Delaunay.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: ClusterSequence_Delaunay.cc 3475 2014-07-29 11:57:23Z salam $
+// $Id: ClusterSequence_Delaunay.cc 3918 2015-07-03 14:19:13Z salam $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -70 +70 @@
   // initialise our DNN structure with the set of points
   auto_ptr<DynamicNearestNeighbours> DNN;
+  bool verbose = false;
 #ifndef DROP_CGAL // strategy = NlnN* are not supported if we drop CGAL...
-  bool verbose = false;
   bool ignore_nearest_is_mirror = (_Rparam < twopi);
   if (_strategy == NlnN4pi) {
@@ -126 +126 @@
       jet_i = SmallestDijPair.first;
       jet_j = SmallestDijPair.second;
+      if (verbose) cout << "CS_Delaunay found recombination candidate: " << jet_i << " " << jet_j << " " << SmallestDij << endl; // GPS debugging
       // distance is immediately removed regardless of whether or not
       // it is used.
@@ -139 +140 @@
       if (!recombine_with_beam) {Valid2 = DNN->Valid(jet_j);} 
       else {Valid2 = true;}
-
+      if (verbose) cout << "CS_Delaunay validities i & j: " << DNN->Valid(jet_i) << " " << Valid2 << endl;
     } while ( !DNN->Valid(jet_i) || !Valid2);
 
@@ -148 +149 @@
     if (! recombine_with_beam) {
       int nn; // will be index of new jet
+      if (verbose) cout << "CS_Delaunay call _do_ij_recomb: " << jet_i << " " << jet_j << " " << SmallestDij << endl; // GPS debug
       _do_ij_recombination_step(jet_i, jet_j, SmallestDij, nn);
       //OBS // merge the two jets, add new jet, remove old ones
@@ -169 +171 @@
     } else {
       // recombine the jet with the beam
+      if (verbose) cout << "CS_Delaunay call _do_iB_recomb: " << jet_i << " " << SmallestDij << endl; // GPS debug
       _do_iB_recombination_step(jet_i, SmallestDij);
       //OBS _add_step_to_history(n+i,_jets[jet_i].cluster_hist_index(),BeamJet,