Changes in external/fastjet/tools/GridMedianBackgroundEstimator.hh [554babf:406b698] in git

File:

• external/fastjet/tools/GridMedianBackgroundEstimator.hh (modified) (4 diffs)

external/fastjet/tools/GridMedianBackgroundEstimator.hh

@@ -3 +3 @@
 
 //FJSTARTHEADER
-// $Id: GridMedianBackgroundEstimator.hh 3778 2014-12-24 09:28:09Z salam $
+// $Id: GridMedianBackgroundEstimator.hh 3610 2014-08-13 09:49:28Z salam $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -77 +77 @@
 class GridMedianBackgroundEstimator : public BackgroundEstimatorBase
 #ifdef FASTJET_GMBGE_USEFJGRID
-                                    , public RectangularGrid
+                                                                    , public RectangularGrid
 #endif 
 {
@@ -94 +94 @@
     _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) {}
+
   //----------------------------------------------------------------
   /// Constructor based on a user's fully specified RectangularGrid
@@ -102 +116 @@
       throw Error("attempt to construct GridMedianBackgroundEstimator with uninitialised RectangularGrid");
   }    
-
-  //---------------------------------------------------------------- 
-  /// Constructor with the explicit parameters for the underlying
-  /// RectangularGrid
-  ///
-  ///  \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) {}
 
 #else  // alternative in old framework where we didn't have the rectangular grid