Fork me on GitHub

Changeset cb80e6f in git for external/fastjet/contribs


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/contribs/RecursiveTools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/contribs/RecursiveTools/AUTHORS

    r5eda6767 rcb80e6f  
    2828   Recursive Soft Drop.
    2929   Frederic A. Dreyer, Lina Necib, Gregory Soyez, and Jesse Thaler
    30    arXiv:1804.03657
     30   JHEP 1806:093 (2018), arXiv:1804.03657
    3131   

  • external/fastjet/contribs/RecursiveTools/ChangeLog

    r5eda6767 rcb80e6f  
     12018-11-02  Jesse Thaler  <jthaler@jthaler.net>
     2
     3        * AUTHORS:  updated journal for RecursiveSoftDrop
     4
     52018-10-30  Gregory Soyez  <soyez@fastjet.fr>
     6
     7        * RecursiveSoftDrop.cc:
     8        fixed a few typos in comments
     9
     10        * RecursiveSoftDrop.hh:
     11        used the native FJ Recluster tool when available (did create
     12        conflicts in some cases)
     13
     142018-06-18  Jesse Thaler  <jthaler@jthaler.net>
     15
     16        * README
     17        Fixed incorrect order of zcut and beta in the README for SoftDrop example.
     18
    1192018-05-29  Jesse Thaler  <jthaler@jthaler.net>
    220

  • external/fastjet/contribs/RecursiveTools/NEWS

    r5eda6767 rcb80e6f  
     12020/03/03: release of version 2.0.0 with updated readme
     2
    132018/05/31: release of version 2.0.0-beta2 with corrected syntax
    24

  • external/fastjet/contribs/RecursiveTools/README

    r5eda6767 rcb80e6f  
    100100A default SoftDrop groomer can be created via:
    101101
     102   double beta  = 2.0;
    102103   double z_cut = 0.10;
    103    double beta  = 2.0;
    104104   double R0    = 1.0; // this is the default value
    105    SoftDrop sd(z_cut,beta,R0);
     105   SoftDrop sd(beta,z_cut,R0);
    106106
    107107and acts on a desired jet as
    … …  
    137137further substructure is found (i.e. corresponds to taking N=infinity).
    138138
     139   double beta  = 2.0;
    139140   double z_cut = 0.10;
    140    double beta  = 2.0;
    141141   double R0    = 1.0; // this is the default value
    142142   int N        = -1; 
    143    RecursiveSoftDrop rsd(z_cut, beta, N, R0);
     143   RecursiveSoftDrop rsd(beta, z_cut, N, R0);
    144144
    145145One then acts on a jet as
    … …  
    217217not met, only the hardest of the two objects is kept for further
    218218clustering and the softest is rejected.
     219
     220BottomUpSoftDrop takes the same arguments as SoftDrop, and a groomer
     221can be created with:
     222
     223   double beta  = 2.0;
     224   double z_cut = 0.10;
     225   double R0    = 1.0; // this is the default value
     226   BottomUpSoftDrop busd(beta,z_cut,R0);
     227
     228One then acts on a jet as
     229
     230   PseudoJet groomed_jet = busd(jet)
    219231
    220232------------------------------------------------------------------------

  • external/fastjet/contribs/RecursiveTools/RecursiveSoftDrop.cc

    r5eda6767 rcb80e6f  
    1 // $Id: RecursiveSoftDrop.cc 1111 2018-04-04 10:06:11Z gsoyez $
     1// $Id: RecursiveSoftDrop.cc 1192 2018-10-30 16:08:36Z gsoyez $
    22//
    33// Copyright (c) 2017-, Gavin P. Salam, Gregory Soyez, Jesse Thaler,
    … …  
    148148  const vector<PseudoJet> &cs_jets = cs->jets();
    149149
    150   // initialize counter to 1 subjet (i.e. the full ca_jet)
     150  // initialise counter to 1 subjet (i.e. the full ca_jet)
    151151  int n_tagged = 0;
    152152  int max_njet = ca_jet.constituents().size();
    … …  
    163163 
    164164  // create a priority queue containing the subjets and a comparison definition
    165   // initialise to the full ca_jet
    166165  priority_queue<internal_recursive_softdrop::RSDHistoryElement*, vector<internal_recursive_softdrop::RSDHistoryElement*>, internal_recursive_softdrop::OrderRSDHistoryElements> active_branches;
    167166  active_branches.push(& (history[0]));
    … …  
    169168  PseudoJet parent, piece1, piece2;
    170169  double sym, mu2;
    171 
    172   // which R0 to use
    173   //double R0sqr = _R0sqr;
    174170 
    175171  // loop over C/A tree until we reach the appropriate number of subjets
    176172  while ((continue_grooming(n_tagged)) && (active_branches.size())) {
    177     // get the element corresponding to the max dR
    178     // and the associated PJ
     173    // get the element corresponding to the max dR and the associated PJ
    179174    internal_recursive_softdrop::RSDHistoryElement * elm = active_branches.top();
    180175    PseudoJet parent = cs_jets[cs_history[elm->current_in_ca_tree].jetp_index];
    … …  
    217212      active_branches.pop();
    218213      // tagging failed and the softest branch should be dropped
    219       // keep track of what has een groomed away
     214      // keep track of what has been groomed away
    220215      max_njet -= piece2.constituents().size();
    221216      elm->dropped_delta_R .push_back((elm->theta_squared >= 0) ? sqrt(elm->theta_squared) : -sqrt(elm->theta_squared));
    … …  
    223218      elm->dropped_mu      .push_back((mu2>=0) ? sqrt(mu2) : -sqrt(mu2));
    224219     
    225       // keep the hardest bhanch in the recursion
     220      // keep the hardest branch in the recursion
    226221      elm->reset(piece1, this);
    227222      active_branches.push(elm);
    … …  
    256251    const internal_recursive_softdrop::RSDHistoryElement & elm = history[history_index];
    257252
    258     // two kinds of events: either just a final leave, poteitially with grooming
     253    // two kinds of events: either just a final leave, potentially with grooming
    259254    // or a brandhing (also with potential grooming at the end)
    260255    if (elm.child1_in_history<0){
    261       // this is a leaf, i.e. with no further sustructure
     256      // this is a leaf, i.e. with no further substructure
    262257      PseudoJet & subjet = mapped_to_history[history_index]
    263258        = cs_jets[cs_history[elm.current_in_ca_tree].jetp_index];
    … …  
    303298  const vector<PseudoJet> &cs_jets = cs->jets();
    304299
    305   // initialize counter to 1 subjet (i.e. the full ca_jet)
     300  // initialise counter to 1 subjet (i.e. the full ca_jet)
    306301  int n_depth = 0;
    307302  int max_njet = ca_jet.constituents().size();
    … …  
    319314 
    320315  // create a priority queue containing the subjets and a comparison definition
    321   // initialize counter to 1 subjet (i.e. the full ca_jet)
    322316  list<internal_recursive_softdrop::RSDHistoryElement*> active_branches;
    323317  active_branches.push_back(& (history[0]));
    … …  
    329323    list<internal_recursive_softdrop::RSDHistoryElement*>::iterator hist_it=active_branches.begin();
    330324    while (hist_it!=active_branches.end()){
    331       // get the element corresponding to the max dR
    332       // and the associated PJ
     325      // get the element corresponding to the max dR and the associated PJ
    333326      internal_recursive_softdrop::RSDHistoryElement * elm = (*hist_it);
    334327      PseudoJet parent = cs_jets[cs_history[elm->current_in_ca_tree].jetp_index];

  • external/fastjet/contribs/RecursiveTools/RecursiveSoftDrop.hh

    r5eda6767 rcb80e6f  
    1 // $Id: RecursiveSoftDrop.hh 1082 2017-10-10 12:00:13Z gsoyez $
     1// $Id: RecursiveSoftDrop.hh 1192 2018-10-30 16:08:36Z gsoyez $
    22//
    33// Copyright (c) 2014-, Gavin P. Salam, Gregory Soyez, Jesse Thaler,
    … …  
    2424#define __RECURSIVESOFTDROP_HH__
    2525
     26// we'll use the native FJ class for reculstering if available
     27#if FASTJET_VERSION_NUMBER >= 30100
     28#include "fastjet/tools/Recluster.hh"
     29#else
    2630#include "Recluster.hh"
     31#endif
    2732#include "SoftDrop.hh"
    2833#include "fastjet/WrappedStructure.hh"
Note: See TracChangeset for help on using the changeset viewer.