Fork me on GitHub

Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/WrappedStructure.hh

    r1d208a2 r35cdc46  
    11//FJSTARTHEADER
    2 // $Id: WrappedStructure.hh 4047 2016-03-03 13:21:49Z soyez $
     2// $Id: WrappedStructure.hh 3433 2014-07-23 08:17:03Z salam $
    33//
    44// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    5757  WrappedStructure(const SharedPtr<PseudoJetStructureBase> & to_be_shared)
    5858    : _structure(to_be_shared){
    59     if (!_structure)
     59    if (!_structure())
    6060      throw Error("Trying to construct a wrapped structure around an empty (NULL) structure");
    6161  }
    … …  
    6565
    6666  /// description
    67   virtual std::string description() const FASTJET_OVERRIDE{
     67  virtual std::string description() const{
    6868    return "PseudoJet wrapping the structure ("+_structure->description()+")";
    6969  }
    … …  
    7676  //-------------------------------------------------------------
    7777  /// returns true if there is an associated ClusterSequence
    78   virtual bool has_associated_cluster_sequence() const FASTJET_OVERRIDE {
     78  virtual bool has_associated_cluster_sequence() const {
    7979    return _structure->has_associated_cluster_sequence();
    8080  }
    … …  
    8282  /// get a (const) pointer to the parent ClusterSequence (NULL if
    8383  /// inexistent)
    84   virtual const ClusterSequence* associated_cluster_sequence() const FASTJET_OVERRIDE{
     84  virtual const ClusterSequence* associated_cluster_sequence() const{
    8585    return _structure->associated_cluster_sequence();
    8686  }
    … …  
    8888  /// returns true if this PseudoJet has an associated and still
    8989  /// valid ClusterSequence.
    90   virtual bool has_valid_cluster_sequence() const FASTJET_OVERRIDE {
     90  virtual bool has_valid_cluster_sequence() const {
    9191    return _structure->has_valid_cluster_sequence();
    9292  }
    … …  
    9494  /// if the jet has a valid associated cluster sequence then return a
    9595  /// pointer to it; otherwise throw an error
    96   virtual const ClusterSequence * validated_cs() const FASTJET_OVERRIDE{
     96  virtual const ClusterSequence * validated_cs() const{
    9797    return _structure->validated_cs();
    9898  }
    … …  
    100100  /// if the jet has valid area information then return a pointer to
    101101  /// the associated ClusterSequenceAreaBase object; otherwise throw an error
    102   virtual const ClusterSequenceAreaBase * validated_csab() const FASTJET_OVERRIDE{
     102  virtual const ClusterSequenceAreaBase * validated_csab() const{
    103103    return _structure->validated_csab();
    104104  }
    … …  
    120120  ///
    121121  /// By default, throws an Error
    122   virtual bool has_partner(const PseudoJet &reference, PseudoJet &partner) const FASTJET_OVERRIDE{
     122  virtual bool has_partner(const PseudoJet &reference, PseudoJet &partner) const{
    123123    return _structure->has_partner(reference, partner);
    124124  }
    … …  
    129129  ///
    130130  /// By default, throws an Error
    131   virtual bool has_child(const PseudoJet &reference, PseudoJet &child) const FASTJET_OVERRIDE{
     131  virtual bool has_child(const PseudoJet &reference, PseudoJet &child) const{
    132132    return _structure->has_child(reference, child);
    133133  }
    … …  
    138138  ///
    139139  /// By default, throws an Error
    140   virtual bool has_parents(const PseudoJet &reference,
    141                            PseudoJet &parent1, PseudoJet &parent2) const FASTJET_OVERRIDE{
     140  virtual bool has_parents(const PseudoJet &reference, PseudoJet &parent1, PseudoJet &parent2) const{
    142141    return _structure->has_parents(reference, parent1, parent2);
    143142  }
    … …  
    147146  ///
    148147  /// By default, throws an Error
    149   virtual bool object_in_jet(const PseudoJet &reference,
    150                              const PseudoJet &jet) const FASTJET_OVERRIDE{
     148  virtual bool object_in_jet(const PseudoJet &reference, const PseudoJet &jet) const{
    151149    return _structure->object_in_jet(reference, jet);
    152150  }
    … …  
    156154  ///
    157155  /// false by default
    158   virtual bool has_constituents() const  FASTJET_OVERRIDE{
     156  virtual bool has_constituents() const {
    159157    return _structure->has_constituents();
    160158  }
    … …  
    163161  ///
    164162  /// By default, throws an Error
    165   virtual std::vector<PseudoJet> constituents(const PseudoJet &reference) const FASTJET_OVERRIDE{
     163  virtual std::vector<PseudoJet> constituents(const PseudoJet &reference) const{
    166164    return _structure->constituents(reference);
    167165  }
    168166
    169167  /// return true if the structure supports exclusive_subjets.
    170   virtual bool has_exclusive_subjets() const  FASTJET_OVERRIDE{
     168  virtual bool has_exclusive_subjets() const {
    171169    return _structure->has_exclusive_subjets();
    172170  }
    … …  
    182180  ///
    183181  /// By default, throws an Error
    184   virtual std::vector<PseudoJet> exclusive_subjets(const PseudoJet &reference,
    185                                                    const double & dcut) const FASTJET_OVERRIDE{
     182  virtual std::vector<PseudoJet> exclusive_subjets(const PseudoJet &reference, const double & dcut) const{
    186183    return _structure->exclusive_subjets(reference, dcut);
    187184  }
    … …  
    192189  ///
    193190  /// By default, throws an Error
    194   virtual int n_exclusive_subjets(const PseudoJet &reference,
    195                                   const double & dcut) const FASTJET_OVERRIDE{
     191  virtual int n_exclusive_subjets(const PseudoJet &reference, const double & dcut) const{
    196192    return _structure->n_exclusive_subjets(reference, dcut);
    197193  }
    … …  
    202198  ///
    203199  /// By default, throws an Error
    204   virtual std::vector<PseudoJet> exclusive_subjets_up_to (const PseudoJet &reference,
    205                                                           int nsub) const FASTJET_OVERRIDE{
     200  virtual std::vector<PseudoJet> exclusive_subjets_up_to (const PseudoJet &reference, int nsub) const{
    206201    return _structure->exclusive_subjets_up_to (reference, nsub);
    207202  }
    … …  
    211206  ///
    212207  /// By default, throws an Error
    213   virtual double exclusive_subdmerge(const PseudoJet &reference, int nsub) const FASTJET_OVERRIDE{
     208  virtual double exclusive_subdmerge(const PseudoJet &reference, int nsub) const{
    214209    return _structure->exclusive_subdmerge(reference, nsub);
    215210  }
    … …  
    220215  ///
    221216  /// By default, throws an Error
    222   virtual double exclusive_subdmerge_max(const PseudoJet &reference, int nsub) const FASTJET_OVERRIDE{
     217  virtual double exclusive_subdmerge_max(const PseudoJet &reference, int nsub) const{
    223218    return _structure->exclusive_subdmerge_max(reference, nsub);
    224219  }
    … …  
    231226  ///
    232227  /// false by default
    233   virtual bool has_pieces(const PseudoJet &reference) const FASTJET_OVERRIDE {
     228  virtual bool has_pieces(const PseudoJet &reference) const {
    234229    return _structure->has_pieces(reference);
    235230  }
    … …  
    238233  ///
    239234  /// By default, throws an Error
    240   virtual std::vector<PseudoJet> pieces(const PseudoJet &reference) const FASTJET_OVERRIDE {
     235  virtual std::vector<PseudoJet> pieces(const PseudoJet &reference) const{
    241236    return _structure->pieces(reference);
    242237  }
    … …  
    249244  ///
    250245  /// false by default
    251   virtual bool has_area() const FASTJET_OVERRIDE  {
     246  virtual bool has_area() const {
    252247    return _structure->has_area();
    253248  }
    … …  
    256251  ///
    257252  /// By default, throws an Error
    258   virtual double area(const PseudoJet &reference) const FASTJET_OVERRIDE{
     253  virtual double area(const PseudoJet &reference) const{
    259254    return _structure->area(reference);
    260255  }
    … …  
    264259  ///
    265260  /// By default, throws an Error
    266   virtual double area_error(const PseudoJet &reference) const FASTJET_OVERRIDE{
     261  virtual double area_error(const PseudoJet &reference) const{
    267262    return _structure->area_error(reference);
    268263  }
    … …  
    271266  ///
    272267  /// By default, throws an Error
    273   virtual PseudoJet area_4vector(const PseudoJet &reference) const FASTJET_OVERRIDE{
     268  virtual PseudoJet area_4vector(const PseudoJet &reference) const{
    274269    return _structure->area_4vector(reference);
    275270  }
    … …  
    278273  ///
    279274  /// By default, throws an Error
    280   virtual bool is_pure_ghost(const PseudoJet &reference) const FASTJET_OVERRIDE{
     275  virtual bool is_pure_ghost(const PseudoJet &reference) const{
    281276    return _structure->is_pure_ghost(reference);
    282277  }
Note: See TracChangeset for help on using the changeset viewer.