Fork me on GitHub

Ignore:
Timestamp:
Jun 6, 2018, 10:05:10 PM (6 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • external/fastjet/contribs/RecursiveTools/SoftDrop.hh

    r95e6b7a rb7b836a  
    1 // $Id: SoftDrop.hh 686 2014-06-14 03:25:09Z jthaler $
     1// $Id: SoftDrop.hh 1034 2017-08-01 10:03:53Z gsoyez $
    22//
    33// Copyright (c) 2014-, Gregory Soyez, Jesse Thaler
     
    112112     RecursiveSymmetryCutBase(symmetry_measure, mu_cut, recursion_choice, subtractor),
    113113     _beta(beta), _symmetry_cut(symmetry_cut), _R0sqr(R0*R0)
    114   {}
     114  {
     115    // change the default: use grooming mode
     116    set_grooming_mode();
     117  }
    115118
    116119  /// default destructor
    117120  virtual ~SoftDrop(){}
    118121
     122  //----------------------------------------------------------------------
     123  // access to class info
     124  double beta()         const { return _beta; }
     125  double symmetry_cut() const { return _symmetry_cut; }
     126  double R0()           const { return sqrt(_R0sqr); }
     127 
    119128protected:
    120129
    121130  // Unlike MMDT, the SoftDrop symmetry_cut_fn depends on the subjet kinematics
    122131  // since the symmetry condition depends on the DeltaR between subjets.
    123   virtual double symmetry_cut_fn(const PseudoJet & /* p1 */,
    124                                  const PseudoJet & /* p2 */) const;
     132  virtual double symmetry_cut_fn(const PseudoJet & p1,
     133                                 const PseudoJet & p2,
     134                                 void * optional_R0sqr_ptr = 0) const;
    125135  virtual std::string symmetry_cut_description() const;
    126136
    127 private:
     137  //private:
    128138  double _beta;         ///< the power of the angular distance to be used
    129139                        ///< in the symmetry condition
Note: See TracChangeset for help on using the changeset viewer.