Changeset b9ae4c3 in git for external/fastjet/ClusterSequenceVoronoiArea.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/ClusterSequenceVoronoiArea.hh (modified) (3 diffs)

external/fastjet/ClusterSequenceVoronoiArea.hh

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: ClusterSequenceVoronoiArea.hh 3433 2014-07-23 08:17:03Z salam $
+// $Id: ClusterSequenceVoronoiArea.hh 4047 2016-03-03 13:21:49Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -65 +65 @@
 
   /// return the area associated with the given jet
-  virtual inline double area(const PseudoJet & jet) const {
+  virtual inline double area(const PseudoJet & jet) const FASTJET_OVERRIDE {
     return _voronoi_area[jet.cluster_hist_index()];}
 
@@ -72 +72 @@
   /// made of sums of centres of all Voronoi cells in jet, each
   /// contributing with a normalisation equal to the area of the cell
-  virtual inline PseudoJet area_4vector(const PseudoJet & jet) const {
+  virtual inline PseudoJet area_4vector(const PseudoJet & jet) const FASTJET_OVERRIDE {
     return _voronoi_area_4vector[jet.cluster_hist_index()];}
 
   /// return the error of the area associated with the given jet
   /// (0 by definition for a voronoi area)
-  virtual inline double area_error(const PseudoJet & /*jet*/) const {
+  virtual inline double area_error(const PseudoJet & /*jet*/) const FASTJET_OVERRIDE {
     return 0.0;}