Fork me on GitHub

Changeset d69dfe4 in git for external/fastjet/PseudoJet.hh


Ignore:
Timestamp:
Nov 20, 2013, 9:52:59 PM (11 years ago)
Author:
pavel <pavel@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
fc39685
Parents:
88a9b72
Message:

upgrade fastjet to 3.0.6

File:
1 edited

Legend:

Unmodified
Added
Removed
  • external/fastjet/PseudoJet.hh

    r88a9b72 rd69dfe4  
    11//STARTHEADER
    2 // $Id: PseudoJet.hh 2728 2011-11-20 14:18:59Z salam $
     2// $Id: PseudoJet.hh 3111 2013-05-04 08:17:27Z salam $
    33//
    44// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     
    5252/// default value for phi, meaning it (and rapidity) have yet to be calculated)
    5353const double pseudojet_invalid_phi = -100.0;
    54 
     54const double pseudojet_invalid_rap = -1e200;
     55
     56#ifndef __FJCORE__
    5557// forward definition
    5658class ClusterSequenceAreaBase;
     59#endif  // __FJCORE__
    5760
    5861/// @ingroup basic_classes
     
    7376  // internal shared pointer: see PJtiming.cc and the notes therein)
    7477  PseudoJet() : _px(0), _py(0), _pz(0), _E(0) {_finish_init(); _reset_indices();}
     78  //PseudoJet() : _px(0), _py(0), _pz(0), _E(0), _phi(pseudojet_invalid_phi), _rap(pseudojet_invalid_rap), _kt2(0) {_reset_indices();}
    7579  /// construct a pseudojet from explicit components
    7680  PseudoJet(const double px, const double py, const double pz, const double E);
     
    251255    // dynamic_cast, NULL is returned if L is not derived from
    252256    // PseudoJet
    253     const PseudoJet * pj = cast_if_derived<const PseudoJet>(&some_four_vector);
     257    //
     258    // Note the explicit request for fastjet::cast_if_derived; when
     259    // combining fastjet and fjcore, this avoids ambiguity in which of
     260    // the two cast_if_derived calls to use.
     261    const PseudoJet * pj = fastjet::cast_if_derived<const PseudoJet>(&some_four_vector);
    254262
    255263    if (pj){
     
    504512  const ClusterSequence * validated_cs() const;
    505513
     514#ifndef __FJCORE__
    506515  /// if the jet has valid area information then return a pointer to
    507516  /// the associated ClusterSequenceAreaBase object; otherwise throw an error
     
    512521  /// shorthand for validated_cluster_sequence_area_base()
    513522  const ClusterSequenceAreaBase * validated_csab() const;
     523#endif  //  __FJCORE__
     524
    514525  //\}
    515526
     
    718729  // parent ClusterSequence (See ClusterSequenceAreaBase for details)
    719730  //------------------------------------------------------------------
     731#ifndef __FJCORE__
    720732
    721733  /// check if it has a defined area
     
    739751  virtual bool is_pure_ghost() const;
    740752
     753#endif  // __FJCORE__
    741754  //\} --- end of jet structure -------------------------------------
    742755
Note: See TracChangeset for help on using the changeset viewer.