Fork me on GitHub

Changeset d69dfe4 in git for external


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

Location:
external/fastjet
Files:
35 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/ClosestPair2D.cc

    r88a9b72 rd69dfe4  
    183183  ID2 = _ID(_points[ID1].neighbour);
    184184  distance2 = _points[ID1].neighbour_dist2;
    185   if (ID1 > ID2) swap(ID1,ID2);
     185  if (ID1 > ID2) std::swap(ID1,ID2);
    186186}
    187187

  • external/fastjet/ClusterSequence.cc

    r88a9b72 rd69dfe4  
    22// $Id$
    33//
    4 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2005-2013, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------
    … …  
    385385  (*ostr) << "#     A software package for jet finding and analysis at colliders      \n";
    386386  (*ostr) << "#                           http://fastjet.fr                           \n";
    387   (*ostr) << "#                                                                       \n";
     387  (*ostr) << "#                                                                       \n";
    388388  (*ostr) << "# Please cite EPJC72(2012)1896 [arXiv:1111.6097] if you use this package\n";
    389389  (*ostr) << "# for scientific work and optionally PLB641(2006)57 [hep-ph/0512210].   \n";
    390   (*ostr) << "#                                                                    \n";
     390  (*ostr) << "#                                                                       \n";
    391391  (*ostr) << "# FastJet is provided without warranty under the terms of the GNU GPLv2.\n";
    392392  (*ostr) << "# It uses T. Chan's closest pair algorithm, S. Fortune's Voronoi code";

  • external/fastjet/ClusterSequence.hh

    r88a9b72 rd69dfe4  
    11//STARTHEADER
    2 // $Id: ClusterSequence.hh 2806 2011-12-01 17:21:00Z salam $
     2// $Id: ClusterSequence.hh 3114 2013-05-04 08:46:00Z salam $
    33//
    44// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    3333#include<vector>
    3434#include<map>
    35 #include "fastjet/internal/DynamicNearestNeighbours.hh"
    3635#include "fastjet/PseudoJet.hh"
    3736#include<memory>
    … …  
    5150
    5251
    53 // forward declaration
     52// forward declarations
    5453class ClusterSequenceStructure;
     54class DynamicNearestNeighbours;
    5555
    5656/// @ingroup basic_classes

  • external/fastjet/ClusterSequenceStructure.cc

    r88a9b72 rd69dfe4  
    3131#include "fastjet/PseudoJet.hh"
    3232#include "fastjet/ClusterSequence.hh"
     33#ifndef __FJCORE__
    3334#include "fastjet/ClusterSequenceAreaBase.hh"
     35#endif  // __FJCORE__
    3436#include <iostream>
    3537
    … …  
    255257//----------------------------------------------------------------------
    256258
     259#ifndef __FJCORE__
    257260// if possible, return a valid ClusterSequenceAreaBase pointer; otherwise
    258261// throw an error
    … …  
    263266}
    264267
    265 
    266268// check if it has a defined area
    267269bool ClusterSequenceStructure::has_area() const{
    … …  
    295297}
    296298
     299#endif  // __FJCORE__
     300
    297301
    298302

  • external/fastjet/ClusterSequenceStructure.hh

    r88a9b72 rd69dfe4  
    11//STARTHEADER
    2 // $Id: ClusterSequenceStructure.hh 2577 2011-09-13 15:11:38Z salam $
     2// $Id: ClusterSequenceStructure.hh 3071 2013-04-01 12:52:46Z cacciari $
    33//
    44// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    9696  virtual const ClusterSequence * validated_cs() const;
    9797
     98#ifndef __FJCORE__
    9899  /// if the jet has valid area information then return a pointer to
    99100  /// the associated ClusterSequenceAreaBase object; otherwise throw an error
    100101  virtual const ClusterSequenceAreaBase * validated_csab() const;
     102#endif  // __FJCORE__
    101103
    102104  /// set the associated csw
    … …  
    237239  // parent ClusterSequence (See ClusterSequenceAreaBase for details)
    238240  //------------------------------------------------------------------
     241#ifndef __FJCORE__
    239242
    240243  /// check if it has a defined area
    … …  
    258261  virtual bool is_pure_ghost(const PseudoJet &reference) const;
    259262
     263#endif  // __FJCORE__
    260264  //\} --- end of jet structure -------------------------------------
    261265

  • external/fastjet/ClusterSequence_Delaunay.cc

    r88a9b72 rd69dfe4  
    3131#include "fastjet/PseudoJet.hh"
    3232#include "fastjet/ClusterSequence.hh"
     33#include "fastjet/internal/DynamicNearestNeighbours.hh"
    3334#include<iostream>
    3435#include<sstream>

  • external/fastjet/ClusterSequence_TiledN2.cc

    r88a9b72 rd69dfe4  
    274274  TiledJet * jetA = briefjets, * jetB;
    275275  TiledJet oldB;
    276  
     276  oldB.tile_index=0; // prevents a gcc warning 
    277277
    278278  // will be used quite deep inside loops, but declare it here so that
    … …  
    517517  TiledJet * jetA = briefjets, * jetB;
    518518  TiledJet oldB;
    519  
     519  oldB.tile_index=0; // prevents a gcc warning 
    520520
    521521  // will be used quite deep inside loops, but declare it here so that
    … …  
    734734  TiledJet * jetA = briefjets, * jetB;
    735735  TiledJet oldB;
     736  oldB.tile_index=0; // prevents a gcc warning
    736737 
    737738

  • external/fastjet/CompositeJetStructure.cc

    r88a9b72 rd69dfe4  
    4545                                             const JetDefinition::Recombiner * recombiner)
    4646  : _pieces(initial_pieces){
     47
     48#ifndef __FJCORE__
    4749  // deal with area support (cache the area if needed)
    4850  //--------------------------------------------------
    … …  
    6870    _area_4vector_ptr = 0;
    6971  }
     72#else
     73  if (recombiner){};  // ugly trick to prevent a gcc warning
     74  _area_4vector_ptr = 0;
     75#endif
    7076
    7177}
    … …  
    115121
    116122
     123#ifndef __FJCORE__
    117124// area-related material
    118125
    … …  
    167174}
    168175
     176#endif  // __FJCORE__
    169177
    170178

  • external/fastjet/CompositeJetStructure.hh

    r88a9b72 rd69dfe4  
    11//STARTHEADER
    2 // $Id: CompositeJetStructure.hh 2684 2011-11-14 07:41:44Z soyez $
     2// $Id: CompositeJetStructure.hh 3071 2013-04-01 12:52:46Z cacciari $
    33//
    44// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    8888
    8989  // area-related material
     90#ifndef __FJCORE__
    9091
    9192  /// check if it has a well-defined area
    … …  
    116117  }
    117118
     119#endif  // __FJCORE__
    118120
    119121protected:

  • external/fastjet/NNH.hh

    r88a9b72 rd69dfe4  
    1 #ifndef __NNH_HH__
    2 #define __NNH_HH__
     1#ifndef __FASTJET_NNH_HH__
     2#define __FASTJET_NNH_HH__
    33
    44//STARTHEADER
    5 // $Id: NNH.hh 2891 2012-06-15 12:47:59Z soyez $
     5// $Id: NNH.hh 3203 2013-09-15 07:49:50Z salam $
    66//
    77// Copyright (c) 2009, Matteo Cacciari, Gavin Salam and Gregory Soyez
    … …  
    379379
    380380
    381 #endif // __NNH_HH__
     381#endif // __FASTJET_NNH_HH__

  • external/fastjet/PseudoJet.cc

    r88a9b72 rd69dfe4  
    3131#include "fastjet/PseudoJet.hh"
    3232#include "fastjet/ClusterSequence.hh"
     33#ifndef __FJCORE__
    3334#include "fastjet/ClusterSequenceAreaBase.hh"
     35#endif  // __FJCORE__
    3436#include "fastjet/CompositeJetStructure.hh"
    3537#include<valarray>
    … …  
    6769  _kt2 = this->px()*this->px() + this->py()*this->py();
    6870  _phi = pseudojet_invalid_phi;
     71  // strictly speaking, _rap does not need initialising, because
     72  // it's never used as long as _phi == pseudojet_invalid_phi
     73  // (and gets set when _phi is requested). However ATLAS
     74  // 2013-03-28 complained that they sometimes have NaN's in
     75  // _rap and this interferes with some of their internal validation.
     76  // So we initialise it; penalty is about 0.3ns per PseudoJet out of about
     77  // 10ns total initialisation time (on a intel Core i7 2.7GHz)
     78  _rap = pseudojet_invalid_rap;
    6979}
    7080
    … …  
    668678//----------------------------------------------------------------------
    669679
     680#ifndef __FJCORE__
     681
    670682//----------------------------------------------------------------------
    671683// if possible, return a valid ClusterSequenceAreaBase pointer; otherwise
    … …  
    715727}
    716728
     729#endif  // __FJCORE__
    717730
    718731//----------------------------------------------------------------------

  • 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

  • external/fastjet/PseudoJetStructureBase.cc

    r88a9b72 rd69dfe4  
    3232#include "fastjet/PseudoJet.hh"
    3333#include "fastjet/ClusterSequence.hh"
     34#ifndef __FJCORE__
    3435#include "fastjet/ClusterSequenceAreaBase.hh"
     36#endif  // __FJCORE__
    3537
    3638using namespace std;
    … …  
    7476}
    7577
     78#ifndef __FJCORE__
    7679// if the jet has valid area information then return a pointer to
    7780// the associated ClusterSequenceAreaBase object; otherwise throw an error
    … …  
    8184  throw Error("This PseudoJet structure is not associated with a valid cluster sequence with area");
    8285}
     86#endif
    8387
    8488
    … …  
    193197// parent ClusterSequence (See ClusterSequenceAreaBase for details)
    194198//------------------------------------------------------------------
     199#ifndef __FJCORE__
    195200
    196201// return the jet (scalar) area.
    … …  
    222227  throw Error("This PseudoJet structure has no implementation for is_pure_ghost");
    223228}
     229#endif  // __FJCORE__
    224230
    225231FASTJET_END_NAMESPACE

  • external/fastjet/PseudoJetStructureBase.hh

    r88a9b72 rd69dfe4  
     1#ifndef __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__
     2#define __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__
     3
    14//STARTHEADER
    2 // $Id: PseudoJetStructureBase.hh 2670 2011-11-11 17:01:06Z salam $
     5// $Id: PseudoJetStructureBase.hh 3071 2013-04-01 12:52:46Z cacciari $
    36//
    47// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    2831
    2932
    30 #ifndef __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__
    31 #define __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__
    32 
    3333#include "fastjet/internal/base.hh"
    3434
    … …  
    4040class PseudoJet;
    4141class ClusterSequence;
     42#ifndef __FJCORE__
    4243class ClusterSequenceAreaBase;
     44#endif  // __FJCORE__
    4345
    4446/// @ingroup extra_info
    … …  
    8587  virtual const ClusterSequence * validated_cs() const;
    8688
     89#ifndef __FJCORE__
    8790  /// if the jet has valid area information then return a pointer to
    8891  /// the associated ClusterSequenceAreaBase object; otherwise throw an error
    8992  virtual const ClusterSequenceAreaBase * validated_csab() const;
     93#endif
    9094
    9195  //\}
    … …  
    203207  // parent ClusterSequence (See ClusterSequenceAreaBase for details)
    204208  //------------------------------------------------------------------
     209#ifndef __FJCORE__
    205210
    206211  /// check if it has a defined area
    … …  
    230235  virtual bool is_pure_ghost(const PseudoJet &reference) const;
    231236
     237#endif  // __FJCORE__
    232238  //\} --- end of jet structure -------------------------------------
    233239};

  • external/fastjet/Selector.cc

    r88a9b72 rd69dfe4  
    3131#include <algorithm>
    3232#include "fastjet/Selector.hh"
     33#ifndef __FJCORE__
    3334#include "fastjet/GhostedAreaSpec.hh"  // for area support
     35#endif  // __FJCORE__
    3436
    3537using namespace std;
    … …  
    131133}
    132134
     135#ifndef __FJCORE__
    133136// area using default ghost area
    134137double Selector::area() const{
    … …  
    153156  return ghost_spec.ghost_area() * ((*this)(ghosts)).size();
    154157}
     158#endif  // __FJCORE__
    155159
    156160
    … …  
    13401344
    13411345//----------------------------------------------------------------------
     1346#ifndef __FJCORE__
    13421347/// helper for selecting the pure ghost
    13431348class SW_IsPureGhost : public SelectorWorker {
    … …  
    13641369  return Selector(new SW_IsPureGhost());
    13651370}
    1366 
    13671371
    13681372//----------------------------------------------------------------------
    … …  
    14201424  _worker.reset(new SW_RangeDefinition(range));
    14211425}
     1426#endif  // __FJCORE__
    14221427
    14231428

  • external/fastjet/Selector.hh

    r88a9b72 rd69dfe4  
    1 #ifndef __SELECTOR_HH__
    2 #define __SELECTOR_HH__
     1#ifndef __FASTJET_SELECTOR_HH__
     2#define __FASTJET_SELECTOR_HH__
    33
    44//STARTHEADER
    5 // $Id: Selector.hh 2687 2011-11-14 11:17:51Z soyez $
     5// $Id: Selector.hh 3203 2013-09-15 07:49:50Z salam $
    66//
    77// Copyright (c) 2009-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    3131
    3232#include "fastjet/PseudoJet.hh"
     33#ifndef __FJCORE__
    3334#include "fastjet/RangeDefinition.hh"  // for initialisation from a RangeDefinition
     35#endif  // __FJCORE__
    3436#include <limits>
    3537#include <cmath>
    … …  
    150152
    151153
     154#ifndef __FJCORE__
    152155  /// ctor from a RangeDefinition
    153156  ///
    … …  
    160163  /// the direct use of this constructor.
    161164  Selector(const RangeDefinition &range);
     165#endif  // __FJCORE__
    162166
    163167  /// dummy virtual dtor
    … …  
    229233  }
    230234
     235#ifndef __FJCORE__
    231236  /// returns the rapidity-phi area associated with the Selector
    232237  /// (throws InvalidArea if the area does not make sense).
    … …  
    248253  ///
    249254  double area(double ghost_area) const;
     255#endif  // __FJCORE__
    250256
    251257  /// returns a (reference to) the underlying worker's shared pointer
    … …  
    455461Selector SelectorIsZero();
    456462
     463#ifndef __FJCORE__
    457464/// select objects that are (or are only made of) ghosts.
    458465/// PseudoJets for which has_area() are considered non-pure-ghost.
    459466Selector SelectorIsPureGhost();
     467#endif  // __FJCORE__
    460468
    461469/// @}
    … …  
    463471FASTJET_END_NAMESPACE      // defined in fastjet/internal/base.hh
    464472
    465 #endif // __SELECTOR_HH__
    466 
     473#endif // __FASTJET_SELECTOR_HH__
     474

  • external/fastjet/SharedPtr.hh

    r88a9b72 rd69dfe4  
    33
    44//STARTHEADER
    5 // $Id: SharedPtr.hh 2680 2011-11-12 17:12:05Z soyez $
     5// $Id: SharedPtr.hh 3129 2013-06-05 08:48:36Z salam $
    66//
    77// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    3535// for testing purposes, the following define makes it possible
    3636// for our SharedPtr simply to be derived from the STL TR1 one.
    37 // #define USETR1SHAREDPTR
    38 
    39 #ifdef USETR1SHAREDPTR
     37// #define __FASTJET_USETR1SHAREDPTR
     38
     39#ifdef __FASTJET_USETR1SHAREDPTR
    4040#include <tr1/memory>
    41 #endif // USETR1SHAREDPTR
     41#endif // __FASTJET_USETR1SHAREDPTR
    4242
    4343FASTJET_BEGIN_NAMESPACE      // defined in fastjet/internal/base.hh
    4444
    45 #ifdef USETR1SHAREDPTR
     45#ifdef __FASTJET_USETR1SHAREDPTR
    4646
    4747/// @ingroup advanced_usage
    … …  
    7878
    7979
    80 #else // USETR1SHAREDPTR
     80#else // __FASTJET_USETR1SHAREDPTR
    8181
    8282/**
    … …  
    390390}
    391391
    392 #endif // USETR1SHAREDPTR
     392#endif // __FASTJET_USETR1SHAREDPTR
    393393
    394394FASTJET_END_NAMESPACE      // defined in fastjet/internal/base.hh

  • external/fastjet/VERSION

    r88a9b72 rd69dfe4  
    1 3.0.3
     13.0.6

  • external/fastjet/config_auto.h

    r88a9b72 rd69dfe4  
    147147/* Define to the full name and version of this package. */
    148148#ifndef FASTJET_PACKAGE_STRING
    149 #define FASTJET_PACKAGE_STRING  "FastJet 3.0.3"
     149#define FASTJET_PACKAGE_STRING  "FastJet 3.0.6"
    150150#endif
    151151
    … …  
    155155#endif
    156156
    157 /* Define to the home page for this package. */
    158 #ifndef FASTJET_PACKAGE_URL
    159 #define FASTJET_PACKAGE_URL  ""
    160 #endif
    161 
    162157/* Define to the version of this package. */
    163158#ifndef FASTJET_PACKAGE_VERSION
    164 #define FASTJET_PACKAGE_VERSION  "3.0.3"
     159#define FASTJET_PACKAGE_VERSION  "3.0.6"
    165160#endif
    166161
    … …  
    172167/* Version number of package */
    173168#ifndef FASTJET_VERSION
    174 #define FASTJET_VERSION  "3.0.3"
     169#define FASTJET_VERSION  "3.0.6"
    175170#endif
    176171 

  • external/fastjet/config_raw.h

    r88a9b72 rd69dfe4  
    8888
    8989/* Define to the full name and version of this package. */
    90 #define PACKAGE_STRING "FastJet 3.0.3"
     90#define PACKAGE_STRING "FastJet 3.0.6"
    9191
    9292/* Define to the one symbol short name of this package. */
    9393#define PACKAGE_TARNAME "fastjet"
    9494
    95 /* Define to the home page for this package. */
    96 #define PACKAGE_URL ""
    97 
    9895/* Define to the version of this package. */
    99 #define PACKAGE_VERSION "3.0.3"
     96#define PACKAGE_VERSION "3.0.6"
    10097
    10198/* Define to 1 if you have the ANSI C header files. */
    … …  
    103100
    104101/* Version number of package */
    105 #define VERSION "3.0.3"
     102#define VERSION "3.0.6"

  • external/fastjet/config_win.h

    r88a9b72 rd69dfe4  
    1 #define FASTJET_PACKAGE_STRING  "FastJet 3.0.3"
    2 #define FASTJET_PACKAGE_VERSION  "3.0.3"
     1#define FASTJET_PACKAGE_STRING  "FastJet 3.0.6"
     2#define FASTJET_PACKAGE_VERSION  "3.0.6"
    33
    44/* The ATLASCone plugin is disabled by default*/

  • external/fastjet/internal/ClusterSequence_N2.icc

    r88a9b72 rd69dfe4  
    11// -*- C++ -*-
    2 #ifndef __CLUSTERQUENCE_N2_ICC__
    3 #define __CLUSTERQUENCE_N2_ICC__
     2#ifndef __FASTJET_CLUSTERQUENCE_N2_ICC__
     3#define __FASTJET_CLUSTERQUENCE_N2_ICC__
    44#include "fastjet/ClusterSequence.hh"
    55
    … …  
    196196FASTJET_END_NAMESPACE
    197197
    198 #endif // __CLUSTERQUENCE_N2_ICC__
    199 
    200 
     198#endif // __FASTJET_CLUSTERQUENCE_N2_ICC__
     199
     200

  • external/fastjet/internal/IsBase.hh

    r88a9b72 rd69dfe4  
    11//STARTHEADER
    2 // $Id: IsBase.hh 2622 2011-10-05 22:13:23Z soyez $
     2// $Id: IsBase.hh 3071 2013-04-01 12:52:46Z cacciari $
    33//
    44// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    163163template<class B, class D>
    164164B* cast_if_derived(D* d){
    165   return IsBaseAndDerived<B,D>::value ? (B*)(d) : NULL;
     165  return IsBaseAndDerived<B,D>::value ? (B*)(d) : 0;
    166166}
    167167

  • external/fastjet/internal/SearchTree.hh

    r88a9b72 rd69dfe4  
    11//STARTHEADER
    2 // $Id: SearchTree.hh 2577 2011-09-13 15:11:38Z salam $
     2// $Id: SearchTree.hh 3107 2013-05-03 15:47:47Z salam $
    33//
    44// Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    … …  
    8989  // tracking the depth may have some speed overhead -- so leave it
    9090  // out for the time being...
    91 #ifdef TRACK_DEPTH
     91#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
    9292  /// the max depth the tree has ever reached
    9393  inline unsigned int max_depth() const {return _max_depth;};
    … …  
    129129
    130130 
    131 #ifdef TRACK_DEPTH
     131#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
    132132  unsigned int _max_depth;
    133133#endif
    … …  
    189189
    190190  // so that it can access out _node object;
    191   friend class SearchTree<T>::const_circulator;
     191  // note: "class U" needed for clang (v1.1 branches/release_27) compilation
     192  template<class U> friend class SearchTree<U>::const_circulator;
    192193  friend class SearchTree<T>;
    193194
    … …  
    340341  //_available_nodes.reserve();
    341342
    342 #ifdef TRACK_DEPTH
     343#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
    343344  _max_depth     = 0;
    344345#endif
    … …  
    390391                                         ) {
    391392
    392 #ifdef TRACK_DEPTH
     393#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
    393394  // keep track of tree depth for checking things stay reasonable...
    394395  _max_depth = max(depth, _max_depth);
    … …  
    565566  bool             on_left = true; // (init not needed -- but soothes g++4)
    566567  // work through tree until we reach its end
    567 #ifdef TRACK_DEPTH
     568#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
    568569  unsigned int depth = 0;
    569570#endif
    570571  while(location != NULL) {
    571 #ifdef TRACK_DEPTH
     572#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
    572573    depth++;
    573574#endif
    … …  
    577578    else {location = location->right;}
    578579  }
    579 #ifdef TRACK_DEPTH
     580#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
    580581  _max_depth = max(depth, _max_depth);
    581582#endif

  • external/fastjet/plugins/CDFCones/JetCluAlgorithm.cc

    r88a9b72 rd69dfe4  
    2828#include <algorithm>
    2929#include <cmath>
     30#include <cstdlib>
    3031
    3132#include <fastjet/internal/base.hh>
    … …  
    7980          if ((iEtaPreClusterTower >= 8 && iEtaPreClusterTower < 14) || (iEtaPreClusterTower >= 38 && iEtaPreClusterTower < 44))
    8081            iPhiPreClusterTower = iPhiPreClusterTower/2;
    81           int dIEta = abs(iEtaSeedTower - iEtaPreClusterTower);
    82           int dIPhi = abs(iPhiSeedTower - iPhiPreClusterTower);
     82          int dIEta = std::abs(iEtaSeedTower - iEtaPreClusterTower);
     83          int dIPhi = std::abs(iPhiSeedTower - iPhiPreClusterTower);
    8384          if(dIPhi > 12)
    8485            dIPhi = 24 - dIPhi;

  • external/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh

    r88a9b72 rd69dfe4  
    3030//ENDHEADER
    3131
    32 #include "D0RunIBaseConePlugin.hh"
     32#include "fastjet/D0RunIBaseConePlugin.hh"
    3333
    3434// questionable whether this should be in fastjet namespace or not...

  • external/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh

    r88a9b72 rd69dfe4  
    3030//ENDHEADER
    3131
    32 #include "D0RunIBaseConePlugin.hh"
     32#include "fastjet/D0RunIBaseConePlugin.hh"
    3333
    3434// questionable whether this should be in fastjet namespace or not...

  • external/fastjet/plugins/D0RunIICone/ConeSplitMerge.hpp

    r88a9b72 rd69dfe4  
    7575{
    7676public:
    77   bool operator()(const ProtoJet<Item> & first, const ProtoJet<Item> & second)
     77  bool operator()(const ProtoJet<Item> & first, const ProtoJet<Item> & second) const
    7878  {
    7979    if ( first.pT() > second.pT() ) return true;

  • external/fastjet/plugins/GridJet/fastjet/GridJetPlugin.hh

    r88a9b72 rd69dfe4  
    7575  virtual double R() const;
    7676
     77  /// returns the actual rapidity spacing of the grid
     78  double drap()   const {return _dy;}
     79  /// returns the actual phi spacing of the grid
     80  double dphi() const {return _dphi;}
     81  /// returns the minimum rapidity of the grid
     82  double rapmin() const {return _ymin;}
     83  /// returns the maximum rapidity of the grid
     84  double rapmax() const {return _ymax;}
     85
    7786private:
    7887

  • external/fastjet/plugins/SISCone/AUTHORS

    r88a9b72 rd69dfe4  
    77
    88         (2) PH-TH, CERN, CH-1211 Geneva 23, Switzerland;
    9              Physics Department, Princeton University, Princeton NJ 08544, USA;
    109             LPTHE, UPMC (Univ. Paris 6), 75252 Paris cedex 05, France.
    1110
    … …  
    1413
    1514email  : soyez@fastjet.fr
    16          salam@lpthe.jussieu.fr
     15         gavin.salam@cern.ch

  • external/fastjet/plugins/SISCone/SISConePlugin.cc

    r88a9b72 rd69dfe4  
    55
    66// sisocne stuff
    7 #include "momentum.h"
    8 #include "siscone.h"
     7#include "siscone/momentum.h"
     8#include "siscone/siscone.h"
    99
    1010// other stuff

  • external/fastjet/plugins/SISCone/config.h

    r88a9b72 rd69dfe4  
    4949
    5050/* Define to the full name and version of this package. */
    51 #define PACKAGE_STRING "SISCone 2.0.5"
     51#define PACKAGE_STRING "SISCone 2.0.6"
    5252
    5353/* Define to the one symbol short name of this package. */
    … …  
    5555
    5656/* Define to the home page for this package. */
    57 #define PACKAGE_URL ""
     57/* #undef PACKAGE_URL */
    5858
    5959/* Define to the version of this package. */
    60 #define PACKAGE_VERSION "2.0.5"
     60#define PACKAGE_VERSION "2.0.6"
    6161
    6262/* Define to 1 if you have the ANSI C header files. */
    … …  
    6464
    6565/* Version number of package */
    66 #define VERSION "2.0.5"
     66#define VERSION "2.0.6"

  • external/fastjet/plugins/SISCone/siscone.cc

    r88a9b72 rd69dfe4  
    2929//#else
    3030//#define PACKAGE_NAME "SISCone"
    31 //#define VERSION "1.4.0-devel"
     31//#define VERSION "2.0.6"
    3232//#warning "No config.h file available, using preset values"
    3333//#endif

  • external/fastjet/tools/JHTopTagger.cc

    r88a9b72 rd69dfe4  
    6868  // warn if the jet has not been clustered with a Cambridge/Aachen
    6969  // algorithm
    70   if (! jet.validated_cs()->jet_def().jet_algorithm() == cambridge_algorithm)
     70  if (jet.validated_cs()->jet_def().jet_algorithm() != cambridge_algorithm)
    7171    _warnings_nonca.warn("JHTopTagger should only be applied on jets from a Cambridge/Aachen clustering; use it with other algorithms at your own risk.");
    7272

  • external/fastjet/tools/MassDropTagger.cc

    r88a9b72 rd69dfe4  
    5858  // clustering
    5959  if ((! j.has_associated_cluster_sequence()) ||
    60       (! j.validated_cs()->jet_def().jet_algorithm() == cambridge_algorithm))
     60      (j.validated_cs()->jet_def().jet_algorithm() != cambridge_algorithm))
    6161    _warnings_nonca.warn("MassDropTagger should only be applied on jets from a Cambridge/Aachen clustering; use it with other algorithms at your own risk.");
    6262
Note: See TracChangeset for help on using the changeset viewer.