Fork me on GitHub

Changeset 554babf in git


Ignore:
Timestamp:
Jan 15, 2015, 9:24:38 PM (10 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
ce4b888
Parents:
51cabe8
Message:

upgrade FastJet to version 3.1.1

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • doc/update_fastjet.sh

    r51cabe8 r554babf  
    11version=3.1.1
    22
    3 #wget http://fastjet.fr/repo/fastjet-${version}.tar.gz
     3wget http://fastjet.fr/repo/fastjet-${version}.tar.gz
    44
    55tar -zxf fastjet-${version}.tar.gz

  • external/fastjet/RectangularGrid.cc

    r51cabe8 r554babf  
    11//FJSTARTHEADER
    2 // $Id$
     2// $Id: RectangularGrid.cc 3771 2014-12-22 21:13:22Z salam $
    33//
    44// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez

  • external/fastjet/RectangularGrid.hh

    r51cabe8 r554babf  
    33
    44//FJSTARTHEADER
    5 // $Id$
     5// $Id: RectangularGrid.hh 3771 2014-12-22 21:13:22Z salam $
    66//
    77// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    4242class TilingBase {
    4343public:
    44   virtual ~TilingBase() {}
    45 
    4644  /// returns the index of the tile in which p is located, or -1 if p
    4745  /// is outside the tiling region
    … …  
    8179  virtual bool is_initialised() const = 0;
    8280  bool is_initialized() const {return is_initialised();}
     81
     82  /// virtual destructor
     83  virtual ~TilingBase() {}
    8384};
    8485
    … …  
    165166  // a tile selector
    166167  Selector _tile_selector;
    167   // a cached
     168  // if there's a tile selector, then for each tile, this caches the
     169  // information about whether it is "good" i.e. it passes the tile
     170  // selector
    168171  std::vector<bool> _is_good;
    169172 

  • external/fastjet/VERSION

    r51cabe8 r554babf  
    1 3.1.0
     13.1.1

  • external/fastjet/config_auto.h

    r51cabe8 r554babf  
    151151/* Define to the full name and version of this package. */
    152152#ifndef FASTJET_PACKAGE_STRING
    153 #define FASTJET_PACKAGE_STRING  "FastJet 3.1.0"
     153#define FASTJET_PACKAGE_STRING  "FastJet 3.1.1"
    154154#endif
    155155
    … …  
    161161/* Define to the version of this package. */
    162162#ifndef FASTJET_PACKAGE_VERSION
    163 #define FASTJET_PACKAGE_VERSION  "3.1.0"
     163#define FASTJET_PACKAGE_VERSION  "3.1.1"
    164164#endif
    165165
    … …  
    171171/* Version number of package */
    172172#ifndef FASTJET_VERSION
    173 #define FASTJET_VERSION  "3.1.0"
     173#define FASTJET_VERSION  "3.1.1"
    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  30100
     188#define FASTJET_VERSION_NUMBER  30101
    189189#endif
    190190
    191191/* Patch version of this package */
    192192#ifndef FASTJET_VERSION_PATCHLEVEL
    193 #define FASTJET_VERSION_PATCHLEVEL  0
     193#define FASTJET_VERSION_PATCHLEVEL  1
    194194#endif
    195195

  • external/fastjet/config_raw.h

    r51cabe8 r554babf  
    9292
    9393/* Define to the full name and version of this package. */
    94 #define PACKAGE_STRING "FastJet 3.1.0"
     94#define PACKAGE_STRING "FastJet 3.1.1"
    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.0"
     100#define PACKAGE_VERSION "3.1.1"
    101101
    102102/* Define to 1 if you have the ANSI C header files. */
    … …  
    104104
    105105/* Version number of package */
    106 #define VERSION "3.1.0"
     106#define VERSION "3.1.1"
    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 30100
     115#define VERSION_NUMBER 30101
    116116
    117117/* Patch version of this package */
    118 #define VERSION_PATCHLEVEL 0
     118#define VERSION_PATCHLEVEL 1
    119119
    120120/* Pre-release version of this package */

  • external/fastjet/config_win.h

    r51cabe8 r554babf  
    1 #define FASTJET_PACKAGE_STRING  "FastJet 3.1.0"
    2 #define FASTJET_PACKAGE_VERSION  "3.1.0"
    3 #define FASTJET_VERSION  "3.1.0"
     1#define FASTJET_PACKAGE_STRING  "FastJet 3.1.1"
     2#define FASTJET_PACKAGE_VERSION  "3.1.1"
     3#define FASTJET_VERSION  "3.1.1"
    44#define FASTJET_VERSION_MAJOR       3
    55#define FASTJET_VERSION_MINOR       1
    6 #define FASTJET_VERSION_PATCHLEVEL  0
    7 #define FASTJET_VERSION_NUMBER      30100
     6#define FASTJET_VERSION_PATCHLEVEL  1
     7#define FASTJET_VERSION_NUMBER      30101
    88
    99/* The ATLASCone plugin is disabled by default*/

  • external/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh

    r51cabe8 r554babf  
    3232//FJENDHEADER
    3333
    34 #include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen)
     34#include "fastjet/internal/base.hh"     // namespace macros (include explicitly to help Doxygen)
    3535#include "D0RunIBaseConePlugin.hh"
    3636

  • external/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh

    r51cabe8 r554babf  
    3232//FJENDHEADER
    3333
    34 #include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen)
     34#include "fastjet/internal/base.hh"     // namespace macros (include explicitly to help Doxygen)
    3535#include "D0RunIBaseConePlugin.hh"
    3636

  • external/fastjet/tools/Filter.cc

    r51cabe8 r554babf  
    11//FJSTARTHEADER
    2 // $Id: Filter.cc 3633 2014-08-15 13:23:52Z soyez $
     2// $Id: Filter.cc 3760 2014-12-19 10:05:10Z soyez $
    33//
    44// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    164164  if ((ca_optimisation_used) && (kept.size()+rejected.size()>0)){
    165165    bool has_non_explicit_ghost_area = (kept.size()>0)
    166       ? (kept[0].has_area()     && kept[0].validated_csab()->has_explicit_ghosts())
    167       : (rejected[0].has_area() && rejected[0].validated_csab()->has_explicit_ghosts());
     166      ? (kept[0].has_area()     && (!(kept[0].validated_csab()->has_explicit_ghosts())))
     167      : (rejected[0].has_area() && (!(rejected[0].validated_csab()->has_explicit_ghosts())));
    168168    if (has_non_explicit_ghost_area)
    169169      fs->discard_area();

  • external/fastjet/tools/GridMedianBackgroundEstimator.hh

    r51cabe8 r554babf  
    33
    44//FJSTARTHEADER
    5 // $Id: GridMedianBackgroundEstimator.hh 3610 2014-08-13 09:49:28Z salam $
     5// $Id: GridMedianBackgroundEstimator.hh 3778 2014-12-24 09:28:09Z salam $
    66//
    77// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    7777class GridMedianBackgroundEstimator : public BackgroundEstimatorBase
    7878#ifdef FASTJET_GMBGE_USEFJGRID
    79                                                                     , public RectangularGrid
     79                                    , public RectangularGrid
    8080#endif
    8181{
    … …  
    9494    _has_particles(false), _enable_rho_m(true) {}
    9595
    96   /// ctor with more control over initialisation
     96  //----------------------------------------------------------------
     97  /// Constructor based on a user's fully specified RectangularGrid
     98  GridMedianBackgroundEstimator(const RectangularGrid & grid) :
     99    RectangularGrid(grid),
     100    _has_particles(false), _enable_rho_m(true) {
     101    if (!RectangularGrid::is_initialised())
     102      throw Error("attempt to construct GridMedianBackgroundEstimator with uninitialised RectangularGrid");
     103  }   
     104
     105  //----------------------------------------------------------------
     106  /// Constructor with the explicit parameters for the underlying
     107  /// RectangularGrid
     108  ///
    97109  ///  \param rapmin         the minimum rapidity extent of the grid
    98110  ///  \param rapmax         the maximum rapidity extent of the grid
    99111  ///  \param drap           the grid spacing in rapidity
    100112  ///  \param dphi           the grid spacing in azimuth
    101   ///  \param tile_selector  optional (geometric) selector to specify
     113  ///  \param tile_selector  optional (geometric) selector to specify 
    102114  ///                        which tiles are good; a tile is good if
    103115  ///                        a massless 4-vector at the center of the tile passes
    … …  
    107119    RectangularGrid(rapmin_in, rapmax_in, drap_in, dphi_in, tile_selector),
    108120    _has_particles(false), _enable_rho_m(true) {}
    109 
    110   //----------------------------------------------------------------
    111   /// Constructor based on a user's fully specified RectangularGrid
    112   GridMedianBackgroundEstimator(const RectangularGrid & grid) :
    113     RectangularGrid(grid),
    114     _has_particles(false), _enable_rho_m(true) {
    115     if (!RectangularGrid::is_initialised())
    116       throw Error("attempt to construct GridMedianBackgroundEstimator with uninitialised RectangularGrid");
    117   }   
    118121
    119122#else  // alternative in old framework where we didn't have the rectangular grid

  • external/fastjet/tools/Recluster.hh

    r51cabe8 r554babf  
    22#define __FASTJET_TOOLS_RECLUSTER_HH__
    33
    4 // $Id: Recluster.hh 3714 2014-09-30 09:47:31Z soyez $
     4// $Id: Recluster.hh 3760 2014-12-19 10:05:10Z soyez $
    55//
    66// Copyright (c) 2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    5050/// Alternatively, Recluster can be constructed from a jet algorithm
    5151/// and an optional radius. In that case the recombiner is
    52 /// systematically obtained fromn the jet being processed (unless you
     52/// systematically obtained from the jet being processed (unless you
    5353/// call set_acquire_recombiner(false)). If only the jet algorithm is
    5454/// specified, a default radius of max_allowable_R will be assumed if
    … …  
    124124  /// parameter (like the genkt algorithm), please specify the jet
    125125  /// definition fully using the constructor above.
    126   Recluster(JetAlgorithm snew_jet_alg, double new_jet_radius, Keep keep_in = keep_only_hardest);
     126  Recluster(JetAlgorithm new_jet_alg, double new_jet_radius, Keep keep_in = keep_only_hardest);
    127127
    128128  /// constructor with just a jet algorithm, but no jet radius. If the
Note: See TracChangeset for help on using the changeset viewer.