Fork me on GitHub

Changeset 45e58be in git


Ignore:
Timestamp:
Feb 12, 2019, 8:56:12 PM (6 years ago)
Author:
Pavel Demin <pavel-demin@…>
Branches:
ImprovedOutputFile, Timing, llp, master
Children:
341014c
Parents:
769f65b
Message:

update FastJet library to 3.3.2 and FastJet Contrib library to 1.041

Files:
13 edited

Legend:

Unmodified
Added
Removed

  • doc/update_fastjet.sh

    r769f65b r45e58be  
    1 version=3.3.1
     1version=3.3.2
    22
    33wget http://fastjet.fr/repo/fastjet-${version}.tar.gz

  • external/fastjet/VERSION

    r769f65b r45e58be  
    1 3.3.1
     13.3.2

  • external/fastjet/config_auto.h

    r769f65b r45e58be  
    169169/* Define to the full name and version of this package. */
    170170#ifndef FASTJET_PACKAGE_STRING
    171 #define FASTJET_PACKAGE_STRING  "FastJet 3.3.1"
     171#define FASTJET_PACKAGE_STRING  "FastJet 3.3.2"
    172172#endif
    173173
    … …  
    184184/* Define to the version of this package. */
    185185#ifndef FASTJET_PACKAGE_VERSION
    186 #define FASTJET_PACKAGE_VERSION  "3.3.1"
     186#define FASTJET_PACKAGE_VERSION  "3.3.2"
    187187#endif
    188188
    … …  
    194194/* Version number of package */
    195195#ifndef FASTJET_VERSION
    196 #define FASTJET_VERSION  "3.3.1"
     196#define FASTJET_VERSION  "3.3.2"
    197197#endif
    198198
    … …  
    209209/* Version of the package under the form XYYZZ (instead of X.Y.Z) */
    210210#ifndef FASTJET_VERSION_NUMBER
    211 #define FASTJET_VERSION_NUMBER  30301
     211#define FASTJET_VERSION_NUMBER  30302
    212212#endif
    213213
    214214/* Patch version of this package */
    215215#ifndef FASTJET_VERSION_PATCHLEVEL
    216 #define FASTJET_VERSION_PATCHLEVEL  1
     216#define FASTJET_VERSION_PATCHLEVEL  2
    217217#endif
    218218

  • external/fastjet/config_raw.h

    r769f65b r45e58be  
    106106
    107107/* Define to the full name and version of this package. */
    108 #define PACKAGE_STRING "FastJet 3.3.1"
     108#define PACKAGE_STRING "FastJet 3.3.2"
    109109
    110110/* Define to the one symbol short name of this package. */
    … …  
    115115
    116116/* Define to the version of this package. */
    117 #define PACKAGE_VERSION "3.3.1"
     117#define PACKAGE_VERSION "3.3.2"
    118118
    119119/* Define to 1 if you have the ANSI C header files. */
    … …  
    121121
    122122/* Version number of package */
    123 #define VERSION "3.3.1"
     123#define VERSION "3.3.2"
    124124
    125125/* Major version of this package */
    … …  
    130130
    131131/* Version of the package under the form XYYZZ (instead of X.Y.Z) */
    132 #define VERSION_NUMBER 30301
     132#define VERSION_NUMBER 30302
    133133
    134134/* Patch version of this package */
    135 #define VERSION_PATCHLEVEL 1
     135#define VERSION_PATCHLEVEL 2
    136136
    137137/* Pre-release version of this package */

  • external/fastjet/config_win.h

    r769f65b r45e58be  
    1 #define FASTJET_PACKAGE_STRING  "FastJet 3.3.1"
    2 #define FASTJET_PACKAGE_VERSION  "3.3.1"
    3 #define FASTJET_VERSION  "3.3.1"
     1#define FASTJET_PACKAGE_STRING  "FastJet 3.3.2"
     2#define FASTJET_PACKAGE_VERSION  "3.3.2"
     3#define FASTJET_VERSION  "3.3.2"
    44#define FASTJET_VERSION_MAJOR       3
    55#define FASTJET_VERSION_MINOR       3
    6 #define FASTJET_VERSION_PATCHLEVEL  1
    7 #define FASTJET_VERSION_NUMBER      30301
     6#define FASTJET_VERSION_PATCHLEVEL  2
     7#define FASTJET_VERSION_NUMBER      30302
    88
    99/* The ATLASCone plugin is disabled by default*/

  • external/fastjet/contribs/ValenciaPlugin/AUTHORS

    r769f65b r45e58be  
    1 The ValenciaJetAlgorithm FastJet contrib was written and is maintained and developed by: Ignacio Garcia Garcia, Marcel Vos, IFIC (UVEG/CSIC) Valencia, Spain
     1The ValenciaPlugin FastJet contrib was written and is maintained and developed by: Ignacio Garcia Garcia, Marcel Vos, IFIC (UVEG/CSIC) Valencia, Spain
    22
    3 Acknowledging suggestions by Gavin P. Salam (CERN) and J. Thaler (MIT)
     3The first incarnation of the Valencia algorithm (with two parameters R and beta) was proposed "A robust jet reconstruction algorithm for high-energy lepton colliders", PLB 750 (2015) 95-99, arXiv:1404.4294
     4The authors acknowledge suggestions by Gavin P. Salam (CERN) and his help in assessing the IR safety of the algorithm
    45
    5 A preprint motivating the algorithm and describing its performance is available on: "A new jet algorithm for lepton colliders", arXiv:1404.4294 (submitted to PLB)
     6The VLC algorithm (with three parameters R, beta and gamma) is described in "Jet reconstruction at high-energy electron-positron colliders", EPJC 78 (2018) no. 2, 144. The addition of the gamma parameter was suggested by J. Thaler (MIT). The performance of the algorithm is evaluated in detail in this paper, in collaboration with Ph. Roloff, R. Simoniello (CERN) and M. Boronat, J. Fuster (IFIC)
    67
    78Please contact: marcel.vos@ific.uv.es for questions, queries and comments

  • external/fastjet/contribs/ValenciaPlugin/ChangeLog

    r769f65b r45e58be  
     122-12-2018: Gavin Salam <gavin.salam@cern.ch>
     2        * VERSION:
     3        * NEWS:
     4        updated version to 2.0.2
     5
     62018-12-18: Marcel Vos <marcel.vos@ific.uv.es>a
     7        * ValenciaPlugin.cc:
     8        Incorporates a modification suggested by
     9        Filip Zarnecki (Warsaw) to make sure the behaviour for negative
     10        beta is correct (added to trunk in june 2017 but left out of
     11        2.0.1)
     12
     132018-12-04: Marcel Vos <marcel.vos@ific.uv.es>
     14        * VERSION
     15        * NEWS
     16        updated version to 2.0.1
     17
     18        * ValenciaPlugin.cc:
     19        Bug fix: a bug was discovered in the plugin by Matthias Weber (CERN)
     20        the calculation of the distance diB assumed massless constituents.
     21        The impact on the results - jet energy and mass - is typically small,
     22        but can be non-negligible
     23
    12424-02-2015  Marcel Vos <marcel.vos@ific.uv.es>
    225

  • external/fastjet/contribs/ValenciaPlugin/NEWS

    r769f65b r45e58be  
     122 December 2018: bug-fix release 2.0.2, for negative beta
     204 December 2018: bug-fix release 2.0.1, for massive constituents
    1324 February 2015: version 2.0.0
    2421 February 2015: released 2.0-devel

  • external/fastjet/contribs/ValenciaPlugin/VERSION

    r769f65b r45e58be  
    1 2.0.0
     12.0.2

  • external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.cc

    r769f65b r45e58be  
    1 // $Id: ValenciaPlugin.cc 776 2015-02-24 17:53:27Z vos $
     1// $Id: ValenciaPlugin.cc 1209 2018-12-05 16:18:01Z vos $
    22//
    33// Copyright (c) 2014, Marcel Vos and Ignacio Garcia
    … …  
    6666    // E-to-the-2*beta times sin(polar angle)-to-the-2*gamma
    6767    if (E==0. || jet.perp()==0.) diB=0.;
    68     diB = pow(E,2*beta) * pow(jet.perp()/E,2*info->gamma()); 
     68    // modified diB in release 2.0.1   
     69    diB = pow(E,2*beta) * pow(jet.perp()/sqrt(jet.perp2()+jet.pz()*jet.pz()),2*info->gamma());
    6970  }
    7071
    … …  
    7879                   - nz*jet->nz;
    7980
    80     if (jet->E < E)
     81    if (pow(jet->E,2*beta) < pow(E,2*beta))
    8182      dij *= 2 * pow(jet->E,2*beta);
    8283    else

  • external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh

    r769f65b r45e58be  
    1 // $Id: ValenciaPlugin.hh 776 2015-02-24 17:53:27Z vos $
     1// $Id: ValenciaPlugin.hh 771 2015-02-21 16:40:07Z vos $
    22//
    33// Copyright (c) 2014, Marcel Vos and Ignacio Garcia

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

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

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

    r769f65b r45e58be  
    4848
    4949/* Define to the full name and version of this package. */
    50 #define PACKAGE_STRING "SISCone 3.0.3"
     50#define PACKAGE_STRING "SISCone 3.0.4"
    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.3"
     59#define PACKAGE_VERSION "3.0.4"
    6060
    6161/* Define to 1 if you have the ANSI C header files. */
    … …  
    6666
    6767/* Version number of package */
    68 #define VERSION "3.0.3"
     68#define VERSION "3.0.4"
Note: See TracChangeset for help on using the changeset viewer.