Changeset 554babf in git for external/fastjet

Timestamp:

Jan 15, 2015, 9:24:38 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

ce4b888

Parents:

51cabe8

Message:

upgrade FastJet to version 3.1.1

Location:

external/fastjet

Files:

• RectangularGrid.cc (modified) (1 diff)
• RectangularGrid.hh (modified) (4 diffs)
• VERSION (modified) (1 diff)
• config_auto.h (modified) (4 diffs)
• config_raw.h (modified) (4 diffs)
• config_win.h (modified) (1 diff)
• plugins/D0RunICone/fastjet/D0RunIConePlugin.hh (modified) (1 diff)
• plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh (modified) (1 diff)
• tools/Filter.cc (modified) (2 diffs)
• tools/GridMedianBackgroundEstimator.hh (modified) (4 diffs)
• tools/Recluster.hh (modified) (3 diffs)

external/fastjet/RectangularGrid.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id$
+// $Id: RectangularGrid.cc 3771 2014-12-22 21:13:22Z salam $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez

external/fastjet/RectangularGrid.hh

@@ -3 +3 @@
 
 //FJSTARTHEADER
-// $Id$
+// $Id: RectangularGrid.hh 3771 2014-12-22 21:13:22Z salam $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -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
@@ -81 +79 @@
   virtual bool is_initialised() const = 0;
   bool is_initialized() const {return is_initialised();}
+
+  /// virtual destructor
+  virtual ~TilingBase() {}
 };
 
@@ -165 +166 @@
   // a tile selector
   Selector _tile_selector;
-  // a cached 
+  // if there's a tile selector, then for each tile, this caches the
+  // information about whether it is "good" i.e. it passes the tile
+  // selector
   std::vector<bool> _is_good;
   

external/fastjet/VERSION

@@ -1 @@
-3.1.0
+3.1.1

external/fastjet/config_auto.h

@@ -151 +151 @@
 /* Define to the full name and version of this package. */
 #ifndef FASTJET_PACKAGE_STRING 
-#define FASTJET_PACKAGE_STRING  "FastJet 3.1.0" 
+#define FASTJET_PACKAGE_STRING  "FastJet 3.1.1" 
 #endif
 
@@ -161 +161 @@
 /* Define to the version of this package. */
 #ifndef FASTJET_PACKAGE_VERSION 
-#define FASTJET_PACKAGE_VERSION  "3.1.0" 
+#define FASTJET_PACKAGE_VERSION  "3.1.1" 
 #endif
 
@@ -171 +171 @@
 /* Version number of package */
 #ifndef FASTJET_VERSION 
-#define FASTJET_VERSION  "3.1.0" 
+#define FASTJET_VERSION  "3.1.1" 
 #endif
 
@@ -186 +186 @@
 /* Version of the package under the form XYYZZ (instead of X.Y.Z) */
 #ifndef FASTJET_VERSION_NUMBER 
-#define FASTJET_VERSION_NUMBER  30100 
+#define FASTJET_VERSION_NUMBER  30101 
 #endif
 
 /* Patch version of this package */
 #ifndef FASTJET_VERSION_PATCHLEVEL 
-#define FASTJET_VERSION_PATCHLEVEL  0 
+#define FASTJET_VERSION_PATCHLEVEL  1 
 #endif
 

external/fastjet/config_raw.h

@@ -92 +92 @@
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "FastJet 3.1.0"
+#define PACKAGE_STRING "FastJet 3.1.1"
 
 /* Define to the one symbol short name of this package. */
@@ -98 +98 @@
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.1.0"
+#define PACKAGE_VERSION "3.1.1"
 
 /* Define to 1 if you have the ANSI C header files. */
@@ -104 +104 @@
 
 /* Version number of package */
-#define VERSION "3.1.0"
+#define VERSION "3.1.1"
 
 /* Major version of this package */
@@ -113 +113 @@
 
 /* Version of the package under the form XYYZZ (instead of X.Y.Z) */
-#define VERSION_NUMBER 30100
+#define VERSION_NUMBER 30101
 
 /* Patch version of this package */
-#define VERSION_PATCHLEVEL 0
+#define VERSION_PATCHLEVEL 1
 
 /* Pre-release version of this package */

external/fastjet/config_win.h

@@ -1 @@
-#define FASTJET_PACKAGE_STRING  "FastJet 3.1.0"
-#define FASTJET_PACKAGE_VERSION  "3.1.0"
-#define FASTJET_VERSION  "3.1.0"
+#define FASTJET_PACKAGE_STRING  "FastJet 3.1.1"
+#define FASTJET_PACKAGE_VERSION  "3.1.1"
+#define FASTJET_VERSION  "3.1.1"
 #define FASTJET_VERSION_MAJOR       3
 #define FASTJET_VERSION_MINOR       1
-#define FASTJET_VERSION_PATCHLEVEL  0
-#define FASTJET_VERSION_NUMBER      30100
+#define FASTJET_VERSION_PATCHLEVEL  1
+#define FASTJET_VERSION_NUMBER      30101
 
 /* The ATLASCone plugin is disabled by default*/

external/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh

@@ -32 +32 @@
 //FJENDHEADER
 
-#include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen)
+#include "fastjet/internal/base.hh"     // namespace macros (include explicitly to help Doxygen)
 #include "D0RunIBaseConePlugin.hh"
 

external/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh

@@ -32 +32 @@
 //FJENDHEADER
 
-#include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen)
+#include "fastjet/internal/base.hh"     // namespace macros (include explicitly to help Doxygen)
 #include "D0RunIBaseConePlugin.hh"
 

external/fastjet/tools/Filter.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: Filter.cc 3633 2014-08-15 13:23:52Z soyez $
+// $Id: Filter.cc 3760 2014-12-19 10:05:10Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -164 +164 @@
   if ((ca_optimisation_used) && (kept.size()+rejected.size()>0)){
     bool has_non_explicit_ghost_area = (kept.size()>0)
-      ? (kept[0].has_area()     && kept[0].validated_csab()->has_explicit_ghosts())
-      : (rejected[0].has_area() && rejected[0].validated_csab()->has_explicit_ghosts());
+      ? (kept[0].has_area()     && (!(kept[0].validated_csab()->has_explicit_ghosts())))
+      : (rejected[0].has_area() && (!(rejected[0].validated_csab()->has_explicit_ghosts())));
     if (has_non_explicit_ghost_area)
       fs->discard_area();

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

external/fastjet/tools/Recluster.hh

@@ -2 +2 @@
 #define __FASTJET_TOOLS_RECLUSTER_HH__
 
-// $Id: Recluster.hh 3714 2014-09-30 09:47:31Z soyez $
+// $Id: Recluster.hh 3760 2014-12-19 10:05:10Z soyez $
 //
 // Copyright (c) 2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -50 +50 @@
 /// Alternatively, Recluster can be constructed from a jet algorithm
 /// and an optional radius. In that case the recombiner is
-/// systematically obtained fromn the jet being processed (unless you
+/// systematically obtained from the jet being processed (unless you
 /// call set_acquire_recombiner(false)). If only the jet algorithm is
 /// specified, a default radius of max_allowable_R will be assumed if
@@ -124 +124 @@
   /// parameter (like the genkt algorithm), please specify the jet
   /// definition fully using the constructor above.
-  Recluster(JetAlgorithm snew_jet_alg, double new_jet_radius, Keep keep_in = keep_only_hardest);
+  Recluster(JetAlgorithm new_jet_alg, double new_jet_radius, Keep keep_in = keep_only_hardest);
 
   /// constructor with just a jet algorithm, but no jet radius. If the