New Upstream Release - fastjet

Ready changes

Summary

Merged new upstream version: 3.4.1+dfsg (was: 3.4.0+dfsg).

Diff

diff --git a/ChangeLog b/ChangeLog
index acb73ee..db3da4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,247 @@
 ========== CHANGELOG FILE FOR FastJet =================================
+2023-05-02  FastJet team <fastjet@projects.hepforge.org>
+
+	Release of FastJet fastjet-3.4.1
+
+2023-05-02  Gregory Soyez  <soyez@fastjet.fr>
+
+	* almost all cc and hh files:
+	updated the header to include the correct years in the copyright
+
+2023-05-02  Gregory Soyez  <soyez@fastjet.fr>
+
+	* NEWS:
+	set the release date for v3.4.1 to May the 2nd 2023
+
+2023-04-25 Tue  <gavin.salam@physics.ox.ac.uk>
+
+	* NEWS:
+	drafting news items for 3.4.1 release
+
+2023-02-18 Sat  <gavin.salam@physics.ox.ac.uk>
+
+	* scripts/mksnapshot.sh:
+	updated script to use git rather than svn
+
+	* autogen.sh:
+	switched over to bash explicitly, and addressed issues
+	with check for glibtool on Mac OS. 
+
+2023-02-16  Gavin Salam  <gavin.salam@physics.ox.ac.uk>
+
+	* testsuite/mkcxx.pl: *ADDED*
+	* testsuite/mkmk:
+	added the mkcxx.pl script used by mkmk and adapted
+	mkmk to use the local version (intended to ease
+	testing on vanilla systems)
+
+2023-02-16  Gregory Soyez  <soyez@fastjet.fr> + Gavin
+
+	* src/PseudoJet.cc (PseudoJet::_ensure_valid_rap_phi):
+	Changed the part that waits until the calculation is done to a
+	simple loop. Also, set the computation/wait mechanism to use
+	memory_order_releease/memory_order_acquire
+
+2023-02-15 Gavin Salam  <gavin.salam@physics.ox.ac.uk> + Gregory
+
+
+	* src/PseudoJet.cc:
+	replaced use of _init_status = Init_Done with _init_status.store(Init_Done)
+	(though we expect it to be equivalent)
+
+	* testsuite/README:
+	fixed a few details
+
+	* testsuite/TestThreadsBase.hh:
+	* testsuite/thread_safety_tests.cc:
+	trying to get repeated tests of reset momentum and assignment,
+	to help increase likelihood of catching thread safety issues, 
+	if any remain (so far it passes).
+
+	* testsuite/README:
+	added a note about the thread safety tests and fixed some typos.
+
+2023-02-14  Gregory Soyez  <soyez@fastjet.fr>
+
+	* testsuite/TestThreadsBase.hh:
+	* testsuite/thread_safety_tests.cc:
+	* testsuite/TestPseudoJet.hh:
+	added tests of thread safety for the copy and reset_momentum of
+	PseudoJet
+
+	* include/fastjet/PseudoJet.hh:
+	removed line wrongly left in during earlier tests
+
+2023-02-14 Tue  <gavin.salam@physics.ox.ac.uk> with Gregory
+
+    * include/fastjet/PseudoJet.hh:
+    * src/PseudoJet.cc:
+
+	attempted fix of a severe thread safety issue in
+	PseudoJet::reset_momentum(const PseudoJet &) and
+	PseudoJet::operator=(const PseudoJet &) to do with caching of
+	rapidity and phi (issue brough up by Ludovic Scyboz). Further tests
+	still to be written.
+
+
+2023-02-14  Gregory Soyez  <soyez@fastjet.fr>
+
+	* include/fastjet/internal/ClusterSequence_N2.icc:
+	* src/LazyTiling9.cc:
+	* src/LazyTiling9Alt.cc:
+	* src/LazyTiling25.cc:
+	* src/ClusterSequence_TiledN2.cc:
+
+	got rid of "history_location" (a remnant of an archaic treatment
+	of recombination histories) which was no longer used.  This fixes
+	an issue reported by Torbjorn Sjostrand (and Philip Ilten) of
+	compilation warnings with clang15.
+
+2022-12-08  Gavin SALAM  <gavin.salam@cern.ch>
+
+	* regression-tests/nightly-check.pl: 
+	commented out very old version of icpc in tests (default in path, 
+	was 10.1.018). Increased number of events in the v14 from 10 to 1k
+
+2022-12-08 Gavin Salam  <gavin.salam@physics.ox.ac.uk>
+
+	* src/ClusterSequenceAreaBase.cc:
+	* tools/BackgroundEstimatorBase.cc:
+	* tools/JetMedianBackgroundEstimator.cc:
+
+	in various places, replaced sqrt(mean_area) -> sqrt(max(0.0, mean_area))
+	so that when the mean area is negative we don't get NaN for the 
+	sigma result (which causes an FPE for ATLAS, as reported by PAD, 
+	and documented as our 2022-11-FPE-negative-sqrt-density-sigma issue).
+
+	Note, this is not a proper fix for the underlying physical problem
+	in that issue, which is that in some small fraction of events, when
+	the clustering inputs are restricted to be within the area selection
+	region, Voronoi areas extend well beyond the area selection region,
+	which can lead to unphysical results for rho. One could even argue that
+	the FPE was useful, because it signalled the existence of the problem.
+
+	Also fixed typos in comments. 
+
+2022-11-01  Gavin Salam  <gavin.salam@physics.ox.ac.uk>
+
+	* pyinterface/fastjet.i:
+	Accepting merge request from Chris Papageorgakis
+	<chrispap95@gmail.com>, which fixes an issue with an import
+	string
+
+2022-09-27 Tue  <gavin.salam@physics.ox.ac.uk> + Gregory
+
+	* configure.ac:
+	replaced default auto_ptr interface from enabled to disabled,
+	reflecting trouble with modern compilers that no longer
+	have auto_ptr by default (report from Samiur Mir). 
+	Enable at configure-time with --enable-auto-ptr
+
+2022-07-23  Gavin Salam  <gavin.salam@physics.ox.ac.uk>
+
+	* fastjet-config.in:
+	fixed issue where `fastjet-config --pythonpath` was giving incorrect
+	path for non-standard install locations.
+
+2022-06-10 Fri  <gavin.salam@physics.ox.ac.uk>
+
+	* testsuite/thread_safety_tests.cc:
+	removed old unused testing code (superseded by the contents of TestThreadsbase.hh)
+
+2021-11-21 Sun  <gavin.salam@physics.ox.ac.uk>
+
+	* include/fastjet/ClusterSequence.hh:
+
+	rearranged comments for history_element, so that doxygen output
+	comes out OK (comments were being associated with wrong variable).
+
+
+2021-11-15 Mon  <gavin.salam@physics.ox.ac.uk>
+
+	* include/fastjet/JetDefinition.hh:
+	added new strategy N2PlainEEAccurate, intended to work for eekt and ee_genkt
+
+	* include/fastjet/ClusterSequence.hh:
+	* src/ClusterSequence.cc:
+	* src/ClusterSequence_N2.cc:
+
+	Implemented the switch to use of more accurate code for eekt and ee_genkt
+	when the requested strategy is N2PlainEEAccurate. This involves a
+	the use of the cross product for angular-distance
+	calculations when the angle is smaller than (roughly)
+	epsilon**1/4, where epsilon is machine precision. It has a
+	timing penalty of about 15% slower than the default strategy (see
+	below), but is considerably more accurate for angles close to, or
+	smaller than, sqrt(epsilon), where the normal method breaks down.
+	This more accurate strategy breaks down for angles ~ epsilon. 
+	
+	* testsuite/TestEEDotCross.hh:
+
+	updated to use test only the distance calculation with
+	N2PlainEEAccurate (with the default strategy it will give errors).
+
+	* regression-tests/test-all-algs.pl:
+	For the native e+e- algorithms, it now runs the standard and the
+	more accurate strategies. Try it, e.g., with 
+
+	  ./regression-tests/test-all-algs.pl -alg eekt
+
+	NB: the more accurate one doesn't really get seriously tested here,
+	because it kicks in only for very small angles, which tend not to
+	be present in the event files used for the tests. The testsuite
+	tests are more indicative here.
+
+	* Timing summary: (machine in a different state relative to 2021-09-16)
+	(MacOS, clang 12.0.0, 2.3 GHz 8-Core Intel Core i9)
+
+	The timings with the original (default) strategy are as follows:
+	> ./fastjet_timing_plugins -eegenkt 0 -repeat 100000 < data/single-ee-event.dat
+    2.17,2.10,2.16,2.20 s -> average = 2.16 s
+
+	With the new N2PlainEEAccurate strategy (code 31), the speed penalty is about 15%: 	
+	> ./fastjet_timing_plugins -eegenkt 0 -repeat 100000 -strategy 31 < data/single-ee-event.dat
+	2.53,2.54,2.50,2.49 s -> average = 2.52 s
+
+	NB: also tested a version where the cross-product calculation is
+	used for angles < pi/2. This is somewhat more accurate for angles ~
+	epsilon**1/4 (relative accuracy of epsilon**3/4 instead of
+	epsilon**1/2?), but the speed cost is closer to a factor of two than
+	15%. (NB default strategy timings somewhat different -- at this
+	level they are sensitive to machine state)
+
+	> ./fastjet_timing_plugins -eegenkt 0 -repeat 100000 < data/single-ee-event.dat
+    2.06,2.11,2.06,2.11 -> average = 2.085
+	> ./fastjet_timing_plugins -eegenkt 0 -repeat 100000 -strategy 31 < data/single-ee-event.dat
+	4.21,4.21,4.17,4.22 -> average = 4.20
+
+2021-09-16 Thu  <gavin.salam@physics.ox.ac.uk>
+
+	* testsuite/TestEEDotCross.hh: *** ADDED ***
+	* testsuite/run_tests.cc:
+	started work on tests to be able to verify genkt small-angle dmerge
+
+	Timings prior to change for (MacOS, clang 12.0.0, 2.3 GHz 8-Core Intel Core i9)
+	./fastjet_timing_plugins -eegenkt 0 -repeat 100000 < data/single-ee-event.dat
+	2.43s, 2.46s, 2.43s, 2.35s, 2.38s, average = 2.41s
+
+	Timings after the change are 
+	2.68s, 2.70s, 2.79s, 2.83s, 2.79s, average = 2.76, i.e. 15% penalty
+
+2021-07-22 Thu  <gavin.salam@physics.ox.ac.uk>
+
+    * scripts/Makefile-fjcore.txt:
+	added note that on some systems, the fortran example needs
+	-lstdc++ rather than -lc++
+
+	* include/fastjet/ClusterSequence.hh:
+	added CS::plugin_non_const_jet(i) for plugins to be able to
+	modify properties of the input jets (e.g. user info)
+
+	* include/fastjet/PseudoJet.hh:
+	added PseudoJet::set_user_info_shared_ptr(...), to allow
+	user info to easily be transferred from one jet to another
+
 2021-06-25  FastJet team <fastjet@projects.hepforge.org>
 
 	Release of FastJet fastjet-3.4.0
@@ -1933,7 +2176,7 @@ Entries above were added while nmerging the master branch
 	make it mutable and perhaps change the name]
 	[GS: I'd be in favour of that option but struggle w the naming]
 
-	We haev also removed the thread_local for the random generator as
+	We have also removed the thread_local for the random generator as
 	it is not supported by Apple's version of clang.
 
 	* include/fastjet/internal/BasicRandom.hh:
diff --git a/Doxyfile b/Doxyfile
index 14dab63..0b8b0ce 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = FastJet
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.4.0
+PROJECT_NUMBER         = 3.4.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/NEWS b/NEWS
index 4e11e25..13c58f9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,39 @@
 Release Notes for FastJet
 -------------------------
 
+================================================================
+Summary of changes from v3.4.0 -> v3.4.1: 2023-05-02
+================================================================
+
+New features:
+
+* JetDefinition has a new clustering strategy, N2PlainEEAccurate,
+  intended to work with the ee_kt_algorithm and ee_genkt_algorithms. It
+  replaces the dot-product evaluation of (1-cos(theta)) with a more
+  accurate cross-product evaluation when two particles are close in
+  angle (~10^{-4}). It has a timing penalty of ~15% but can calculate
+  inter-particle angles down to ~epsilon rather than sqrt(epsilon),
+  where epsilon is machine precision. This work has been ported from
+  PanScales.
+
+* two new functions to make it possible for plugin algorithms to modify
+  user info, as needed for modern flavoured jet-clustering algorithms:
+  . PseudoJet::set_user_info_shared_ptr(...), to allow user info to
+    easily be copied from one jet to another and
+  . ClusterSequence::plugin_non_const_jet(...) to get non-const access
+    to the initial jets.
+
+Bug fixes:
+
+* Resolved MAJOR BUG that arose with full thread-safety enabled
+  (reported by Ludo Scyboz), where PseudoJet::reset_momentum and
+  PseudoJet::operator= failed to update internally cached values of
+  phi() and rap(). In some instances related issues could also lead to
+  race conditions.
+
+* eliminated NaN from square-root of negative mean areas in background
+  estimation (now returns zero)
+
 ================================================================
 Summary of changes from v3.3.4 -> v3.4.0: 2021-06-25
 ================================================================
diff --git a/config.h.in b/config.h.in
index 354eb32..dda2866 100644
--- a/config.h.in
+++ b/config.h.in
@@ -70,9 +70,6 @@
 /* defined if limited thread-safety has been enabled */
 #undef HAVE_LIMITED_THREAD_SAFETY
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if you have the <mpfr.h> header file. */
 #undef HAVE_MPFR_H
 
@@ -82,6 +79,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -127,7 +127,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Version number of package */
diff --git a/debian/changelog b/debian/changelog
index e542529..a16695a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fastjet (3.4.1+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 19 Jul 2023 23:36:24 -0000
+
 fastjet (3.4.0+dfsg-1) unstable; urgency=medium
 
   * Use Debian packages siscone and drop code copy
diff --git a/debian/patches/disable-rpath-by-default.patch b/debian/patches/disable-rpath-by-default.patch
index 2e64de5..2c8064a 100644
--- a/debian/patches/disable-rpath-by-default.patch
+++ b/debian/patches/disable-rpath-by-default.patch
@@ -1,6 +1,8 @@
---- a/fastjet-config.in
-+++ b/fastjet-config.in
-@@ -167,7 +167,7 @@ arg_yesno_list="shared plugins rpath gue
+Index: fastjet.git/fastjet-config.in
+===================================================================
+--- fastjet.git.orig/fastjet-config.in
++++ fastjet.git/fastjet-config.in
+@@ -168,7 +168,7 @@ arg_yesno_list="shared plugins rpath gue
  # default behaviour for parameters
  plugins_included="no"
  use_shared="yes"
diff --git a/debian/patches/fortran-wrap.patch b/debian/patches/fortran-wrap.patch
index 69b3ac8..df59bbc 100644
--- a/debian/patches/fortran-wrap.patch
+++ b/debian/patches/fortran-wrap.patch
@@ -1,5 +1,7 @@
---- a/fortran_wrapper/Makefile.am
-+++ b/fortran_wrapper/Makefile.am
+Index: fastjet.git/fortran_wrapper/Makefile.am
+===================================================================
+--- fastjet.git.orig/fortran_wrapper/Makefile.am
++++ fastjet.git/fortran_wrapper/Makefile.am
 @@ -1 +1,5 @@
 -EXTRA_DIST = README Makefile.alt fastjetfortran.cc fastjet_fortran_example.f
 +EXTRA_DIST = README Makefile.alt fastjet_fortran_example.f
@@ -7,8 +9,10 @@
 +lib_LTLIBRARIES = libfastjet-fortran.la
 +libfastjet_fortran_la_SOURCES = fastjetfortran.cc
 +libfastjet_fortran_la_CXXFLAGS = -I$(srcdir)/../include -I$(srcdir)/../plugins/SISCone
---- a/fortran_wrapper/Makefile.alt
-+++ b/fortran_wrapper/Makefile.alt
+Index: fastjet.git/fortran_wrapper/Makefile.alt
+===================================================================
+--- fastjet.git.orig/fortran_wrapper/Makefile.alt
++++ fastjet.git/fortran_wrapper/Makefile.alt
 @@ -18,7 +18,7 @@ F77FLAGS = -O -g
  
  # get the fastjet libraries
diff --git a/debian/patches/libfastjetplugins-links-gfortran.patch b/debian/patches/libfastjetplugins-links-gfortran.patch
index 34b36ae..75b7150 100644
--- a/debian/patches/libfastjetplugins-links-gfortran.patch
+++ b/debian/patches/libfastjetplugins-links-gfortran.patch
@@ -1,5 +1,7 @@
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
+Index: fastjet.git/plugins/Makefile.am
+===================================================================
+--- fastjet.git.orig/plugins/Makefile.am
++++ fastjet.git/plugins/Makefile.am
 @@ -44,7 +44,7 @@ if MONOLITHIC_PLUGINS
  lib_LTLIBRARIES = libfastjetplugins.la
  libfastjetplugins_la_SOURCES=
diff --git a/debian/patches/libfastjetplugins-links-siscone.patch b/debian/patches/libfastjetplugins-links-siscone.patch
index 6781b9a..13c14fa 100644
--- a/debian/patches/libfastjetplugins-links-siscone.patch
+++ b/debian/patches/libfastjetplugins-links-siscone.patch
@@ -1,5 +1,7 @@
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
+Index: fastjet.git/plugins/Makefile.am
+===================================================================
+--- fastjet.git.orig/plugins/Makefile.am
++++ fastjet.git/plugins/Makefile.am
 @@ -44,7 +44,7 @@ if MONOLITHIC_PLUGINS
  lib_LTLIBRARIES = libfastjetplugins.la
  libfastjetplugins_la_SOURCES=
diff --git a/debian/patches/reproducible-builds b/debian/patches/reproducible-builds
index 3f66988..d0d1af5 100644
--- a/debian/patches/reproducible-builds
+++ b/debian/patches/reproducible-builds
@@ -6,8 +6,10 @@ Bug-Debian: https://bugs.debian.org/787865
 Last-Update: 2016-06-13
 Forwarded: no
 
---- a/Doxyfile
-+++ b/Doxyfile
+Index: fastjet.git/Doxyfile
+===================================================================
+--- fastjet.git.orig/Doxyfile
++++ fastjet.git/Doxyfile
 @@ -1259,7 +1259,7 @@ HTML_COLORSTYLE_GAMMA  = 80
  # The default value is: NO.
  # This tag requires that the tag GENERATE_HTML is set to YES.
diff --git a/debian/patches/use_debian_packaged_siscone.patch b/debian/patches/use_debian_packaged_siscone.patch
index ba8b7ad..81d5467 100644
--- a/debian/patches/use_debian_packaged_siscone.patch
+++ b/debian/patches/use_debian_packaged_siscone.patch
@@ -3,8 +3,10 @@ Bug-Debian: https://bugs.debian.org/999761
 Author: Andreas Tille <tille@debian.org>
 Last-Update: Wed, 09 Mar 2022 09:35:36 +0100
 
---- a/plugins/SISCone/Makefile.am
-+++ b/plugins/SISCone/Makefile.am
+Index: fastjet.git/plugins/SISCone/Makefile.am
+===================================================================
+--- fastjet.git.orig/plugins/SISCone/Makefile.am
++++ fastjet.git/plugins/SISCone/Makefile.am
 @@ -1,12 +1,12 @@
 -SUBDIRS = siscone fastjet .
 +SUBDIRS = fastjet .
@@ -21,8 +23,10 @@ Last-Update: Wed, 09 Mar 2022 09:35:36 +0100
 +libSISConePlugin_la_LIBADD = ../../src/libfastjet.la -lsiscone -lsiscone_spherical
  
  EXTRA_DIST = makefile.static
---- a/example/Makefile.am
-+++ b/example/Makefile.am
+Index: fastjet.git/example/Makefile.am
+===================================================================
+--- fastjet.git.orig/example/Makefile.am
++++ fastjet.git/example/Makefile.am
 @@ -42,8 +42,8 @@ noinst_PROGRAMS += 03-plugin
  #03_plugin_SHORTNAME = 03
  03_plugin_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include
diff --git a/doc/fastjet-doc.tex b/doc/fastjet-doc.tex
index e0c580f..4cdda8b 100644
--- a/doc/fastjet-doc.tex
+++ b/doc/fastjet-doc.tex
@@ -81,7 +81,7 @@
 
 \title{\sf FastJet user manual%
   \\ \large (for version
-  3.4.0%  %%%-VERSION-NUMBER (do not remove this comment; used
+  3.4.1%  %%%-VERSION-NUMBER (do not remove this comment; used
              %  for automatic version-number changes; version number must
              %  stay one a single line)
   )
@@ -1638,6 +1638,26 @@ consisting of all the particles in the event.
 In such a context it is only the \ttt{exclusive\_jets(...)} call that
 provides non-trivial information.
 
+
+%
+Note that the default clustering strategy (\ttt{N2Plain}) evaluates
+$1- \cos\theta_{ij}$ using a dot product between normalised
+four-vectors.
+%
+Rounding error case this to break down when
+$\theta_{ij} \lesssim \sqrt{\epsilon}$, where $\epsilon$ is the
+machine precision.
+%
+For applications where it is important to have reliable clustering for
+particles at angles smaller than $\sqrt{\epsilon}$, one should use the
+\ttt{N2PlainEEAccurate} strategy, which uses a cross-product to
+determine $\theta_{ij}$ for $\theta_{ij} \lesssim \epsilon^{1/4}$.
+%
+It pushes the breakdown point to $\theta_{ij} \sim \epsilon$, though
+it is about $15\%$ slower.
+%
+
+
 %......................................................................
 \subsection[$k_t$ algorithm for $e^+e^-$ collisions]
 {$\boldsymbol{k_t}$ algorithm for $\boldsymbol{e^+e^-}$ collisions}
@@ -1668,6 +1688,10 @@ $p=1$ gives a clustering sequence that is identical to that of the
 %
 The normalisation of the $d_{ij}$'s will however be different.
 
+As with the algorithms of section~\ref{sec:ee-algs} the default
+strategy is \ttt{N2Plain}, but for applications with particles at
+particularly small angles to each other, the \ttt{N2PlainEEAccurate}
+strategy should instead be used.
 
 %======================================================================
 \section{Plugin jet algorithms}
@@ -5264,6 +5288,15 @@ single-jet reclustering.
 Should users have applications where such improvements are
 critical, they are encouraged to contact the \fastjet authors.
 
+A final comment concerns the native $e^+e^-$ algorithms (\ttt{eekt}
+and \ttt{ee\_genkt}).
+%
+By default these always use an \ttt{N2Plain} strategy.
+%
+A more accurate \ttt{N2PlainEEAccurate} strategy is also available, as
+discussed in section~\ref{sec:ee-algs}, with a speed penalty of about
+$15\%$.
+ 
 %======================================================================
 \section{User Info in PseudoJets}
 \label{app:user-info}
diff --git a/fastjet-config.in b/fastjet-config.in
index 451ddc6..703f02a 100755
--- a/fastjet-config.in
+++ b/fastjet-config.in
@@ -14,7 +14,8 @@ exec_prefix=@exec_prefix@
 installationdir=@prefix@
 libdir=@libdir@
 includedir=@includedir@
-
+PYTHON_EXEC_PREFIX=@PYTHON_EXEC_PREFIX@
+PYTHON_PREFIX=@PYTHON_PREFIX@
 
 # print a usage message and exit
 # exit code passed as argument:
diff --git a/fortran_wrapper/fastjetfortran.cc b/fortran_wrapper/fastjetfortran.cc
index 6bd6eac..e1c7f6a 100644
--- a/fortran_wrapper/fastjetfortran.cc
+++ b/fortran_wrapper/fastjetfortran.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ActiveAreaSpec.hh b/include/fastjet/ActiveAreaSpec.hh
index d37b750..fe1cfb3 100644
--- a/include/fastjet/ActiveAreaSpec.hh
+++ b/include/fastjet/ActiveAreaSpec.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/AreaDefinition.hh b/include/fastjet/AreaDefinition.hh
index 22c4e33..7b26fc2 100644
--- a/include/fastjet/AreaDefinition.hh
+++ b/include/fastjet/AreaDefinition.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2006-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/CircularRange.hh b/include/fastjet/CircularRange.hh
index 659d39a..d6f3dd6 100644
--- a/include/fastjet/CircularRange.hh
+++ b/include/fastjet/CircularRange.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ClusterSequence.hh b/include/fastjet/ClusterSequence.hh
index 97cf8f7..d2822a4 100644
--- a/include/fastjet/ClusterSequence.hh
+++ b/include/fastjet/ClusterSequence.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -345,6 +345,23 @@ class ClusterSequence {
     _do_iB_recombination_step(jet_i, diB);
   }
 
+  /// return a non-const reference to the jets()[i], to allow plugins to
+  /// modify its contents. 
+  ///
+  /// It can only be called when the plugin is activated.
+  ///
+  /// If you reset the jet (or set it equal to another one) you _must_
+  /// ensure that final jet is given the structure_shared_ptr of the
+  /// original jet, otherwise you will end up with an inconsistent
+  /// ClusterSequence. 
+  ///
+  /// ONLY USE THIS IF YOU ARE SURE YOU KNOW WHAT YOU ARE DOING (contact
+  /// FJ authors if you think you need this but are unsure)
+  PseudoJet & plugin_non_const_jet(unsigned i) {
+    assert(plugin_activated());
+    return _jets[i];
+  }
+
   /// @ingroup extra_info
   /// \class Extras
   /// base class to store extra information that plugins may provide
@@ -414,33 +431,39 @@ public:
   /// 
   /// (see vector _history below).
   struct history_element{
-    int parent1; /// index in _history where first parent of this jet
-                 /// was created (InexistentParent if this jet is an
-                 /// original particle)
-
-    int parent2; /// index in _history where second parent of this jet
-                 /// was created (InexistentParent if this jet is an
-                 /// original particle); BeamJet if this history entry
-                 /// just labels the fact that the jet has recombined
-                 /// with the beam)
-
-    int child;   /// index in _history where the current jet is
-		 /// recombined with another jet to form its child. It
-		 /// is Invalid if this jet does not further
-		 /// recombine.
-
-    int jetp_index; /// index in the _jets vector where we will find the
-                 /// PseudoJet object corresponding to this jet
-                 /// (i.e. the jet created at this entry of the
-                 /// history). NB: if this element of the history
-                 /// corresponds to a beam recombination, then
-                 /// jetp_index=Invalid.
-
-    double dij;  /// the distance corresponding to the recombination
-		 /// at this stage of the clustering.
-
-    double max_dij_so_far; /// the largest recombination distance seen
-			   /// so far in the clustering history.
+    /// index in _history where first parent of this jet
+    /// was created (InexistentParent if this jet is an
+    /// original particle)
+    int parent1; 
+
+    /// index in _history where second parent of this jet
+    /// was created (InexistentParent if this jet is an
+    /// original particle); BeamJet if this history entry
+    /// just labels the fact that the jet has recombined
+    /// with the beam)
+    int parent2; 
+
+    /// index in _history where the current jet is
+		/// recombined with another jet to form its child. It
+		/// is Invalid if this jet does not further
+		/// recombine.
+    int child;   
+
+    /// index in the _jets vector where we will find the
+    /// PseudoJet object corresponding to this jet
+    /// (i.e. the jet created at this entry of the
+    /// history). NB: if this element of the history
+    /// corresponds to a beam recombination, then
+    /// jetp_index=Invalid.
+    int jetp_index; 
+
+    /// the distance corresponding to the recombination
+    /// at this stage of the clustering.
+    double dij;  
+
+    /// the largest recombination distance seen
+    /// so far in the clustering history.
+    double max_dij_so_far; 
   };
 
   enum JetType {Invalid=-3, InexistentParent = -2, BeamJet = -1};
@@ -927,6 +950,11 @@ protected:
     double nx, ny, nz;  // our internal storage for fast distance calcs
   };
 
+  /// identical to EEBriefJet, but the corresponding distance
+  /// calculation (_bj_dist) is overloaded to use the more accurate
+  /// cross-product approach
+  class EEAccurateBriefJet : public EEBriefJet { };
+
   /// to help instantiation (fj 2.4.0; did not quite work on gcc 33 and os x 10.3?)
   //void _dummy_N2_cluster_instantiation();
 
@@ -935,6 +963,7 @@ protected:
   void _simple_N2_cluster_BriefJet();
   /// to avoid issues with template instantiation (OS X 10.3, gcc 3.3)
   void _simple_N2_cluster_EEBriefJet();
+  void _simple_N2_cluster_EEAccurateBriefJet();
 };
 
 
diff --git a/include/fastjet/ClusterSequence1GhostPassiveArea.hh b/include/fastjet/ClusterSequence1GhostPassiveArea.hh
index d17941e..9e3b018 100644
--- a/include/fastjet/ClusterSequence1GhostPassiveArea.hh
+++ b/include/fastjet/ClusterSequence1GhostPassiveArea.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ClusterSequenceActiveArea.hh b/include/fastjet/ClusterSequenceActiveArea.hh
index 5413695..1d13f12 100644
--- a/include/fastjet/ClusterSequenceActiveArea.hh
+++ b/include/fastjet/ClusterSequenceActiveArea.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh b/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
index 739dd45..daabc2d 100644
--- a/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
+++ b/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ClusterSequenceArea.hh b/include/fastjet/ClusterSequenceArea.hh
index 59b8615..f7b0e9f 100644
--- a/include/fastjet/ClusterSequenceArea.hh
+++ b/include/fastjet/ClusterSequenceArea.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2006-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ClusterSequenceAreaBase.hh b/include/fastjet/ClusterSequenceAreaBase.hh
index 5b2aeb6..f2f340c 100644
--- a/include/fastjet/ClusterSequenceAreaBase.hh
+++ b/include/fastjet/ClusterSequenceAreaBase.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ClusterSequencePassiveArea.hh b/include/fastjet/ClusterSequencePassiveArea.hh
index ac170c6..c929da7 100644
--- a/include/fastjet/ClusterSequencePassiveArea.hh
+++ b/include/fastjet/ClusterSequencePassiveArea.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ClusterSequenceStructure.hh b/include/fastjet/ClusterSequenceStructure.hh
index 14c78ab..b7213f0 100644
--- a/include/fastjet/ClusterSequenceStructure.hh
+++ b/include/fastjet/ClusterSequenceStructure.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ClusterSequenceVoronoiArea.hh b/include/fastjet/ClusterSequenceVoronoiArea.hh
index 8cb1b4e..de7090a 100644
--- a/include/fastjet/ClusterSequenceVoronoiArea.hh
+++ b/include/fastjet/ClusterSequenceVoronoiArea.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/ClusterSequenceWithArea.hh b/include/fastjet/ClusterSequenceWithArea.hh
index b9e2d96..40afc4e 100644
--- a/include/fastjet/ClusterSequenceWithArea.hh
+++ b/include/fastjet/ClusterSequenceWithArea.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2006-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/CompositeJetStructure.hh b/include/fastjet/CompositeJetStructure.hh
index c2ccc83..44f877a 100644
--- a/include/fastjet/CompositeJetStructure.hh
+++ b/include/fastjet/CompositeJetStructure.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/Error.hh b/include/fastjet/Error.hh
index 82926f6..a0c511a 100644
--- a/include/fastjet/Error.hh
+++ b/include/fastjet/Error.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/FunctionOfPseudoJet.hh b/include/fastjet/FunctionOfPseudoJet.hh
index 7f97cd6..cb59ba5 100644
--- a/include/fastjet/FunctionOfPseudoJet.hh
+++ b/include/fastjet/FunctionOfPseudoJet.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/GhostedAreaSpec.hh b/include/fastjet/GhostedAreaSpec.hh
index 6fd9316..805128d 100644
--- a/include/fastjet/GhostedAreaSpec.hh
+++ b/include/fastjet/GhostedAreaSpec.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/JetDefinition.hh b/include/fastjet/JetDefinition.hh
index 2d588f4..8d7109e 100644
--- a/include/fastjet/JetDefinition.hh
+++ b/include/fastjet/JetDefinition.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -123,6 +123,13 @@ enum Strategy {
   /// the automatic strategy choice that was being made in FJ 3.0
   /// (restricted to strategies that were present in FJ 3.0)
   BestFJ30     =  21, 
+  /// a variant of N2Plain strategy for native \f$e^+e^-\f$ algorithms
+  /// (eekt, ee_genkt) that uses a more accurate calculation of the
+  /// distance measure when angles between PseudoJets are smaller than
+  /// \f$\epsilon^{1/4}\f$, where \f$\epsilon\f$ is the machine
+  /// precision. It shifts the breakdown point from \f$\theta\sim
+  /// \sqrt{\epsilon}\f$ to \f$\theta \sim \epsilon\f$.
+  N2PlainEEAccurate =  31,
   /// the plugin has been used...
   plugin_strategy = 999
 };
diff --git a/include/fastjet/LimitedWarning.hh b/include/fastjet/LimitedWarning.hh
index 4cbf6bf..26579b8 100644
--- a/include/fastjet/LimitedWarning.hh
+++ b/include/fastjet/LimitedWarning.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/NNBase.hh b/include/fastjet/NNBase.hh
index 414397b..d899d4d 100644
--- a/include/fastjet/NNBase.hh
+++ b/include/fastjet/NNBase.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2016-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2016-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/NNFJN2Plain.hh b/include/fastjet/NNFJN2Plain.hh
index 9fdeea2..3617bc9 100644
--- a/include/fastjet/NNFJN2Plain.hh
+++ b/include/fastjet/NNFJN2Plain.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/NNFJN2Tiled.hh b/include/fastjet/NNFJN2Tiled.hh
index a0cb83f..6e210bc 100644
--- a/include/fastjet/NNFJN2Tiled.hh
+++ b/include/fastjet/NNFJN2Tiled.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2016-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2016-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/NNH.hh b/include/fastjet/NNH.hh
index 18455a1..485374d 100644
--- a/include/fastjet/NNH.hh
+++ b/include/fastjet/NNH.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/PseudoJet.hh b/include/fastjet/PseudoJet.hh
index 4752be3..0495a05 100644
--- a/include/fastjet/PseudoJet.hh
+++ b/include/fastjet/PseudoJet.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -523,6 +523,10 @@ class PseudoJet {
     return _user_info;
   }
 
+  void set_user_info_shared_ptr(const SharedPtr<UserInfoBase> & user_info_in) {
+    _user_info = user_info_in;
+  }
+
   // \} --- end of extra info functions ---------------------------------
 
   //----------------------------------------------------------------------
@@ -693,7 +697,7 @@ class PseudoJet {
   /// associated ClusterSequence
   virtual bool contains(const PseudoJet &constituent) const;
 
-  /// check if the current PseudoJet is contained the one passed as
+  /// check if the current PseudoJet is contained in the one passed as
   /// argument.
   ///
   /// an Error is thrown if this PseudoJet has no currently valid
@@ -1086,9 +1090,29 @@ inline void PseudoJet::reset_momentum(const PseudoJet & pj) {
   _py  = pj._py ;
   _pz  = pj._pz ;
   _E   = pj._E  ;
+#ifdef FASTJET_HAVE_THREAD_SAFETY
+  // the following lines are here to address the situation where
+  // the current form of the jet has Init_Done, but the other jet does
+  // not (or is in the process of being initialized, so that copying
+  // is dangerous). 
+  // We take the approach of verifying if the pj has been initialised
+  // and if it has we take its cached phi & rapidity, otherwise
+  // we call _finish_init(), which sets Init_NotDone and puts
+  // rapidity & phi to invalid values. 
+  int expected = Init_Done;
+  if (pj._init_status.compare_exchange_weak(expected, Init_Done)) {
+    _init_status = Init_Done;
+    _phi = pj._phi;
+    _rap = pj._rap;
+    _kt2 = pj._kt2;
+  } else {
+    _finish_init();
+  }
+#else 
   _phi = pj._phi;
   _rap = pj._rap;
   _kt2 = pj._kt2;
+#endif
 }
 
 //-------------------------------------------------------------------------------
diff --git a/include/fastjet/PseudoJetStructureBase.hh b/include/fastjet/PseudoJetStructureBase.hh
index 7419028..9a0c9e7 100644
--- a/include/fastjet/PseudoJetStructureBase.hh
+++ b/include/fastjet/PseudoJetStructureBase.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/RangeDefinition.hh b/include/fastjet/RangeDefinition.hh
index 507048a..a6d0c07 100644
--- a/include/fastjet/RangeDefinition.hh
+++ b/include/fastjet/RangeDefinition.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/RectangularGrid.hh b/include/fastjet/RectangularGrid.hh
index 7a4dd6c..830cc3c 100644
--- a/include/fastjet/RectangularGrid.hh
+++ b/include/fastjet/RectangularGrid.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/Selector.hh b/include/fastjet/Selector.hh
index 8026258..1be5266 100644
--- a/include/fastjet/Selector.hh
+++ b/include/fastjet/Selector.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2009-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -330,14 +330,14 @@ public:
 protected:
   /// Helper for copying selector workers if needed
   ///
-  /// The following is needed if we want to modify a selectors that
+  /// The following is needed if we want to modify a selector that
   /// shares a worker with another selector. In that case, we need to
   /// get another copy of the worker to avoid interferences
   ///
   /// Note that any non-const operation has to call this to behave
   /// correctly w.r.t shared workers!
   void _copy_worker_if_needed(){
-    // do nothing if there's a sinlge user of the worker
+    // do nothing if there's a single user of the worker
     if (_worker.unique()) return;
 
     // call the worker's copy
diff --git a/include/fastjet/SharedPtr.hh b/include/fastjet/SharedPtr.hh
index aeb919e..ab1861f 100644
--- a/include/fastjet/SharedPtr.hh
+++ b/include/fastjet/SharedPtr.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -315,7 +315,7 @@ inline bool operator!=(SharedPtr<T> const & t, SharedPtr<U> const & u){
   return t.get() != u.get();
 }
 
-/// comparison: orgering
+/// comparison: ordering
 template<class T,class U>
 inline bool operator<(SharedPtr<T> const & t, SharedPtr<U> const & u){
   return t.get() < u.get();
@@ -608,7 +608,7 @@ inline bool operator!=(SharedPtr<T> const & t, SharedPtr<U> const & u){
   return t.get() != u.get();
 }
 
-/// comparison: orgering
+/// comparison: ordering
 template<class T,class U>
 inline bool operator<(SharedPtr<T> const & t, SharedPtr<U> const & u){
   return t.get() < u.get();
diff --git a/include/fastjet/WrappedStructure.hh b/include/fastjet/WrappedStructure.hh
index 014fabf..e7e2d79 100644
--- a/include/fastjet/WrappedStructure.hh
+++ b/include/fastjet/WrappedStructure.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/config_win.h b/include/fastjet/config_win.h
index 0ad2f9d..2693fb6 100644
--- a/include/fastjet/config_win.h
+++ b/include/fastjet/config_win.h
@@ -1,10 +1,10 @@
-#define FASTJET_PACKAGE_STRING  "FastJet 3.4.0"
-#define FASTJET_PACKAGE_VERSION  "3.4.0"
-#define FASTJET_VERSION  "3.4.0"
+#define FASTJET_PACKAGE_STRING  "FastJet 3.4.1"
+#define FASTJET_PACKAGE_VERSION  "3.4.1"
+#define FASTJET_VERSION  "3.4.1"
 #define FASTJET_VERSION_MAJOR       3
 #define FASTJET_VERSION_MINOR       4
-#define FASTJET_VERSION_PATCHLEVEL  0
-#define FASTJET_VERSION_NUMBER      30400
+#define FASTJET_VERSION_PATCHLEVEL  1
+#define FASTJET_VERSION_NUMBER      30401
 
 /* The ATLASCone plugin is disabled by default*/
 #undef FASTJET_ENABLE_PLUGIN_ATLASCONE 
diff --git a/include/fastjet/internal/ClosestPair2D.hh b/include/fastjet/internal/ClosestPair2D.hh
index 7e82bc5..d1634d2 100644
--- a/include/fastjet/internal/ClosestPair2D.hh
+++ b/include/fastjet/internal/ClosestPair2D.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/ClosestPair2DBase.hh b/include/fastjet/internal/ClosestPair2DBase.hh
index 57f0338..c732fe4 100644
--- a/include/fastjet/internal/ClosestPair2DBase.hh
+++ b/include/fastjet/internal/ClosestPair2DBase.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/ClusterSequence_N2.icc b/include/fastjet/internal/ClusterSequence_N2.icc
index e0a3dff..458f087 100644
--- a/include/fastjet/internal/ClusterSequence_N2.icc
+++ b/include/fastjet/internal/ClusterSequence_N2.icc
@@ -6,7 +6,7 @@
 //FJSTARTHEADER
 // $Id: ClusterSequence_N2.cc 1351 2009-01-09 18:03:03Z salam $
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -83,7 +83,6 @@ template<class BJ> void ClusterSequence::_simple_N2_cluster() {
   }
 
   // now run the recombination loop
-  int history_location = n-1;
   while (tail != head) {
 
     // find the minimum of the diJ on this round
@@ -94,7 +93,6 @@ template<class BJ> void ClusterSequence::_simple_N2_cluster() {
     }
     
     // do the recombination between A and B
-    history_location++;
     jetA = & briefjets[diJ_min_jet];
     // GPS mod 2009-02-11
     //jetB = jetA->NN;
diff --git a/include/fastjet/internal/Dnn2piCylinder.hh b/include/fastjet/internal/Dnn2piCylinder.hh
index 4a3dc83..c5e15b1 100644
--- a/include/fastjet/internal/Dnn2piCylinder.hh
+++ b/include/fastjet/internal/Dnn2piCylinder.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/Dnn3piCylinder.hh b/include/fastjet/internal/Dnn3piCylinder.hh
index d1376fa..78443cc 100644
--- a/include/fastjet/internal/Dnn3piCylinder.hh
+++ b/include/fastjet/internal/Dnn3piCylinder.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/Dnn4piCylinder.hh b/include/fastjet/internal/Dnn4piCylinder.hh
index 8d7e331..6e7f7fb 100644
--- a/include/fastjet/internal/Dnn4piCylinder.hh
+++ b/include/fastjet/internal/Dnn4piCylinder.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/DnnPlane.hh b/include/fastjet/internal/DnnPlane.hh
index 580d13a..1895a35 100644
--- a/include/fastjet/internal/DnnPlane.hh
+++ b/include/fastjet/internal/DnnPlane.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/DynamicNearestNeighbours.hh b/include/fastjet/internal/DynamicNearestNeighbours.hh
index d70e213..3bdeebd 100644
--- a/include/fastjet/internal/DynamicNearestNeighbours.hh
+++ b/include/fastjet/internal/DynamicNearestNeighbours.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/IsBase.hh b/include/fastjet/internal/IsBase.hh
index 0771d76..4315d6b 100644
--- a/include/fastjet/internal/IsBase.hh
+++ b/include/fastjet/internal/IsBase.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/LazyTiling25.hh b/include/fastjet/internal/LazyTiling25.hh
index 685dc92..6703f30 100644
--- a/include/fastjet/internal/LazyTiling25.hh
+++ b/include/fastjet/internal/LazyTiling25.hh
@@ -6,7 +6,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/LazyTiling9.hh b/include/fastjet/internal/LazyTiling9.hh
index e4c98f9..aa2f1be 100644
--- a/include/fastjet/internal/LazyTiling9.hh
+++ b/include/fastjet/internal/LazyTiling9.hh
@@ -6,7 +6,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/LazyTiling9Alt.hh b/include/fastjet/internal/LazyTiling9Alt.hh
index 50ad0c5..ed534ea 100644
--- a/include/fastjet/internal/LazyTiling9Alt.hh
+++ b/include/fastjet/internal/LazyTiling9Alt.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/LazyTiling9SeparateGhosts.hh b/include/fastjet/internal/LazyTiling9SeparateGhosts.hh
index 1d32c07..e3bde74 100644
--- a/include/fastjet/internal/LazyTiling9SeparateGhosts.hh
+++ b/include/fastjet/internal/LazyTiling9SeparateGhosts.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/LimitedWarning.hh b/include/fastjet/internal/LimitedWarning.hh
index a62dd9a..8869ede 100644
--- a/include/fastjet/internal/LimitedWarning.hh
+++ b/include/fastjet/internal/LimitedWarning.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/MinHeap.hh b/include/fastjet/internal/MinHeap.hh
index 4fac9f0..51d6730 100644
--- a/include/fastjet/internal/MinHeap.hh
+++ b/include/fastjet/internal/MinHeap.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/SearchTree.hh b/include/fastjet/internal/SearchTree.hh
index 081bdb0..d22af5a 100644
--- a/include/fastjet/internal/SearchTree.hh
+++ b/include/fastjet/internal/SearchTree.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/TilingExtent.hh b/include/fastjet/internal/TilingExtent.hh
index b26b3b0..208737b 100644
--- a/include/fastjet/internal/TilingExtent.hh
+++ b/include/fastjet/internal/TilingExtent.hh
@@ -6,7 +6,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/Triangulation.hh b/include/fastjet/internal/Triangulation.hh
index 847b390..2ce3ec5 100644
--- a/include/fastjet/internal/Triangulation.hh
+++ b/include/fastjet/internal/Triangulation.hh
@@ -5,7 +5,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/Voronoi.hh b/include/fastjet/internal/Voronoi.hh
index 9c7bdd9..f334c55 100644
--- a/include/fastjet/internal/Voronoi.hh
+++ b/include/fastjet/internal/Voronoi.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/base.hh b/include/fastjet/internal/base.hh
index 701e4ea..e1cc30d 100644
--- a/include/fastjet/internal/base.hh
+++ b/include/fastjet/internal/base.hh
@@ -2,7 +2,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/deprecated.hh b/include/fastjet/internal/deprecated.hh
index 665923c..48ef9cf 100644
--- a/include/fastjet/internal/deprecated.hh
+++ b/include/fastjet/internal/deprecated.hh
@@ -2,7 +2,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/numconsts.hh b/include/fastjet/internal/numconsts.hh
index a7eb80c..c4d3b1f 100644
--- a/include/fastjet/internal/numconsts.hh
+++ b/include/fastjet/internal/numconsts.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/internal/thread_safety_helpers.hh b/include/fastjet/internal/thread_safety_helpers.hh
index bb861aa..3e38735 100644
--- a/include/fastjet/internal/thread_safety_helpers.hh
+++ b/include/fastjet/internal/thread_safety_helpers.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2014-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2014-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/include/fastjet/version.hh b/include/fastjet/version.hh
index 4dc85bb..0a962f1 100644
--- a/include/fastjet/version.hh
+++ b/include/fastjet/version.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index c4c0294..e7b6833 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,6 +1,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+#   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -31,7 +32,7 @@ m4_define([_LT_COPYING], [dnl
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ])
 
-# serial 58 LT_INIT
+# serial 59 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -181,6 +182,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_DECL_FILECMD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
 m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
@@ -219,8 +221,8 @@ esac
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -777,7 +779,7 @@ _LT_EOF
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
+  $SED '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
    mv -f "$cfgfile" "$ofile" ||
@@ -1041,8 +1043,8 @@ int forced_loaded() { return 2;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
       echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
       $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
       cat > conftest.c << _LT_EOF
@@ -1066,17 +1068,12 @@ _LT_EOF
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[912]]*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]][[,.]]*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*|11.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
@@ -1125,12 +1122,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
     output_verbose_link_cmd=func_echo_all
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
     m4_if([$1], [CXX],
 [   if test yes != "$lt_cv_apple_cc_single_mod"; then
       _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 ],[])
   else
@@ -1244,7 +1241,8 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 # _LT_WITH_SYSROOT
 # ----------------
 AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
+[m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([for sysroot])
 AC_ARG_WITH([sysroot],
 [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
   [Search for dependent libraries within DIR (or the compiler's sysroot
@@ -1261,7 +1259,7 @@ case $with_sysroot in #(
    fi
    ;; #(
  /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
    ;; #(
  no|'')
    ;; #(
@@ -1291,7 +1289,7 @@ ia64-*-hpux*)
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
@@ -1308,7 +1306,7 @@ ia64-*-hpux*)
   echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
 	  ;;
@@ -1320,7 +1318,7 @@ ia64-*-hpux*)
 	;;
       esac
     else
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -32"
 	  ;;
@@ -1342,7 +1340,7 @@ mips64*-*linux*)
   echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *32-bit*)
 	emul="${emul}32"
 	;;
@@ -1350,7 +1348,7 @@ mips64*-*linux*)
 	emul="${emul}64"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *MSB*)
 	emul="${emul}btsmip"
 	;;
@@ -1358,7 +1356,7 @@ mips64*-*linux*)
 	emul="${emul}ltsmip"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *N32*)
 	emul="${emul}n32"
 	;;
@@ -1378,14 +1376,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
       *32-bit*)
 	case $host in
 	  x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
+	    case `$FILECMD conftest.o` in
 	      *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
@@ -1453,7 +1451,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*)
@@ -1492,9 +1490,22 @@ need_locks=$enable_libtool_lock
 m4_defun([_LT_PROG_AR],
 [AC_CHECK_TOOLS(AR, [ar], false)
 : ${AR=ar}
-: ${AR_FLAGS=cr}
 _LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}],
+         [Flags to create an archive])
 
 AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
   [lt_cv_ar_at_file=no
@@ -1713,7 +1724,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1756,7 +1767,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   sysv5* | sco5v6* | sysv4.2uw2*)
     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
     if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[	 ]]//'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
@@ -2206,26 +2217,35 @@ m4_defun([_LT_CMD_STRIPLIB],
 striplib=
 old_striplib=
 AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
+if test -z "$STRIP"; then
+  AC_MSG_RESULT([no])
 else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    AC_MSG_RESULT([yes])
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       AC_MSG_RESULT([yes])
-    else
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+      fi
+      ;;
+    *)
       AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
+      ;;
+    esac
+  fi
 fi
 _LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
 _LT_DECL([], [striplib], [1])
@@ -2548,7 +2568,7 @@ cygwin* | mingw* | pw32* | cegcc*)
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
 m4_if([$1], [],[
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
@@ -2558,14 +2578,14 @@ m4_if([$1], [],[
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl*)
-    # Native MSVC
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -2584,7 +2604,7 @@ m4_if([$1], [],[
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
@@ -2621,7 +2641,7 @@ m4_if([$1], [],[
     ;;
 
   *)
-    # Assume MSVC wrapper
+    # Assume MSVC and ICC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -2654,7 +2674,7 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@ -3465,7 +3485,7 @@ beos*)
 
 bsdi[[45]]*)
   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_cmd='$FILECMD -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
@@ -3499,14 +3519,14 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_cmd=$FILECMD
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
     esac
@@ -3520,7 +3540,7 @@ haiku*)
   ;;
 
 hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
@@ -3567,7 +3587,7 @@ netbsd* | netbsdelf*-gnu)
 
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_cmd=$FILECMD
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
@@ -3694,13 +3714,13 @@ else
 	mingw*) lt_bad_file=conftest.nm/nofile ;;
 	*) lt_bad_file=/dev/null ;;
 	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
 	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
 	  break 2
 	  ;;
 	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
 	    break 2
@@ -3726,7 +3746,7 @@ else
     # Let the user override the test.
   else
     AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
     *COFF*)
       DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
@@ -3966,7 +3986,7 @@ esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
   lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
   lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
@@ -3984,20 +4004,20 @@ fi
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
 $lt_cdecl_hook\
 " -e 's/^T .* \(.*\)$/extern int \1();/p'"\
 " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
@@ -4021,7 +4041,7 @@ for ac_symprfx in "" "_"; do
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
@@ -4039,9 +4059,9 @@ for ac_symprfx in "" "_"; do
 "     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
 "     ' prfx=^$ac_symprfx]"
   else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -4329,7 +4349,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -4412,7 +4432,7 @@ m4_if([$1], [CXX], [
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4754,7 +4774,7 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4937,7 +4957,7 @@ m4_if([$1], [CXX], [
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
@@ -4945,7 +4965,7 @@ m4_if([$1], [CXX], [
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*)
+    cl* | icl*)
       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
       ;;
     *)
@@ -5005,15 +5025,15 @@ dnl Note also adjust exclude_expsyms for C++ above.
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
+    # Microsoft Visual C++ or Intel C++ Compiler.
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
@@ -5068,7 +5088,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
       _LT_TAGVAR(whole_archive_flag_spec, $1)=
     fi
     supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+    case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -5180,6 +5200,7 @@ _LT_EOF
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
 
     interix[[3-9]]*)
@@ -5194,7 +5215,7 @@ _LT_EOF
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -5237,7 +5258,7 @@ _LT_EOF
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  ;;
 	esac
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | $SED 5q` in
 	*Sun\ C*)			# Sun C 5.9
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
@@ -5249,13 +5270,14 @@ _LT_EOF
 
         if test yes = "$supports_anon_versioning"; then
           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
             echo "local: *; };" >> $output_objdir/$libname.ver~
             $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
 	tcc*)
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
 	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
@@ -5265,7 +5287,7 @@ _LT_EOF
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test yes = "$supports_anon_versioning"; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
               echo "local: *; };" >> $output_objdir/$libname.ver~
               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
@@ -5397,7 +5419,7 @@ _LT_EOF
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -5580,12 +5602,12 @@ _LT_EOF
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
+      # Microsoft Visual C++ or Intel C++ Compiler.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl*)
-	# Native MSVC
+      cl* | icl*)
+	# Native MSVC or ICC
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -5626,7 +5648,7 @@ _LT_EOF
           fi'
 	;;
       *)
-	# Assume MSVC wrapper
+	# Assume MSVC and ICC wrapper
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -5674,7 +5696,7 @@ _LT_EOF
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    freebsd* | dragonfly* | midnightbsd*)
       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -5815,6 +5837,7 @@ _LT_EOF
 	# Fabrice Bellard et al's Tiny C Compiler
 	_LT_TAGVAR(ld_shlibs, $1)=yes
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 	;;
       esac
       ;;
@@ -5886,6 +5909,7 @@ _LT_EOF
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
 
     osf3*)
@@ -6656,8 +6680,8 @@ if test yes != "$_lt_caught_CXX_error"; then
 
       cygwin* | mingw* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
+	,cl* | no,cl* | ,icl* | no,icl*)
+	  # Native MSVC or ICC
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -6755,6 +6779,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;
 
       dgux*)
@@ -6785,7 +6810,7 @@ if test yes != "$_lt_caught_CXX_error"; then
         _LT_TAGVAR(archive_cmds_need_lc, $1)=no
         ;;
 
-      freebsd* | dragonfly*)
+      freebsd* | dragonfly* | midnightbsd*)
         # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
         # conventions
         _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -6922,7 +6947,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
       irix5* | irix6*)
         case $cc_basename in
@@ -7062,13 +7087,13 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	    if test yes = "$supports_anon_versioning"; then
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
                 echo "local: *; };" >> $output_objdir/$libname.ver~
                 $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	    fi
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1 | $SED 5q` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -8214,6 +8239,14 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program])
 AC_SUBST([DLLTOOL])
 ])
 
+# _LT_DECL_FILECMD
+# ----------------
+# Check for a file(cmd) program that can be used to detect file type and magic
+m4_defun([_LT_DECL_FILECMD],
+[AC_CHECK_TOOL([FILECMD], [file], [:])
+_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types])
+])# _LD_DECL_FILECMD
+
 # _LT_DECL_SED
 # ------------
 # Check for a fully-functional sed program, that truncates
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 94b0829..b0b5e9c 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,7 +1,7 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
-#   Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free
+#   Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 48bc934..902508b 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,6 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index fa04b52..b155d0a 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -1,6 +1,7 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation,
+#   Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -9,15 +10,15 @@
 
 # @configure_input@
 
-# serial 4179 ltversion.m4
+# serial 4245 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.6])
-m4_define([LT_PACKAGE_REVISION], [2.4.6])
+m4_define([LT_PACKAGE_VERSION], [2.4.7])
+m4_define([LT_PACKAGE_REVISION], [2.4.7])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6'
-macro_revision='2.4.6'
+[macro_version='2.4.7'
+macro_revision='2.4.7'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c6b26f8..0f7a875 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,7 +1,7 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
-#   Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free
+#   Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
diff --git a/plugins/ATLASCone/ATLASConePlugin.cc b/plugins/ATLASCone/ATLASConePlugin.cc
index a94393b..7259b0b 100644
--- a/plugins/ATLASCone/ATLASConePlugin.cc
+++ b/plugins/ATLASCone/ATLASConePlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/ATLASCone/fastjet/ATLASConePlugin.hh b/plugins/ATLASCone/fastjet/ATLASConePlugin.hh
index 91cde1d..b2ab44f 100644
--- a/plugins/ATLASCone/fastjet/ATLASConePlugin.hh
+++ b/plugins/ATLASCone/fastjet/ATLASConePlugin.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/CDFCones/CDFJetCluPlugin.cc b/plugins/CDFCones/CDFJetCluPlugin.cc
index 3c876d9..962a374 100644
--- a/plugins/CDFCones/CDFJetCluPlugin.cc
+++ b/plugins/CDFCones/CDFJetCluPlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/CDFCones/CDFMidPointPlugin.cc b/plugins/CDFCones/CDFMidPointPlugin.cc
index e02010a..0965135 100644
--- a/plugins/CDFCones/CDFMidPointPlugin.cc
+++ b/plugins/CDFCones/CDFMidPointPlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh b/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh
index 2fbaef7..d1407e8 100644
--- a/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh
+++ b/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh b/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh
index 266884b..86934e9 100644
--- a/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh
+++ b/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/CMSIterativeCone/CMSIterativeConePlugin.cc b/plugins/CMSIterativeCone/CMSIterativeConePlugin.cc
index 55cdc8b..c5a1bf3 100644
--- a/plugins/CMSIterativeCone/CMSIterativeConePlugin.cc
+++ b/plugins/CMSIterativeCone/CMSIterativeConePlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id: CMSIterativeConePlugin.cc 1504 2009-04-10 13:39:48Z salam $
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh b/plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh
index dd7b937..49f1c78 100644
--- a/plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh
+++ b/plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id: CMSIterativeConePlugin.hh 1508 2009-04-10 22:46:49Z soyez $
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/D0RunICone/D0RunIBaseConePlugin.cc b/plugins/D0RunICone/D0RunIBaseConePlugin.cc
index 3178425..aadfe78 100644
--- a/plugins/D0RunICone/D0RunIBaseConePlugin.cc
+++ b/plugins/D0RunICone/D0RunIBaseConePlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id: D0RunIBaseConePlugin.cc 1779 2010-10-25 10:32:59Z soyez $
 //
-// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2009-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh b/plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh
index 8efa34b..599b47b 100644
--- a/plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh
+++ b/plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id: D0RunIBaseConePlugin.hh 1778 2010-10-25 10:02:58Z soyez $
 //
-// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2009-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh b/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh
index d2995e4..978c8ff 100644
--- a/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh
+++ b/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id: D0RunIConePlugin.hh 1778 2010-10-25 10:02:58Z soyez $
 //
-// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2009-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh b/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh
index dd54ce9..2af8636 100644
--- a/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh
+++ b/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id: D0RunIpre96ConePlugin.hh 1778 2010-10-25 10:02:58Z soyez $
 //
-// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2009-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/D0RunIICone/D0RunIIConePlugin.cc b/plugins/D0RunIICone/D0RunIIConePlugin.cc
index a8b7f6c..edf78ee 100644
--- a/plugins/D0RunIICone/D0RunIIConePlugin.cc
+++ b/plugins/D0RunIICone/D0RunIIConePlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh b/plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh
index 095ee2d..bf701c1 100644
--- a/plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh
+++ b/plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/EECambridge/EECambridgePlugin.cc b/plugins/EECambridge/EECambridgePlugin.cc
index 807573a..2da5044 100644
--- a/plugins/EECambridge/EECambridgePlugin.cc
+++ b/plugins/EECambridge/EECambridgePlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/EECambridge/fastjet/EECambridgePlugin.hh b/plugins/EECambridge/fastjet/EECambridgePlugin.hh
index bbb3022..e479535 100644
--- a/plugins/EECambridge/fastjet/EECambridgePlugin.hh
+++ b/plugins/EECambridge/fastjet/EECambridgePlugin.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/GridJet/GridJetPlugin.cc b/plugins/GridJet/GridJetPlugin.cc
index 9a52ba5..b3b0802 100644
--- a/plugins/GridJet/GridJetPlugin.cc
+++ b/plugins/GridJet/GridJetPlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id: GridJetPlugin.cc 2268 2011-06-20 15:12:26Z salam $
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/GridJet/fastjet/GridJetPlugin.hh b/plugins/GridJet/fastjet/GridJetPlugin.hh
index 11de229..7c93353 100644
--- a/plugins/GridJet/fastjet/GridJetPlugin.hh
+++ b/plugins/GridJet/fastjet/GridJetPlugin.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id: GridJetPlugin.hh 2267 2011-06-20 15:10:23Z salam $
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/Jade/JadePlugin.cc b/plugins/Jade/JadePlugin.cc
index f1e997d..8e0100f 100644
--- a/plugins/Jade/JadePlugin.cc
+++ b/plugins/Jade/JadePlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/Jade/fastjet/JadePlugin.hh b/plugins/Jade/fastjet/JadePlugin.hh
index 1c68bcb..b52b752 100644
--- a/plugins/Jade/fastjet/JadePlugin.hh
+++ b/plugins/Jade/fastjet/JadePlugin.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/NestedDefs/NestedDefsPlugin.cc b/plugins/NestedDefs/NestedDefsPlugin.cc
index a63bd6d..477878c 100644
--- a/plugins/NestedDefs/NestedDefsPlugin.cc
+++ b/plugins/NestedDefs/NestedDefsPlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/NestedDefs/fastjet/NestedDefsPlugin.hh b/plugins/NestedDefs/fastjet/NestedDefsPlugin.hh
index aa0e581..7468326 100644
--- a/plugins/NestedDefs/fastjet/NestedDefsPlugin.hh
+++ b/plugins/NestedDefs/fastjet/NestedDefsPlugin.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/PxCone/PxConePlugin.cc b/plugins/PxCone/PxConePlugin.cc
index 08e33ea..0a3225a 100644
--- a/plugins/PxCone/PxConePlugin.cc
+++ b/plugins/PxCone/PxConePlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/PxCone/fastjet/PxConePlugin.hh b/plugins/PxCone/fastjet/PxConePlugin.hh
index 0eeba8f..76efaf2 100644
--- a/plugins/PxCone/fastjet/PxConePlugin.hh
+++ b/plugins/PxCone/fastjet/PxConePlugin.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/TrackJet/TrackJetPlugin.cc b/plugins/TrackJet/TrackJetPlugin.cc
index e3bc45c..8ef2ba6 100644
--- a/plugins/TrackJet/TrackJetPlugin.cc
+++ b/plugins/TrackJet/TrackJetPlugin.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/plugins/TrackJet/fastjet/TrackJetPlugin.hh b/plugins/TrackJet/fastjet/TrackJetPlugin.hh
index 51a89d0..6af3cd6 100644
--- a/plugins/TrackJet/fastjet/TrackJetPlugin.hh
+++ b/plugins/TrackJet/fastjet/TrackJetPlugin.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2007-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/py-compile b/py-compile
index e56d98d..81b122b 100755
--- a/py-compile
+++ b/py-compile
@@ -1,9 +1,9 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2020-02-19.23; # UTC
+scriptversion=2021-02-27.01; # UTC
 
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ scriptversion=2020-02-19.23; # UTC
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
-if [ -z "$PYTHON" ]; then
+if test -z "$PYTHON"; then
   PYTHON=python
 fi
 
@@ -96,26 +96,26 @@ done
 
 files=$*
 if test -z "$files"; then
-    usage_error "no files given"
+  usage_error "no files given"
 fi
 
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
-if [ -z "$basedir" ]; then
-    pathtrans="path = file"
+if test -z "$basedir"; then
+  pathtrans="path = file"
 else
-    pathtrans="path = os.path.join('$basedir', file)"
+  pathtrans="path = os.path.join('$basedir', file)"
 fi
 
 # if destdir was given, then it needs to be prepended to the filename to
 # byte compile but not go into the compiled file.
-if [ -z "$destdir" ]; then
-    filetrans="filepath = path"
+if test -z "$destdir"; then
+  filetrans="filepath = path"
 else
-    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
+  filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
-python_major=$($PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q')
+python_major=`$PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q'`
 if test -z "$python_major"; then
   echo "$me: could not determine $PYTHON major version, guessing 3" >&2
   python_major=3
@@ -176,7 +176,7 @@ for file in files.split():
         py_compile.compile(filepath, $import_call(filepath$import_arg2), path)
     else:
         py_compile.compile(filepath, filepath + 'o', path)
-sys.stdout.write('\n')" 2>/dev/null || :
+sys.stdout.write('\n')" 2>/dev/null || exit $?
 
 # Local Variables:
 # mode: shell-script
diff --git a/pyinterface/fastjet.i b/pyinterface/fastjet.i
index 8e91610..eea039d 100644
--- a/pyinterface/fastjet.i
+++ b/pyinterface/fastjet.i
@@ -138,7 +138,10 @@ static PyObject * FastJetError_;
 
 // include FastJetError in python module
 %pythoncode {
-  from _fastjet import FastJetError
+  if __package__ or "." in __name__:
+    from ._fastjet import FastJetError
+  else:
+    from _fastjet import FastJetError
 }
 
 FASTJET_ERRORS_AS_PYTHON_EXCEPTIONS(fastjet)
diff --git a/pyinterface/fastjet.py b/pyinterface/fastjet.py
index 668a860..fe8d9b6 100644
--- a/pyinterface/fastjet.py
+++ b/pyinterface/fastjet.py
@@ -1,7 +1,7 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 4.0.2
+# This file was automatically generated by SWIG (https://www.swig.org).
+# Version 4.1.0
 #
-# Do not make changes to this file unless you know what you are doing--modify
+# Do not make changes to this file unless you know what you are doing - modify
 # the SWIG interface file instead.
 
 """
@@ -60,9 +60,6 @@ Example
 """
 
 from sys import version_info as _swig_python_version_info
-if _swig_python_version_info < (2, 7, 0):
-    raise RuntimeError("Python 2.7 or later required")
-
 # Import the low-level C/C++ module
 if __package__ or "." in __name__:
     from . import _fastjet
@@ -84,10 +81,10 @@ def _swig_repr(self):
 
 def _swig_setattr_nondynamic_instance_variable(set):
     def set_instance_attr(self, name, value):
-        if name == "thisown":
-            self.this.own(value)
-        elif name == "this":
+        if name == "this":
             set(self, name, value)
+        elif name == "thisown":
+            self.this.own(value)
         elif hasattr(self, name) and isinstance(getattr(type(self), name), property):
             set(self, name, value)
         else:
@@ -176,7 +173,6 @@ class SwigPyIterator(object):
 
 # Register SwigPyIterator in _fastjet:
 _fastjet.SwigPyIterator_swigregister(SwigPyIterator)
-
 class vectorPJ(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -283,15 +279,16 @@ class vectorPJ(object):
 # Register vectorPJ in _fastjet:
 _fastjet.vectorPJ_swigregister(vectorPJ)
 
-
-from _fastjet import FastJetError
+if __package__ or "." in __name__:
+  from ._fastjet import FastJetError
+else:
+  from _fastjet import FastJetError
 
 _INCLUDE_FASTJET_CONFIG_AUTO_H = _fastjet._INCLUDE_FASTJET_CONFIG_AUTO_H
 FASTJET_HAVE_DLFCN_H = _fastjet.FASTJET_HAVE_DLFCN_H
 FASTJET_HAVE_EXECINFO_H = _fastjet.FASTJET_HAVE_EXECINFO_H
 FASTJET_HAVE_INTTYPES_H = _fastjet.FASTJET_HAVE_INTTYPES_H
 FASTJET_HAVE_LIBM = _fastjet.FASTJET_HAVE_LIBM
-FASTJET_HAVE_MEMORY_H = _fastjet.FASTJET_HAVE_MEMORY_H
 FASTJET_HAVE_STDINT_H = _fastjet.FASTJET_HAVE_STDINT_H
 FASTJET_HAVE_STDLIB_H = _fastjet.FASTJET_HAVE_STDLIB_H
 FASTJET_HAVE_STRINGS_H = _fastjet.FASTJET_HAVE_STRINGS_H
@@ -420,38 +417,6 @@ zeta3 = cvar.zeta3
 eulergamma = cvar.eulergamma
 ln2 = cvar.ln2
 
-def LimitedWarning_set_default_stream(ostr):
-    r"""
-
-    `set_default_stream(std::ostream *ostr)`  
-
-    sets the default output stream for all warnings (by default cerr; passing a null
-    pointer prevents warnings from being output)  
-
-    """
-    return _fastjet.LimitedWarning_set_default_stream(ostr)
-
-def LimitedWarning_set_default_max_warn(max_warn):
-    r"""
-
-    `set_default_max_warn(int max_warn)`  
-
-    sets the default maximum number of warnings of a given kind before warning
-    messages are silenced.  
-
-    """
-    return _fastjet.LimitedWarning_set_default_max_warn(max_warn)
-
-def LimitedWarning_summary():
-    r"""
-
-    `summary() -> std::string`  
-
-    returns a summary of all the warnings that came through the LimiteWarning class  
-
-    """
-    return _fastjet.LimitedWarning_summary()
-
 class Error(object):
     r"""
 
@@ -538,41 +503,6 @@ class Error(object):
 
 # Register Error in _fastjet:
 _fastjet.Error_swigregister(Error)
-
-def Error_set_print_errors(print_errors):
-    r"""
-
-    `set_print_errors(bool print_errors)`  
-
-    controls whether the error message (and the backtrace, if its printing is
-    enabled) is printed out or not  
-
-    """
-    return _fastjet.Error_set_print_errors(print_errors)
-
-def Error_set_print_backtrace(enabled):
-    r"""
-
-    `set_print_backtrace(bool enabled)`  
-
-    controls whether the backtrace is printed out with the error message or not.  
-
-    The default is "false".  
-
-    """
-    return _fastjet.Error_set_print_backtrace(enabled)
-
-def Error_set_default_stream(ostr):
-    r"""
-
-    `set_default_stream(std::ostream *ostr)`  
-
-    sets the default output stream for all errors; by default cerr; if it's null
-    then error output is suppressed.  
-
-    """
-    return _fastjet.Error_set_default_stream(ostr)
-
 class InternalError(Error):
     r"""
 
@@ -607,7 +537,6 @@ class InternalError(Error):
 
 # Register InternalError in _fastjet:
 _fastjet.InternalError_swigregister(InternalError)
-
 class PseudoJetStructureBase(object):
     r"""
 
@@ -962,7 +891,6 @@ class PseudoJetStructureBase(object):
 
 # Register PseudoJetStructureBase in _fastjet:
 _fastjet.PseudoJetStructureBase_swigregister(PseudoJetStructureBase)
-
 class PseudoJet(object):
     r"""
 
@@ -1519,6 +1447,9 @@ class PseudoJet(object):
         """
         return _fastjet.PseudoJet_user_info_shared_ptr(self, *args)
 
+    def set_user_info_shared_ptr(self, user_info_in):
+        return _fastjet.PseudoJet_set_user_info_shared_ptr(self, user_info_in)
+
     def description(self):
         r"""
 
@@ -2123,7 +2054,6 @@ class IndexedSortHelper(object):
 
 # Register IndexedSortHelper in _fastjet:
 _fastjet.IndexedSortHelper_swigregister(IndexedSortHelper)
-
 class RangeDefinition(object):
     r"""
 
@@ -2220,7 +2150,6 @@ class RangeDefinition(object):
 
 # Register RangeDefinition in _fastjet:
 _fastjet.RangeDefinition_swigregister(RangeDefinition)
-
 class SelectorWorker(object):
     r"""
 
@@ -2377,7 +2306,6 @@ class SelectorWorker(object):
 
 # Register SelectorWorker in _fastjet:
 _fastjet.SelectorWorker_swigregister(SelectorWorker)
-
 class Selector(object):
     r"""
 
@@ -2622,7 +2550,6 @@ class Selector(object):
 # Register Selector in _fastjet:
 _fastjet.Selector_swigregister(Selector)
 
-
 def SelectorIdentity():
     return _fastjet.SelectorIdentity()
 
@@ -2750,6 +2677,7 @@ NlnNCam4pi = _fastjet.NlnNCam4pi
 NlnNCam2pi2R = _fastjet.NlnNCam2pi2R
 NlnNCam = _fastjet.NlnNCam
 BestFJ30 = _fastjet.BestFJ30
+N2PlainEEAccurate = _fastjet.N2PlainEEAccurate
 plugin_strategy = _fastjet.plugin_strategy
 kt_algorithm = _fastjet.kt_algorithm
 cambridge_algorithm = _fastjet.cambridge_algorithm
@@ -3046,26 +2974,6 @@ aachen_algorithm = cvar.aachen_algorithm
 cambridge_aachen_algorithm = cvar.cambridge_aachen_algorithm
 JetDefinition.max_allowable_R = _fastjet.cvar.JetDefinition_max_allowable_R
 
-def JetDefinition_algorithm_description(jet_alg):
-    r"""
-
-    `algorithm_description(const JetAlgorithm jet_alg) -> std::string`  
-
-    a short textual description of the algorithm jet_alg  
-
-    """
-    return _fastjet.JetDefinition_algorithm_description(jet_alg)
-
-def JetDefinition_n_parameters_for_algorithm(jet_alg):
-    r"""
-
-    `n_parameters_for_algorithm(const JetAlgorithm jet_alg) -> unsigned int`  
-
-    the number of parameters associated to a given jet algorithm  
-
-    """
-    return _fastjet.JetDefinition_n_parameters_for_algorithm(jet_alg)
-
 
 def join(*args):
     return _fastjet.join(*args)
@@ -3224,7 +3132,6 @@ class CompositeJetStructure(PseudoJetStructureBase):
 
 # Register CompositeJetStructure in _fastjet:
 _fastjet.CompositeJetStructure_swigregister(CompositeJetStructure)
-
 class ClusterSequenceStructure(PseudoJetStructureBase):
     r"""
 
@@ -3600,7 +3507,6 @@ class ClusterSequenceStructure(PseudoJetStructureBase):
 
 # Register ClusterSequenceStructure in _fastjet:
 _fastjet.ClusterSequenceStructure_swigregister(ClusterSequenceStructure)
-
 class ClusterSequence(object):
     r"""
 
@@ -4032,6 +3938,9 @@ class ClusterSequence(object):
         """
         return _fastjet.ClusterSequence_plugin_record_iB_recombination(self, jet_i, diB)
 
+    def plugin_non_const_jet(self, i):
+        return _fastjet.ClusterSequence_plugin_non_const_jet(self, i)
+
     def plugin_associate_extras(self, extras_in):
         r"""
 
@@ -4277,39 +4186,6 @@ class ClusterSequence(object):
 
 # Register ClusterSequence in _fastjet:
 _fastjet.ClusterSequence_swigregister(ClusterSequence)
-
-def ClusterSequence_print_banner():
-    r"""
-
-    `print_banner()`  
-
-    This is the function that is automatically called during clustering to print the
-    FastJet banner.  
-
-    Only the first call to this function will result in the printout of the banner.
-    Users may wish to call this function themselves, during the initialization phase
-    of their program, in order to ensure that the banner appears before other
-    output. This call will not affect 3rd-party banners, e.g. those from plugins.  
-
-    """
-    return _fastjet.ClusterSequence_print_banner()
-
-def ClusterSequence_set_fastjet_banner_stream(ostr):
-    return _fastjet.ClusterSequence_set_fastjet_banner_stream(ostr)
-
-def ClusterSequence_fastjet_banner_stream():
-    r"""
-
-    `fastjet_banner_stream() -> std::ostream *`  
-
-    returns a pointer to the stream to be used to print banners (cout by default).  
-
-    This function is used by plugins to determine where to direct their banners.
-    Plugins should properly handle the case where the pointer is null.  
-
-    """
-    return _fastjet.ClusterSequence_fastjet_banner_stream()
-
 class TilingBase(object):
     r"""
 
@@ -4448,7 +4324,6 @@ class TilingBase(object):
 
 # Register TilingBase in _fastjet:
 _fastjet.TilingBase_swigregister(TilingBase)
-
 class RectangularGrid(TilingBase):
     r"""
 
@@ -4606,7 +4481,6 @@ class RectangularGrid(TilingBase):
 
 # Register RectangularGrid in _fastjet:
 _fastjet.RectangularGrid_swigregister(RectangularGrid)
-
 class _NoInfo(object):
     r"""
 
@@ -4626,7 +4500,6 @@ class _NoInfo(object):
 
 # Register _NoInfo in _fastjet:
 _fastjet._NoInfo_swigregister(_NoInfo)
-
 STATIC_GENERATOR = _fastjet.STATIC_GENERATOR
 class GhostedAreaSpec(object):
     r"""
@@ -5055,7 +4928,6 @@ class VoronoiAreaSpec(object):
 
 # Register VoronoiAreaSpec in _fastjet:
 _fastjet.VoronoiAreaSpec_swigregister(VoronoiAreaSpec)
-
 invalid_area = _fastjet.invalid_area
 active_area = _fastjet.active_area
 active_area_explicit_ghosts = _fastjet.active_area_explicit_ghosts
@@ -5134,7 +5006,6 @@ class AreaDefinition(object):
 
 # Register AreaDefinition in _fastjet:
 _fastjet.AreaDefinition_swigregister(AreaDefinition)
-
 class ClusterSequenceAreaBase(ClusterSequence):
     r"""
 
@@ -5349,7 +5220,6 @@ class ClusterSequenceAreaBase(ClusterSequence):
 
 # Register ClusterSequenceAreaBase in _fastjet:
 _fastjet.ClusterSequenceAreaBase_swigregister(ClusterSequenceAreaBase)
-
 class ClusterSequenceActiveAreaExplicitGhosts(ClusterSequenceAreaBase):
     r"""
 
@@ -5483,7 +5353,6 @@ class ClusterSequenceActiveAreaExplicitGhosts(ClusterSequenceAreaBase):
 
 # Register ClusterSequenceActiveAreaExplicitGhosts in _fastjet:
 _fastjet.ClusterSequenceActiveAreaExplicitGhosts_swigregister(ClusterSequenceActiveAreaExplicitGhosts)
-
 class ClusterSequenceActiveArea(ClusterSequenceAreaBase):
     r"""
 
@@ -5610,7 +5479,6 @@ class ClusterSequenceActiveArea(ClusterSequenceAreaBase):
 
 # Register ClusterSequenceActiveArea in _fastjet:
 _fastjet.ClusterSequenceActiveArea_swigregister(ClusterSequenceActiveArea)
-
 class ClusterSequence1GhostPassiveArea(ClusterSequenceActiveArea):
     r"""
 
@@ -5657,7 +5525,6 @@ class ClusterSequence1GhostPassiveArea(ClusterSequenceActiveArea):
 
 # Register ClusterSequence1GhostPassiveArea in _fastjet:
 _fastjet.ClusterSequence1GhostPassiveArea_swigregister(ClusterSequence1GhostPassiveArea)
-
 class ClusterSequencePassiveArea(ClusterSequence1GhostPassiveArea):
     r"""
 
@@ -5704,7 +5571,6 @@ class ClusterSequencePassiveArea(ClusterSequence1GhostPassiveArea):
 
 # Register ClusterSequencePassiveArea in _fastjet:
 _fastjet.ClusterSequencePassiveArea_swigregister(ClusterSequencePassiveArea)
-
 class ClusterSequenceVoronoiArea(ClusterSequenceAreaBase):
     r"""
 
@@ -5785,7 +5651,6 @@ class ClusterSequenceVoronoiArea(ClusterSequenceAreaBase):
 
 # Register ClusterSequenceVoronoiArea in _fastjet:
 _fastjet.ClusterSequenceVoronoiArea_swigregister(ClusterSequenceVoronoiArea)
-
 class ClusterSequenceArea(ClusterSequenceAreaBase):
     r"""
 
@@ -5935,7 +5800,6 @@ class ClusterSequenceArea(ClusterSequenceAreaBase):
 
 # Register ClusterSequenceArea in _fastjet:
 _fastjet.ClusterSequenceArea_swigregister(ClusterSequenceArea)
-
 class UserInfoPython(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -5950,7 +5814,6 @@ class UserInfoPython(object):
 # Register UserInfoPython in _fastjet:
 _fastjet.UserInfoPython_swigregister(UserInfoPython)
 
-
 def cpp_string_from_py_str(py_str):
     return _fastjet.cpp_string_from_py_str(py_str)
 
@@ -5995,7 +5858,6 @@ class SelectorWorkerPython(SelectorWorker):
 # Register SelectorWorkerPython in _fastjet:
 _fastjet.SelectorWorkerPython_swigregister(SelectorWorkerPython)
 
-
 def SelectorPython(py_function_or_class):
     return _fastjet.SelectorPython(py_function_or_class)
 class RecombinerPython(object):
@@ -6018,7 +5880,6 @@ class RecombinerPython(object):
 # Register RecombinerPython in _fastjet:
 _fastjet.RecombinerPython_swigregister(RecombinerPython)
 
-
 def JetDefinition0Param(*args):
     return _fastjet.JetDefinition0Param(*args)
 
@@ -6082,7 +5943,6 @@ class FunctionOfPseudoJetDouble(object):
 
 # Register FunctionOfPseudoJetDouble in _fastjet:
 _fastjet.FunctionOfPseudoJetDouble_swigregister(FunctionOfPseudoJetDouble)
-
 class FunctionOfPseudoJetPseudoJet(object):
     r"""
 
@@ -6138,7 +5998,6 @@ class FunctionOfPseudoJetPseudoJet(object):
 
 # Register FunctionOfPseudoJetPseudoJet in _fastjet:
 _fastjet.FunctionOfPseudoJetPseudoJet_swigregister(FunctionOfPseudoJetPseudoJet)
-
 class Transformer(FunctionOfPseudoJetPseudoJet):
     r"""
 
@@ -6197,7 +6056,6 @@ class Transformer(FunctionOfPseudoJetPseudoJet):
 
 # Register Transformer in _fastjet:
 _fastjet.Transformer_swigregister(Transformer)
-
 class Boost(FunctionOfPseudoJetPseudoJet):
     r"""
 
@@ -6240,7 +6098,6 @@ class Boost(FunctionOfPseudoJetPseudoJet):
 
 # Register Boost in _fastjet:
 _fastjet.Boost_swigregister(Boost)
-
 class Unboost(FunctionOfPseudoJetPseudoJet):
     r"""
 
@@ -6284,7 +6141,6 @@ class Unboost(FunctionOfPseudoJetPseudoJet):
 
 # Register Unboost in _fastjet:
 _fastjet.Unboost_swigregister(Unboost)
-
 class Recluster(FunctionOfPseudoJetPseudoJet):
     r"""
 
@@ -6507,7 +6363,6 @@ class Recluster(FunctionOfPseudoJetPseudoJet):
 
 # Register Recluster in _fastjet:
 _fastjet.Recluster_swigregister(Recluster)
-
 class Filter(Transformer):
     r"""
 
@@ -6635,7 +6490,6 @@ class Filter(Transformer):
 
 # Register Filter in _fastjet:
 _fastjet.Filter_swigregister(Filter)
-
 class FilterStructure(CompositeJetStructure):
     r"""
 
@@ -6685,7 +6539,6 @@ class FilterStructure(CompositeJetStructure):
 
 # Register FilterStructure in _fastjet:
 _fastjet.FilterStructure_swigregister(FilterStructure)
-
 class Pruner(Transformer):
     r"""
 
@@ -6781,7 +6634,6 @@ class Pruner(Transformer):
 
 # Register Pruner in _fastjet:
 _fastjet.Pruner_swigregister(Pruner)
-
 class PrunerStructure(object):
     r"""
 
@@ -6865,7 +6717,6 @@ class PrunerStructure(object):
 
 # Register PrunerStructure in _fastjet:
 _fastjet.PrunerStructure_swigregister(PrunerStructure)
-
 class PruningRecombiner(object):
     r"""
 
@@ -6942,7 +6793,6 @@ class PruningRecombiner(object):
 
 # Register PruningRecombiner in _fastjet:
 _fastjet.PruningRecombiner_swigregister(PruningRecombiner)
-
 class PruningPlugin(object):
     r"""
 
@@ -7004,7 +6854,6 @@ class PruningPlugin(object):
 
 # Register PruningPlugin in _fastjet:
 _fastjet.PruningPlugin_swigregister(PruningPlugin)
-
 class CASubJetTagger(Transformer):
     r"""
 
@@ -7132,7 +6981,6 @@ class CASubJetTagger(Transformer):
 
 # Register CASubJetTagger in _fastjet:
 _fastjet.CASubJetTagger_swigregister(CASubJetTagger)
-
 class CASubJetTaggerStructure(object):
     r"""
 
@@ -7211,7 +7059,6 @@ class CASubJetTaggerStructure(object):
 
 # Register CASubJetTaggerStructure in _fastjet:
 _fastjet.CASubJetTaggerStructure_swigregister(CASubJetTaggerStructure)
-
 class MassDropTagger(Transformer):
     r"""
 
@@ -7303,7 +7150,6 @@ class MassDropTagger(Transformer):
 
 # Register MassDropTagger in _fastjet:
 _fastjet.MassDropTagger_swigregister(MassDropTagger)
-
 class MassDropTaggerStructure(object):
     r"""
 
@@ -7362,7 +7208,6 @@ class MassDropTaggerStructure(object):
 
 # Register MassDropTaggerStructure in _fastjet:
 _fastjet.MassDropTaggerStructure_swigregister(MassDropTaggerStructure)
-
 class RestFrameNSubjettinessTagger(Transformer):
     r"""
 
@@ -7454,7 +7299,6 @@ class RestFrameNSubjettinessTagger(Transformer):
 
 # Register RestFrameNSubjettinessTagger in _fastjet:
 _fastjet.RestFrameNSubjettinessTagger_swigregister(RestFrameNSubjettinessTagger)
-
 class RestFrameNSubjettinessTaggerStructure(CompositeJetStructure):
     r"""
 
@@ -7505,7 +7349,6 @@ class RestFrameNSubjettinessTaggerStructure(CompositeJetStructure):
 
 # Register RestFrameNSubjettinessTaggerStructure in _fastjet:
 _fastjet.RestFrameNSubjettinessTaggerStructure_swigregister(RestFrameNSubjettinessTaggerStructure)
-
 class TopTaggerBase(Transformer):
     r"""
 
@@ -7563,7 +7406,6 @@ class TopTaggerBase(Transformer):
 
 # Register TopTaggerBase in _fastjet:
 _fastjet.TopTaggerBase_swigregister(TopTaggerBase)
-
 class TopTaggerBaseStructure(object):
     r"""
 
@@ -7603,7 +7445,6 @@ class TopTaggerBaseStructure(object):
 
 # Register TopTaggerBaseStructure in _fastjet:
 _fastjet.TopTaggerBaseStructure_swigregister(TopTaggerBaseStructure)
-
 class JHTopTagger(TopTaggerBase):
     r"""
 
@@ -7722,7 +7563,6 @@ class JHTopTagger(TopTaggerBase):
 
 # Register JHTopTagger in _fastjet:
 _fastjet.JHTopTagger_swigregister(JHTopTagger)
-
 class JHTopTaggerStructure(CompositeJetStructure, TopTaggerBaseStructure):
     r"""
 
@@ -7804,7 +7644,6 @@ class JHTopTaggerStructure(CompositeJetStructure, TopTaggerBaseStructure):
 
 # Register JHTopTaggerStructure in _fastjet:
 _fastjet.JHTopTaggerStructure_swigregister(JHTopTaggerStructure)
-
 class BackgroundEstimate(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -7869,7 +7708,6 @@ class BackgroundEstimate(object):
 
 # Register BackgroundEstimate in _fastjet:
 _fastjet.BackgroundEstimate_swigregister(BackgroundEstimate)
-
 class BackgroundEstimatorBase(object):
     r"""
 
@@ -8022,7 +7860,6 @@ class BackgroundEstimatorBase(object):
 
 # Register BackgroundEstimatorBase in _fastjet:
 _fastjet.BackgroundEstimatorBase_swigregister(BackgroundEstimatorBase)
-
 class BackgroundRescalingYPolynomial(FunctionOfPseudoJetDouble):
     r"""
 
@@ -8070,7 +7907,6 @@ class BackgroundRescalingYPolynomial(FunctionOfPseudoJetDouble):
 
 # Register BackgroundRescalingYPolynomial in _fastjet:
 _fastjet.BackgroundRescalingYPolynomial_swigregister(BackgroundRescalingYPolynomial)
-
 class JetMedianBackgroundEstimator(BackgroundEstimatorBase):
     r"""
 
@@ -8475,7 +8311,6 @@ class JetMedianBackgroundEstimator(BackgroundEstimatorBase):
 
 # Register JetMedianBackgroundEstimator in _fastjet:
 _fastjet.JetMedianBackgroundEstimator_swigregister(JetMedianBackgroundEstimator)
-
 class BackgroundJetPtDensity(FunctionOfPseudoJetDouble):
     r"""
 
@@ -8521,7 +8356,6 @@ class BackgroundJetPtDensity(FunctionOfPseudoJetDouble):
 
 # Register BackgroundJetPtDensity in _fastjet:
 _fastjet.BackgroundJetPtDensity_swigregister(BackgroundJetPtDensity)
-
 class BackgroundJetScalarPtDensity(FunctionOfPseudoJetDouble):
     r"""
 
@@ -8578,7 +8412,6 @@ class BackgroundJetScalarPtDensity(FunctionOfPseudoJetDouble):
 
 # Register BackgroundJetScalarPtDensity in _fastjet:
 _fastjet.BackgroundJetScalarPtDensity_swigregister(BackgroundJetScalarPtDensity)
-
 class BackgroundJetPtMDensity(FunctionOfPseudoJetDouble):
     r"""
 
@@ -8627,7 +8460,6 @@ class BackgroundJetPtMDensity(FunctionOfPseudoJetDouble):
 
 # Register BackgroundJetPtMDensity in _fastjet:
 _fastjet.BackgroundJetPtMDensity_swigregister(BackgroundJetPtMDensity)
-
 class GridMedianBackgroundEstimator(BackgroundEstimatorBase, RectangularGrid):
     r"""
 
@@ -8828,7 +8660,6 @@ class GridMedianBackgroundEstimator(BackgroundEstimatorBase, RectangularGrid):
 
 # Register GridMedianBackgroundEstimator in _fastjet:
 _fastjet.GridMedianBackgroundEstimator_swigregister(GridMedianBackgroundEstimator)
-
 class Subtractor(Transformer):
     r"""
 
@@ -9002,5 +8833,3 @@ class Subtractor(Transformer):
 # Register Subtractor in _fastjet:
 _fastjet.Subtractor_swigregister(Subtractor)
 
-
-
diff --git a/pyinterface/swig_wrap.cpp b/pyinterface/swig_wrap.cpp
index 7889a80..85303ad 100644
--- a/pyinterface/swig_wrap.cpp
+++ b/pyinterface/swig_wrap.cpp
@@ -1,44 +1,16 @@
 /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.1.0
  *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG
- * interface file instead.
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
 
-#ifndef SWIGPYTHON
+#define SWIG_VERSION 0x040100
 #define SWIGPYTHON
-#endif
-
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
 
-
-#ifdef __cplusplus
-/* SwigValueWrapper is described in swig.swg */
-template<typename T> class SwigValueWrapper {
-  struct SwigMovePointer {
-    T *ptr;
-    SwigMovePointer(T *p) : ptr(p) { }
-    ~SwigMovePointer() { delete ptr; }
-    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
-  } pointer;
-  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
-  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
-public:
-  SwigValueWrapper() : pointer(0) { }
-  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
-  operator T&() const { return *pointer.ptr; }
-  T *operator&() { return pointer.ptr; }
-};
-
-template <typename T> T SwigValueInit() {
-  return T();
-}
-#endif
-
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
@@ -169,8 +141,26 @@ template <typename T> T SwigValueInit() {
 # include <math.h>
 #endif
 
+#if !defined(PY_SSIZE_T_CLEAN) && !defined(SWIG_NO_PY_SSIZE_T_CLEAN)
+#define PY_SSIZE_T_CLEAN
+#endif
+
+#if __GNUC__ >= 7
+#pragma GCC diagnostic push
+#if defined(__cplusplus) && __cplusplus >=201703L
+#pragma GCC diagnostic ignored "-Wregister" /* For python-2.7 headers that use register */
+#endif
+#endif
+
 #if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
 /* Use debug wrappers with the Python release dll */
+
+#if defined(_MSC_VER) && _MSC_VER >= 1929
+/* Workaround compilation errors when redefining _DEBUG in MSVC 2019 version 16.10 and later
+ * See https://github.com/swig/swig/issues/2090 */
+# include <corecrt.h>
+#endif
+
 # undef _DEBUG
 # include <Python.h>
 # define _DEBUG 1
@@ -178,6 +168,10 @@ template <typename T> T SwigValueInit() {
 # include <Python.h>
 #endif
 
+#if __GNUC__ >= 7
+#pragma GCC diagnostic pop
+#endif
+
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
@@ -224,6 +218,8 @@ template <typename T> T SwigValueInit() {
 #define SWIG_POINTER_DISOWN        0x1
 #define SWIG_CAST_NEW_MEMORY       0x2
 #define SWIG_POINTER_NO_NULL       0x4
+#define SWIG_POINTER_CLEAR         0x8
+#define SWIG_POINTER_RELEASE       (SWIG_POINTER_CLEAR | SWIG_POINTER_DISOWN)
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -295,7 +291,7 @@ template <typename T> T SwigValueInit() {
    SWIG errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-   allows to return the 'cast rank', for example, if you have this
+   allows returning the 'cast rank', for example, if you have this
 
        int food(double)
        int fooi(int);
@@ -309,7 +305,13 @@ template <typename T> T SwigValueInit() {
 */
 
 #define SWIG_OK                    (0)
+/* Runtime errors are < 0 */
 #define SWIG_ERROR                 (-1)
+/* Errors in range -1 to -99 are in swigerrors.swg (errors for all languages including those not using the runtime) */
+/* Errors in range -100 to -199 are language specific errors defined in *errors.swg */
+/* Errors < -200 are generic runtime specific errors */
+#define SWIG_ERROR_RELEASE_NOT_OWNED (-200)
+
 #define SWIG_IsOK(r)               (r >= 0)
 #define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
@@ -324,7 +326,7 @@ template <typename T> T SwigValueInit() {
 #define SWIG_OLDOBJ                (SWIG_OK)
 #define SWIG_NEWOBJ                (SWIG_OK | SWIG_NEWOBJMASK)
 #define SWIG_TMPOBJ                (SWIG_OK | SWIG_TMPOBJMASK)
-/* Check, add and del mask methods */
+/* Check, add and del object mask methods */
 #define SWIG_AddNewMask(r)         (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r)
 #define SWIG_DelNewMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r)
 #define SWIG_IsNewObj(r)           (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK))
@@ -470,7 +472,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+SWIG_TypeCheckStruct(const swig_type_info *from, swig_type_info *ty) {
   if (ty) {
     swig_cast_info *iter = ty->cast;
     while (iter) {
@@ -530,9 +532,9 @@ SWIG_TypeName(const swig_type_info *ty) {
 SWIGRUNTIME const char *
 SWIG_TypePrettyName(const swig_type_info *type) {
   /* The "str" field contains the equivalent pretty names of the
-     type, separated by vertical-bar characters.  We choose
-     to print the last name, as it is often (?) the most
-     specific. */
+     type, separated by vertical-bar characters.  Choose the last
+     name. It should be the most specific; a fully resolved name
+     but not necessarily with default template parameters expanded. */
   if (!type) return NULL;
   if (type->str != NULL) {
     const char *last_name = type->str;
@@ -752,7 +754,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 }
 #endif
 
-/*  Errors in SWIG */
+/* SWIG Errors applicable to all language modules, values are reserved from -1 to -99 */
 #define  SWIG_UnknownError    	   -1
 #define  SWIG_IOError        	   -2
 #define  SWIG_RuntimeError   	   -3
@@ -768,7 +770,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define  SWIG_NullReferenceError   -13
 
 
-
 /* Compatibility macros for Python 3 */
 #if PY_VERSION_HEX >= 0x03000000
 
@@ -784,7 +785,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define PyString_Size(str) PyBytes_Size(str)	
 #define PyString_InternFromString(key) PyUnicode_InternFromString(key)
 #define Py_TPFLAGS_HAVE_CLASS Py_TPFLAGS_BASETYPE
-#define PyString_AS_STRING(x) PyUnicode_AS_STRING(x)
 #define _PyLong_FromSsize_t(x) PyLong_FromSsize_t(x)
 
 #endif
@@ -802,38 +802,19 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 
-/* Warning: This function will allocate a new string in Python 3,
- * so please call SWIG_Python_str_DelForPy3(x) to free the space.
- */
 SWIGINTERN char*
 SWIG_Python_str_AsChar(PyObject *str)
 {
 #if PY_VERSION_HEX >= 0x03030000
   return (char *)PyUnicode_AsUTF8(str);
-#elif PY_VERSION_HEX >= 0x03000000
-  char *newstr = 0;
-  str = PyUnicode_AsUTF8String(str);
-  if (str) {
-    char *cstr;
-    Py_ssize_t len;
-    if (PyBytes_AsStringAndSize(str, &cstr, &len) != -1) {
-      newstr = (char *) malloc(len+1);
-      if (newstr)
-        memcpy(newstr, cstr, len+1);
-    }
-    Py_XDECREF(str);
-  }
-  return newstr;
 #else
   return PyString_AsString(str);
 #endif
 }
 
-#if PY_VERSION_HEX >= 0x03030000 || PY_VERSION_HEX < 0x03000000
-#  define SWIG_Python_str_DelForPy3(x)
-#else
-#  define SWIG_Python_str_DelForPy3(x) free( (void*) (x) )
-#endif
+/* Was useful for Python 3.0.x-3.2.x - now provided only for compatibility
+ * with any uses in user interface files. */
+#define SWIG_Python_str_DelForPy3(x)
 
 
 SWIGINTERN PyObject*
@@ -850,10 +831,14 @@ SWIG_Python_str_FromChar(const char *c)
 # define PyObject_DEL PyObject_Del
 #endif
 
-// SWIGPY_USE_CAPSULE is no longer used within SWIG itself, but some user
-// interface files check for it.
+/* SWIGPY_USE_CAPSULE is no longer used within SWIG itself, but some user interface files check for it. */
 # define SWIGPY_USE_CAPSULE
-# define SWIGPY_CAPSULE_NAME ("swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
+#ifdef SWIGPYTHON_BUILTIN
+# define SWIGPY_CAPSULE_ATTR_NAME "type_pointer_capsule_builtin" SWIG_TYPE_TABLE_NAME
+#else
+# define SWIGPY_CAPSULE_ATTR_NAME "type_pointer_capsule" SWIG_TYPE_TABLE_NAME
+#endif
+# define SWIGPY_CAPSULE_NAME ("swig_runtime_data" SWIG_RUNTIME_VERSION "." SWIGPY_CAPSULE_ATTR_NAME)
 
 #if PY_VERSION_HEX < 0x03020000
 #define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
@@ -927,7 +912,6 @@ SWIG_Python_AddErrorMsg(const char* mesg)
       PyErr_Format(type, "%s %s", tmp, mesg);
     else
       PyErr_Format(type, "%s", mesg);
-    SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
@@ -958,8 +942,12 @@ SWIG_Python_RaiseOrModifyTypeError(const char *message)
 #else
     newvalue = PyString_FromFormat("%s\nAdditional information:\n%s", PyString_AsString(value), message);
 #endif
-    Py_XDECREF(value);
-    PyErr_Restore(type, newvalue, traceback);
+    if (newvalue) {
+      Py_XDECREF(value);
+      PyErr_Restore(type, newvalue, traceback);
+    } else {
+      PyErr_Restore(type, value, traceback);
+    }
   } else {
     /* Raise TypeError using given message */
     PyErr_SetString(PyExc_TypeError, message);
@@ -976,8 +964,12 @@ SWIG_Python_RaiseOrModifyTypeError(const char *message)
 #    define SWIG_PYTHON_USE_GIL
 #  endif
 #  if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
-#    ifndef SWIG_PYTHON_INITIALIZE_THREADS
-#     define SWIG_PYTHON_INITIALIZE_THREADS  PyEval_InitThreads() 
+#    if !defined(SWIG_PYTHON_INITIALIZE_THREADS)
+#      if PY_VERSION_HEX < 0x03070000
+#        define SWIG_PYTHON_INITIALIZE_THREADS PyEval_InitThreads()
+#      else
+#        define SWIG_PYTHON_INITIALIZE_THREADS
+#      endif
 #    endif
 #    ifdef __cplusplus /* C++ code */
        class SWIG_Python_Thread_Block {
@@ -1075,8 +1067,8 @@ typedef struct swig_const_info {
 # error "This version of SWIG only supports Python >= 2.7"
 #endif
 
-#if PY_VERSION_HEX >= 0x03000000 && PY_VERSION_HEX < 0x03020000
-# error "This version of SWIG only supports Python 3 >= 3.2"
+#if PY_VERSION_HEX >= 0x03000000 && PY_VERSION_HEX < 0x03030000
+# error "This version of SWIG only supports Python 3 >= 3.3"
 #endif
 
 /* Common SWIG API */
@@ -1191,7 +1183,12 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
     if (!PyList_Check(result)) {
       PyObject *o2 = result;
       result = PyList_New(1);
-      PyList_SetItem(result, 0, o2);
+      if (result) {
+        PyList_SET_ITEM(result, 0, o2);
+      } else {
+        Py_DECREF(obj);
+        return o2;
+      }
     }
     PyList_Append(result,obj);
     Py_DECREF(obj);
@@ -1273,6 +1270,238 @@ SWIG_Python_CheckNoKeywords(PyObject *kwargs, const char *name) {
 #define SWIG_STATIC_POINTER(var)  var = 0; if (!var) var
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Python-specific SWIG API */
+#define SWIG_newvarlink()                             SWIG_Python_newvarlink()
+#define SWIG_addvarlink(p, name, get_attr, set_attr)  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
+#define SWIG_InstallConstants(d, constants)           SWIG_Python_InstallConstants(d, constants)
+ 
+/* -----------------------------------------------------------------------------
+ * global variable support code.
+ * ----------------------------------------------------------------------------- */
+ 
+typedef struct swig_globalvar {   
+  char       *name;                  /* Name of global variable */
+  PyObject *(*get_attr)(void);       /* Return the current value */
+  int       (*set_attr)(PyObject *); /* Set the value */
+  struct swig_globalvar *next;
+} swig_globalvar;
+
+typedef struct swig_varlinkobject {
+  PyObject_HEAD
+  swig_globalvar *vars;
+} swig_varlinkobject;
+
+SWIGINTERN PyObject *
+swig_varlink_repr(PyObject *SWIGUNUSEDPARM(v)) {
+#if PY_VERSION_HEX >= 0x03000000
+  return PyUnicode_InternFromString("<Swig global variables>");
+#else
+  return PyString_FromString("<Swig global variables>");
+#endif
+}
+
+SWIGINTERN PyObject *
+swig_varlink_str(PyObject *o) {
+  swig_varlinkobject *v = (swig_varlinkobject *) o;
+#if PY_VERSION_HEX >= 0x03000000
+  PyObject *str = PyUnicode_InternFromString("(");
+  PyObject *tail;
+  PyObject *joined;
+  swig_globalvar *var;
+  for (var = v->vars; var; var=var->next) {
+    tail = PyUnicode_FromString(var->name);
+    joined = PyUnicode_Concat(str, tail);
+    Py_DecRef(str);
+    Py_DecRef(tail);
+    str = joined;
+    if (var->next) {
+        tail = PyUnicode_InternFromString(", ");
+        joined = PyUnicode_Concat(str, tail);
+        Py_DecRef(str);
+        Py_DecRef(tail);
+        str = joined;
+    }
+  }
+  tail = PyUnicode_InternFromString(")");
+  joined = PyUnicode_Concat(str, tail);
+  Py_DecRef(str);
+  Py_DecRef(tail);
+  str = joined;
+#else
+  PyObject *str = PyString_FromString("(");
+  swig_globalvar *var;
+  for (var = v->vars; var; var=var->next) {
+    PyString_ConcatAndDel(&str,PyString_FromString(var->name));
+    if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
+  }
+  PyString_ConcatAndDel(&str,PyString_FromString(")"));
+#endif
+  return str;
+}
+
+SWIGINTERN void
+swig_varlink_dealloc(PyObject *o) {
+  swig_varlinkobject *v = (swig_varlinkobject *) o;
+  swig_globalvar *var = v->vars;
+  while (var) {
+    swig_globalvar *n = var->next;
+    free(var->name);
+    free(var);
+    var = n;
+  }
+}
+
+SWIGINTERN PyObject *
+swig_varlink_getattr(PyObject *o, char *n) {
+  swig_varlinkobject *v = (swig_varlinkobject *) o;
+  PyObject *res = NULL;
+  swig_globalvar *var = v->vars;
+  while (var) {
+    if (strcmp(var->name,n) == 0) {
+      res = (*var->get_attr)();
+      break;
+    }
+    var = var->next;
+  }
+  if (res == NULL && !PyErr_Occurred()) {
+    PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
+  }
+  return res;
+}
+
+SWIGINTERN int
+swig_varlink_setattr(PyObject *o, char *n, PyObject *p) {
+  swig_varlinkobject *v = (swig_varlinkobject *) o;
+  int res = 1;
+  swig_globalvar *var = v->vars;
+  while (var) {
+    if (strcmp(var->name,n) == 0) {
+      res = (*var->set_attr)(p);
+      break;
+    }
+    var = var->next;
+  }
+  if (res == 1 && !PyErr_Occurred()) {
+    PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
+  }
+  return res;
+}
+
+SWIGINTERN PyTypeObject*
+swig_varlink_type(void) {
+  static char varlink__doc__[] = "Swig var link object";
+  static PyTypeObject varlink_type;
+  static int type_init = 0;
+  if (!type_init) {
+    const PyTypeObject tmp = {
+#if PY_VERSION_HEX >= 0x03000000
+      PyVarObject_HEAD_INIT(NULL, 0)
+#else
+      PyObject_HEAD_INIT(NULL)
+      0,                                  /* ob_size */
+#endif
+      "swigvarlink",                      /* tp_name */
+      sizeof(swig_varlinkobject),         /* tp_basicsize */
+      0,                                  /* tp_itemsize */
+      (destructor) swig_varlink_dealloc,  /* tp_dealloc */
+#if PY_VERSION_HEX < 0x030800b4
+      (printfunc)0,                       /*tp_print*/
+#else
+      (Py_ssize_t)0,                      /*tp_vectorcall_offset*/
+#endif
+      (getattrfunc) swig_varlink_getattr, /* tp_getattr */
+      (setattrfunc) swig_varlink_setattr, /* tp_setattr */
+      0,                                  /* tp_compare */
+      (reprfunc) swig_varlink_repr,       /* tp_repr */
+      0,                                  /* tp_as_number */
+      0,                                  /* tp_as_sequence */
+      0,                                  /* tp_as_mapping */
+      0,                                  /* tp_hash */
+      0,                                  /* tp_call */
+      (reprfunc) swig_varlink_str,        /* tp_str */
+      0,                                  /* tp_getattro */
+      0,                                  /* tp_setattro */
+      0,                                  /* tp_as_buffer */
+      0,                                  /* tp_flags */
+      varlink__doc__,                     /* tp_doc */
+      0,                                  /* tp_traverse */
+      0,                                  /* tp_clear */
+      0,                                  /* tp_richcompare */
+      0,                                  /* tp_weaklistoffset */
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+      0,                                  /* tp_del */
+      0,                                  /* tp_version_tag */
+#if PY_VERSION_HEX >= 0x03040000
+      0,                                  /* tp_finalize */
+#endif
+#if PY_VERSION_HEX >= 0x03080000
+      0,                                  /* tp_vectorcall */
+#endif
+#if (PY_VERSION_HEX >= 0x03080000) && (PY_VERSION_HEX < 0x03090000)
+      0,                                  /* tp_print */
+#endif
+#ifdef COUNT_ALLOCS
+      0,                                  /* tp_allocs */
+      0,                                  /* tp_frees */
+      0,                                  /* tp_maxalloc */
+      0,                                  /* tp_prev */
+      0                                   /* tp_next */
+#endif
+    };
+    varlink_type = tmp;
+    type_init = 1;
+    if (PyType_Ready(&varlink_type) < 0)
+      return NULL;
+  }
+  return &varlink_type;
+}
+
+/* Create a variable linking object for use later */
+SWIGINTERN PyObject *
+SWIG_Python_newvarlink(void) {
+  swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
+  if (result) {
+    result->vars = 0;
+  }
+  return ((PyObject*) result);
+}
+
+SWIGINTERN void 
+SWIG_Python_addvarlink(PyObject *p, const char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
+  swig_varlinkobject *v = (swig_varlinkobject *) p;
+  swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
+  if (gv) {
+    size_t size = strlen(name)+1;
+    gv->name = (char *)malloc(size);
+    if (gv->name) {
+      memcpy(gv->name, name, size);
+      gv->get_attr = get_attr;
+      gv->set_attr = set_attr;
+      gv->next = v->vars;
+    }
+  }
+  v->vars = gv;
+}
+
+
+static PyObject *Swig_Globals_global = NULL;
+  
+SWIGINTERN PyObject *
+SWIG_globals(void) {
+  if (Swig_Globals_global == NULL) {
+    Swig_Globals_global = SWIG_newvarlink();
+  }
+  return Swig_Globals_global;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
 /* -----------------------------------------------------------------------------
  * Pointer declarations
  * ----------------------------------------------------------------------------- */
@@ -1343,18 +1572,25 @@ SwigPyClientData_New(PyObject* obj)
     /* the newraw method and newargs arguments used to create a new raw instance */
     if (PyClass_Check(obj)) {
       data->newraw = 0;
-      data->newargs = obj;
       Py_INCREF(obj);
+      data->newargs = obj;
     } else {
       data->newraw = PyObject_GetAttrString(data->klass, "__new__");
       if (data->newraw) {
-	Py_INCREF(data->newraw);
-	data->newargs = PyTuple_New(1);
-	PyTuple_SetItem(data->newargs, 0, obj);
+        data->newargs = PyTuple_New(1);
+        if (data->newargs) {
+          Py_INCREF(obj);
+          PyTuple_SET_ITEM(data->newargs, 0, obj);
+        } else {
+          Py_DECREF(data->newraw);
+          Py_DECREF(data->klass);
+          free(data);
+          return 0;
+        }
       } else {
-	data->newargs = obj;
+        Py_INCREF(obj);
+        data->newargs = obj;
       }
-      Py_INCREF(data->newargs);
     }
     /* the destroy method, aka as the C++ delete method */
     data->destroy = PyObject_GetAttrString(data->klass, "__swig_destroy__");
@@ -1363,10 +1599,7 @@ SwigPyClientData_New(PyObject* obj)
       data->destroy = 0;
     }
     if (data->destroy) {
-      int flags;
-      Py_INCREF(data->destroy);
-      flags = PyCFunction_GET_FLAGS(data->destroy);
-      data->delargs = !(flags & (METH_O));
+      data->delargs = !(PyCFunction_GET_FLAGS(data->destroy) & METH_O);
     } else {
       data->delargs = 0;
     }
@@ -1377,10 +1610,13 @@ SwigPyClientData_New(PyObject* obj)
 }
 
 SWIGRUNTIME void 
-SwigPyClientData_Del(SwigPyClientData *data) {
+SwigPyClientData_Del(SwigPyClientData *data)
+{
+  Py_XDECREF(data->klass);
   Py_XDECREF(data->newraw);
   Py_XDECREF(data->newargs);
   Py_XDECREF(data->destroy);
+  free(data);
 }
 
 /* =============== SwigPyObject =====================*/
@@ -1407,7 +1643,7 @@ SwigPyObject_get___dict__(PyObject *v, PyObject *SWIGUNUSEDPARM(args))
   if (!sobj->dict)
     sobj->dict = PyDict_New();
 
-  Py_INCREF(sobj->dict);
+  Py_XINCREF(sobj->dict);
   return sobj->dict;
 }
 
@@ -1425,18 +1661,21 @@ SwigPyObject_format(const char* fmt, SwigPyObject *v)
   PyObject *res = NULL;
   PyObject *args = PyTuple_New(1);
   if (args) {
-    if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) {
-      PyObject *ofmt = SWIG_Python_str_FromChar(fmt);
+    PyObject *val = SwigPyObject_long(v);
+    if (val) {
+      PyObject *ofmt;
+      PyTuple_SET_ITEM(args, 0, val);
+      ofmt = SWIG_Python_str_FromChar(fmt);
       if (ofmt) {
 #if PY_VERSION_HEX >= 0x03000000
-	res = PyUnicode_Format(ofmt,args);
+        res = PyUnicode_Format(ofmt,args);
 #else
-	res = PyString_Format(ofmt,args);
+        res = PyString_Format(ofmt,args);
 #endif
-	Py_DECREF(ofmt);
+        Py_DECREF(ofmt);
       }
-      Py_DECREF(args);
     }
+    Py_DECREF(args);
   }
   return res;
 }
@@ -1458,18 +1697,23 @@ SwigPyObject_repr(SwigPyObject *v)
 {
   const char *name = SWIG_TypePrettyName(v->ty);
   PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", (name ? name : "unknown"), (void *)v);
-  if (v->next) {
+  if (repr && v->next) {
     PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
+    if (nrep) {
 # if PY_VERSION_HEX >= 0x03000000
-    PyObject *joined = PyUnicode_Concat(repr, nrep);
-    Py_DecRef(repr);
-    Py_DecRef(nrep);
-    repr = joined;
+      PyObject *joined = PyUnicode_Concat(repr, nrep);
+      Py_DecRef(repr);
+      Py_DecRef(nrep);
+      repr = joined;
 # else
-    PyString_ConcatAndDel(&repr,nrep);
+      PyString_ConcatAndDel(&repr,nrep);
 # endif
+    } else {
+      Py_DecRef(repr);
+      repr = NULL;
+    }
   }
-  return repr;  
+  return repr;
 }
 
 /* We need a version taking two PyObject* parameters so it's a valid
@@ -1539,6 +1783,8 @@ SwigPyObject_Check(PyObject *op) {
 SWIGRUNTIME PyObject *
 SwigPyObject_New(void *ptr, swig_type_info *ty, int own);
 
+static PyObject* Swig_Capsule_global = NULL;
+
 SWIGRUNTIME void
 SwigPyObject_dealloc(PyObject *v)
 {
@@ -1565,8 +1811,12 @@ SwigPyObject_dealloc(PyObject *v)
       if (data->delargs) {
         /* we need to create a temporary object to carry the destroy operation */
         PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0);
-        res = SWIG_Python_CallFunctor(destroy, tmp);
-        Py_DECREF(tmp);
+        if (tmp) {
+          res = SWIG_Python_CallFunctor(destroy, tmp);
+        } else {
+          res = 0;
+        }
+        Py_XDECREF(tmp);
       } else {
         PyCFunction meth = PyCFunction_GET_FUNCTION(destroy);
         PyObject *mself = PyCFunction_GET_SELF(destroy);
@@ -1585,8 +1835,12 @@ SwigPyObject_dealloc(PyObject *v)
       printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
     }
 #endif
-  } 
+    Py_XDECREF(Swig_Capsule_global);
+  }
   Py_XDECREF(next);
+#ifdef SWIGPYTHON_BUILTIN
+  Py_XDECREF(sobj->dict);
+#endif
   PyObject_DEL(v);
 }
 
@@ -1598,6 +1852,7 @@ SwigPyObject_append(PyObject* v, PyObject* next)
     PyErr_SetString(PyExc_TypeError, "Attempt to append a non SwigPyObject");
     return NULL;
   }
+  ((SwigPyObject *)next)->next = sobj->next;
   sobj->next = next;
   Py_INCREF(next);
   return SWIG_Py_Void();
@@ -1642,9 +1897,9 @@ SwigPyObject_own(PyObject *v, PyObject *args)
     PyObject *obj = PyBool_FromLong(sobj->own);
     if (val) {
       if (PyObject_IsTrue(val)) {
-        SwigPyObject_acquire(v,args);
+        Py_DECREF(SwigPyObject_acquire(v,args));
       } else {
-        SwigPyObject_disown(v,args);
+        Py_DECREF(SwigPyObject_disown(v,args));
       }
     } 
     return obj;
@@ -1724,7 +1979,11 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      0,                                    /* tp_print */
+#if PY_VERSION_HEX < 0x030800b4
+      (printfunc)0,                         /*tp_print*/
+#else
+      (Py_ssize_t)0,                        /*tp_vectorcall_offset*/
+#endif
       (getattrfunc)0,                       /* tp_getattr */
       (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX >= 0x03000000
@@ -1789,7 +2048,7 @@ SwigPyObject_TypeOnce(void) {
     };
     swigpyobject_type = tmp;
     type_init = 1;
-    if (PyType_Ready(&swigpyobject_type) < 0)
+    if (PyType_Ready(&swigpyobject_type) != 0)
       return NULL;
   }
   return &swigpyobject_type;
@@ -1804,6 +2063,15 @@ SwigPyObject_New(void *ptr, swig_type_info *ty, int own)
     sobj->ty   = ty;
     sobj->own  = own;
     sobj->next = 0;
+#ifdef SWIGPYTHON_BUILTIN
+    sobj->dict = 0;
+#endif
+    if (own == SWIG_POINTER_OWN) {
+      /* Obtain a reference to the Python capsule wrapping the module information, so that the
+       * module information is correctly destroyed after all SWIG python objects have been freed
+       * by the GC (and corresponding destructors invoked) */
+      Py_XINCREF(Swig_Capsule_global);
+    }
   }
   return (PyObject *)sobj;
 }
@@ -1891,7 +2159,11 @@ SwigPyPacked_TypeOnce(void) {
       sizeof(SwigPyPacked),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyPacked_dealloc,     /* tp_dealloc */
-      0,                                    /* tp_print */
+#if PY_VERSION_HEX < 0x030800b4
+      (printfunc)0,                         /*tp_print*/
+#else
+      (Py_ssize_t)0,                        /*tp_vectorcall_offset*/
+#endif
       (getattrfunc)0,                       /* tp_getattr */
       (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX>=0x03000000
@@ -1956,7 +2228,7 @@ SwigPyPacked_TypeOnce(void) {
     };
     swigpypacked_type = tmp;
     type_init = 1;
-    if (PyType_Ready(&swigpypacked_type) < 0)
+    if (PyType_Ready(&swigpypacked_type) != 0)
       return NULL;
   }
   return &swigpypacked_type;
@@ -2146,12 +2418,19 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
   }
   if (sobj) {
-    if (own)
-      *own = *own | sobj->own;
-    if (flags & SWIG_POINTER_DISOWN) {
-      sobj->own = 0;
+    if (((flags & SWIG_POINTER_RELEASE) == SWIG_POINTER_RELEASE) && !sobj->own) {
+      res = SWIG_ERROR_RELEASE_NOT_OWNED;
+    } else {
+      if (own)
+        *own = *own | sobj->own;
+      if (flags & SWIG_POINTER_DISOWN) {
+        sobj->own = 0;
+      }
+      if (flags & SWIG_POINTER_CLEAR) {
+        sobj->ptr = 0;
+      }
+      res = SWIG_OK;
     }
-    res = SWIG_OK;
   } else {
     if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
@@ -2264,12 +2543,17 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 #if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
       PyObject **dictptr = _PyObject_GetDictPtr(inst);
       if (dictptr != NULL) {
-	PyObject *dict = *dictptr;
-	if (dict == NULL) {
-	  dict = PyDict_New();
-	  *dictptr = dict;
-	  PyDict_SetItem(dict, SWIG_This(), swig_this);
-	}
+        PyObject *dict = *dictptr;
+        if (dict == NULL) {
+          dict = PyDict_New();
+          *dictptr = dict;
+        }
+        if (dict) {
+          PyDict_SetItem(dict, SWIG_This(), swig_this);
+        } else{
+          Py_DECREF(inst);
+          inst = 0;
+        }
       }
 #else
       if (PyObject_SetAttr(inst, SWIG_This(), swig_this) == -1) {
@@ -2291,7 +2575,7 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
             Py_DECREF(inst);
             inst = 0;
           } else {
-            Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+            PyType_Modified(Py_TYPE(inst));
           }
         }
       }
@@ -2320,7 +2604,11 @@ SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
       dict = PyDict_New();
       *dictptr = dict;
     }
-    return PyDict_SetItem(dict, SWIG_This(), swig_this);
+    if (dict) {
+      return PyDict_SetItem(dict, SWIG_This(), swig_this);
+    } else{
+      return -1;
+    }
   }
 #endif
   return PyObject_SetAttr(inst, SWIG_This(), swig_this);
@@ -2335,7 +2623,7 @@ SWIG_Python_InitShadowInstance(PyObject *args) {
   } else {
     SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
     if (sthis) {
-      SwigPyObject_append((PyObject*) sthis, obj[1]);
+      Py_DECREF(SwigPyObject_append((PyObject*) sthis, obj[1]));
     } else {
       if (SWIG_Python_SetSwigThis(obj[0], obj[1]) != 0)
         return NULL;
@@ -2374,7 +2662,9 @@ SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int f
     } else {
       newobj = PyObject_New(SwigPyObject, clientdata->pytype);
 #ifdef SWIGPYTHON_BUILTIN
-      newobj->dict = 0;
+      if (newobj) {
+        newobj->dict = 0;
+      }
 #endif
     }
     if (newobj) {
@@ -2413,39 +2703,61 @@ SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
 void *SWIG_ReturnGlobalTypeList(void *);
 #endif
 
+static PyObject *Swig_TypeCache_global = NULL;
+
+/* The python cached type query */
+SWIGRUNTIME PyObject *
+SWIG_Python_TypeCache(void) {
+  if (Swig_TypeCache_global == NULL) {
+    Swig_TypeCache_global = PyDict_New();
+  }
+  return Swig_TypeCache_global;
+}
+
 SWIGRUNTIME swig_module_info *
 SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
+#ifdef SWIG_LINK_RUNTIME
   static void *type_pointer = (void *)0;
   /* first check if module already created */
   if (!type_pointer) {
-#ifdef SWIG_LINK_RUNTIME
     type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
+  }
 #else
-    type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0);
-    if (PyErr_Occurred()) {
-      PyErr_Clear();
-      type_pointer = (void *)0;
-    }
-#endif
+  void *type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0);
+  if (PyErr_Occurred()) {
+    PyErr_Clear();
+    type_pointer = (void *)0;
   }
+#endif
   return (swig_module_info *) type_pointer;
 }
 
+
+static int interpreter_counter = 0; // how many (sub-)interpreters are using swig_module's types
+
 SWIGRUNTIME void
 SWIG_Python_DestroyModule(PyObject *obj)
 {
   swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME);
   swig_type_info **types = swig_module->types;
   size_t i;
+  if (--interpreter_counter != 0) // another sub-interpreter may still be using the swig_module's types
+    return;
   for (i =0; i < swig_module->size; ++i) {
     swig_type_info *ty = types[i];
     if (ty->owndata) {
       SwigPyClientData *data = (SwigPyClientData *) ty->clientdata;
+      ty->clientdata = 0;
       if (data) SwigPyClientData_Del(data);
     }
   }
   Py_DECREF(SWIG_This());
   Swig_This_global = NULL;
+  Py_DECREF(SWIG_globals());
+  Swig_Globals_global = NULL;
+  Py_DECREF(SWIG_Python_TypeCache());
+  Swig_TypeCache_global = NULL;
+  Swig_Capsule_global = NULL;
 }
 
 SWIGRUNTIME void
@@ -2459,19 +2771,17 @@ SWIG_Python_SetModule(swig_module_info *swig_module) {
 #endif
   PyObject *pointer = PyCapsule_New((void *) swig_module, SWIGPY_CAPSULE_NAME, SWIG_Python_DestroyModule);
   if (pointer && module) {
-    PyModule_AddObject(module, "type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
+    if (PyModule_AddObject(module, SWIGPY_CAPSULE_ATTR_NAME, pointer) == 0) {
+      ++interpreter_counter;
+      Swig_Capsule_global = pointer;
+    } else {
+      Py_DECREF(pointer);
+    }
   } else {
     Py_XDECREF(pointer);
   }
 }
 
-/* The python cached type query */
-SWIGRUNTIME PyObject *
-SWIG_Python_TypeCache(void) {
-  static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New();
-  return cache;
-}
-
 SWIGRUNTIME swig_type_info *
 SWIG_Python_TypeQuery(const char *type)
 {
@@ -2486,8 +2796,10 @@ SWIG_Python_TypeQuery(const char *type)
     descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
     if (descriptor) {
       obj = PyCapsule_New((void*) descriptor, NULL, NULL);
-      PyDict_SetItem(cache, key, obj);
-      Py_DECREF(obj);
+      if (obj) {
+        PyDict_SetItem(cache, key, obj);
+        Py_DECREF(obj);
+      }
     }
   }
   Py_DECREF(key);
@@ -2520,7 +2832,6 @@ SWIG_Python_AddErrMesg(const char* mesg, int infront)
       } else {
 	PyErr_Format(type, "%s %s", errmesg, mesg);
       }
-      SWIG_Python_str_DelForPy3(tmp);
       Py_DECREF(old_str);
     }
     return 1;
@@ -2572,7 +2883,6 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
 	if (cstr) {
 	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
 		       type, otype, cstr);
-          SWIG_Python_str_DelForPy3(cstr);
 	} else {
 	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
 		       type, otype);
@@ -2594,12 +2904,6 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int SWIGUNUSEDPARM(arg
   void *result;
   if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
     PyErr_Clear();
-#if SWIG_POINTER_EXCEPTION
-    if (flags) {
-      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
-      SWIG_Python_ArgFail(argnum);
-    }
-#endif
   }
   return result;
 }
@@ -2630,7 +2934,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   }
 
   if (!tp->tp_dict) {
-    if (PyType_Ready(tp) < 0)
+    if (PyType_Ready(tp) != 0)
       goto done;
   }
 
@@ -2645,7 +2949,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
     } else {
       encoded_name = PyUnicode_AsUTF8String(name);
       if (!encoded_name)
-        return -1;
+        goto done;
     }
     PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name));
     Py_DECREF(encoded_name);
@@ -2668,24 +2972,9 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 
 #define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) 
 
-#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else 
-
+#define SWIG_contract_assert(expr, msg) do { if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } } while (0) 
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Method creation and docstring support functions */
-
-SWIGINTERN PyMethodDef *SWIG_PythonGetProxyDoc(const char *name);
-SWIGINTERN PyObject *SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func);
-SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func);
-
-#ifdef __cplusplus
-}
-#endif
-
 
   #define SWIG_exception(code, msg) do { SWIG_Error(code, msg); SWIG_fail;; } while(0) 
 
@@ -2809,8 +3098,52 @@ static swig_module_info swig_module = {swig_types, 93, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_fastjet"
 
-#define SWIGVERSION 0x040002 
-#define SWIG_VERSION SWIGVERSION
+#ifdef __cplusplus
+#include <utility>
+/* SwigValueWrapper is described in swig.swg */
+template<typename T> class SwigValueWrapper {
+  struct SwigSmartPointer {
+    T *ptr;
+    SwigSmartPointer(T *p) : ptr(p) { }
+    ~SwigSmartPointer() { delete ptr; }
+    SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+    void reset(T *p) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = p; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
+public:
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; }
+#if __cplusplus >=201103L
+  SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; }
+  operator T&&() const { return std::move(*pointer.ptr); }
+#else
+  operator T&() const { return *pointer.ptr; }
+#endif
+  T *operator&() const { return pointer.ptr; }
+  static void reset(SwigValueWrapper& t, T *p) { t.pointer.reset(p); }
+};
+
+/*
+ * SwigValueInit() is a generic initialisation solution as the following approach:
+ * 
+ *       T c_result = T();
+ * 
+ * doesn't compile for all types for example:
+ * 
+ *       unsigned int c_result = unsigned int();
+ */
+template <typename T> T SwigValueInit() {
+  return T();
+}
+
+#if __cplusplus >=201103L
+# define SWIG_STD_MOVE(OBJ) std::move(OBJ)
+#else
+# define SWIG_STD_MOVE(OBJ) OBJ
+#endif
+
+#endif
 
 
 #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) 
@@ -5135,7 +5468,7 @@ SWIGINTERN std::string fastjet_Subtractor___str__(fastjet::Subtractor const *sel
 #ifdef __cplusplus
 extern "C" {
 #endif
-SWIGINTERN PyObject *_wrap_delete_SwigPyIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_SwigPyIterator(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
@@ -5157,7 +5490,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_value(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_value(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
@@ -5188,7 +5521,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   size_t arg2 ;
@@ -5225,7 +5558,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
@@ -5263,7 +5596,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator_incr", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
@@ -5272,7 +5605,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
@@ -5296,7 +5629,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   size_t arg2 ;
@@ -5333,7 +5666,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
@@ -5371,7 +5704,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator_decr", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
@@ -5380,7 +5713,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
@@ -5404,7 +5737,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   swig::SwigPyIterator *arg2 = 0 ;
@@ -5441,7 +5774,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   swig::SwigPyIterator *arg2 = 0 ;
@@ -5478,7 +5811,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_copy(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
@@ -5501,7 +5834,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_next(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_next(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
@@ -5532,7 +5865,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___next__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___next__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
@@ -5563,7 +5896,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_previous(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_previous(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
@@ -5594,7 +5927,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator_advance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_advance(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
@@ -5632,7 +5965,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   swig::SwigPyIterator *arg2 = 0 ;
@@ -5667,7 +6000,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   swig::SwigPyIterator *arg2 = 0 ;
@@ -5702,7 +6035,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___iadd__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___iadd__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
@@ -5740,7 +6073,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___isub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___isub__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
@@ -5778,7 +6111,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
@@ -5818,7 +6151,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
@@ -5857,7 +6190,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   swig::SwigPyIterator *arg2 = 0 ;
@@ -5900,7 +6233,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args
   if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator___sub__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
@@ -5913,7 +6246,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
@@ -5941,7 +6274,7 @@ SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_vectorPJ_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_iterator(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
@@ -5966,7 +6299,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ___nonzero__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -5989,7 +6322,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___bool__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ___bool__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6012,7 +6345,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ___len__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6035,7 +6368,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ___getslice__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::difference_type arg2 ;
@@ -6066,7 +6399,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___getslice__(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg3 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val3);
   try {
-    result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *)std_vector_Sl_fastjet_PseudoJet_Sg____getslice__(arg1,arg2,arg3);
+    result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *)std_vector_Sl_fastjet_PseudoJet_Sg____getslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   } catch(std::invalid_argument &_e) {
@@ -6079,7 +6412,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ___setslice____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::difference_type arg2 ;
@@ -6108,7 +6441,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setslice____SWIG_0(PyObject *SWIGUNUSEDPAR
   } 
   arg3 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val3);
   try {
-    std_vector_Sl_fastjet_PseudoJet_Sg____setslice____SWIG_0(arg1,arg2,arg3);
+    std_vector_Sl_fastjet_PseudoJet_Sg____setslice____SWIG_0(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   } catch(std::invalid_argument &_e) {
@@ -6121,7 +6454,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ___setslice____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::difference_type arg2 ;
@@ -6163,7 +6496,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setslice____SWIG_1(PyObject *SWIGUNUSEDPAR
     arg4 = ptr;
   }
   try {
-    std_vector_Sl_fastjet_PseudoJet_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg4);
+    std_vector_Sl_fastjet_PseudoJet_Sg____setslice____SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg4);
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   } catch(std::invalid_argument &_e) {
@@ -6187,7 +6520,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setslice__(PyObject *self, PyObject *args)
   if (!(argc = SWIG_Python_UnpackTuple(args, "vectorPJ___setslice__", 0, 4, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -6207,7 +6540,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setslice__(PyObject *self, PyObject *args)
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -6240,7 +6573,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ___delslice__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::difference_type arg2 ;
@@ -6270,7 +6603,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___delslice__(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg3 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val3);
   try {
-    std_vector_Sl_fastjet_PseudoJet_Sg____delslice__(arg1,arg2,arg3);
+    std_vector_Sl_fastjet_PseudoJet_Sg____delslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   } catch(std::invalid_argument &_e) {
@@ -6283,7 +6616,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ___delitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::difference_type arg2 ;
@@ -6304,7 +6637,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val2);
   try {
-    std_vector_Sl_fastjet_PseudoJet_Sg____delitem____SWIG_0(arg1,arg2);
+    std_vector_Sl_fastjet_PseudoJet_Sg____delitem____SWIG_0(arg1,SWIG_STD_MOVE(arg2));
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   } catch(std::invalid_argument &_e) {
@@ -6317,7 +6650,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ___getitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -6351,7 +6684,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -6399,7 +6732,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -6432,7 +6765,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ___delitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   PySliceObject *arg2 = (PySliceObject *) 0 ;
@@ -6474,7 +6807,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___delitem__(PyObject *self, PyObject *args)
   if (!(argc = SWIG_Python_UnpackTuple(args, "vectorPJ___delitem__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -6487,7 +6820,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___delitem__(PyObject *self, PyObject *args)
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -6510,7 +6843,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ___getitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::difference_type arg2 ;
@@ -6532,7 +6865,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val2);
   try {
-    result = (std::vector< fastjet::PseudoJet >::value_type *) &std_vector_Sl_fastjet_PseudoJet_Sg____getitem____SWIG_1((std::vector< fastjet::PseudoJet > const *)arg1,arg2);
+    result = (std::vector< fastjet::PseudoJet >::value_type *) &std_vector_Sl_fastjet_PseudoJet_Sg____getitem____SWIG_1((std::vector< fastjet::PseudoJet > const *)arg1,SWIG_STD_MOVE(arg2));
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
@@ -6553,7 +6886,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___getitem__(PyObject *self, PyObject *args)
   if (!(argc = SWIG_Python_UnpackTuple(args, "vectorPJ___getitem__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -6566,7 +6899,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___getitem__(PyObject *self, PyObject *args)
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -6589,7 +6922,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::difference_type arg2 ;
@@ -6621,7 +6954,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM
   }
   arg3 = reinterpret_cast< std::vector< fastjet::PseudoJet >::value_type * >(argp3);
   try {
-    std_vector_Sl_fastjet_PseudoJet_Sg____setitem____SWIG_2(arg1,arg2,(fastjet::PseudoJet const &)*arg3);
+    std_vector_Sl_fastjet_PseudoJet_Sg____setitem____SWIG_2(arg1,SWIG_STD_MOVE(arg2),(fastjet::PseudoJet const &)*arg3);
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
@@ -6641,7 +6974,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setitem__(PyObject *self, PyObject *args)
   if (!(argc = SWIG_Python_UnpackTuple(args, "vectorPJ___setitem__", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -6654,7 +6987,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setitem__(PyObject *self, PyObject *args)
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -6671,7 +7004,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setitem__(PyObject *self, PyObject *args)
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -6699,7 +7032,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_pop(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6719,14 +7052,14 @@ SWIGINTERN PyObject *_wrap_vectorPJ_pop(PyObject *SWIGUNUSEDPARM(self), PyObject
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< fastjet::PseudoJet >::value_type(static_cast< const std::vector< fastjet::PseudoJet >::value_type& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< fastjet::PseudoJet >::value_type(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_append(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::value_type *arg2 = 0 ;
@@ -6758,7 +7091,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *result = 0 ;
   
@@ -6771,7 +7104,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -6799,7 +7132,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_empty(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6822,7 +7155,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_size(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6845,7 +7178,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_swap(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet > *arg2 = 0 ;
@@ -6877,7 +7210,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_begin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6901,7 +7234,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_end(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6925,7 +7258,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_rbegin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6949,7 +7282,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_rend(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6973,7 +7306,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_clear(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -6995,7 +7328,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_get_allocator(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -7011,14 +7344,14 @@ SWIGINTERN PyObject *_wrap_vectorPJ_get_allocator(PyObject *SWIGUNUSEDPARM(self)
   }
   arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1);
   result = ((std::vector< fastjet::PseudoJet > const *)arg1)->get_allocator();
-  resultobj = SWIG_NewPointerObj((new std::vector< fastjet::PseudoJet >::allocator_type(static_cast< const std::vector< fastjet::PseudoJet >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_fastjet__PseudoJet_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< fastjet::PseudoJet >::allocator_type(result)), SWIGTYPE_p_std__allocatorT_fastjet__PseudoJet_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet >::size_type arg1 ;
   size_t val1 ;
@@ -7039,7 +7372,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_pop_back(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -7061,7 +7394,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ_resize__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::size_type arg2 ;
@@ -7089,7 +7422,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ_erase__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::iterator arg2 ;
@@ -7116,7 +7449,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorPJ_erase" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet >::iterator""'");
     }
   }
-  result = std_vector_Sl_fastjet_PseudoJet_Sg__erase__SWIG_0(arg1,arg2);
+  result = std_vector_Sl_fastjet_PseudoJet_Sg__erase__SWIG_0(arg1,SWIG_STD_MOVE(arg2));
   resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< fastjet::PseudoJet >::iterator & >(result)),
     swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
@@ -7125,7 +7458,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ_erase__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::iterator arg2 ;
@@ -7166,7 +7499,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorPJ_erase" "', argument " "3"" of type '" "std::vector< fastjet::PseudoJet >::iterator""'");
     }
   }
-  result = std_vector_Sl_fastjet_PseudoJet_Sg__erase__SWIG_1(arg1,arg2,arg3);
+  result = std_vector_Sl_fastjet_PseudoJet_Sg__erase__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
   resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< fastjet::PseudoJet >::iterator & >(result)),
     swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
@@ -7184,7 +7517,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_erase(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "vectorPJ_erase", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -7197,7 +7530,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_erase(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -7224,7 +7557,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet >::size_type arg1 ;
   std::vector< fastjet::PseudoJet >::value_type *arg2 = 0 ;
@@ -7268,7 +7601,7 @@ SWIGINTERN PyObject *_wrap_new_vectorPJ(PyObject *self, PyObject *args) {
     return _wrap_new_vectorPJ__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_size_t(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -7278,7 +7611,7 @@ SWIGINTERN PyObject *_wrap_new_vectorPJ(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -7286,7 +7619,7 @@ SWIGINTERN PyObject *_wrap_new_vectorPJ(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_size_t(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -7311,7 +7644,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_push_back(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::value_type *arg2 = 0 ;
@@ -7343,7 +7676,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_front(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -7367,7 +7700,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_back(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -7391,7 +7724,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_assign(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::size_type arg2 ;
@@ -7431,7 +7764,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ_resize__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::size_type arg2 ;
@@ -7479,7 +7812,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_resize(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "vectorPJ_resize", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -7493,7 +7826,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_resize(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -7520,7 +7853,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ_insert__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::iterator arg2 ;
@@ -7558,7 +7891,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorPJ_insert" "', argument " "3"" of type '" "std::vector< fastjet::PseudoJet >::value_type const &""'"); 
   }
   arg3 = reinterpret_cast< std::vector< fastjet::PseudoJet >::value_type * >(argp3);
-  result = std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_0(arg1,arg2,(fastjet::PseudoJet const &)*arg3);
+  result = std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_0(arg1,SWIG_STD_MOVE(arg2),(fastjet::PseudoJet const &)*arg3);
   resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< fastjet::PseudoJet >::iterator & >(result)),
     swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
@@ -7567,7 +7900,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_vectorPJ_insert__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::iterator arg2 ;
@@ -7612,7 +7945,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorPJ_insert" "', argument " "4"" of type '" "std::vector< fastjet::PseudoJet >::value_type const &""'"); 
   }
   arg4 = reinterpret_cast< std::vector< fastjet::PseudoJet >::value_type * >(argp4);
-  std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_1(arg1,arg2,arg3,(fastjet::PseudoJet const &)*arg4);
+  std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(fastjet::PseudoJet const &)*arg4);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -7629,7 +7962,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_insert(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "vectorPJ_insert", 0, 4, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -7646,7 +7979,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_insert(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -7678,7 +8011,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_reserve(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet >::size_type arg2 ;
@@ -7707,7 +8040,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorPJ_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorPJ_capacity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -7730,7 +8063,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_vectorPJ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_vectorPJ(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet > *arg1 = (std::vector< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -7869,7 +8202,7 @@ SWIGINTERN PyObject *Swig_var_ln2_get(void) {
 }
 
 
-SWIGINTERN PyObject *_wrap___default_random_generator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap___default_random_generator(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   int *arg1 = (int *) 0 ;
   void *argp1 = 0 ;
@@ -7960,7 +8293,7 @@ SWIGINTERN PyObject *Swig_var__G_random_double_get(void) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_LimitedWarning__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_LimitedWarning__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::LimitedWarning *result = 0 ;
   
@@ -7981,7 +8314,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_LimitedWarning__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_LimitedWarning__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   int arg1 ;
   int val1 ;
@@ -8022,7 +8355,7 @@ SWIGINTERN PyObject *_wrap_new_LimitedWarning(PyObject *self, PyObject *args) {
     return _wrap_new_LimitedWarning__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -8041,7 +8374,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::LimitedWarning *arg1 = (fastjet::LimitedWarning *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -8080,7 +8413,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::LimitedWarning *arg1 = (fastjet::LimitedWarning *) 0 ;
   std::string *arg2 = 0 ;
@@ -8123,7 +8456,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::LimitedWarning *arg1 = (fastjet::LimitedWarning *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -8170,7 +8503,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::LimitedWarning *arg1 = (fastjet::LimitedWarning *) 0 ;
   std::string *arg2 = 0 ;
@@ -8230,7 +8563,7 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_warn(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "LimitedWarning_warn", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__LimitedWarning, 0);
     _v = SWIG_CheckState(res);
@@ -8243,7 +8576,7 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_warn(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__LimitedWarning, 0);
     _v = SWIG_CheckState(res);
@@ -8256,7 +8589,7 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_warn(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__LimitedWarning, 0);
     _v = SWIG_CheckState(res);
@@ -8274,7 +8607,7 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_warn(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__LimitedWarning, 0);
     _v = SWIG_CheckState(res);
@@ -8303,7 +8636,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_LimitedWarning_set_default_stream(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_LimitedWarning_set_default_stream(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::ostream *arg1 = (std::ostream *) 0 ;
   void *argp1 = 0 ;
@@ -8333,7 +8666,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_LimitedWarning_set_default_max_warn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_LimitedWarning_set_default_max_warn(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
   int val1 ;
@@ -8363,7 +8696,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_LimitedWarning_max_warn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_LimitedWarning_max_warn(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::LimitedWarning *arg1 = (fastjet::LimitedWarning *) 0 ;
   void *argp1 = 0 ;
@@ -8394,7 +8727,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_LimitedWarning_n_warn_so_far(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_LimitedWarning_n_warn_so_far(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::LimitedWarning *arg1 = (fastjet::LimitedWarning *) 0 ;
   void *argp1 = 0 ;
@@ -8425,7 +8758,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_LimitedWarning_summary(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_LimitedWarning_summary(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::string result;
   
@@ -8446,7 +8779,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_LimitedWarning(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_LimitedWarning(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::LimitedWarning *arg1 = (fastjet::LimitedWarning *) 0 ;
   void *argp1 = 0 ;
@@ -8487,7 +8820,7 @@ SWIGINTERN PyObject *LimitedWarning_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_Error__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_Error__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::Error *result = 0 ;
   
@@ -8508,7 +8841,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Error__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Error__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -8556,7 +8889,7 @@ SWIGINTERN PyObject *_wrap_new_Error(PyObject *self, PyObject *args) {
     return _wrap_new_Error__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -8573,7 +8906,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Error(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Error *arg1 = (fastjet::Error *) 0 ;
   void *argp1 = 0 ;
@@ -8603,7 +8936,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Error_message(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Error_message(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Error *arg1 = (fastjet::Error *) 0 ;
   void *argp1 = 0 ;
@@ -8634,7 +8967,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Error_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Error_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Error *arg1 = (fastjet::Error *) 0 ;
   void *argp1 = 0 ;
@@ -8665,7 +8998,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Error_set_print_errors(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Error_set_print_errors(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   bool arg1 ;
   bool val1 ;
@@ -8695,7 +9028,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Error_set_print_backtrace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Error_set_print_backtrace(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   bool arg1 ;
   bool val1 ;
@@ -8725,7 +9058,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Error_set_default_stream(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Error_set_default_stream(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::ostream *arg1 = (std::ostream *) 0 ;
   void *argp1 = 0 ;
@@ -8755,7 +9088,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Error___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Error___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Error *arg1 = (fastjet::Error *) 0 ;
   void *argp1 = 0 ;
@@ -8797,7 +9130,7 @@ SWIGINTERN PyObject *Error_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_InternalError(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_InternalError(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -8835,7 +9168,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_InternalError(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_InternalError(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::InternalError *arg1 = (fastjet::InternalError *) 0 ;
   void *argp1 = 0 ;
@@ -8876,7 +9209,7 @@ SWIGINTERN PyObject *InternalError_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_PseudoJetStructureBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PseudoJetStructureBase(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *result = 0 ;
   
@@ -8897,7 +9230,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_PseudoJetStructureBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_PseudoJetStructureBase(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -8927,7 +9260,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -8958,7 +9291,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_associated_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_associated_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -8989,7 +9322,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_associated_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_associated_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -9020,7 +9353,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_valid_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_valid_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -9051,7 +9384,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_validated_cs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_validated_cs(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -9082,7 +9415,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_validated_csab(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_validated_csab(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -9113,7 +9446,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_partner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_partner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9165,7 +9498,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_child(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_child(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9217,7 +9550,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_parents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_parents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9280,7 +9613,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_object_in_jet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_object_in_jet(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9332,7 +9665,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -9363,7 +9696,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9404,7 +9737,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_exclusive_subjets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_exclusive_subjets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -9435,7 +9768,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subjets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subjets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9486,7 +9819,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_n_exclusive_subjets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_n_exclusive_subjets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9537,7 +9870,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subjets_up_to(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subjets_up_to(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9586,7 +9919,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subdmerge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subdmerge(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9635,7 +9968,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subdmerge_max(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subdmerge_max(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9684,7 +10017,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_pieces(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_pieces(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9725,7 +10058,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_pieces(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_pieces(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9766,7 +10099,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   void *argp1 = 0 ;
@@ -9797,7 +10130,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9838,7 +10171,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area_error(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9879,7 +10212,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -9913,14 +10246,14 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area_4vector(PyObject *SWIGUNU
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_is_pure_ghost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_is_pure_ghost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJetStructureBase *arg1 = (fastjet::PseudoJetStructureBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -10014,7 +10347,7 @@ SWIGINTERN PyObject *Swig_var_pseudojet_invalid_rap_get(void) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_PseudoJet__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_PseudoJet__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *result = 0 ;
   
@@ -10035,7 +10368,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_PseudoJet__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_PseudoJet__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -10088,7 +10421,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_PseudoJet__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_PseudoJet__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   bool arg1 ;
   bool val1 ;
@@ -10129,7 +10462,7 @@ SWIGINTERN PyObject *_wrap_new_PseudoJet(PyObject *self, PyObject *args) {
     return _wrap_new_PseudoJet__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_bool(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -10139,7 +10472,7 @@ SWIGINTERN PyObject *_wrap_new_PseudoJet(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -10177,7 +10510,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_PseudoJet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_PseudoJet(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10207,7 +10540,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_E(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_E(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10238,7 +10571,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_e(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_e(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10269,7 +10602,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_px(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_px(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10300,7 +10633,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_py(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_py(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10331,7 +10664,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_pz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_pz(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10362,7 +10695,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_phi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_phi(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10393,7 +10726,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_phi_std(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_phi_std(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10424,7 +10757,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_phi_02pi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_phi_02pi(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10455,7 +10788,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_rap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_rap(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10486,7 +10819,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_rapidity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_rapidity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10517,7 +10850,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_pseudorapidity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_pseudorapidity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10548,7 +10881,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_eta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_eta(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10579,7 +10912,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_pt2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_pt2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10610,7 +10943,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_pt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_pt(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10641,7 +10974,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_perp2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_perp2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10672,7 +11005,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_perp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_perp(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10703,7 +11036,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_kt2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_kt2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10734,7 +11067,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_m2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_m2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10765,7 +11098,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10796,7 +11129,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_mperp2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_mperp2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10827,7 +11160,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_mperp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_mperp(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10858,7 +11191,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_mt2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_mt2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10889,7 +11222,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_mt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_mt(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10920,7 +11253,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_modp2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_modp2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10951,7 +11284,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_modp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_modp(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -10982,7 +11315,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_Et(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_Et(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -11013,7 +11346,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_Et2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_Et2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -11044,7 +11377,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_cos_theta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_cos_theta(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -11075,7 +11408,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_theta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_theta(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -11106,7 +11439,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___call__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   int arg2 ;
@@ -11144,7 +11477,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_kt_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_kt_distance(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11185,7 +11518,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_plain_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_plain_distance(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11226,7 +11559,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_squared_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_squared_distance(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11267,7 +11600,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_delta_R(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_delta_R(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11308,7 +11641,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_delta_phi_to(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_delta_phi_to(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11349,7 +11682,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_beam_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_beam_distance(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -11380,7 +11713,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_four_mom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_four_mom(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -11404,14 +11737,14 @@ SWIGINTERN PyObject *_wrap_PseudoJet_four_mom(PyObject *SWIGUNUSEDPARM(self), Py
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::valarray< double >(static_cast< const std::valarray< double >& >(result))), SWIGTYPE_p_std__valarrayT_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::valarray< double >(result)), SWIGTYPE_p_std__valarrayT_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_boost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_boost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11452,7 +11785,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_unboost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_unboost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11493,7 +11826,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___imul__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___imul__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -11531,7 +11864,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___itruediv__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___itruediv__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -11569,7 +11902,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___iadd__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___iadd__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11610,7 +11943,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___isub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___isub__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11651,7 +11984,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_reset__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_reset__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -11711,7 +12044,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_reset__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_reset__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -11759,7 +12092,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "PseudoJet_reset", 0, 5, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -11772,7 +12105,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -11814,7 +12147,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_reset_PtYPhiM__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_reset_PtYPhiM__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -11874,7 +12207,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_reset_PtYPhiM__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_reset_PtYPhiM__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -11935,7 +12268,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_PtYPhiM(PyObject *self, PyObject *arg
   if (!(argc = SWIG_Python_UnpackTuple(args, "PseudoJet_reset_PtYPhiM", 0, 5, argv))) SWIG_fail;
   --argc;
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -11962,7 +12295,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_PtYPhiM(PyObject *self, PyObject *arg
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -12004,7 +12337,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -12064,7 +12397,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -12112,7 +12445,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum(PyObject *self, PyObject *ar
   if (!(argc = SWIG_Python_UnpackTuple(args, "PseudoJet_reset_momentum", 0, 5, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -12125,7 +12458,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum(PyObject *self, PyObject *ar
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -12167,7 +12500,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum_PtYPhiM__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum_PtYPhiM__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -12227,7 +12560,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum_PtYPhiM__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum_PtYPhiM__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -12288,7 +12621,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum_PtYPhiM(PyObject *self, PyOb
   if (!(argc = SWIG_Python_UnpackTuple(args, "PseudoJet_reset_momentum_PtYPhiM", 0, 5, argv))) SWIG_fail;
   --argc;
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -12315,7 +12648,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum_PtYPhiM(PyObject *self, PyOb
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -12357,7 +12690,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_set_cached_rap_phi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_set_cached_rap_phi(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -12402,7 +12735,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_user_index(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_user_index(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12433,7 +12766,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_set_user_index(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_set_user_index(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   int arg2 ;
@@ -12470,7 +12803,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_set_user_info(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_set_user_info(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet::UserInfoBase *arg2 = (fastjet::PseudoJet::UserInfoBase *) 0 ;
@@ -12507,7 +12840,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_user_info(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_user_info(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12538,7 +12871,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_user_info_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_user_info_ptr(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12569,7 +12902,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_user_info_shared_ptr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_user_info_shared_ptr__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12598,7 +12931,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_user_info_shared_ptr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_user_info_shared_ptr__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12636,7 +12969,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_user_info_shared_ptr(PyObject *self, PyObje
   if (!(argc = SWIG_Python_UnpackTuple(args, "PseudoJet_user_info_shared_ptr", 0, 1, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -12645,7 +12978,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_user_info_shared_ptr(PyObject *self, PyObje
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -12663,69 +12996,78 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_set_user_info_shared_ptr(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
+  fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  std::string result;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject *swig_obj[2] ;
   
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
+  if (!SWIG_Python_UnpackTuple(args, "PseudoJet_set_user_info_shared_ptr", 2, 2, swig_obj)) SWIG_fail;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__PseudoJet, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PseudoJet_description" "', argument " "1"" of type '" "fastjet::PseudoJet const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PseudoJet_set_user_info_shared_ptr" "', argument " "1"" of type '" "fastjet::PseudoJet *""'"); 
   }
   arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PseudoJet_set_user_info_shared_ptr" "', argument " "2"" of type '" "fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PseudoJet_set_user_info_shared_ptr" "', argument " "2"" of type '" "fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > const &""'"); 
+  }
+  arg2 = reinterpret_cast< fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > * >(argp2);
   {
     try {
-      result = ((fastjet::PseudoJet const *)arg1)->description(); 
+      (arg1)->set_user_info_shared_ptr((fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > const &)*arg2); 
     }
     catch (fastjet::Error & e) {
       PyErr_SetString(FastJetError_, e.message().c_str());
       SWIG_fail;
     }
   }
-  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_associated_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
-  bool result;
+  std::string result;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__PseudoJet, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PseudoJet_has_associated_cluster_sequence" "', argument " "1"" of type '" "fastjet::PseudoJet const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PseudoJet_description" "', argument " "1"" of type '" "fastjet::PseudoJet const *""'"); 
   }
   arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1);
   {
     try {
-      result = (bool)((fastjet::PseudoJet const *)arg1)->has_associated_cluster_sequence(); 
+      result = ((fastjet::PseudoJet const *)arg1)->description(); 
     }
     catch (fastjet::Error & e) {
       PyErr_SetString(FastJetError_, e.message().c_str());
       SWIG_fail;
     }
   }
-  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_associated_cs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_associated_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12737,12 +13079,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_associated_cs(PyObject *SWIGUNUSEDPARM(
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__PseudoJet, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PseudoJet_has_associated_cs" "', argument " "1"" of type '" "fastjet::PseudoJet const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PseudoJet_has_associated_cluster_sequence" "', argument " "1"" of type '" "fastjet::PseudoJet const *""'"); 
   }
   arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1);
   {
     try {
-      result = (bool)((fastjet::PseudoJet const *)arg1)->has_associated_cs(); 
+      result = (bool)((fastjet::PseudoJet const *)arg1)->has_associated_cluster_sequence(); 
     }
     catch (fastjet::Error & e) {
       PyErr_SetString(FastJetError_, e.message().c_str());
@@ -12756,7 +13098,38 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_valid_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_associated_cs(PyObject *self, PyObject *args) {
+  PyObject *resultobj = 0;
+  fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  bool result;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__PseudoJet, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PseudoJet_has_associated_cs" "', argument " "1"" of type '" "fastjet::PseudoJet const *""'"); 
+  }
+  arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1);
+  {
+    try {
+      result = (bool)((fastjet::PseudoJet const *)arg1)->has_associated_cs(); 
+    }
+    catch (fastjet::Error & e) {
+      PyErr_SetString(FastJetError_, e.message().c_str());
+      SWIG_fail;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PseudoJet_has_valid_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12787,7 +13160,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_valid_cs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_valid_cs(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12818,7 +13191,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_associated_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_associated_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12849,7 +13222,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_associated_cs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_associated_cs(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12880,7 +13253,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_validated_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_validated_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12911,7 +13284,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_validated_cs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_validated_cs(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12942,7 +13315,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_validated_cluster_sequence_area_base(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_validated_cluster_sequence_area_base(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -12973,7 +13346,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_validated_csab(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_validated_csab(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13004,7 +13377,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_set_structure_shared_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_set_structure_shared_ptr(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::SharedPtr< fastjet::PseudoJetStructureBase > *arg2 = 0 ;
@@ -13044,7 +13417,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_structure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_structure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13075,7 +13448,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_structure_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_structure_ptr(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13106,7 +13479,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_structure_non_const_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_structure_non_const_ptr(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13137,7 +13510,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_validated_structure_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_validated_structure_ptr(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13168,7 +13541,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_structure_shared_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_structure_shared_ptr(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13199,7 +13572,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_partner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_partner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -13240,7 +13613,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_child(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_child(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -13281,7 +13654,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_parents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_parents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -13333,7 +13706,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_contains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_contains(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -13374,7 +13747,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_is_inside(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_is_inside(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -13415,7 +13788,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13446,7 +13819,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13477,7 +13850,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_exclusive_subjets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_exclusive_subjets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13508,7 +13881,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -13545,7 +13918,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_n_exclusive_subjets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_n_exclusive_subjets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -13583,7 +13956,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   int arg2 ;
@@ -13629,7 +14002,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets(PyObject *self, PyObject
   if (!(argc = SWIG_Python_UnpackTuple(args, "PseudoJet_exclusive_subjets", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -13644,7 +14017,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets(PyObject *self, PyObject
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -13668,7 +14041,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets_up_to(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets_up_to(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   int arg2 ;
@@ -13706,7 +14079,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subdmerge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subdmerge(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   int arg2 ;
@@ -13744,7 +14117,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subdmerge_max(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subdmerge_max(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   int arg2 ;
@@ -13782,7 +14155,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_pieces(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_pieces(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13813,7 +14186,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_pieces(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_pieces(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13844,7 +14217,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_has_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_has_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13875,7 +14248,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13906,7 +14279,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_area_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_area_error(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13937,7 +14310,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13961,14 +14334,14 @@ SWIGINTERN PyObject *_wrap_PseudoJet_area_4vector(PyObject *SWIGUNUSEDPARM(self)
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_is_pure_ghost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_is_pure_ghost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -13999,7 +14372,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_cluster_hist_index(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_cluster_hist_index(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -14030,7 +14403,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_set_cluster_hist_index(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_set_cluster_hist_index(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   int arg2 ;
@@ -14067,7 +14440,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_cluster_sequence_history_index(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_cluster_sequence_history_index(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -14098,7 +14471,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_set_cluster_sequence_history_index(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_set_cluster_sequence_history_index(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   int arg2 ;
@@ -14135,7 +14508,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -14166,7 +14539,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_set_python_info(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_set_python_info(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
@@ -14197,7 +14570,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet_python_info(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet_python_info(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   void *argp1 = 0 ;
@@ -14228,7 +14601,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___add__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -14262,7 +14635,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet___add__(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14271,7 +14644,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___sub__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -14305,7 +14678,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet___sub__(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14314,7 +14687,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___eq____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet___eq____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -14356,7 +14729,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___ne____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet___ne____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -14398,7 +14771,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___mul__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___mul__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -14429,7 +14802,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet___mul__(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14438,7 +14811,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___rmul__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___rmul__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -14469,7 +14842,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet___rmul__(PyObject *SWIGUNUSEDPARM(self), Py
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14478,7 +14851,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PseudoJet___div__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -14509,7 +14882,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet___div__(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14518,7 +14891,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___eq____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet___eq____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -14566,7 +14939,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet___eq__(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "PseudoJet___eq__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -14579,7 +14952,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet___eq__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -14600,7 +14973,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PseudoJet___ne____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PseudoJet___ne____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = (fastjet::PseudoJet *) 0 ;
   double arg2 ;
@@ -14648,7 +15021,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet___ne__(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "PseudoJet___ne__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -14661,7 +15034,7 @@ SWIGINTERN PyObject *_wrap_PseudoJet___ne__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__PseudoJet, 0);
     _v = SWIG_CheckState(res);
@@ -14693,7 +15066,7 @@ SWIGINTERN PyObject *PseudoJet_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap___add__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -14730,7 +15103,7 @@ SWIGINTERN PyObject *_wrap___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14739,7 +15112,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap___sub__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -14776,7 +15149,7 @@ SWIGINTERN PyObject *_wrap___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14785,7 +15158,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap___mul____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -14818,7 +15191,7 @@ SWIGINTERN PyObject *_wrap___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ss
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14827,7 +15200,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap___mul____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   double arg2 ;
@@ -14860,7 +15233,7 @@ SWIGINTERN PyObject *_wrap___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ss
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14869,7 +15242,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___truediv__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap___truediv__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   double arg2 ;
@@ -14903,7 +15276,7 @@ SWIGINTERN PyObject *_wrap___truediv__(PyObject *SWIGUNUSEDPARM(self), PyObject
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -14912,7 +15285,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___eq____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap___eq____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -14957,7 +15330,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___ne____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap___ne____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -15002,7 +15375,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___eq____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap___eq____SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   double arg2 ;
@@ -15044,7 +15417,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___eq____SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap___eq____SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -15095,7 +15468,7 @@ SWIGINTERN PyObject *_wrap___eq__(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "__eq__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -15107,7 +15480,7 @@ SWIGINTERN PyObject *_wrap___eq__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -15121,7 +15494,7 @@ SWIGINTERN PyObject *_wrap___eq__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -15141,7 +15514,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___ne____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap___ne____SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   double arg2 ;
@@ -15183,7 +15556,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap___ne____SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap___ne____SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -15234,7 +15607,7 @@ SWIGINTERN PyObject *_wrap___ne__(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "__ne__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -15246,7 +15619,7 @@ SWIGINTERN PyObject *_wrap___ne__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -15260,7 +15633,7 @@ SWIGINTERN PyObject *_wrap___ne__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -15280,7 +15653,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_dot_product(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_dot_product(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -15324,7 +15697,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_cos_theta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_cos_theta(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -15368,7 +15741,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_theta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_theta(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -15412,7 +15785,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_have_same_momentum(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_have_same_momentum(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -15456,7 +15829,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PtYPhiM__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PtYPhiM__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -15502,14 +15875,14 @@ SWIGINTERN PyObject *_wrap_PtYPhiM__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ss
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PtYPhiM__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PtYPhiM__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -15547,7 +15920,7 @@ SWIGINTERN PyObject *_wrap_PtYPhiM__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ss
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15563,7 +15936,7 @@ SWIGINTERN PyObject *_wrap_PtYPhiM(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "PtYPhiM", 0, 4, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -15585,7 +15958,7 @@ SWIGINTERN PyObject *_wrap_PtYPhiM(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -15622,7 +15995,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_sorted_by_pt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_sorted_by_pt(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -15660,7 +16033,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_sorted_by_rapidity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_sorted_by_rapidity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -15698,7 +16071,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_sorted_by_E(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_sorted_by_E(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -15736,7 +16109,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_sorted_by_pz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_sorted_by_pz(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -15774,7 +16147,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_sort_indices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_sort_indices(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< int,std::allocator< int > > *arg1 = 0 ;
   std::vector< double,std::allocator< double > > *arg2 = 0 ;
@@ -15817,7 +16190,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IndexedSortHelper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_IndexedSortHelper(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< double,std::allocator< double > > *arg1 = (std::vector< double,std::allocator< double > > *) 0 ;
   void *argp1 = 0 ;
@@ -15848,7 +16221,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_IndexedSortHelper___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IndexedSortHelper___call__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::IndexedSortHelper *arg1 = (fastjet::IndexedSortHelper *) 0 ;
   int arg2 ;
@@ -15894,7 +16267,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_IndexedSortHelper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_IndexedSortHelper(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::IndexedSortHelper *arg1 = (fastjet::IndexedSortHelper *) 0 ;
   void *argp1 = 0 ;
@@ -15935,7 +16308,7 @@ SWIGINTERN PyObject *IndexedSortHelper_swiginit(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_join__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -15962,7 +16335,7 @@ SWIGINTERN PyObject *_wrap_join__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -15971,7 +16344,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_join__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -15996,14 +16369,14 @@ SWIGINTERN PyObject *_wrap_join__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_join__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -16039,14 +16412,14 @@ SWIGINTERN PyObject *_wrap_join__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_join__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -16093,14 +16466,14 @@ SWIGINTERN PyObject *_wrap_join__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_join__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -16158,14 +16531,14 @@ SWIGINTERN PyObject *_wrap_join__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *result = 0 ;
   
@@ -16186,7 +16559,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -16215,7 +16588,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_RangeDefinition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_RangeDefinition(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = (fastjet::RangeDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -16245,7 +16618,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -16298,7 +16671,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -16343,7 +16716,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -16392,7 +16765,7 @@ SWIGINTERN PyObject *_wrap_new_RangeDefinition(PyObject *self, PyObject *args) {
     return _wrap_new_RangeDefinition__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -16402,7 +16775,7 @@ SWIGINTERN PyObject *_wrap_new_RangeDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -16418,7 +16791,7 @@ SWIGINTERN PyObject *_wrap_new_RangeDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -16440,7 +16813,7 @@ SWIGINTERN PyObject *_wrap_new_RangeDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -16480,7 +16853,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RangeDefinition_is_localizable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RangeDefinition_is_localizable(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = (fastjet::RangeDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -16511,7 +16884,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RangeDefinition_set_position__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_RangeDefinition_set_position__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = (fastjet::RangeDefinition *) 0 ;
   double *arg2 = 0 ;
@@ -16559,7 +16932,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RangeDefinition_set_position__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_RangeDefinition_set_position__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = (fastjet::RangeDefinition *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -16607,7 +16980,7 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_set_position(PyObject *self, PyObject
   if (!(argc = SWIG_Python_UnpackTuple(args, "RangeDefinition_set_position", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__RangeDefinition, 0);
     _v = SWIG_CheckState(res);
@@ -16620,7 +16993,7 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_set_position(PyObject *self, PyObject
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__RangeDefinition, 0);
     _v = SWIG_CheckState(res);
@@ -16650,7 +17023,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RangeDefinition_is_in_range__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_RangeDefinition_is_in_range__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = (fastjet::RangeDefinition *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -16690,7 +17063,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RangeDefinition_is_in_range__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_RangeDefinition_is_in_range__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = (fastjet::RangeDefinition *) 0 ;
   double arg2 ;
@@ -16744,7 +17117,7 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_is_in_range(PyObject *self, PyObject
   if (!(argc = SWIG_Python_UnpackTuple(args, "RangeDefinition_is_in_range", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__RangeDefinition, 0);
     _v = SWIG_CheckState(res);
@@ -16757,7 +17130,7 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_is_in_range(PyObject *self, PyObject
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__RangeDefinition, 0);
     _v = SWIG_CheckState(res);
@@ -16787,7 +17160,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RangeDefinition_get_rap_limits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RangeDefinition_get_rap_limits(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = (fastjet::RangeDefinition *) 0 ;
   double *arg2 = 0 ;
@@ -16838,7 +17211,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RangeDefinition_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RangeDefinition_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = (fastjet::RangeDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -16869,7 +17242,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RangeDefinition_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RangeDefinition_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = (fastjet::RangeDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -16911,7 +17284,7 @@ SWIGINTERN PyObject *RangeDefinition_swiginit(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_delete_SelectorWorker(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_SelectorWorker(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -16941,7 +17314,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker__pass(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker__pass(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -16982,7 +17355,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_terminator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_terminator(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   std::vector< fastjet::PseudoJet const *,std::allocator< fastjet::PseudoJet const * > > *arg2 = 0 ;
@@ -17022,7 +17395,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_applies_jet_by_jet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_applies_jet_by_jet(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -17053,7 +17426,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -17084,7 +17457,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_takes_reference(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_takes_reference(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -17115,7 +17488,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_set_reference(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_set_reference(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -17155,7 +17528,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_copy(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -17186,7 +17559,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_get_rapidity_extent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_get_rapidity_extent(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   double *arg2 = 0 ;
@@ -17237,7 +17610,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_is_geometric(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_is_geometric(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -17268,7 +17641,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_has_finite_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_has_finite_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -17299,7 +17672,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_has_known_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_has_known_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -17330,7 +17703,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorker_known_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorker_known_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -17368,7 +17741,7 @@ SWIGINTERN PyObject *SelectorWorker_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Selector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_Selector__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::Selector *result = 0 ;
   
@@ -17389,7 +17762,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Selector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Selector__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorker *arg1 = (fastjet::SelectorWorker *) 0 ;
   void *argp1 = 0 ;
@@ -17418,7 +17791,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Selector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Selector__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::RangeDefinition *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -17462,7 +17835,7 @@ SWIGINTERN PyObject *_wrap_new_Selector(PyObject *self, PyObject *args) {
     return _wrap_new_Selector__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__SelectorWorker, 0);
     _v = SWIG_CheckState(res);
@@ -17471,7 +17844,7 @@ SWIGINTERN PyObject *_wrap_new_Selector(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__RangeDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -17489,7 +17862,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Selector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Selector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -17519,7 +17892,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector__pass(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector__pass(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -17560,7 +17933,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___call____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Selector___call____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -17600,7 +17973,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_count(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_count(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -17645,7 +18018,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_sum(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_sum(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -17681,7 +18054,7 @@ SWIGINTERN PyObject *_wrap_Selector_sum(PyObject *SWIGUNUSEDPARM(self), PyObject
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
 fail:
@@ -17690,7 +18063,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_scalar_pt_sum(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_scalar_pt_sum(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -17735,7 +18108,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_sift(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_sift(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -17801,7 +18174,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_applies_jet_by_jet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_applies_jet_by_jet(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -17832,7 +18205,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___call____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Selector___call____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -17885,7 +18258,7 @@ SWIGINTERN PyObject *_wrap_Selector___call__(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "Selector___call__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Selector, 0);
     _v = SWIG_CheckState(res);
@@ -17898,7 +18271,7 @@ SWIGINTERN PyObject *_wrap_Selector___call__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Selector, 0);
     _v = SWIG_CheckState(res);
@@ -17920,7 +18293,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_nullify_non_selected(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_nullify_non_selected(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   std::vector< fastjet::PseudoJet const *,std::allocator< fastjet::PseudoJet const * > > *arg2 = 0 ;
@@ -17960,7 +18333,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_get_rapidity_extent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_get_rapidity_extent(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   double *arg2 = 0 ;
@@ -18011,7 +18384,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18042,7 +18415,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_is_geometric(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_is_geometric(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18073,7 +18446,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_has_finite_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_has_finite_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18104,7 +18477,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_area__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Selector_area__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18133,7 +18506,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_area__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Selector_area__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   double arg2 ;
@@ -18179,7 +18552,7 @@ SWIGINTERN PyObject *_wrap_Selector_area(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "Selector_area", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Selector, 0);
     _v = SWIG_CheckState(res);
@@ -18188,7 +18561,7 @@ SWIGINTERN PyObject *_wrap_Selector_area(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Selector, 0);
     _v = SWIG_CheckState(res);
@@ -18212,7 +18585,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_worker(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_worker(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18243,7 +18616,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_validated_worker(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_validated_worker(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18274,7 +18647,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_takes_reference(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_takes_reference(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18305,7 +18678,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector_set_reference(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector_set_reference(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -18346,7 +18719,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___iand__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector___iand__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -18387,7 +18760,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___ior__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector___ior__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -18428,7 +18801,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___str____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Selector___str____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18457,7 +18830,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___str____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Selector___str____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18495,7 +18868,7 @@ SWIGINTERN PyObject *_wrap_Selector___str__(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "Selector___str__", 0, 1, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Selector, 0);
     _v = SWIG_CheckState(res);
@@ -18504,7 +18877,7 @@ SWIGINTERN PyObject *_wrap_Selector___str__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Selector, 0);
     _v = SWIG_CheckState(res);
@@ -18522,7 +18895,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___mul__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector___mul__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -18556,7 +18929,7 @@ SWIGINTERN PyObject *_wrap_Selector___mul__(PyObject *SWIGUNUSEDPARM(self), PyOb
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -18565,7 +18938,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___and__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector___and__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -18599,7 +18972,7 @@ SWIGINTERN PyObject *_wrap_Selector___and__(PyObject *SWIGUNUSEDPARM(self), PyOb
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -18608,7 +18981,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___or__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector___or__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -18642,7 +19015,7 @@ SWIGINTERN PyObject *_wrap_Selector___or__(PyObject *SWIGUNUSEDPARM(self), PyObj
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -18651,7 +19024,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Selector___invert__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Selector___invert__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = (fastjet::Selector *) 0 ;
   void *argp1 = 0 ;
@@ -18675,7 +19048,7 @@ SWIGINTERN PyObject *_wrap_Selector___invert__(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18693,7 +19066,7 @@ SWIGINTERN PyObject *Selector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_SelectorIdentity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorIdentity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector result;
   
@@ -18707,14 +19080,14 @@ SWIGINTERN PyObject *_wrap_SelectorIdentity(PyObject *SWIGUNUSEDPARM(self), PyOb
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap___mul____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap___mul____SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -18750,7 +19123,7 @@ SWIGINTERN PyObject *_wrap___mul____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ss
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   PyErr_Clear();
@@ -18768,7 +19141,7 @@ SWIGINTERN PyObject *_wrap___mul__(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "__mul__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -18782,7 +19155,7 @@ SWIGINTERN PyObject *_wrap___mul__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -18794,7 +19167,7 @@ SWIGINTERN PyObject *_wrap___mul__(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -18814,7 +19187,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorPtMin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorPtMin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -18838,14 +19211,14 @@ SWIGINTERN PyObject *_wrap_SelectorPtMin(PyObject *SWIGUNUSEDPARM(self), PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorPtMax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorPtMax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -18869,14 +19242,14 @@ SWIGINTERN PyObject *_wrap_SelectorPtMax(PyObject *SWIGUNUSEDPARM(self), PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorPtRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorPtRange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -18907,14 +19280,14 @@ SWIGINTERN PyObject *_wrap_SelectorPtRange(PyObject *SWIGUNUSEDPARM(self), PyObj
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorEtMin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorEtMin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -18938,14 +19311,14 @@ SWIGINTERN PyObject *_wrap_SelectorEtMin(PyObject *SWIGUNUSEDPARM(self), PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorEtMax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorEtMax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -18969,14 +19342,14 @@ SWIGINTERN PyObject *_wrap_SelectorEtMax(PyObject *SWIGUNUSEDPARM(self), PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorEtRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorEtRange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19007,14 +19380,14 @@ SWIGINTERN PyObject *_wrap_SelectorEtRange(PyObject *SWIGUNUSEDPARM(self), PyObj
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorEMin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorEMin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19038,14 +19411,14 @@ SWIGINTERN PyObject *_wrap_SelectorEMin(PyObject *SWIGUNUSEDPARM(self), PyObject
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorEMax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorEMax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19069,14 +19442,14 @@ SWIGINTERN PyObject *_wrap_SelectorEMax(PyObject *SWIGUNUSEDPARM(self), PyObject
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorERange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorERange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19107,14 +19480,14 @@ SWIGINTERN PyObject *_wrap_SelectorERange(PyObject *SWIGUNUSEDPARM(self), PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorMassMin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorMassMin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19138,14 +19511,14 @@ SWIGINTERN PyObject *_wrap_SelectorMassMin(PyObject *SWIGUNUSEDPARM(self), PyObj
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorMassMax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorMassMax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19169,14 +19542,14 @@ SWIGINTERN PyObject *_wrap_SelectorMassMax(PyObject *SWIGUNUSEDPARM(self), PyObj
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorMassRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorMassRange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19207,14 +19580,14 @@ SWIGINTERN PyObject *_wrap_SelectorMassRange(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorRapMin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorRapMin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19238,14 +19611,14 @@ SWIGINTERN PyObject *_wrap_SelectorRapMin(PyObject *SWIGUNUSEDPARM(self), PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorRapMax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorRapMax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19269,14 +19642,14 @@ SWIGINTERN PyObject *_wrap_SelectorRapMax(PyObject *SWIGUNUSEDPARM(self), PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorRapRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorRapRange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19307,14 +19680,14 @@ SWIGINTERN PyObject *_wrap_SelectorRapRange(PyObject *SWIGUNUSEDPARM(self), PyOb
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorAbsRapMin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorAbsRapMin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19338,14 +19711,14 @@ SWIGINTERN PyObject *_wrap_SelectorAbsRapMin(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorAbsRapMax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorAbsRapMax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19369,14 +19742,14 @@ SWIGINTERN PyObject *_wrap_SelectorAbsRapMax(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorAbsRapRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorAbsRapRange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19407,14 +19780,14 @@ SWIGINTERN PyObject *_wrap_SelectorAbsRapRange(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorEtaMin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorEtaMin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19438,14 +19811,14 @@ SWIGINTERN PyObject *_wrap_SelectorEtaMin(PyObject *SWIGUNUSEDPARM(self), PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorEtaMax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorEtaMax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19469,14 +19842,14 @@ SWIGINTERN PyObject *_wrap_SelectorEtaMax(PyObject *SWIGUNUSEDPARM(self), PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorEtaRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorEtaRange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19507,14 +19880,14 @@ SWIGINTERN PyObject *_wrap_SelectorEtaRange(PyObject *SWIGUNUSEDPARM(self), PyOb
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorAbsEtaMin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorAbsEtaMin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19538,14 +19911,14 @@ SWIGINTERN PyObject *_wrap_SelectorAbsEtaMin(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorAbsEtaMax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorAbsEtaMax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19569,14 +19942,14 @@ SWIGINTERN PyObject *_wrap_SelectorAbsEtaMax(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorAbsEtaRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorAbsEtaRange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19607,14 +19980,14 @@ SWIGINTERN PyObject *_wrap_SelectorAbsEtaRange(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorPhiRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorPhiRange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19645,14 +20018,14 @@ SWIGINTERN PyObject *_wrap_SelectorPhiRange(PyObject *SWIGUNUSEDPARM(self), PyOb
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorRapPhiRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorRapPhiRange(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19699,14 +20072,14 @@ SWIGINTERN PyObject *_wrap_SelectorRapPhiRange(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorNHardest(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorNHardest(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   unsigned int arg1 ;
   unsigned int val1 ;
@@ -19730,14 +20103,14 @@ SWIGINTERN PyObject *_wrap_SelectorNHardest(PyObject *SWIGUNUSEDPARM(self), PyOb
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorCircle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorCircle(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19761,14 +20134,14 @@ SWIGINTERN PyObject *_wrap_SelectorCircle(PyObject *SWIGUNUSEDPARM(self), PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorDoughnut(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorDoughnut(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19799,14 +20172,14 @@ SWIGINTERN PyObject *_wrap_SelectorDoughnut(PyObject *SWIGUNUSEDPARM(self), PyOb
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorStrip(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorStrip(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19830,14 +20203,14 @@ SWIGINTERN PyObject *_wrap_SelectorStrip(PyObject *SWIGUNUSEDPARM(self), PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorRectangle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorRectangle(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -19868,14 +20241,14 @@ SWIGINTERN PyObject *_wrap_SelectorRectangle(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorPtFractionMin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorPtFractionMin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -19899,14 +20272,14 @@ SWIGINTERN PyObject *_wrap_SelectorPtFractionMin(PyObject *SWIGUNUSEDPARM(self),
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorIsZero(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorIsZero(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector result;
   
@@ -19920,14 +20293,14 @@ SWIGINTERN PyObject *_wrap_SelectorIsZero(PyObject *SWIGUNUSEDPARM(self), PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorIsPureGhost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorIsPureGhost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Selector result;
   
@@ -19941,14 +20314,14 @@ SWIGINTERN PyObject *_wrap_SelectorIsPureGhost(PyObject *SWIGUNUSEDPARM(self), P
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_fastjet_version_string(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_fastjet_version_string(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::string result;
   
@@ -19997,7 +20370,7 @@ SWIGINTERN PyObject *Swig_var_cambridge_aachen_algorithm_get(void) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20050,7 +20423,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20095,7 +20468,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20132,7 +20505,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   fastjet::RecombinationScheme arg2 ;
@@ -20177,7 +20550,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   fastjet::RecombinationScheme arg2 ;
@@ -20214,7 +20587,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   int val1 ;
@@ -20243,7 +20616,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20304,7 +20677,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_7(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20357,7 +20730,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_8(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_8(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20402,7 +20775,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_9(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_9(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20455,7 +20828,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_10(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_10(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20500,7 +20873,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_11(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_11(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   fastjet::JetDefinition::Recombiner *arg2 = (fastjet::JetDefinition::Recombiner *) 0 ;
@@ -20545,7 +20918,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_12(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_12(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   fastjet::JetDefinition::Recombiner *arg2 = (fastjet::JetDefinition::Recombiner *) 0 ;
@@ -20582,7 +20955,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_13(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_13(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20643,7 +21016,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_14(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_14(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20696,7 +21069,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_15(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_15(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *result = 0 ;
   
@@ -20717,7 +21090,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_16(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_16(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition::Plugin *arg1 = (fastjet::JetDefinition::Plugin *) 0 ;
   void *argp1 = 0 ;
@@ -20746,7 +21119,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_17(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_17(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20807,7 +21180,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_18(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_18(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20868,7 +21241,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_19(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_19(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20921,7 +21294,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_20(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_20(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -20978,7 +21351,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     return _wrap_new_JetDefinition__SWIG_15(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetDefinition__Plugin, 0);
     _v = SWIG_CheckState(res);
@@ -20987,7 +21360,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -20997,7 +21370,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21012,7 +21385,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21028,7 +21401,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21044,7 +21417,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21065,7 +21438,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21087,7 +21460,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21108,7 +21481,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21130,7 +21503,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21152,7 +21525,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21174,7 +21547,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21201,7 +21574,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21229,7 +21602,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21257,7 +21630,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21284,7 +21657,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21312,7 +21685,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21346,7 +21719,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21380,7 +21753,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21413,7 +21786,7 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -21489,7 +21862,7 @@ SWIGINTERN PyObject *Swig_var_JetDefinition_max_allowable_R_get(void) {
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_set_recombination_scheme(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_set_recombination_scheme(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   fastjet::RecombinationScheme arg2 ;
@@ -21526,7 +21899,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_set_recombiner__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition_set_recombiner__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   fastjet::JetDefinition::Recombiner *arg2 = (fastjet::JetDefinition::Recombiner *) 0 ;
@@ -21562,7 +21935,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_set_recombiner__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition_set_recombiner__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -21610,7 +21983,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition_set_recombiner(PyObject *self, PyObject
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetDefinition_set_recombiner", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetDefinition, 0);
     _v = SWIG_CheckState(res);
@@ -21624,7 +21997,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition_set_recombiner(PyObject *self, PyObject
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetDefinition, 0);
     _v = SWIG_CheckState(res);
@@ -21646,7 +22019,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_delete_recombiner_when_unused(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_delete_recombiner_when_unused(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -21676,7 +22049,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_plugin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_plugin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -21707,7 +22080,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_delete_plugin_when_unused(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_delete_plugin_when_unused(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -21737,7 +22110,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_jet_algorithm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_jet_algorithm(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -21768,7 +22141,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_jet_finder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_jet_finder(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -21799,7 +22172,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_R(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_R(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -21830,7 +22203,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_extra_param(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_extra_param(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -21861,7 +22234,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_strategy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_strategy(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -21892,7 +22265,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_recombination_scheme(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_recombination_scheme(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -21923,7 +22296,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_set_jet_algorithm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_set_jet_algorithm(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   fastjet::JetAlgorithm arg2 ;
@@ -21960,7 +22333,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_set_jet_finder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_set_jet_finder(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   fastjet::JetAlgorithm arg2 ;
@@ -21997,7 +22370,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_set_extra_param(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_set_extra_param(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   double arg2 ;
@@ -22034,7 +22407,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_recombiner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_recombiner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -22065,7 +22438,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_has_same_recombiner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_has_same_recombiner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -22106,7 +22479,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_is_spherical(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_is_spherical(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -22137,7 +22510,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -22168,7 +22541,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_description_no_recombiner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_description_no_recombiner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -22199,7 +22572,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_algorithm_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_algorithm_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   int val1 ;
@@ -22230,7 +22603,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_n_parameters_for_algorithm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_n_parameters_for_algorithm(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   int val1 ;
@@ -22261,7 +22634,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -22292,7 +22665,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition___call__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -22337,7 +22710,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition_set_python_recombiner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetDefinition_set_python_recombiner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
@@ -22368,7 +22741,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_JetDefinition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_JetDefinition(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = (fastjet::JetDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -22409,7 +22782,7 @@ SWIGINTERN PyObject *JetDefinition_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_join__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition::Recombiner *arg2 = 0 ;
@@ -22447,7 +22820,7 @@ SWIGINTERN PyObject *_wrap_join__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -22456,7 +22829,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_join__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::JetDefinition::Recombiner *arg2 = 0 ;
@@ -22492,14 +22865,14 @@ SWIGINTERN PyObject *_wrap_join__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_join__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_7(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -22546,14 +22919,14 @@ SWIGINTERN PyObject *_wrap_join__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_join__SWIG_8(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_8(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -22611,14 +22984,14 @@ SWIGINTERN PyObject *_wrap_join__SWIG_8(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_join__SWIG_9(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_join__SWIG_9(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -22687,7 +23060,7 @@ SWIGINTERN PyObject *_wrap_join__SWIG_9(PyObject *SWIGUNUSEDPARM(self), Py_ssize
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22703,7 +23076,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "join", 0, 5, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22711,7 +23084,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22719,7 +23092,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22731,7 +23104,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22743,7 +23116,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22755,7 +23128,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22771,7 +23144,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22787,7 +23160,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22807,7 +23180,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22827,7 +23200,7 @@ SWIGINTERN PyObject *_wrap_join(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22868,7 +23241,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CompositeJetStructure__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_CompositeJetStructure__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *result = 0 ;
   
@@ -22889,7 +23262,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CompositeJetStructure__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_CompositeJetStructure__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition::Recombiner *arg2 = (fastjet::JetDefinition::Recombiner *) 0 ;
@@ -22933,7 +23306,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CompositeJetStructure__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_CompositeJetStructure__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -22981,7 +23354,7 @@ SWIGINTERN PyObject *_wrap_new_CompositeJetStructure(PyObject *self, PyObject *a
     return _wrap_new_CompositeJetStructure__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -22989,7 +23362,7 @@ SWIGINTERN PyObject *_wrap_new_CompositeJetStructure(PyObject *self, PyObject *a
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -23012,7 +23385,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CompositeJetStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_CompositeJetStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23042,7 +23415,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23073,7 +23446,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_has_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_has_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23104,7 +23477,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23145,7 +23518,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_has_pieces(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_has_pieces(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23186,7 +23559,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_pieces(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_pieces(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23227,7 +23600,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_has_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_has_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23258,7 +23631,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23299,7 +23672,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_area_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_area_error(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23340,7 +23713,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23374,14 +23747,14 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_area_4vector(PyObject *SWIGUNUS
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_is_pure_ghost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_is_pure_ghost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23422,7 +23795,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CompositeJetStructure_discard_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CompositeJetStructure_discard_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CompositeJetStructure *arg1 = (fastjet::CompositeJetStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23463,7 +23836,7 @@ SWIGINTERN PyObject *CompositeJetStructure_swiginit(PyObject *SWIGUNUSEDPARM(sel
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceStructure__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceStructure__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *result = 0 ;
   
@@ -23484,7 +23857,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceStructure__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceStructure__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -23525,7 +23898,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceStructure(PyObject *self, PyObject
     return _wrap_new_ClusterSequenceStructure__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -23543,7 +23916,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ClusterSequenceStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ClusterSequenceStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23573,7 +23946,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23604,7 +23977,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_associated_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_associated_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23635,7 +24008,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_associated_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_associated_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23666,7 +24039,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_valid_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_valid_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23697,7 +24070,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_validated_cs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_validated_cs(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23728,7 +24101,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_validated_csab(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_validated_csab(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -23759,7 +24132,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_set_associated_cs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_set_associated_cs(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::ClusterSequence *arg2 = (fastjet::ClusterSequence *) 0 ;
@@ -23796,7 +24169,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_partner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_partner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23848,7 +24221,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_child(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_child(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23900,7 +24273,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_parents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_parents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -23963,7 +24336,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_object_in_jet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_object_in_jet(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24015,7 +24388,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -24046,7 +24419,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24087,7 +24460,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_exclusive_subjets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_exclusive_subjets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -24118,7 +24491,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subjets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subjets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24169,7 +24542,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_n_exclusive_subjets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_n_exclusive_subjets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24220,7 +24593,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subjets_up_to(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subjets_up_to(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24269,7 +24642,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subdmerge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subdmerge(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24318,7 +24691,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subdmerge_max(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subdmerge_max(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24367,7 +24740,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_pieces(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_pieces(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24408,7 +24781,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_pieces(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_pieces(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24449,7 +24822,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   void *argp1 = 0 ;
@@ -24480,7 +24853,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24521,7 +24894,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area_error(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24562,7 +24935,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24596,14 +24969,14 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area_4vector(PyObject *SWIGU
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_is_pure_ghost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_is_pure_ghost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceStructure *arg1 = (fastjet::ClusterSequenceStructure *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -24655,7 +25028,7 @@ SWIGINTERN PyObject *ClusterSequenceStructure_swiginit(PyObject *SWIGUNUSEDPARM(
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *result = 0 ;
   
@@ -24676,7 +25049,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -24708,7 +25081,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ClusterSequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ClusterSequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -24738,7 +25111,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_inclusive_jets__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_inclusive_jets__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   double arg2 ;
@@ -24775,7 +25148,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_inclusive_jets__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_inclusive_jets__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -24813,7 +25186,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_inclusive_jets(PyObject *self, PyObje
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequence_inclusive_jets", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -24822,7 +25195,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_inclusive_jets(PyObject *self, PyObje
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -24846,7 +25219,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_n_exclusive_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_n_exclusive_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   double arg2 ;
@@ -24884,7 +25257,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   double arg2 ;
@@ -24921,7 +25294,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   int arg2 ;
@@ -24967,7 +25340,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets(PyObject *self, PyObje
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequence_exclusive_jets", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -24982,7 +25355,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets(PyObject *self, PyObje
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -25006,7 +25379,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets_up_to(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets_up_to(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   int arg2 ;
@@ -25044,7 +25417,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_dmerge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_dmerge(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   int arg2 ;
@@ -25082,7 +25455,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_dmerge_max(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_dmerge_max(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   int arg2 ;
@@ -25120,7 +25493,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_ymerge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_ymerge(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   int arg2 ;
@@ -25158,7 +25531,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_ymerge_max(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_ymerge_max(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   int arg2 ;
@@ -25196,7 +25569,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_n_exclusive_jets_ycut(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_n_exclusive_jets_ycut(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   double arg2 ;
@@ -25234,7 +25607,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets_ycut(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets_ycut(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   double arg2 ;
@@ -25272,7 +25645,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25320,7 +25693,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_n_exclusive_subjets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_n_exclusive_subjets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25369,7 +25742,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25426,7 +25799,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets(PyObject *self, PyO
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequence_exclusive_subjets", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -25445,7 +25818,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets(PyObject *self, PyO
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -25473,7 +25846,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets_up_to(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets_up_to(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25522,7 +25895,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subdmerge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subdmerge(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25571,7 +25944,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subdmerge_max(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subdmerge_max(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25620,7 +25993,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_Q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_Q(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -25651,7 +26024,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_Q2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_Q2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -25682,7 +26055,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_object_in_jet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_object_in_jet(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25734,7 +26107,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_has_parents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_has_parents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25797,7 +26170,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_has_child__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_has_child__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25848,7 +26221,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_has_child__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_has_child__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -25908,7 +26281,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_has_child(PyObject *self, PyObject *a
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequence_has_child", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -25926,7 +26299,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_has_child(PyObject *self, PyObject *a
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -25953,7 +26326,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_has_partner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_has_partner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -26005,7 +26378,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -26046,7 +26419,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -26100,7 +26473,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -26143,7 +26516,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -26216,7 +26589,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -26283,7 +26656,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root(PyObject *self, P
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequence_print_jets_for_root", 0, 4, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -26296,7 +26669,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root(PyObject *self, P
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -26314,7 +26687,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root(PyObject *self, P
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -26331,7 +26704,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root(PyObject *self, P
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -26363,7 +26736,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_add_constituents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_add_constituents(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -26414,7 +26787,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_used(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_used(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -26445,7 +26818,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_string__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_string__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -26474,7 +26847,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_string__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_string__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::Strategy arg2 ;
@@ -26520,7 +26893,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_string(PyObject *self, PyObj
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequence_strategy_string", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -26529,7 +26902,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_string(PyObject *self, PyObj
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -26553,7 +26926,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_jet_def(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_jet_def(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -26584,7 +26957,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_delete_self_when_unused(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_delete_self_when_unused(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -26614,7 +26987,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_will_delete_self_when_unused(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_will_delete_self_when_unused(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -26645,7 +27018,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_signal_imminent_self_deletion(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_signal_imminent_self_deletion(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -26675,7 +27048,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_jet_scale_for_algorithm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_jet_scale_for_algorithm(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -26716,7 +27089,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_ij_recombination__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_ij_recombination__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   int arg2 ;
@@ -26779,7 +27152,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_ij_recombination__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_ij_recombination__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   int arg2 ;
@@ -26862,7 +27235,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_ij_recombination(PyObje
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequence_plugin_record_ij_recombination", 0, 6, argv))) SWIG_fail;
   --argc;
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -26894,7 +27267,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_ij_recombination(PyObje
     }
   }
   if (argc == 6) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -26939,7 +27312,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_iB_recombination(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_iB_recombination(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   int arg2 ;
@@ -26984,7 +27357,45 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_associate_extras(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_non_const_jet(PyObject *self, PyObject *args) {
+  PyObject *resultobj = 0;
+  fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject *swig_obj[2] ;
+  fastjet::PseudoJet *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args, "ClusterSequence_plugin_non_const_jet", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__ClusterSequence, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ClusterSequence_plugin_non_const_jet" "', argument " "1"" of type '" "fastjet::ClusterSequence *""'"); 
+  }
+  arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ClusterSequence_plugin_non_const_jet" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      result = (fastjet::PseudoJet *) &(arg1)->plugin_non_const_jet(arg2); 
+    }
+    catch (fastjet::Error & e) {
+      PyErr_SetString(FastJetError_, e.message().c_str());
+      SWIG_fail;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJet, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_associate_extras(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::ClusterSequence::Extras *arg2 = (fastjet::ClusterSequence::Extras *) 0 ;
@@ -27021,7 +27432,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_activated(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_activated(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -27052,7 +27463,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_extras(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_extras(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -27083,7 +27494,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -27114,7 +27525,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_history(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_history(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -27145,7 +27556,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_n_particles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_n_particles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -27176,7 +27587,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_particle_jet_indices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_particle_jet_indices(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -27212,7 +27623,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_particle_jet_indices(PyObject *SWIGUN
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< int,std::allocator< int > >(static_cast< const std::vector< int,std::allocator< int > >& >(result))), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< int,std::allocator< int > >(result)), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
   if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
 fail:
@@ -27221,7 +27632,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_unique_history_order(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_unique_history_order(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -27245,14 +27656,14 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_unique_history_order(PyObject *SWIGUN
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< int,std::allocator< int > >(static_cast< const std::vector< int,std::allocator< int > >& >(result))), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< int,std::allocator< int > >(result)), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_unclustered_particles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_unclustered_particles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -27283,7 +27694,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_childless_pseudojets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_childless_pseudojets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -27314,7 +27725,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_contains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_contains(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -27355,7 +27766,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_transfer_from_sequence__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_transfer_from_sequence__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::ClusterSequence *arg2 = 0 ;
@@ -27402,7 +27813,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_transfer_from_sequence__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_transfer_from_sequence__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   fastjet::ClusterSequence *arg2 = 0 ;
@@ -27450,7 +27861,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_transfer_from_sequence(PyObject *self
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequence_transfer_from_sequence", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -27463,7 +27874,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_transfer_from_sequence(PyObject *self
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequence, 0);
     _v = SWIG_CheckState(res);
@@ -27490,7 +27901,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_structure_shared_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_structure_shared_ptr(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence *arg1 = (fastjet::ClusterSequence *) 0 ;
   void *argp1 = 0 ;
@@ -27521,7 +27932,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_print_banner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_print_banner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   
   if (!SWIG_Python_UnpackTuple(args, "ClusterSequence_print_banner", 0, 0, 0)) SWIG_fail;
@@ -27541,7 +27952,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_set_fastjet_banner_stream(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_set_fastjet_banner_stream(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::ostream *arg1 = (std::ostream *) 0 ;
   void *argp1 = 0 ;
@@ -27571,7 +27982,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence_fastjet_banner_stream(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence_fastjet_banner_stream(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::ostream *result = 0 ;
   
@@ -27592,7 +28003,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -27649,7 +28060,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -27708,7 +28119,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence(PyObject *self, PyObject *args) {
     return _wrap_new_ClusterSequence__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__ClusterSequence, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -27716,7 +28127,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -27728,7 +28139,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -27768,7 +28179,7 @@ SWIGINTERN PyObject *ClusterSequence_swiginit(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_TilingBase_tile_index(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_tile_index(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -27809,7 +28220,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_n_tiles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_n_tiles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   void *argp1 = 0 ;
@@ -27840,7 +28251,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_n_good_tiles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_n_good_tiles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   void *argp1 = 0 ;
@@ -27871,7 +28282,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_tile_is_good(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_tile_is_good(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   int arg2 ;
@@ -27909,7 +28320,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_all_tiles_good(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_all_tiles_good(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   void *argp1 = 0 ;
@@ -27940,7 +28351,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_all_tiles_equal_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_all_tiles_equal_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   void *argp1 = 0 ;
@@ -27971,7 +28382,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_tile_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_tile_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   int arg2 ;
@@ -28009,7 +28420,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_mean_tile_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_mean_tile_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   void *argp1 = 0 ;
@@ -28040,7 +28451,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   void *argp1 = 0 ;
@@ -28071,7 +28482,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_is_initialised(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_is_initialised(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   void *argp1 = 0 ;
@@ -28102,7 +28513,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TilingBase_is_initialized(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TilingBase_is_initialized(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   void *argp1 = 0 ;
@@ -28133,7 +28544,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TilingBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_TilingBase(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TilingBase *arg1 = (fastjet::TilingBase *) 0 ;
   void *argp1 = 0 ;
@@ -28170,7 +28581,7 @@ SWIGINTERN PyObject *TilingBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyO
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -28207,7 +28618,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -28276,7 +28687,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -28329,7 +28740,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *result = 0 ;
   
@@ -28362,7 +28773,7 @@ SWIGINTERN PyObject *_wrap_new_RectangularGrid(PyObject *self, PyObject *args) {
     return _wrap_new_RectangularGrid__SWIG_3(self, argc, argv);
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -28378,7 +28789,7 @@ SWIGINTERN PyObject *_wrap_new_RectangularGrid(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -28406,7 +28817,7 @@ SWIGINTERN PyObject *_wrap_new_RectangularGrid(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -28449,7 +28860,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_n_tiles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_n_tiles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28480,7 +28891,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_n_good_tiles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_n_good_tiles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28511,7 +28922,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_tile_index(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_tile_index(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -28552,7 +28963,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_tile_is_good(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_tile_is_good(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   int arg2 ;
@@ -28590,7 +29001,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_tile_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_tile_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   int arg2 ;
@@ -28628,7 +29039,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_mean_tile_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_mean_tile_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28659,7 +29070,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28690,7 +29101,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_rapmin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_rapmin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28721,7 +29132,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_rapmax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_rapmax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28752,7 +29163,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_drap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_drap(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28783,7 +29194,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_dphi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_dphi(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28814,7 +29225,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid_is_initialised(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid_is_initialised(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28845,7 +29256,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RectangularGrid___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RectangularGrid___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28876,7 +29287,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_RectangularGrid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_RectangularGrid(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = (fastjet::RectangularGrid *) 0 ;
   void *argp1 = 0 ;
@@ -28917,7 +29328,7 @@ SWIGINTERN PyObject *RectangularGrid_swiginit(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new__NoInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new__NoInfo(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::_NoInfo *result = 0 ;
   
@@ -28938,7 +29349,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete__NoInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete__NoInfo(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::_NoInfo *arg1 = (fastjet::_NoInfo *) 0 ;
   void *argp1 = 0 ;
@@ -29063,7 +29474,7 @@ SWIGINTERN PyObject *Swig_var_def_mean_ghost_pt_get(void) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *result = 0 ;
   
@@ -29084,7 +29495,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   fastjet::BasicRandom< double > *arg2 = (fastjet::BasicRandom< double > *) 0 ;
@@ -29121,7 +29532,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 ;
@@ -29198,7 +29609,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 ;
@@ -29267,7 +29678,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 ;
@@ -29328,7 +29739,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 ;
@@ -29381,7 +29792,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 ;
@@ -29426,7 +29837,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_7(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 ;
@@ -29463,7 +29874,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_8(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_8(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -29492,7 +29903,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_9(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_9(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -29577,7 +29988,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_10(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_10(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -29654,7 +30065,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_11(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_11(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -29723,7 +30134,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_12(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_12(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -29784,7 +30195,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_13(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_13(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -29837,7 +30248,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_14(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_14(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -29882,7 +30293,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_15(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_15(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -29919,7 +30330,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_16(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_16(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   int arg2 ;
@@ -29999,7 +30410,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_17(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_17(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   int arg2 ;
@@ -30071,7 +30482,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_18(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_18(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   int arg2 ;
@@ -30135,7 +30546,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_19(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_19(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   int arg2 ;
@@ -30191,7 +30602,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_20(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_20(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   int arg2 ;
@@ -30239,7 +30650,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_21(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_21(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   int arg2 ;
@@ -30279,7 +30690,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_22(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_22(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -30323,7 +30734,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     return _wrap_new_GhostedAreaSpec__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -30331,7 +30742,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30341,7 +30752,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -30355,7 +30766,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30370,7 +30781,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30386,7 +30797,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30402,7 +30813,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -30422,7 +30833,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30444,7 +30855,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30466,7 +30877,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -30492,7 +30903,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30520,7 +30931,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30548,7 +30959,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -30580,7 +30991,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30614,7 +31025,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30648,7 +31059,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 6) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -30686,7 +31097,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 6) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30726,7 +31137,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 6) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30766,7 +31177,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 7) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -30809,7 +31220,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 7) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30854,7 +31265,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 7) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30900,7 +31311,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 8) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -30981,7 +31392,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec__initialize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec__initialize(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31011,7 +31422,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_rapmax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_rapmax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31042,7 +31453,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_maxrap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_maxrap(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31073,7 +31484,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_etamax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_etamax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31104,7 +31515,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_maxeta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_maxeta(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31135,7 +31546,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31166,7 +31577,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_grid_scatter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_grid_scatter(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31197,7 +31608,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_pt_scatter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_pt_scatter(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31228,7 +31639,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_mean_ghost_pt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_mean_ghost_pt(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31259,7 +31670,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_repeat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_repeat(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31290,7 +31701,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_fj2_placement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_fj2_placement(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31321,7 +31732,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_kt_scatter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_kt_scatter(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31352,7 +31763,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_mean_ghost_kt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_mean_ghost_kt(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31383,7 +31794,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_actual_ghost_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_actual_ghost_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31414,7 +31825,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_n_ghosts(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_n_ghosts(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31445,7 +31856,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31482,7 +31893,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_rapmax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_rapmax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31519,7 +31930,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_maxrap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_maxrap(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31556,7 +31967,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_etamax(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_etamax(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31593,7 +32004,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_maxeta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_maxeta(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31630,7 +32041,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_grid_scatter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_grid_scatter(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31667,7 +32078,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_pt_scatter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_pt_scatter(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31704,7 +32115,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_mean_ghost_pt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_mean_ghost_pt(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31741,7 +32152,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_repeat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_repeat(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   int arg2 ;
@@ -31778,7 +32189,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_kt_scatter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_kt_scatter(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31815,7 +32226,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_mean_ghost_kt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_mean_ghost_kt(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   double arg2 ;
@@ -31852,7 +32263,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_fj2_placement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_fj2_placement(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   bool arg2 ;
@@ -31889,7 +32300,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_nphi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_nphi(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31920,7 +32331,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_nrap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_nrap(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -31951,7 +32362,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_get_random_status(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_get_random_status(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   std::vector< int,std::allocator< int > > *arg2 = 0 ;
@@ -31991,7 +32402,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_random_status(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_random_status(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   std::vector< int,std::allocator< int > > *arg2 = 0 ;
@@ -32031,7 +32442,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_with_fixed_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_with_fixed_seed(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   std::vector< int,std::allocator< int > > *arg2 = 0 ;
@@ -32065,14 +32476,14 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_with_fixed_seed(PyObject *SWIGUNUSEDP
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::GhostedAreaSpec(static_cast< const fastjet::GhostedAreaSpec& >(result))), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::GhostedAreaSpec(result)), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_get_fixed_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_get_fixed_seed(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   std::vector< int,std::allocator< int > > *arg2 = 0 ;
@@ -32112,7 +32523,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_get_last_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_get_last_seed(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   std::vector< int,std::allocator< int > > *arg2 = 0 ;
@@ -32152,7 +32563,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_checkpoint_random(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_checkpoint_random(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32182,7 +32593,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_restore_checkpoint_random(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_restore_checkpoint_random(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32212,7 +32623,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32243,7 +32654,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_add_ghosts(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_add_ghosts(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -32283,7 +32694,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_random_at_own_risk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_random_at_own_risk(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32314,7 +32725,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_generator_at_own_risk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_generator_at_own_risk(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32345,7 +32756,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec_user_random_generator_at_own_risk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec_user_random_generator_at_own_risk(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32376,7 +32787,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GhostedAreaSpec___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GhostedAreaSpec___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32407,7 +32818,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GhostedAreaSpec(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_GhostedAreaSpec(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32448,7 +32859,7 @@ SWIGINTERN PyObject *GhostedAreaSpec_swiginit(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_VoronoiAreaSpec__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_VoronoiAreaSpec__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::VoronoiAreaSpec *result = 0 ;
   
@@ -32469,7 +32880,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_VoronoiAreaSpec__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_VoronoiAreaSpec__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -32510,7 +32921,7 @@ SWIGINTERN PyObject *_wrap_new_VoronoiAreaSpec(PyObject *self, PyObject *args) {
     return _wrap_new_VoronoiAreaSpec__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -32529,7 +32940,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_VoronoiAreaSpec_effective_Rfact(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VoronoiAreaSpec_effective_Rfact(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::VoronoiAreaSpec *arg1 = (fastjet::VoronoiAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32560,7 +32971,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_VoronoiAreaSpec_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VoronoiAreaSpec_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::VoronoiAreaSpec *arg1 = (fastjet::VoronoiAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32591,7 +33002,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_VoronoiAreaSpec(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_VoronoiAreaSpec(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::VoronoiAreaSpec *arg1 = (fastjet::VoronoiAreaSpec *) 0 ;
   void *argp1 = 0 ;
@@ -32632,7 +33043,7 @@ SWIGINTERN PyObject *VoronoiAreaSpec_swiginit(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::AreaDefinition *result = 0 ;
   
@@ -32653,7 +33064,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::AreaType arg1 ;
   fastjet::GhostedAreaSpec *arg2 = 0 ;
@@ -32693,7 +33104,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::AreaType arg1 ;
   fastjet::VoronoiAreaSpec *arg2 = 0 ;
@@ -32733,7 +33144,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::AreaType arg1 ;
   int val1 ;
@@ -32762,7 +33173,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = 0 ;
   fastjet::AreaType arg2 ;
@@ -32802,7 +33213,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GhostedAreaSpec *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -32834,7 +33245,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::VoronoiAreaSpec *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -32878,7 +33289,7 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition(PyObject *self, PyObject *args) {
     return _wrap_new_AreaDefinition__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -32886,7 +33297,7 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__VoronoiAreaSpec, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -32894,7 +33305,7 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -32904,7 +33315,7 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -32918,7 +33329,7 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -32932,7 +33343,7 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -32960,7 +33371,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AreaDefinition_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AreaDefinition_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -32991,7 +33402,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AreaDefinition_area_type(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AreaDefinition_area_type(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -33022,7 +33433,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AreaDefinition_ghost_spec__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_AreaDefinition_ghost_spec__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -33051,7 +33462,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AreaDefinition_ghost_spec__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_AreaDefinition_ghost_spec__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -33089,7 +33500,7 @@ SWIGINTERN PyObject *_wrap_AreaDefinition_ghost_spec(PyObject *self, PyObject *a
   if (!(argc = SWIG_Python_UnpackTuple(args, "AreaDefinition_ghost_spec", 0, 1, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__AreaDefinition, 0);
     _v = SWIG_CheckState(res);
@@ -33098,7 +33509,7 @@ SWIGINTERN PyObject *_wrap_AreaDefinition_ghost_spec(PyObject *self, PyObject *a
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__AreaDefinition, 0);
     _v = SWIG_CheckState(res);
@@ -33116,7 +33527,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AreaDefinition_voronoi_spec(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AreaDefinition_voronoi_spec(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -33147,7 +33558,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AreaDefinition_with_fixed_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AreaDefinition_with_fixed_seed(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ;
   std::vector< int,std::allocator< int > > *arg2 = 0 ;
@@ -33181,14 +33592,14 @@ SWIGINTERN PyObject *_wrap_AreaDefinition_with_fixed_seed(PyObject *SWIGUNUSEDPA
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::AreaDefinition(static_cast< const fastjet::AreaDefinition& >(result))), SWIGTYPE_p_fastjet__AreaDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::AreaDefinition(result)), SWIGTYPE_p_fastjet__AreaDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_AreaDefinition___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AreaDefinition___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -33219,7 +33630,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_AreaDefinition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_AreaDefinition(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ;
   void *argp1 = 0 ;
@@ -33260,7 +33671,7 @@ SWIGINTERN PyObject *AreaDefinition_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceAreaBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceAreaBase(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *result = 0 ;
   
@@ -33281,7 +33692,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ClusterSequenceAreaBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ClusterSequenceAreaBase(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   void *argp1 = 0 ;
@@ -33311,7 +33722,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -33352,7 +33763,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area_error(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -33393,7 +33804,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -33427,14 +33838,14 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area_4vector(PyObject *SWIGUN
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_is_pure_ghost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_is_pure_ghost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -33475,7 +33886,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_has_explicit_ghosts(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_has_explicit_ghosts(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   void *argp1 = 0 ;
@@ -33506,7 +33917,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_empty_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_empty_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -33547,7 +33958,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_empty_area_from_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_empty_area_from_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -33603,7 +34014,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_n_empty_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_n_empty_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -33644,7 +34055,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_median_pt_per_unit_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_median_pt_per_unit_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -33685,7 +34096,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_median_pt_per_unit_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_median_pt_per_unit_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -33726,7 +34137,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_median_pt_per_unit_something(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_median_pt_per_unit_something(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -33775,7 +34186,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -33855,7 +34266,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -33958,7 +34369,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -34053,7 +34464,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -34131,7 +34542,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma(PyOb
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequenceAreaBase_get_median_rho_and_sigma", 0, 8, argv))) SWIG_fail;
   --argc;
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34160,7 +34571,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma(PyOb
     }
   }
   if (argc == 6) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34194,7 +34605,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma(PyOb
     }
   }
   if (argc == 7) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34232,7 +34643,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma(PyOb
     }
   }
   if (argc == 8) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34287,7 +34698,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   double *arg2 = 0 ;
@@ -34364,7 +34775,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   double *arg2 = 0 ;
@@ -34433,7 +34844,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   double *arg2 = 0 ;
@@ -34503,7 +34914,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area(Py
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequenceAreaBase_parabolic_pt_per_unit_area", 0, 6, argv))) SWIG_fail;
   --argc;
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34526,7 +34937,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area(Py
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34555,7 +34966,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area(Py
     }
   }
   if (argc == 6) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34600,7 +35011,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   double arg2 ;
@@ -34645,7 +35056,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   double arg2 ;
@@ -34682,7 +35093,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -34730,7 +35141,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -34779,7 +35190,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets(PyObject *sel
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequenceAreaBase_subtracted_jets", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34792,7 +35203,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets(PyObject *sel
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34807,7 +35218,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets(PyObject *sel
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34826,7 +35237,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets(PyObject *sel
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34858,7 +35269,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -34899,14 +35310,14 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet__SWIG_0(PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -34950,7 +35361,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet__SWIG_1(PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34966,7 +35377,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet(PyObject *self
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequenceAreaBase_subtracted_jet", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -34983,7 +35394,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet(PyObject *self
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -35011,7 +35422,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -35067,7 +35478,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -35115,7 +35526,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -35174,7 +35585,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceAreaBase *arg1 = (fastjet::ClusterSequenceAreaBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -35234,7 +35645,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt(PyObject *self,
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequenceAreaBase_subtracted_pt", 0, 4, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -35251,7 +35662,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt(PyObject *self,
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -35270,7 +35681,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt(PyObject *self,
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -35293,7 +35704,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt(PyObject *self,
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0);
     _v = SWIG_CheckState(res);
@@ -35340,7 +35751,7 @@ SWIGINTERN PyObject *ClusterSequenceAreaBase_swiginit(PyObject *SWIGUNUSEDPARM(s
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_n_hard_particles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_n_hard_particles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   void *argp1 = 0 ;
@@ -35371,7 +35782,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -35412,7 +35823,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -35446,14 +35857,14 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_area_4vector(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_is_pure_ghost__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_is_pure_ghost__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -35493,7 +35904,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_is_pure_ghost__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_is_pure_ghost__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   int arg2 ;
@@ -35539,7 +35950,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_is_pure_ghost
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequenceActiveAreaExplicitGhosts_is_pure_ghost", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, 0);
     _v = SWIG_CheckState(res);
@@ -35552,7 +35963,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_is_pure_ghost
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, 0);
     _v = SWIG_CheckState(res);
@@ -35576,7 +35987,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_has_explicit_ghosts(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_has_explicit_ghosts(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   void *argp1 = 0 ;
@@ -35607,7 +36018,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_empty_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_empty_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -35648,7 +36059,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_total_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_total_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   void *argp1 = 0 ;
@@ -35679,7 +36090,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_max_ghost_perp2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_max_ghost_perp2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   void *argp1 = 0 ;
@@ -35710,7 +36121,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_has_dangerous_particles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_has_dangerous_particles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   void *argp1 = 0 ;
@@ -35741,7 +36152,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -35809,7 +36220,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -35867,7 +36278,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -35947,7 +36358,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_7(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -36026,7 +36437,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts(PyObject
   if (!(argc = SWIG_Python_UnpackTuple(args, "new_ClusterSequenceActiveAreaExplicitGhosts", 0, 5, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -36042,7 +36453,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts(PyObject
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -36064,7 +36475,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts(PyObject
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -36086,7 +36497,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts(PyObject
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -36125,7 +36536,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ClusterSequenceActiveAreaExplicitGhosts(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ClusterSequenceActiveAreaExplicitGhosts(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveAreaExplicitGhosts *arg1 = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *) 0 ;
   void *argp1 = 0 ;
@@ -36166,7 +36577,7 @@ SWIGINTERN PyObject *ClusterSequenceActiveAreaExplicitGhosts_swiginit(PyObject *
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *result = 0 ;
   
@@ -36187,7 +36598,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *arg1 = (fastjet::ClusterSequenceActiveArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -36228,7 +36639,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area_error(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *arg1 = (fastjet::ClusterSequenceActiveArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -36269,7 +36680,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *arg1 = (fastjet::ClusterSequenceActiveArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -36303,14 +36714,14 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area_4vector(PyObject *SWIG
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *arg1 = (fastjet::ClusterSequenceActiveArea *) 0 ;
   fastjet::ClusterSequenceActiveArea::mean_pt_strategies arg2 ;
@@ -36355,7 +36766,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *arg1 = (fastjet::ClusterSequenceActiveArea *) 0 ;
   fastjet::ClusterSequenceActiveArea::mean_pt_strategies arg2 ;
@@ -36392,7 +36803,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *arg1 = (fastjet::ClusterSequenceActiveArea *) 0 ;
   void *argp1 = 0 ;
@@ -36430,7 +36841,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area(PyObject *
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequenceActiveArea_pt_per_unit_area", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceActiveArea, 0);
     _v = SWIG_CheckState(res);
@@ -36439,7 +36850,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area(PyObject *
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceActiveArea, 0);
     _v = SWIG_CheckState(res);
@@ -36454,7 +36865,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area(PyObject *
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceActiveArea, 0);
     _v = SWIG_CheckState(res);
@@ -36485,7 +36896,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_empty_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_empty_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *arg1 = (fastjet::ClusterSequenceActiveArea *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -36526,7 +36937,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_n_empty_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_n_empty_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *arg1 = (fastjet::ClusterSequenceActiveArea *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -36567,7 +36978,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -36635,7 +37046,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -36705,7 +37116,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea(PyObject *self, PyObjec
     return _wrap_new_ClusterSequenceActiveArea__SWIG_0(self, argc, argv);
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -36721,7 +37132,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea(PyObject *self, PyObjec
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -36753,7 +37164,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ClusterSequenceActiveArea(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ClusterSequenceActiveArea(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceActiveArea *arg1 = (fastjet::ClusterSequenceActiveArea *) 0 ;
   void *argp1 = 0 ;
@@ -36794,7 +37205,7 @@ SWIGINTERN PyObject *ClusterSequenceActiveArea_swiginit(PyObject *SWIGUNUSEDPARM
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence1GhostPassiveArea *result = 0 ;
   
@@ -36815,7 +37226,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequence1GhostPassiveArea_n_empty_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequence1GhostPassiveArea_n_empty_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence1GhostPassiveArea *arg1 = (fastjet::ClusterSequence1GhostPassiveArea *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -36856,7 +37267,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -36924,7 +37335,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -36994,7 +37405,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea(PyObject *self,
     return _wrap_new_ClusterSequence1GhostPassiveArea__SWIG_0(self, argc, argv);
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -37010,7 +37421,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea(PyObject *self,
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -37042,7 +37453,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ClusterSequence1GhostPassiveArea(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ClusterSequence1GhostPassiveArea(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequence1GhostPassiveArea *arg1 = (fastjet::ClusterSequence1GhostPassiveArea *) 0 ;
   void *argp1 = 0 ;
@@ -37083,7 +37494,7 @@ SWIGINTERN PyObject *ClusterSequence1GhostPassiveArea_swiginit(PyObject *SWIGUNU
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_ClusterSequencePassiveArea_empty_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequencePassiveArea_empty_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequencePassiveArea *arg1 = (fastjet::ClusterSequencePassiveArea *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -37124,7 +37535,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequencePassiveArea__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequencePassiveArea__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -37192,7 +37603,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequencePassiveArea__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequencePassiveArea__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -37259,7 +37670,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequencePassiveArea(PyObject *self, PyObje
   if (!(argc = SWIG_Python_UnpackTuple(args, "new_ClusterSequencePassiveArea", 0, 4, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -37275,7 +37686,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequencePassiveArea(PyObject *self, PyObje
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -37306,7 +37717,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ClusterSequencePassiveArea(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ClusterSequencePassiveArea(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequencePassiveArea *arg1 = (fastjet::ClusterSequencePassiveArea *) 0 ;
   void *argp1 = 0 ;
@@ -37347,7 +37758,7 @@ SWIGINTERN PyObject *ClusterSequencePassiveArea_swiginit(PyObject *SWIGUNUSEDPAR
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_delete_ClusterSequenceVoronoiArea(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ClusterSequenceVoronoiArea(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceVoronoiArea *arg1 = (fastjet::ClusterSequenceVoronoiArea *) 0 ;
   void *argp1 = 0 ;
@@ -37377,7 +37788,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceVoronoiArea *arg1 = (fastjet::ClusterSequenceVoronoiArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -37418,7 +37829,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceVoronoiArea *arg1 = (fastjet::ClusterSequenceVoronoiArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -37452,14 +37863,14 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area_4vector(PyObject *SWI
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area_error(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceVoronoiArea *arg1 = (fastjet::ClusterSequenceVoronoiArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -37500,7 +37911,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -37568,7 +37979,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -37626,7 +38037,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -37682,7 +38093,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea(PyObject *self, PyObje
   if (!(argc = SWIG_Python_UnpackTuple(args, "new_ClusterSequenceVoronoiArea", 0, 4, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -37694,7 +38105,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea(PyObject *self, PyObje
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -37710,7 +38121,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea(PyObject *self, PyObje
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -37753,7 +38164,7 @@ SWIGINTERN PyObject *ClusterSequenceVoronoiArea_swiginit(PyObject *SWIGUNUSEDPAR
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_def(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_def(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   void *argp1 = 0 ;
@@ -37784,7 +38195,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -37825,7 +38236,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_error(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -37866,7 +38277,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -37900,14 +38311,14 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_4vector(PyObject *SWIGUNUSED
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_empty_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_empty_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -37948,7 +38359,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_n_empty_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_n_empty_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -37989,7 +38400,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_is_pure_ghost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_is_pure_ghost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -38030,7 +38441,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_has_explicit_ghosts(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_has_explicit_ghosts(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   void *argp1 = 0 ;
@@ -38061,7 +38472,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -38164,7 +38575,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -38259,7 +38670,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -38328,7 +38739,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -38417,7 +38828,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma(PyObject
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequenceArea_get_median_rho_and_sigma", 0, 8, argv))) SWIG_fail;
   --argc;
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceArea, 0);
     _v = SWIG_CheckState(res);
@@ -38446,7 +38857,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma(PyObject
     }
   }
   if (argc == 6) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceArea, 0);
     _v = SWIG_CheckState(res);
@@ -38480,7 +38891,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma(PyObject
     }
   }
   if (argc == 7) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceArea, 0);
     _v = SWIG_CheckState(res);
@@ -38518,7 +38929,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma(PyObject
     }
   }
   if (argc == 8) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceArea, 0);
     _v = SWIG_CheckState(res);
@@ -38573,7 +38984,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   double *arg2 = 0 ;
@@ -38650,7 +39061,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   double *arg2 = 0 ;
@@ -38719,7 +39130,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   double *arg2 = 0 ;
@@ -38789,7 +39200,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area(PyObje
   if (!(argc = SWIG_Python_UnpackTuple(args, "ClusterSequenceArea_parabolic_pt_per_unit_area", 0, 6, argv))) SWIG_fail;
   --argc;
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceArea, 0);
     _v = SWIG_CheckState(res);
@@ -38812,7 +39223,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area(PyObje
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceArea, 0);
     _v = SWIG_CheckState(res);
@@ -38841,7 +39252,7 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area(PyObje
     }
   }
   if (argc == 6) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__ClusterSequenceArea, 0);
     _v = SWIG_CheckState(res);
@@ -38886,7 +39297,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -38944,7 +39355,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -39002,7 +39413,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -39069,7 +39480,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea(PyObject *self, PyObject *arg
   if (!(argc = SWIG_Python_UnpackTuple(args, "new_ClusterSequenceArea", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -39085,7 +39496,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea(PyObject *self, PyObject *arg
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -39101,7 +39512,7 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea(PyObject *self, PyObject *arg
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -39127,7 +39538,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ClusterSequenceArea(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ClusterSequenceArea(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::ClusterSequenceArea *arg1 = (fastjet::ClusterSequenceArea *) 0 ;
   void *argp1 = 0 ;
@@ -39168,7 +39579,7 @@ SWIGINTERN PyObject *ClusterSequenceArea_swiginit(PyObject *SWIGUNUSEDPARM(self)
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_UserInfoPython(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_UserInfoPython(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   PyObject *swig_obj[1] ;
@@ -39193,7 +39604,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_UserInfoPython_get_pyobj(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_UserInfoPython_get_pyobj(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::UserInfoPython *arg1 = (fastjet::UserInfoPython *) 0 ;
   void *argp1 = 0 ;
@@ -39224,7 +39635,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_UserInfoPython(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_UserInfoPython(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::UserInfoPython *arg1 = (fastjet::UserInfoPython *) 0 ;
   void *argp1 = 0 ;
@@ -39265,7 +39676,7 @@ SWIGINTERN PyObject *UserInfoPython_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_cpp_string_from_py_str(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_cpp_string_from_py_str(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   PyObject *swig_obj[1] ;
@@ -39290,7 +39701,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_cpp_string_from_str_py_obj(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_cpp_string_from_str_py_obj(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   PyObject *swig_obj[1] ;
@@ -39315,7 +39726,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_cpp_string_from_name_py_obj(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_cpp_string_from_name_py_obj(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   PyObject *swig_obj[1] ;
@@ -39340,7 +39751,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SelectorWorkerPython(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_SelectorWorkerPython(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   PyObject *swig_obj[1] ;
@@ -39365,7 +39776,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_SelectorWorkerPython(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_SelectorWorkerPython(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorkerPython *arg1 = (fastjet::SelectorWorkerPython *) 0 ;
   void *argp1 = 0 ;
@@ -39395,7 +39806,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorkerPython_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorkerPython_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorkerPython *arg1 = (fastjet::SelectorWorkerPython *) 0 ;
   void *argp1 = 0 ;
@@ -39426,7 +39837,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SelectorWorkerPython__pass(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorWorkerPython__pass(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::SelectorWorkerPython *arg1 = (fastjet::SelectorWorkerPython *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -39478,7 +39889,7 @@ SWIGINTERN PyObject *SelectorWorkerPython_swiginit(PyObject *SWIGUNUSEDPARM(self
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_SelectorPython(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SelectorPython(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   PyObject *swig_obj[1] ;
@@ -39496,14 +39907,14 @@ SWIGINTERN PyObject *_wrap_SelectorPython(PyObject *SWIGUNUSEDPARM(self), PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::Selector(result)), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RecombinerPython(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RecombinerPython(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   PyObject *swig_obj[1] ;
@@ -39528,7 +39939,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_RecombinerPython(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_RecombinerPython(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RecombinerPython *arg1 = (fastjet::RecombinerPython *) 0 ;
   void *argp1 = 0 ;
@@ -39558,7 +39969,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RecombinerPython_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RecombinerPython_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RecombinerPython *arg1 = (fastjet::RecombinerPython *) 0 ;
   void *argp1 = 0 ;
@@ -39589,7 +40000,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RecombinerPython_recombine(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RecombinerPython_recombine(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RecombinerPython *arg1 = (fastjet::RecombinerPython *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -39651,7 +40062,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RecombinerPython_preprocess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RecombinerPython_preprocess(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RecombinerPython *arg1 = (fastjet::RecombinerPython *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -39702,7 +40113,7 @@ SWIGINTERN PyObject *RecombinerPython_swiginit(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   fastjet::RecombinationScheme arg2 ;
@@ -39740,14 +40151,14 @@ SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_0(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(result)), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   fastjet::RecombinationScheme arg2 ;
@@ -39777,14 +40188,14 @@ SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_1(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(result)), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   int val1 ;
@@ -39806,7 +40217,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_2(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(result)), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39822,7 +40233,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition0Param(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetDefinition0Param", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -39832,7 +40243,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition0Param(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -39848,7 +40259,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition0Param(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -39880,7 +40291,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -39926,14 +40337,14 @@ SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_0(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(result)), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -39971,14 +40382,14 @@ SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_1(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(result)), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -40008,7 +40419,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_2(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(result)), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40024,7 +40435,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition1Param(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetDefinition1Param", 0, 4, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -40040,7 +40451,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition1Param(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -40062,7 +40473,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition1Param(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -40100,7 +40511,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -40154,14 +40565,14 @@ SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_0(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(result)), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -40207,14 +40618,14 @@ SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_1(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(result)), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -40252,7 +40663,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_2(PyObject *SWIGUNUSEDPARM(
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(result)), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40268,7 +40679,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition2Param(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetDefinition2Param", 0, 5, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -40290,7 +40701,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition2Param(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -40318,7 +40729,7 @@ SWIGINTERN PyObject *_wrap_JetDefinition2Param(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -40362,7 +40773,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FunctionOfPseudoJetDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_FunctionOfPseudoJetDouble(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< double > *arg1 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
   void *argp1 = 0 ;
@@ -40392,7 +40803,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< double > *arg1 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
   void *argp1 = 0 ;
@@ -40423,7 +40834,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< double > *arg1 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -40464,7 +40875,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___call____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___call____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< double > *arg1 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -40504,7 +40915,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___call____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___call____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< double > *arg1 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -40539,7 +40950,7 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___call____SWIG_1(PyObject *
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< double,std::allocator< double > >(static_cast< const std::vector< double,std::allocator< double > >& >(result))), SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< double,std::allocator< double > >(result)), SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_POINTER_OWN |  0 );
   if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
 fail:
@@ -40557,7 +40968,7 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___call__(PyObject *self, Py
   if (!(argc = SWIG_Python_UnpackTuple(args, "FunctionOfPseudoJetDouble___call__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_double_t, 0);
     _v = SWIG_CheckState(res);
@@ -40570,7 +40981,7 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___call__(PyObject *self, Py
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_double_t, 0);
     _v = SWIG_CheckState(res);
@@ -40592,7 +41003,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< double > *arg1 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
   void *argp1 = 0 ;
@@ -40630,7 +41041,7 @@ SWIGINTERN PyObject *FunctionOfPseudoJetDouble_swigregister(PyObject *SWIGUNUSED
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_delete_FunctionOfPseudoJetPseudoJet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_FunctionOfPseudoJetPseudoJet(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *arg1 = (fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -40660,7 +41071,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *arg1 = (fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -40691,7 +41102,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *arg1 = (fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -40725,14 +41136,14 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet_result(PyObject *SWIGUNU
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___call____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___call____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *arg1 = (fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -40765,14 +41176,14 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___call____SWIG_0(PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___call____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___call____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *arg1 = (fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -40825,7 +41236,7 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___call__(PyObject *self,
   if (!(argc = SWIG_Python_UnpackTuple(args, "FunctionOfPseudoJetPseudoJet___call__", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0);
     _v = SWIG_CheckState(res);
@@ -40838,7 +41249,7 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___call__(PyObject *self,
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0);
     _v = SWIG_CheckState(res);
@@ -40860,7 +41271,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *arg1 = (fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) 0 ;
   void *argp1 = 0 ;
@@ -40898,7 +41309,7 @@ SWIGINTERN PyObject *FunctionOfPseudoJetPseudoJet_swigregister(PyObject *SWIGUNU
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_delete_Transformer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Transformer(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Transformer *arg1 = (fastjet::Transformer *) 0 ;
   void *argp1 = 0 ;
@@ -40928,7 +41339,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Transformer_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Transformer_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Transformer *arg1 = (fastjet::Transformer *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -40962,14 +41373,14 @@ SWIGINTERN PyObject *_wrap_Transformer_result(PyObject *SWIGUNUSEDPARM(self), Py
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_Transformer_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Transformer_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Transformer *arg1 = (fastjet::Transformer *) 0 ;
   void *argp1 = 0 ;
@@ -41007,7 +41418,7 @@ SWIGINTERN PyObject *Transformer_swigregister(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_Boost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Boost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -41041,7 +41452,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Boost_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Boost_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Boost *arg1 = (fastjet::Boost *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -41075,14 +41486,14 @@ SWIGINTERN PyObject *_wrap_Boost_result(PyObject *SWIGUNUSEDPARM(self), PyObject
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_Boost___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Boost___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Boost *arg1 = (fastjet::Boost *) 0 ;
   void *argp1 = 0 ;
@@ -41113,7 +41524,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Boost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Boost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Boost *arg1 = (fastjet::Boost *) 0 ;
   void *argp1 = 0 ;
@@ -41154,7 +41565,7 @@ SWIGINTERN PyObject *Boost_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_Unboost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_Unboost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -41188,7 +41599,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Unboost_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Unboost_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Unboost *arg1 = (fastjet::Unboost *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -41222,14 +41633,14 @@ SWIGINTERN PyObject *_wrap_Unboost_result(PyObject *SWIGUNUSEDPARM(self), PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_Unboost___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Unboost___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Unboost *arg1 = (fastjet::Unboost *) 0 ;
   void *argp1 = 0 ;
@@ -41260,7 +41671,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Unboost(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Unboost(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Unboost *arg1 = (fastjet::Unboost *) 0 ;
   void *argp1 = 0 ;
@@ -41301,7 +41712,7 @@ SWIGINTERN PyObject *Unboost_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::Recluster *result = 0 ;
   
@@ -41322,7 +41733,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = 0 ;
   bool arg2 ;
@@ -41370,7 +41781,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = 0 ;
   bool arg2 ;
@@ -41410,7 +41821,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -41442,7 +41853,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -41487,7 +41898,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -41524,7 +41935,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   fastjet::Recluster::Keep arg2 ;
@@ -41561,7 +41972,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_7(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   int val1 ;
@@ -41602,7 +42013,7 @@ SWIGINTERN PyObject *_wrap_new_Recluster(PyObject *self, PyObject *args) {
     return _wrap_new_Recluster__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -41610,7 +42021,7 @@ SWIGINTERN PyObject *_wrap_new_Recluster(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -41620,7 +42031,7 @@ SWIGINTERN PyObject *_wrap_new_Recluster(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -41634,7 +42045,7 @@ SWIGINTERN PyObject *_wrap_new_Recluster(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -41650,7 +42061,7 @@ SWIGINTERN PyObject *_wrap_new_Recluster(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -41666,7 +42077,7 @@ SWIGINTERN PyObject *_wrap_new_Recluster(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -41686,7 +42097,7 @@ SWIGINTERN PyObject *_wrap_new_Recluster(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -41723,7 +42134,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Recluster(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Recluster(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   void *argp1 = 0 ;
@@ -41753,7 +42164,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_set_acquire_recombiner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_set_acquire_recombiner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   bool arg2 ;
@@ -41790,7 +42201,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_acquire_recombiner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_acquire_recombiner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   void *argp1 = 0 ;
@@ -41821,7 +42232,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_set_cambridge_optimisation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_set_cambridge_optimisation(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   bool arg2 ;
@@ -41858,7 +42269,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_set_cambridge_optimization(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_set_cambridge_optimization(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   bool arg2 ;
@@ -41895,7 +42306,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_cambridge_optimization(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_cambridge_optimization(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   void *argp1 = 0 ;
@@ -41926,7 +42337,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_cambridge_optimisation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_cambridge_optimisation(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   void *argp1 = 0 ;
@@ -41957,7 +42368,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_set_keep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_set_keep(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   fastjet::Recluster::Keep arg2 ;
@@ -41994,7 +42405,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_keep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_keep(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   void *argp1 = 0 ;
@@ -42025,7 +42436,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   void *argp1 = 0 ;
@@ -42056,7 +42467,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -42090,14 +42501,14 @@ SWIGINTERN PyObject *_wrap_Recluster_result(PyObject *SWIGUNUSEDPARM(self), PyOb
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_get_new_jets_and_def(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_get_new_jets_and_def(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -42149,7 +42560,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster_generate_output_jet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster_generate_output_jet(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -42191,14 +42602,14 @@ SWIGINTERN PyObject *_wrap_Recluster_generate_output_jet(PyObject *SWIGUNUSEDPAR
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_Recluster___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Recluster___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Recluster *arg1 = (fastjet::Recluster *) 0 ;
   void *argp1 = 0 ;
@@ -42240,7 +42651,7 @@ SWIGINTERN PyObject *Recluster_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_Filter__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_Filter__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::Filter *result = 0 ;
   
@@ -42261,7 +42672,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Filter__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Filter__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition arg1 ;
   fastjet::Selector arg2 ;
@@ -42322,7 +42733,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Filter__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Filter__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition arg1 ;
   fastjet::Selector arg2 ;
@@ -42375,7 +42786,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Filter__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Filter__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   fastjet::Selector arg2 ;
@@ -42428,7 +42839,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Filter__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Filter__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   fastjet::Selector arg2 ;
@@ -42473,7 +42884,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Filter__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Filter__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< double > *arg1 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
   fastjet::Selector arg2 ;
@@ -42526,7 +42937,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Filter__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Filter__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::FunctionOfPseudoJet< double > *arg1 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
   fastjet::Selector arg2 ;
@@ -42583,7 +42994,7 @@ SWIGINTERN PyObject *_wrap_new_Filter(PyObject *self, PyObject *args) {
     return _wrap_new_Filter__SWIG_0(self, argc, argv);
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -42595,7 +43006,7 @@ SWIGINTERN PyObject *_wrap_new_Filter(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_double_t, 0);
     _v = SWIG_CheckState(res);
@@ -42608,7 +43019,7 @@ SWIGINTERN PyObject *_wrap_new_Filter(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -42622,7 +43033,7 @@ SWIGINTERN PyObject *_wrap_new_Filter(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -42640,7 +43051,7 @@ SWIGINTERN PyObject *_wrap_new_Filter(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_double_t, 0);
     _v = SWIG_CheckState(res);
@@ -42659,7 +43070,7 @@ SWIGINTERN PyObject *_wrap_new_Filter(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -42693,7 +43104,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Filter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Filter(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Filter *arg1 = (fastjet::Filter *) 0 ;
   void *argp1 = 0 ;
@@ -42723,7 +43134,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Filter_set_subtractor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Filter_set_subtractor(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Filter *arg1 = (fastjet::Filter *) 0 ;
   fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *arg2 = (fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) 0 ;
@@ -42760,7 +43171,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Filter_subtractor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Filter_subtractor(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Filter *arg1 = (fastjet::Filter *) 0 ;
   void *argp1 = 0 ;
@@ -42791,7 +43202,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Filter_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Filter_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Filter *arg1 = (fastjet::Filter *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -42825,14 +43236,14 @@ SWIGINTERN PyObject *_wrap_Filter_result(PyObject *SWIGUNUSEDPARM(self), PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_Filter_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Filter_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Filter *arg1 = (fastjet::Filter *) 0 ;
   void *argp1 = 0 ;
@@ -42863,7 +43274,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Filter___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Filter___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Filter *arg1 = (fastjet::Filter *) 0 ;
   void *argp1 = 0 ;
@@ -42905,7 +43316,7 @@ SWIGINTERN PyObject *Filter_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_FilterStructure__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_FilterStructure__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   fastjet::JetDefinition::Recombiner *arg2 = (fastjet::JetDefinition::Recombiner *) 0 ;
@@ -42949,7 +43360,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FilterStructure__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_FilterStructure__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -42994,7 +43405,7 @@ SWIGINTERN PyObject *_wrap_new_FilterStructure(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "new_FilterStructure", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -43002,7 +43413,7 @@ SWIGINTERN PyObject *_wrap_new_FilterStructure(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -43024,7 +43435,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FilterStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_FilterStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FilterStructure *arg1 = (fastjet::FilterStructure *) 0 ;
   void *argp1 = 0 ;
@@ -43054,7 +43465,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FilterStructure_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FilterStructure_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FilterStructure *arg1 = (fastjet::FilterStructure *) 0 ;
   void *argp1 = 0 ;
@@ -43085,7 +43496,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FilterStructure_rejected(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FilterStructure_rejected(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::FilterStructure *arg1 = (fastjet::FilterStructure *) 0 ;
   void *argp1 = 0 ;
@@ -43127,7 +43538,7 @@ SWIGINTERN PyObject *FilterStructure_swiginit(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_Pruner__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Pruner__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetAlgorithm arg1 ;
   double arg2 ;
@@ -43172,7 +43583,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Pruner__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Pruner__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = 0 ;
   double arg2 ;
@@ -43220,7 +43631,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Pruner__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Pruner__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = 0 ;
   fastjet::FunctionOfPseudoJet< double > *arg2 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
@@ -43277,7 +43688,7 @@ SWIGINTERN PyObject *_wrap_new_Pruner(PyObject *self, PyObject *args) {
   if (!(argc = SWIG_Python_UnpackTuple(args, "new_Pruner", 0, 3, argv))) SWIG_fail;
   --argc;
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -43295,7 +43706,7 @@ SWIGINTERN PyObject *_wrap_new_Pruner(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -43315,7 +43726,7 @@ SWIGINTERN PyObject *_wrap_new_Pruner(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -43347,7 +43758,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Pruner_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Pruner_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Pruner *arg1 = (fastjet::Pruner *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -43381,14 +43792,14 @@ SWIGINTERN PyObject *_wrap_Pruner_result(PyObject *SWIGUNUSEDPARM(self), PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_Pruner_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Pruner_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Pruner *arg1 = (fastjet::Pruner *) 0 ;
   void *argp1 = 0 ;
@@ -43419,7 +43830,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Pruner___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Pruner___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Pruner *arg1 = (fastjet::Pruner *) 0 ;
   void *argp1 = 0 ;
@@ -43450,7 +43861,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Pruner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Pruner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Pruner *arg1 = (fastjet::Pruner *) 0 ;
   void *argp1 = 0 ;
@@ -43491,7 +43902,7 @@ SWIGINTERN PyObject *Pruner_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_PrunerStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PrunerStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -43525,7 +43936,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PrunerStructure_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrunerStructure_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PrunerStructure *arg1 = (fastjet::PrunerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -43556,7 +43967,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PrunerStructure_rejected(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrunerStructure_rejected(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PrunerStructure *arg1 = (fastjet::PrunerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -43587,7 +43998,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PrunerStructure_extra_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrunerStructure_extra_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PrunerStructure *arg1 = (fastjet::PrunerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -43618,7 +44029,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PrunerStructure_Rcut(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrunerStructure_Rcut(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PrunerStructure *arg1 = (fastjet::PrunerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -43649,7 +44060,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PrunerStructure_zcut(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrunerStructure_zcut(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PrunerStructure *arg1 = (fastjet::PrunerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -43680,7 +44091,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_PrunerStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_PrunerStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PrunerStructure *arg1 = (fastjet::PrunerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -43721,7 +44132,7 @@ SWIGINTERN PyObject *PrunerStructure_swiginit(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_PruningRecombiner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PruningRecombiner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -43767,7 +44178,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PruningRecombiner_recombine(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PruningRecombiner_recombine(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PruningRecombiner *arg1 = (fastjet::PruningRecombiner *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -43829,7 +44240,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PruningRecombiner_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PruningRecombiner_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PruningRecombiner *arg1 = (fastjet::PruningRecombiner *) 0 ;
   void *argp1 = 0 ;
@@ -43860,7 +44271,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PruningRecombiner_rejected(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PruningRecombiner_rejected(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PruningRecombiner *arg1 = (fastjet::PruningRecombiner *) 0 ;
   void *argp1 = 0 ;
@@ -43891,7 +44302,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PruningRecombiner_clear_rejected(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PruningRecombiner_clear_rejected(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PruningRecombiner *arg1 = (fastjet::PruningRecombiner *) 0 ;
   void *argp1 = 0 ;
@@ -43921,7 +44332,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_PruningRecombiner(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_PruningRecombiner(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PruningRecombiner *arg1 = (fastjet::PruningRecombiner *) 0 ;
   void *argp1 = 0 ;
@@ -43962,7 +44373,7 @@ SWIGINTERN PyObject *PruningRecombiner_swiginit(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_PruningPlugin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PruningPlugin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition *arg1 = 0 ;
   double arg2 ;
@@ -44011,7 +44422,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PruningPlugin_run_clustering(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PruningPlugin_run_clustering(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PruningPlugin *arg1 = (fastjet::PruningPlugin *) 0 ;
   fastjet::ClusterSequence *arg2 = 0 ;
@@ -44051,7 +44462,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PruningPlugin_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PruningPlugin_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PruningPlugin *arg1 = (fastjet::PruningPlugin *) 0 ;
   void *argp1 = 0 ;
@@ -44082,7 +44493,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PruningPlugin_R(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PruningPlugin_R(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PruningPlugin *arg1 = (fastjet::PruningPlugin *) 0 ;
   void *argp1 = 0 ;
@@ -44113,7 +44524,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_PruningPlugin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_PruningPlugin(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PruningPlugin *arg1 = (fastjet::PruningPlugin *) 0 ;
   void *argp1 = 0 ;
@@ -44154,7 +44565,7 @@ SWIGINTERN PyObject *PruningPlugin_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_CASubJetTagger__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_CASubJetTagger__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger::ScaleChoice arg1 ;
   double arg2 ;
@@ -44191,7 +44602,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CASubJetTagger__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_CASubJetTagger__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger::ScaleChoice arg1 ;
   int val1 ;
@@ -44220,7 +44631,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CASubJetTagger__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_CASubJetTagger__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger *result = 0 ;
   
@@ -44253,7 +44664,7 @@ SWIGINTERN PyObject *_wrap_new_CASubJetTagger(PyObject *self, PyObject *args) {
     return _wrap_new_CASubJetTagger__SWIG_2(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -44263,7 +44674,7 @@ SWIGINTERN PyObject *_wrap_new_CASubJetTagger(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -44289,7 +44700,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTagger_set_dr_min(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CASubJetTagger_set_dr_min(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger *arg1 = (fastjet::CASubJetTagger *) 0 ;
   double arg2 ;
@@ -44326,7 +44737,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTagger_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CASubJetTagger_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger *arg1 = (fastjet::CASubJetTagger *) 0 ;
   void *argp1 = 0 ;
@@ -44357,7 +44768,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTagger_set_absolute_z_cut__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_CASubJetTagger_set_absolute_z_cut__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger *arg1 = (fastjet::CASubJetTagger *) 0 ;
   bool arg2 ;
@@ -44393,7 +44804,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTagger_set_absolute_z_cut__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_CASubJetTagger_set_absolute_z_cut__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger *arg1 = (fastjet::CASubJetTagger *) 0 ;
   void *argp1 = 0 ;
@@ -44430,7 +44841,7 @@ SWIGINTERN PyObject *_wrap_CASubJetTagger_set_absolute_z_cut(PyObject *self, PyO
   if (!(argc = SWIG_Python_UnpackTuple(args, "CASubJetTagger_set_absolute_z_cut", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__CASubJetTagger, 0);
     _v = SWIG_CheckState(res);
@@ -44439,7 +44850,7 @@ SWIGINTERN PyObject *_wrap_CASubJetTagger_set_absolute_z_cut(PyObject *self, PyO
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__CASubJetTagger, 0);
     _v = SWIG_CheckState(res);
@@ -44463,7 +44874,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTagger_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CASubJetTagger_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger *arg1 = (fastjet::CASubJetTagger *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -44497,14 +44908,14 @@ SWIGINTERN PyObject *_wrap_CASubJetTagger_result(PyObject *SWIGUNUSEDPARM(self),
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTagger___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CASubJetTagger___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger *arg1 = (fastjet::CASubJetTagger *) 0 ;
   void *argp1 = 0 ;
@@ -44535,7 +44946,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CASubJetTagger(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_CASubJetTagger(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTagger *arg1 = (fastjet::CASubJetTagger *) 0 ;
   void *argp1 = 0 ;
@@ -44576,7 +44987,7 @@ SWIGINTERN PyObject *CASubJetTagger_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_CASubJetTaggerStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_CASubJetTaggerStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -44610,7 +45021,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_scale_choice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_scale_choice(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTaggerStructure *arg1 = (fastjet::CASubJetTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -44641,7 +45052,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_distance(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTaggerStructure *arg1 = (fastjet::CASubJetTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -44672,7 +45083,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_z(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_z(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTaggerStructure *arg1 = (fastjet::CASubJetTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -44703,7 +45114,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_absolute_z(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_absolute_z(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTaggerStructure *arg1 = (fastjet::CASubJetTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -44734,7 +45145,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CASubJetTaggerStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_CASubJetTaggerStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::CASubJetTaggerStructure *arg1 = (fastjet::CASubJetTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -44775,7 +45186,7 @@ SWIGINTERN PyObject *CASubJetTaggerStructure_swiginit(PyObject *SWIGUNUSEDPARM(s
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_MassDropTagger__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_MassDropTagger__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -44812,7 +45223,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_MassDropTagger__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_MassDropTagger__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -44841,7 +45252,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_MassDropTagger__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_MassDropTagger__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::MassDropTagger *result = 0 ;
   
@@ -44874,7 +45285,7 @@ SWIGINTERN PyObject *_wrap_new_MassDropTagger(PyObject *self, PyObject *args) {
     return _wrap_new_MassDropTagger__SWIG_2(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -44884,7 +45295,7 @@ SWIGINTERN PyObject *_wrap_new_MassDropTagger(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -44910,7 +45321,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_MassDropTagger_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MassDropTagger_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::MassDropTagger *arg1 = (fastjet::MassDropTagger *) 0 ;
   void *argp1 = 0 ;
@@ -44941,7 +45352,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_MassDropTagger_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MassDropTagger_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::MassDropTagger *arg1 = (fastjet::MassDropTagger *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -44975,14 +45386,14 @@ SWIGINTERN PyObject *_wrap_MassDropTagger_result(PyObject *SWIGUNUSEDPARM(self),
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_MassDropTagger___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MassDropTagger___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::MassDropTagger *arg1 = (fastjet::MassDropTagger *) 0 ;
   void *argp1 = 0 ;
@@ -45013,7 +45424,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_MassDropTagger(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_MassDropTagger(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::MassDropTagger *arg1 = (fastjet::MassDropTagger *) 0 ;
   void *argp1 = 0 ;
@@ -45054,7 +45465,7 @@ SWIGINTERN PyObject *MassDropTagger_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_MassDropTaggerStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_MassDropTaggerStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::PseudoJet *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -45088,7 +45499,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_MassDropTaggerStructure_mu(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MassDropTaggerStructure_mu(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::MassDropTaggerStructure *arg1 = (fastjet::MassDropTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -45119,7 +45530,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_MassDropTaggerStructure_y(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MassDropTaggerStructure_y(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::MassDropTaggerStructure *arg1 = (fastjet::MassDropTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -45150,7 +45561,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_MassDropTaggerStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_MassDropTaggerStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::MassDropTaggerStructure *arg1 = (fastjet::MassDropTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -45191,7 +45602,7 @@ SWIGINTERN PyObject *MassDropTaggerStructure_swiginit(PyObject *SWIGUNUSEDPARM(s
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition arg1 ;
   double arg2 ;
@@ -45252,7 +45663,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition arg1 ;
   double arg2 ;
@@ -45305,7 +45716,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition arg1 ;
   double arg2 ;
@@ -45350,7 +45761,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetDefinition arg1 ;
   void *argp1 ;
@@ -45396,7 +45807,7 @@ SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger(PyObject *self, PyOb
   if (!(argc = SWIG_Python_UnpackTuple(args, "new_RestFrameNSubjettinessTagger", 0, 4, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -45404,7 +45815,7 @@ SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger(PyObject *self, PyOb
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -45418,7 +45829,7 @@ SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger(PyObject *self, PyOb
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -45438,7 +45849,7 @@ SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger(PyObject *self, PyOb
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -45475,7 +45886,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RestFrameNSubjettinessTagger *arg1 = (fastjet::RestFrameNSubjettinessTagger *) 0 ;
   void *argp1 = 0 ;
@@ -45506,7 +45917,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RestFrameNSubjettinessTagger *arg1 = (fastjet::RestFrameNSubjettinessTagger *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -45540,14 +45951,14 @@ SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger_result(PyObject *SWIGUNU
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RestFrameNSubjettinessTagger *arg1 = (fastjet::RestFrameNSubjettinessTagger *) 0 ;
   void *argp1 = 0 ;
@@ -45578,7 +45989,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_RestFrameNSubjettinessTagger(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_RestFrameNSubjettinessTagger(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RestFrameNSubjettinessTagger *arg1 = (fastjet::RestFrameNSubjettinessTagger *) 0 ;
   void *argp1 = 0 ;
@@ -45619,7 +46030,7 @@ SWIGINTERN PyObject *RestFrameNSubjettinessTagger_swiginit(PyObject *SWIGUNUSEDP
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTaggerStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTaggerStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
@@ -45657,7 +46068,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTaggerStructure_tau2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTaggerStructure_tau2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RestFrameNSubjettinessTaggerStructure *arg1 = (fastjet::RestFrameNSubjettinessTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -45688,7 +46099,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTaggerStructure_costhetas(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTaggerStructure_costhetas(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RestFrameNSubjettinessTaggerStructure *arg1 = (fastjet::RestFrameNSubjettinessTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -45719,7 +46130,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_RestFrameNSubjettinessTaggerStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_RestFrameNSubjettinessTaggerStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::RestFrameNSubjettinessTaggerStructure *arg1 = (fastjet::RestFrameNSubjettinessTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -45760,7 +46171,7 @@ SWIGINTERN PyObject *RestFrameNSubjettinessTaggerStructure_swiginit(PyObject *SW
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_TopTaggerBase_set_top_selector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TopTaggerBase_set_top_selector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TopTaggerBase *arg1 = (fastjet::TopTaggerBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -45800,7 +46211,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TopTaggerBase_set_W_selector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TopTaggerBase_set_W_selector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TopTaggerBase *arg1 = (fastjet::TopTaggerBase *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -45840,7 +46251,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TopTaggerBase_description_of_selectors(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TopTaggerBase_description_of_selectors(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TopTaggerBase *arg1 = (fastjet::TopTaggerBase *) 0 ;
   void *argp1 = 0 ;
@@ -45871,7 +46282,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TopTaggerBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_TopTaggerBase(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TopTaggerBase *arg1 = (fastjet::TopTaggerBase *) 0 ;
   void *argp1 = 0 ;
@@ -45908,7 +46319,7 @@ SWIGINTERN PyObject *TopTaggerBase_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_TopTaggerBaseStructure_W(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TopTaggerBaseStructure_W(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TopTaggerBaseStructure *arg1 = (fastjet::TopTaggerBaseStructure *) 0 ;
   void *argp1 = 0 ;
@@ -45939,7 +46350,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TopTaggerBaseStructure_non_W(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TopTaggerBaseStructure_non_W(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TopTaggerBaseStructure *arg1 = (fastjet::TopTaggerBaseStructure *) 0 ;
   void *argp1 = 0 ;
@@ -45970,7 +46381,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TopTaggerBaseStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_TopTaggerBaseStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::TopTaggerBaseStructure *arg1 = (fastjet::TopTaggerBaseStructure *) 0 ;
   void *argp1 = 0 ;
@@ -46007,7 +46418,7 @@ SWIGINTERN PyObject *TopTaggerBaseStructure_swigregister(PyObject *SWIGUNUSEDPAR
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -46060,7 +46471,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -46105,7 +46516,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -46142,7 +46553,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -46171,7 +46582,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::JHTopTagger *result = 0 ;
   
@@ -46204,7 +46615,7 @@ SWIGINTERN PyObject *_wrap_new_JHTopTagger(PyObject *self, PyObject *args) {
     return _wrap_new_JHTopTagger__SWIG_4(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -46214,7 +46625,7 @@ SWIGINTERN PyObject *_wrap_new_JHTopTagger(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -46230,7 +46641,7 @@ SWIGINTERN PyObject *_wrap_new_JHTopTagger(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -46252,7 +46663,7 @@ SWIGINTERN PyObject *_wrap_new_JHTopTagger(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -46292,7 +46703,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JHTopTagger_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JHTopTagger_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTagger *arg1 = (fastjet::JHTopTagger *) 0 ;
   void *argp1 = 0 ;
@@ -46323,7 +46734,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JHTopTagger_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JHTopTagger_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTagger *arg1 = (fastjet::JHTopTagger *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -46357,14 +46768,14 @@ SWIGINTERN PyObject *_wrap_JHTopTagger_result(PyObject *SWIGUNUSEDPARM(self), Py
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JHTopTagger___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JHTopTagger___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTagger *arg1 = (fastjet::JHTopTagger *) 0 ;
   void *argp1 = 0 ;
@@ -46395,7 +46806,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_JHTopTagger(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_JHTopTagger(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTagger *arg1 = (fastjet::JHTopTagger *) 0 ;
   void *argp1 = 0 ;
@@ -46436,7 +46847,7 @@ SWIGINTERN PyObject *JHTopTagger_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObje
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_JHTopTaggerStructure__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JHTopTaggerStructure__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > arg1 ;
   fastjet::JetDefinition::Recombiner *arg2 = (fastjet::JetDefinition::Recombiner *) 0 ;
@@ -46475,7 +46886,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JHTopTaggerStructure__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JHTopTaggerStructure__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > arg1 ;
   fastjet::JHTopTaggerStructure *result = 0 ;
@@ -46515,7 +46926,7 @@ SWIGINTERN PyObject *_wrap_new_JHTopTaggerStructure(PyObject *self, PyObject *ar
   if (!(argc = SWIG_Python_UnpackTuple(args, "new_JHTopTaggerStructure", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -46523,7 +46934,7 @@ SWIGINTERN PyObject *_wrap_new_JHTopTaggerStructure(PyObject *self, PyObject *ar
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = swig::asptr(argv[0], (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -46545,7 +46956,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTaggerStructure *arg1 = (fastjet::JHTopTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -46576,7 +46987,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W1(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTaggerStructure *arg1 = (fastjet::JHTopTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -46600,14 +47011,14 @@ SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W1(PyObject *SWIGUNUSEDPARM(self
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTaggerStructure *arg1 = (fastjet::JHTopTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -46631,14 +47042,14 @@ SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W2(PyObject *SWIGUNUSEDPARM(self
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_non_W(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_non_W(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTaggerStructure *arg1 = (fastjet::JHTopTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -46669,7 +47080,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_cos_theta_W(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_cos_theta_W(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTaggerStructure *arg1 = (fastjet::JHTopTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -46700,7 +47111,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_JHTopTaggerStructure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_JHTopTaggerStructure(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JHTopTaggerStructure *arg1 = (fastjet::JHTopTaggerStructure *) 0 ;
   void *argp1 = 0 ;
@@ -46741,7 +47152,7 @@ SWIGINTERN PyObject *JHTopTaggerStructure_swiginit(PyObject *SWIGUNUSEDPARM(self
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_BackgroundEstimate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_BackgroundEstimate(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *result = 0 ;
   
@@ -46762,7 +47173,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_rho(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_rho(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -46793,7 +47204,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_sigma(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -46824,7 +47235,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_has_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_has_sigma(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -46855,7 +47266,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -46886,7 +47297,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_sigma_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_sigma_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -46917,7 +47328,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_has_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_has_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -46948,7 +47359,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_mean_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_mean_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -46979,7 +47390,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_has_extras(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_has_extras(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -47010,7 +47421,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_reset(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_reset(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -47040,7 +47451,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_rho(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_rho(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   double arg2 ;
@@ -47077,7 +47488,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_sigma(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   double arg2 ;
@@ -47114,7 +47525,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_has_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_has_sigma(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   bool arg2 ;
@@ -47151,7 +47562,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   double arg2 ;
@@ -47188,7 +47599,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_sigma_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_sigma_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   double arg2 ;
@@ -47225,7 +47636,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_has_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_has_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   bool arg2 ;
@@ -47262,7 +47673,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_mean_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_mean_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   double arg2 ;
@@ -47299,7 +47710,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_apply_rescaling_factor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_apply_rescaling_factor(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   double arg2 ;
@@ -47336,7 +47747,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_extras(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_extras(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   fastjet::BackgroundEstimate::Extras *arg2 = (fastjet::BackgroundEstimate::Extras *) 0 ;
@@ -47373,7 +47784,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_BackgroundEstimate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_BackgroundEstimate(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ;
   void *argp1 = 0 ;
@@ -47414,7 +47825,7 @@ SWIGINTERN PyObject *BackgroundEstimate_swiginit(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_delete_BackgroundEstimatorBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_BackgroundEstimatorBase(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -47444,7 +47855,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_particles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_particles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -47488,7 +47899,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_particles_with_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_particles_with_seed(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -47543,7 +47954,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_copy(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -47574,7 +47985,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -47596,14 +48007,14 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate__SWIG_0(PyObject *SW
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const fastjet::BackgroundEstimate& >(result))), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(result)), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -47636,7 +48047,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate__SWIG_1(PyObject *SW
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const fastjet::BackgroundEstimate& >(result))), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(result)), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47652,7 +48063,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate(PyObject *self, PyOb
   if (!(argc = SWIG_Python_UnpackTuple(args, "BackgroundEstimatorBase_estimate", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -47661,7 +48072,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate(PyObject *self, PyOb
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -47683,7 +48094,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -47712,7 +48123,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -47741,7 +48152,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -47790,7 +48201,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho(PyObject *self, PyObject
   if (!(argc = SWIG_Python_UnpackTuple(args, "BackgroundEstimatorBase_rho", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -47799,7 +48210,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho(PyObject *self, PyObject
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -47821,7 +48232,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -47870,7 +48281,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma(PyObject *self, PyObjec
   if (!(argc = SWIG_Python_UnpackTuple(args, "BackgroundEstimatorBase_sigma", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -47879,7 +48290,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma(PyObject *self, PyObjec
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -47901,7 +48312,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_has_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_has_sigma(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -47932,7 +48343,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho_m__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho_m__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -47961,7 +48372,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma_m__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma_m__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -47990,7 +48401,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho_m__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho_m__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -48039,7 +48450,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho_m(PyObject *self, PyObjec
   if (!(argc = SWIG_Python_UnpackTuple(args, "BackgroundEstimatorBase_rho_m", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -48048,7 +48459,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho_m(PyObject *self, PyObjec
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -48070,7 +48481,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma_m__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma_m__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -48119,7 +48530,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma_m(PyObject *self, PyObj
   if (!(argc = SWIG_Python_UnpackTuple(args, "BackgroundEstimatorBase_sigma_m", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -48128,7 +48539,7 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma_m(PyObject *self, PyObj
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -48150,7 +48561,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_has_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_has_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -48181,7 +48592,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_rescaling_class(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_rescaling_class(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   fastjet::FunctionOfPseudoJet< double > *arg2 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
@@ -48218,7 +48629,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rescaling_class(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rescaling_class(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -48249,7 +48660,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -48287,7 +48698,7 @@ SWIGINTERN PyObject *BackgroundEstimatorBase_swigregister(PyObject *SWIGUNUSEDPA
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -48348,7 +48759,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -48401,7 +48812,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -48446,7 +48857,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -48483,7 +48894,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -48512,7 +48923,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::BackgroundRescalingYPolynomial *result = 0 ;
   
@@ -48545,7 +48956,7 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial(PyObject *self, Py
     return _wrap_new_BackgroundRescalingYPolynomial__SWIG_5(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -48555,7 +48966,7 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial(PyObject *self, Py
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -48571,7 +48982,7 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial(PyObject *self, Py
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -48593,7 +49004,7 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial(PyObject *self, Py
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -48621,7 +49032,7 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial(PyObject *self, Py
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -48668,7 +49079,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundRescalingYPolynomial_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundRescalingYPolynomial_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundRescalingYPolynomial *arg1 = (fastjet::BackgroundRescalingYPolynomial *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -48709,7 +49120,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_BackgroundRescalingYPolynomial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_BackgroundRescalingYPolynomial(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundRescalingYPolynomial *arg1 = (fastjet::BackgroundRescalingYPolynomial *) 0 ;
   void *argp1 = 0 ;
@@ -48750,7 +49161,7 @@ SWIGINTERN PyObject *BackgroundRescalingYPolynomial_swiginit(PyObject *SWIGUNUSE
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   fastjet::JetDefinition *arg2 = 0 ;
@@ -48804,7 +49215,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   fastjet::ClusterSequenceAreaBase *arg2 = 0 ;
@@ -48847,7 +49258,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Selector *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -48879,7 +49290,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *result = 0 ;
   
@@ -48912,7 +49323,7 @@ SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator(PyObject *self, PyOb
     return _wrap_new_JetMedianBackgroundEstimator__SWIG_3(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -48920,7 +49331,7 @@ SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator(PyObject *self, PyOb
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -48932,7 +49343,7 @@ SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator(PyObject *self, PyOb
     }
   }
   if (argc == 3) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -48959,7 +49370,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_JetMedianBackgroundEstimator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_JetMedianBackgroundEstimator(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -48989,7 +49400,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_particles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_particles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -49033,7 +49444,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_particles_with_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_particles_with_seed(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -49088,7 +49499,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_cluster_sequence(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_cluster_sequence(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   fastjet::ClusterSequenceAreaBase *arg2 = 0 ;
@@ -49128,7 +49539,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -49172,7 +49583,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_selector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_selector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -49212,7 +49623,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_compute_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_compute_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   bool arg2 ;
@@ -49249,7 +49660,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_copy(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49280,7 +49691,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49302,14 +49713,14 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate__SWIG_0(PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const fastjet::BackgroundEstimate& >(result))), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(result)), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -49342,7 +49753,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate__SWIG_1(PyObjec
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const fastjet::BackgroundEstimate& >(result))), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(result)), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49358,7 +49769,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate(PyObject *self,
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetMedianBackgroundEstimator_estimate", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49367,7 +49778,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate(PyObject *self,
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49389,7 +49800,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49418,7 +49829,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49447,7 +49858,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -49496,7 +49907,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho(PyObject *self, PyOb
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetMedianBackgroundEstimator_rho", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49505,7 +49916,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho(PyObject *self, PyOb
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49527,7 +49938,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -49576,7 +49987,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma(PyObject *self, Py
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetMedianBackgroundEstimator_sigma", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49585,7 +49996,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma(PyObject *self, Py
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49607,7 +50018,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_has_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_has_sigma(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49638,7 +50049,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho_m__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho_m__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49667,7 +50078,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma_m__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma_m__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49696,7 +50107,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho_m__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho_m__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -49745,7 +50156,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho_m(PyObject *self, Py
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetMedianBackgroundEstimator_rho_m", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49754,7 +50165,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho_m(PyObject *self, Py
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49776,7 +50187,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma_m__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma_m__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -49825,7 +50236,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma_m(PyObject *self,
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetMedianBackgroundEstimator_sigma_m", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49834,7 +50245,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma_m(PyObject *self,
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -49856,7 +50267,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_has_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_has_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49887,7 +50298,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_mean_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_mean_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49918,7 +50329,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_n_jets_used(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_n_jets_used(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49949,7 +50360,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_jets_used(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_jets_used(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -49980,7 +50391,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_empty_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_empty_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -50011,7 +50422,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_n_empty_jets(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_n_empty_jets(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -50042,7 +50453,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_reset(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_reset(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -50072,7 +50483,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_use_area_4vector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_use_area_4vector__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   bool arg2 ;
@@ -50108,7 +50519,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_use_area_4vector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_use_area_4vector__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -50145,7 +50556,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_use_area_4vector(PyO
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetMedianBackgroundEstimator_set_use_area_4vector", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -50154,7 +50565,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_use_area_4vector(PyO
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -50178,7 +50589,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_use_area_4vector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_use_area_4vector(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -50209,7 +50620,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_provide_fj2_sigma__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_provide_fj2_sigma__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   bool arg2 ;
@@ -50245,7 +50656,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_provide_fj2_sigma__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_provide_fj2_sigma__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -50282,7 +50693,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_provide_fj2_sigma(Py
   if (!(argc = SWIG_Python_UnpackTuple(args, "JetMedianBackgroundEstimator_set_provide_fj2_sigma", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -50291,7 +50702,7 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_provide_fj2_sigma(Py
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -50315,7 +50726,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_jet_density_class(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_jet_density_class(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   fastjet::FunctionOfPseudoJet< double > *arg2 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
@@ -50352,7 +50763,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_jet_density_class(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_jet_density_class(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -50383,7 +50794,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_rescaling_class(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_rescaling_class(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   fastjet::FunctionOfPseudoJet< double > *arg2 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
@@ -50420,7 +50831,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -50462,7 +50873,7 @@ SWIGINTERN PyObject *JetMedianBackgroundEstimator_swiginit(PyObject *SWIGUNUSEDP
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_BackgroundJetPtDensity_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundJetPtDensity_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetPtDensity *arg1 = (fastjet::BackgroundJetPtDensity *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -50503,7 +50914,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundJetPtDensity_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundJetPtDensity_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetPtDensity *arg1 = (fastjet::BackgroundJetPtDensity *) 0 ;
   void *argp1 = 0 ;
@@ -50534,7 +50945,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_BackgroundJetPtDensity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_BackgroundJetPtDensity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetPtDensity *result = 0 ;
   
@@ -50555,7 +50966,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_BackgroundJetPtDensity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_BackgroundJetPtDensity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetPtDensity *arg1 = (fastjet::BackgroundJetPtDensity *) 0 ;
   void *argp1 = 0 ;
@@ -50596,7 +51007,7 @@ SWIGINTERN PyObject *BackgroundJetPtDensity_swiginit(PyObject *SWIGUNUSEDPARM(se
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_BackgroundJetScalarPtDensity__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_BackgroundJetScalarPtDensity__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetScalarPtDensity *result = 0 ;
   
@@ -50617,7 +51028,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_BackgroundJetScalarPtDensity__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_BackgroundJetScalarPtDensity__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -50658,7 +51069,7 @@ SWIGINTERN PyObject *_wrap_new_BackgroundJetScalarPtDensity(PyObject *self, PyOb
     return _wrap_new_BackgroundJetScalarPtDensity__SWIG_0(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -50677,7 +51088,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundJetScalarPtDensity_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundJetScalarPtDensity_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetScalarPtDensity *arg1 = (fastjet::BackgroundJetScalarPtDensity *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -50718,7 +51129,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundJetScalarPtDensity_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundJetScalarPtDensity_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetScalarPtDensity *arg1 = (fastjet::BackgroundJetScalarPtDensity *) 0 ;
   void *argp1 = 0 ;
@@ -50749,7 +51160,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_BackgroundJetScalarPtDensity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_BackgroundJetScalarPtDensity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetScalarPtDensity *arg1 = (fastjet::BackgroundJetScalarPtDensity *) 0 ;
   void *argp1 = 0 ;
@@ -50790,7 +51201,7 @@ SWIGINTERN PyObject *BackgroundJetScalarPtDensity_swiginit(PyObject *SWIGUNUSEDP
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_BackgroundJetPtMDensity_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundJetPtMDensity_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetPtMDensity *arg1 = (fastjet::BackgroundJetPtMDensity *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -50831,7 +51242,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_BackgroundJetPtMDensity_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_BackgroundJetPtMDensity_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetPtMDensity *arg1 = (fastjet::BackgroundJetPtMDensity *) 0 ;
   void *argp1 = 0 ;
@@ -50862,7 +51273,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_BackgroundJetPtMDensity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_BackgroundJetPtMDensity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetPtMDensity *result = 0 ;
   
@@ -50883,7 +51294,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_BackgroundJetPtMDensity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_BackgroundJetPtMDensity(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::BackgroundJetPtMDensity *arg1 = (fastjet::BackgroundJetPtMDensity *) 0 ;
   void *argp1 = 0 ;
@@ -50924,7 +51335,7 @@ SWIGINTERN PyObject *BackgroundJetPtMDensity_swiginit(PyObject *SWIGUNUSEDPARM(s
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -50961,7 +51372,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::RectangularGrid *arg1 = 0 ;
   void *argp1 = 0 ;
@@ -50993,7 +51404,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -51062,7 +51473,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -51124,7 +51535,7 @@ SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator(PyObject *self, PyO
   if (!(argc = SWIG_Python_UnpackTuple(args, "new_GridMedianBackgroundEstimator", 0, 5, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__RectangularGrid, SWIG_POINTER_NO_NULL | 0);
     _v = SWIG_CheckState(res);
     if (_v) {
@@ -51132,7 +51543,7 @@ SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator(PyObject *self, PyO
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -51148,7 +51559,7 @@ SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator(PyObject *self, PyO
     }
   }
   if (argc == 4) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -51176,7 +51587,7 @@ SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator(PyObject *self, PyO
     }
   }
   if (argc == 5) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -51219,7 +51630,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_particles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_particles(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ;
@@ -51263,7 +51674,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_compute_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_compute_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   bool arg2 ;
@@ -51300,7 +51711,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_copy(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -51331,7 +51742,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -51353,14 +51764,14 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate__SWIG_0(PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const fastjet::BackgroundEstimate& >(result))), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(result)), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -51393,7 +51804,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate__SWIG_1(PyObje
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const fastjet::BackgroundEstimate& >(result))), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(result)), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51409,7 +51820,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate(PyObject *self
   if (!(argc = SWIG_Python_UnpackTuple(args, "GridMedianBackgroundEstimator_estimate", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51418,7 +51829,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate(PyObject *self
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51440,7 +51851,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -51469,7 +51880,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -51498,7 +51909,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -51547,7 +51958,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho(PyObject *self, PyO
   if (!(argc = SWIG_Python_UnpackTuple(args, "GridMedianBackgroundEstimator_rho", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51556,7 +51967,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho(PyObject *self, PyO
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51578,7 +51989,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -51627,7 +52038,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma(PyObject *self, P
   if (!(argc = SWIG_Python_UnpackTuple(args, "GridMedianBackgroundEstimator_sigma", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51636,7 +52047,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma(PyObject *self, P
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51658,7 +52069,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_has_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_has_sigma(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -51689,7 +52100,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho_m__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho_m__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -51718,7 +52129,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma_m__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma_m__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -51747,7 +52158,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho_m__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho_m__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -51796,7 +52207,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho_m(PyObject *self, P
   if (!(argc = SWIG_Python_UnpackTuple(args, "GridMedianBackgroundEstimator_rho_m", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51805,7 +52216,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho_m(PyObject *self, P
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51827,7 +52238,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma_m__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma_m__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -51876,7 +52287,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma_m(PyObject *self,
   if (!(argc = SWIG_Python_UnpackTuple(args, "GridMedianBackgroundEstimator_sigma_m", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51885,7 +52296,7 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma_m(PyObject *self,
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0);
     _v = SWIG_CheckState(res);
@@ -51907,7 +52318,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_has_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_has_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -51938,7 +52349,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_mean_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_mean_area(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -51969,7 +52380,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_rescaling_class(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_rescaling_class(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   fastjet::FunctionOfPseudoJet< double > *arg2 = (fastjet::FunctionOfPseudoJet< double > *) 0 ;
@@ -52006,7 +52417,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -52037,7 +52448,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GridMedianBackgroundEstimator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_GridMedianBackgroundEstimator(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ;
   void *argp1 = 0 ;
@@ -52078,7 +52489,7 @@ SWIGINTERN PyObject *GridMedianBackgroundEstimator_swiginit(PyObject *SWIGUNUSED
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ;
   void *argp1 = 0 ;
@@ -52107,7 +52518,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double val1 ;
@@ -52136,7 +52547,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
@@ -52173,7 +52584,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *result = 0 ;
   
@@ -52206,7 +52617,7 @@ SWIGINTERN PyObject *_wrap_new_Subtractor(PyObject *self, PyObject *args) {
     return _wrap_new_Subtractor__SWIG_3(self, argc, argv);
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0);
     _v = SWIG_CheckState(res);
@@ -52215,7 +52626,7 @@ SWIGINTERN PyObject *_wrap_new_Subtractor(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -52225,7 +52636,7 @@ SWIGINTERN PyObject *_wrap_new_Subtractor(PyObject *self, PyObject *args) {
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     {
       int res = SWIG_AsVal_double(argv[0], NULL);
       _v = SWIG_CheckState(res);
@@ -52252,7 +52663,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Subtractor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Subtractor(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   void *argp1 = 0 ;
@@ -52282,7 +52693,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_set_defaults(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Subtractor_set_defaults(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   void *argp1 = 0 ;
@@ -52312,7 +52723,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_set_background_estimator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Subtractor_set_background_estimator(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   fastjet::BackgroundEstimatorBase *arg2 = (fastjet::BackgroundEstimatorBase *) 0 ;
@@ -52349,7 +52760,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_set_use_rho_m__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Subtractor_set_use_rho_m__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   bool arg2 ;
@@ -52385,7 +52796,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_set_use_rho_m__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Subtractor_set_use_rho_m__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   void *argp1 = 0 ;
@@ -52422,7 +52833,7 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_use_rho_m(PyObject *self, PyObject *ar
   if (!(argc = SWIG_Python_UnpackTuple(args, "Subtractor_set_use_rho_m", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Subtractor, 0);
     _v = SWIG_CheckState(res);
@@ -52431,7 +52842,7 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_use_rho_m(PyObject *self, PyObject *ar
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Subtractor, 0);
     _v = SWIG_CheckState(res);
@@ -52455,7 +52866,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_use_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Subtractor_use_rho_m(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   void *argp1 = 0 ;
@@ -52486,7 +52897,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_set_safe_mass__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Subtractor_set_safe_mass__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   bool arg2 ;
@@ -52522,7 +52933,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_set_safe_mass__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_Subtractor_set_safe_mass__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   void *argp1 = 0 ;
@@ -52559,7 +52970,7 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_safe_mass(PyObject *self, PyObject *ar
   if (!(argc = SWIG_Python_UnpackTuple(args, "Subtractor_set_safe_mass", 0, 2, argv))) SWIG_fail;
   --argc;
   if (argc == 1) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Subtractor, 0);
     _v = SWIG_CheckState(res);
@@ -52568,7 +52979,7 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_safe_mass(PyObject *self, PyObject *ar
     }
   }
   if (argc == 2) {
-    int _v;
+    int _v = 0;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__Subtractor, 0);
     _v = SWIG_CheckState(res);
@@ -52592,7 +53003,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_safe_mass(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Subtractor_safe_mass(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   void *argp1 = 0 ;
@@ -52623,7 +53034,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_set_known_selectors(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Subtractor_set_known_selectors(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   fastjet::Selector *arg2 = 0 ;
@@ -52674,7 +53085,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Subtractor_result(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   fastjet::PseudoJet *arg2 = 0 ;
@@ -52708,14 +53119,14 @@ SWIGINTERN PyObject *_wrap_Subtractor_result(PyObject *SWIGUNUSEDPARM(self), PyO
       SWIG_fail;
     }
   }
-  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(result)), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor_description(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Subtractor_description(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   void *argp1 = 0 ;
@@ -52746,7 +53157,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Subtractor___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Subtractor___str__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ;
   void *argp1 = 0 ;
@@ -52789,7 +53200,6 @@ SWIGINTERN PyObject *Subtractor_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec
 }
 
 static PyMethodDef SwigMethods[] = {
-	 { "SWIG_PyInstanceMethod_New", SWIG_PyInstanceMethod_New, METH_O, NULL},
 	 { "delete_SwigPyIterator", _wrap_delete_SwigPyIterator, METH_O, NULL},
 	 { "SwigPyIterator_value", _wrap_SwigPyIterator_value, METH_O, NULL},
 	 { "SwigPyIterator_incr", _wrap_SwigPyIterator_incr, METH_VARARGS, NULL},
@@ -53613,6 +54023,7 @@ static PyMethodDef SwigMethods[] = {
 		"\n"
 		"\n"
 		""},
+	 { "PseudoJet_set_user_info_shared_ptr", _wrap_PseudoJet_set_user_info_shared_ptr, METH_VARARGS, NULL},
 	 { "PseudoJet_description", _wrap_PseudoJet_description, METH_O, "\n"
 		"\n"
 		"`description() const -> std::string`  \n"
@@ -55302,6 +55713,7 @@ static PyMethodDef SwigMethods[] = {
 		"recombination will returned to the user as a jet.  \n"
 		"\n"
 		""},
+	 { "ClusterSequence_plugin_non_const_jet", _wrap_ClusterSequence_plugin_non_const_jet, METH_VARARGS, NULL},
 	 { "ClusterSequence_plugin_associate_extras", _wrap_ClusterSequence_plugin_associate_extras, METH_VARARGS, "\n"
 		"\n"
 		"`plugin_associate_extras(Extras *extras_in)`  \n"
@@ -58227,81 +58639,35 @@ static PyMethodDef SwigMethods[] = {
 	 { NULL, NULL, 0, NULL }
 };
 
-static PyMethodDef SwigMethods_proxydocs[] = {
-	 { NULL, NULL, 0, NULL }
-};
-
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_fastjet__BackgroundJetPtDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< double > *)  ((fastjet::BackgroundJetPtDensity *) x));
-}
-static void *_p_fastjet__BackgroundJetScalarPtDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< double > *)  ((fastjet::BackgroundJetScalarPtDensity *) x));
-}
-static void *_p_fastjet__BackgroundJetPtMDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< double > *)  ((fastjet::BackgroundJetPtMDensity *) x));
-}
-static void *_p_fastjet__BackgroundRescalingYPolynomialTo_p_fastjet__FunctionOfPseudoJetT_double_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< double > *)  ((fastjet::BackgroundRescalingYPolynomial *) x));
-}
-static void *_p_fastjet__CompositeJetStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::PseudoJetStructureBase *)  ((fastjet::CompositeJetStructure *) x));
-}
-static void *_p_fastjet__ClusterSequenceStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::PseudoJetStructureBase *)  ((fastjet::ClusterSequenceStructure *) x));
-}
-static void *_p_fastjet__FilterStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::PseudoJetStructureBase *) (fastjet::CompositeJetStructure *) ((fastjet::FilterStructure *) x));
-}
-static void *_p_fastjet__RestFrameNSubjettinessTaggerStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::PseudoJetStructureBase *) (fastjet::CompositeJetStructure *) ((fastjet::RestFrameNSubjettinessTaggerStructure *) x));
-}
-static void *_p_fastjet__JHTopTaggerStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::PseudoJetStructureBase *) (fastjet::CompositeJetStructure *) ((fastjet::JHTopTaggerStructure *) x));
-}
-static void *_p_fastjet__UserInfoPythonTo_p_fastjet__PseudoJet__UserInfoBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::PseudoJet::UserInfoBase *)  ((fastjet::UserInfoPython *) x));
-}
-static void *_p_fastjet__JHTopTaggerTo_p_fastjet__TopTaggerBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::TopTaggerBase *)  ((fastjet::JHTopTagger *) x));
-}
-static void *_p_fastjet__FilterTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::Transformer *)  ((fastjet::Filter *) x));
-}
-static void *_p_fastjet__CASubJetTaggerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::Transformer *)  ((fastjet::CASubJetTagger *) x));
-}
-static void *_p_fastjet__MassDropTaggerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::Transformer *)  ((fastjet::MassDropTagger *) x));
-}
-static void *_p_fastjet__JHTopTaggerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::Transformer *) (fastjet::TopTaggerBase *) ((fastjet::JHTopTagger *) x));
+static void *_p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__BackgroundEstimatorBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::BackgroundEstimatorBase *)  ((fastjet::GridMedianBackgroundEstimator *) x));
 }
-static void *_p_fastjet__RestFrameNSubjettinessTaggerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::Transformer *)  ((fastjet::RestFrameNSubjettinessTagger *) x));
+static void *_p_fastjet__JetMedianBackgroundEstimatorTo_p_fastjet__BackgroundEstimatorBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::BackgroundEstimatorBase *)  ((fastjet::JetMedianBackgroundEstimator *) x));
 }
-static void *_p_fastjet__SubtractorTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::Transformer *)  ((fastjet::Subtractor *) x));
+static void *_p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *)(fastjet::ClusterSequenceActiveArea *) ((fastjet::ClusterSequence1GhostPassiveArea *) x));
 }
-static void *_p_fastjet__PrunerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::Transformer *)  ((fastjet::Pruner *) x));
+static void *_p_fastjet__ClusterSequenceActiveAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *) ((fastjet::ClusterSequenceActiveArea *) x));
 }
-static void *_p_fastjet__TopTaggerBaseTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::Transformer *)  ((fastjet::TopTaggerBase *) x));
+static void *_p_fastjet__ClusterSequenceActiveAreaExplicitGhostsTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *) ((fastjet::ClusterSequenceActiveAreaExplicitGhosts *) x));
 }
-static void *_p_fastjet__SelectorWorkerPythonTo_p_fastjet__SelectorWorker(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::SelectorWorker *)  ((fastjet::SelectorWorkerPython *) x));
+static void *_p_fastjet__ClusterSequenceAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *) ((fastjet::ClusterSequenceArea *) x));
 }
-static void *_p_fastjet__JetMedianBackgroundEstimatorTo_p_fastjet__BackgroundEstimatorBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::BackgroundEstimatorBase *)  ((fastjet::JetMedianBackgroundEstimator *) x));
+static void *_p_fastjet__ClusterSequenceAreaBaseTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequence *)  ((fastjet::ClusterSequenceAreaBase *) x));
 }
-static void *_p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__BackgroundEstimatorBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::BackgroundEstimatorBase *)  ((fastjet::GridMedianBackgroundEstimator *) x));
+static void *_p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *)(fastjet::ClusterSequenceActiveArea *)(fastjet::ClusterSequence1GhostPassiveArea *) ((fastjet::ClusterSequencePassiveArea *) x));
 }
-static void *_p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__RectangularGrid(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::RectangularGrid *)  ((fastjet::GridMedianBackgroundEstimator *) x));
+static void *_p_fastjet__ClusterSequenceVoronoiAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *) ((fastjet::ClusterSequenceVoronoiArea *) x));
 }
 static void *_p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequence1GhostPassiveArea(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::ClusterSequence1GhostPassiveArea *)  ((fastjet::ClusterSequencePassiveArea *) x));
@@ -58312,101 +58678,143 @@ static void *_p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSe
 static void *_p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequenceActiveArea(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::ClusterSequenceActiveArea *) (fastjet::ClusterSequence1GhostPassiveArea *) ((fastjet::ClusterSequencePassiveArea *) x));
 }
-static void *_p_fastjet__JHTopTaggerStructureTo_p_fastjet__TopTaggerBaseStructure(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::TopTaggerBaseStructure *)  ((fastjet::JHTopTaggerStructure *) x));
+static void *_p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequenceAreaBase *) (fastjet::ClusterSequenceActiveArea *) ((fastjet::ClusterSequence1GhostPassiveArea *) x));
+}
+static void *_p_fastjet__ClusterSequenceActiveAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequenceAreaBase *)  ((fastjet::ClusterSequenceActiveArea *) x));
+}
+static void *_p_fastjet__ClusterSequenceActiveAreaExplicitGhostsTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequenceAreaBase *)  ((fastjet::ClusterSequenceActiveAreaExplicitGhosts *) x));
+}
+static void *_p_fastjet__ClusterSequenceAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequenceAreaBase *)  ((fastjet::ClusterSequenceArea *) x));
+}
+static void *_p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequenceAreaBase *) (fastjet::ClusterSequenceActiveArea *)(fastjet::ClusterSequence1GhostPassiveArea *) ((fastjet::ClusterSequencePassiveArea *) x));
+}
+static void *_p_fastjet__ClusterSequenceVoronoiAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::ClusterSequenceAreaBase *)  ((fastjet::ClusterSequenceVoronoiArea *) x));
 }
 static void *_p_fastjet__FilterStructureTo_p_fastjet__CompositeJetStructure(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::CompositeJetStructure *)  ((fastjet::FilterStructure *) x));
 }
+static void *_p_fastjet__JHTopTaggerStructureTo_p_fastjet__CompositeJetStructure(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::CompositeJetStructure *)  ((fastjet::JHTopTaggerStructure *) x));
+}
 static void *_p_fastjet__RestFrameNSubjettinessTaggerStructureTo_p_fastjet__CompositeJetStructure(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::CompositeJetStructure *)  ((fastjet::RestFrameNSubjettinessTaggerStructure *) x));
 }
-static void *_p_fastjet__JHTopTaggerStructureTo_p_fastjet__CompositeJetStructure(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::CompositeJetStructure *)  ((fastjet::JHTopTaggerStructure *) x));
+static void *_p_fastjet__InternalErrorTo_p_fastjet__Error(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::Error *)  ((fastjet::InternalError *) x));
+}
+static void *_p_fastjet__BackgroundJetPtDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< double > *)  ((fastjet::BackgroundJetPtDensity *) x));
+}
+static void *_p_fastjet__BackgroundJetPtMDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< double > *)  ((fastjet::BackgroundJetPtMDensity *) x));
+}
+static void *_p_fastjet__BackgroundJetScalarPtDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< double > *)  ((fastjet::BackgroundJetScalarPtDensity *) x));
+}
+static void *_p_fastjet__BackgroundRescalingYPolynomialTo_p_fastjet__FunctionOfPseudoJetT_double_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< double > *)  ((fastjet::BackgroundRescalingYPolynomial *) x));
 }
 static void *_p_fastjet__BoostTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *)  ((fastjet::Boost *) x));
 }
+static void *_p_fastjet__CASubJetTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::CASubJetTagger *) x));
+}
 static void *_p_fastjet__FilterTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::Filter *) x));
 }
-static void *_p_fastjet__CASubJetTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::CASubJetTagger *) x));
+static void *_p_fastjet__JHTopTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *)(fastjet::TopTaggerBase *) ((fastjet::JHTopTagger *) x));
 }
 static void *_p_fastjet__MassDropTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::MassDropTagger *) x));
 }
-static void *_p_fastjet__JHTopTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *)(fastjet::TopTaggerBase *) ((fastjet::JHTopTagger *) x));
+static void *_p_fastjet__PrunerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::Pruner *) x));
+}
+static void *_p_fastjet__ReclusterTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *)  ((fastjet::Recluster *) x));
 }
 static void *_p_fastjet__RestFrameNSubjettinessTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::RestFrameNSubjettinessTagger *) x));
 }
-static void *_p_fastjet__TransformerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *)  ((fastjet::Transformer *) x));
-}
 static void *_p_fastjet__SubtractorTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::Subtractor *) x));
 }
+static void *_p_fastjet__TopTaggerBaseTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::TopTaggerBase *) x));
+}
+static void *_p_fastjet__TransformerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *)  ((fastjet::Transformer *) x));
+}
 static void *_p_fastjet__UnboostTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *)  ((fastjet::Unboost *) x));
 }
-static void *_p_fastjet__ReclusterTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *)  ((fastjet::Recluster *) x));
+static void *_p_fastjet__UserInfoPythonTo_p_fastjet__PseudoJet__UserInfoBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::PseudoJet::UserInfoBase *)  ((fastjet::UserInfoPython *) x));
 }
-static void *_p_fastjet__PrunerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::Pruner *) x));
+static void *_p_fastjet__ClusterSequenceStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::PseudoJetStructureBase *)  ((fastjet::ClusterSequenceStructure *) x));
 }
-static void *_p_fastjet__TopTaggerBaseTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *) (fastjet::Transformer *) ((fastjet::TopTaggerBase *) x));
+static void *_p_fastjet__CompositeJetStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::PseudoJetStructureBase *)  ((fastjet::CompositeJetStructure *) x));
 }
-static void *_p_fastjet__RectangularGridTo_p_fastjet__TilingBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::TilingBase *)  ((fastjet::RectangularGrid *) x));
+static void *_p_fastjet__FilterStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::PseudoJetStructureBase *) (fastjet::CompositeJetStructure *) ((fastjet::FilterStructure *) x));
 }
-static void *_p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__TilingBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::TilingBase *) (fastjet::RectangularGrid *) ((fastjet::GridMedianBackgroundEstimator *) x));
+static void *_p_fastjet__JHTopTaggerStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::PseudoJetStructureBase *) (fastjet::CompositeJetStructure *) ((fastjet::JHTopTaggerStructure *) x));
 }
-static void *_p_fastjet__ClusterSequenceAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *) ((fastjet::ClusterSequenceArea *) x));
+static void *_p_fastjet__RestFrameNSubjettinessTaggerStructureTo_p_fastjet__PseudoJetStructureBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::PseudoJetStructureBase *) (fastjet::CompositeJetStructure *) ((fastjet::RestFrameNSubjettinessTaggerStructure *) x));
 }
-static void *_p_fastjet__ClusterSequenceAreaBaseTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequence *)  ((fastjet::ClusterSequenceAreaBase *) x));
+static void *_p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__RectangularGrid(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::RectangularGrid *)  ((fastjet::GridMedianBackgroundEstimator *) x));
 }
-static void *_p_fastjet__ClusterSequenceActiveAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *) ((fastjet::ClusterSequenceActiveArea *) x));
+static void *_p_fastjet__SelectorWorkerPythonTo_p_fastjet__SelectorWorker(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::SelectorWorker *)  ((fastjet::SelectorWorkerPython *) x));
 }
-static void *_p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *)(fastjet::ClusterSequenceActiveArea *) ((fastjet::ClusterSequence1GhostPassiveArea *) x));
+static void *_p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__TilingBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::TilingBase *) (fastjet::RectangularGrid *) ((fastjet::GridMedianBackgroundEstimator *) x));
 }
-static void *_p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *)(fastjet::ClusterSequenceActiveArea *)(fastjet::ClusterSequence1GhostPassiveArea *) ((fastjet::ClusterSequencePassiveArea *) x));
+static void *_p_fastjet__RectangularGridTo_p_fastjet__TilingBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::TilingBase *)  ((fastjet::RectangularGrid *) x));
 }
-static void *_p_fastjet__ClusterSequenceActiveAreaExplicitGhostsTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *) ((fastjet::ClusterSequenceActiveAreaExplicitGhosts *) x));
+static void *_p_fastjet__JHTopTaggerTo_p_fastjet__TopTaggerBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::TopTaggerBase *)  ((fastjet::JHTopTagger *) x));
 }
-static void *_p_fastjet__ClusterSequenceVoronoiAreaTo_p_fastjet__ClusterSequence(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequence *) (fastjet::ClusterSequenceAreaBase *) ((fastjet::ClusterSequenceVoronoiArea *) x));
+static void *_p_fastjet__JHTopTaggerStructureTo_p_fastjet__TopTaggerBaseStructure(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::TopTaggerBaseStructure *)  ((fastjet::JHTopTaggerStructure *) x));
 }
-static void *_p_fastjet__InternalErrorTo_p_fastjet__Error(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::Error *)  ((fastjet::InternalError *) x));
+static void *_p_fastjet__CASubJetTaggerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::Transformer *)  ((fastjet::CASubJetTagger *) x));
 }
-static void *_p_fastjet__ClusterSequenceAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequenceAreaBase *)  ((fastjet::ClusterSequenceArea *) x));
+static void *_p_fastjet__FilterTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::Transformer *)  ((fastjet::Filter *) x));
 }
-static void *_p_fastjet__ClusterSequenceActiveAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequenceAreaBase *)  ((fastjet::ClusterSequenceActiveArea *) x));
+static void *_p_fastjet__JHTopTaggerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::Transformer *) (fastjet::TopTaggerBase *) ((fastjet::JHTopTagger *) x));
 }
-static void *_p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequenceAreaBase *) (fastjet::ClusterSequenceActiveArea *) ((fastjet::ClusterSequence1GhostPassiveArea *) x));
+static void *_p_fastjet__MassDropTaggerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::Transformer *)  ((fastjet::MassDropTagger *) x));
 }
-static void *_p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequenceAreaBase *) (fastjet::ClusterSequenceActiveArea *)(fastjet::ClusterSequence1GhostPassiveArea *) ((fastjet::ClusterSequencePassiveArea *) x));
+static void *_p_fastjet__PrunerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::Transformer *)  ((fastjet::Pruner *) x));
 }
-static void *_p_fastjet__ClusterSequenceActiveAreaExplicitGhostsTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequenceAreaBase *)  ((fastjet::ClusterSequenceActiveAreaExplicitGhosts *) x));
+static void *_p_fastjet__RestFrameNSubjettinessTaggerTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::Transformer *)  ((fastjet::RestFrameNSubjettinessTagger *) x));
 }
-static void *_p_fastjet__ClusterSequenceVoronoiAreaTo_p_fastjet__ClusterSequenceAreaBase(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((fastjet::ClusterSequenceAreaBase *)  ((fastjet::ClusterSequenceVoronoiArea *) x));
+static void *_p_fastjet__SubtractorTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::Transformer *)  ((fastjet::Subtractor *) x));
+}
+static void *_p_fastjet__TopTaggerBaseTo_p_fastjet__Transformer(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((fastjet::Transformer *)  ((fastjet::TopTaggerBase *) x));
 }
 static swig_type_info _swigt__p_StructureType = {"_p_StructureType", "StructureType *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_allocator_type = {"_p_allocator_type", "allocator_type *", 0, 0, (void*)0, 0};
@@ -58442,13 +58850,13 @@ static swig_type_info _swigt__p_fastjet__Filter = {"_p_fastjet__Filter", "fastje
 static swig_type_info _swigt__p_fastjet__FilterStructure = {"_p_fastjet__FilterStructure", "fastjet::FilterStructure *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__FunctionOfPseudoJetT_double_t = {"_p_fastjet__FunctionOfPseudoJetT_double_t", "fastjet::FunctionOfPseudoJet< double > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t = {"_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t", "fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_fastjet__GhostedAreaSpec = {"_p_fastjet__GhostedAreaSpec", "fastjet::GhostedAreaSpec *|fastjet::ActiveAreaSpec *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_fastjet__GhostedAreaSpec = {"_p_fastjet__GhostedAreaSpec", "fastjet::ActiveAreaSpec *|fastjet::GhostedAreaSpec *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__GridMedianBackgroundEstimator = {"_p_fastjet__GridMedianBackgroundEstimator", "fastjet::GridMedianBackgroundEstimator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__IndexedSortHelper = {"_p_fastjet__IndexedSortHelper", "fastjet::IndexedSortHelper *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__InternalError = {"_p_fastjet__InternalError", "fastjet::InternalError *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__JHTopTagger = {"_p_fastjet__JHTopTagger", "fastjet::JHTopTagger *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__JHTopTaggerStructure = {"_p_fastjet__JHTopTaggerStructure", "fastjet::JHTopTaggerStructure *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_fastjet__JetAlgorithm = {"_p_fastjet__JetAlgorithm", "enum fastjet::JetAlgorithm *|fastjet::JetFinder *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_fastjet__JetAlgorithm = {"_p_fastjet__JetAlgorithm", "fastjet::JetFinder *|enum fastjet::JetAlgorithm *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__JetDefinition = {"_p_fastjet__JetDefinition", "fastjet::JetDefinition *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__JetDefinition__Plugin = {"_p_fastjet__JetDefinition__Plugin", "fastjet::JetDefinition::Plugin *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fastjet__JetDefinition__Recombiner = {"_p_fastjet__JetDefinition__Recombiner", "fastjet::JetDefinition::Recombiner *", 0, 0, (void*)0, 0};
@@ -58489,7 +58897,7 @@ static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_PyObject = {"_p_p_PyObject", "PyObject **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_fastjet__PseudoJet = {"_p_p_fastjet__PseudoJet", "fastjet::PseudoJet **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__allocatorT_fastjet__PseudoJet_t = {"_p_std__allocatorT_fastjet__PseudoJet_t", "std::allocator< fastjet::PseudoJet > *|std::vector< fastjet::PseudoJet >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__allocatorT_fastjet__PseudoJet_t = {"_p_std__allocatorT_fastjet__PseudoJet_t", "std::vector< fastjet::PseudoJet >::allocator_type *|std::allocator< fastjet::PseudoJet > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__invalid_argument = {"_p_std__invalid_argument", "std::invalid_argument *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__ostream = {"_p_std__ostream", "std::ostream *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__valarrayT_double_t = {"_p_std__valarrayT_double_t", "std::valarray< double > *", 0, 0, (void*)0, 0};
@@ -58606,7 +59014,7 @@ static swig_cast_info _swigc__p_double[] = {  {&_swigt__p_double, 0, 0, 0},{0, 0
 static swig_cast_info _swigc__p_fastjet__AreaDefinition[] = {  {&_swigt__p_fastjet__AreaDefinition, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__BackgroundEstimate[] = {  {&_swigt__p_fastjet__BackgroundEstimate, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__BackgroundEstimate__Extras[] = {  {&_swigt__p_fastjet__BackgroundEstimate__Extras, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__BackgroundEstimatorBase[] = {  {&_swigt__p_fastjet__JetMedianBackgroundEstimator, _p_fastjet__JetMedianBackgroundEstimatorTo_p_fastjet__BackgroundEstimatorBase, 0, 0},  {&_swigt__p_fastjet__GridMedianBackgroundEstimator, _p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__BackgroundEstimatorBase, 0, 0},  {&_swigt__p_fastjet__BackgroundEstimatorBase, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__BackgroundEstimatorBase[] = {  {&_swigt__p_fastjet__BackgroundEstimatorBase, 0, 0, 0},  {&_swigt__p_fastjet__GridMedianBackgroundEstimator, _p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__BackgroundEstimatorBase, 0, 0},  {&_swigt__p_fastjet__JetMedianBackgroundEstimator, _p_fastjet__JetMedianBackgroundEstimatorTo_p_fastjet__BackgroundEstimatorBase, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__BackgroundJetPtDensity[] = {  {&_swigt__p_fastjet__BackgroundJetPtDensity, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__BackgroundJetPtMDensity[] = {  {&_swigt__p_fastjet__BackgroundJetPtMDensity, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__BackgroundJetScalarPtDensity[] = {  {&_swigt__p_fastjet__BackgroundJetScalarPtDensity, 0, 0, 0},{0, 0, 0, 0}};
@@ -58616,22 +59024,22 @@ static swig_cast_info _swigc__p_fastjet__BasicRandomT_int_t[] = {  {&_swigt__p_f
 static swig_cast_info _swigc__p_fastjet__Boost[] = {  {&_swigt__p_fastjet__Boost, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__CASubJetTagger[] = {  {&_swigt__p_fastjet__CASubJetTagger, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__CASubJetTaggerStructure[] = {  {&_swigt__p_fastjet__CASubJetTaggerStructure, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__ClusterSequence[] = {  {&_swigt__p_fastjet__ClusterSequenceArea, _p_fastjet__ClusterSequenceAreaTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, _p_fastjet__ClusterSequenceActiveAreaExplicitGhostsTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceAreaBase, _p_fastjet__ClusterSequenceAreaBaseTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceActiveArea, _p_fastjet__ClusterSequenceActiveAreaTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequence1GhostPassiveArea, _p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequencePassiveArea, _p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequence, 0, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceVoronoiArea, _p_fastjet__ClusterSequenceVoronoiAreaTo_p_fastjet__ClusterSequence, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__ClusterSequence[] = {  {&_swigt__p_fastjet__ClusterSequence, 0, 0, 0},  {&_swigt__p_fastjet__ClusterSequence1GhostPassiveArea, _p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceActiveArea, _p_fastjet__ClusterSequenceActiveAreaTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, _p_fastjet__ClusterSequenceActiveAreaExplicitGhostsTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceArea, _p_fastjet__ClusterSequenceAreaTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceAreaBase, _p_fastjet__ClusterSequenceAreaBaseTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequencePassiveArea, _p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequence, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceVoronoiArea, _p_fastjet__ClusterSequenceVoronoiAreaTo_p_fastjet__ClusterSequence, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__ClusterSequence1GhostPassiveArea[] = {  {&_swigt__p_fastjet__ClusterSequence1GhostPassiveArea, 0, 0, 0},  {&_swigt__p_fastjet__ClusterSequencePassiveArea, _p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequence1GhostPassiveArea, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__ClusterSequenceActiveArea[] = {  {&_swigt__p_fastjet__ClusterSequenceActiveArea, 0, 0, 0},  {&_swigt__p_fastjet__ClusterSequence1GhostPassiveArea, _p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSequenceActiveArea, 0, 0},  {&_swigt__p_fastjet__ClusterSequencePassiveArea, _p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequenceActiveArea, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__ClusterSequenceActiveAreaExplicitGhosts[] = {  {&_swigt__p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__ClusterSequenceArea[] = {  {&_swigt__p_fastjet__ClusterSequenceArea, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__ClusterSequenceAreaBase[] = {  {&_swigt__p_fastjet__ClusterSequenceArea, _p_fastjet__ClusterSequenceAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, _p_fastjet__ClusterSequenceActiveAreaExplicitGhostsTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceAreaBase, 0, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceActiveArea, _p_fastjet__ClusterSequenceActiveAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequence1GhostPassiveArea, _p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequencePassiveArea, _p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceVoronoiArea, _p_fastjet__ClusterSequenceVoronoiAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__ClusterSequenceAreaBase[] = {  {&_swigt__p_fastjet__ClusterSequenceAreaBase, 0, 0, 0},  {&_swigt__p_fastjet__ClusterSequence1GhostPassiveArea, _p_fastjet__ClusterSequence1GhostPassiveAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceActiveArea, _p_fastjet__ClusterSequenceActiveAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, _p_fastjet__ClusterSequenceActiveAreaExplicitGhostsTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceArea, _p_fastjet__ClusterSequenceAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequencePassiveArea, _p_fastjet__ClusterSequencePassiveAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceVoronoiArea, _p_fastjet__ClusterSequenceVoronoiAreaTo_p_fastjet__ClusterSequenceAreaBase, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__ClusterSequencePassiveArea[] = {  {&_swigt__p_fastjet__ClusterSequencePassiveArea, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__ClusterSequenceStructure[] = {  {&_swigt__p_fastjet__ClusterSequenceStructure, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__ClusterSequenceVoronoiArea[] = {  {&_swigt__p_fastjet__ClusterSequenceVoronoiArea, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__ClusterSequence__Extras[] = {  {&_swigt__p_fastjet__ClusterSequence__Extras, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__CompositeJetStructure[] = {  {&_swigt__p_fastjet__CompositeJetStructure, 0, 0, 0},  {&_swigt__p_fastjet__FilterStructure, _p_fastjet__FilterStructureTo_p_fastjet__CompositeJetStructure, 0, 0},  {&_swigt__p_fastjet__RestFrameNSubjettinessTaggerStructure, _p_fastjet__RestFrameNSubjettinessTaggerStructureTo_p_fastjet__CompositeJetStructure, 0, 0},  {&_swigt__p_fastjet__JHTopTaggerStructure, _p_fastjet__JHTopTaggerStructureTo_p_fastjet__CompositeJetStructure, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__Error[] = {  {&_swigt__p_fastjet__InternalError, _p_fastjet__InternalErrorTo_p_fastjet__Error, 0, 0},  {&_swigt__p_fastjet__Error, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__CompositeJetStructure[] = {  {&_swigt__p_fastjet__CompositeJetStructure, 0, 0, 0},  {&_swigt__p_fastjet__FilterStructure, _p_fastjet__FilterStructureTo_p_fastjet__CompositeJetStructure, 0, 0},  {&_swigt__p_fastjet__JHTopTaggerStructure, _p_fastjet__JHTopTaggerStructureTo_p_fastjet__CompositeJetStructure, 0, 0},  {&_swigt__p_fastjet__RestFrameNSubjettinessTaggerStructure, _p_fastjet__RestFrameNSubjettinessTaggerStructureTo_p_fastjet__CompositeJetStructure, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__Error[] = {  {&_swigt__p_fastjet__Error, 0, 0, 0},  {&_swigt__p_fastjet__InternalError, _p_fastjet__InternalErrorTo_p_fastjet__Error, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__Filter[] = {  {&_swigt__p_fastjet__Filter, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__FilterStructure[] = {  {&_swigt__p_fastjet__FilterStructure, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__FunctionOfPseudoJetT_double_t[] = {  {&_swigt__p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0, 0},  {&_swigt__p_fastjet__BackgroundJetPtDensity, _p_fastjet__BackgroundJetPtDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0},  {&_swigt__p_fastjet__BackgroundJetScalarPtDensity, _p_fastjet__BackgroundJetScalarPtDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0},  {&_swigt__p_fastjet__BackgroundJetPtMDensity, _p_fastjet__BackgroundJetPtMDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0},  {&_swigt__p_fastjet__BackgroundRescalingYPolynomial, _p_fastjet__BackgroundRescalingYPolynomialTo_p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t[] = {  {&_swigt__p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0, 0},  {&_swigt__p_fastjet__Pruner, _p_fastjet__PrunerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Boost, _p_fastjet__BoostTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__CASubJetTagger, _p_fastjet__CASubJetTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__MassDropTagger, _p_fastjet__MassDropTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__JHTopTagger, _p_fastjet__JHTopTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Filter, _p_fastjet__FilterTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__RestFrameNSubjettinessTagger, _p_fastjet__RestFrameNSubjettinessTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Transformer, _p_fastjet__TransformerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Subtractor, _p_fastjet__SubtractorTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__TopTaggerBase, _p_fastjet__TopTaggerBaseTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Unboost, _p_fastjet__UnboostTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Recluster, _p_fastjet__ReclusterTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__FunctionOfPseudoJetT_double_t[] = {  {&_swigt__p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0, 0},  {&_swigt__p_fastjet__BackgroundJetPtDensity, _p_fastjet__BackgroundJetPtDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0},  {&_swigt__p_fastjet__BackgroundJetPtMDensity, _p_fastjet__BackgroundJetPtMDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0},  {&_swigt__p_fastjet__BackgroundJetScalarPtDensity, _p_fastjet__BackgroundJetScalarPtDensityTo_p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0},  {&_swigt__p_fastjet__BackgroundRescalingYPolynomial, _p_fastjet__BackgroundRescalingYPolynomialTo_p_fastjet__FunctionOfPseudoJetT_double_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t[] = {  {&_swigt__p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0, 0},  {&_swigt__p_fastjet__Boost, _p_fastjet__BoostTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__CASubJetTagger, _p_fastjet__CASubJetTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Filter, _p_fastjet__FilterTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__JHTopTagger, _p_fastjet__JHTopTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__MassDropTagger, _p_fastjet__MassDropTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Pruner, _p_fastjet__PrunerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Recluster, _p_fastjet__ReclusterTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__RestFrameNSubjettinessTagger, _p_fastjet__RestFrameNSubjettinessTaggerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Subtractor, _p_fastjet__SubtractorTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__TopTaggerBase, _p_fastjet__TopTaggerBaseTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Transformer, _p_fastjet__TransformerTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},  {&_swigt__p_fastjet__Unboost, _p_fastjet__UnboostTo_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__GhostedAreaSpec[] = {  {&_swigt__p_fastjet__GhostedAreaSpec, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__GridMedianBackgroundEstimator[] = {  {&_swigt__p_fastjet__GridMedianBackgroundEstimator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__IndexedSortHelper[] = {  {&_swigt__p_fastjet__IndexedSortHelper, 0, 0, 0},{0, 0, 0, 0}};
@@ -58651,8 +59059,8 @@ static swig_cast_info _swigc__p_fastjet__PrunerStructure[] = {  {&_swigt__p_fast
 static swig_cast_info _swigc__p_fastjet__PruningPlugin[] = {  {&_swigt__p_fastjet__PruningPlugin, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__PruningRecombiner[] = {  {&_swigt__p_fastjet__PruningRecombiner, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__PseudoJet[] = {  {&_swigt__p_fastjet__PseudoJet, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__PseudoJetStructureBase[] = {  {&_swigt__p_fastjet__PseudoJetStructureBase, 0, 0, 0},  {&_swigt__p_fastjet__CompositeJetStructure, _p_fastjet__CompositeJetStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},  {&_swigt__p_fastjet__FilterStructure, _p_fastjet__FilterStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},  {&_swigt__p_fastjet__RestFrameNSubjettinessTaggerStructure, _p_fastjet__RestFrameNSubjettinessTaggerStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},  {&_swigt__p_fastjet__JHTopTaggerStructure, _p_fastjet__JHTopTaggerStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceStructure, _p_fastjet__ClusterSequenceStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__PseudoJet__UserInfoBase[] = {  {&_swigt__p_fastjet__UserInfoPython, _p_fastjet__UserInfoPythonTo_p_fastjet__PseudoJet__UserInfoBase, 0, 0},  {&_swigt__p_fastjet__PseudoJet__UserInfoBase, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__PseudoJetStructureBase[] = {  {&_swigt__p_fastjet__PseudoJetStructureBase, 0, 0, 0},  {&_swigt__p_fastjet__ClusterSequenceStructure, _p_fastjet__ClusterSequenceStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},  {&_swigt__p_fastjet__CompositeJetStructure, _p_fastjet__CompositeJetStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},  {&_swigt__p_fastjet__FilterStructure, _p_fastjet__FilterStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},  {&_swigt__p_fastjet__JHTopTaggerStructure, _p_fastjet__JHTopTaggerStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},  {&_swigt__p_fastjet__RestFrameNSubjettinessTaggerStructure, _p_fastjet__RestFrameNSubjettinessTaggerStructureTo_p_fastjet__PseudoJetStructureBase, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__PseudoJet__UserInfoBase[] = {  {&_swigt__p_fastjet__PseudoJet__UserInfoBase, 0, 0, 0},  {&_swigt__p_fastjet__UserInfoPython, _p_fastjet__UserInfoPythonTo_p_fastjet__PseudoJet__UserInfoBase, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__RangeDefinition[] = {  {&_swigt__p_fastjet__RangeDefinition, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__Recluster[] = {  {&_swigt__p_fastjet__Recluster, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__RecombinerPython[] = {  {&_swigt__p_fastjet__RecombinerPython, 0, 0, 0},{0, 0, 0, 0}};
@@ -58660,17 +59068,17 @@ static swig_cast_info _swigc__p_fastjet__RectangularGrid[] = {  {&_swigt__p_fast
 static swig_cast_info _swigc__p_fastjet__RestFrameNSubjettinessTagger[] = {  {&_swigt__p_fastjet__RestFrameNSubjettinessTagger, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__RestFrameNSubjettinessTaggerStructure[] = {  {&_swigt__p_fastjet__RestFrameNSubjettinessTaggerStructure, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__Selector[] = {  {&_swigt__p_fastjet__Selector, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__SelectorWorker[] = {  {&_swigt__p_fastjet__SelectorWorkerPython, _p_fastjet__SelectorWorkerPythonTo_p_fastjet__SelectorWorker, 0, 0},  {&_swigt__p_fastjet__SelectorWorker, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__SelectorWorker[] = {  {&_swigt__p_fastjet__SelectorWorker, 0, 0, 0},  {&_swigt__p_fastjet__SelectorWorkerPython, _p_fastjet__SelectorWorkerPythonTo_p_fastjet__SelectorWorker, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__SelectorWorkerPython[] = {  {&_swigt__p_fastjet__SelectorWorkerPython, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__SharedPtrT_fastjet__BasicRandomT_double_t_t[] = {  {&_swigt__p_fastjet__SharedPtrT_fastjet__BasicRandomT_double_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t[] = {  {&_swigt__p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t[] = {  {&_swigt__p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__SharedPtrT_fastjet__SelectorWorker_t[] = {  {&_swigt__p_fastjet__SharedPtrT_fastjet__SelectorWorker_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__Subtractor[] = {  {&_swigt__p_fastjet__Subtractor, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__TilingBase[] = {  {&_swigt__p_fastjet__TilingBase, 0, 0, 0},  {&_swigt__p_fastjet__RectangularGrid, _p_fastjet__RectangularGridTo_p_fastjet__TilingBase, 0, 0},  {&_swigt__p_fastjet__GridMedianBackgroundEstimator, _p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__TilingBase, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__TopTaggerBase[] = {  {&_swigt__p_fastjet__JHTopTagger, _p_fastjet__JHTopTaggerTo_p_fastjet__TopTaggerBase, 0, 0},  {&_swigt__p_fastjet__TopTaggerBase, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__TilingBase[] = {  {&_swigt__p_fastjet__TilingBase, 0, 0, 0},  {&_swigt__p_fastjet__GridMedianBackgroundEstimator, _p_fastjet__GridMedianBackgroundEstimatorTo_p_fastjet__TilingBase, 0, 0},  {&_swigt__p_fastjet__RectangularGrid, _p_fastjet__RectangularGridTo_p_fastjet__TilingBase, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__TopTaggerBase[] = {  {&_swigt__p_fastjet__TopTaggerBase, 0, 0, 0},  {&_swigt__p_fastjet__JHTopTagger, _p_fastjet__JHTopTaggerTo_p_fastjet__TopTaggerBase, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__TopTaggerBaseStructure[] = {  {&_swigt__p_fastjet__TopTaggerBaseStructure, 0, 0, 0},  {&_swigt__p_fastjet__JHTopTaggerStructure, _p_fastjet__JHTopTaggerStructureTo_p_fastjet__TopTaggerBaseStructure, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_fastjet__Transformer[] = {  {&_swigt__p_fastjet__Pruner, _p_fastjet__PrunerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__CASubJetTagger, _p_fastjet__CASubJetTaggerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__MassDropTagger, _p_fastjet__MassDropTaggerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__JHTopTagger, _p_fastjet__JHTopTaggerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__Filter, _p_fastjet__FilterTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__RestFrameNSubjettinessTagger, _p_fastjet__RestFrameNSubjettinessTaggerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__Transformer, 0, 0, 0},  {&_swigt__p_fastjet__Subtractor, _p_fastjet__SubtractorTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__TopTaggerBase, _p_fastjet__TopTaggerBaseTo_p_fastjet__Transformer, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fastjet__Transformer[] = {  {&_swigt__p_fastjet__Transformer, 0, 0, 0},  {&_swigt__p_fastjet__CASubJetTagger, _p_fastjet__CASubJetTaggerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__Filter, _p_fastjet__FilterTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__JHTopTagger, _p_fastjet__JHTopTaggerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__MassDropTagger, _p_fastjet__MassDropTaggerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__Pruner, _p_fastjet__PrunerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__RestFrameNSubjettinessTagger, _p_fastjet__RestFrameNSubjettinessTaggerTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__Subtractor, _p_fastjet__SubtractorTo_p_fastjet__Transformer, 0, 0},  {&_swigt__p_fastjet__TopTaggerBase, _p_fastjet__TopTaggerBaseTo_p_fastjet__Transformer, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__Unboost[] = {  {&_swigt__p_fastjet__Unboost, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__UserInfoPython[] = {  {&_swigt__p_fastjet__UserInfoPython, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fastjet__VoronoiAreaSpec[] = {  {&_swigt__p_fastjet__VoronoiAreaSpec, 0, 0, 0},{0, 0, 0, 0}};
@@ -58849,9 +59257,12 @@ extern "C" {
 #define SWIGRUNTIME_DEBUG
 #endif
 
+#ifndef SWIG_INIT_CLIENT_DATA_TYPE
+#define SWIG_INIT_CLIENT_DATA_TYPE void *
+#endif
 
 SWIGRUNTIME void
-SWIG_InitializeModule(void *clientdata) {
+SWIG_InitializeModule(SWIG_INIT_CLIENT_DATA_TYPE clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
   int init;
@@ -59034,220 +59445,6 @@ SWIG_PropagateClientData(void) {
 extern "C" {
 #endif
   
-  /* Python-specific SWIG API */
-#define SWIG_newvarlink()                             SWIG_Python_newvarlink()
-#define SWIG_addvarlink(p, name, get_attr, set_attr)  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
-#define SWIG_InstallConstants(d, constants)           SWIG_Python_InstallConstants(d, constants)
-  
-  /* -----------------------------------------------------------------------------
-   * global variable support code.
-   * ----------------------------------------------------------------------------- */
-  
-  typedef struct swig_globalvar {
-    char       *name;                  /* Name of global variable */
-    PyObject *(*get_attr)(void);       /* Return the current value */
-    int       (*set_attr)(PyObject *); /* Set the value */
-    struct swig_globalvar *next;
-  } swig_globalvar;
-  
-  typedef struct swig_varlinkobject {
-    PyObject_HEAD
-    swig_globalvar *vars;
-  } swig_varlinkobject;
-  
-  SWIGINTERN PyObject *
-  swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
-#if PY_VERSION_HEX >= 0x03000000
-    return PyUnicode_InternFromString("<Swig global variables>");
-#else
-    return PyString_FromString("<Swig global variables>");
-#endif
-  }
-  
-  SWIGINTERN PyObject *
-  swig_varlink_str(swig_varlinkobject *v) {
-#if PY_VERSION_HEX >= 0x03000000
-    PyObject *str = PyUnicode_InternFromString("(");
-    PyObject *tail;
-    PyObject *joined;
-    swig_globalvar *var;
-    for (var = v->vars; var; var=var->next) {
-      tail = PyUnicode_FromString(var->name);
-      joined = PyUnicode_Concat(str, tail);
-      Py_DecRef(str);
-      Py_DecRef(tail);
-      str = joined;
-      if (var->next) {
-        tail = PyUnicode_InternFromString(", ");
-        joined = PyUnicode_Concat(str, tail);
-        Py_DecRef(str);
-        Py_DecRef(tail);
-        str = joined;
-      }
-    }
-    tail = PyUnicode_InternFromString(")");
-    joined = PyUnicode_Concat(str, tail);
-    Py_DecRef(str);
-    Py_DecRef(tail);
-    str = joined;
-#else
-    PyObject *str = PyString_FromString("(");
-    swig_globalvar *var;
-    for (var = v->vars; var; var=var->next) {
-      PyString_ConcatAndDel(&str,PyString_FromString(var->name));
-      if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
-    }
-    PyString_ConcatAndDel(&str,PyString_FromString(")"));
-#endif
-    return str;
-  }
-  
-  SWIGINTERN void
-  swig_varlink_dealloc(swig_varlinkobject *v) {
-    swig_globalvar *var = v->vars;
-    while (var) {
-      swig_globalvar *n = var->next;
-      free(var->name);
-      free(var);
-      var = n;
-    }
-  }
-  
-  SWIGINTERN PyObject *
-  swig_varlink_getattr(swig_varlinkobject *v, char *n) {
-    PyObject *res = NULL;
-    swig_globalvar *var = v->vars;
-    while (var) {
-      if (strcmp(var->name,n) == 0) {
-        res = (*var->get_attr)();
-        break;
-      }
-      var = var->next;
-    }
-    if (res == NULL && !PyErr_Occurred()) {
-      PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
-    }
-    return res;
-  }
-  
-  SWIGINTERN int
-  swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
-    int res = 1;
-    swig_globalvar *var = v->vars;
-    while (var) {
-      if (strcmp(var->name,n) == 0) {
-        res = (*var->set_attr)(p);
-        break;
-      }
-      var = var->next;
-    }
-    if (res == 1 && !PyErr_Occurred()) {
-      PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
-    }
-    return res;
-  }
-  
-  SWIGINTERN PyTypeObject*
-  swig_varlink_type(void) {
-    static char varlink__doc__[] = "Swig var link object";
-    static PyTypeObject varlink_type;
-    static int type_init = 0;
-    if (!type_init) {
-      const PyTypeObject tmp = {
-#if PY_VERSION_HEX >= 0x03000000
-        PyVarObject_HEAD_INIT(NULL, 0)
-#else
-        PyObject_HEAD_INIT(NULL)
-        0,                                  /* ob_size */
-#endif
-        "swigvarlink",                      /* tp_name */
-        sizeof(swig_varlinkobject),         /* tp_basicsize */
-        0,                                  /* tp_itemsize */
-        (destructor) swig_varlink_dealloc,  /* tp_dealloc */
-        0,                                  /* tp_print */
-        (getattrfunc) swig_varlink_getattr, /* tp_getattr */
-        (setattrfunc) swig_varlink_setattr, /* tp_setattr */
-        0,                                  /* tp_compare */
-        (reprfunc) swig_varlink_repr,       /* tp_repr */
-        0,                                  /* tp_as_number */
-        0,                                  /* tp_as_sequence */
-        0,                                  /* tp_as_mapping */
-        0,                                  /* tp_hash */
-        0,                                  /* tp_call */
-        (reprfunc) swig_varlink_str,        /* tp_str */
-        0,                                  /* tp_getattro */
-        0,                                  /* tp_setattro */
-        0,                                  /* tp_as_buffer */
-        0,                                  /* tp_flags */
-        varlink__doc__,                     /* tp_doc */
-        0,                                  /* tp_traverse */
-        0,                                  /* tp_clear */
-        0,                                  /* tp_richcompare */
-        0,                                  /* tp_weaklistoffset */
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
-        0,                                  /* tp_del */
-        0,                                  /* tp_version_tag */
-#if PY_VERSION_HEX >= 0x03040000
-        0,                                  /* tp_finalize */
-#endif
-#if PY_VERSION_HEX >= 0x03080000
-        0,                                  /* tp_vectorcall */
-#endif
-#if (PY_VERSION_HEX >= 0x03080000) && (PY_VERSION_HEX < 0x03090000)
-        0,                                  /* tp_print */
-#endif
-#ifdef COUNT_ALLOCS
-        0,                                  /* tp_allocs */
-        0,                                  /* tp_frees */
-        0,                                  /* tp_maxalloc */
-        0,                                  /* tp_prev */
-        0                                   /* tp_next */
-#endif
-      };
-      varlink_type = tmp;
-      type_init = 1;
-      if (PyType_Ready(&varlink_type) < 0)
-      return NULL;
-    }
-    return &varlink_type;
-  }
-  
-  /* Create a variable linking object for use later */
-  SWIGINTERN PyObject *
-  SWIG_Python_newvarlink(void) {
-    swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
-    if (result) {
-      result->vars = 0;
-    }
-    return ((PyObject*) result);
-  }
-  
-  SWIGINTERN void 
-  SWIG_Python_addvarlink(PyObject *p, const char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
-    swig_varlinkobject *v = (swig_varlinkobject *) p;
-    swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
-    if (gv) {
-      size_t size = strlen(name)+1;
-      gv->name = (char *)malloc(size);
-      if (gv->name) {
-        memcpy(gv->name, name, size);
-        gv->get_attr = get_attr;
-        gv->set_attr = set_attr;
-        gv->next = v->vars;
-      }
-    }
-    v->vars = gv;
-  }
-  
-  SWIGINTERN PyObject *
-  SWIG_globals(void) {
-    static PyObject *globals = 0;
-    if (!globals) {
-      globals = SWIG_newvarlink();
-    }
-    return globals;
-  }
-  
   /* -----------------------------------------------------------------------------
    * constants/methods manipulation
    * ----------------------------------------------------------------------------- */
@@ -59276,15 +59473,12 @@ extern "C" {
     }
   }
   
-  /* -----------------------------------------------------------------------------*/
-  /* Fix SwigMethods to carry the callback ptrs when needed */
-  /* -----------------------------------------------------------------------------*/
+  /* -----------------------------------------------------------------------------
+   * Patch %callback methods' docstrings to hold the callback ptrs
+   * -----------------------------------------------------------------------------*/
   
   SWIGINTERN void
-  SWIG_Python_FixMethods(PyMethodDef *methods,
-    swig_const_info *const_table,
-    swig_type_info **types,
-    swig_type_info **types_initial) {
+  SWIG_Python_FixMethods(PyMethodDef *methods, const swig_const_info *const_table, swig_type_info **types, swig_type_info **types_initial) {
     size_t i;
     for (i = 0; methods[i].ml_name; ++i) {
       const char *c = methods[i].ml_doc;
@@ -59292,7 +59486,7 @@ extern "C" {
       c = strstr(c, "swig_ptr: ");
       if (c) {
         int j;
-        swig_const_info *ci = 0;
+        const swig_const_info *ci = 0;
         const char *name = c + 10;
         for (j = 0; const_table[j].type; ++j) {
           if (strncmp(const_table[j].name, name, 
@@ -59324,68 +59518,13 @@ extern "C" {
     }
   } 
   
-  /* -----------------------------------------------------------------------------
-   * Method creation and docstring support functions
-   * ----------------------------------------------------------------------------- */
-  
-  /* -----------------------------------------------------------------------------
-   * Function to find the method definition with the correct docstring for the
-   * proxy module as opposed to the low-level API
-   * ----------------------------------------------------------------------------- */
-  
-  SWIGINTERN PyMethodDef *SWIG_PythonGetProxyDoc(const char *name) {
-    /* Find the function in the modified method table */
-    size_t offset = 0;
-    int found = 0;
-    while (SwigMethods_proxydocs[offset].ml_meth != NULL) {
-      if (strcmp(SwigMethods_proxydocs[offset].ml_name, name) == 0) {
-        found = 1;
-        break;
-      }
-      offset++;
-    }
-    /* Use the copy with the modified docstring if available */
-    return found ? &SwigMethods_proxydocs[offset] : NULL;
-  }
-  
-  /* -----------------------------------------------------------------------------
-   * Wrapper of PyInstanceMethod_New() used in Python 3
-   * It is exported to the generated module, used for -fastproxy
-   * ----------------------------------------------------------------------------- */
-  
-  SWIGINTERN PyObject *SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func) {
-    if (PyCFunction_Check(func)) {
-      PyCFunctionObject *funcobj = (PyCFunctionObject *)func;
-      PyMethodDef *ml = SWIG_PythonGetProxyDoc(funcobj->m_ml->ml_name);
-      if (ml)
-      func = PyCFunction_NewEx(ml, funcobj->m_self, funcobj->m_module);
-    }
-#if PY_VERSION_HEX >= 0x03000000
-    return PyInstanceMethod_New(func);
-#else
-    return PyMethod_New(func, NULL, NULL);
-#endif
-  }
-  
-  /* -----------------------------------------------------------------------------
-   * Wrapper of PyStaticMethod_New()
-   * It is exported to the generated module, used for -fastproxy
-   * ----------------------------------------------------------------------------- */
-  
-  SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func) {
-    if (PyCFunction_Check(func)) {
-      PyCFunctionObject *funcobj = (PyCFunctionObject *)func;
-      PyMethodDef *ml = SWIG_PythonGetProxyDoc(funcobj->m_ml->ml_name);
-      if (ml)
-      func = PyCFunction_NewEx(ml, funcobj->m_self, funcobj->m_module);
-    }
-    return PyStaticMethod_New(func);
-  }
-  
 #ifdef __cplusplus
 }
 #endif
 
+
+
+
 /* -----------------------------------------------------------------------------*
  *  Partial Init method
  * -----------------------------------------------------------------------------*/
@@ -59544,7 +59683,6 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "FASTJET_HAVE_EXECINFO_H",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "FASTJET_HAVE_INTTYPES_H",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "FASTJET_HAVE_LIBM",SWIG_From_int(static_cast< int >(1)));
-  SWIG_Python_SetConstant(d, "FASTJET_HAVE_MEMORY_H",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "FASTJET_HAVE_STDINT_H",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "FASTJET_HAVE_STDLIB_H",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "FASTJET_HAVE_STRINGS_H",SWIG_From_int(static_cast< int >(1)));
@@ -59556,16 +59694,16 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "FASTJET_PACKAGE",SWIG_FromCharPtr("fastjet"));
   SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_BUGREPORT",SWIG_FromCharPtr(""));
   SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_NAME",SWIG_FromCharPtr("FastJet"));
-  SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_STRING",SWIG_FromCharPtr("FastJet 3.4.0"));
+  SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_STRING",SWIG_FromCharPtr("FastJet 3.4.1"));
   SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_TARNAME",SWIG_FromCharPtr("fastjet"));
   SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_URL",SWIG_FromCharPtr(""));
-  SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_VERSION",SWIG_FromCharPtr("3.4.0"));
+  SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_VERSION",SWIG_FromCharPtr("3.4.1"));
   SWIG_Python_SetConstant(d, "FASTJET_STDC_HEADERS",SWIG_From_int(static_cast< int >(1)));
-  SWIG_Python_SetConstant(d, "FASTJET_VERSION",SWIG_FromCharPtr("3.4.0"));
+  SWIG_Python_SetConstant(d, "FASTJET_VERSION",SWIG_FromCharPtr("3.4.1"));
   SWIG_Python_SetConstant(d, "FASTJET_VERSION_MAJOR",SWIG_From_int(static_cast< int >(3)));
   SWIG_Python_SetConstant(d, "FASTJET_VERSION_MINOR",SWIG_From_int(static_cast< int >(4)));
-  SWIG_Python_SetConstant(d, "FASTJET_VERSION_NUMBER",SWIG_From_int(static_cast< int >(30400)));
-  SWIG_Python_SetConstant(d, "FASTJET_VERSION_PATCHLEVEL",SWIG_From_int(static_cast< int >(0)));
+  SWIG_Python_SetConstant(d, "FASTJET_VERSION_NUMBER",SWIG_From_int(static_cast< int >(30401)));
+  SWIG_Python_SetConstant(d, "FASTJET_VERSION_PATCHLEVEL",SWIG_From_int(static_cast< int >(1)));
   globals = SWIG_globals();
   if (!globals) {
     PyErr_SetString(PyExc_TypeError, "Failure to create SWIG globals.");
@@ -59576,7 +59714,6 @@ SWIG_init(void) {
 #endif
   }
   PyDict_SetItemString(md, "cvar", globals);
-  Py_DECREF(globals);
   SWIG_addvarlink(globals, "pi", Swig_var_pi_get, Swig_var_pi_set);
   SWIG_addvarlink(globals, "twopi", Swig_var_twopi_get, Swig_var_twopi_set);
   SWIG_addvarlink(globals, "pisq", Swig_var_pisq_get, Swig_var_pisq_set);
@@ -59613,6 +59750,7 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "NlnNCam2pi2R",SWIG_From_int(static_cast< int >(fastjet::NlnNCam2pi2R)));
   SWIG_Python_SetConstant(d, "NlnNCam",SWIG_From_int(static_cast< int >(fastjet::NlnNCam)));
   SWIG_Python_SetConstant(d, "BestFJ30",SWIG_From_int(static_cast< int >(fastjet::BestFJ30)));
+  SWIG_Python_SetConstant(d, "N2PlainEEAccurate",SWIG_From_int(static_cast< int >(fastjet::N2PlainEEAccurate)));
   SWIG_Python_SetConstant(d, "plugin_strategy",SWIG_From_int(static_cast< int >(fastjet::plugin_strategy)));
   SWIG_Python_SetConstant(d, "kt_algorithm",SWIG_From_int(static_cast< int >(fastjet::kt_algorithm)));
   SWIG_Python_SetConstant(d, "cambridge_algorithm",SWIG_From_int(static_cast< int >(fastjet::cambridge_algorithm)));
diff --git a/src/AreaDefinition.cc b/src/AreaDefinition.cc
index 5570aeb..f928a7d 100644
--- a/src/AreaDefinition.cc
+++ b/src/AreaDefinition.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/BasicRandom.cc b/src/BasicRandom.cc
index 07df7bf..ef20075 100644
--- a/src/BasicRandom.cc
+++ b/src/BasicRandom.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClosestPair2D.cc b/src/ClosestPair2D.cc
index 78b1843..68dab68 100644
--- a/src/ClosestPair2D.cc
+++ b/src/ClosestPair2D.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequence.cc b/src/ClusterSequence.cc
index 638cf46..1af89ca 100644
--- a/src/ClusterSequence.cc
+++ b/src/ClusterSequence.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -277,8 +277,6 @@ void ClusterSequence::_initialise_and_run_no_decant () {
     return;
   } else if (_jet_algorithm == ee_kt_algorithm ||
 	     _jet_algorithm == ee_genkt_algorithm) {
-    // ignore requested strategy
-    _strategy = N2Plain;
     if (_jet_algorithm == ee_kt_algorithm) {
       // make sure that R is large enough so that "beam" recomb only
       // occurs when a single particle is left
@@ -303,7 +301,14 @@ void ClusterSequence::_initialise_and_run_no_decant () {
       }
       _invR2 = 1.0/_R2;
     }
-    _simple_N2_cluster_EEBriefJet();
+    // choose the appropriate strategy
+    if (_strategy == N2PlainEEAccurate) {
+      _simple_N2_cluster_EEAccurateBriefJet();      
+    } else {
+      // otherwise we revert to the default strategy
+      _strategy = N2Plain;
+      _simple_N2_cluster_EEBriefJet();
+    }
     return;
   } else if (_jet_algorithm == undefined_jet_algorithm) {
     throw Error("A ClusterSequence cannot be created with an uninitialised JetDefinition");
@@ -573,6 +578,8 @@ string ClusterSequence::strategy_string (Strategy strategy_in)  const {
     strategy = "NlnN4pi"; break;
   case N2Plain:
     strategy = "N2Plain"; break;
+  case N2PlainEEAccurate:
+    strategy = "N2PlainEEAccurate"; break;
   case N2Tiled:
     strategy = "N2Tiled"; break;
   case N2MinHeapTiled:
diff --git a/src/ClusterSequence1GhostPassiveArea.cc b/src/ClusterSequence1GhostPassiveArea.cc
index 892383d..6c2cdae 100644
--- a/src/ClusterSequence1GhostPassiveArea.cc
+++ b/src/ClusterSequence1GhostPassiveArea.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequenceActiveArea.cc b/src/ClusterSequenceActiveArea.cc
index 1db0a86..afc3985 100644
--- a/src/ClusterSequenceActiveArea.cc
+++ b/src/ClusterSequenceActiveArea.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequenceActiveAreaExplicitGhosts.cc b/src/ClusterSequenceActiveAreaExplicitGhosts.cc
index fd3299e..1e1ea65 100644
--- a/src/ClusterSequenceActiveAreaExplicitGhosts.cc
+++ b/src/ClusterSequenceActiveAreaExplicitGhosts.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequenceArea.cc b/src/ClusterSequenceArea.cc
index 0ab6adc..44c12f7 100644
--- a/src/ClusterSequenceArea.cc
+++ b/src/ClusterSequenceArea.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2006-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequenceAreaBase.cc b/src/ClusterSequenceAreaBase.cc
index b98a09a..6d6d77d 100644
--- a/src/ClusterSequenceAreaBase.cc
+++ b/src/ClusterSequenceAreaBase.cc
@@ -2,7 +2,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -306,8 +306,9 @@ void ClusterSequenceAreaBase::_get_median_rho_and_sigma(
   // pt_over_areas array, because we'll often be doing subtraction of
   // -1, negating it, etc. All of these operations go crazy with unsigned ints.
   int pt_over_areas_size = pt_over_areas.size();
-  if (n_empty < -pt_over_areas_size/4.0)
+  if (n_empty < -pt_over_areas_size/4.0) {
     _warnings_empty_area.warn("ClusterSequenceAreaBase::get_median_rho_and_sigma(...): the estimated empty area is suspiciously large and negative and may lead to an over-estimation of rho. This may be due to (i) a rare statistical fluctuation or (ii) too small a range used to estimate the background properties.");
+  }
 
   for (int i = 0; i < 2; i++) {
     double nj_median_pos = 
@@ -333,7 +334,7 @@ void ClusterSequenceAreaBase::_get_median_rho_and_sigma(
   median = res[0];
   double error  = res[0] - res[1];
   mean_area = total_area / total_njets;
-  sigma  = error * sqrt(mean_area);
+  sigma  = error * sqrt( max(0.0, mean_area) );
 }
 
 
diff --git a/src/ClusterSequencePassiveArea.cc b/src/ClusterSequencePassiveArea.cc
index 03b11fb..dbdc30a 100644
--- a/src/ClusterSequencePassiveArea.cc
+++ b/src/ClusterSequencePassiveArea.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequenceStructure.cc b/src/ClusterSequenceStructure.cc
index 2552f35..a864a2c 100644
--- a/src/ClusterSequenceStructure.cc
+++ b/src/ClusterSequenceStructure.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequenceVoronoiArea.cc b/src/ClusterSequenceVoronoiArea.cc
index 40596e9..bc885da 100644
--- a/src/ClusterSequenceVoronoiArea.cc
+++ b/src/ClusterSequenceVoronoiArea.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2006-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequence_CP2DChan.cc b/src/ClusterSequence_CP2DChan.cc
index a03334d..4f8373e 100644
--- a/src/ClusterSequence_CP2DChan.cc
+++ b/src/ClusterSequence_CP2DChan.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequence_Delaunay.cc b/src/ClusterSequence_Delaunay.cc
index 292fed7..c09e0af 100644
--- a/src/ClusterSequence_Delaunay.cc
+++ b/src/ClusterSequence_Delaunay.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequence_DumbN3.cc b/src/ClusterSequence_DumbN3.cc
index fc2c16b..190731f 100644
--- a/src/ClusterSequence_DumbN3.cc
+++ b/src/ClusterSequence_DumbN3.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/ClusterSequence_N2.cc b/src/ClusterSequence_N2.cc
index 39d0b6e..9752cc6 100644
--- a/src/ClusterSequence_N2.cc
+++ b/src/ClusterSequence_N2.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -90,8 +90,18 @@ template<> inline void ClusterSequence::_bj_set_jetinfo(
   jetA->NN      = NULL;
 }
 
+// this is declared to ensure that calls with the EEAccurateBriefJet
+// are redirected to the EEBriefJet implementation (otherwise
+// it tries the default pp template)
+template<> inline void ClusterSequence::_bj_set_jetinfo(
+                           EEAccurateBriefJet * const jetA, const int _jets_index) const {
+  _bj_set_jetinfo<EEBriefJet>(jetA, _jets_index);
+}
+
+
 //----------------------------------------------------------------------
-// returns the angular distance between the two jets
+// returns the angular distance between the two jets, defined as
+// 2*(1-cos theta_ab)
 template<> double ClusterSequence::_bj_dist(
                 const EEBriefJet * const jeta, 
                 const EEBriefJet * const jetb) const {
@@ -99,8 +109,62 @@ template<> double ClusterSequence::_bj_dist(
     - jeta->nx*jetb->nx
     - jeta->ny*jetb->ny
     - jeta->nz*jetb->nz;
-  dist *= 2; // distance is _2_*min(Ei^2,Ej^2)*(1-cos theta)
-  return dist;
+
+  return dist*2; // distance is _2_*min(Ei^2,Ej^2)*(1-cos theta)
+}
+
+//----------------------------------------------------------------------
+// returns the angular distance between the two jets, defined as
+// 2*(1-cos theta_ab)
+template<> double ClusterSequence::_bj_dist(
+                const EEAccurateBriefJet * const jeta, 
+                const EEAccurateBriefJet * const jetb) const {
+  double dist = 1.0 
+    - jeta->nx*jetb->nx
+    - jeta->ny*jetb->ny
+    - jeta->nz*jetb->nz;
+
+  // if the distance is smaller than sqrt(epsilon), then switch to
+  // cross-product based evaluation; this is intended to ensure an
+  // absolute accuracy on sqrt(bj_dist), that is somewhere in the region
+  // of max(epsilon, sqrt(epsilon) * dist) rather than epsilon.
+  //
+  // Let's write cos(theta) == cos and sin(theta)==sin; then we have
+  //
+  //    2*(1-cos) = 2*(1-cos^2)/(1+cos) = 2*sin^2/(1+cos);   
+  //
+  // To save a division, we then replace 2/(1+cos) -> 1, which introduces
+  // a relative error of order sin^2(theta), which is sqrt(epsilon) when
+  // dist is itself sqrt(epsilon). For that value of dist, the relative
+  // error on the normal dot-product calculation of dist is itself
+  // sqrt(epsilon). This motivates the choice switchover point.
+  //
+  // This approach has been adopted from PanScales work.
+  if (dist*dist < numeric_limits<double>::epsilon()) {
+    double cross_x = jeta->ny * jetb->nz - jetb->ny * jeta->nz;
+    double cross_y = jeta->nz * jetb->nx - jetb->nz * jeta->nx;
+    double cross_z = jeta->nx * jetb->ny - jetb->nx * jeta->ny;
+    
+    // 2(1-cos(theta)) ~ theta^2, which is |cross_product|^2
+    dist = cross_x*cross_x + cross_y*cross_y + cross_z*cross_z;
+    return dist;
+  }
+
+  // this alternative code has higher accuracy in some boundary regions
+  // but is almost a factor of two slower than the plain dot product
+  // (the code above is only 15% slower on a standard-looking event).  
+  //if (dist < 1) {
+  //  double cross_x = jeta->ny * jetb->nz - jetb->ny * jeta->nz;
+  //  double cross_y = jeta->nz * jetb->nx - jetb->nz * jeta->nx;
+  //  double cross_z = jeta->nx * jetb->ny - jetb->nx * jeta->ny;
+  //  
+  //  // 2(1-cos(theta)) ~ theta^2, which is |cross_product|^2
+  //  double sinsqr = cross_x*cross_x + cross_y*cross_y + cross_z*cross_z;
+  //  return 2*sinsqr/(2.0-dist);
+  //  //return dist;
+  //}
+
+  return dist*2; // distance is _2_*min(Ei^2,Ej^2)*(1-cos theta)
 }
 
 
@@ -117,6 +181,11 @@ void ClusterSequence::_simple_N2_cluster_EEBriefJet() {
   _simple_N2_cluster<EEBriefJet>();
 }
 
+void ClusterSequence::_simple_N2_cluster_EEAccurateBriefJet() {  
+  _simple_N2_cluster<EEAccurateBriefJet>();
+}
+
+
 // //----------------------------------------------------------------------
 // /// Force instantiation of desired versions of _simple_N2_cluster
 // ///
diff --git a/src/ClusterSequence_TiledN2.cc b/src/ClusterSequence_TiledN2.cc
index fd355bc..7b1169e 100644
--- a/src/ClusterSequence_TiledN2.cc
+++ b/src/ClusterSequence_TiledN2.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -345,7 +345,6 @@ void ClusterSequence::_tiled_N2_cluster() {
   }
 
   // now run the recombination loop
-  int history_location = n-1;
   while (tail != head) {
 
     // find the minimum of the diJ on this round
@@ -356,7 +355,6 @@ void ClusterSequence::_tiled_N2_cluster() {
     }
 
     // do the recombination between A and B
-    history_location++;
     jetA = & briefjets[diJ_min_jet];
     jetB = jetA->NN;
     // put the normalisation back in
@@ -377,19 +375,6 @@ void ClusterSequence::_tiled_N2_cluster() {
       int nn; // new jet index
       _do_ij_recombination_step(jetA->_jets_index, jetB->_jets_index, diJ_min, nn);
 
-      //OBS// get the two history indices
-      //OBSint hist_a = _jets[jetA->_jets_index].cluster_hist_index();
-      //OBSint hist_b = _jets[jetB->_jets_index].cluster_hist_index();
-      //OBS// create the recombined jet
-      //OBS_jets.push_back(_jets[jetA->_jets_index] + _jets[jetB->_jets_index]);
-      //OBSint nn = _jets.size() - 1;
-      //OBS_jets[nn].set_cluster_hist_index(history_location);
-      //OBS// update history
-      //OBS//cout <<n-1<<" "<<jetA-head<<" "<<jetB-head<<"; ";
-      //OBS_add_step_to_history(history_location, 
-      //OBS  		   min(hist_a,hist_b),max(hist_a,hist_b),
-      //OBS			   nn, diJ_min);
-
       // what was jetB will now become the new jet
       _bj_remove_from_tiles(jetA);
       oldB = * jetB;  // take a copy because we will need it...
@@ -399,10 +384,6 @@ void ClusterSequence::_tiled_N2_cluster() {
       // jet-beam recombination
       _do_iB_recombination_step(jetA->_jets_index, diJ_min);
 	    
-      //OBS// get the hist_index
-      //OBSint hist_a = _jets[jetA->_jets_index].cluster_hist_index();
-      //OBS//cout <<n-1<<" "<<jetA-head<<" "<<-1<<"; ";
-      //OBS_add_step_to_history(history_location,hist_a,BeamJet,Invalid,diJ_min); 
       _bj_remove_from_tiles(jetA);
     }
 
@@ -598,7 +579,6 @@ void ClusterSequence::_faster_tiled_N2_cluster() {
   }
 
   // now run the recombination loop
-  int history_location = n-1;
   while (n > 0) {
 
     // find the minimum of the diJ on this round
@@ -614,7 +594,6 @@ void ClusterSequence::_faster_tiled_N2_cluster() {
     }
 
     // do the recombination between A and B
-    history_location++;
     jetA = best->jet;
     jetB = jetA->NN;
     // put the normalisation back in
@@ -631,18 +610,6 @@ void ClusterSequence::_faster_tiled_N2_cluster() {
       int nn; // new jet index
       _do_ij_recombination_step(jetA->_jets_index, jetB->_jets_index, diJ_min, nn);
       
-      //OBS// get the two history indices
-      //OBSint ihstry_a = _jets[jetA->_jets_index].cluster_hist_index();
-      //OBSint ihstry_b = _jets[jetB->_jets_index].cluster_hist_index();
-      //OBS// create the recombined jet
-      //OBS_jets.push_back(_jets[jetA->_jets_index] + _jets[jetB->_jets_index]);
-      //OBSint nn = _jets.size() - 1;
-      //OBS_jets[nn].set_cluster_hist_index(history_location);
-      //OBS// update history
-      //OBS//cout <<n-1<<" "<<jetA-head<<" "<<jetB-head<<"; ";
-      //OBS_add_step_to_history(history_location, 
-      //OBS  		   min(ihstry_a,ihstry_b),max(ihstry_a,ihstry_b),
-      //OBS			   nn, diJ_min);
       // what was jetB will now become the new jet
       _bj_remove_from_tiles(jetA);
       oldB = * jetB;  // take a copy because we will need it...
@@ -653,9 +620,6 @@ void ClusterSequence::_faster_tiled_N2_cluster() {
       // jet-beam recombination
       // get the hist_index
       _do_iB_recombination_step(jetA->_jets_index, diJ_min);
-      //OBSint ihstry_a = _jets[jetA->_jets_index].cluster_hist_index();
-      //OBS//cout <<n-1<<" "<<jetA-head<<" "<<-1<<"; ";
-      //OBS_add_step_to_history(history_location,ihstry_a,BeamJet,Invalid,diJ_min); 
       _bj_remove_from_tiles(jetA);
     }
 
@@ -823,14 +787,12 @@ void ClusterSequence::_minheap_faster_tiled_N2_cluster() {
   jets_for_minheap.reserve(n); 
 
   // now run the recombination loop
-  int history_location = n-1;
   while (n > 0) {
 
     double diJ_min = minheap.minval() *_invR2;
     jetA = head + minheap.minloc();
 
     // do the recombination between A and B
-    history_location++;
     jetB = jetA->NN;
 
     if (jetB != NULL) {
diff --git a/src/CompositeJetStructure.cc b/src/CompositeJetStructure.cc
index 143f4aa..d37edd4 100644
--- a/src/CompositeJetStructure.cc
+++ b/src/CompositeJetStructure.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/Dnn2piCylinder.cc b/src/Dnn2piCylinder.cc
index de0ce54..6d92b98 100644
--- a/src/Dnn2piCylinder.cc
+++ b/src/Dnn2piCylinder.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/Dnn3piCylinder.cc b/src/Dnn3piCylinder.cc
index ba7e670..99fe513 100644
--- a/src/Dnn3piCylinder.cc
+++ b/src/Dnn3piCylinder.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/Dnn4piCylinder.cc b/src/Dnn4piCylinder.cc
index 456b196..40d25a3 100644
--- a/src/Dnn4piCylinder.cc
+++ b/src/Dnn4piCylinder.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/DnnPlane.cc b/src/DnnPlane.cc
index 57c635d..263e549 100644
--- a/src/DnnPlane.cc
+++ b/src/DnnPlane.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/Error.cc b/src/Error.cc
index 28de418..10d537a 100644
--- a/src/Error.cc
+++ b/src/Error.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/FunctionOfPseudoJet.cc b/src/FunctionOfPseudoJet.cc
index b35e465..ce4fa98 100644
--- a/src/FunctionOfPseudoJet.cc
+++ b/src/FunctionOfPseudoJet.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/GhostedAreaSpec.cc b/src/GhostedAreaSpec.cc
index 97ac3da..cefca0c 100644
--- a/src/GhostedAreaSpec.cc
+++ b/src/GhostedAreaSpec.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/JetDefinition.cc b/src/JetDefinition.cc
index 99f4ba1..c52c96d 100644
--- a/src/JetDefinition.cc
+++ b/src/JetDefinition.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/LazyTiling25.cc b/src/LazyTiling25.cc
index 5849b7d..2216f73 100644
--- a/src/LazyTiling25.cc
+++ b/src/LazyTiling25.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -625,14 +625,12 @@ void LazyTiling25::run() {
   jets_for_minheap.reserve(n); 
 
   // now run the recombination loop
-  int history_location = n-1;
   while (n > 0) {
 
     double diJ_min = minheap.minval() *_invR2;
     jetA = head + minheap.minloc();
 
     // do the recombination between A and B
-    history_location++;
     jetB = jetA->NN;
 
     if (jetB != NULL) {
diff --git a/src/LazyTiling9.cc b/src/LazyTiling9.cc
index 55a96c4..ffe65f0 100644
--- a/src/LazyTiling9.cc
+++ b/src/LazyTiling9.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -621,14 +621,12 @@ void LazyTiling9::run() {
   jets_for_minheap.reserve(n); 
 
   // now run the recombination loop
-  int history_location = n-1;
   while (n > 0) {
 
     double diJ_min = minheap.minval() *_invR2;
     jetA = head + minheap.minloc();
 
     // do the recombination between A and B
-    history_location++;
     jetB = jetA->NN;
 
     if (jetB != NULL) {
diff --git a/src/LazyTiling9Alt.cc b/src/LazyTiling9Alt.cc
index f6ec4fa..93c6470 100644
--- a/src/LazyTiling9Alt.cc
+++ b/src/LazyTiling9Alt.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -568,14 +568,12 @@ void LazyTiling9Alt::run() {
   jets_for_minheap.reserve(n); 
 
   // now run the recombination loop
-  int history_location = n-1;
   while (n > 0) {
 
     double diJ_min = minheap.minval() *_invR2;
     jetA = head + minheap.minloc();
 
     // do the recombination between A and B
-    history_location++;
     jetB = jetA->NN;
 
     if (jetB != NULL) {
diff --git a/src/LazyTiling9SeparateGhosts.cc b/src/LazyTiling9SeparateGhosts.cc
index a5a1669..23e1468 100644
--- a/src/LazyTiling9SeparateGhosts.cc
+++ b/src/LazyTiling9SeparateGhosts.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/LimitedWarning.cc b/src/LimitedWarning.cc
index 2b83e6a..de3b550 100644
--- a/src/LimitedWarning.cc
+++ b/src/LimitedWarning.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/MinHeap.cc b/src/MinHeap.cc
index be451d4..539d8a2 100644
--- a/src/MinHeap.cc
+++ b/src/MinHeap.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/PseudoJet.cc b/src/PseudoJet.cc
index a920aa2..22600f5 100644
--- a/src/PseudoJet.cc
+++ b/src/PseudoJet.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -73,19 +73,13 @@ PseudoJet & PseudoJet::operator=(const PseudoJet & other_pj){
   _structure = other_pj._structure;
   _user_info = other_pj._user_info;
 
-  _kt2 = other_pj._kt2; 
   _cluster_hist_index = other_pj._cluster_hist_index;
   _user_index = other_pj._user_index;
 
-  _px = other_pj._px;
-  _py = other_pj._py;
-  _pz = other_pj._pz;
-  _E  = other_pj._E;
-
-  _phi = other_pj._phi; 
-  _rap = other_pj._rap;
-
-  _init_status.store(other_pj._init_status);
+  // copy the remaining information through the reset_momentum call
+  // which properly handles the thread safety, notably related
+  // to caching of the phi and rap values
+  reset_momentum(other_pj);
   
   return *this;
 }
@@ -157,24 +151,19 @@ void PseudoJet::_ensure_valid_rap_phi() const{
                                              std::memory_order_seq_cst,
                                              std::memory_order_relaxed)){
       _set_rap_phi();
-      _init_status = Init_Done; // can safely be done after all physics varlables are set
+      // Now we can safely set the status flag to Init_Done (after all
+      // physics variables are set). The memory ordering guarantees
+      // synchronisation across threads.
+      _init_status.store(Init_Done, memory_order_release); 
     } else {
       // wait until done
-      do{
-        // the operation below will reset expected to whatever is in
-        // init_state if the test fails, so we need to reset it to
-        // the 1 (aka init_done) we want!
-        expected = Init_Done;
- 
-        // the next line
-        // - here we could potentially use the weak form
-        // - on success the value is unchanged so I think we can use relaxed ordering
-        // - expected will be reinitialised anyway so again, relaxed ordering should be fi
-
-        //} while (!_init_state.compare_exchange_strong(expected, 1));
-      } while (!_init_status.compare_exchange_weak(expected, Init_Done,
-                                                   std::memory_order_relaxed,
-                                                   std::memory_order_relaxed));
+      //
+      // Here we use memory_order_acquire to guarantee that the
+      // rap/phi values set in the thread which actually does the
+      // calculation are synchronised.
+      // Reading https://gcc.gnu.org/wiki/Atomic/GCCMM/AtomicSync in
+      // interesting in this context.
+      while (_init_status.load(memory_order_acquire) != Init_Done);
     }
     
   }
diff --git a/src/PseudoJetStructureBase.cc b/src/PseudoJetStructureBase.cc
index 71f73ef..f707e34 100644
--- a/src/PseudoJetStructureBase.cc
+++ b/src/PseudoJetStructureBase.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/RangeDefinition.cc b/src/RangeDefinition.cc
index db6621e..a360491 100644
--- a/src/RangeDefinition.cc
+++ b/src/RangeDefinition.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/RectangularGrid.cc b/src/RectangularGrid.cc
index dc8d2c8..14c8aa6 100644
--- a/src/RectangularGrid.cc
+++ b/src/RectangularGrid.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/Selector.cc b/src/Selector.cc
index 09c30a2..d3f8caa 100644
--- a/src/Selector.cc
+++ b/src/Selector.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/TilingExtent.cc b/src/TilingExtent.cc
index fb824b2..521c159 100644
--- a/src/TilingExtent.cc
+++ b/src/TilingExtent.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/src/Voronoi.cc b/src/Voronoi.cc
index 45628a5..a8fb1f4 100644
--- a/src/Voronoi.cc
+++ b/src/Voronoi.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/test-driver b/test-driver
index 9759384..be73b80 100755
--- a/test-driver
+++ b/test-driver
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -105,8 +105,11 @@ trap "st=130; $do_exit" 2
 trap "st=141; $do_exit" 13
 trap "st=143; $do_exit" 15
 
-# Test script is run here.
-"$@" >$log_file 2>&1
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
 estatus=$?
 
 if test $enable_hard_errors = no && test $estatus -eq 99; then
@@ -128,7 +131,7 @@ esac
 # know whether the test passed or failed simply by looking at the '.log'
 # file, without the need of also peaking into the corresponding '.trs'
 # file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
 
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"
diff --git a/tools/BackgroundEstimatorBase.cc b/tools/BackgroundEstimatorBase.cc
index e897582..4708e76 100644
--- a/tools/BackgroundEstimatorBase.cc
+++ b/tools/BackgroundEstimatorBase.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -75,8 +75,9 @@ void BackgroundEstimatorBase::_median_and_stddev(const vector<double> & quantity
   // empty area can sometimes be negative; with small ranges this can
   // become pathological, so warn the user
   int n_jets_used = sorted_quantity_vector.size();
-  if (n_empty_jets < -n_jets_used/4.0)
+  if (n_empty_jets < -n_jets_used/4.0) {
     _warnings_empty_area.warn("BackgroundEstimatorBase::_median_and_stddev(...): the estimated empty area is suspiciously large and negative and may lead to an over-estimation of rho. This may be due to (i) a rare statistical fluctuation or (ii) too small a range used to estimate the background properties.");
+  }
 
   // now get the median & error, accounting for empty jets;
   // define the fractions of distribution at median, median-1sigma
diff --git a/tools/CASubJetTagger.cc b/tools/CASubJetTagger.cc
index 71dc383..2ec0498 100644
--- a/tools/CASubJetTagger.cc
+++ b/tools/CASubJetTagger.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/Filter.cc b/tools/Filter.cc
index a4812c3..f842d94 100644
--- a/tools/Filter.cc
+++ b/tools/Filter.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/GridMedianBackgroundEstimator.cc b/tools/GridMedianBackgroundEstimator.cc
index 7c0b763..4e04a75 100644
--- a/tools/GridMedianBackgroundEstimator.cc
+++ b/tools/GridMedianBackgroundEstimator.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/JHTopTagger.cc b/tools/JHTopTagger.cc
index 5711c49..97e7d64 100644
--- a/tools/JHTopTagger.cc
+++ b/tools/JHTopTagger.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/JetMedianBackgroundEstimator.cc b/tools/JetMedianBackgroundEstimator.cc
index 4646a7d..bcc9d38 100644
--- a/tools/JetMedianBackgroundEstimator.cc
+++ b/tools/JetMedianBackgroundEstimator.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
@@ -289,7 +289,7 @@ BackgroundEstimate JetMedianBackgroundEstimator::estimate(const PseudoJet &jet)
     local_estimate = _compute(jet);
   } else {
     // otherwise, we're in a situation where things can be cached once
-    // and for all and then the cache can be used frely
+    // and for all and then the cache can be used freely
     if (!_cache_available) _compute_and_cache_no_overwrite();
     local_estimate = _cached_estimate;
   }  
@@ -720,7 +720,7 @@ BackgroundEstimate JetMedianBackgroundEstimator::_compute(const PseudoJet &jet)
   
   // process and store the results (_rho was already stored above)
   local_estimate.set_mean_area(total_area / total_njets);
-  local_estimate.set_sigma(stand_dev * sqrt(local_estimate.mean_area()));
+  local_estimate.set_sigma(stand_dev * sqrt( max(0.0, local_estimate.mean_area()) ));
 
   // compute the rho_m part now
   if (do_rho_m){
@@ -728,7 +728,7 @@ BackgroundEstimate JetMedianBackgroundEstimator::_compute(const PseudoJet &jet)
                        rho_tmp, stand_dev, 
 		       _provide_fj2_sigma);
     local_estimate.set_rho_m(rho_tmp);
-    local_estimate.set_sigma_m(stand_dev * sqrt(local_estimate.mean_area()));
+    local_estimate.set_sigma_m(stand_dev * sqrt( max(0.0, local_estimate.mean_area()) ));
   }
 
   return local_estimate;
diff --git a/tools/MassDropTagger.cc b/tools/MassDropTagger.cc
index 718d995..6947d10 100644
--- a/tools/MassDropTagger.cc
+++ b/tools/MassDropTagger.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/Pruner.cc b/tools/Pruner.cc
index cd4b12b..f201d08 100644
--- a/tools/Pruner.cc
+++ b/tools/Pruner.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/RestFrameNSubjettinessTagger.cc b/tools/RestFrameNSubjettinessTagger.cc
index 01f6ab8..c33519a 100644
--- a/tools/RestFrameNSubjettinessTagger.cc
+++ b/tools/RestFrameNSubjettinessTagger.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/Subtractor.cc b/tools/Subtractor.cc
index b981a02..30a3e46 100644
--- a/tools/Subtractor.cc
+++ b/tools/Subtractor.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/TopTaggerBase.cc b/tools/TopTaggerBase.cc
index 1fcea8d..8518079 100644
--- a/tools/TopTaggerBase.cc
+++ b/tools/TopTaggerBase.cc
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/BackgroundEstimatorBase.hh b/tools/fastjet/tools/BackgroundEstimatorBase.hh
index b33cadf..fe26840 100644
--- a/tools/fastjet/tools/BackgroundEstimatorBase.hh
+++ b/tools/fastjet/tools/BackgroundEstimatorBase.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/Boost.hh b/tools/fastjet/tools/Boost.hh
index 5584141..81a213b 100644
--- a/tools/fastjet/tools/Boost.hh
+++ b/tools/fastjet/tools/Boost.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/CASubJetTagger.hh b/tools/fastjet/tools/CASubJetTagger.hh
index e30c620..8f9b8b8 100644
--- a/tools/fastjet/tools/CASubJetTagger.hh
+++ b/tools/fastjet/tools/CASubJetTagger.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/Filter.hh b/tools/fastjet/tools/Filter.hh
index bc7d417..a662b85 100644
--- a/tools/fastjet/tools/Filter.hh
+++ b/tools/fastjet/tools/Filter.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/GridMedianBackgroundEstimator.hh b/tools/fastjet/tools/GridMedianBackgroundEstimator.hh
index 919e2ae..0628394 100644
--- a/tools/fastjet/tools/GridMedianBackgroundEstimator.hh
+++ b/tools/fastjet/tools/GridMedianBackgroundEstimator.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/JHTopTagger.hh b/tools/fastjet/tools/JHTopTagger.hh
index 92e7983..d416fd8 100644
--- a/tools/fastjet/tools/JHTopTagger.hh
+++ b/tools/fastjet/tools/JHTopTagger.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/JetMedianBackgroundEstimator.hh b/tools/fastjet/tools/JetMedianBackgroundEstimator.hh
index 8c56c54..73c03cc 100644
--- a/tools/fastjet/tools/JetMedianBackgroundEstimator.hh
+++ b/tools/fastjet/tools/JetMedianBackgroundEstimator.hh
@@ -5,7 +5,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/MassDropTagger.hh b/tools/fastjet/tools/MassDropTagger.hh
index a56a324..1457f06 100644
--- a/tools/fastjet/tools/MassDropTagger.hh
+++ b/tools/fastjet/tools/MassDropTagger.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/Pruner.hh b/tools/fastjet/tools/Pruner.hh
index ab826bd..ac532a7 100644
--- a/tools/fastjet/tools/Pruner.hh
+++ b/tools/fastjet/tools/Pruner.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/RestFrameNSubjettinessTagger.hh b/tools/fastjet/tools/RestFrameNSubjettinessTagger.hh
index ceca21f..05e0bb6 100644
--- a/tools/fastjet/tools/RestFrameNSubjettinessTagger.hh
+++ b/tools/fastjet/tools/RestFrameNSubjettinessTagger.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/Subtractor.hh b/tools/fastjet/tools/Subtractor.hh
index 106a0b3..0e111c4 100644
--- a/tools/fastjet/tools/Subtractor.hh
+++ b/tools/fastjet/tools/Subtractor.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/TopTaggerBase.hh b/tools/fastjet/tools/TopTaggerBase.hh
index 4257b51..2293c05 100644
--- a/tools/fastjet/tools/TopTaggerBase.hh
+++ b/tools/fastjet/tools/TopTaggerBase.hh
@@ -4,7 +4,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.
diff --git a/tools/fastjet/tools/Transformer.hh b/tools/fastjet/tools/Transformer.hh
index 21b0823..fd2e9c1 100644
--- a/tools/fastjet/tools/Transformer.hh
+++ b/tools/fastjet/tools/Transformer.hh
@@ -1,7 +1,7 @@
 //FJSTARTHEADER
 // $Id$
 //
-// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
+// Copyright (c) 2005-2023, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
 //
 //----------------------------------------------------------------------
 // This file is part of FastJet.

More details

Full run details

Historical runs