Changeset d77b51d in git for external/fastjet/tools/GridMedianBackgroundEstimator.hh

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:

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

external/fastjet/tools/GridMedianBackgroundEstimator.hh

@@ -3 +3 @@
 
 //FJSTARTHEADER
-// $Id: GridMedianBackgroundEstimator.hh 3610 2014-08-13 09:49:28Z salam $
+// $Id: GridMedianBackgroundEstimator.hh 3778 2014-12-24 09:28:09Z 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
+  //----------------------------------------------------------------
+  /// Constructor based on a user's fully specified RectangularGrid
+  GridMedianBackgroundEstimator(const RectangularGrid & grid) :
+    RectangularGrid(grid),
+    _has_particles(false), _enable_rho_m(true) {
+    if (!RectangularGrid::is_initialised()) 
+      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
+  ///  \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
@@ -107 +119 @@
     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
-  GridMedianBackgroundEstimator(const RectangularGrid & grid) :
-    RectangularGrid(grid),
-    _has_particles(false), _enable_rho_m(true) {
-    if (!RectangularGrid::is_initialised()) 
-      throw Error("attempt to construct GridMedianBackgroundEstimator with uninitialised RectangularGrid");
-  }    
 
 #else  // alternative in old framework where we didn't have the rectangular grid