Move to fastjet 3.4.0 and fjcontrib to 1.045

fastjet/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.3.4
+PROJECT_NUMBER         = 3.4.0
 
 # 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

fastjet/INSTALL

@@ -2,13 +2,18 @@
 Installation instructions for FastJet
 ------------------------------------- 
 
-FastJet can be configured, built and installed using the standard sequence
+These instructions for installation from an untarred FastJet release
+tarball. For additional steps needed from a git clone, see below.
+
+FastJet can be configured, built and installed using the standard
+sequence
 
 % ./configure [options]
 % make
 % make check   (optional)
 % make install
 
+
 The full list of configuration options can be obtained with ./configure --help. 
 Some useful ones include:
 
@@ -105,31 +110,44 @@ If, instead you want to disable the  option, you can use --enable-foo=no
 or --disable-foo.
 
 
-Note for SVN users -- developers only
+Note for git users
 ------------------
-If you download a subversion copy of FastJet (currently restricted to
-the developers), you first need to generate all configuration files. 
-This is done by using
 
-% autoreconf --install
-% ./configure [configure option]
+If you clone FastJet from the git repository, you first need to set up
+the SISCone submodule 
+
+% git submodule init
+% git submodule update
+
+Then you should generate all configuration files. This is done using
+
+% ./autogen.sh [configure options]
 
 or, alternatively,
 
-% ./autogen.sh [configure option]
+% autoreconf --install
+% cd plugins/SISCone/siscone; autoreconf --install; cd ../../..
+% ./configure [configure options]
 
 Remarks: 
-- a version of libtool >= 1.5 is needed. On Mac OSX the GNU libtool
-  should be installed.
+
+- a version of libtool >= 1.5 is needed. On older version of Mac OSX the
+  GNU libtool should be installed.
 - adding '--force' to the list of autoreconf arguments will overwrite
   the INSTALL file with the default version
 - using the autogen.sh script automatically runs ./configure 
   (with the specified options)
-
+- on some systems, config.h from git (and a corresponding file in the SISCone
+  release) may get overwritten. It is usually safe to restore the
+  original git versions with "git checkout config.h". 
+
 
 ======================================================================
 OLD (NON-AUTOTOOLS) BUILD SYSTEM
 ======================================================================
+
+These instructions are obsolete.
+
 ------------
 Quick method
 ------------

fastjet/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.
@@ -352,6 +352,7 @@ am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
 TEST_SUITE_LOG = test-suite.log
 TEST_EXTENSIONS = @EXEEXT@ .test
@@ -377,7 +378,7 @@ DIST_SUBDIRS = src include plugins tools example fortran_wrapper doc \
 	pyinterface
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/fastjet-config.in \
 	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO compile \
-	config.guess config.sub install-sh ltmain.sh missing \
+	config.guess config.sub depcomp install-sh ltmain.sh missing \
 	py-compile test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -417,6 +418,8 @@ am__relativize = \
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -896,7 +899,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
@@ -1098,7 +1101,7 @@ distcheck: dist
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \

fastjet/NEWS

@@ -1,6 +1,101 @@
 Release Notes for FastJet
 -------------------------
 
+================================================================
+Summary of changes from v3.3.4 -> v3.4.0: 2021-06-25
+================================================================
+New features:
+
+* addition of support for thread safety. It requires a compiler 
+  supporting the C++11 standard (or later) and must be explicitly 
+  enabled at configure time. There are two options
+  - the --enable-limited-thread-safety configure option is generally 
+    sufficient if each thread is processing entirely distinct events.
+    It should have essentially no speed overhead.
+  - the --enable-thread-safety configure option is required if
+    you want to be able to read/copy/process a common set of PseudoJets 
+    across multiple threads. Depending on the system, our tests have
+    shown speed penalties of up to 10-15%.
+  For further details, see section 10 of the manual, doc/fastjet-doc.tex
+
+* The jet area infrastructure has new calls to facilitate reproducible
+  multi-threaded running: AreaDefinition::with_fixed_seed(seed) and
+  GhostedAreaSpec::get_last_seed(seed). See section 10.3.1 of the manual.
+
+* The background estimators have a new interface to facilitate 
+  reproducible multi-threaded running: 
+  BackgroundEstimatorBase::estimate(...) 
+  returns a BackgroundEstimate object, which contains rho, sigma, etc. 
+  For details on using it, see sections 8 and 10.3.2 of the manual.
+  The Subtractor class has been updated to use this. 
+
+Improvements to existing features:
+
+* the Python interface now has improved exceptions (a fastjet Error is
+  translated into a FastJetError python exception) and can be more
+  easily be used with projects using FastJet that want to define their
+  own python wrappers. Thanks to Patrick Komiske for the suggestions.
+
+* PxConePlugin now has an optional mode argument for e+e- running
+  (mode=1) instead of pp running (mode=2). Thanks to Stefan Kluth for
+  the suggestion.
+
+Bug fixes:
+
+* the Fortran interface to e+e- interface now returns jets ordered
+  in decreasing energy rather than decreasing transverse momentum. 
+
+================================================================
+Summary of changes from v3.4.0-beta.1 -> v3.4.0: 2021-06-25
+================================================================
+
+* added set_default_stream_and_mutex to Error and LimitedWarnings 
+  to help guard against garbled output
+
+================================================================
+Summary of changes from v3.3.4 -> v3.4.0-beta.1: 2021-03-10
+================================================================
+New features:
+
+* addition of support for thread safety. It requires a compiler 
+  supporting the C++11 standard (or later) and must be explicitly 
+  enabled at configure time. There are two options
+  - the --enable-limited-thread-safety configure option is generally 
+    sufficient if each thread is processing entirely distinct events.
+    It should have essentially no speed overhead.
+  - the --enable-thread-safety configure option is required if
+    you want to be able to read/copy/process a common set of PseudoJets 
+    across multiple threads. Depending on the system, our tests have
+    shown speed penalties of up to 10-15%.
+  For further details, see section 10 of the manual, doc/fastjet-doc.tex
+
+* The jet area infrastructure has new calls to facilitate reproducible
+  multi-threaded running: AreaDefinition::with_fixed_seed(seed) and
+  GhostedAreaSpec::get_last_seed(seed). See section 10.3.1 of the manual.
+
+* The background estimators have a new interface to facilitate 
+  reproducible multi-threaded running: 
+  BackgroundEstimatorBase::estimate(...) 
+  returns a BackgroundEstimate object, which contains rho, sigma, etc. 
+  For details on using it, see sections 8 and 10.3.2 of the manual.
+  The Subtractor class has been updated to use this. 
+
+Improvements to existing features:
+
+* the Python interface now has improved exceptions (a fastjet Error is
+  translated into a FastJetError python exception) and can be more
+  easily be used with projects using FastJet that want to define their
+  own python wrappers. Thanks to Patrick Komiske for the suggestions.
+
+* PxConePlugin now has an optional mode argument for e+e- running
+  (mode=1) instead of pp running (mode=2). Thanks to Stefan Kluth for
+  the suggestion.
+
+Bug fixes:
+
+* the Fortran interface to e+e- interface now returns jets ordered
+  in decreasing energy rather than decreasing transverse momentum. 
+
 ================================================================
 Summary of changes from v3.3.3 -> v3.3.4: 2020-05-05
 ================================================================

fastjet/aclocal.m4

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
 
 # Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.2], [],
+m4_if([$1], [1.16.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.2])dnl
+[AM_AUTOMAKE_VERSION([1.16.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -703,12 +703,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -880,12 +875,14 @@ AC_DEFUN([AM_PATH_PYTHON],
     m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
   else
 
-  dnl Query Python for its version number.  Getting [:3] seems to be
-  dnl the best way to do this; it's what "site.py" does in the standard
-  dnl library.
+  dnl Query Python for its version number.  Although site.py simply uses
+  dnl sys.version[:3], printing that failed with Python 3.10, since the
+  dnl trailing zero was eliminated. So now we output just the major
+  dnl and minor version numbers, as numbers. Apparently the tertiary
+  dnl version is not of interest.
 
   AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
-    [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+    [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])
   AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
 
   dnl Use the values of $prefix and $exec_prefix for the corresponding

fastjet/config.h.in

@@ -67,6 +67,9 @@
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
+/* 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
 
@@ -94,6 +97,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* defined if thread-safety has been enabled */
+#undef HAVE_THREAD_SAFETY
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H