Changeset 1d208a2 in git for external/fastjet/CircularRange.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/CircularRange.hh (modified) (8 diffs)

external/fastjet/CircularRange.hh

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: CircularRange.hh 3433 2014-07-23 08:17:03Z salam $
+// $Id: CircularRange.hh 4074 2016-03-08 09:09:25Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -35 +35 @@
 #include "fastjet/RangeDefinition.hh"
 #include "fastjet/Error.hh"
+#include "fastjet/internal/deprecated.hh"
 
 // for backwards compatibility: one should now use SelectorCircle,
@@ -50 +51 @@
 public:
   /// constructor
+  FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead")
   CircularRange() {_set_invalid_rapphi();}
   
   /// initialise CircularRange with a jet
+  FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead")
   CircularRange(const fastjet::PseudoJet & jet, double distance) {
                 _distance = distance;
@@ -60 +63 @@
 
   /// initialise CircularRange with a (rap,phi) point
+  FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead")
   CircularRange(double rap, double phi, double distance) {
                 _distance = distance;
@@ -67 +71 @@
 
   /// initialise CircularRange with just the radius parameter
+  FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead")
   CircularRange(double distance) {
                 _set_invalid_rapphi();
@@ -76 +81 @@
   
   /// return description of range
-  virtual inline std::string description() const {
+  virtual inline std::string description() const FASTJET_OVERRIDE {
     std::ostringstream ostr;
     ostr << "CircularRange: within distance "<< _distance << " of given jet or point." ;
@@ -83 +88 @@
   /// returns true since this range is localizable (i.e. set_position
   /// does something meaningful)
-  virtual inline bool is_localizable() const { return true; }
+  virtual inline bool is_localizable() const FASTJET_OVERRIDE { return true; }
   
   /// return bool according to whether (rap,phi) is in range
-  virtual inline bool is_in_range(double rap, double phi) const {
+  virtual inline bool is_in_range(double rap, double phi) const FASTJET_OVERRIDE {
      if (! _rapphi_are_valid()) {
        throw Error("Circular range used without a center having being defined (use set_position())");
@@ -98 +103 @@
 
   /// return the minimal and maximal rapidity of this range
-  virtual inline void get_rap_limits(double & rapmin, double & rapmax) const {
+  virtual inline void get_rap_limits(double & rapmin, double & rapmax) const FASTJET_OVERRIDE {
      rapmin = _rapjet - _distance;
      rapmax = _rapjet + _distance; }