Changeset d69dfe4 in git for external/fastjet
- Timestamp:
- Nov 20, 2013, 9:52:59 PM (11 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- fc39685
- Parents:
- 88a9b72
- Location:
- external/fastjet
- Files:
-
- 35 edited
Legend:
- Unmodified
- Added
- Removed
-
external/fastjet/ClosestPair2D.cc
r88a9b72 rd69dfe4 183 183 ID2 = _ID(_points[ID1].neighbour); 184 184 distance2 = _points[ID1].neighbour_dist2; 185 if (ID1 > ID2) s wap(ID1,ID2);185 if (ID1 > ID2) std::swap(ID1,ID2); 186 186 } 187 187 -
external/fastjet/ClusterSequence.cc
r88a9b72 rd69dfe4 2 2 // $Id$ 3 3 // 4 // Copyright (c) 2005-201 1, Matteo Cacciari, Gavin P. Salam and Gregory Soyez4 // Copyright (c) 2005-2013, Matteo Cacciari, Gavin P. Salam and Gregory Soyez 5 5 // 6 6 //---------------------------------------------------------------------- … … 385 385 (*ostr) << "# A software package for jet finding and analysis at colliders \n"; 386 386 (*ostr) << "# http://fastjet.fr \n"; 387 (*ostr) << "# 387 (*ostr) << "# \n"; 388 388 (*ostr) << "# Please cite EPJC72(2012)1896 [arXiv:1111.6097] if you use this package\n"; 389 389 (*ostr) << "# for scientific work and optionally PLB641(2006)57 [hep-ph/0512210]. \n"; 390 (*ostr) << "# 390 (*ostr) << "# \n"; 391 391 (*ostr) << "# FastJet is provided without warranty under the terms of the GNU GPLv2.\n"; 392 392 (*ostr) << "# It uses T. Chan's closest pair algorithm, S. Fortune's Voronoi code"; -
external/fastjet/ClusterSequence.hh
r88a9b72 rd69dfe4 1 1 //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 $ 3 3 // 4 4 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 33 33 #include<vector> 34 34 #include<map> 35 #include "fastjet/internal/DynamicNearestNeighbours.hh"36 35 #include "fastjet/PseudoJet.hh" 37 36 #include<memory> … … 51 50 52 51 53 // forward declaration 52 // forward declarations 54 53 class ClusterSequenceStructure; 54 class DynamicNearestNeighbours; 55 55 56 56 /// @ingroup basic_classes -
external/fastjet/ClusterSequenceStructure.cc
r88a9b72 rd69dfe4 31 31 #include "fastjet/PseudoJet.hh" 32 32 #include "fastjet/ClusterSequence.hh" 33 #ifndef __FJCORE__ 33 34 #include "fastjet/ClusterSequenceAreaBase.hh" 35 #endif // __FJCORE__ 34 36 #include <iostream> 35 37 … … 255 257 //---------------------------------------------------------------------- 256 258 259 #ifndef __FJCORE__ 257 260 // if possible, return a valid ClusterSequenceAreaBase pointer; otherwise 258 261 // throw an error … … 263 266 } 264 267 265 266 268 // check if it has a defined area 267 269 bool ClusterSequenceStructure::has_area() const{ … … 295 297 } 296 298 299 #endif // __FJCORE__ 300 297 301 298 302 -
external/fastjet/ClusterSequenceStructure.hh
r88a9b72 rd69dfe4 1 1 //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 $ 3 3 // 4 4 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 96 96 virtual const ClusterSequence * validated_cs() const; 97 97 98 #ifndef __FJCORE__ 98 99 /// if the jet has valid area information then return a pointer to 99 100 /// the associated ClusterSequenceAreaBase object; otherwise throw an error 100 101 virtual const ClusterSequenceAreaBase * validated_csab() const; 102 #endif // __FJCORE__ 101 103 102 104 /// set the associated csw … … 237 239 // parent ClusterSequence (See ClusterSequenceAreaBase for details) 238 240 //------------------------------------------------------------------ 241 #ifndef __FJCORE__ 239 242 240 243 /// check if it has a defined area … … 258 261 virtual bool is_pure_ghost(const PseudoJet &reference) const; 259 262 263 #endif // __FJCORE__ 260 264 //\} --- end of jet structure ------------------------------------- 261 265 -
external/fastjet/ClusterSequence_Delaunay.cc
r88a9b72 rd69dfe4 31 31 #include "fastjet/PseudoJet.hh" 32 32 #include "fastjet/ClusterSequence.hh" 33 #include "fastjet/internal/DynamicNearestNeighbours.hh" 33 34 #include<iostream> 34 35 #include<sstream> -
external/fastjet/ClusterSequence_TiledN2.cc
r88a9b72 rd69dfe4 274 274 TiledJet * jetA = briefjets, * jetB; 275 275 TiledJet oldB; 276 276 oldB.tile_index=0; // prevents a gcc warning 277 277 278 278 // will be used quite deep inside loops, but declare it here so that … … 517 517 TiledJet * jetA = briefjets, * jetB; 518 518 TiledJet oldB; 519 519 oldB.tile_index=0; // prevents a gcc warning 520 520 521 521 // will be used quite deep inside loops, but declare it here so that … … 734 734 TiledJet * jetA = briefjets, * jetB; 735 735 TiledJet oldB; 736 oldB.tile_index=0; // prevents a gcc warning 736 737 737 738 -
external/fastjet/CompositeJetStructure.cc
r88a9b72 rd69dfe4 45 45 const JetDefinition::Recombiner * recombiner) 46 46 : _pieces(initial_pieces){ 47 48 #ifndef __FJCORE__ 47 49 // deal with area support (cache the area if needed) 48 50 //-------------------------------------------------- … … 68 70 _area_4vector_ptr = 0; 69 71 } 72 #else 73 if (recombiner){}; // ugly trick to prevent a gcc warning 74 _area_4vector_ptr = 0; 75 #endif 70 76 71 77 } … … 115 121 116 122 123 #ifndef __FJCORE__ 117 124 // area-related material 118 125 … … 167 174 } 168 175 176 #endif // __FJCORE__ 169 177 170 178 -
external/fastjet/CompositeJetStructure.hh
r88a9b72 rd69dfe4 1 1 //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 $ 3 3 // 4 4 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 88 88 89 89 // area-related material 90 #ifndef __FJCORE__ 90 91 91 92 /// check if it has a well-defined area … … 116 117 } 117 118 119 #endif // __FJCORE__ 118 120 119 121 protected: -
external/fastjet/NNH.hh
r88a9b72 rd69dfe4 1 #ifndef __ NNH_HH__2 #define __ NNH_HH__1 #ifndef __FASTJET_NNH_HH__ 2 #define __FASTJET_NNH_HH__ 3 3 4 4 //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 $ 6 6 // 7 7 // Copyright (c) 2009, Matteo Cacciari, Gavin Salam and Gregory Soyez … … 379 379 380 380 381 #endif // __ NNH_HH__381 #endif // __FASTJET_NNH_HH__ -
external/fastjet/PseudoJet.cc
r88a9b72 rd69dfe4 31 31 #include "fastjet/PseudoJet.hh" 32 32 #include "fastjet/ClusterSequence.hh" 33 #ifndef __FJCORE__ 33 34 #include "fastjet/ClusterSequenceAreaBase.hh" 35 #endif // __FJCORE__ 34 36 #include "fastjet/CompositeJetStructure.hh" 35 37 #include<valarray> … … 67 69 _kt2 = this->px()*this->px() + this->py()*this->py(); 68 70 _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; 69 79 } 70 80 … … 668 678 //---------------------------------------------------------------------- 669 679 680 #ifndef __FJCORE__ 681 670 682 //---------------------------------------------------------------------- 671 683 // if possible, return a valid ClusterSequenceAreaBase pointer; otherwise … … 715 727 } 716 728 729 #endif // __FJCORE__ 717 730 718 731 //---------------------------------------------------------------------- -
external/fastjet/PseudoJet.hh
r88a9b72 rd69dfe4 1 1 //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 $ 3 3 // 4 4 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 52 52 /// default value for phi, meaning it (and rapidity) have yet to be calculated) 53 53 const double pseudojet_invalid_phi = -100.0; 54 54 const double pseudojet_invalid_rap = -1e200; 55 56 #ifndef __FJCORE__ 55 57 // forward definition 56 58 class ClusterSequenceAreaBase; 59 #endif // __FJCORE__ 57 60 58 61 /// @ingroup basic_classes … … 73 76 // internal shared pointer: see PJtiming.cc and the notes therein) 74 77 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();} 75 79 /// construct a pseudojet from explicit components 76 80 PseudoJet(const double px, const double py, const double pz, const double E); … … 251 255 // dynamic_cast, NULL is returned if L is not derived from 252 256 // 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); 254 262 255 263 if (pj){ … … 504 512 const ClusterSequence * validated_cs() const; 505 513 514 #ifndef __FJCORE__ 506 515 /// if the jet has valid area information then return a pointer to 507 516 /// the associated ClusterSequenceAreaBase object; otherwise throw an error … … 512 521 /// shorthand for validated_cluster_sequence_area_base() 513 522 const ClusterSequenceAreaBase * validated_csab() const; 523 #endif // __FJCORE__ 524 514 525 //\} 515 526 … … 718 729 // parent ClusterSequence (See ClusterSequenceAreaBase for details) 719 730 //------------------------------------------------------------------ 731 #ifndef __FJCORE__ 720 732 721 733 /// check if it has a defined area … … 739 751 virtual bool is_pure_ghost() const; 740 752 753 #endif // __FJCORE__ 741 754 //\} --- end of jet structure ------------------------------------- 742 755 -
external/fastjet/PseudoJetStructureBase.cc
r88a9b72 rd69dfe4 32 32 #include "fastjet/PseudoJet.hh" 33 33 #include "fastjet/ClusterSequence.hh" 34 #ifndef __FJCORE__ 34 35 #include "fastjet/ClusterSequenceAreaBase.hh" 36 #endif // __FJCORE__ 35 37 36 38 using namespace std; … … 74 76 } 75 77 78 #ifndef __FJCORE__ 76 79 // if the jet has valid area information then return a pointer to 77 80 // the associated ClusterSequenceAreaBase object; otherwise throw an error … … 81 84 throw Error("This PseudoJet structure is not associated with a valid cluster sequence with area"); 82 85 } 86 #endif 83 87 84 88 … … 193 197 // parent ClusterSequence (See ClusterSequenceAreaBase for details) 194 198 //------------------------------------------------------------------ 199 #ifndef __FJCORE__ 195 200 196 201 // return the jet (scalar) area. … … 222 227 throw Error("This PseudoJet structure has no implementation for is_pure_ghost"); 223 228 } 229 #endif // __FJCORE__ 224 230 225 231 FASTJET_END_NAMESPACE -
external/fastjet/PseudoJetStructureBase.hh
r88a9b72 rd69dfe4 1 #ifndef __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__ 2 #define __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__ 3 1 4 //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 $ 3 6 // 4 7 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 28 31 29 32 30 #ifndef __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__31 #define __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__32 33 33 #include "fastjet/internal/base.hh" 34 34 … … 40 40 class PseudoJet; 41 41 class ClusterSequence; 42 #ifndef __FJCORE__ 42 43 class ClusterSequenceAreaBase; 44 #endif // __FJCORE__ 43 45 44 46 /// @ingroup extra_info … … 85 87 virtual const ClusterSequence * validated_cs() const; 86 88 89 #ifndef __FJCORE__ 87 90 /// if the jet has valid area information then return a pointer to 88 91 /// the associated ClusterSequenceAreaBase object; otherwise throw an error 89 92 virtual const ClusterSequenceAreaBase * validated_csab() const; 93 #endif 90 94 91 95 //\} … … 203 207 // parent ClusterSequence (See ClusterSequenceAreaBase for details) 204 208 //------------------------------------------------------------------ 209 #ifndef __FJCORE__ 205 210 206 211 /// check if it has a defined area … … 230 235 virtual bool is_pure_ghost(const PseudoJet &reference) const; 231 236 237 #endif // __FJCORE__ 232 238 //\} --- end of jet structure ------------------------------------- 233 239 }; -
external/fastjet/Selector.cc
r88a9b72 rd69dfe4 31 31 #include <algorithm> 32 32 #include "fastjet/Selector.hh" 33 #ifndef __FJCORE__ 33 34 #include "fastjet/GhostedAreaSpec.hh" // for area support 35 #endif // __FJCORE__ 34 36 35 37 using namespace std; … … 131 133 } 132 134 135 #ifndef __FJCORE__ 133 136 // area using default ghost area 134 137 double Selector::area() const{ … … 153 156 return ghost_spec.ghost_area() * ((*this)(ghosts)).size(); 154 157 } 158 #endif // __FJCORE__ 155 159 156 160 … … 1340 1344 1341 1345 //---------------------------------------------------------------------- 1346 #ifndef __FJCORE__ 1342 1347 /// helper for selecting the pure ghost 1343 1348 class SW_IsPureGhost : public SelectorWorker { … … 1364 1369 return Selector(new SW_IsPureGhost()); 1365 1370 } 1366 1367 1371 1368 1372 //---------------------------------------------------------------------- … … 1420 1424 _worker.reset(new SW_RangeDefinition(range)); 1421 1425 } 1426 #endif // __FJCORE__ 1422 1427 1423 1428 -
external/fastjet/Selector.hh
r88a9b72 rd69dfe4 1 #ifndef __ SELECTOR_HH__2 #define __ SELECTOR_HH__1 #ifndef __FASTJET_SELECTOR_HH__ 2 #define __FASTJET_SELECTOR_HH__ 3 3 4 4 //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 $ 6 6 // 7 7 // Copyright (c) 2009-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 31 31 32 32 #include "fastjet/PseudoJet.hh" 33 #ifndef __FJCORE__ 33 34 #include "fastjet/RangeDefinition.hh" // for initialisation from a RangeDefinition 35 #endif // __FJCORE__ 34 36 #include <limits> 35 37 #include <cmath> … … 150 152 151 153 154 #ifndef __FJCORE__ 152 155 /// ctor from a RangeDefinition 153 156 /// … … 160 163 /// the direct use of this constructor. 161 164 Selector(const RangeDefinition &range); 165 #endif // __FJCORE__ 162 166 163 167 /// dummy virtual dtor … … 229 233 } 230 234 235 #ifndef __FJCORE__ 231 236 /// returns the rapidity-phi area associated with the Selector 232 237 /// (throws InvalidArea if the area does not make sense). … … 248 253 /// 249 254 double area(double ghost_area) const; 255 #endif // __FJCORE__ 250 256 251 257 /// returns a (reference to) the underlying worker's shared pointer … … 455 461 Selector SelectorIsZero(); 456 462 463 #ifndef __FJCORE__ 457 464 /// select objects that are (or are only made of) ghosts. 458 465 /// PseudoJets for which has_area() are considered non-pure-ghost. 459 466 Selector SelectorIsPureGhost(); 467 #endif // __FJCORE__ 460 468 461 469 /// @} … … 463 471 FASTJET_END_NAMESPACE // defined in fastjet/internal/base.hh 464 472 465 #endif // __ SELECTOR_HH__466 473 #endif // __FASTJET_SELECTOR_HH__ 474 -
external/fastjet/SharedPtr.hh
r88a9b72 rd69dfe4 3 3 4 4 //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 $ 6 6 // 7 7 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 35 35 // for testing purposes, the following define makes it possible 36 36 // for our SharedPtr simply to be derived from the STL TR1 one. 37 // #define USETR1SHAREDPTR38 39 #ifdef USETR1SHAREDPTR37 // #define __FASTJET_USETR1SHAREDPTR 38 39 #ifdef __FASTJET_USETR1SHAREDPTR 40 40 #include <tr1/memory> 41 #endif // USETR1SHAREDPTR41 #endif // __FASTJET_USETR1SHAREDPTR 42 42 43 43 FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh 44 44 45 #ifdef USETR1SHAREDPTR45 #ifdef __FASTJET_USETR1SHAREDPTR 46 46 47 47 /// @ingroup advanced_usage … … 78 78 79 79 80 #else // USETR1SHAREDPTR80 #else // __FASTJET_USETR1SHAREDPTR 81 81 82 82 /** … … 390 390 } 391 391 392 #endif // USETR1SHAREDPTR392 #endif // __FASTJET_USETR1SHAREDPTR 393 393 394 394 FASTJET_END_NAMESPACE // defined in fastjet/internal/base.hh -
external/fastjet/VERSION
r88a9b72 rd69dfe4 1 3.0. 31 3.0.6 -
external/fastjet/config_auto.h
r88a9b72 rd69dfe4 147 147 /* Define to the full name and version of this package. */ 148 148 #ifndef FASTJET_PACKAGE_STRING 149 #define FASTJET_PACKAGE_STRING "FastJet 3.0. 3"149 #define FASTJET_PACKAGE_STRING "FastJet 3.0.6" 150 150 #endif 151 151 … … 155 155 #endif 156 156 157 /* Define to the home page for this package. */158 #ifndef FASTJET_PACKAGE_URL159 #define FASTJET_PACKAGE_URL ""160 #endif161 162 157 /* Define to the version of this package. */ 163 158 #ifndef FASTJET_PACKAGE_VERSION 164 #define FASTJET_PACKAGE_VERSION "3.0. 3"159 #define FASTJET_PACKAGE_VERSION "3.0.6" 165 160 #endif 166 161 … … 172 167 /* Version number of package */ 173 168 #ifndef FASTJET_VERSION 174 #define FASTJET_VERSION "3.0. 3"169 #define FASTJET_VERSION "3.0.6" 175 170 #endif 176 171 -
external/fastjet/config_raw.h
r88a9b72 rd69dfe4 88 88 89 89 /* 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" 91 91 92 92 /* Define to the one symbol short name of this package. */ 93 93 #define PACKAGE_TARNAME "fastjet" 94 94 95 /* Define to the home page for this package. */96 #define PACKAGE_URL ""97 98 95 /* Define to the version of this package. */ 99 #define PACKAGE_VERSION "3.0. 3"96 #define PACKAGE_VERSION "3.0.6" 100 97 101 98 /* Define to 1 if you have the ANSI C header files. */ … … 103 100 104 101 /* 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" 3 3 4 4 /* The ATLASCone plugin is disabled by default*/ -
external/fastjet/internal/ClusterSequence_N2.icc
r88a9b72 rd69dfe4 1 1 // -*- C++ -*- 2 #ifndef __ CLUSTERQUENCE_N2_ICC__3 #define __ CLUSTERQUENCE_N2_ICC__2 #ifndef __FASTJET_CLUSTERQUENCE_N2_ICC__ 3 #define __FASTJET_CLUSTERQUENCE_N2_ICC__ 4 4 #include "fastjet/ClusterSequence.hh" 5 5 … … 196 196 FASTJET_END_NAMESPACE 197 197 198 #endif // __ CLUSTERQUENCE_N2_ICC__199 200 198 #endif // __FASTJET_CLUSTERQUENCE_N2_ICC__ 199 200 -
external/fastjet/internal/IsBase.hh
r88a9b72 rd69dfe4 1 1 //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 $ 3 3 // 4 4 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 163 163 template<class B, class D> 164 164 B* cast_if_derived(D* d){ 165 return IsBaseAndDerived<B,D>::value ? (B*)(d) : NULL;165 return IsBaseAndDerived<B,D>::value ? (B*)(d) : 0; 166 166 } 167 167 -
external/fastjet/internal/SearchTree.hh
r88a9b72 rd69dfe4 1 1 //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 $ 3 3 // 4 4 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 89 89 // tracking the depth may have some speed overhead -- so leave it 90 90 // out for the time being... 91 #ifdef TRACK_DEPTH91 #ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH 92 92 /// the max depth the tree has ever reached 93 93 inline unsigned int max_depth() const {return _max_depth;}; … … 129 129 130 130 131 #ifdef TRACK_DEPTH131 #ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH 132 132 unsigned int _max_depth; 133 133 #endif … … 189 189 190 190 // 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; 192 193 friend class SearchTree<T>; 193 194 … … 340 341 //_available_nodes.reserve(); 341 342 342 #ifdef TRACK_DEPTH343 #ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH 343 344 _max_depth = 0; 344 345 #endif … … 390 391 ) { 391 392 392 #ifdef TRACK_DEPTH393 #ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH 393 394 // keep track of tree depth for checking things stay reasonable... 394 395 _max_depth = max(depth, _max_depth); … … 565 566 bool on_left = true; // (init not needed -- but soothes g++4) 566 567 // work through tree until we reach its end 567 #ifdef TRACK_DEPTH568 #ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH 568 569 unsigned int depth = 0; 569 570 #endif 570 571 while(location != NULL) { 571 #ifdef TRACK_DEPTH572 #ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH 572 573 depth++; 573 574 #endif … … 577 578 else {location = location->right;} 578 579 } 579 #ifdef TRACK_DEPTH580 #ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH 580 581 _max_depth = max(depth, _max_depth); 581 582 #endif -
external/fastjet/plugins/CDFCones/JetCluAlgorithm.cc
r88a9b72 rd69dfe4 28 28 #include <algorithm> 29 29 #include <cmath> 30 #include <cstdlib> 30 31 31 32 #include <fastjet/internal/base.hh> … … 79 80 if ((iEtaPreClusterTower >= 8 && iEtaPreClusterTower < 14) || (iEtaPreClusterTower >= 38 && iEtaPreClusterTower < 44)) 80 81 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); 83 84 if(dIPhi > 12) 84 85 dIPhi = 24 - dIPhi; -
external/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh
r88a9b72 rd69dfe4 30 30 //ENDHEADER 31 31 32 #include " D0RunIBaseConePlugin.hh"32 #include "fastjet/D0RunIBaseConePlugin.hh" 33 33 34 34 // questionable whether this should be in fastjet namespace or not... -
external/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh
r88a9b72 rd69dfe4 30 30 //ENDHEADER 31 31 32 #include " D0RunIBaseConePlugin.hh"32 #include "fastjet/D0RunIBaseConePlugin.hh" 33 33 34 34 // questionable whether this should be in fastjet namespace or not... -
external/fastjet/plugins/D0RunIICone/ConeSplitMerge.hpp
r88a9b72 rd69dfe4 75 75 { 76 76 public: 77 bool operator()(const ProtoJet<Item> & first, const ProtoJet<Item> & second) 77 bool operator()(const ProtoJet<Item> & first, const ProtoJet<Item> & second) const 78 78 { 79 79 if ( first.pT() > second.pT() ) return true; -
external/fastjet/plugins/GridJet/fastjet/GridJetPlugin.hh
r88a9b72 rd69dfe4 75 75 virtual double R() const; 76 76 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 77 86 private: 78 87 -
external/fastjet/plugins/SISCone/AUTHORS
r88a9b72 rd69dfe4 7 7 8 8 (2) PH-TH, CERN, CH-1211 Geneva 23, Switzerland; 9 Physics Department, Princeton University, Princeton NJ 08544, USA;10 9 LPTHE, UPMC (Univ. Paris 6), 75252 Paris cedex 05, France. 11 10 … … 14 13 15 14 email : soyez@fastjet.fr 16 salam@lpthe.jussieu.fr15 gavin.salam@cern.ch -
external/fastjet/plugins/SISCone/SISConePlugin.cc
r88a9b72 rd69dfe4 5 5 6 6 // sisocne stuff 7 #include " momentum.h"8 #include "siscone .h"7 #include "siscone/momentum.h" 8 #include "siscone/siscone.h" 9 9 10 10 // other stuff -
external/fastjet/plugins/SISCone/config.h
r88a9b72 rd69dfe4 49 49 50 50 /* 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" 52 52 53 53 /* Define to the one symbol short name of this package. */ … … 55 55 56 56 /* Define to the home page for this package. */ 57 #define PACKAGE_URL "" 57 /* #undef PACKAGE_URL */ 58 58 59 59 /* Define to the version of this package. */ 60 #define PACKAGE_VERSION "2.0. 5"60 #define PACKAGE_VERSION "2.0.6" 61 61 62 62 /* Define to 1 if you have the ANSI C header files. */ … … 64 64 65 65 /* Version number of package */ 66 #define VERSION "2.0. 5"66 #define VERSION "2.0.6" -
external/fastjet/plugins/SISCone/siscone.cc
r88a9b72 rd69dfe4 29 29 //#else 30 30 //#define PACKAGE_NAME "SISCone" 31 //#define VERSION " 1.4.0-devel"31 //#define VERSION "2.0.6" 32 32 //#warning "No config.h file available, using preset values" 33 33 //#endif -
external/fastjet/tools/JHTopTagger.cc
r88a9b72 rd69dfe4 68 68 // warn if the jet has not been clustered with a Cambridge/Aachen 69 69 // algorithm 70 if ( ! jet.validated_cs()->jet_def().jet_algorithm() == cambridge_algorithm)70 if (jet.validated_cs()->jet_def().jet_algorithm() != cambridge_algorithm) 71 71 _warnings_nonca.warn("JHTopTagger should only be applied on jets from a Cambridge/Aachen clustering; use it with other algorithms at your own risk."); 72 72 -
external/fastjet/tools/MassDropTagger.cc
r88a9b72 rd69dfe4 58 58 // clustering 59 59 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)) 61 61 _warnings_nonca.warn("MassDropTagger should only be applied on jets from a Cambridge/Aachen clustering; use it with other algorithms at your own risk."); 62 62
Note:
See TracChangeset
for help on using the changeset viewer.