Fork me on GitHub

Changeset cb80e6f in git for external/fastjet/plugins


Ignore:
Timestamp:
Mar 25, 2021, 9:55:59 AM (4 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
master
Children:
13331dc
Parents:
5eda6767
Message:

update FastJet library to 3.3.4 and FastJet Contrib library to 1.045

Location:
external/fastjet/plugins
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/plugins/ATLASCone/ATLASConePlugin.cc

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: ATLASConePlugin.cc 4354 2018-04-22 07:12:37Z salam $
     2// $Id: ATLASConePlugin.cc 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/ATLASCone/fastjet/ATLASConePlugin.hh

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: ATLASConePlugin.hh 4354 2018-04-22 07:12:37Z salam $
     2// $Id: ATLASConePlugin.hh 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/CDFCones/CDFJetCluPlugin.cc

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: CDFJetCluPlugin.cc 4354 2018-04-22 07:12:37Z salam $
     2// $Id: CDFJetCluPlugin.cc 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/CDFCones/CDFMidPointPlugin.cc

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: CDFMidPointPlugin.cc 4354 2018-04-22 07:12:37Z salam $
     2// $Id: CDFMidPointPlugin.cc 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: CDFJetCluPlugin.hh 4354 2018-04-22 07:12:37Z salam $
     2// $Id: CDFJetCluPlugin.hh 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: CDFMidPointPlugin.hh 4354 2018-04-22 07:12:37Z salam $
     2// $Id: CDFMidPointPlugin.hh 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.cc

    r5eda6767 rcb80e6f  
    22// $Id: CMSIterativeConePlugin.cc 1504 2009-04-10 13:39:48Z salam $
    33//
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh

    r5eda6767 rcb80e6f  
    22// $Id: CMSIterativeConePlugin.hh 1508 2009-04-10 22:46:49Z soyez $
    33//
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.cc

    r5eda6767 rcb80e6f  
    22// $Id: D0RunIBaseConePlugin.cc 1779 2010-10-25 10:32:59Z soyez $
    33//
    4 // Copyright (c) 2009-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2009-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

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

    r5eda6767 rcb80e6f  
    55// $Id: D0RunIBaseConePlugin.hh 1778 2010-10-25 10:02:58Z soyez $
    66//
    7 // Copyright (c) 2009-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2009-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

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

    r5eda6767 rcb80e6f  
    55// $Id: D0RunIConePlugin.hh 1778 2010-10-25 10:02:58Z soyez $
    66//
    7 // Copyright (c) 2009-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2009-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

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

    r5eda6767 rcb80e6f  
    55// $Id: D0RunIpre96ConePlugin.hh 1778 2010-10-25 10:02:58Z soyez $
    66//
    7 // Copyright (c) 2009-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2009-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.cc

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: D0RunIIConePlugin.cc 4354 2018-04-22 07:12:37Z salam $
     2// $Id: D0RunIIConePlugin.cc 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh

    r5eda6767 rcb80e6f  
    33
    44//FJSTARTHEADER
    5 // $Id: D0RunIIConePlugin.hh 4354 2018-04-22 07:12:37Z salam $
     5// $Id: D0RunIIConePlugin.hh 4442 2020-05-05 07:50:11Z soyez $
    66//
    7 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/plugins/EECambridge/EECambridgePlugin.cc

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: EECambridgePlugin.cc 4354 2018-04-22 07:12:37Z salam $
     2// $Id: EECambridgePlugin.cc 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/EECambridge/fastjet/EECambridgePlugin.hh

    r5eda6767 rcb80e6f  
    33
    44//FJSTARTHEADER
    5 // $Id: EECambridgePlugin.hh 4354 2018-04-22 07:12:37Z salam $
     5// $Id: EECambridgePlugin.hh 4442 2020-05-05 07:50:11Z soyez $
    66//
    7 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/plugins/GridJet/GridJetPlugin.cc

    r5eda6767 rcb80e6f  
    22// $Id: GridJetPlugin.cc 2268 2011-06-20 15:12:26Z salam $
    33//
    4 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/GridJet/fastjet/GridJetPlugin.hh

    r5eda6767 rcb80e6f  
    55// $Id: GridJetPlugin.hh 2267 2011-06-20 15:10:23Z salam $
    66//
    7 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/plugins/Jade/JadePlugin.cc

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: JadePlugin.cc 4354 2018-04-22 07:12:37Z salam $
    3 //
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     2// $Id: JadePlugin.cc 4442 2020-05-05 07:50:11Z soyez $
     3//
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------
    … …  
    108108    // get a number that is almost the same as max(), just a little
    109109    // smaller so as to ensure that when we divide it by rt2E and then
    110     // multiply it again, we won't get an overflow
     110    // multiply it again, we won't get an overflow.
     111    // Watch out for cases where rt2E < 1.0 (cf. bug fix from
     112    // andrii.verbytskyi@mpp.mpg.de on 2019-02-14)
    111113    const double almost_max = numeric_limits<double>::max() * (1 - 1e-13);
    112     return almost_max / rt2E;
     114    if (rt2E>1.0) return almost_max / rt2E;
     115    else          return almost_max;
    113116  }
    114117 

  • external/fastjet/plugins/Jade/fastjet/JadePlugin.hh

    r5eda6767 rcb80e6f  
    33
    44//FJSTARTHEADER
    5 // $Id: JadePlugin.hh 4354 2018-04-22 07:12:37Z salam $
     5// $Id: JadePlugin.hh 4442 2020-05-05 07:50:11Z soyez $
    66//
    7 // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     7// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    88//
    99//----------------------------------------------------------------------

  • external/fastjet/plugins/NestedDefs/NestedDefsPlugin.cc

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: NestedDefsPlugin.cc 4354 2018-04-22 07:12:37Z salam $
     2// $Id: NestedDefsPlugin.cc 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/NestedDefs/fastjet/NestedDefsPlugin.hh

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: NestedDefsPlugin.hh 4354 2018-04-22 07:12:37Z salam $
     2// $Id: NestedDefsPlugin.hh 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/SISCone/AUTHORS

    r5eda6767 rcb80e6f  
    66             France
    77
    8          (2) PH-TH, CERN, CH-1211 Geneva 23, Switzerland;
     8         (2) Rudolf Peierls Centre for Theoretical Physics, Parks Road, Oxford OX1 3PU, UK;
     9             PH-TH, CERN, CH-1211 Geneva 23, Switzerland;
    910             LPTHE, UPMC (Univ. Paris 6), 75252 Paris cedex 05, France.
    1011
    11 phone  : +33 69 08 40 11
    12          +41 22 767 2462
    13 
    1412email  : soyez@fastjet.fr
    15          gavin.salam@cern.ch
     13         gavin.salam@physics.ox.ac.uk

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

    r5eda6767 rcb80e6f  
    8383/* Define to the full name and version of this package. */
    8484#ifndef SISCONE_PACKAGE_STRING
    85 #define SISCONE_PACKAGE_STRING  "SISCone 3.0.4"
     85#define SISCONE_PACKAGE_STRING  "SISCone 3.0.5"
    8686#endif
    8787
    … …  
    9898/* Define to the version of this package. */
    9999#ifndef SISCONE_PACKAGE_VERSION
    100 #define SISCONE_PACKAGE_VERSION  "3.0.4"
     100#define SISCONE_PACKAGE_VERSION  "3.0.5"
    101101#endif
    102102
    … …  
    111111/* Version number of package */
    112112#ifndef SISCONE_VERSION
    113 #define SISCONE_VERSION  "3.0.4"
     113#define SISCONE_VERSION  "3.0.5"
    114114#endif
    115115 

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

    r5eda6767 rcb80e6f  
    4848
    4949/* Define to the full name and version of this package. */
    50 #define PACKAGE_STRING "SISCone 3.0.4"
     50#define PACKAGE_STRING "SISCone 3.0.5"
    5151
    5252/* Define to the one symbol short name of this package. */
    … …  
    5757
    5858/* Define to the version of this package. */
    59 #define PACKAGE_VERSION "3.0.4"
     59#define PACKAGE_VERSION "3.0.5"
    6060
    6161/* Define to 1 if you have the ANSI C header files. */
    … …  
    6666
    6767/* Version number of package */
    68 #define VERSION "3.0.4"
     68#define VERSION "3.0.5"

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

    r5eda6767 rcb80e6f  
    2222// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //
    2323//                                                                           //
    24 // $Revision:: 268                                                          $//
    25 // $Date:: 2009-03-12 21:24:16 +0100 (Thu, 12 Mar 2009)                     $//
     24// $Revision:: 422                                                          $//
     25// $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)                     $//
    2626///////////////////////////////////////////////////////////////////////////////
    2727
    … …  
    153153  /// return the cell index corrsponding to an eta value
    154154  inline unsigned int get_eta_cell(double eta){
    155     return (unsigned int) (1 << ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));
     155    return (unsigned int) (1u << ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));
    156156  }
    157157
    158158  /// return the cell index corrsponding to a phi value
    159159  inline unsigned int get_phi_cell(double phi){
    160     return (unsigned int) (1 << ((int) (32*phi/twopi+16)%32));
     160    return (unsigned int) (1u << ((int) (32*phi/twopi+16)%32));
    161161  }
    162162};

  • external/fastjet/plugins/TrackJet/TrackJetPlugin.cc

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: TrackJetPlugin.cc 4354 2018-04-22 07:12:37Z salam $
    3 //
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     2// $Id: TrackJetPlugin.cc 4442 2020-05-05 07:50:11Z soyez $
     3//
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/TrackJet/fastjet/TrackJetPlugin.hh

    r5eda6767 rcb80e6f  
    11//FJSTARTHEADER
    2 // $Id: TrackJetPlugin.hh 4354 2018-04-22 07:12:37Z salam $
     2// $Id: TrackJetPlugin.hh 4442 2020-05-05 07:50:11Z soyez $
    33//
    4 // Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.