Fork me on GitHub

Ignore:
Timestamp:
Sep 29, 2015, 2:08:10 PM (9 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
a98c7ef
Parents:
d870fc5 (diff), 06ec139 (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.
Message:

Merge remote-tracking branch 'upstream/master'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • external/fastjet/LazyTiling25.cc

    rd870fc5 rd77b51d  
    11//FJSTARTHEADER
    2 // $Id: LazyTiling25.cc 3477 2014-07-29 14:34:39Z salam $
     2// $Id: LazyTiling25.cc 3808 2015-02-20 11:24:53Z soyez $
    33//
    44// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     
    365365  for (Tile25 ** near_tile = tile.begin_tiles; near_tile != tile.end_tiles; near_tile++){
    366366    if ((*near_tile)->tagged) continue;
    367     double dist = _distance_to_tile(jet, *near_tile);
     367    // here we are not allowed to miss a tile due to some rounding
     368    // error. We therefore allow for a margin of security
     369    double dist = _distance_to_tile(jet, *near_tile) - tile_edge_security_margin;
    368370    // cout << "      max info looked at tile " << *near_tile - &_tiles[0]
    369371    //   << ", dist = " << dist << " " << (*near_tile)->max_NN_dist
Note: See TracChangeset for help on using the changeset viewer.