- Timestamp:
- Jan 15, 2015, 9:24:38 PM (10 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- ce4b888
- Parents:
- 51cabe8
- Location:
- external/fastjet
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
external/fastjet/RectangularGrid.cc
r51cabe8 r554babf 1 1 //FJSTARTHEADER 2 // $Id $2 // $Id: RectangularGrid.cc 3771 2014-12-22 21:13:22Z salam $ 3 3 // 4 4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez -
external/fastjet/RectangularGrid.hh
r51cabe8 r554babf 3 3 4 4 //FJSTARTHEADER 5 // $Id $5 // $Id: RectangularGrid.hh 3771 2014-12-22 21:13:22Z salam $ 6 6 // 7 7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 42 42 class TilingBase { 43 43 public: 44 virtual ~TilingBase() {}45 46 44 /// returns the index of the tile in which p is located, or -1 if p 47 45 /// is outside the tiling region … … 81 79 virtual bool is_initialised() const = 0; 82 80 bool is_initialized() const {return is_initialised();} 81 82 /// virtual destructor 83 virtual ~TilingBase() {} 83 84 }; 84 85 … … 165 166 // a tile selector 166 167 Selector _tile_selector; 167 // a cached 168 // if there's a tile selector, then for each tile, this caches the 169 // information about whether it is "good" i.e. it passes the tile 170 // selector 168 171 std::vector<bool> _is_good; 169 172 -
external/fastjet/VERSION
r51cabe8 r554babf 1 3.1. 01 3.1.1 -
external/fastjet/config_auto.h
r51cabe8 r554babf 151 151 /* Define to the full name and version of this package. */ 152 152 #ifndef FASTJET_PACKAGE_STRING 153 #define FASTJET_PACKAGE_STRING "FastJet 3.1. 0"153 #define FASTJET_PACKAGE_STRING "FastJet 3.1.1" 154 154 #endif 155 155 … … 161 161 /* Define to the version of this package. */ 162 162 #ifndef FASTJET_PACKAGE_VERSION 163 #define FASTJET_PACKAGE_VERSION "3.1. 0"163 #define FASTJET_PACKAGE_VERSION "3.1.1" 164 164 #endif 165 165 … … 171 171 /* Version number of package */ 172 172 #ifndef FASTJET_VERSION 173 #define FASTJET_VERSION "3.1. 0"173 #define FASTJET_VERSION "3.1.1" 174 174 #endif 175 175 … … 186 186 /* Version of the package under the form XYYZZ (instead of X.Y.Z) */ 187 187 #ifndef FASTJET_VERSION_NUMBER 188 #define FASTJET_VERSION_NUMBER 3010 0188 #define FASTJET_VERSION_NUMBER 30101 189 189 #endif 190 190 191 191 /* Patch version of this package */ 192 192 #ifndef FASTJET_VERSION_PATCHLEVEL 193 #define FASTJET_VERSION_PATCHLEVEL 0193 #define FASTJET_VERSION_PATCHLEVEL 1 194 194 #endif 195 195 -
external/fastjet/config_raw.h
r51cabe8 r554babf 92 92 93 93 /* Define to the full name and version of this package. */ 94 #define PACKAGE_STRING "FastJet 3.1. 0"94 #define PACKAGE_STRING "FastJet 3.1.1" 95 95 96 96 /* Define to the one symbol short name of this package. */ … … 98 98 99 99 /* Define to the version of this package. */ 100 #define PACKAGE_VERSION "3.1. 0"100 #define PACKAGE_VERSION "3.1.1" 101 101 102 102 /* Define to 1 if you have the ANSI C header files. */ … … 104 104 105 105 /* Version number of package */ 106 #define VERSION "3.1. 0"106 #define VERSION "3.1.1" 107 107 108 108 /* Major version of this package */ … … 113 113 114 114 /* Version of the package under the form XYYZZ (instead of X.Y.Z) */ 115 #define VERSION_NUMBER 3010 0115 #define VERSION_NUMBER 30101 116 116 117 117 /* Patch version of this package */ 118 #define VERSION_PATCHLEVEL 0118 #define VERSION_PATCHLEVEL 1 119 119 120 120 /* Pre-release version of this package */ -
external/fastjet/config_win.h
r51cabe8 r554babf 1 #define FASTJET_PACKAGE_STRING "FastJet 3.1. 0"2 #define FASTJET_PACKAGE_VERSION "3.1. 0"3 #define FASTJET_VERSION "3.1. 0"1 #define FASTJET_PACKAGE_STRING "FastJet 3.1.1" 2 #define FASTJET_PACKAGE_VERSION "3.1.1" 3 #define FASTJET_VERSION "3.1.1" 4 4 #define FASTJET_VERSION_MAJOR 3 5 5 #define FASTJET_VERSION_MINOR 1 6 #define FASTJET_VERSION_PATCHLEVEL 07 #define FASTJET_VERSION_NUMBER 3010 06 #define FASTJET_VERSION_PATCHLEVEL 1 7 #define FASTJET_VERSION_NUMBER 30101 8 8 9 9 /* The ATLASCone plugin is disabled by default*/ -
external/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh
r51cabe8 r554babf 32 32 //FJENDHEADER 33 33 34 #include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen)34 #include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen) 35 35 #include "D0RunIBaseConePlugin.hh" 36 36 -
external/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh
r51cabe8 r554babf 32 32 //FJENDHEADER 33 33 34 #include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen)34 #include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen) 35 35 #include "D0RunIBaseConePlugin.hh" 36 36 -
external/fastjet/tools/Filter.cc
r51cabe8 r554babf 1 1 //FJSTARTHEADER 2 // $Id: Filter.cc 3 633 2014-08-15 13:23:52Z soyez $2 // $Id: Filter.cc 3760 2014-12-19 10:05:10Z soyez $ 3 3 // 4 4 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 164 164 if ((ca_optimisation_used) && (kept.size()+rejected.size()>0)){ 165 165 bool has_non_explicit_ghost_area = (kept.size()>0) 166 ? (kept[0].has_area() && kept[0].validated_csab()->has_explicit_ghosts())167 : (rejected[0].has_area() && rejected[0].validated_csab()->has_explicit_ghosts());166 ? (kept[0].has_area() && (!(kept[0].validated_csab()->has_explicit_ghosts()))) 167 : (rejected[0].has_area() && (!(rejected[0].validated_csab()->has_explicit_ghosts()))); 168 168 if (has_non_explicit_ghost_area) 169 169 fs->discard_area(); -
external/fastjet/tools/GridMedianBackgroundEstimator.hh
r51cabe8 r554babf 3 3 4 4 //FJSTARTHEADER 5 // $Id: GridMedianBackgroundEstimator.hh 3 610 2014-08-13 09:49:28Z salam $5 // $Id: GridMedianBackgroundEstimator.hh 3778 2014-12-24 09:28:09Z salam $ 6 6 // 7 7 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 77 77 class GridMedianBackgroundEstimator : public BackgroundEstimatorBase 78 78 #ifdef FASTJET_GMBGE_USEFJGRID 79 79 , public RectangularGrid 80 80 #endif 81 81 { … … 94 94 _has_particles(false), _enable_rho_m(true) {} 95 95 96 /// ctor with more control over initialisation 96 //---------------------------------------------------------------- 97 /// Constructor based on a user's fully specified RectangularGrid 98 GridMedianBackgroundEstimator(const RectangularGrid & grid) : 99 RectangularGrid(grid), 100 _has_particles(false), _enable_rho_m(true) { 101 if (!RectangularGrid::is_initialised()) 102 throw Error("attempt to construct GridMedianBackgroundEstimator with uninitialised RectangularGrid"); 103 } 104 105 //---------------------------------------------------------------- 106 /// Constructor with the explicit parameters for the underlying 107 /// RectangularGrid 108 /// 97 109 /// \param rapmin the minimum rapidity extent of the grid 98 110 /// \param rapmax the maximum rapidity extent of the grid 99 111 /// \param drap the grid spacing in rapidity 100 112 /// \param dphi the grid spacing in azimuth 101 /// \param tile_selector optional (geometric) selector to specify 113 /// \param tile_selector optional (geometric) selector to specify 102 114 /// which tiles are good; a tile is good if 103 115 /// a massless 4-vector at the center of the tile passes … … 107 119 RectangularGrid(rapmin_in, rapmax_in, drap_in, dphi_in, tile_selector), 108 120 _has_particles(false), _enable_rho_m(true) {} 109 110 //----------------------------------------------------------------111 /// Constructor based on a user's fully specified RectangularGrid112 GridMedianBackgroundEstimator(const RectangularGrid & grid) :113 RectangularGrid(grid),114 _has_particles(false), _enable_rho_m(true) {115 if (!RectangularGrid::is_initialised())116 throw Error("attempt to construct GridMedianBackgroundEstimator with uninitialised RectangularGrid");117 }118 121 119 122 #else // alternative in old framework where we didn't have the rectangular grid -
external/fastjet/tools/Recluster.hh
r51cabe8 r554babf 2 2 #define __FASTJET_TOOLS_RECLUSTER_HH__ 3 3 4 // $Id: Recluster.hh 37 14 2014-09-30 09:47:31Z soyez $4 // $Id: Recluster.hh 3760 2014-12-19 10:05:10Z soyez $ 5 5 // 6 6 // Copyright (c) 2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez … … 50 50 /// Alternatively, Recluster can be constructed from a jet algorithm 51 51 /// and an optional radius. In that case the recombiner is 52 /// systematically obtained from nthe jet being processed (unless you52 /// systematically obtained from the jet being processed (unless you 53 53 /// call set_acquire_recombiner(false)). If only the jet algorithm is 54 54 /// specified, a default radius of max_allowable_R will be assumed if … … 124 124 /// parameter (like the genkt algorithm), please specify the jet 125 125 /// definition fully using the constructor above. 126 Recluster(JetAlgorithm snew_jet_alg, double new_jet_radius, Keep keep_in = keep_only_hardest);126 Recluster(JetAlgorithm new_jet_alg, double new_jet_radius, Keep keep_in = keep_only_hardest); 127 127 128 128 /// constructor with just a jet algorithm, but no jet radius. If the
Note:
See TracChangeset
for help on using the changeset viewer.