Hello community, here is the log from the commit of package fastjet for openSUSE:Factory checked in at 2015-11-10 10:03:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fastjet (Old) and /work/SRC/openSUSE:Factory/.fastjet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fastjet" Changes: -------- --- /work/SRC/openSUSE:Factory/fastjet/fastjet.changes 2015-01-14 11:45:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fastjet.new/fastjet.changes 2015-11-10 10:03:47.000000000 +0100 @@ -1,0 +2,17 @@ +Sun Nov 8 13:20:00 UTC 2015 - [email protected] + +- Update to version 3.1.3 + * disables JetDefinition::operator(...) when CINT is detected, for + ROOT v5 compatibility + * works around an issue with recent versions of CGAL and the clang + compiler +- Changes from version 3.1.2 + * fixes a rounding error issue in the "lazy" clustering strategies + that, in rare cases, caused infinite loops or crashes + * adds a check on clustering's internal consistency; a failure will + throw a new "InternalError" exception (derived from Error) + * fixes a bug in the extraction of the fjcore code that resulted in + fjcore failing for high multiplicities (~1000). This issue only + affects fjcore, not the full fastjet library + +------------------------------------------------------------------- Old: ---- fastjet-3.1.1.tar.gz New: ---- fastjet-3.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fastjet.spec ++++++ --- /var/tmp/diff_new_pack.jckzlj/_old 2015-11-10 10:03:48.000000000 +0100 +++ /var/tmp/diff_new_pack.jckzlj/_new 2015-11-10 10:03:48.000000000 +0100 @@ -17,14 +17,13 @@ Name: fastjet -Version: 3.1.1 +Version: 3.1.3 Release: 0 Summary: Package for jet finding in pp and e+e- collisions License: GPL-2.0 Group: Development/Libraries/C and C++ Url: http://fastjet.fr/ Source: http://fastjet.fr/repo/%{name}-%{version}.tar.gz -#Patch: BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -126,7 +125,6 @@ %build %configure --disable-static --enable-allcxxplugins - make %{?_smp_mflags} %install ++++++ fastjet-3.1.1.tar.gz -> fastjet-3.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/ChangeLog new/fastjet-3.1.3/ChangeLog --- old/fastjet-3.1.1/ChangeLog 2015-01-06 16:27:02.000000000 +0100 +++ new/fastjet-3.1.3/ChangeLog 2015-07-04 17:28:58.000000000 +0200 @@ -1,3 +1,217 @@ +2015-07-04 Gavin Salam <[email protected]> + Matteo + + Release of FastJet 3.1.3 + +2015-07-03 Gavin Salam <[email protected]> + Matteo + + * NEWS: + updated it with info about CINT detection. + + * configure.ac: + * include/fastjet/config_win.h: + * Doxyfile: + * tex/fastjet-doc.tex: + changed version to 3.1.3 + +2015-07-03 Gavin Salam <[email protected]> + + * src/ClusterSequence_Delaunay.cc: + * src/DnnPlane.cc: + added various extra output for when verbose is true, which was + used to help debug the issue that was eventually traced to + DnnPlane.h + + * include/fastjet/internal/DnnPlane.hh: + added DnnPlane::_is_not_null(vertex_handle) to centralize checks + of whether a vertex_handle is null. This provides a workaround for + the issue that (vertex_handle != NULL) seems to work with + clang-3.6.1 and CGAL-4.6.1. + +2015-06-30 Gavin Salam <[email protected]> + Matteo + + * include/fastjet/ClusterSequence.hh: + + added #ifndef __CINT__ around the (templated) + JetDefinition::operator() to solve issues with root5 reported by + Adrian Sevcenco. + +2015-03-12 Gregory Soyez <[email protected]> + + * CHECKLIST: + * configure.ac: + * include/fastjet/config_win.h: + * Doxyfile: + * tex/fastjet-doc.tex: + changed version to 3.1.3-devel + +2015-03-12 Gregory Soyez <[email protected]> + + Release of FastJet 3.1.2 + +2015-03-11 Gregory Soyez <[email protected]> + + * configure.ac: + * include/fastjet/config_win.h: + * Doxyfile: + * tex/fastjet-doc.tex: + changed version to 3.1.2 + +2015-03-08 Gregory Soyez <[email protected]> + + * tools/fastjet/tools/Filter.hh: + removed a harmless "shadow" warning in set_subtractor() + +2015-03-05 Gregory Soyez <[email protected]> + + * NEWS: + reverted one item to the previous version + + * NEWS: + tried to shorten things a bit + +2015-03-04 Matteo Cacciari <[email protected]> + + * NEWS: + worked on the release notes for v3.1.2 + +2015-02-26 Gregory Soyez <[email protected]> + + * NEWS: + worked on the release notes for v3.1.2 + +2015-02-27 Gavin Salam <[email protected]> + Matteo + + * scripts/mkfjcore.sh: + directory used to create fjcore now gets removed + + * regression-tests/nightly-check.pl: + - exchanged order of make dist and mkfjcore + - fjcore tarball now left in the main directory and extracted each + time to $tmpDir + - make check test adapted to also handle newer autotools output + +2015-02-27 Matteo Cacciari <[email protected]> + + * scripts/mkfjcore.sh + added the option to extract fjcore into any given directory rather + that only as a subdirectory of scripts. Useful when running mkfjcore.sh + in the nightly checks script. + + * regression-tests/nightly-check.pl + added the extraction (and test) of fjcore, and the running of a + version of fastjet_timing_plugins compiled with fjcore. Also added + a couple of basic fjcore tests to setups list. + +2015-02-25 Gavin Salam <[email protected]> + + * testsuite/TestSpecialEvents.hh: + * testsuite/special-events/2015-02-out-of-bounds-reduced.txt: *** ADDED *** + added a test to check the 2015-02-out-of-bounds issue + +2015-02-21 Gavin Salam <[email protected]> + + * testsuite/run_tests.cc: + * testsuite/TestSpecialEvents.hh: *** ADDED *** + * testsuite/special-events/2015-02-infinite-loop-simplified.txt: *** ADDED *** + added class for testing special events (e.g. events known to have + caused problems in older FJ versions, so that we don't run the + risk of the same identical issue reappearing). + + Also added the event from the 2015-02-infinite-loop issue and + checked that the test "fails" if we remove the fix for the issue. + + And added check in run_tests.cc that all command-line options have + been used. + + * testsuite/TestBase.hh: + added VERIFY_RUNS as a check (with graceful catch) that something + runs rather than throws. + + * testsuite/mkmk: *** ADDED *** + to generate Makefile automatically (requires Gavin's mkcxx.pl) + +2015-02-20 Gregory Soyez <[email protected]> + + * src/ClusterSequence.cc (_add_step_to_history): + throws an InternalError if we're trying to cluster a particle that + has previsouly been clustered + + * include/fastjet/Error.hh (InternalError): + Added an InternalError class that will be thrown in critical + internal errors that we still want to be catchable by end-users + + * include/fastjet/internal/LazyTiling9Alt.hh: + updated the comment to reflect the modifications listed below + + * include/fastjet/internal/LazyTiling9Alt.hh: + * src/LazyTiling9SeparateGhosts.cc: + * src/LazyTiling9Alt.cc: + * src/LazyTiling9.cc: + * src/LazyTiling25.cc: + (_distance_to_tile) + (_add_untagged_neighbours_to_tile_union_using_max_info): instead + of having the security margin directly in distance_to_tile, + instead have in + _add_untagged_neighbours_to_tile_union_using_max_info. Indeed, + it's sufficient to add the security margin when browsing + neighbouring tile for possible updates. + + Also, used a C++ const rather than a C proprocessor symbol. + +2015-02-20 Matteo Cacciari <[email protected] + + example/fastjet_timing_plugins.cc + regression-tests/test-all-algs.pl + + Modified fastjet_timing_plugins.cc so that it can be compiled with + fjcore using something like + + g++ -D__FJCORE__ fastjet_timing_plugins_fjcore.cc \ + ../scripts/fjcore-3.2.0-devel/fjcore.cc CmdLine.cc \ + -I ../scripts/fjcore-3.2.0-devel/ -o fastjet_timing_plugins_fjcore + + Modified test-all-algs.pl so that it now takes a command line + option "-fjcore" that runs the version of fastjet_timing_plugins + compiled with fjcore instead of the one compiled with the + full fastjet + + Not fully robust yet, e.g. running test-all-algs.pl using -areas + or -bkgds options together with -fjcore will break, because + the reading of some command-line options in fastjet_timing_plugins.cc + is so nested that excluding each and every one of them using __FJCORE__ + guards would be a significant amount of work, and make the code + perhaps uselessly unreadable + +2015-02-18 Matteo Cacciari <[email protected]> + + * src/ClusterSequence.cc: + moved an FJCORE guard, previously in the wrong place + and causing an erroneous throw in fjcore about the + N2MHTLazy9AntiKtSeparateGhosts strategy (bug reported by Sergei + Chekanov) + +2015-02-16 Gregory Soyez <[email protected]> + + * include/fastjet/internal/LazyTiling9Alt.hh: + * src/LazyTiling9SeparateGhosts.cc (_distance_to_tile): + * src/LazyTiling9.cc (_distance_to_tile): + * src/LazyTiling25.cc (_distance_to_tile): + added a margin of security in the comparison of "distance_to_tile" + with "max_NN_dist". This prevents missed updates due to rounding + errors. [Fixing the cause of the bug reported by Jochen Olt on + February 12] + +2015-01-06 Gregory Soyez <[email protected]> + Matteo + + * configure.ac: + * include/fastjet/config_win.h: + * Doxyfile: + * tex/fastjet-doc.tex: + changed version to 3.1.2-devel + + * plugins/SISCone: + switched over to the trunk + 2015-01-06 Gregory Soyez <[email protected]> + Matteo Release of FastJet 3.1.1 @@ -125,7 +339,7 @@ 2014-09-18 Matteo Cacciari <[email protected]> - * regression-tests/nightly-check.pl + * regression-tests/nightly-check.pl: Added a test with gcc 4.9 2014-09-18 Gregory Soyez <[email protected]> @@ -142,7 +356,7 @@ 2014-09-18 Matteo Cacciari <[email protected]> - * src/Error.cc + * src/Error.cc: modified the guard to LimitedWarning Error::_execinfo_undefined; so that it's the same that is now used elsewhere and in Error,hh, i.e. #if (!defined(FASTJET_HAVE_EXECINFO_H)) || defined(__FJCORE__) @@ -170,9 +384,9 @@ 2014-09-18 Matteo Cacciari <[email protected]> - * include/fastjet/Error.hh - * src/Error.cc - * scripts/mkfjcore.sh + * include/fastjet/Error.hh: + * src/Error.cc: + * scripts/mkfjcore.sh: - demangle() included in the Error class - Added a warning to Error:set_print_backtrace in case @@ -213,8 +427,8 @@ 2014-09-08 Matteo Cacciari <[email protected]> - * src/Error.cc - * scripts/mkfjcore.sh + * src/Error.cc: + * scripts/mkfjcore.sh: Added FJCORE guards around the backtrace block and the corresponding include in Error.cc, so that they are never included in fjcore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/Doxyfile new/fastjet-3.1.3/Doxyfile --- old/fastjet-3.1.1/Doxyfile 2015-01-06 16:03:37.000000000 +0100 +++ new/fastjet-3.1.3/Doxyfile 2015-07-02 18:08:46.000000000 +0200 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 3.1.1 +PROJECT_NUMBER = 3.1.3 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/NEWS new/fastjet-3.1.3/NEWS --- old/fastjet-3.1.1/NEWS 2015-01-06 16:11:18.000000000 +0100 +++ new/fastjet-3.1.3/NEWS 2015-07-04 17:28:51.000000000 +0200 @@ -2,6 +2,28 @@ ------------------------- ================================================================ +Summary of changes from v3.1.2 -> v3.1.3: 2015-07-04 +================================================================ +This is a maintenance relase with the following changes: +* disabled JetDefinition::operator(...) when CINT is detected, for + ROOT v5 compatibility. +* worked around an issue with recent versions of CGAL and the clang + compiler + +================================================================ +Summary of changes from v3.1.1 -> v3.1.2: 2015-03-12 +================================================================ +This is a bug-fix release. Main changes: + +* fixed rounding error issue in the "lazy" clustering strategies that, + in rare cases, caused infinite loops or crashes (reported by Jochen Ott). +* added check on clustering's internal consistency; failure will throw + a new "InternalError" exception (derived from Error). +* fixed bug in extraction of fjcore code that resulted in fjcore + failing for high multiplicities (~1000) (reported by Sergei Chekanov). + Only affects fjcore, not the full fastjet library. + +================================================================ Summary of changes from v3.1.0 -> v3.1.1: 2015-01-06 ================================================================ This is a bug-fix release. Main changes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/config.h.in new/fastjet-3.1.3/config.h.in --- old/fastjet-3.1.1/config.h.in 2015-01-06 16:14:04.000000000 +0100 +++ new/fastjet-3.1.3/config.h.in 2015-07-03 16:22:42.000000000 +0200 @@ -36,6 +36,9 @@ /* The TrackJet plugin is enabled */ #undef ENABLE_PLUGIN_TRACKJET +/* defined if C++11 features have been enabled */ +#undef HAVE_CXX11_FEATURES + /* defined if demangling is enabled at configure time and is supported through the GNU C++ ABI */ #undef HAVE_DEMANGLING_SUPPORT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/configure new/fastjet-3.1.3/configure --- old/fastjet-3.1.1/configure 2015-01-06 16:12:38.000000000 +0100 +++ new/fastjet-3.1.3/configure 2015-07-02 18:11:04.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for FastJet 3.1.1. +# Generated by GNU Autoconf 2.63 for FastJet 3.1.3. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -743,8 +743,8 @@ # Identity of this package. PACKAGE_NAME='FastJet' PACKAGE_TARNAME='fastjet' -PACKAGE_VERSION='3.1.1' -PACKAGE_STRING='FastJet 3.1.1' +PACKAGE_VERSION='3.1.3' +PACKAGE_STRING='FastJet 3.1.3' PACKAGE_BUGREPORT='' ac_unique_file="src/JetDefinition.cc" @@ -1551,7 +1551,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FastJet 3.1.1 to adapt to many kinds of systems. +\`configure' configures FastJet 3.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1621,7 +1621,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FastJet 3.1.1:";; + short | recursive ) echo "Configuration of FastJet 3.1.3:";; esac cat <<\_ACEOF @@ -1746,7 +1746,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FastJet configure 3.1.1 +FastJet configure 3.1.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1760,7 +1760,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FastJet $as_me 3.1.1, which was +It was created by FastJet $as_me 3.1.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2610,7 +2610,7 @@ # Define the identity of the package. PACKAGE='fastjet' - VERSION='3.1.1' + VERSION='3.1.3' cat >>confdefs.h <<_ACEOF @@ -22357,7 +22357,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FastJet $as_me 3.1.1, which was +This file was extended by FastJet $as_me 3.1.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22420,7 +22420,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -FastJet config.status 3.1.1 +FastJet config.status 3.1.3 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/configure.ac new/fastjet-3.1.3/configure.ac --- old/fastjet-3.1.1/configure.ac 2015-01-06 16:03:37.000000000 +0100 +++ new/fastjet-3.1.3/configure.ac 2015-07-02 18:08:46.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([FastJet],[3.1.1]) +AC_INIT([FastJet],[3.1.3]) AC_CONFIG_SRCDIR([src/JetDefinition.cc]) AM_INIT_AUTOMAKE(tar-ustar) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/doc/fastjet-doc.tex new/fastjet-3.1.3/doc/fastjet-doc.tex --- old/fastjet-3.1.1/doc/fastjet-doc.tex 2015-01-06 16:03:37.000000000 +0100 +++ new/fastjet-3.1.3/doc/fastjet-doc.tex 2015-07-02 18:08:46.000000000 +0200 @@ -77,7 +77,7 @@ \title{\sf FastJet user manual% \\ \large (for version - 3.1.1% %%%-VERSION-NUMBER (do not remove this comment; used + 3.1.3% %%%-VERSION-NUMBER (do not remove this comment; used % for automatic version-number changes; version number must % stay one a single line) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/example/fastjet_timing_plugins.cc new/fastjet-3.1.3/example/fastjet_timing_plugins.cc --- old/fastjet-3.1.1/example/fastjet_timing_plugins.cc 2014-12-23 10:08:20.000000000 +0100 +++ new/fastjet-3.1.3/example/fastjet_timing_plugins.cc 2015-03-04 21:56:42.000000000 +0100 @@ -1,5 +1,5 @@ //STARTHEADER -// $Id: fastjet_timing_plugins.cc 3473 2014-07-29 09:45:34Z soyez $ +// $Id: fastjet_timing_plugins.cc 3838 2015-03-04 15:56:55Z cacciari $ // // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -193,11 +193,14 @@ /// fastjet/JetDefinition.hh). /// - +#ifndef __FJCORE__ #include "fastjet/ClusterSequenceArea.hh" #include "fastjet/tools/JetMedianBackgroundEstimator.hh" #include "fastjet/tools/GridMedianBackgroundEstimator.hh" #include "fastjet/Selector.hh" +#else +#include "fjcore.hh" +#endif #include<iostream> #include<iomanip> #include<sstream> @@ -208,8 +211,10 @@ //#include<cstddef> // for size_t #include "CmdLine.hh" +#ifndef __FJCORE__ // get info on how fastjet was configured #include "fastjet/config.h" +#endif // include the installed plugins (don't delete this line) #ifdef FASTJET_ENABLE_PLUGIN_SISCONE @@ -253,7 +258,11 @@ using namespace std; // to avoid excessive typing, use the fastjet namespace +#ifndef __FJCORE__ using namespace fastjet; +#else +using namespace fjcore; +#endif inline double pow2(const double x) {return x*x;} @@ -346,6 +355,7 @@ : SelectorIdentity(); do_areas = cmdline.present("-area"); +#ifndef __FJCORE__ AreaDefinition area_def; if (do_areas) { assert(!write); // it's incompatible @@ -366,7 +376,12 @@ area_def = AreaDefinition(active_area, ghost_spec); } } +#else + do_areas=false; +#endif + bool do_bkgd = cmdline.present("-bkgd"); // background estimation +#ifndef __FJCORE__ bool do_bkgd_csab = false, do_bkgd_jetmedian = false, do_bkgd_fj2 = false; bool do_bkgd_gridmedian = false; Selector bkgd_range; @@ -381,6 +396,9 @@ } assert(do_areas || do_bkgd_gridmedian); } +#else + do_bkgd = false; +#endif bool show_cones = cmdline.present("-cones"); // only works for siscone @@ -390,6 +408,10 @@ overlap_threshold = cmdline.double_val("-f",overlap_threshold); double seed_threshold = cmdline.double_val("-seed",1.0); +#ifdef __FJCORE__ + show_cones = false; +#endif + // for ee algorithms, allow to specify ycut double ycut = cmdline.double_val("-ycut",0.08); @@ -623,6 +645,7 @@ if (abs(psjet.rap()) < rapmax) {particles.push_back(psjet);} } +#ifndef __FJCORE__ // add a fake underlying event which is very soft, uniformly distributed // in eta,phi so as to allow one to reconstruct the area that is associated // with each jet. @@ -653,6 +676,9 @@ // } // } } +#else + add_dense_coverage = false; +#endif // select the particles that pass the selection cut particles = particles_sel(particles); @@ -665,7 +691,9 @@ try { auto_ptr<ClusterSequence> clust_seq; if (do_areas) { +#ifndef __FJCORE__ clust_seq.reset(new ClusterSequenceArea(particles,jet_def,area_def)); +#endif } else { clust_seq.reset(new ClusterSequence(particles,jet_def,write)); } @@ -682,7 +710,9 @@ cout << "iev "<<iev<< ": number of particles = "<< nparticles << endl; cout << "strategy used = "<< clust_seq->strategy_string()<< endl; if (iev == 0) cout << "Jet Definition: " << jet_def.description() << " (" << fastjet_version_string() << ")" << endl; +#ifndef __FJCORE__ if (do_areas && iev == 0) cout << "Area definition: " << area_def.description() << endl; +#endif // now provide some nice output... if (inclkt >= 0.0) { @@ -774,6 +804,7 @@ } #endif // FASTJET_ENABLE_PLUGIN_SISCONE +#ifndef __FJCORE__ if (do_bkgd) { double rho, sigma, mean_area, empty_area, n_empty_jets; ClusterSequenceAreaBase * csab = @@ -810,8 +841,9 @@ << ", n_empty_jets = " << n_empty_jets << endl; } +#endif } // try - catch (fastjet::Error fjerr) { + catch (Error fjerr) { cout << "Caught fastjet error, exiting gracefully" << endl; exit(0); } @@ -865,9 +897,11 @@ j,jets[j].rap(),jets[j].phi(),jets[j].perp()); // also print out the scalar area and the perp component of the // 4-vector (just enough to check a reasonable 4-vector?) +#ifndef __FJCORE__ if (do_areas) printf(" %15.8f %15.8f", jets[j].area(), jets[j].area_4vector().perp()); cout << "\n"; +#endif if (show_constituents) { vector<PseudoJet> const_jets = jets[j].constituents(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/include/fastjet/ClusterSequence.hh new/fastjet-3.1.3/include/fastjet/ClusterSequence.hh --- old/fastjet-3.1.1/include/fastjet/ClusterSequence.hh 2014-12-23 10:08:24.000000000 +0100 +++ new/fastjet-3.1.3/include/fastjet/ClusterSequence.hh 2015-07-02 14:15:17.000000000 +0200 @@ -2,7 +2,7 @@ #define __FASTJET_CLUSTERSEQUENCE_HH__ //FJSTARTHEADER -// $Id: ClusterSequence.hh 3709 2014-09-29 13:19:11Z soyez $ +// $Id: ClusterSequence.hh 3911 2015-07-02 12:09:58Z salam $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -990,6 +990,7 @@ //---------------------------------------------------------------------- // implementation of JetDefinition::operator() is here to avoid nasty // issues of order of implementations and includes +#ifndef __CINT__ template<class L> std::vector<PseudoJet> JetDefinition::operator()(const std::vector<L> & particles) const { // create a new cluster sequence @@ -1014,7 +1015,7 @@ return jets; } - +#endif // __CINT__ //---------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/include/fastjet/Error.hh new/fastjet-3.1.3/include/fastjet/Error.hh --- old/fastjet-3.1.1/include/fastjet/Error.hh 2014-12-23 10:08:24.000000000 +0100 +++ new/fastjet-3.1.3/include/fastjet/Error.hh 2015-03-04 21:56:42.000000000 +0100 @@ -2,7 +2,7 @@ #define __FASTJET_ERROR_HH__ //FJSTARTHEADER -// $Id: Error.hh 3694 2014-09-18 13:21:54Z soyez $ +// $Id: Error.hh 3809 2015-02-20 13:05:13Z soyez $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -95,6 +95,25 @@ }; +/// @ingroup error_handling +/// \class InternalError +/// class corresponding to critical internal errors +/// +/// This is an error class (derived from Error) meant for serious, +/// critical, internal errors that we still want to be catchable by an +/// end-user [e.g. a serious issue in clustering where the end-user +/// can catch it and retry with a different strategy] +/// +/// Please directly contact the FastJet authors if you see such an +/// error. +class InternalError : public Error{ +public: + /// ctor with error message: + /// just add a bit of info to the message and pass it to the base class + InternalError(const std::string & message_in) : Error(std::string("*** CRITICAL INTERNAL FASTJET ERROR *** CONTACT THE AUTHORS *** ") + message_in){ } +}; + + FASTJET_END_NAMESPACE #endif // __FASTJET_ERROR_HH__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/include/fastjet/config_win.h new/fastjet-3.1.3/include/fastjet/config_win.h --- old/fastjet-3.1.1/include/fastjet/config_win.h 2015-01-06 16:03:37.000000000 +0100 +++ new/fastjet-3.1.3/include/fastjet/config_win.h 2015-07-02 18:08:46.000000000 +0200 @@ -1,10 +1,11 @@ -#define FASTJET_PACKAGE_STRING "FastJet 3.1.1" -#define FASTJET_PACKAGE_VERSION "3.1.1" -#define FASTJET_VERSION "3.1.1" -#define FASTJET_VERSION_MAJOR 3 -#define FASTJET_VERSION_MINOR 1 -#define FASTJET_VERSION_PATCHLEVEL 1 -#define FASTJET_VERSION_NUMBER 30101 +#define FASTJET_PACKAGE_STRING "FastJet 3.1.3" +#define FASTJET_PACKAGE_VERSION "3.1.3" +#define FASTJET_VERSION "3.1.3" +#define FASTJET_VERSION_MAJOR 3.1.3 +#define FASTJET_VERSION_MINOR 3.1.3 +#define FASTJET_VERSION_PATCHLEVEL 3.1.3 +#define FASTJET_VERSION_PRERELEASE "3.1.3" +#define FASTJET_VERSION_NUMBER 00000 /* The ATLASCone plugin is disabled by default*/ #undef FASTJET_ENABLE_PLUGIN_ATLASCONE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/include/fastjet/internal/DnnPlane.hh new/fastjet-3.1.3/include/fastjet/internal/DnnPlane.hh --- old/fastjet-3.1.1/include/fastjet/internal/DnnPlane.hh 2014-12-23 10:08:24.000000000 +0100 +++ new/fastjet-3.1.3/include/fastjet/internal/DnnPlane.hh 2015-07-03 16:22:41.000000000 +0200 @@ -1,5 +1,5 @@ //FJSTARTHEADER -// $Id: DnnPlane.hh 3442 2014-07-24 07:20:49Z salam $ +// $Id: DnnPlane.hh 3918 2015-07-03 14:19:13Z salam $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -189,7 +189,7 @@ // of RemoveAndAddPoints so here we should just make sure there is // no crash... that's done by checking (near != NULL) if ((std::abs(dist-mindist)<DISTANCE_FOR_CGAL_CHECKS) && - (near != NULL) && + _is_not_null(near) && // GPS cf. note below about != NULL with clang/CGAL (_euclid_distance(candidate, near->point())<DISTANCE_FOR_CGAL_CHECKS)){ // we're in a situation where there might be a rounding issue, // use CGAL's distance computation to get it right @@ -221,6 +221,23 @@ /// and the distance between the two points is also smaller than this /// then use CGAL to compare the distances. static const double DISTANCE_FOR_CGAL_CHECKS; + + + /// small routine to check if if a vertex handle is not null. + /// + /// This is centralised here because of the need for a not-very + /// readable workaround for certain CGAL/clang++ compiler + /// combinations. + inline static bool _is_not_null(const Vertex_handle & vh) { + // as found in issue 2015-07-clang61+CGAL, the form + // vh != NULL + // appears to be broken with CGAL-3.6 and clang-3.6.0/.1 + // + // The not very "readable" + // vh.operator->() + // does the job instead + return vh.operator->(); + } }; @@ -236,7 +253,13 @@ inline bool DnnPlane::Valid(const int index) const { if (index >= 0 && index < static_cast<int>(_supervertex.size())) { - return (_supervertex[index].vertex != NULL);} else {return false;} } + return _is_not_null(_supervertex[index].vertex); + } + else { + return false; + } +} + inline EtaPhi DnnPlane::etaphi(const int i) const { Point * p = & (_supervertex[i].vertex->point()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/include/fastjet/internal/LazyTiling9Alt.hh new/fastjet-3.1.3/include/fastjet/internal/LazyTiling9Alt.hh --- old/fastjet-3.1.1/include/fastjet/internal/LazyTiling9Alt.hh 2014-12-23 10:08:24.000000000 +0100 +++ new/fastjet-3.1.3/include/fastjet/internal/LazyTiling9Alt.hh 2015-03-04 21:56:42.000000000 +0100 @@ -2,7 +2,7 @@ #define __FASTJET_LAZYTILING9ALT_HH__ //FJSTARTHEADER -// $Id: LazyTiling9Alt.hh 3477 2014-07-29 14:34:39Z salam $ +// $Id: LazyTiling9Alt.hh 3808 2015-02-20 11:24:53Z soyez $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -37,6 +37,39 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh +/// Rounding errors in the Lazy strategies may cause the following +/// problem: when browsing tiles in the vicinity of the particles +/// being clustered in order to decide which of these tiles may +/// contain particles that need to be updated (because theit NN is one +/// of the particles that are currently clustered), we discard tiles +/// that are deemed "too far from the cell" by the "max_NN_dist" +/// criterion. Because of rounding error, this condition can sometimes +/// miss cases where an update is needed. +/// +/// An example of this happens if a particle '1' is, say, at the lower +/// edge of the rapidity of a given tile, with a particle '2' in the +/// tile directly on its left at the same rapidity. Assume also that +/// max_NN_dist in 2's tile corresponds to the distance between 2 and +/// teh tile of 1. If 2 is 1's NN then in case 2 gets clustered, 1's +/// NN needs to be updated. However, rounding errors in the +/// calculation of the distance between 1 and 2 may result is +/// something slightly larger than the max_NN_dist in 2's tile. +/// +/// This situation corresponds to the bug reported by Jochen Olt on +/// February 12 2015 [see issue-tracker/2015-02-infinite-loop], +/// causing an infinite loop. +/// +/// To prevent this, the simplest solution is, when looking at tiles +/// to browse for updateds, to add a margin of security close to the +/// edges of the cell, i.e. instead of updating only tiles for which +/// distance<=max_NN_dist, we will update tiles for which +/// distance<=max_NN_dist+tile_edge_security_margin. +/// +/// Note that this does not need to be done when computing nearest +/// neighbours [rounding errors are tolerated there] but it is +/// critical when tracking points that have to be updated. +const double tile_edge_security_margin=1.0e-7; + /// structure analogous to BriefJet, but with the extra information /// needed for dealing with tiles class TiledJet { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/m4/CGAL.m4 new/fastjet-3.1.3/m4/CGAL.m4 --- old/fastjet-3.1.1/m4/CGAL.m4 2014-12-23 10:08:18.000000000 +0100 +++ new/fastjet-3.1.3/m4/CGAL.m4 2015-07-02 18:08:45.000000000 +0200 @@ -118,7 +118,7 @@ dnl if CGAL hasn't been found yet and the Makefile search didn't return an error message dnl we check if we can get the arguments ourselves. This method leave the option to specify dnl a CGAL directory using the --with-cgaldir directive -dnl If no dir are specified, CGLA will be searched in standard places +dnl If no dir are specified, CGAL will be searched for in standard places if test "$acx_cgal_found" == no; then dnl check support for -frounding-math for the C++ compiler ADDITIONAL_CGAL_FLAGS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/plugins/SISCone/siscone/config.h.in new/fastjet-3.1.3/plugins/SISCone/siscone/config.h.in --- old/fastjet-3.1.1/plugins/SISCone/siscone/config.h.in 2015-01-06 00:54:20.000000000 +0100 +++ new/fastjet-3.1.3/plugins/SISCone/siscone/config.h.in 2015-07-02 18:12:02.000000000 +0200 @@ -52,9 +52,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/src/ClusterSequence.cc new/fastjet-3.1.3/src/ClusterSequence.cc --- old/fastjet-3.1.1/src/ClusterSequence.cc 2014-12-23 10:08:19.000000000 +0100 +++ new/fastjet-3.1.3/src/ClusterSequence.cc 2015-03-04 21:56:41.000000000 +0100 @@ -1,5 +1,5 @@ //FJSTARTHEADER -// $Id: ClusterSequence.cc 3685 2014-09-11 20:15:00Z salam $ +// $Id: ClusterSequence.cc 3809 2015-02-20 13:05:13Z soyez $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -371,8 +371,8 @@ tiling.run(); _plugin_activated = false; -#ifndef __FJCORE__ } else if (_strategy == N2MHTLazy9AntiKtSeparateGhosts) { +#ifndef __FJCORE__ // attempt to use an external tiling routine -- it manipulates // the CS history via the plugin mechanism _plugin_activated = true; @@ -1470,9 +1470,24 @@ int local_step = _history.size()-1; assert(local_step == step_number); + // sanity check: make sure the particles have not already been recombined + // + // Note that good practice would make this an assert (since this is + // a serious internal issue). However, we decided to throw an + // InternalError so that the end user can decide to catch it and + // retry the clustering with a different strategy. + assert(parent1 >= 0); + if (_history[parent1].child != Invalid){ + throw InternalError("trying to recomine an object that has previsously been recombined"); + } _history[parent1].child = local_step; - if (parent2 >= 0) {_history[parent2].child = local_step;} + if (parent2 >= 0) { + if (_history[parent2].child != Invalid){ + throw InternalError("trying to recomine an object that has previsously been recombined"); + } + _history[parent2].child = local_step; + } // get cross-referencing right from PseudoJets if (jetp_index != Invalid) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/src/ClusterSequence_Delaunay.cc new/fastjet-3.1.3/src/ClusterSequence_Delaunay.cc --- old/fastjet-3.1.1/src/ClusterSequence_Delaunay.cc 2014-12-23 10:08:19.000000000 +0100 +++ new/fastjet-3.1.3/src/ClusterSequence_Delaunay.cc 2015-07-03 16:22:41.000000000 +0200 @@ -1,5 +1,5 @@ //FJSTARTHEADER -// $Id: ClusterSequence_Delaunay.cc 3475 2014-07-29 11:57:23Z salam $ +// $Id: ClusterSequence_Delaunay.cc 3918 2015-07-03 14:19:13Z salam $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -69,8 +69,8 @@ // initialise our DNN structure with the set of points auto_ptr<DynamicNearestNeighbours> DNN; -#ifndef DROP_CGAL // strategy = NlnN* are not supported if we drop CGAL... bool verbose = false; +#ifndef DROP_CGAL // strategy = NlnN* are not supported if we drop CGAL... bool ignore_nearest_is_mirror = (_Rparam < twopi); if (_strategy == NlnN4pi) { DNN.reset(new Dnn4piCylinder(points,verbose)); @@ -125,6 +125,7 @@ SmallestDijPair = DijMap.begin()->second; jet_i = SmallestDijPair.first; jet_j = SmallestDijPair.second; + if (verbose) cout << "CS_Delaunay found recombination candidate: " << jet_i << " " << jet_j << " " << SmallestDij << endl; // GPS debugging // distance is immediately removed regardless of whether or not // it is used. // Some temporary testing code relating to problems with the gcc-3.2 compiler @@ -138,7 +139,7 @@ recombine_with_beam = (jet_j == BeamJet); if (!recombine_with_beam) {Valid2 = DNN->Valid(jet_j);} else {Valid2 = true;} - + if (verbose) cout << "CS_Delaunay validities i & j: " << DNN->Valid(jet_i) << " " << Valid2 << endl; } while ( !DNN->Valid(jet_i) || !Valid2); @@ -147,6 +148,7 @@ // later (only if at least 2 jets are around). if (! recombine_with_beam) { int nn; // will be index of new jet + if (verbose) cout << "CS_Delaunay call _do_ij_recomb: " << jet_i << " " << jet_j << " " << SmallestDij << endl; // GPS debug _do_ij_recombination_step(jet_i, jet_j, SmallestDij, nn); //OBS // merge the two jets, add new jet, remove old ones //OBS _jets.push_back(_jets[jet_i] + _jets[jet_j]); @@ -168,6 +170,7 @@ points.push_back(newpoint); } else { // recombine the jet with the beam + if (verbose) cout << "CS_Delaunay call _do_iB_recomb: " << jet_i << " " << SmallestDij << endl; // GPS debug _do_iB_recombination_step(jet_i, SmallestDij); //OBS _add_step_to_history(n+i,_jets[jet_i].cluster_hist_index(),BeamJet, //OBS Invalid, SmallestDij); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/src/DnnPlane.cc new/fastjet-3.1.3/src/DnnPlane.cc --- old/fastjet-3.1.1/src/DnnPlane.cc 2014-12-23 10:08:19.000000000 +0100 +++ new/fastjet-3.1.3/src/DnnPlane.cc 2015-07-03 16:22:41.000000000 +0200 @@ -1,5 +1,5 @@ //FJSTARTHEADER -// $Id: DnnPlane.cc 3442 2014-07-24 07:20:49Z salam $ +// $Id: DnnPlane.cc 3918 2015-07-03 14:19:13Z salam $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -259,7 +259,9 @@ // triangulation and the supervertex structure should be updated // to reflect the fact that the points are no longer valid. _TR.remove(_supervertex[index].vertex); + if (_verbose) cout << "DnnPlane about to set _supervertex["<< index<<"].vertex to NULL" << endl; _supervertex[index].vertex = NULL; + if (_verbose) cout << " value is " << (_is_not_null(_supervertex[index].vertex)) << endl; } // add new point: give a "hint" to the inserter that @@ -296,7 +298,8 @@ _supervertex.push_back(sv); int index = _supervertex.size()-1; indices_added.push_back(index); - if (_verbose) cout << " adding " << index << endl; + if (_verbose) cout << " adding " << index << " at " + << points_to_add[ia].first<< " " << points_to_add[ia].second << endl; //if (indices_to_remove.size() > 0) { if (NeighbourUnion.size() > 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/src/LazyTiling25.cc new/fastjet-3.1.3/src/LazyTiling25.cc --- old/fastjet-3.1.1/src/LazyTiling25.cc 2014-12-23 10:08:19.000000000 +0100 +++ new/fastjet-3.1.3/src/LazyTiling25.cc 2015-03-04 21:56:41.000000000 +0100 @@ -1,5 +1,5 @@ //FJSTARTHEADER -// $Id: LazyTiling25.cc 3477 2014-07-29 14:34:39Z salam $ +// $Id: LazyTiling25.cc 3808 2015-02-20 11:24:53Z soyez $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -364,7 +364,9 @@ for (Tile25 ** near_tile = tile.begin_tiles; near_tile != tile.end_tiles; near_tile++){ if ((*near_tile)->tagged) continue; - double dist = _distance_to_tile(jet, *near_tile); + // here we are not allowed to miss a tile due to some rounding + // error. We therefore allow for a margin of security + double dist = _distance_to_tile(jet, *near_tile) - tile_edge_security_margin; // cout << " max info looked at tile " << *near_tile - &_tiles[0] // << ", dist = " << dist << " " << (*near_tile)->max_NN_dist // << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/src/LazyTiling9.cc new/fastjet-3.1.3/src/LazyTiling9.cc --- old/fastjet-3.1.1/src/LazyTiling9.cc 2014-12-23 10:08:19.000000000 +0100 +++ new/fastjet-3.1.3/src/LazyTiling9.cc 2015-03-04 21:56:41.000000000 +0100 @@ -1,5 +1,5 @@ //FJSTARTHEADER -// $Id: LazyTiling9.cc 3477 2014-07-29 14:34:39Z salam $ +// $Id: LazyTiling9.cc 3808 2015-02-20 11:24:53Z soyez $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -347,7 +347,9 @@ for (Tile2 ** near_tile = tile.begin_tiles; near_tile != tile.end_tiles; near_tile++){ if ((*near_tile)->tagged) continue; - double dist = _distance_to_tile(jet, *near_tile); + // here we are not allowed to miss a tile due to some rounding + // error. We therefore allow for a margin of security + double dist = _distance_to_tile(jet, *near_tile) - tile_edge_security_margin; // cout << " max info looked at tile " << *near_tile - &_tiles[0] // << ", dist = " << dist << " " << (*near_tile)->max_NN_dist // << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/src/LazyTiling9Alt.cc new/fastjet-3.1.3/src/LazyTiling9Alt.cc --- old/fastjet-3.1.1/src/LazyTiling9Alt.cc 2014-12-23 10:08:19.000000000 +0100 +++ new/fastjet-3.1.3/src/LazyTiling9Alt.cc 2015-03-04 21:56:41.000000000 +0100 @@ -1,5 +1,5 @@ //FJSTARTHEADER -// $Id: LazyTiling9Alt.cc 3477 2014-07-29 14:34:39Z salam $ +// $Id: LazyTiling9Alt.cc 3808 2015-02-20 11:24:53Z soyez $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -318,7 +318,9 @@ for (Tile::TileFnPair * near_tile = tile.begin_tiles; near_tile != tile.end_tiles; near_tile++){ if ((near_tile->first)->tagged) continue; - double dist = (tile.*(near_tile->second))(jet); + // here we are not allowed to miss a tile due to some rounding + // error. We therefore allow for a margin of security + double dist = (tile.*(near_tile->second))(jet) - tile_edge_security_margin; // cout << " max info looked at tile " << *near_tile - &_tiles[0] // << ", dist = " << dist << " " << (*near_tile)->max_NN_dist // << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/src/LazyTiling9SeparateGhosts.cc new/fastjet-3.1.3/src/LazyTiling9SeparateGhosts.cc --- old/fastjet-3.1.1/src/LazyTiling9SeparateGhosts.cc 2014-12-23 10:08:19.000000000 +0100 +++ new/fastjet-3.1.3/src/LazyTiling9SeparateGhosts.cc 2015-03-04 21:56:41.000000000 +0100 @@ -1,5 +1,5 @@ //FJSTARTHEADER -// $Id: LazyTiling9SeparateGhosts.cc 3596 2014-08-12 15:27:19Z soyez $ +// $Id: LazyTiling9SeparateGhosts.cc 3808 2015-02-20 11:24:53Z soyez $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -297,7 +297,9 @@ for (Tile3 ** near_tile = tile.begin_tiles; near_tile != tile.end_tiles; near_tile++){ if ((*near_tile)->tagged) continue; - double dist = _distance_to_tile(jet, *near_tile); + // here we are not allowed to miss a tile due to some rounding + // error. We therefore allow for a margin of security + double dist = _distance_to_tile(jet, *near_tile) - tile_edge_security_margin; // cout << " max info looked at tile " << *near_tile - &_tiles[0] // << ", dist = " << dist << " " << (*near_tile)->max_NN_dist // << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fastjet-3.1.1/tools/fastjet/tools/Filter.hh new/fastjet-3.1.3/tools/fastjet/tools/Filter.hh --- old/fastjet-3.1.1/tools/fastjet/tools/Filter.hh 2014-12-23 10:08:20.000000000 +0100 +++ new/fastjet-3.1.3/tools/fastjet/tools/Filter.hh 2015-07-02 14:15:16.000000000 +0200 @@ -2,7 +2,7 @@ #define __FASTJET_TOOLS_FILTER_HH__ //FJSTARTHEADER -// $Id: Filter.hh 3494 2014-07-30 20:38:48Z soyez $ +// $Id: Filter.hh 3845 2015-03-08 08:35:36Z soyez $ // // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -141,7 +141,7 @@ /// Set a subtractor that is applied to all individual subjets before /// deciding which ones to keep. It takes precedence over a non-zero rho. - void set_subtractor(const FunctionOfPseudoJet<PseudoJet> * subtractor) {_subtractor = subtractor;} + void set_subtractor(const FunctionOfPseudoJet<PseudoJet> * subtractor_in) {_subtractor = subtractor_in;} /// runs the filtering and sets kept and rejected to be the jets of interest /// (with non-zero rho, they will have been subtracted).
