Changeset 35cdc46 in git for external/fastjet/internal/Dnn4piCylinder.hh

Timestamp:

Sep 3, 2014, 3:18:54 PM (10 years ago)

Author:

Pavel Demin <demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

be2222c

Parents:

5b5a56b

Message:

upgrade FastJet to version 3.1.0-beta.1, upgrade Nsubjettiness to version 2.1.0, add SoftKiller version 1.0.0

File:

• external/fastjet/internal/Dnn4piCylinder.hh (modified) (7 diffs)

external/fastjet/internal/Dnn4piCylinder.hh

@@ -1 @@
-//STARTHEADER
-// $Id: Dnn4piCylinder.hh 2577 2011-09-13 15:11:38Z salam $
+//FJSTARTHEADER
+// $Id: Dnn4piCylinder.hh 3442 2014-07-24 07:20:49Z salam $
 //
-// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
@@ -13 +13 @@
 //
 //  The algorithms that underlie FastJet have required considerable
-//  development and are described in hep-ph/0512210. If you use
+//  development. They are described in the original FastJet paper,
+//  hep-ph/0512210 and in the manual, arXiv:1111.6097. If you use
 //  FastJet as part of work towards a scientific publication, please
-//  include a citation to the FastJet paper.
+//  quote the version you use and include a citation to the manual and
+//  optionally also to hep-ph/0512210.
 //
 //  FastJet is distributed in the hope that it will be useful,
@@ -25 +27 @@
 //  along with FastJet. If not, see <http://www.gnu.org/licenses/>.
 //----------------------------------------------------------------------
-//ENDHEADER
+//FJENDHEADER
 
 
@@ -57 +59 @@
   /// Returns the index of  the nearest neighbour of point labelled
   /// by ii (assumes ii is valid)
-  int NearestNeighbourIndex(const int & ii) const ;
+  int NearestNeighbourIndex(const int ii) const ;
 
   /// Returns the distance to the nearest neighbour of point labelled
   /// by index ii (assumes ii is valid)
-  double NearestNeighbourDistance(const int & ii) const ;
+  double NearestNeighbourDistance(const int ii) const ;
 
   /// Returns true iff the given index corresponds to a point that
   /// exists in the DNN structure (meaning that it has been added, and
   /// not removed in the meantime)
-  bool Valid(const int & index) const;
+  bool Valid(const int index) const;
 
   void RemoveAndAddPoints(const std::vector<int> & indices_to_remove,
@@ -98 +100 @@
 // functions defined above
 
-inline int Dnn4piCylinder::NearestNeighbourIndex(const int & current) const {
+inline int Dnn4piCylinder::NearestNeighbourIndex(const int current) const {
   return (_DNN1->NearestNeighbourDistance(current) < 
           _DNN2->NearestNeighbourDistance(current)) ? 
@@ -105 +107 @@
 }
 
-inline double Dnn4piCylinder::NearestNeighbourDistance(const int & current) const {
+inline double Dnn4piCylinder::NearestNeighbourDistance(const int current) const {
   return (_DNN1->NearestNeighbourDistance(current) < 
           _DNN2->NearestNeighbourDistance(current)) ? 
@@ -112 +114 @@
 }
 
-inline bool Dnn4piCylinder::Valid(const int & index) const {
+inline bool Dnn4piCylinder::Valid(const int index) const {
   return (_DNN1->Valid(index) && _DNN2->Valid(index));
 }