Changeset 1d208a2 in git for external/fastjet/ClusterSequenceActiveArea.hh

Timestamp:

Aug 30, 2016, 12:36:00 AM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6be4bc0

Parents:

d091310

Message:

update FastJet library to 3.2.1 and Nsubjettiness library to 2.2.4

File:

• external/fastjet/ClusterSequenceActiveArea.hh (modified) (3 diffs)

external/fastjet/ClusterSequenceActiveArea.hh

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: ClusterSequenceActiveArea.hh 3619 2014-08-13 14:17:19Z salam $
+// $Id: ClusterSequenceActiveArea.hh 4047 2016-03-03 13:21:49Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -74 +74 @@
           const bool & writeout_combinations = false) ;
 
-  virtual double area (const PseudoJet & jet) const {
+  virtual double area (const PseudoJet & jet) const FASTJET_OVERRIDE {
                              return _average_area[jet.cluster_hist_index()];};
-  virtual double area_error (const PseudoJet & jet) const {
+  virtual double area_error (const PseudoJet & jet) const FASTJET_OVERRIDE {
                              return _average_area2[jet.cluster_hist_index()];};
 
-  virtual PseudoJet area_4vector (const PseudoJet & jet) const {
+  virtual PseudoJet area_4vector (const PseudoJet & jet) const FASTJET_OVERRIDE {
                     return _average_area_4vector[jet.cluster_hist_index()];};
 
@@ -110 +110 @@
   ///
   /// The selector passed as an argument needs to apply jet by jet.
-  virtual double empty_area(const Selector & selector) const;
+  virtual double empty_area(const Selector & selector) const FASTJET_OVERRIDE;
 
   /// return the true number of empty jets (replaces
   /// ClusterSequenceAreaBase::n_empty_jets(...))
-  virtual double n_empty_jets(const Selector & selector) const;
+  virtual double n_empty_jets(const Selector & selector) const FASTJET_OVERRIDE;
 
 protected: