Changeset 273e668 in git for external/fastjet/RectangularGrid.hh

Timestamp:

Oct 15, 2014, 10:55:55 AM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

35b9204, b25d4cf

Parents:

f14bd6a

git-author:

Pavel Demin <pavel.demin@…> (10/10/14 08:56:40)

git-committer:

Pavel Demin <pavel.demin@…> (10/15/14 10:55:55)

Message:

upgrade FastJet to version 3.1.0

File:

• external/fastjet/RectangularGrid.hh (modified) (2 diffs)

external/fastjet/RectangularGrid.hh

@@ -88 +88 @@
   ///  \param rapmax     the maximal absolute rapidity extent of the grid
   ///  \param cell_size  the grid spacing (equivalently, cell size)
-  RectangularGrid(double rapmax, double cell_size) :
-      _ymax(rapmax), _ymin(-rapmax), 
+  RectangularGrid(double rapmax_in, double cell_size) :
+      _ymax(rapmax_in), _ymin(-rapmax_in), 
       _requested_drap(cell_size), _requested_dphi(cell_size) {
     _setup_grid();
@@ -103 +103 @@
   ///                        a massless 4-vector at the center of the tile passes
   ///                        the selection
-  RectangularGrid(double rapmin, double rapmax, double drap, double dphi,
+  RectangularGrid(double rapmin_in, double rapmax_in, double drap_in, double dphi_in,
                   Selector tile_selector = Selector()) 
-    : _ymax(rapmax), _ymin(rapmin), 
-      _requested_drap(drap), _requested_dphi(dphi),
+    : _ymax(rapmax_in), _ymin(rapmin_in), 
+      _requested_drap(drap_in), _requested_dphi(dphi_in),
       _tile_selector(tile_selector)
   {