Fork me on GitHub

Ignore:
Timestamp:
Jun 6, 2018, 10:05:10 PM (7 years ago)
Author:
Pavel Demin <pavel-demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
17d0ab8
Parents:
95e6b7a
Message:

update FastJet library to 3.3.1 and FastJet Contrib library to 1.036

Location:
external/fastjet/contribs/Nsubjettiness
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/contribs/Nsubjettiness/AUTHORS

    r95e6b7a rb7b836a  
    3939   Iain W. Stewart, Frank J. Tackmann, Jesse Thaler,
    4040   Christopher K. Vermilion, and Thomas F. Wilkason.
    41    arXiv:1508.01516.
     41   JHEP 1511:072 (2015), arXiv:1508.01516.
    4242
    4343   Resolving Boosted Jets with XCone.
    4444   Jesse Thaler and Thomas F. Wilkason.
    45    arXiv:1508.01518.
     45   JHEP 1512:051 (2015), arXiv:1508.01518.
    4646
    4747-------------------------------------------------------------------------------

  • external/fastjet/contribs/Nsubjettiness/AxesDefinition.hh

    r95e6b7a rb7b836a  
    55//  Jesse Thaler, Ken Van Tilburg, Christopher K. Vermilion, and TJ Wilkason
    66//
    7 //  $Id: AxesDefinition.hh 833 2015-07-23 14:35:23Z jthaler $
     7//  $Id: AxesDefinition.hh 1130 2018-06-06 12:09:46Z jthaler $
    88//----------------------------------------------------------------------
    99// This file is part of FastJet contrib.
    … …  
    508508/// \brief Wrapper for jet definitions (for memory management)
    509509///
    510 /// This class was introduced to avoid issue of a FastJet bug when using genKT clustering
    511 /// Now using this for all AxesDefinition with a manual recombiner to use the delete_recombiner_when_unused function
     510/// This class is used by all AxesDefinition with a manual recombiner to
     511/// ensure that the delete_recombiner_when_unused function is always called
    512512///------------------------------------------------------------------------
    513513class JetDefinitionWrapper {
    … …  
    549549   : ExclusiveJetAxes(JetDefinitionWrapper(fastjet::kt_algorithm,
    550550                                          fastjet::JetDefinition::max_allowable_R, //maximum jet radius constant
    551                                           _recomb = new WinnerTakeAllRecombiner(), // Needs to be explicitly declared (this will be deleted by JetDefinitionWrapper)
     551                                          new WinnerTakeAllRecombiner(), // Needs to be explicitly declared (this will be deleted by JetDefinitionWrapper)
    552552                                          fastjet::Best).getJetDef()
    553553                      ) {
    … …  
    571571   virtual WTA_KT_Axes* create() const {return new WTA_KT_Axes(*this);}
    572572
    573 private:
    574    const WinnerTakeAllRecombiner *_recomb;  ///< Internal recombiner
    575 
    576573};
    577574   
    … …  
    588585   : ExclusiveJetAxes(JetDefinitionWrapper(fastjet::cambridge_algorithm,
    589586                                             fastjet::JetDefinition::max_allowable_R, //maximum jet radius constant
    590                                              _recomb = new WinnerTakeAllRecombiner(), // Needs to be explicitly declared (this will be deleted by JetDefinitionWrapper)
     587                                             new WinnerTakeAllRecombiner(), // Needs to be explicitly declared (this will be deleted by JetDefinitionWrapper)
    591588                                             fastjet::Best).getJetDef()) {
    592589    setNPass(NO_REFINING);
    … …  
    608605   /// For copying purposes
    609606   virtual WTA_CA_Axes* create() const {return new WTA_CA_Axes(*this);}
    610    
    611 private:
    612    const WinnerTakeAllRecombiner *_recomb;  ///< Internal recombiner
    613 
     607 
    614608};
    615609
    … …  
    674668                                            R0,
    675669                                            p,
    676                                             _recomb = new WinnerTakeAllRecombiner()
     670                                            new WinnerTakeAllRecombiner()
    677671                                            ).getJetDef()), _p(p), _R0(R0) {
    678672      if (p < 0) throw Error("WTA_GenKT_Axes:  Currently only p >=0 is supported.");
    … …  
    702696   double _p;   ///< genkT power
    703697   double _R0;  ///< jet radius
    704    const WinnerTakeAllRecombiner *_recomb; ///< Internal recombiner
    705698};
    706699   
    … …  
    717710   /// Constructor
    718711   GenET_GenKT_Axes(double delta, double p, double R0 = fastjet::JetDefinition::max_allowable_R)
    719    : ExclusiveJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, _recomb = new GeneralEtSchemeRecombiner(delta))).getJetDef() ),
     712   : ExclusiveJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, new GeneralEtSchemeRecombiner(delta))).getJetDef() ),
    720713    _delta(delta), _p(p), _R0(R0) {
    721714       if (p < 0) throw Error("GenET_GenKT_Axes:  Currently only p >=0 is supported.");
    … …  
    750743   double _p;     ///< GenkT power
    751744   double _R0;    ///< jet radius
    752    const GeneralEtSchemeRecombiner *_recomb;   ///< Internal recombiner
    753745};
    754746
    … …  
    12011193   /// Constructor
    12021194   Comb_WTA_GenKT_Axes(int nExtra, double p, double R0 = fastjet::JetDefinition::max_allowable_R)
    1203    : ExclusiveCombinatorialJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, _recomb = new WinnerTakeAllRecombiner())).getJetDef(), nExtra),
     1195   : ExclusiveCombinatorialJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, new WinnerTakeAllRecombiner())).getJetDef(), nExtra),
    12041196    _p(p), _R0(R0) {
    12051197       if (p < 0) throw Error("Comb_WTA_GenKT_Axes:  Currently only p >=0 is supported.");
    … …  
    12271219   double _p;        ///< GenkT power
    12281220   double _R0;       ///< jet radius
    1229    const WinnerTakeAllRecombiner *_recomb;   ///< Internal recombiner
    12301221};
    12311222   
    … …  
    12411232   /// Constructor
    12421233   Comb_GenET_GenKT_Axes(int nExtra, double delta, double p, double R0 = fastjet::JetDefinition::max_allowable_R)
    1243    : ExclusiveCombinatorialJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, _recomb = new GeneralEtSchemeRecombiner(delta))).getJetDef(), nExtra),
     1234   : ExclusiveCombinatorialJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, new GeneralEtSchemeRecombiner(delta))).getJetDef(), nExtra),
    12441235    _delta(delta), _p(p), _R0(R0) {
    12451236       if (p < 0) throw Error("Comb_GenET_GenKT_Axes:  Currently only p >=0 is supported.");
    … …  
    12711262   double _p;        ///< GenkT power
    12721263   double _R0;       ///< jet radius
    1273    const GeneralEtSchemeRecombiner *_recomb;  ///<  Internal recombiner
    12741264};
    12751265   

  • external/fastjet/contribs/Nsubjettiness/ChangeLog

    r95e6b7a rb7b836a  
     12018-07-06 <jthaler>
     2   Updated comments in AxesDefinition.hh about role of JetDefinitionWrapper
     3   Updated AUTHORS with JHEP publication information for XCone
     4   Prepared VERSION and NEWS for 2.2.5 release
     52018-07-05 <jthaler>
     6   Fixed bug in AxesDefinition.hh where _recomb was used before it was declared.
    172016-06-08 <jthaler>
    28   Fixed bug in MeasureDefinition.cc where axes were not completely defined,

  • external/fastjet/contribs/Nsubjettiness/MeasureDefinition.cc

    r95e6b7a rb7b836a  
    55//  Jesse Thaler, Ken Van Tilburg, Christopher K. Vermilion, and TJ Wilkason
    66//
    7 //  $Id: MeasureDefinition.cc 946 2016-06-14 19:11:27Z jthaler $
     7//  $Id: MeasureDefinition.cc 943 2016-06-09 00:55:29Z jthaler $
    88//----------------------------------------------------------------------
    99// This file is part of FastJet contrib.

  • external/fastjet/contribs/Nsubjettiness/NEWS

    r95e6b7a rb7b836a  
    3232    N-jettiness as a jet finder using the new ConicalGeometric measure.
    3333
     34-- 2.2.5:  (June 6, 2018) Fixed bug involved undefined pointer for in
     35           AxesDefinition (thanks Attila Krasznahorkay)
    3436-- 2.2.4:  (Jun 14, 2016) Fixed bug where multi-pass minimization could yield
    3537           pathological axes (thanks Gregory Soyez)

  • external/fastjet/contribs/Nsubjettiness/VERSION

    r95e6b7a rb7b836a  
    1 2.2.4
     12.2.5
Note: See TracChangeset for help on using the changeset viewer.