Changeset b9ae4c3 in git for external/fastjet/ClusterSequenceActiveArea.hh

Timestamp:

Sep 2, 2016, 3:46:14 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fa068d3

Parents:

ec5e04b (diff), 23389ff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Pavel Demin <pavel-demin@…> (09/02/16 15:46:14)

git-committer:

GitHub <noreply@…> (09/02/16 15:46:14)

Message:

Merge pull request #32 from delphes/dev_01

Dev 01

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: