Changeset 406b698 in git for external

Timestamp:

Dec 21, 2014, 11:04:36 AM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

1d1f6a4

Parents:

a740c66

Message:

replace map with vector< GridMedianBackgroundEstimator * >

Location:

external/fastjet

Files:

• RectangularGrid.hh (modified) (1 diff)
• tools/GridMedianBackgroundEstimator.hh (modified) (2 diffs)

external/fastjet/RectangularGrid.hh

@@ -42 +42 @@
 class TilingBase {
 public:
+  virtual ~TilingBase() {}
+
   /// returns the index of the tile in which p is located, or -1 if p
   /// is outside the tiling region

external/fastjet/tools/GridMedianBackgroundEstimator.hh

@@ -77 +77 @@
 class GridMedianBackgroundEstimator : public BackgroundEstimatorBase
 #ifdef FASTJET_GMBGE_USEFJGRID
-                                                                    , RectangularGrid
+                                                                    , public RectangularGrid
 #endif 
 {
@@ -93 +93 @@
     RectangularGrid(ymax, requested_grid_spacing),
     _has_particles(false), _enable_rho_m(true) {} 
+
+  /// ctor with more control over initialisation
+  ///  \param rapmin         the minimum rapidity extent of the grid
+  ///  \param rapmax         the maximum rapidity extent of the grid
+  ///  \param drap           the grid spacing in rapidity
+  ///  \param dphi           the grid spacing in azimuth
+  ///  \param tile_selector  optional (geometric) selector to specify
+  ///                        which tiles are good; a tile is good if
+  ///                        a massless 4-vector at the center of the tile passes
+  ///                        the selection
+  GridMedianBackgroundEstimator(double rapmin_in, double rapmax_in, double drap_in, double dphi_in,
+                                Selector tile_selector = Selector()) :
+    RectangularGrid(rapmin_in, rapmax_in, drap_in, dphi_in, tile_selector),
+    _has_particles(false), _enable_rho_m(true) {}
 
   //----------------------------------------------------------------