Fork me on GitHub

Ignore:
Timestamp:
Sep 29, 2015, 2:08:10 PM (9 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
a98c7ef
Parents:
d870fc5 (diff), 06ec139 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'upstream/master'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • external/fastjet/tools/GridMedianBackgroundEstimator.hh

    rd870fc5 rd77b51d  
    33
    44//FJSTARTHEADER
    5 // $Id: GridMedianBackgroundEstimator.hh 3610 2014-08-13 09:49:28Z salam $
     5// $Id: GridMedianBackgroundEstimator.hh 3778 2014-12-24 09:28:09Z salam $
    66//
    77// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     
    7777class GridMedianBackgroundEstimator : public BackgroundEstimatorBase
    7878#ifdef FASTJET_GMBGE_USEFJGRID
    79                                                                     , public RectangularGrid
     79                                    , public RectangularGrid
    8080#endif
    8181{
     
    9494    _has_particles(false), _enable_rho_m(true) {}
    9595
    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  ///
    97109  ///  \param rapmin         the minimum rapidity extent of the grid
    98110  ///  \param rapmax         the maximum rapidity extent of the grid
    99111  ///  \param drap           the grid spacing in rapidity
    100112  ///  \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 
    102114  ///                        which tiles are good; a tile is good if
    103115  ///                        a massless 4-vector at the center of the tile passes
     
    107119    RectangularGrid(rapmin_in, rapmax_in, drap_in, dphi_in, tile_selector),
    108120    _has_particles(false), _enable_rho_m(true) {}
    109 
    110   //----------------------------------------------------------------
    111   /// Constructor based on a user's fully specified RectangularGrid
    112   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   }   
    118121
    119122#else  // alternative in old framework where we didn't have the rectangular grid
Note: See TracChangeset for help on using the changeset viewer.