Fork me on GitHub

Changeset 10e33bc in git for external/fastjet


Ignore:
Timestamp:
Jun 26, 2015, 9:03:11 PM (9 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
1bc87da
Parents:
8497ac6
Message:

update FastJet library to 3.1.2

Location:
external/fastjet
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/ClusterSequence.cc

    r8497ac6 r10e33bc  
    11//FJSTARTHEADER
    2 // $Id: ClusterSequence.cc 3685 2014-09-11 20:15:00Z salam $
     2// $Id: ClusterSequence.cc 3809 2015-02-20 13:05:13Z soyez $
    33//
    44// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    372372    _plugin_activated = false;
    373373
     374  } else if (_strategy == N2MHTLazy9AntiKtSeparateGhosts) {
    374375#ifndef __FJCORE__
    375   } else if (_strategy == N2MHTLazy9AntiKtSeparateGhosts) {
    376376    // attempt to use an external tiling routine -- it manipulates
    377377    // the CS history via the plugin mechanism
    … …  
    14711471  assert(local_step == step_number);
    14721472
     1473  // sanity check: make sure the particles have not already been recombined
     1474  //
     1475  // Note that good practice would make this an assert (since this is
     1476  // a serious internal issue). However, we decided to throw an
     1477  // InternalError so that the end user can decide to catch it and
     1478  // retry the clustering with a different strategy.
     1479
    14731480  assert(parent1 >= 0);
     1481  if (_history[parent1].child != Invalid){
     1482    throw InternalError("trying to recomine an object that has previsously been recombined");
     1483  }
    14741484  _history[parent1].child = local_step;
    1475   if (parent2 >= 0) {_history[parent2].child = local_step;}
     1485  if (parent2 >= 0) {
     1486    if (_history[parent2].child != Invalid){
     1487      throw InternalError("trying to recomine an object that has previsously been recombined");
     1488    }
     1489    _history[parent2].child = local_step;
     1490  }
    14761491
    14771492  // get cross-referencing right from PseudoJets

  • external/fastjet/Error.hh

    r8497ac6 r10e33bc  
    33
    44//FJSTARTHEADER
    5 // $Id: Error.hh 3694 2014-09-18 13:21:54Z soyez $
     5// $Id: Error.hh 3809 2015-02-20 13:05:13Z soyez $
    66//
    77// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    9696
    9797
     98/// @ingroup error_handling
     99/// \class InternalError
     100/// class corresponding to critical internal errors
     101///
     102/// This is an error class (derived from Error) meant for serious,
     103/// critical, internal errors that we still want to be catchable by an
     104/// end-user [e.g. a serious issue in clustering where the end-user
     105/// can catch it and retry with a different strategy]
     106///
     107/// Please directly contact the FastJet authors if you see such an
     108/// error.
     109class InternalError : public Error{
     110public:
     111  /// ctor with error message:
     112  /// just add a bit of info to the message and pass it to the base class
     113  InternalError(const std::string & message_in) : Error(std::string("*** CRITICAL INTERNAL FASTJET ERROR *** CONTACT THE AUTHORS *** ") + message_in){ }
     114};
     115
     116
    98117FASTJET_END_NAMESPACE
    99118

  • external/fastjet/LazyTiling25.cc

    r8497ac6 r10e33bc  
    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

  • external/fastjet/LazyTiling9.cc

    r8497ac6 r10e33bc  
    11//FJSTARTHEADER
    2 // $Id: LazyTiling9.cc 3477 2014-07-29 14:34:39Z salam $
     2// $Id: LazyTiling9.cc 3808 2015-02-20 11:24:53Z soyez $
    33//
    44// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    348348  for (Tile2 ** near_tile = tile.begin_tiles; near_tile != tile.end_tiles; near_tile++){
    349349    if ((*near_tile)->tagged) continue;
    350     double dist = _distance_to_tile(jet, *near_tile);
     350    // here we are not allowed to miss a tile due to some rounding
     351    // error. We therefore allow for a margin of security
     352    double dist = _distance_to_tile(jet, *near_tile) - tile_edge_security_margin;
    351353    // cout << "      max info looked at tile " << *near_tile - &_tiles[0]
    352354    //   << ", dist = " << dist << " " << (*near_tile)->max_NN_dist

  • external/fastjet/LazyTiling9Alt.cc

    r8497ac6 r10e33bc  
    11//FJSTARTHEADER
    2 // $Id: LazyTiling9Alt.cc 3477 2014-07-29 14:34:39Z salam $
     2// $Id: LazyTiling9Alt.cc 3808 2015-02-20 11:24:53Z soyez $
    33//
    44// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    319319  for (Tile::TileFnPair * near_tile = tile.begin_tiles; near_tile != tile.end_tiles; near_tile++){
    320320    if ((near_tile->first)->tagged) continue;
    321     double dist = (tile.*(near_tile->second))(jet);
     321    // here we are not allowed to miss a tile due to some rounding
     322    // error. We therefore allow for a margin of security
     323    double dist = (tile.*(near_tile->second))(jet) - tile_edge_security_margin;
    322324    // cout << "      max info looked at tile " << *near_tile - &_tiles[0]
    323325    //   << ", dist = " << dist << " " << (*near_tile)->max_NN_dist

  • external/fastjet/LazyTiling9SeparateGhosts.cc

    r8497ac6 r10e33bc  
    11//FJSTARTHEADER
    2 // $Id: LazyTiling9SeparateGhosts.cc 3596 2014-08-12 15:27:19Z soyez $
     2// $Id: LazyTiling9SeparateGhosts.cc 3808 2015-02-20 11:24:53Z soyez $
    33//
    44// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    298298  for (Tile3 ** near_tile = tile.begin_tiles; near_tile != tile.end_tiles; near_tile++){
    299299    if ((*near_tile)->tagged) continue;
    300     double dist = _distance_to_tile(jet, *near_tile);
     300    // here we are not allowed to miss a tile due to some rounding
     301    // error. We therefore allow for a margin of security
     302    double dist = _distance_to_tile(jet, *near_tile) - tile_edge_security_margin;
    301303    // cout << "      max info looked at tile " << *near_tile - &_tiles[0]
    302304    //   << ", dist = " << dist << " " << (*near_tile)->max_NN_dist

  • external/fastjet/VERSION

    r8497ac6 r10e33bc  
    1 3.1.1
     13.1.2

  • external/fastjet/config_auto.h

    r8497ac6 r10e33bc  
    151151/* Define to the full name and version of this package. */
    152152#ifndef FASTJET_PACKAGE_STRING
    153 #define FASTJET_PACKAGE_STRING  "FastJet 3.1.1"
     153#define FASTJET_PACKAGE_STRING  "FastJet 3.1.2"
    154154#endif
    155155
    … …  
    161161/* Define to the version of this package. */
    162162#ifndef FASTJET_PACKAGE_VERSION
    163 #define FASTJET_PACKAGE_VERSION  "3.1.1"
     163#define FASTJET_PACKAGE_VERSION  "3.1.2"
    164164#endif
    165165
    … …  
    171171/* Version number of package */
    172172#ifndef FASTJET_VERSION
    173 #define FASTJET_VERSION  "3.1.1"
     173#define FASTJET_VERSION  "3.1.2"
    174174#endif
    175175
    … …  
    186186/* Version of the package under the form XYYZZ (instead of X.Y.Z) */
    187187#ifndef FASTJET_VERSION_NUMBER
    188 #define FASTJET_VERSION_NUMBER  30101
     188#define FASTJET_VERSION_NUMBER  30102
    189189#endif
    190190
    191191/* Patch version of this package */
    192192#ifndef FASTJET_VERSION_PATCHLEVEL
    193 #define FASTJET_VERSION_PATCHLEVEL  1
     193#define FASTJET_VERSION_PATCHLEVEL  2
    194194#endif
    195195

  • external/fastjet/config_raw.h

    r8497ac6 r10e33bc  
    9292
    9393/* Define to the full name and version of this package. */
    94 #define PACKAGE_STRING "FastJet 3.1.1"
     94#define PACKAGE_STRING "FastJet 3.1.2"
    9595
    9696/* Define to the one symbol short name of this package. */
    … …  
    9898
    9999/* Define to the version of this package. */
    100 #define PACKAGE_VERSION "3.1.1"
     100#define PACKAGE_VERSION "3.1.2"
    101101
    102102/* Define to 1 if you have the ANSI C header files. */
    … …  
    104104
    105105/* Version number of package */
    106 #define VERSION "3.1.1"
     106#define VERSION "3.1.2"
    107107
    108108/* Major version of this package */
    … …  
    113113
    114114/* Version of the package under the form XYYZZ (instead of X.Y.Z) */
    115 #define VERSION_NUMBER 30101
     115#define VERSION_NUMBER 30102
    116116
    117117/* Patch version of this package */
    118 #define VERSION_PATCHLEVEL 1
     118#define VERSION_PATCHLEVEL 2
    119119
    120120/* Pre-release version of this package */

  • external/fastjet/config_win.h

    r8497ac6 r10e33bc  
    1 #define FASTJET_PACKAGE_STRING  "FastJet 3.1.1"
    2 #define FASTJET_PACKAGE_VERSION  "3.1.1"
    3 #define FASTJET_VERSION  "3.1.1"
     1#define FASTJET_PACKAGE_STRING  "FastJet 3.1.2"
     2#define FASTJET_PACKAGE_VERSION  "3.1.2"
     3#define FASTJET_VERSION  "3.1.2"
    44#define FASTJET_VERSION_MAJOR       3
    55#define FASTJET_VERSION_MINOR       1
    6 #define FASTJET_VERSION_PATCHLEVEL  1
    7 #define FASTJET_VERSION_NUMBER      30101
     6#define FASTJET_VERSION_PATCHLEVEL  2
     7#define FASTJET_VERSION_NUMBER      30102
    88
    99/* The ATLASCone plugin is disabled by default*/

  • external/fastjet/internal/LazyTiling9Alt.hh

    r8497ac6 r10e33bc  
    33
    44//FJSTARTHEADER
    5 // $Id: LazyTiling9Alt.hh 3477 2014-07-29 14:34:39Z salam $
     5// $Id: LazyTiling9Alt.hh 3808 2015-02-20 11:24:53Z soyez $
    66//
    77// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    3737
    3838FASTJET_BEGIN_NAMESPACE      // defined in fastjet/internal/base.hh
     39
     40/// Rounding errors in the Lazy strategies may cause the following
     41/// problem: when browsing tiles in the vicinity of the particles
     42/// being clustered in order to decide which of these tiles may
     43/// contain particles that need to be updated (because theit NN is one
     44/// of the particles that are currently clustered), we discard tiles
     45/// that are deemed "too far from the cell" by the "max_NN_dist"
     46/// criterion. Because of rounding error, this condition can sometimes
     47/// miss cases where an update is needed.
     48///
     49/// An example of this happens if a particle '1' is, say, at the lower
     50/// edge of the rapidity of a given tile, with a particle '2' in the
     51/// tile directly on its left at the same rapidity. Assume also that
     52/// max_NN_dist in 2's tile corresponds to the distance between 2 and
     53/// teh tile of 1. If 2 is 1's NN then in case 2 gets clustered, 1's
     54/// NN needs to be updated. However, rounding errors in the
     55/// calculation of the distance between 1 and 2 may result is
     56/// something slightly larger than the max_NN_dist in 2's tile.
     57///
     58/// This situation corresponds to the bug reported by Jochen Olt on
     59/// February 12 2015 [see issue-tracker/2015-02-infinite-loop],
     60/// causing an infinite loop.
     61///
     62/// To prevent this, the simplest solution is, when looking at tiles
     63/// to browse for updateds, to add a margin of security close to the
     64/// edges of the cell, i.e. instead of updating only tiles for which
     65/// distance<=max_NN_dist, we will update tiles for which
     66/// distance<=max_NN_dist+tile_edge_security_margin.
     67///
     68/// Note that this does not need to be done when computing nearest
     69/// neighbours [rounding errors are tolerated there] but it is
     70/// critical when tracking points that have to be updated.
     71const double tile_edge_security_margin=1.0e-7;
    3972
    4073/// structure analogous to BriefJet, but with the extra information

  • external/fastjet/plugins/SISCone/config.h

    r8497ac6 r10e33bc  
    5454#define PACKAGE_TARNAME "siscone"
    5555
    56 /* Define to the home page for this package. */
    57 /* #undef PACKAGE_URL */
    58 
    5956/* Define to the version of this package. */
    6057#define PACKAGE_VERSION "3.0.0"

  • external/fastjet/tools/Filter.hh

    r8497ac6 r10e33bc  
    33
    44//FJSTARTHEADER
    5 // $Id: Filter.hh 3494 2014-07-30 20:38:48Z soyez $
     5// $Id: Filter.hh 3845 2015-03-08 08:35:36Z soyez $
    66//
    77// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    142142  /// Set a subtractor that is applied to all individual subjets before
    143143  /// deciding which ones to keep. It takes precedence over a non-zero rho.
    144   void set_subtractor(const FunctionOfPseudoJet<PseudoJet> * subtractor) {_subtractor = subtractor;}
     144  void set_subtractor(const FunctionOfPseudoJet<PseudoJet> * subtractor_in) {_subtractor = subtractor_in;}
    145145
    146146  /// runs the filtering and sets kept and rejected to be the jets of interest
Note: See TracChangeset for help on using the changeset viewer.