Changeset 554babf in git for external/fastjet/tools
- 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/tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
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.