From a7a459d280f151197bc24676a243d9cafa065b81 Mon Sep 17 00:00:00 2001 From: bernie Date: Mon, 12 Jul 2021 19:03:32 +0200 Subject: [PATCH] Move to fastjet 3.4.0 and fjcontrib to 1.045 --- fastjet/ChangeLog | 863 +- fastjet/Doxyfile | 2 +- fastjet/INSTALL | 40 +- fastjet/Makefile.in | 11 +- fastjet/NEWS | 95 + fastjet/aclocal.m4 | 23 +- fastjet/config.h.in | 6 + fastjet/configure | 203 +- fastjet/configure.ac | 96 +- fastjet/doc/Makefile.in | 2 +- fastjet/doc/fastjet-doc.tex | 394 +- fastjet/doc/figs/Makefile.in | 2 +- fastjet/example/01-basic.cc | 2 +- fastjet/example/02-jetdef.cc | 2 +- fastjet/example/03-plugin.cc | 2 +- fastjet/example/04-constituents.cc | 2 +- fastjet/example/05-eplus_eminus.cc | 2 +- fastjet/example/06-area.cc | 2 +- fastjet/example/07-subtraction.cc | 13 +- fastjet/example/08-selector.cc | 2 +- fastjet/example/09-user_info.cc | 2 +- fastjet/example/10-subjets.cc | 2 +- fastjet/example/11-filter.cc | 2 +- fastjet/example/12-boosted_higgs.cc | 2 +- fastjet/example/13-boosted_top.cc | 2 +- fastjet/example/14-groomers.cc | 2 +- fastjet/example/CmdLine.hh | 4 +- fastjet/example/Makefile.in | 2 +- fastjet/example/data/Makefile.in | 2 +- fastjet/example/fastjet_areas.cc | 2 +- fastjet/example/fastjet_example.cc | 2 +- fastjet/example/fastjet_timing_plugins.cc | 269 +- fastjet/example/python/02-area.py | 4 +- fastjet/example/python/Makefile.in | 2 +- fastjet/example/root/Makefile.in | 2 +- fastjet/fortran_wrapper/Makefile.alt | 9 +- fastjet/fortran_wrapper/Makefile.in | 2 +- .../fortran_wrapper/fastjet_fortran_example.f | 2 +- fastjet/fortran_wrapper/fastjetfortran.cc | 322 +- fastjet/include/Makefile.in | 2 +- fastjet/include/fastjet/ActiveAreaSpec.hh | 4 +- fastjet/include/fastjet/AreaDefinition.hh | 13 +- fastjet/include/fastjet/CircularRange.hh | 20 +- fastjet/include/fastjet/ClusterSequence.hh | 28 +- .../ClusterSequence1GhostPassiveArea.hh | 6 +- .../fastjet/ClusterSequenceActiveArea.hh | 8 +- ...ClusterSequenceActiveAreaExplicitGhosts.hh | 4 +- .../include/fastjet/ClusterSequenceArea.hh | 26 +- .../fastjet/ClusterSequenceAreaBase.hh | 40 +- .../fastjet/ClusterSequencePassiveArea.hh | 4 +- .../fastjet/ClusterSequenceStructure.hh | 4 +- .../fastjet/ClusterSequenceVoronoiArea.hh | 4 +- .../fastjet/ClusterSequenceWithArea.hh | 4 +- .../include/fastjet/CompositeJetStructure.hh | 10 +- fastjet/include/fastjet/Error.hh | 34 +- .../include/fastjet/FunctionOfPseudoJet.hh | 8 +- fastjet/include/fastjet/GhostedAreaSpec.hh | 189 +- fastjet/include/fastjet/JetDefinition.hh | 8 +- fastjet/include/fastjet/LimitedWarning.hh | 56 +- fastjet/include/fastjet/Makefile.in | 2 +- fastjet/include/fastjet/NNBase.hh | 4 +- fastjet/include/fastjet/NNFJN2Plain.hh | 6 +- fastjet/include/fastjet/NNFJN2Tiled.hh | 8 +- fastjet/include/fastjet/NNH.hh | 6 +- fastjet/include/fastjet/PseudoJet.hh | 103 +- .../include/fastjet/PseudoJetStructureBase.hh | 4 +- fastjet/include/fastjet/RangeDefinition.hh | 12 +- fastjet/include/fastjet/RectangularGrid.hh | 12 +- fastjet/include/fastjet/Selector.hh | 4 +- fastjet/include/fastjet/SharedPtr.hh | 363 +- fastjet/include/fastjet/WrappedStructure.hh | 18 +- fastjet/include/fastjet/config_win.h | 12 +- .../include/fastjet/internal/BasicRandom.hh | 61 +- .../include/fastjet/internal/ClosestPair2D.hh | 4 +- .../fastjet/internal/ClosestPair2DBase.hh | 4 +- .../fastjet/internal/ClusterSequence_N2.icc | 2 +- .../fastjet/internal/Dnn2piCylinder.hh | 4 +- .../fastjet/internal/Dnn3piCylinder.hh | 4 +- .../fastjet/internal/Dnn4piCylinder.hh | 4 +- fastjet/include/fastjet/internal/DnnPlane.hh | 4 +- .../internal/DynamicNearestNeighbours.hh | 4 +- fastjet/include/fastjet/internal/IsBase.hh | 4 +- .../include/fastjet/internal/LazyTiling25.hh | 4 +- .../include/fastjet/internal/LazyTiling9.hh | 4 +- .../fastjet/internal/LazyTiling9Alt.hh | 4 +- .../internal/LazyTiling9SeparateGhosts.hh | 6 +- .../fastjet/internal/LimitedWarning.hh | 4 +- fastjet/include/fastjet/internal/Makefile.am | 3 +- fastjet/include/fastjet/internal/Makefile.in | 5 +- fastjet/include/fastjet/internal/MinHeap.hh | 4 +- .../include/fastjet/internal/SearchTree.hh | 4 +- .../include/fastjet/internal/TilingExtent.hh | 4 +- .../include/fastjet/internal/Triangulation.hh | 4 +- fastjet/include/fastjet/internal/Voronoi.hh | 4 +- fastjet/include/fastjet/internal/base.hh | 4 +- .../include/fastjet/internal/deprecated.hh | 21 +- fastjet/include/fastjet/internal/numconsts.hh | 4 +- .../fastjet/internal/thread_safety_helpers.hh | 250 + fastjet/include/fastjet/version.hh | 4 +- fastjet/install-sh | 148 +- fastjet/ltmain.sh | 4 +- fastjet/m4/libtool.m4 | 4 +- fastjet/plugins/ATLASCone/ATLASConePlugin.cc | 9 +- fastjet/plugins/ATLASCone/CommonUtils.hh | 2 +- fastjet/plugins/ATLASCone/Jet.cc | 2 +- fastjet/plugins/ATLASCone/Jet.hh | 2 +- .../plugins/ATLASCone/JetConeFinderTool.cc | 2 +- .../plugins/ATLASCone/JetConeFinderTool.hh | 2 +- fastjet/plugins/ATLASCone/JetDistances.hh | 2 +- .../plugins/ATLASCone/JetSplitMergeTool.cc | 2 +- .../plugins/ATLASCone/JetSplitMergeTool.hh | 2 +- fastjet/plugins/ATLASCone/LorentzVector.hh | 2 +- fastjet/plugins/ATLASCone/Makefile.in | 2 +- .../ATLASCone/fastjet/ATLASConePlugin.hh | 7 +- fastjet/plugins/ATLASCone/fastjet/Makefile.in | 2 +- fastjet/plugins/CDFCones/CDFJetCluPlugin.cc | 9 +- fastjet/plugins/CDFCones/CDFMidPointPlugin.cc | 9 +- fastjet/plugins/CDFCones/CDFcode/Makefile.in | 2 +- fastjet/plugins/CDFCones/Makefile.in | 2 +- .../CDFCones/fastjet/CDFJetCluPlugin.hh | 7 +- .../CDFCones/fastjet/CDFMidPointPlugin.hh | 7 +- fastjet/plugins/CDFCones/fastjet/Makefile.in | 2 +- .../CMSIterativeConePlugin.cc | 7 +- fastjet/plugins/CMSIterativeCone/Makefile.in | 2 +- .../fastjet/CMSIterativeConePlugin.hh | 5 +- .../CMSIterativeCone/fastjet/Makefile.in | 2 +- .../D0RunICone/D0RunIBaseConePlugin.cc | 12 +- fastjet/plugins/D0RunICone/Makefile.in | 2 +- .../fastjet/D0RunIBaseConePlugin.hh | 2 +- .../D0RunICone/fastjet/D0RunIConePlugin.hh | 5 +- .../fastjet/D0RunIpre96ConePlugin.hh | 5 +- .../plugins/D0RunICone/fastjet/Makefile.in | 2 +- .../plugins/D0RunIICone/D0RunIIConePlugin.cc | 9 +- fastjet/plugins/D0RunIICone/Makefile.in | 2 +- .../D0RunIICone/fastjet/D0RunIIConePlugin.hh | 7 +- .../plugins/D0RunIICone/fastjet/Makefile.in | 2 +- .../plugins/EECambridge/EECambridgePlugin.cc | 4 +- fastjet/plugins/EECambridge/Makefile.in | 2 +- .../EECambridge/fastjet/EECambridgePlugin.hh | 4 +- .../plugins/EECambridge/fastjet/Makefile.in | 2 +- fastjet/plugins/GridJet/GridJetPlugin.cc | 2 +- fastjet/plugins/GridJet/Makefile.in | 2 +- .../plugins/GridJet/fastjet/GridJetPlugin.hh | 2 +- fastjet/plugins/GridJet/fastjet/Makefile.in | 2 +- fastjet/plugins/Jade/JadePlugin.cc | 4 +- fastjet/plugins/Jade/Makefile.in | 2 +- fastjet/plugins/Jade/fastjet/JadePlugin.hh | 4 +- fastjet/plugins/Jade/fastjet/Makefile.in | 2 +- fastjet/plugins/Makefile.in | 2 +- fastjet/plugins/NestedDefs/Makefile.in | 2 +- .../plugins/NestedDefs/NestedDefsPlugin.cc | 4 +- .../plugins/NestedDefs/fastjet/Makefile.in | 2 +- .../NestedDefs/fastjet/NestedDefsPlugin.hh | 4 +- fastjet/plugins/PxCone/Makefile.in | 2 +- fastjet/plugins/PxCone/PxConePlugin.cc | 16 +- fastjet/plugins/PxCone/fastjet/Makefile.in | 2 +- .../plugins/PxCone/fastjet/PxConePlugin.hh | 22 +- fastjet/plugins/SISCone/Makefile.in | 2 +- fastjet/plugins/SISCone/SISConePlugin.cc | 2 +- fastjet/plugins/SISCone/fastjet/Makefile.in | 2 +- fastjet/plugins/SISCone/siscone/Makefile.in | 8 +- fastjet/plugins/SISCone/siscone/aclocal.m4 | 13 +- fastjet/plugins/SISCone/siscone/configure | 11 +- .../SISCone/siscone/examples/Makefile.in | 2 +- .../siscone/examples/events/Makefile.in | 2 +- .../plugins/SISCone/siscone/examples/main.cpp | 4 +- .../SISCone/siscone/examples/options.cpp | 4 +- .../SISCone/siscone/examples/options.h | 4 +- .../SISCone/siscone/examples/sample.cpp | 4 +- .../plugins/SISCone/siscone/examples/test.cpp | 4 +- .../SISCone/siscone/examples/times.cpp | 4 +- fastjet/plugins/SISCone/siscone/install-sh | 148 +- fastjet/plugins/SISCone/siscone/ltmain.sh | 4 +- fastjet/plugins/SISCone/siscone/m4/libtool.m4 | 4 +- .../SISCone/siscone/siscone/Makefile.in | 2 +- .../plugins/SISCone/siscone/siscone/defines.h | 4 +- .../SISCone/siscone/siscone/geom_2d.cpp | 4 +- .../plugins/SISCone/siscone/siscone/geom_2d.h | 4 +- .../plugins/SISCone/siscone/siscone/hash.cpp | 4 +- .../plugins/SISCone/siscone/siscone/hash.h | 4 +- .../SISCone/siscone/siscone/momentum.cpp | 4 +- .../SISCone/siscone/siscone/momentum.h | 4 +- .../SISCone/siscone/siscone/protocones.cpp | 4 +- .../SISCone/siscone/siscone/protocones.h | 4 +- .../SISCone/siscone/siscone/quadtree.cpp | 4 +- .../SISCone/siscone/siscone/quadtree.h | 4 +- .../SISCone/siscone/siscone/reference.cpp | 4 +- .../SISCone/siscone/siscone/reference.h | 4 +- .../SISCone/siscone/siscone/siscone.cpp | 4 +- .../plugins/SISCone/siscone/siscone/siscone.h | 4 +- .../SISCone/siscone/siscone/siscone_error.cpp | 4 +- .../SISCone/siscone/siscone/siscone_error.h | 4 +- .../siscone/siscone/spherical/Makefile.in | 2 +- .../siscone/siscone/spherical/geom_2d.cpp | 4 +- .../siscone/siscone/spherical/geom_2d.h | 4 +- .../siscone/siscone/spherical/hash.cpp | 4 +- .../SISCone/siscone/siscone/spherical/hash.h | 4 +- .../siscone/siscone/spherical/momentum.cpp | 4 +- .../siscone/siscone/spherical/momentum.h | 4 +- .../siscone/siscone/spherical/protocones.cpp | 4 +- .../siscone/siscone/spherical/protocones.h | 4 +- .../siscone/siscone/spherical/siscone.cpp | 4 +- .../siscone/siscone/spherical/siscone.h | 4 +- .../siscone/siscone/spherical/split_merge.cpp | 4 +- .../siscone/siscone/spherical/split_merge.h | 4 +- .../siscone/siscone/spherical/vicinity.cpp | 4 +- .../siscone/siscone/spherical/vicinity.h | 4 +- .../SISCone/siscone/siscone/split_merge.cpp | 4 +- .../SISCone/siscone/siscone/split_merge.h | 4 +- .../SISCone/siscone/siscone/vicinity.cpp | 4 +- .../SISCone/siscone/siscone/vicinity.h | 4 +- fastjet/plugins/TrackJet/Makefile.in | 2 +- fastjet/plugins/TrackJet/TrackJetPlugin.cc | 9 +- fastjet/plugins/TrackJet/fastjet/Makefile.in | 2 +- .../TrackJet/fastjet/TrackJetPlugin.hh | 7 +- fastjet/pyinterface/Makefile.am | 6 +- fastjet/pyinterface/Makefile.in | 60 +- fastjet/pyinterface/fastjet.i | 87 +- fastjet/pyinterface/fastjet.py | 116 +- fastjet/pyinterface/swig_wrap.cpp | 14297 ++++++++-------- fastjet/src/AreaDefinition.cc | 4 +- fastjet/src/BasicRandom.cc | 8 +- fastjet/src/ClosestPair2D.cc | 4 +- fastjet/src/ClusterSequence.cc | 59 +- .../src/ClusterSequence1GhostPassiveArea.cc | 4 +- fastjet/src/ClusterSequenceActiveArea.cc | 4 +- ...ClusterSequenceActiveAreaExplicitGhosts.cc | 4 +- fastjet/src/ClusterSequenceArea.cc | 4 +- fastjet/src/ClusterSequenceAreaBase.cc | 4 +- fastjet/src/ClusterSequencePassiveArea.cc | 4 +- fastjet/src/ClusterSequenceStructure.cc | 9 +- fastjet/src/ClusterSequenceVoronoiArea.cc | 4 +- fastjet/src/ClusterSequence_CP2DChan.cc | 4 +- fastjet/src/ClusterSequence_Delaunay.cc | 6 +- fastjet/src/ClusterSequence_DumbN3.cc | 4 +- fastjet/src/ClusterSequence_N2.cc | 4 +- fastjet/src/ClusterSequence_TiledN2.cc | 4 +- fastjet/src/CompositeJetStructure.cc | 6 +- fastjet/src/Dnn2piCylinder.cc | 4 +- fastjet/src/Dnn3piCylinder.cc | 4 +- fastjet/src/Dnn4piCylinder.cc | 4 +- fastjet/src/DnnPlane.cc | 4 +- fastjet/src/Error.cc | 42 +- fastjet/src/FunctionOfPseudoJet.cc | 6 +- fastjet/src/GhostedAreaSpec.cc | 60 +- fastjet/src/JetDefinition.cc | 7 +- fastjet/src/LazyTiling25.cc | 4 +- fastjet/src/LazyTiling9.cc | 4 +- fastjet/src/LazyTiling9Alt.cc | 4 +- fastjet/src/LazyTiling9SeparateGhosts.cc | 8 +- fastjet/src/LimitedWarning.cc | 90 +- fastjet/src/Makefile.in | 2 +- fastjet/src/MinHeap.cc | 4 +- fastjet/src/PseudoJet.cc | 116 +- fastjet/src/PseudoJetStructureBase.cc | 4 +- fastjet/src/RangeDefinition.cc | 4 +- fastjet/src/RectangularGrid.cc | 4 +- fastjet/src/Selector.cc | 4 +- fastjet/src/TilingExtent.cc | 4 +- fastjet/src/Voronoi.cc | 4 +- fastjet/src/genconfig.sh | 2 +- fastjet/test-driver | 8 +- fastjet/tools/BackgroundEstimatorBase.cc | 33 +- fastjet/tools/CASubJetTagger.cc | 8 +- fastjet/tools/Filter.cc | 16 +- .../tools/GridMedianBackgroundEstimator.cc | 115 +- fastjet/tools/JHTopTagger.cc | 12 +- fastjet/tools/JetMedianBackgroundEstimator.cc | 551 +- fastjet/tools/Makefile.in | 2 +- fastjet/tools/MassDropTagger.cc | 8 +- fastjet/tools/Pruner.cc | 4 +- fastjet/tools/Recluster.cc | 4 +- fastjet/tools/RestFrameNSubjettinessTagger.cc | 10 +- fastjet/tools/Subtractor.cc | 17 +- fastjet/tools/TopTaggerBase.cc | 6 +- fastjet/tools/fastjet/Makefile.in | 2 +- .../fastjet/tools/BackgroundEstimatorBase.hh | 290 +- fastjet/tools/fastjet/tools/Boost.hh | 10 +- fastjet/tools/fastjet/tools/CASubJetTagger.hh | 10 +- fastjet/tools/fastjet/tools/Filter.hh | 12 +- .../tools/GridMedianBackgroundEstimator.hh | 103 +- fastjet/tools/fastjet/tools/JHTopTagger.hh | 10 +- .../tools/JetMedianBackgroundEstimator.hh | 213 +- fastjet/tools/fastjet/tools/Makefile.in | 2 +- fastjet/tools/fastjet/tools/MassDropTagger.hh | 10 +- fastjet/tools/fastjet/tools/Pruner.hh | 8 +- fastjet/tools/fastjet/tools/Recluster.hh | 6 +- .../tools/RestFrameNSubjettinessTagger.hh | 12 +- fastjet/tools/fastjet/tools/Subtractor.hh | 13 +- fastjet/tools/fastjet/tools/TopTaggerBase.hh | 8 +- fastjet/tools/fastjet/tools/Transformer.hh | 10 +- 291 files changed, 12341 insertions(+), 8891 deletions(-) create mode 100644 fastjet/include/fastjet/internal/thread_safety_helpers.hh mode change 100644 => 100755 fastjet/ltmain.sh mode change 100644 => 100755 fastjet/plugins/SISCone/siscone/ltmain.sh diff --git a/fastjet/ChangeLog b/fastjet/ChangeLog index 3c61cf0..acb73ee 100644 --- a/fastjet/ChangeLog +++ b/fastjet/ChangeLog @@ -1,3 +1,349 @@ +========== CHANGELOG FILE FOR FastJet ================================= +2021-06-25 FastJet team + + Release of FastJet fastjet-3.4.0 + +2021-06-25 Fri + Gregory & Matteo + + * NEWS: + prepared news for 3.4.0 release + + * include/fastjet/Error.hh + * include/fastjet/LimitedWarning.hh + * src/Error.cc + * src/LimitedWarning.cc + * testsuite/TestThreadsBase.hh + * testsuite/mkmk + * testsuite/thread_safety_tests.cc + + added set_default_stream_and_mutex to Error and LimitedWarning, + to allow users to set a mutex for I/O to the specified stream, + so that the stream I/O locks the supplied mutex before the output, + to help avoid garbled output. + + Also added some related checks in the testsuite. + +2021-03-10 FastJet team + + Release of FastJet 3.4.1-beta.1 + +2021-03-10 Gregory Soyez + + * src/genconfig.sh: + * configure.ac: + fixed issue in version parsing. The approach now supports version + numbers with a pre-release tag containing a dot, such as + X.Y.Z-beta.K + +2021-03-06 Sat + + * regression-tests/nightly-check.pl: + added gcc-10.2 to list of checks + +2021-03-05 Matteo Cacciari + + * tools/JetMedianBackgroundEstimator.cc: + removed a typo (;; instead of ;) + + * doc/fastjet-doc.tex + updated affiliation and reworked a sentence in the quickstart guide + +2021-03-05 Gregory Soyez + + * tools/JetMedianBackgroundEstimator.cc: + fixed issue of reference unset when computing empty areas w local + selectors (and checked no other misused were spotted) + +2021-03-04 Gregory Soyez + + * src/GhostedAreaSpec.cc: + fixed memory leak in add ghost (new without delete) + +2021-03-03 Wed + Gregory + Matteo + + * plugins/SISCone/siscone: + moved from 3.0.6-devel to 3.0.5 (in preparation for release) + + * tools/JetMedianBackgroundEstimator.cc: + fixed potential bug in jets_used() introduced earlier as part of + thread-safety changes, to do with selector reference not being + properly set. + +2021-02-27 Gregory Soyez + + * almost all cc and hh files: + updated the header to include the correct years in the copyright + +2021-02-27 Gregory Soyez + + * include/fastjet/CompositeJetStructure.hh + * include/fastjet/FunctionOfPseudoJet.hh + * include/fastjet/NNFJN2Plain.hh + * include/fastjet/NNFJN2Tiled.hh + * include/fastjet/NNH.hh + * plugins/ATLASCone/CommonUtils.cc + * plugins/ATLASCone/CommonUtils.hh + * plugins/ATLASCone/Jet.cc + * plugins/ATLASCone/Jet.hh + * plugins/ATLASCone/JetConeFinderTool.cc + * plugins/ATLASCone/JetConeFinderTool.hh + * plugins/ATLASCone/JetDistances.hh + * plugins/ATLASCone/JetSplitMergeTool.cc + * plugins/ATLASCone/JetSplitMergeTool.hh + * plugins/ATLASCone/LorentzVector.hh + * src/CompositeJetStructure.cc + * src/FunctionOfPseudoJet.cc + * tools/CASubJetTagger.cc + * tools/Filter.cc + * tools/JHTopTagger.cc + * tools/JetMedianBackgroundEstimator.cc + * tools/MassDropTagger.cc + * tools/Recluster.cc + * tools/RestFrameNSubjettinessTagger.cc + * tools/TopTaggerBase.cc + * tools/fastjet/tools/BackgroundEstimatorBase.hh + * tools/fastjet/tools/Boost.hh + * tools/fastjet/tools/CASubJetTagger.hh + * tools/fastjet/tools/Filter.hh + * tools/fastjet/tools/JHTopTagger.hh + * tools/fastjet/tools/JetMedianBackgroundEstimator.hh + * tools/fastjet/tools/MassDropTagger.hh + * tools/fastjet/tools/Recluster.hh + * tools/fastjet/tools/RestFrameNSubjettinessTagger.hh + * tools/fastjet/tools/TopTaggerBase.hh + * tools/fastjet/tools/Transformer.hh: + used + #include "fastjet/..." + instead of + #include + to facilitate integration with the Cxx.jl tool. + Solves issue 2020-01-FJ-include-char + +2021-02-26 Fri + Gregory + + * regression-tests/test-all-algs.pl + * example/fastjet_timing_plugins.cc: + added -bkgd:alt-ktR option to force background estimation to + use the kt algorithm with the specified R value and updated + test-all-algs to use that. + + This is needed because when using the same jet definition for + background estimation and subtraction, it is common for one of the + jets to coincide with the median background estimation jet, and then + the subtraction comparison of jet.pt() v. amount_to_sutract.pt() + should show something that is identically equal, but is prone to + rounding errors and the behaviour differs according to the system, + which affects whether the jet is set to zero pt or instead 4-vector + subtracted. + + also added printout of command line to fastjet_timing_plugins + + plus hopefully fixed fastjet_timing_plugins to compile again with fjcore + +2021-02-25 Gregory Soyez + + * example/fastjet_timing_plugins.cc (print_jets_bkgd): + reformatted the output for bkg estimation of subtraction + +2021-02-25 Thu + + * regression-tests/nightly-check.pl: + attempt to get thread-safety check working on orphee + + * example/fastjet_timing_plugins.cc: + removed extraneous output of pxcone info (which caused make check to fail) + + * plugins/PxCone/fastjet/PxConePlugin.hh: + removed double declaration of _first_time, which caused compilation fairly + after merge. + + * include/fastjet/GhostedAreaSpec.hh: + fixed typo in deprecation warning + +-------------------------------------------------------------------------------- +Entries above are added in the master branch +Entries below are inserted in the thread-safety branch +-------------------------------------------------------------------------------- + +2021-02-25 Thu + + *** merged fastjet-3.4.0-thread-safety-devel into master branch + +2021-02-25 Gregory Soyez + + * fortran_wrapper/fastjetfortran.cc: + implemented the missing "nocache" functions + + * fortran_wrapper/fastjetfortran.cc: + convert_input_particles now takes the list of PseudoJet to be + created as an argument (instead of returning it) + + uses jet_def.is_spherical() to decide whether to use energy or pt + ordering for the jets + +2021-02-24 Gregory Soyez + + * fortran_wrapper/fastjetfortran.cc: + added a pre-processor flag to allow one to make the cache thread-local + + started to work on providing access to the clustering routines + without caching (invalidates later calls to extract additional + info, but restores thread safety) + +2021-02-22 Gregory Soyez + Gavin (work over the past week) + + * example/07-subtraction.cc: + * tools/fastjet/tools/Subtractor.hh: + * tools/Subtractor.cc: + + percolated the changes in the various BGEs (mostly used estimate() + when possible) + + * tools/fastjet/tools/BackgroundEstimatorBase.hh: + * tools/fastjet/tools/GridMedianBackgroundEstimator.hh: + * tools/fastjet/tools/JetMedianBackgroundEstimator.hh: + * tools/BackgroundEstimatorBase.cc: + * tools/GridMedianBackgroundEstimator.cc: + * tools/JetMedianBackgroundEstimator.cc: + + worked on making the background estimation thread-safe: + - inserted a copy() mechanism + set_particles_with_seeds to allow + for a thread-safe usage of multiple events in parallel + + - made sure that the access to the cache is safe when calling the + BGE across different threadds sharing the same event (i.e. after + the call to set_... have all been made) + - included a BackgrounmdEstimate class that gets filled when calling + BGE::estimate() + + +2020-09-15 Gregory Soyez + + * merged master branch back into the thread-safety branch + + Questions left to possible double-check: + - do we uncomment L592, 607 of PseudoJet.cc? + Based on what I see in SharedPtr we should leave this commented + - Extras in ClusterSequence.hh? + they were commented out in the branch and used an old auto_ptr, + but it seems like the new syntax from the master branch should + work + - check the deprecation syntax: (message,func) + + * configure.ac + * include/fastjet/internal/deprecated.hh + * include/fastjet/CircularRange.hh + * include/fastjet/ClusterSequence.hh + * include/fastjet/ClusterSequenceAreaBase.hh + * include/fastjet/GhostedAreaSpec.hh + * include/fastjet/JetDefinition.hh + * include/fastjet/RangeDefinition.hh + * include/fastjet/SharedPtr.hh + * m4/CGAL.m4 + * src/ClusterSequence_Delaunay.cc + * src/PseudoJet.cc + Those files had conflicts during the merge + Everything has been fixed easily (leftover comments are above). + + Other things: + * testsuite/thread_safety_tests.cc + added for testing a range of aspects of thread safety + * tools/Subtractor.cc: + switched to use of BackgroundEstimate + +-------------------------------------------------------------------------------- +Entries above are inserted in the thread-safety branch +Entries below are added in the master branch +-------------------------------------------------------------------------------- + +2021-02-22 Gregory Soyez + + * fortran_wrapper/fastjetfortran.cc: + used an ordering in energy when using the eegenkt algorithm + +2021-02-22 Gregory Soyez + + * plugins/PxCone/fastjet/PxConePlugin.hh: + * plugins/PxCone/PxConePlugin.cc: + allowed one to run in e+e- mode (setting mode=1 instead of the + default mode=2) + +2021-02-19 Fri + + * regression-tests/README.md: (*** ADDED ***) + * regression-tests/test-contrib.pl: + added some basic documentation + option -std=c+XX + + * example/fastjet_timing_plugins.cc: + added -bkgd:localrange option to turn on usage of a local range + with the JetMedianBackgroundEstimator (in which case rho, sigma etc. + are printed out for each jet). + Added a -bkgd:rescaling option to turn on usage of a rescaling + function (should not be used with a localrange). + Also added a -subtractor option, which works with GMBGE and JMBGE + and prints out the original jets (including rho info) and the + subtracted jets + + * regression-tests/test-all-algs.pl: + added extra runs with the -bkgds (-cam) option, running various subtractions, + and added corresponding references checksums + +2021-02-14 Gavin Salam + * INSTALL instructions from git now mention running autoreconf in + siscone directory as well. + +2021-01-08 Gavin Salam + + * regression-tests/nightly-check.pl: + temporarily removed karnak because the machine is offline. + +2021-01-06 Gregory Soyez + + * include/fastjet/Error.hh: + removed the inheritance on std::exception for 2 reasons: (i) is + causes issues w old compilers (throw() v. noexcept v. no + qualifiers) and (ii) doing this properly also requires defining + "virtual const char* what()" + +2021-01-05 Gregory Soyez + + * include/fastjet/Error.hh: + had the Error class derive from std::exception + + * pyinterface/fastjet.i: + included a few fixes suggested by Patrick Komiske: + - installed a few files so they're acceessible for projects + derived from FJ to define their own wrapper + - improved exceptions (throws a FastJetError py exception) + - defined a data table + +2020-09-11 Gavin Salam + + * INSTALL + updated instructions for usage with git + + * regression-tests/nightly-check.pl: + updated nightly-check.pl to work with git + +2020-09-11 Gregory Soyez + + * example/fastjet_timing_plugins.cc: + caught an "Error" exception by reference instead of by value + +2020-07-02 Gavin Salam + + * example/python/02-area.py: + fixed bug in area printout (format string and argument) + reported by Michael Neidhard Heinz. + +2020-05-05 Gregory Soyez + + * configure.ac: + * include/fastjet/config_win.h: + * Doxyfile: + * tex/fastjet-doc.tex: + changed version to 3.3.5-devel + 2020-05-05 Gregory Soyez * Release of FastJet fastjet-3.3.4 @@ -605,7 +951,7 @@ At this stage, more testing (incl memory management) is needed * pyinterface/Makefile.am: - fixed fate of swig_wrp.cpp and fastjet.i during make dist + fixed fate of swig_wrap.cpp and fastjet.i during make dist 2017-02-10 Gavin Salam @@ -1444,10 +1790,523 @@ JetDefinition::operator() to solve issues with root5 reported by Adrian Sevcenco. +-------------------------------------------------------------------------------- +Entries below are in the thread-safety branch +Entries above were added while nmerging the master branch +-------------------------------------------------------------------------------- + +2017-02-08 Gregory Soyez + + * include/fastjet/ClusterSequenceActiveArea.hh (ClusterSequenceAreaBase): + added FASTJET_OVERRIDE + + * include/fastjet/internal/BasicRandom.hh: + added the "thread-safe" generation of random numbers to the + specialisation + + Tidied up the changes compared to the original version at the topo + of the file + +2016-03-02 Gregory Soyez + + * include/fastjet/LimitedWarning.hh: + * include/fastjet/internal/thread_safety_helpers.hh: + added copy ctors for a unch of classes that contain atomic + member(s) + + * include/fastjet/internal/LazyTiling9SeparateGhosts.hh: + removed commented code (atomic ghost_pt2_threshold which we + decided not to go for) + +2016-03-01 Gregory Soyez + + * tools/fastjet/tools/JetMedianBackgroundEstimator.hh: + * tools/JetMedianBackgroundEstimator.cc: + added an explicit copy ctor + + * tools/JetMedianBackgroundEstimator.cc: + _get_value_reference(...) fixed a series of issues with acquiring + and releasing locks (much more involved that initially thought). + + Note that one might wonder if that is necessary at all since + rho(jet) operations are non-const, we have no obligation to + guarantee their thread-safety! + +2015-09-30 Gregory Soyez + + * include/fastjet/internal/BasicRandom.hh: + * include/fastjet/GhostedAreaSpec.hh: + minor modifications to comments + + * tools/fastjet/tools/Pruner.hh: + mentioned that PruningRecombiner::_rejected could be thread + unsafe. Note that we do not fix that because that class is meant + for internal usage only. So we just added a comment. + +2015-09-29 Gregory Soyez + + * tools/JetMedianBackgroundEstimator.cc: + declared _status as int or atomic since atiomic is + apparently not supported by all compilers [gcc 4.6 and icpc]. + + * include/fastjet/internal/LazyTiling9SeparateGhosts.hh: + * src/LazyTiling9SeparateGhosts.cc: + moved back to "ghost_pt2_threshold" declared as double and not + atomic. The latter is not supported by gcc-4.6 and + icpc(v13 and 15). Furthermore, it's the end-userresponsibility to + ensure thread-safety if (s)he writes to that variable. + + Note: one might consider the alternative of having a + set_ghost_pt2_tyhreshold where we do care of thread-safety + + * src/LimitedWarning.cc: + explicitly cast the _this_warning_summary variable to a pointer of + type LimitedWarning::Summary* before testing if it is 0. + + This is harmless wo thread-safety enabled and is perfectly fine + with the atomic version when thread-safety is switched on. Not + doing the cast explicitly, the intel compiler (v13 and 15 tested) + are confused between different versions of the == operator. + + * tools/fastjet/tools/JetMedianBackgroundEstimator.hh: + * tools/JetMedianBackgroundEstimator.cc: + moved the templated implementations to the header file; + removed a few unneeded template specifications + + added std:: before the memory order + + * include/fastjet/internal/BasicRandom.hh: + added a missing "#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY" + around the declaration of the mutex + + * tools/fastjet/tools/JetMedianBackgroundEstimator.hh: + * tools/JetMedianBackgroundEstimator.cc: + Stored cached results in a JMBGEResult internal class. + Implemented a thread-safe version. + +2015-09-25 Gregory Soyez + + * include/fastjet/ClusterSequence1GhostPassiveArea.hh: + * include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh: + * include/fastjet/ClusterSequenceActiveArea.hh: + * include/fastjet/ClusterSequenceArea.hh: + * include/fastjet/ClusterSequencePassiveArea.hh: + * include/fastjet/CircularRange.hh: + * include/fastjet/RectangularGrid.hh: + * include/fastjet/ClusterSequenceStructure.hh: + * include/fastjet/CompositeJetStructure.hh: + * include/fastjet/WrappedStructure.hh: + * include/fastjet/JetDefinition.hh (DefaultRecombiner): + added FASTJET_OVERRIDE where needed + + * include/fastjet/internal/base.hh: + introduced a FASTJET_OVERRIDE macro that, when supported, allows + one to flag a method as having to be overriding the same method in + the base class. This would help finding typos (or constness + mismatches) in derived classes. + + * include/fastjet/GhostedAreaSpec.hh: + * src/GhostedAreaSpec.cc: + * include/fastjet/AreaDefinition.hh: + Tentative implementation of thread-safety: + + By default, add_ghost locks (with a mutex) during the time it + generates the random numbers needed for the ghosts. + The seed used for that can be obtained using + GhostedAreaSpec::get_used_random_seed() after the clustering [this + is fine because ClusterSequenceArea stores a copy of it]. + + If one wants to use a fixed set of seeds, you should use a local + copy of the GhostedAreaSpec using + GhostedAreaSpec::with_fixed_seed(seed). Note that this will fix + the seed to that value [and a lock is no longer needed because we + can use a copy of the random number generator] + + In practice, one can get a copy of the AreaDefinition using + AreaDefinition::with_fixed_seed(seed). + + Note / OPEN QUESTION: + --------------------- + this does not work for n_repeat>1 since the same seed will be used + for each ghost set. The workaround would be to have the fixed_seed + updated to the generator status at the end of eachset [requires to + 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 + it is not supported by Apple's version of clang. + + * include/fastjet/internal/BasicRandom.hh: + * src/BasicRandom.cc: + added a operator()(N, *array, seed) which would lock (using a + mutex) during the time the N random numbers are genrated and + return in 'seed' te initial seed used to generate the numbers + + * include/fastjet/ClusterSequence.hh : + marked plugin_associate_extras(std::auto_ptr) as deprecated + + * include/fastjet/internal/deprecated.hh: + added a compiler way to deprecate functions using the + FASTJET_DEPRECATED(func[,message]) macro. + + * src/LimitedWarning.cc: + fixed a missed switch to FASTJET_HAVE_LIMITED_THREAD_SAFETY. + [tested using grep that none are left over] + +2015-09-24 Gregory Soyez + + * include/fastjet/ClusterSequence.hh: + * src/ClusterSequence.cc: + put the banner printing (including the optional ostream) into + FASTJET_HAVE_LIMITED_THREAD_SAFETY and the CS self-deletion in + FASTJET_HAVE_THREAD_SAFETY. + + * include/fastjet/PseudoJet.hh: + put _init_status in a code onlly used with thread safety + + * include/fastjet/PseudoJet.hh: + * src/PseudoJet.cc: + * include/fastjet/SharedPtr.hh: + used the FASTJET_HAVE_THREAD_SAFETY confgure define + + * src/LimitedWarning.cc: + * include/fastjet/LimitedWarning.hh: + * src/Error.cc: + * include/fastjet/Error.hh: + * src/LazyTiling9SeparateGhosts.cc: + * include/fastjet/internal/LazyTiling9SeparateGhosts.hh: + * include/fastjet/GhostedAreaSpec.hh: + * src/GhostedAreaSpec.cc: + used the FASTJET_HAVE_LIMITED_THREAD_SAFETY confgure define + + * plugins/ATLASCone/ATLASConePlugin.cc: + * plugins/ATLASCone/fastjet/ATLASConePlugin.hh: + * plugins/CDFCones/CDFJetCluPlugin.cc: + * plugins/CDFCones/CDFMidPointPlugin.cc: + * plugins/CDFCones/fastjet/CDFJetCluPlugin.hh: + * plugins/CDFCones/fastjet/CDFMidPointPlugin.hh: + * plugins/CMSIterativeCone/CMSIterativeConePlugin.cc: + * plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh: + * plugins/D0RunICone/D0RunIBaseConePlugin.cc: + * plugins/D0RunICone/fastjet/D0RunIConePlugin.hh: + * plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh: + * plugins/D0RunIICone/D0RunIIConePlugin.cc: + * plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh: + * plugins/PxCone/PxConePlugin.cc: + * plugins/PxCone/fastjet/PxConePlugin.hh: + * plugins/TrackJet/TrackJetPlugin.cc: + * plugins/TrackJet/fastjet/TrackJetPlugin.hh: + replaced cxx11helpers::FirstTimeTrigger by + thread_safety_helpers::FirstTimeTrue + and used the FASTJET_HAVE_LIMITED_THREAD_SAFETY confgure define + + * include/fastjet/internal/cxx11helpers.hh: *** REMOVED *** + * include/fastjet/internal/thread_safety_helpers.hh: *** ADDED *** + * include/fastjet/internal/Makefile.am: + renamed cxx11helpers.hh into thread_safety_helpers.hh. + Renamed the cxx11helpers namespace into thread_safety_helpers. + Also renamed FirstTimeTrigger into FirstTimeTrue + + * include/fastjet/SahredPtr.hh: + explicitly included the header + + * m4/CGAL.m4: + improved support for compiler options (brought from the trunk) + + * config.h.in: + * configure.ac (CONFIGURE_INVOCATION): + replaced HAVE_CXX11_FEATURES by HAVE_LIMITED_THREAD_SAFETY and + HAVE_THREAD_SAFETY allowing two levels of thread-safety through + --enable-limited-thread-safety --enable-thread-safety. + + checked for support for a few specific compiler flags, (deprecated + and override), and define the appropriate symbols) + + * src/ClusterSequenceStructure.cc (ClusterSequenceStructure): + commeted out a #ifndef left over from the switch ack to our own + SharedPtr (60 lines down in the ChangeLog) + + * include/fastjet/PseudoJet.hh: + * src/PseudoJet.cc: + implemented a thread-safe version of the rap-phi initialisation. + This goes through an atomic status flag. + Notes: - it comes with a ~5% time penalty + - there might be further gain to get on memory ordering (see code) + + * include/fastjet/internal/cxx11helpers.hh (cxx11helpers): + Mostly reverted AtomicCounter to a simple stepping counter with + overflow protection. + + * include/fastjet/SharedPtr.hh: + made the internal __SharedCountingPtr inherit directly from atomic + +2015-09-23 Gregory Soyez + + * tools/fastjet/tools/Subtractor.hh: + * tools/Subtractor.cc: + made _unused_rho_m_warning static instead of mutable. + [ported from Gavin's modification in the trunk] + +2015-09-23 Gavin Salam + + * include/fastjet/internal/ClosestPair2D.hh: + * src/ClosestPair2D.cc (closest_pair): + * src/ClusterSequence_Delaunay.cc (_delaunay_cluster): + * example/fastjet_timing_plugins.cc: + * plugins/SISCone/SISConePlugin.cc: + * plugins/SISCone/SISConeSphericalPlugin.cc: + * plugins/SISCone/fastjet/SISConePlugin.hh: + * plugins/SISCone/fastjet/SISConeSphericalPlugin.hh: + * include/fastjet/ClusterSequenceArea.hh: + replaced std::auto_ptr with SharedPtr (since the former is + deprecated, unique_ptr is available only from C++11, while + SharedPtr is our own and always available). + + * example/fastjet_timing_plugins.cc: + added -cache option to turn on the SISCone cache. + + * include/fastjet/internal/cxx11helpers.hh (cxx11helpers): + added comments put together with Matteo + +2015-09-23 Gregory Soyez + + * include/fastjet/internal/cxx11helpers.hh: + added AtomicCounter::count() which just returns the value of the + counter + + * include/fastjet/PseudoJet.hh: + * include/fastjet/ClusterSequence.hh: + * src/PseudoJet.cc: + * src/ClusterSequence.cc: + used the new SharedPtr implementation which basically allows us to + revert to the use of SharedPtr::set_count(). + + The code using the standard shared_ptr has been commented out with + a std::shared_ptr: label in case we want to go back to that option + easily + + * include/fastjet/SharedPtr.hh (SharedPtr): + when C++11 featues are enabled, use our own implementation of + SharedPtr instead of the std one. This has the advantage of + providing set_count() [extremely helpful for self-deletion of + ClusterSequence]. Note that the implementation is different from + the one without C++11 features enabled (in that it uses an atomic + counter) + +2015-09-22 Gregory Soyez + + * include/fastjet/internal/cxx11helpers.hh: + fixed a bad return value for AtomicCount::set() + + * include/fastjet/internal/cxx11helpers.hh: + used the sinples fetch_add(1) option for the step. + added a few simple functionalities + +2015-09-21 Gavin Salam + + * src/PseudoJet.cc: + made _release_jet_from_cs() slightly more efficient + +2015-07-22 Gregory Soyez + + * tools/Filter.cc: + take a copy of the subtractor before using it [should guarantee + thread-safety (TBC?)] + + * include/fastjet/GhostedAreaSpec.hh (G): + added the option to specify a user-defined random generator. Typically, use + BasicRandom my_random(s1, s2); + GhostedAreaSpec(ghost_max_rap, &my_random); + + The generator is stored as a shared pointer so it takes ownership of it. + + the default BasicRandom random generator has also be made + thread-local to agrantee thread safety. + +2015-04-23 Gregory Soyez + + * include/fastjet/PseudoJet.hh: + * include/fastjet/ClusterSequence.hh: + * src/PseudoJet.cc: + * src/ClusterSequence.cc: + * src/ClusterSequenceStructure.cc: + Revamped the strategy to handle self-deleting ClusterSequences + with cxx11 features on. This follows from the fact that + std::shared_ptr does not support set_count(). + + The strategy here is to have PseudoJet tell its associated + ClusterSequence (if any) when it will no longer use the shared + pointer. This is implemented in PseudoJet::release_jet_from_cs() + which calls ClusterSequence::release_pseudojet(). + + Important technical remarks: + + - PseudoJet::release_jet_from_cs() has to be called everytime we + want to change the PJ's structure pointer. + + - for the same reason, we have to introduce explicitly the = + operator (the default would copy the structure pointer without + first calling release_jet_from_cs) + + - Since we want to keep this light, we want to avoid calling + release_jet_from_cs() from ctors (also, the shared pointers are + by default initialised to empty shared pointers). So we have + split _reset_indices() in two parts: _reset_indices() and + _reset_shared_pointers(). Only the first is called in ctors + while both at called in reset(...) + + - ClusterSequence::release_pseudojet() has to take care of a few + things. First, it is only relevant for self-deleting CS. Then, + we reset the ("calling") PJ's shared pointer before checking if + we need to delete the CS. This allows to check self-deletion using + shared_ptr.use_count == _structure_use_count_after_construction + instead of + shared_ptr.use_count == _structure_use_count_after_construction+1 + which would not be thread-safe. + However this cones with a complication that resetting the PJ's + structure pointer would call PseudoJet::release_jet_from_cs() + and result in an infinite loop. We added a + PseudoJet::force_reset_structure() to go around that issue. + + - The condition + shared_ptr.use_count == _structure_use_count_after_construction + can in principle be triggered by more than one thread deleting the + "last" PJs at the same time. This is cured by making + _deletes_self_when_unused atomic and using compare_and_exchange + to test which thread sould perform the deletion. + + - We tried to limit the computational expense as most as possible + by performing tests only when they were needed [some + improvements might be possible] + + * src/JetDefinition.cc: + work towards thread-safety and usage of std::shared_ptr. + replaced a reset(shared_ptr) by an = shared_ptr which is also + supported by C11's shared_ptr + + * src/ClusterSequence.cc: + disabled the usage of SharedPtr's set_count when CXX11 features are on. + AT THE MOMENT, CS SELF-DELETION IS BROKEN WITH CXX11FEATURES + + * include/fastjet/SharedPtr.hh: + when c++11 features are enabled, use std::shared_ptr. + Notes: + - cxx11's shared pointer does not provide set_count so this + imposes a bunch of modifications to self-deleting + ClusterSequences. + - We use C++11 alias templates. + + * include/fastjet/JetDefinition.hh: + * include/fastjet/PseudoJet.hh: + * include/fastjet/WrappedStructure.hh: + * src/PseudoJet.cc: + * src/ClusterSequence.cc: + * src/JetDefinition.cc: + * tools/JetMedianBackgroundEstimator.cc: + SharedPtr cast to bool does not need a ()! [somehow both seem to + work in our own implementation but std's implementation differs] + This has been changed in the following places; + . _user_info in PseudoJet::user_info_ptr() + . _structure in PseudoJet::has_structure_of() + . _structure in PseudoJet::structure_of() + . shared_recombiner in JetDefinition::set_recombiner() + . _structure_shared_ptr in ~ClusterSequence() + . _structure_shared_ptr in ClusterSequence::transfer_from_sequence() + . _structure in PseudoJet::description() + . _structure in PseudoJet::has_associated_cluster_sequence() + . _structure in PseudoJet::has_valid_cluster_sequence() + . _structure in PseudoJet::has_structure() + . _structure in PseudoJet::structure() + . _structure in PseudoJet::structure_non_const_ptr() + . _structure in PseudoJet::validated_structure_ptr() + . _structure in PseudoJet::has_constituents() + . _structure in PseudoJet::has_exclusive_subjets() + . _structure in PseudoJet::has_pieces() + . _structure in WrappedStructure() + . _shared_recombiner in etDefinition::set_recombination_scheme() + + We have also removed the usage of the () operator to access the + pointer and moved to the standard use of get(). Occurences in + . _structure_shared_ptr in ~ClusterSequence() + . _structure_shared_ptr in ClusterSequence::transfer_from_sequence() + . _structure in PseudoJet::description() + . _structure in PseudoJet::structure() + . _structure in PseudoJet::structure_non_const_ptr() + . _structure in PseudoJet::validated_structure_ptr() + . _csi in JetMedianBackgroundEstimator::set_jets() + . _csi in JetMedianBackgroundEstimator::_compute() + . _csi in JetMedianBackgroundEstimator::_check_csa_alive() + . _csi in JetMedianBackgroundEstimator::_check_jet_alg_good_for_median() + + * src/LimitedWarning.cc: + * include/fastjet/LimitedWarning.hh: + work towards thread-safety: _max_warn_default, _default_ostr, + _this_warning_summary as atomic. Summary switched to use the + cxx11helpers::AtomicCounter which also provides access e.g. to + n_warn_so_far. + + For warn() and summary() we use a lock (mutex) + + * src/LazyTiling9SeparateGhosts.cc: + * include/fastjet/internal/LazyTiling9SeparateGhosts.hh: + work towards thread-safety: ghost_pt2_threshold declared atomic + + * src/Error.cc: + * include/fastjet/Error.hh: + work towards thread-safety: declared _print_errors, + _print_backtrace and _default_ostr as atomic. + + * src/ClusterSequence.cc: + * include/fastjet/ClusterSequence.hh: + work towards thread-safety: + . declared _fastjet_banner_ostr as atomic + . declared _frist_time as cxx11helpers::FirstTimeTrigger + + * plugins/TrackJet/TrackJetPlugin.cc: + * plugins/TrackJet/fastjet/TrackJetPlugin.hh: + * plugins/PxCone/PxConePlugin.cc: + * plugins/PxCone/fastjet/PxConePlugin.hh: + * plugins/D0RunIICone/D0RunIIConePlugin.cc: + * plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh: + * plugins/D0RunICone/D0RunIBaseConePlugin.cc: + * plugins/D0RunICone/fastjet/D0RunIConePlugin.hh: + * plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh: + * plugins/CMSIterativeCone/CMSIterativeConePlugin.cc: + * plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh: + * plugins/CDFCones/CDFMidPointPlugin.cc: + * plugins/CDFCones/fastjet/CDFMidPointPlugin.hh: + * plugins/CDFCones/CDFJetCluPlugin.cc: + * plugins/CDFCones/fastjet/CDFJetCluPlugin.hh: + * plugins/ATLASCone/ATLASConePlugin.cc : + * plugins/ATLASCone/fastjet/ATLASConePlugin.hh : + + for the banner, declared _first_time as a cxx11helpers::FirstTimeTrigger + + * include/fastjet/internal/Makefile.am: + * include/fastjet/internal/cxx11helpers.hh: *** ADDED *** + added a file containing helpers that would allow an easy + transition between no-CXX11 support and CXX11 support. It + currently introduces two classes: + - FirstTimeTrigger: a class that will return true the first time + its () operator is called, false afterwards. + - AtomicCounter: a thread-safe counter when cxx11 features are + on. Use step() to increment, () to get value. + + * config.h.in: + added a HAVE_CXX11_FEATURES entry + + Note: also added a definition of PACKAGE_URL which should be + automatically included by autoconf >= 2.64 (available since July + 2009) + +-------------------------------------------------------------------------------- +Branching into the thread-safety branch: above comments were added in the branch +-------------------------------------------------------------------------------- + 2015-04-22 Gregory Soyez * configure.ac: - added a --enable-cxx11-features argument to configure which in + added a --enable-c++11-features argument to configure which in turn defines a FASTJET_HAVE_CXX11_FEATURES pre-processor symbol in fastjet/config.h diff --git a/fastjet/Doxyfile b/fastjet/Doxyfile index c8a4490..14dab63 100644 --- a/fastjet/Doxyfile +++ b/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 diff --git a/fastjet/INSTALL b/fastjet/INSTALL index 176545d..0ef44c3 100644 --- a/fastjet/INSTALL +++ b/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 ------------ diff --git a/fastjet/Makefile.in b/fastjet/Makefile.in index dad6a2b..ba24cb2 100644 --- a/fastjet/Makefile.in +++ b/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 \ diff --git a/fastjet/NEWS b/fastjet/NEWS index 6b91755..4e11e25 100644 --- a/fastjet/NEWS +++ b/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 ================================================================ diff --git a/fastjet/aclocal.m4 b/fastjet/aclocal.m4 index f99f34f..8109e02 100644 --- a/fastjet/aclocal.m4 +++ b/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 diff --git a/fastjet/config.h.in b/fastjet/config.h.in index e3bfccf..354eb32 100644 --- a/fastjet/config.h.in +++ b/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 header file. */ #undef HAVE_MEMORY_H @@ -94,6 +97,9 @@ /* Define to 1 if you have the 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 header file. */ #undef HAVE_UNISTD_H diff --git a/fastjet/configure b/fastjet/configure index e00e999..1205fa3 100755 --- a/fastjet/configure +++ b/fastjet/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for FastJet 3.3.4. +# Generated by GNU Autoconf 2.69 for FastJet 3.4.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='FastJet' PACKAGE_TARNAME='fastjet' -PACKAGE_VERSION='3.3.4' -PACKAGE_STRING='FastJet 3.3.4' +PACKAGE_VERSION='3.4.0' +PACKAGE_STRING='FastJet 3.4.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -834,6 +834,8 @@ enable_dependency_tracking enable_debug enable_extra_warnings enable_auto_ptr +enable_limited_thread_safety +enable_thread_safety enable_shared enable_cgal with_cgalmakefile @@ -1437,7 +1439,7 @@ if test "$ac_init_help" = "long"; then # 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.3.4 to adapt to many kinds of systems. +\`configure' configures FastJet 3.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1508,7 +1510,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FastJet 3.3.4:";; + short | recursive ) echo "Configuration of FastJet 3.4.0:";; esac cat <<\_ACEOF @@ -1525,6 +1527,8 @@ Optional Features: --enable-debug Turn on debug compiler information default=yes --enable-extra-warnings Turn on additional compiler warnings default=no --enable-auto-ptr compile the deprecated parts of the interface using auto-ptr default=yes + --enable-limited-thread-safety Turn on basic thread-safety features (requires C++11) default=no + --enable-thread-safety Turn on thread-safety features (requires C++11) default=no --enable-shared[=PKGS] build shared libraries [default=yes] --enable-cgal enables link with the CGAL library default=no --enable-cgal-header-only enable build with header-only install of CGAL, e.g. as for CGALv5; in that case do not use --enable-cgal default=no @@ -1659,7 +1663,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FastJet configure 3.3.4 +FastJet configure 3.4.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2370,7 +2374,7 @@ cat >config.log <<_ACEOF 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.3.4, which was +It was created by FastJet $as_me 3.4.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2924,12 +2928,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` am_aux_dir=`cd "$ac_aux_dir" && pwd` 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 @@ -3234,7 +3233,7 @@ fi # Define the identity of the package. PACKAGE='fastjet' - VERSION='3.3.4' + VERSION='3.4.0' cat >>confdefs.h <<_ACEOF @@ -5649,6 +5648,160 @@ $as_echo "#define HAVE_AUTO_PTR_INTERFACE /**/" >>confdefs.h fi +# Check whether --enable-limited-thread-safety was given. +if test "${enable_limited_thread_safety+set}" = set; then : + enableval=$enable_limited_thread_safety; ENABLE_LIMITED_THREAD_SAFETY_FLAG="$enableval" +else + ENABLE_LIMITED_THREAD_SAFETY_FLAG="no" +fi + +if [ "$ENABLE_LIMITED_THREAD_SAFETY_FLAG" == "yes" ] ; then + +$as_echo "#define HAVE_LIMITED_THREAD_SAFETY /**/" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Thread safety uses C++11 features and may require additional compiler arguments, these have to be specified by the user" >&5 +$as_echo "$as_me: WARNING: Thread safety uses C++11 features and may require additional compiler arguments, these have to be specified by the user" >&2;} + # one could alternately try to see what compiler flag(s) has to be included + # although that can be fairly heavy so better be moved in an ac file + # + # e.g. for g++ we could try + # AC_MSG_CHECKING([if $CXX supports -std=c++11 flag]) + # SAVE_CXXFLAGS="$CXXFLAGS" + # CXXFLAGS="-std=c++11" + # AC_LANG_PUSH(C++) + # AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void){ return 0;}])], + # [ac_cxx_eleven_ok=yes],[ac_cxx_eleven_ok=no]) + # AC_LANG_POP(C++) + # CXXFLAGS="$SAVE_CXXFLAGS" + # AC_MSG_RESULT([$ac_cxx_eleven_ok]) + # if [[ "x${ac_cxx_eleven_ok}" == "xyes" ]]; then + # AM_CXXFLAGS=${AM_CXXFLAGS}" -std=c++11 " + # fi +fi + +# Check whether --enable-thread-safety was given. +if test "${enable_thread_safety+set}" = set; then : + enableval=$enable_thread_safety; ENABLE_THREAD_SAFETY_FLAG="$enableval" +else + ENABLE_THREAD_SAFETY_FLAG="no" +fi + +if [ "$ENABLE_THREAD_SAFETY_FLAG" == "yes" ] ; then + +$as_echo "#define HAVE_LIMITED_THREAD_SAFETY /**/" >>confdefs.h + + +$as_echo "#define HAVE_THREAD_SAFETY /**/" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Thread safety uses C++11 features and may require additional compiler arguments, these have to be specified by the user" >&5 +$as_echo "$as_me: WARNING: Thread safety uses C++11 features and may require additional compiler arguments, these have to be specified by the user" >&2;} +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX $CXXFLAGS supports the \"[[deprecated]]\" keyword" >&5 +$as_echo_n "checking if $CXX $CXXFLAGS supports the \"[[deprecated]]\" keyword... " >&6; } +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -Werror=attributes" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +class A{public: [[deprecated]] void test() {}}; int main(void){ A a; a.test(); return 0;} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_has_requested_support="yes" +else + ac_compiler_has_requested_support="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CXXFLAGS="$save_CXXFLAGS" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if [ "$ac_compiler_has_requested_support" == "yes" ] ; then + +$as_echo "#define HAVE_CXX14_DEPRECATED /**/" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_compiler_has_requested_support" >&5 +$as_echo "$ac_compiler_has_requested_support" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX $CXXFLAGS supports the \"__attribute__((deprecated))\" keyword" >&5 +$as_echo_n "checking if $CXX $CXXFLAGS supports the \"__attribute__((deprecated))\" keyword... " >&6; } +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -Werror=attributes" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +class A{public: void test() __attribute__((deprecated)) {}};int main(void){ A a; a.test(); return 0;} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_has_requested_support="yes" +else + ac_compiler_has_requested_support="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CXXFLAGS="$save_CXXFLAGS" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if [ "$ac_compiler_has_requested_support" == "yes" ] ; then + +$as_echo "#define HAVE_GNUCXX_DEPRECATED /**/" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_compiler_has_requested_support" >&5 +$as_echo "$ac_compiler_has_requested_support" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX $CXXFLAGS supports the \"override\" keyword" >&5 +$as_echo_n "checking if $CXX $CXXFLAGS supports the \"override\" keyword... " >&6; } +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -Werror" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +class A{public: virtual void test(){}}; class B : public A{public: virtual void test() override{}}; int main(void){ B b; b.test(); return 0;} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_has_requested_support="yes" +else + ac_compiler_has_requested_support="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CXXFLAGS="$save_CXXFLAGS" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if [ "$ac_compiler_has_requested_support" == "yes" ] ; then + +$as_echo "#define HAVE_OVERRIDE /**/" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_compiler_has_requested_support" >&5 +$as_echo "$ac_compiler_has_requested_support" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX ${AM_CXXFLAGS} $CXXFLAGS supports the \"[[deprecated]]\" keyword" >&5 $as_echo_n "checking if $CXX ${AM_CXXFLAGS} $CXXFLAGS supports the \"[[deprecated]]\" keyword... " >&6; } @@ -10641,11 +10794,11 @@ $as_echo "$lt_cv_ld_force_load" >&6; } # 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[91]*) + 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.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -22187,7 +22340,7 @@ $as_echo_n "checking for $am_display_PYTHON version... " >&6; } if ${am_cv_python_version+:} false; then : $as_echo_n "(cached) " >&6 else - 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])"` fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 $as_echo "$am_cv_python_version" >&6; } @@ -22566,7 +22719,7 @@ ac_config_files="$ac_config_files pyinterface/Makefile" versionmajor=`echo $PACKAGE_VERSION | sed 's/^\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\).*/\1/'` versionminor=`echo $PACKAGE_VERSION | sed 's/^\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\).*/\2/'` -versionending=`echo $PACKAGE_VERSION | sed 's/^\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)$/\3/'` +versionending=`echo $PACKAGE_VERSION | sed 's/^\([^\.]*\)\.\([^\.]*\)\.\(.*\)$/\3/'` versionpatchlevel=`echo $versionending | sed 's/^\([0-9][0-9]*\).*/\1/'` versionprerelease=`echo $versionending | sed 's/^[0-9-]*//'` versionnumber=`printf "%d%.2d%.2d" "$versionmajor" "$versionminor" "$versionpatchlevel"` @@ -22616,7 +22769,15 @@ CONFIG_SUMMARY+=" Shared libraries "${enable_shared}"\n" CONFIG_SUMMARY+=" Static libraries "${enable_static}"\n" CONFIG_SUMMARY+=" Debug flag "$ENABLE_DEBUG_FLAG"\n" CONFIG_SUMMARY+=" CGAL support "${ENABLE_CGAL_FLAG}"\n" -#CONFIG_SUMMARY+=" C++11 features "${ENABLE_CXX11FEATURES_FLAG}"\n" +if [ "$ENABLE_THREAD_SAFETY_FLAG" == "yes" ]; then +CONFIG_SUMMARY+=" Thread safety yes (requires C++11)\n" +else +if [ "$ENABLE_LIMITED_THREAD_SAFETY_FLAG" == "yes" ]; then +CONFIG_SUMMARY+=" Thread safety limited (requires C++11)\n" +else +CONFIG_SUMMARY+=" Thread safety no\n" +fi +fi CONFIG_SUMMARY+=" Plugins: EECambridge "${ENABLE_EECAMBRIDGE}"\n" @@ -23237,7 +23398,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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.3.4, which was +This file was extended by FastJet $as_me 3.4.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23303,7 +23464,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -FastJet config.status 3.3.4 +FastJet config.status 3.4.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/fastjet/configure.ac b/fastjet/configure.ac index 3f3727c..93d85e4 100644 --- a/fastjet/configure.ac +++ b/fastjet/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([FastJet],[3.3.4]) +AC_INIT([FastJet],[3.4.0]) AC_CONFIG_SRCDIR([src/JetDefinition.cc]) AM_INIT_AUTOMAKE(tar-ustar) @@ -153,6 +153,88 @@ if [[ "$ENABLE_AUTO_PTR_INTERFACE" == "yes" ]] ; then AC_DEFINE(HAVE_AUTO_PTR_INTERFACE, [], [compile the deprecated parts of the interface using auto-ptr]) fi +dnl check if one wants to enable c++11 features (required e.g. for thread-safety) +dnl +dnl This defines a FASTJET_HAVE_CXX11_FEATURES in fastjet/config.h +AC_ARG_ENABLE(limited-thread-safety, + [ --enable-limited-thread-safety Turn on basic thread-safety features (requires C++11) [default=no]], + [ENABLE_LIMITED_THREAD_SAFETY_FLAG="$enableval"], + [ENABLE_LIMITED_THREAD_SAFETY_FLAG="no"]) +if [[ "$ENABLE_LIMITED_THREAD_SAFETY_FLAG" == "yes" ]] ; then + AC_DEFINE(HAVE_LIMITED_THREAD_SAFETY, [], [defined if limited thread-safety has been enabled]) + AC_MSG_WARN([Thread safety uses C++11 features and may require additional compiler arguments, these have to be specified by the user]) + # one could alternately try to see what compiler flag(s) has to be included + # although that can be fairly heavy so better be moved in an ac file + # + # e.g. for g++ we could try + # AC_MSG_CHECKING([if $CXX supports -std=c++11 flag]) + # SAVE_CXXFLAGS="$CXXFLAGS" + # CXXFLAGS="-std=c++11" + # AC_LANG_PUSH(C++) + # AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void){ return 0;}])], + # [ac_cxx_eleven_ok=yes],[ac_cxx_eleven_ok=no]) + # AC_LANG_POP(C++) + # CXXFLAGS="$SAVE_CXXFLAGS" + # AC_MSG_RESULT([$ac_cxx_eleven_ok]) + # if [[ "x${ac_cxx_eleven_ok}" == "xyes" ]]; then + # AM_CXXFLAGS=${AM_CXXFLAGS}" -std=c++11 " + # fi +fi + +AC_ARG_ENABLE(thread-safety, + [ --enable-thread-safety Turn on thread-safety features (requires C++11) [default=no]], + [ENABLE_THREAD_SAFETY_FLAG="$enableval"], + [ENABLE_THREAD_SAFETY_FLAG="no"]) +if [[ "$ENABLE_THREAD_SAFETY_FLAG" == "yes" ]] ; then + AC_DEFINE(HAVE_LIMITED_THREAD_SAFETY, [], [defined if limited thread-safety has been enabled]) + AC_DEFINE(HAVE_THREAD_SAFETY, [], [defined if thread-safety has been enabled]) + AC_MSG_WARN([Thread safety uses C++11 features and may require additional compiler arguments, these have to be specified by the user]) +fi + +dnl------------------------------------------------------------------- +dnl check if a few modern compiler options are availabble + +dnl---------- [[deprecated]] --> HAVE_CXX14_DEPRECATED --------------- +AC_MSG_CHECKING([[if $CXX $CXXFLAGS supports the "[[deprecated]]" keyword]]) +AC_LANG_PUSH(C++) +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -Werror=attributes" +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[class A{public: [[deprecated]] void test() {}}; int main(void){ A a; a.test(); return 0;}]])], + [ac_compiler_has_requested_support="yes"],[ac_compiler_has_requested_support="no"]) +CXXFLAGS="$save_CXXFLAGS" +AC_LANG_POP(C++) +if [[ "$ac_compiler_has_requested_support" == "yes" ]] ; then + AC_DEFINE(HAVE_CXX14_DEPRECATED, [], [compiler supports c++14 deprecated keyword]) +fi +AC_MSG_RESULT([$ac_compiler_has_requested_support]) + +dnl------ _attribute__((deprecated)) --> HAVE_GNUCXX_DEPRECATED ------ +AC_MSG_CHECKING([[if $CXX $CXXFLAGS supports the "__attribute__((deprecated))" keyword]]) +AC_LANG_PUSH(C++) +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -Werror=attributes" +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[class A{public: void test() __attribute__((deprecated)) {}};int main(void){ A a; a.test(); return 0;}]])], + [ac_compiler_has_requested_support="yes"],[ac_compiler_has_requested_support="no"]) +CXXFLAGS="$save_CXXFLAGS" +AC_LANG_POP(C++) +if [[ "$ac_compiler_has_requested_support" == "yes" ]] ; then + AC_DEFINE(HAVE_GNUCXX_DEPRECATED, [], [compiler supports GNU c++ deprecated attribute]) +fi +AC_MSG_RESULT([$ac_compiler_has_requested_support]) + +dnl------------------- override --> HAVE_OVERRIDE --------------------- +AC_MSG_CHECKING([[if $CXX $CXXFLAGS supports the "override" keyword]]) +AC_LANG_PUSH(C++) +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -Werror" +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[class A{public: virtual void test(){}}; class B : public A{public: virtual void test() override{}}; int main(void){ B b; b.test(); return 0;}]])], + [ac_compiler_has_requested_support="yes"],[ac_compiler_has_requested_support="no"]) +CXXFLAGS="$save_CXXFLAGS" +AC_LANG_POP(C++) +if [[ "$ac_compiler_has_requested_support" == "yes" ]] ; then + AC_DEFINE(HAVE_OVERRIDE, [], [compiler supports the "override" keyword]) +fi +AC_MSG_RESULT([$ac_compiler_has_requested_support]) dnl---------- [[deprecated]] --> HAVE_CXX14_DEPRECATED --------------- AC_MSG_CHECKING([[if $CXX ${AM_CXXFLAGS} $CXXFLAGS supports the "[[deprecated]]" keyword]]) @@ -596,7 +678,7 @@ dnl will give a positive anwser for FastJet 3.1.0a1. dnl------------------------------------------------------------------- versionmajor=`echo $PACKAGE_VERSION | sed 's/^\([[^\.]]*\)\.\([[^\.]]*\)\.\([[^\.]]*\).*/\1/'` versionminor=`echo $PACKAGE_VERSION | sed 's/^\([[^\.]]*\)\.\([[^\.]]*\)\.\([[^\.]]*\).*/\2/'` -versionending=`echo $PACKAGE_VERSION | sed 's/^\([[^\.]]*\)\.\([[^\.]]*\)\.\([[^\.]]*\)$/\3/'` +versionending=`echo $PACKAGE_VERSION | sed 's/^\([[^\.]]*\)\.\([[^\.]]*\)\.\(.*\)$/\3/'` versionpatchlevel=`echo $versionending | sed 's/^\([[0-9]][[0-9]]*\).*/\1/'` versionprerelease=`echo $versionending | sed 's/^[[0-9-]]*//'` versionnumber=`printf "%d%.2d%.2d" "$versionmajor" "$versionminor" "$versionpatchlevel"` @@ -648,7 +730,15 @@ CONFIG_SUMMARY+=" Shared libraries "${enable_shared}"\n" CONFIG_SUMMARY+=" Static libraries "${enable_static}"\n" CONFIG_SUMMARY+=" Debug flag "$ENABLE_DEBUG_FLAG"\n" CONFIG_SUMMARY+=" CGAL support "${ENABLE_CGAL_FLAG}"\n" -#CONFIG_SUMMARY+=" C++11 features "${ENABLE_CXX11FEATURES_FLAG}"\n" +if [[ "$ENABLE_THREAD_SAFETY_FLAG" == "yes" ]]; then +CONFIG_SUMMARY+=" Thread safety yes (requires C++11)\n" +else +if [[ "$ENABLE_LIMITED_THREAD_SAFETY_FLAG" == "yes" ]]; then +CONFIG_SUMMARY+=" Thread safety limited (requires C++11)\n" +else +CONFIG_SUMMARY+=" Thread safety no\n" +fi +fi AC_PLUGIN_SUMMARY([yes]) CONFIG_SUMMARY+=" Monolithic plugins lib "$monolithic"\n" CONFIG_SUMMARY+=" Python interface "${ENABLE_PYEXT_FLAG}"\n" diff --git a/fastjet/doc/Makefile.in b/fastjet/doc/Makefile.in index 5dfc9ed..85e31fa 100644 --- a/fastjet/doc/Makefile.in +++ b/fastjet/doc/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. diff --git a/fastjet/doc/fastjet-doc.tex b/fastjet/doc/fastjet-doc.tex index 713685e..e0c580f 100644 --- a/fastjet/doc/fastjet-doc.tex +++ b/fastjet/doc/fastjet-doc.tex @@ -31,6 +31,10 @@ showstringspaces=false, keepspaces=true } +% the following makes it possible to write \lstinline"some_command" +% But note that it then becomes impossible to use the " character +% anywhere else. +\lstMakeShortInline{"} %% \lstset{% general command to set parameter(s) %% columns=fullflexible @@ -58,7 +62,7 @@ \newcommand{\ttt}[1]{{\small\texttt{#1}}} %\newcommand{\ttt}[1]{\scalebox{0.9}{\texttt{#1}}} %\newcommand{\ttt}[1]{\texttt{#1}} -\newcommand{\comment}[1]{\textbf{[#1]}} +\newcommand{\comment}[1]{{\color{red}\textbf{[#1]}}} \newcommand{\order}[1]{{\cal O}\left(#1\right)} \newcommand{\ie}{{\it i.e.}\ } \newcommand{\eg}{{\it e.g.}\ } @@ -77,18 +81,17 @@ \title{\sf FastJet user manual% \\ \large (for version - 3.3.4% %%%-VERSION-NUMBER (do not remove this comment; used + 3.4.0% %%%-VERSION-NUMBER (do not remove this comment; used % for automatic version-number changes; version number must % stay one a single line) ) } -\author{Matteo Cacciari,$^{1,2}$ Gavin P. Salam$^{3,4,}$\footnote{On - leave from CERN, Theoretical Physics Department, Geneva, - Switzerland and from CNRS, UMR 7589, LPTHE, F-75005, Paris, France.}\; and Gregory Soyez$^{5}$\\[10pt] +\author{Matteo Cacciari,$^{1,2}$ Gavin P. Salam$^{3,4}$ and Gregory Soyez$^{5}$\\[10pt] \normalsize - $^1$LPTHE, UPMC Univ.~Paris 6 and CNRS UMR 7589, Paris, France\\ - \normalsize - $^2$Universit\'e Paris Diderot, Paris, France\\ + $^1$ Sorbonne Universit\'e, CNRS, Laboratoire de Physique Th\'eorique et Hautes + \'Energies,\\[-5pt] \normalsize LPTHE, F-75005 Paris, France\\ + \normalsize + $^2$ Universit\'e de Paris, LPTHE, F-75005 Paris, France\\ \normalsize $^3$ Rudolf Peierls Centre for Theoretical Physics,\\[-5pt] \normalsize @@ -96,7 +99,7 @@ \normalsize $^4$ All Souls College, Oxford, United Kingdom\\ \normalsize - $^5$Institut de Physique Th\'eorique, CNRS, CEA Saclay, Universit\'e + $^5$ Institut de Physique Th\'eorique, CNRS, CEA Saclay, Universit\'e Paris-Saclay, France % $^3$CERN, Physics Department, Theory Unit, Geneva, Switzerland\\ % \normalsize @@ -532,9 +535,9 @@ \section{Quick-start guide} make install cd .. \end{verbatim} -If you copy and paste the above lines from one very widespread PDF -viewer, you should note that the first line contains \emph{back-quotes} -not forward quotes but that your PDF viewer may nevertheless paste +You should note that the first line contains \emph{back-quotes} +not forward quotes, but that if you copy and paste the above lines from +one very widespread PDF viewer, it may nevertheless paste forward quotes, causing problems down the line (the issue arises again below). @@ -3255,7 +3258,7 @@ \section{Background estimation and subtraction} determination of the distribution of $p_t/A$ for the jets in a given event (or region of the event) and then taking the median of the distribution as an estimate of $\rho$, as proposed in~\cite{cs} and -studied in detail also in~\cite{Cacciari:2009dp,GridMedianLH}. +studied in detail also in~\cite{Cacciari:2009dp,Soyez:2018opl}. % This is largely insensitive to the presence of a handful of hard jets, and avoids any need for introducing a $p_t$ scale to distinguish hard and @@ -3280,7 +3283,7 @@ \section{Background estimation and subtraction} One may worry that a hard jet will sometimes lie at a corner of multiple grid cells, inducing larger biases in the median than with a normal jet finder jets, however we have found this not -to be an issue in practice~\cite{GridMedianLH}. +to be an issue in practice~\cite{Soyez:2018opl}. \subsection{General Usage}\label{sec:bkg_general_usage} @@ -3307,7 +3310,7 @@ \subsubsection{Background estimation}\label{sec:bkg_estim_usage} We have found that the $k_t$ or Cambridge/Aachen jet algorithms with $R = 0.4 - 0.6$ generally provide adequate background estimates, with the lower range of $R$ values to be preferred if the events are likely -to be busy~\cite{Cacciari:2009dp,GridMedianLH}. +to be busy~\cite{Cacciari:2009dp,Soyez:2018opl}. % An active area with explicit ghosts is generally recommended.\footnote{With the $k_t$ algorithm one may also use a @@ -3335,7 +3338,7 @@ \subsubsection{Background estimation}\label{sec:bkg_estim_usage} double requested_grid_spacing); \end{lstlisting} We have found grid spacings in the range $0.5-0.7$ to be -adequate~\cite{GridMedianLH}, with lower values preferred for events +adequate~\cite{Soyez:2018opl}, with lower values preferred for events that are likely to have high multiplicities. Both of the above background estimators derive from a @@ -3352,15 +3355,16 @@ \subsubsection{Background estimation}\label{sec:bkg_estim_usage} following calls % \begin{lstlisting} + BackgroundEstimate bkgd_estimate = bge.estimate(); // the median of ($p_t$/area) for grid cells, or for jets that pass the selection cut, // making use also of information on empty area in the event (in the jets case) - rho = bge.rho(); + rho = estimate.rho(); // an estimate of the fluctuations in the $p_t$ density per unit $\smash{\sqrt{A}}$, // which is obtained from the 1-sigma half-width of the distribution of pt/A. // To be precise it is defined such that a fraction (1-0.6827)/2 of the jets // (including empty jets) have $p_t/A < \rho - \sigma / \sqrt{\langle A \rangle}$ - sigma = bge.sigma(); + sigma = bkgd_estimate.sigma(); \end{lstlisting} Note that $\rho$ and $\sigma$ determinations count empty area within the relevant region as consisting of jets of zero $p_t$. @@ -3405,9 +3409,11 @@ \subsubsection{Background subtraction}\label{sec:subtractor} PseudoJet subtracted_jet = subtractor(jet); vector subtracted_jets = subtractor(jets); \end{lstlisting} -The subtractor normally returns \ttt{jet - bge.rho(jet)*jet.area\_4vector()}. +The subtractor normally returns \ttt{jet - rho*jet.area\_4vector()}, +where \ttt{rho} may be estimated locally (see below, +section~\ref{sec:BGE-positional}). % -If \ttt{jet.pt() < bge.rho(jet)*jet.area\_4vector().pt()}, then +If \ttt{jet.pt() < rho*jet.area\_4vector().pt()}, then the subtractor instead returns a jet with zero 4-momentum (so that \ttt{(subtracted\_jet==0)} returns \ttt{true}). % @@ -3435,14 +3441,18 @@ \subsection{Positional dependence of background} % Two techniques are described below to help alleviate this problem. % -In each case the properties of the background are to be obtained -through the methods (available for both -\ttt{JetMedianBackgroundEstimator} and +In each case the properties of the background are to be obtained as +follows (available for both \ttt{JetMedianBackgroundEstimator} and \ttt{GridMedianBackgroundEstimator}) \begin{lstlisting} - double rho (const PseudoJet & jet); // $p_t$ density per unit area $A$ near jet - double sigma(const PseudoJet & jet); // fluctuations in the $p_t$ density near jet + // get an estimate of the background in the vicinity of the given jet + BackgroundEstimate bkgd_estimate = bge.estimate(jet); + // and then extract specific information about the background + double rho = bkgd_estimate.rho(); // $p_t$ density per unit area $A$ near jet + double sigma = bkgd_estimate.sigma(); // fluctuations in the $p_t$ density near jet \end{lstlisting} +% double rho (const PseudoJet & jet); +% double sigma(const PseudoJet & jet); // %...................................................................... @@ -3550,18 +3560,19 @@ \subsubsection{Rescaling method} // tell JetMedianBackgroundEstimator or GridMedianBackgroundEstimator about the rescaling bge.set_rescaling_class(&rescaling); \end{lstlisting} -Subsequent calls to \ttt{rho()} will return the median of the -distribution $p_t/A / \ttt{rescaling}(y)$ (rather than $p_t/A$). +Subsequent calls to \ttt{bge.estimate()} will be based on the on median of +the distribution $p_t/A / \ttt{rescaling}(y)$ (rather than $p_t/A$). % -Any calls to \ttt{rho(jet)} and \ttt{sigma(jet)} will include an -additional factor of \ttt{rescaling}$(y_\ttt{jet})$. +Any calls to \ttt{bge.estimate(jet)} will include an additional factor of +\ttt{rescaling}$(y_\ttt{jet})$ in the resulting +\ttt{BackgroundEstimate}. % Note that any overall factor in the rescaling function cancels out for -\ttt{rho(jet)} and \ttt{sigma(jet)}, but not for calls to \ttt{rho()} -and \ttt{sigma()} (which are in any case less meaningful when a -rapidity dependence is being assumed for the background). +\ttt{bge.estimate(jet)}, but not for calls to \ttt{bge.estimate()} +(which are in any case less meaningful when a rapidity dependence is +being assumed for the background). -In ongoing studies \cite{GridMedianLH}, we have found that despite its +We have found~\cite{Soyez:2018opl} that despite its use of an average background shape, the rescaling method generally performs comparably to local estimation in terms of its residual $p_t$ dispersion after subtraction. @@ -3608,8 +3619,8 @@ \subsection{Handling masses} By default, as of \fastjet 3.1, the grid and jet-median background estimators automatically determine $\rho_m$. % -It is returned from a call to \ttt{rho\_m()}, with fluctuations -accessible through \ttt{sigma\_m()}. +It is available within a \ttt{BackgroundEstimate} via a call to +\ttt{rho\_m()}, with fluctuations accessible through \ttt{sigma\_m()}. % The determination of $\rho_m$ involves a small speed penalty and can be disabled with a call to \ttt{set\_compute\_rho\_m(false)} for @@ -3687,14 +3698,20 @@ \subsection{Handling masses} \subsection{Other facilities} \label{sec:BGE-other-facilities} -The \ttt{JetMedianBackgroundEstimator} has a number of enquiry -functions to access information used internally within the median -$\rho$ and $\sigma$ determination. +The \ttt{BackgroundEstimate} class has one further enquiry function: \begin{lstlisting} - // Returns the mean area of the jets used to actually compute the background properties, - // including empty area and jets (available also in grid-based estimator) + // Returns the mean area of the jets or grid cells used to actually compute + // the background properties, including empty area and/or pure ghost jets double mean_area() const; - +\end{lstlisting} +A \ttt{BackgroundEstimate} from a \ttt{JetMedianBackgroundEstimator} contains +yet more information that can be obtained as follows +\begin{lstlisting} + JetMedianBackgroundEstimator::Extras extras = \ + bkgd_estimate.extras(); +\end{lstlisting} +where the \ttt{extras} object has the following member functions: +\begin{lstlisting} // Returns the number of jets used to actually compute the background properties // (including empty jets) unsigned int n_jets_used() const; @@ -3780,11 +3797,10 @@ \subsection{Alternative workflows} // (re)set the jets to be used by future calls to rho() etc. void set_jets(const std::vector & jets); \end{lstlisting} -Note that the -jets passed via the \ttt{set\_jets()} call above must all originate from a common -\ttt{ClusterSequenceAreaBase} type class. - +Note that the jets passed via the \ttt{set\_jets()} call above must +all originate from a common \ttt{ClusterSequenceAreaBase} type class. + %...................................................................... \subsection{Recommendations} @@ -4319,6 +4335,281 @@ \subsubsection{The rest-frame $N$-subjettiness tagger} +%====================================================================== +\section{Thread safety} +\label{sec:thread-safety} + +As of version 3.4.0, FastJet has the option of being configured with +thread-safety enabled. +% +Two variants are possible: limited and full thread safety. +% +Both require \ttt{C++11} support in the compiler. +% +Limited thread safety should come with essentially zero overhead in +normal operation, and is generally suitable if each thread processes a +distinct event. +% +Full thread safety allows separate threads to work concurrently on a +common event or collection of \ttt{PseudoJet}s (e.g.\ multiple threads +each applying a different \ttt{JetDefinition} algorithm or +\ttt{Transformer} to the same set of input \ttt{PseudoJet}s). +% +It involves adaptations of frequently used core objects, which may +have a moderate speed impact: on some systems, we have observed a +slowdown of up to $10{-}15\%$. +% +Summaries of the classes that are thread safe or not with the two +options are given below in +sections~\ref{sec:limit-thre-safety} and \ref{sec:full-thread-safety}. +% +Suggestions concerning thread-safe workflows are given in +section~\ref{sec:thread-safety-workflows}. + +As of version 3.4.0, thread safety is not yet guaranteed in plugins. + + +%---------------------------------------------------------------------- +\subsection{Limited thread safety} +\label{sec:limit-thre-safety} + +Limited thread safety, can be obtained by configuring with the +\ttt{--enable-limited-thread-safety} option. +% +Output of the banner, error-handling and warnings are thread +safe. +% +Concurrent read-access and copying of \ttt{JetDefinition} are safe, so +long as one doesn't use \ttt{delete\_recombiner\_when\_unused()} or +\ttt{delete\_plugin\_when\_unused()}. +% +Concurrent read access of \ttt{AreaDefinition} objects is also safe +across threads (see section \ref{sec:threads-ghosted-areas} for the +handling of seeds for ghost-generation). +% +Core objects for which concurrent read-access and copying of a single +object are not safe across threads include \ttt{PseudoJet} and +\ttt{SharedPtr}, as well as classes that rely on them such as +\ttt{ClusterSequence}. +% +In particular, \ttt{PseudoJet} objects cache rapidity and azimuth the +first time these are evaluated, and this is not thread safe. + + +% Concurrent read-access of \ttt{PseudoJet} objects is not safe across +% threads, for reasons related to internal caching of rapidity and +% azimuth and non-thread safety of the \ttt{SharedPtr}. +% % +% Other objects that rely on \ttt{SharedPtr} are also not thread-safe +% for any operation where the \ttt{SharedPtr} count might be altered. + +%---------------------------------------------------------------------- +\subsection{Full thread safety} +\label{sec:full-thread-safety} + +Full thread safety is obtained by configuring with +\ttt{--enable-thread-safety}. +% +Concurrent read-access of \ttt{PseudoJet} objects is now possible, +and \ttt{SharedPtr} objects are thread safe. +% +This enables thread safety across \fastjet operations marked as +\ttt{const}. + +In our implementation, the \ttt{SharedPtr} object involves an atomic +counter and the \ttt{PseudoJet} involves a spin-lock the first time +\ttt{phi()} or \ttt{rap()} are called, in order to safely cache their +values. +% +Both of these strategies can lead to timing overheads, which in our +tests have not exceeded $10{-}15\%$. + +%---------------------------------------------------------------------- +\subsection{Specific work-flows} +\label{sec:thread-safety-workflows} + +\fastjet usage sometimes entails non-const operations and/or +operations that affect global (static) variables. +% +Below, we outline specific cases where care is needed even with +thread-safety enabled. + +%...................................................................... +\subsubsection{Ghosted areas} +\label{sec:threads-ghosted-areas} +% +Areas that use ghosts, cf.\ Section~\ref{sec:ghosted-areas}, rely on +an internal random number generator to place the ghosts. +% +By default the generator is static and common across all threads. +% +When using the static generator, a lock is employed to ensure that the +full set of ghosts being added to a given event is generated with a +single consistent sequence of random numbers (any concurrent thread +needing a distinct set of ghosts waits its turn until the static +generator is available). +% +Given a \ttt{ClusterSequenceArea csa}, the random seed that was used +for that set of ghosts can be retrieved with +\begin{lstlisting} + vector seeds; + csa.area_def().ghost_spec().get_last_seed(seeds); +\end{lstlisting} +Alternatively, given a ghosted \ttt{AreaDefinition area\_def}, the +\ttt{ClusterSequenceArea} can use ghosts generated using a specific +set of seeds for the random number generator, for example +\begin{lstlisting} + vector seed{12345,67890}; + ClusterSequenceArea csa(particles, jet_def, area_def.with_fixed_seed(seed)); +\end{lstlisting} +The \ttt{area\_def.with\_fixed\_seeds(seeds)} call returns a copy of +the \ttt{area\_def} with the specified seeds.\footnote{If using an + area definition with a repeat value greater than one, this method + will not work, because the seeds will be the same for each + repetition of the ghosts. + % + In that case, the user may create their own random generator (one + per thread), and in each thread create a \ttt{GhostedAreaSpec} with + that generator. +} +% +The above functionality is available even without thread safety and +functions in a thread-safe manner already with the limited thread +safety option. + +%---------------------------------------------------------------------- +\subsubsection{Background estimation and subtraction} +\label{sec:threads-backgr-estim-subtr} + +The classes derived from \ttt{BackgroundEstimatorBase} store +information about an event when one calls member functions such as +\ttt{set\_particles(...)}. +% +Thus it is not safe to use a single \ttt{BackgroundEstimatorBase} +across concurrent threads that are each processing a different event. +% +Instead, given a global \ttt{BackgroundEstimatorBase} +\ttt{global\_bge}, it is possible to ask for a copy of the estimator +locally within a thread, and then set the particles on the local copy +and use that for accessing information about the background +\begin{lstlisting} + // copy the global BackgroundEstimator class + // (the user will be responsible for deleting it and may + // wish to put it into a unique_ptr) + BackgroundEstimatorBase * local_bge(global_bge.copy()); + + // set the particles on the local copy + local_bge->set_particles(particles); + // alternatively set the particles with a fixed a specific seed for + // the ghost generation + vector seed{12345,67890}; + local_bge->set_particles_with_seed(particles, seed); + + // and access information about the background across the whole + // event (if supported), using its operator() function + BackgroundEstimate bkgd_estimate1 = local_bge->estimate(); + // or in the vicinity of a specific jet + BackgroundEstimate bkgd_estimate2 = local_bge->estimate(jet); + + // extract rho + double rho1 = bkgd_estimate1.rho(); + double rho2 = bkgd_estimate2.rho(); +\end{lstlisting} +If using a globally defined \ttt{Subtractor} \ttt{global\_subtractor}, +one similarly needs to take a copy and point that copy to the +thread-local \ttt{BackgroundEstimatorBase}: +\begin{lstlisting} + // copy the subtractor + Subtractor local_subtractor = global_subtractor; + // arrange for the copy to use the local background estimator + local_subtractor.set_background_estimator(local_bge); +\end{lstlisting} +% +The user is responsible for deleting the \ttt{local\_gbe} when it is +no longer needed. + +Note that prior to version 3.4.0 of \fastjet, the +\ttt{BackgroundEstimate} class did not exist and one accessed +information about the background directly from member functions of the +\ttt{BackgroundEstimatorBase} instance, e.g.\ +\ttt{BackgroundEstimatorBase::rho(jet)}. +% +% +For \ttt{JetMedianBackgroundEstimator} objects that involve a +\ttt{Selector} that takes a reference, +(section~\ref{sec:local-bkgd-estimation}), +% +calls to \ttt{rho(jet)}, \ttt{rho\_m(jet)}, \ttt{sigma(jet)}, +\ttt{sigma\_m(jet)} (which are all non-\ttt{const}) update the state +of the \ttt{JetMedianBackgroundEstimator} object, which then affects +the result of subsequent calls to \ttt{mean\_area()}, +\ttt{n\_jets\_used()}, \ttt{jets\_used()}, \ttt{empty\_area()} and +\ttt{n\_empty\_jets()}. +% +Without full thread safety, concurrent calls to \ttt{rho(jet)}, etc., +can cause the code to crash. +% +Compiling with full thread safety enabled eliminates the risk of a +crash. +% +However, even with full thread safety, the results from +\ttt{mean\_area()} calls, etc., can be wrong if separate threads are +each calling \ttt{rho(jet)} with different jets. +% +So we recommend that any code that uses background estimation be +updated to access the results through the \ttt{BackgroundEstimate} +class. +% +The details of its usage are given in +sections~\ref{sec:bkg_estim_usage} and +\ref{sec:BGE-other-facilities}. + +%...................................................................... +\subsubsection{I/O} +\label{sec:thread-safe-io} + +There are three components of the FastJet code that perform text +output: the banner output, the \ttt{LimitedWarning} class and the +\ttt{Error} class. +% +With limited thread safety enabled, all are thread safe in the sense +that they will not crash the code. + +The banner will be output just once, and to ensure reproducibility of +text output the user may wish to call +\ttt{ClusterSequence::print\_banner()} before creating threads (the +stream can be controlled with +\ttt{ClusterSequence::set\_fastjet\_banner\_stream()}). +% + +For the \ttt{LimitedWarning} and \ttt{Error} classes, the user has no +direct control over the stage at which output may come. +% +To prevent garbled output, the user may perform calls to +\begin{lstlisting} + LimitedWarning::set_default_stream_and_mutex(&user_stream, &user_mutex); + Error::set_default_stream_and_mutex(&user_stream, &user_mutex); +\end{lstlisting} +where the user provides a pointer to a stream and a mutex. +% +The mutex is then locked whenever something is to be output to the +stream. +% +If the user is sending their own output to that same stream, it is +their responsibility to ensure that they lock it when performing their +own output. +% +Note that the \ttt{LimitedWarning} warning class outputs a ``(LAST +SUCH WARNING)'' string the last time it outputs a warning of a given +kind. +% +When running concurrent threads, that string may not appear with the +warning that is actually the last of that kind. +% +Recall that output from warnings and errors can be disabled by setting +a null stream for each of them and that a summary of the warnings can +be obtained as a string at any time with a call to +\ttt{LimitedWarning::summary()}. %====================================================================== \section{Compilation notes} @@ -6404,9 +6695,14 @@ \subsection{Backwards compatibility of background estimation facilities} JHEP {\bf 1004 } (2010) 065. [arXiv:0912.4926 [hep-ph]]. -\bibitem{GridMedianLH} M.~Cacciari, G.~P.~Salam and G.~Soyez, contribution in - preparation to proceedings of ``Workshop on TeV Colliders'', Les - Houches, June 2011. +%\cite{Soyez:2018opl} +\bibitem{Soyez:2018opl} +G.~Soyez, +%``Pileup mitigation at the LHC: A theorist's view,'' +Phys. Rept. \textbf{803} (2019), 1-158 +doi:10.1016/j.physrep.2019.01.007 +[arXiv:1801.09721 [hep-ph]]. +% 26 citations counted in INSPIRE as of 22 Feb 2021 \bibitem{Soyez:2012hv} G.~Soyez, G.~P.~Salam, J.~Kim, S.~Dutta and M.~Cacciari, @@ -6559,4 +6855,4 @@ \subsection{Backwards compatibility of background estimation facilities} -% LocalWords: NNBase +% LocalWords: NNBase reproducibility diff --git a/fastjet/doc/figs/Makefile.in b/fastjet/doc/figs/Makefile.in index 6085e70..da5d3c9 100644 --- a/fastjet/doc/figs/Makefile.in +++ b/fastjet/doc/figs/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. diff --git a/fastjet/example/01-basic.cc b/fastjet/example/01-basic.cc index 7d9d7d4..3166b0f 100644 --- a/fastjet/example/01-basic.cc +++ b/fastjet/example/01-basic.cc @@ -13,7 +13,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 01-basic.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/02-jetdef.cc b/fastjet/example/02-jetdef.cc index c63bb4d..d322f7b 100644 --- a/fastjet/example/02-jetdef.cc +++ b/fastjet/example/02-jetdef.cc @@ -12,7 +12,7 @@ //---------------------------------------------------------------------- // //STARTHEADER -// $Id: 02-jetdef.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/03-plugin.cc b/fastjet/example/03-plugin.cc index 5b9eedf..15e0056 100644 --- a/fastjet/example/03-plugin.cc +++ b/fastjet/example/03-plugin.cc @@ -20,7 +20,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 03-plugin.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/04-constituents.cc b/fastjet/example/04-constituents.cc index dfe2668..223a9fe 100644 --- a/fastjet/example/04-constituents.cc +++ b/fastjet/example/04-constituents.cc @@ -16,7 +16,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 04-constituents.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/05-eplus_eminus.cc b/fastjet/example/05-eplus_eminus.cc index 4d2866c..2e02965 100644 --- a/fastjet/example/05-eplus_eminus.cc +++ b/fastjet/example/05-eplus_eminus.cc @@ -22,7 +22,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 05-eplus_eminus.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/06-area.cc b/fastjet/example/06-area.cc index 9edf8ca..2aadafa 100644 --- a/fastjet/example/06-area.cc +++ b/fastjet/example/06-area.cc @@ -12,7 +12,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 06-area.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/07-subtraction.cc b/fastjet/example/07-subtraction.cc index 46ebaaa..e19eb1c 100644 --- a/fastjet/example/07-subtraction.cc +++ b/fastjet/example/07-subtraction.cc @@ -10,7 +10,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 07-subtraction.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -205,12 +205,11 @@ int main(){ cout << "Background estimation:" << endl; cout << " " << bkgd_estimator.description() << endl << endl;; cout << " Giving, for the full event" << endl; - cout << " rho = " << bkgd_estimator.rho() << endl; - cout << " sigma = " << bkgd_estimator.sigma() << endl; -#if FASTJET_VERSION_NUMBER >= 30100 - cout << " rho_m = " << bkgd_estimator.rho_m() << endl; - cout << " sigma_m = " << bkgd_estimator.sigma_m() << endl; -#endif + BackgroundEstimate bkgd_estimate = bkgd_estimator.estimate(); + cout << " rho = " << bkgd_estimate.rho() << endl; + cout << " sigma = " << bkgd_estimate.sigma() << endl; + cout << " rho_m = " << bkgd_estimate.rho_m() << endl; + cout << " sigma_m = " << bkgd_estimate.sigma_m() << endl; cout << endl; cout << "Jets above " << ptmin << " GeV in the hard event (" << hard_event.size() << " particles)" << endl; diff --git a/fastjet/example/08-selector.cc b/fastjet/example/08-selector.cc index f2d871e..9ebd3cb 100644 --- a/fastjet/example/08-selector.cc +++ b/fastjet/example/08-selector.cc @@ -10,7 +10,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 08-selector.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/09-user_info.cc b/fastjet/example/09-user_info.cc index c0630cb..f7f4703 100644 --- a/fastjet/example/09-user_info.cc +++ b/fastjet/example/09-user_info.cc @@ -27,7 +27,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 09-user_info.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/10-subjets.cc b/fastjet/example/10-subjets.cc index c8f7906..1a8a348 100644 --- a/fastjet/example/10-subjets.cc +++ b/fastjet/example/10-subjets.cc @@ -13,7 +13,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 10-subjets.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/11-filter.cc b/fastjet/example/11-filter.cc index 5f678ea..5168b14 100644 --- a/fastjet/example/11-filter.cc +++ b/fastjet/example/11-filter.cc @@ -20,7 +20,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 11-filter.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/12-boosted_higgs.cc b/fastjet/example/12-boosted_higgs.cc index 87ab33a..7854914 100644 --- a/fastjet/example/12-boosted_higgs.cc +++ b/fastjet/example/12-boosted_higgs.cc @@ -23,7 +23,7 @@ //STARTHEADER -// $Id: 12-boosted_higgs.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/13-boosted_top.cc b/fastjet/example/13-boosted_top.cc index 7e137ec..265eb54 100644 --- a/fastjet/example/13-boosted_top.cc +++ b/fastjet/example/13-boosted_top.cc @@ -14,7 +14,7 @@ //STARTHEADER -// $Id: 13-boosted_top.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/14-groomers.cc b/fastjet/example/14-groomers.cc index 0e5ffd2..f0759d9 100644 --- a/fastjet/example/14-groomers.cc +++ b/fastjet/example/14-groomers.cc @@ -16,7 +16,7 @@ //---------------------------------------------------------------------- //STARTHEADER -// $Id: 14-groomers.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/CmdLine.hh b/fastjet/example/CmdLine.hh index 62255e1..4834f21 100644 --- a/fastjet/example/CmdLine.hh +++ b/fastjet/example/CmdLine.hh @@ -18,8 +18,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 1761 $// -// $Date:: 2010-09-16 12:43:18 +0200 (Thu, 16 Sep 2010) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// diff --git a/fastjet/example/Makefile.in b/fastjet/example/Makefile.in index 2e61b74..8cf00b2 100644 --- a/fastjet/example/Makefile.in +++ b/fastjet/example/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. diff --git a/fastjet/example/data/Makefile.in b/fastjet/example/data/Makefile.in index 08435f1..7fcd1e9 100644 --- a/fastjet/example/data/Makefile.in +++ b/fastjet/example/data/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. diff --git a/fastjet/example/fastjet_areas.cc b/fastjet/example/fastjet_areas.cc index 7c4b416..fc200a7 100644 --- a/fastjet/example/fastjet_areas.cc +++ b/fastjet/example/fastjet_areas.cc @@ -1,6 +1,6 @@ //STARTHEADER -// $Id: fastjet_areas.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/fastjet_example.cc b/fastjet/example/fastjet_example.cc index ef1789d..c27c920 100644 --- a/fastjet/example/fastjet_example.cc +++ b/fastjet/example/fastjet_example.cc @@ -20,7 +20,7 @@ /// - \subpage Example14 //STARTHEADER -// $Id: fastjet_example.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // diff --git a/fastjet/example/fastjet_timing_plugins.cc b/fastjet/example/fastjet_timing_plugins.cc index d813bc4..7eb73ea 100644 --- a/fastjet/example/fastjet_timing_plugins.cc +++ b/fastjet/example/fastjet_timing_plugins.cc @@ -1,5 +1,5 @@ //STARTHEADER -// $Id: fastjet_timing_plugins.cc 4354 2018-04-22 07:12:37Z salam $ +// $Id$ // // Copyright (c) 2005-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -197,6 +197,7 @@ #include "fastjet/ClusterSequenceArea.hh" #include "fastjet/tools/JetMedianBackgroundEstimator.hh" #include "fastjet/tools/GridMedianBackgroundEstimator.hh" +#include "fastjet/tools/Subtractor.hh" #include "fastjet/Selector.hh" #else #include "fjcore.hh" @@ -269,6 +270,13 @@ inline double pow2(const double x) {return x*x;} // pretty print the jets and their subjets void print_jets_and_sub (const vector & jets, double dcut); +#ifndef __FJCORE__ +void print_jets_bkgd(const vector &jets, + const vector &subtracted_jets, + BackgroundEstimatorBase * bge_ptr, + bool do_subtractor); +#endif // __FJCORE__ + // have various kinds of subjet finding, to test consistency among them // // this is needed in print_jets_and_sub and declaring it in the @@ -306,9 +314,10 @@ void is_unavailable(const string & algname) { /// wrapped in fastjet int main (int argc, char ** argv) { + CmdLine cmdline(argc,argv); + cout << "# " << cmdline.command_line() << endl; ClusterSequence::print_banner(); - CmdLine cmdline(argc,argv); cmdline_p = &cmdline; // allow the use to specify the Strategy either through the // -clever or the -strategy options (both will take numerical @@ -360,8 +369,8 @@ int main (int argc, char ** argv) { if (do_areas) { assert(!write); // it's incompatible GhostedAreaSpec ghost_spec(ghost_maxrap, - cmdline.value("-area:repeat", 1), - cmdline.value("-ghost-area", 0.01)); + cmdline.value("-area:repeat", 1), + cmdline.value("-ghost-area", 0.01)); if (cmdline.present("-area:fj2")) ghost_spec.set_fj2_placement(true); if (cmdline.present("-area:explicit")) { area_def = AreaDefinition(active_area_explicit_ghosts, ghost_spec); @@ -370,7 +379,7 @@ int main (int argc, char ** argv) { } else if (cmdline.present("-area:voronoi")) { double Rfact = cmdline.value("-area:voronoi"); area_def = AreaDefinition(voronoi_area, - VoronoiAreaSpec(Rfact)); + VoronoiAreaSpec(Rfact)); } else { cmdline.present("-area:active"); // allow, but do not require, arg area_def = AreaDefinition(active_area, ghost_spec); @@ -384,17 +393,30 @@ int main (int argc, char ** argv) { #ifndef __FJCORE__ bool do_bkgd_csab = false, do_bkgd_jetmedian = false, do_bkgd_fj2 = false; bool do_bkgd_gridmedian = false; + bool do_bkgd_localrange = false; + bool do_subtractor = false; + double bkgd_alt_ktR = -1.0; + BackgroundRescalingYPolynomial * bkgd_rescaling = 0; Selector bkgd_range; if (do_bkgd) { bkgd_range = SelectorAbsRapMax(ghost_maxrap - ktR); if (cmdline.present("-bkgd:csab")) {do_bkgd_csab = true;} else if (cmdline.present("-bkgd:jetmedian")) {do_bkgd_jetmedian = true; do_bkgd_fj2 = cmdline.present("-bkgd:fj2"); - } else if (cmdline.present("-bkgd:gridmedian")) {do_bkgd_gridmedian = true; + do_bkgd_localrange = cmdline.present("-bkgd:localrange"); + bkgd_alt_ktR = cmdline.value("-bkgd:alt-ktR", bkgd_alt_ktR); + if (do_bkgd_localrange) bkgd_range = SelectorStrip(1.5); + } else if (cmdline.present("-bkgd:gridmedian")) { + do_bkgd_gridmedian = true; } else { throw Error("with the -bkgd option, some particular background must be specified (csab or jetmedian)"); } + if (cmdline.present("-bkgd:rescaling")) { + bkgd_rescaling = new BackgroundRescalingYPolynomial(1.157,0,-0.0266,0,0.000048); + } assert(do_areas || do_bkgd_gridmedian); + do_subtractor = cmdline.present("-subtractor"); + if (do_subtractor) assert(do_areas); } #else do_bkgd = false; @@ -471,9 +493,12 @@ int main (int argc, char ** argv) { if (all_algs || cmdline.present("-pxcone")) { #ifdef FASTJET_ENABLE_PLUGIN_PXCONE double min_jet_energy = 5.0; + // mode: 1=e+e-, 2=pp + int mode = cmdline.value("-pxcone-mode", 2); + bool E_scheme_jets = false; jet_defs.push_back( JetDefinition( new PxConePlugin ( ktR, min_jet_energy, - overlap_threshold))); + overlap_threshold, E_scheme_jets, mode))); #else // FASTJET_ENABLE_PLUGIN_PXCONE is_unavailable("PxCone"); #endif // FASTJET_ENABLE_PLUGIN_PXCONE @@ -492,7 +517,8 @@ int main (int argc, char ** argv) { int npass = cmdline.value("-npass",0); if (all_algs || cmdline.present("-siscone")) { double sisptmin = cmdline.value("-sisptmin",0.0); - SISPlug * plugin = new SISPlug (ktR, overlap_threshold,npass,sisptmin); + bool cache = cmdline.present("-cache"); + SISPlug * plugin = new SISPlug (ktR, overlap_threshold,npass,sisptmin,cache); if (cmdline.present("-sm-pt")) plugin->set_split_merge_scale(SISPlug::SM_pt); if (cmdline.present("-sm-mt")) plugin->set_split_merge_scale(SISPlug::SM_mt); if (cmdline.present("-sm-Et")) plugin->set_split_merge_scale(SISPlug::SM_Et); @@ -504,9 +530,9 @@ int main (int argc, char ** argv) { if (all_algs || cmdline.present("-sisconespheri")) { double sisEmin = cmdline.value("-sisEmin",0.0); SISConeSphericalPlugin * plugin = - new SISConeSphericalPlugin(ktR, overlap_threshold,npass,sisEmin); + new SISConeSphericalPlugin(ktR, overlap_threshold,npass,sisEmin); if (cmdline.present("-ghost-sep")) { - plugin->set_ghost_separation_scale(cmdline.value("-ghost-sep")); + plugin->set_ghost_separation_scale(cmdline.value("-ghost-sep")); } jet_defs.push_back( JetDefinition(plugin)); } @@ -630,18 +656,18 @@ int main (int argc, char ** argv) { int ii, istat,id,m1,m2,d1,d2; double mass; linestream >> ii>> istat >> id >> m1 >> m2 >> d1 >> d2 - >> fourvec[0] >> fourvec[1] >> fourvec[2] >> mass; + >> fourvec[0] >> fourvec[1] >> fourvec[2] >> mass; // current file contains mass of particle as 4th entry if (istat == 1) { - fourvec[3] = sqrt(+pow2(fourvec[0])+pow2(fourvec[1]) - +pow2(fourvec[2])+pow2(mass)); + fourvec[3] = sqrt(+pow2(fourvec[0])+pow2(fourvec[1]) + +pow2(fourvec[2])+pow2(mass)); } } else { if (massless) { - linestream >> fourvec[0] >> fourvec[1] >> fourvec[2]; - fourvec[3] = sqrt(pow2(fourvec[0])+pow2(fourvec[1])+pow2(fourvec[2]));} + linestream >> fourvec[0] >> fourvec[1] >> fourvec[2]; + fourvec[3] = sqrt(pow2(fourvec[0])+pow2(fourvec[1])+pow2(fourvec[2]));} else { - linestream >> fourvec[0] >> fourvec[1] >> fourvec[2] >> fourvec[3]; + linestream >> fourvec[0] >> fourvec[1] >> fourvec[2] >> fourvec[3]; } } PseudoJet psjet(fourvec); @@ -666,16 +692,16 @@ int main (int argc, char ** argv) { // double kt = 1e-1; // for (int iphi = 0; iphi inv_unique_history(clust_seq->history().size()); for (unsigned int i = 0; i < unique_history.size(); i++) { - inv_unique_history[unique_history[i]] = i;} + inv_unique_history[unique_history[i]] = i;} for (unsigned int i = 0; i < unique_history.size(); i++) { - ClusterSequence::history_element el = - clust_seq->history()[unique_history[i]]; - int uhp1 = el.parent1>=0 ? inv_unique_history[el.parent1] : el.parent1; - int uhp2 = el.parent2>=0 ? inv_unique_history[el.parent2] : el.parent2; - printf("%7d u %15.8e %7d u %7d u\n",i,el.dij,uhp1, uhp2); + ClusterSequence::history_element el = + clust_seq->history()[unique_history[i]]; + int uhp1 = el.parent1>=0 ? inv_unique_history[el.parent1] : el.parent1; + int uhp2 = el.parent2>=0 ? inv_unique_history[el.parent2] : el.parent2; + printf("%7d u %15.8e %7d u %7d u\n",i,el.dij,uhp1, uhp2); } } @@ -800,10 +826,10 @@ int main (int argc, char ** argv) { for (unsigned i = 0; i < sisjets.size(); i++) { printf("%15.8f %15.8f %15.8f %12d %8d %8u\n", sisjets[i].rap(), sisjets[i].phi(), sisjets[i].perp(), - sisjets[i].user_index(), extras->pass(sisjets[i]), - (unsigned int) clust_seq->constituents(sisjets[i]).size() - ); - + sisjets[i].user_index(), extras->pass(sisjets[i]), + (unsigned int) clust_seq->constituents(sisjets[i]).size() + ); + } } #endif // FASTJET_ENABLE_PLUGIN_SISCONE @@ -812,42 +838,90 @@ int main (int argc, char ** argv) { if (do_bkgd) { double rho, sigma, mean_area, empty_area, n_empty_jets; ClusterSequenceAreaBase * csab = - dynamic_cast(clust_seq.get()); + dynamic_cast(clust_seq.get()); + BackgroundEstimatorBase * bge_ptr = 0; if (do_bkgd_csab) { - csab->get_median_rho_and_sigma(bkgd_range, true, rho, sigma, mean_area); - empty_area = csab->empty_area(bkgd_range); - n_empty_jets = csab->n_empty_jets(bkgd_range); + csab->get_median_rho_and_sigma(bkgd_range, true, rho, sigma, mean_area); + empty_area = csab->empty_area(bkgd_range); + n_empty_jets = csab->n_empty_jets(bkgd_range); } else if (do_bkgd_jetmedian) { - JetMedianBackgroundEstimator bge(bkgd_range); - bge.set_provide_fj2_sigma(do_bkgd_fj2); - bge.set_cluster_sequence(*csab); - rho = bge.rho(); - sigma = bge.sigma(); - mean_area = bge.mean_area(); - empty_area = bge.empty_area(); - n_empty_jets = bge.n_empty_jets(); + JetMedianBackgroundEstimator * bge = new JetMedianBackgroundEstimator(bkgd_range); + bge_ptr = bge; + // may be null + bge->set_rescaling_class(bkgd_rescaling); + bge->set_provide_fj2_sigma(do_bkgd_fj2); + if (bkgd_alt_ktR > 0) { + ClusterSequenceAreaBase * clust_seq_bkgd = + new ClusterSequenceArea(particles, JetDefinition(kt_algorithm, bkgd_alt_ktR), area_def); + cout << "Alt JetDef for background-estimation CSAB: " << clust_seq_bkgd->jet_def().description() << endl; + bge->set_cluster_sequence(*clust_seq_bkgd); + clust_seq_bkgd->delete_self_when_unused(); + } else { + bge->set_cluster_sequence(*csab); + } + if (!do_bkgd_localrange) { + rho = bge->rho(); + sigma = bge->sigma(); + mean_area = bge->mean_area(); + empty_area = bge->empty_area(); + n_empty_jets = bge->n_empty_jets(); + } } else { - assert(do_bkgd_gridmedian); + assert(do_bkgd_gridmedian); double grid_rapmin, grid_rapmax; bkgd_range.get_rapidity_extent(grid_rapmin, grid_rapmax); - GridMedianBackgroundEstimator bge(grid_rapmax, 2*ktR); - bge.set_particles(particles); - rho = bge.rho(); - sigma = bge.sigma(); - mean_area = bge.mean_area(); + GridMedianBackgroundEstimator * bge = new GridMedianBackgroundEstimator(grid_rapmax, 2*ktR); + bge_ptr = bge; + bge->set_rescaling_class(bkgd_rescaling); + bge->set_particles(particles); + rho = bge->rho(); + sigma = bge->sigma(); + mean_area = bge->mean_area(); empty_area = 0; n_empty_jets = 0; } - cout << " rho = " << rho - << ", sigma = " << sigma - << ", mean_area = " << mean_area - << ", empty_area = " << empty_area - << ", n_empty_jets = " << n_empty_jets - << endl; + if (do_bkgd_localrange || do_subtractor) { + assert(bge_ptr != 0); + cout << "Background estimator: " << bge_ptr->description() << endl; + //vector + jets = SelectorAbsRapMax(3.0)(sorted_by_pt(csab->inclusive_jets())); + vector subjets; + if (do_subtractor) { + Subtractor subtractor(bge_ptr); + subtractor.set_use_rho_m(true); + subtractor.set_safe_mass(true); + cout << "Subtractor: " << subtractor.description() << endl; + subjets = subtractor(jets); + } + print_jets_bkgd(jets, subjets, bge_ptr, do_subtractor); + // cout << "i pt rap phi m rho rho_m sigma sigma_m" << endl; + // if (do_subtractor) cout << "isub ptsub rapsub phisub msub area" << endl; + // for (unsigned i = 0; i < jets.size(); i++) { + // const PseudoJet & jet = jets[i]; + // cout << i << " " + // << " " << jet.pt() << " " << jet.rap() << " " << jet.phi() << " " << jet.m() + // << " " << bge_ptr->rho(jet) << " " << bge_ptr->rho_m(jet) + // << " " << bge_ptr->sigma(jet) << " " << bge_ptr->sigma_m(jet) << endl; + // if (do_subtractor) { + // const PseudoJet & subjet = subjets[i]; + // cout << i << "sub" + // << " " << subjet.pt() << " " << subjet.rap() << " " << subjet.phi() << " " << subjet.m() + // << " " << jet.area() << endl; + // } + // } + } else { + cout << " rho = " << rho + << ", sigma = " << sigma + << ", mean_area = " << mean_area + << ", empty_area = " << empty_area + << ", n_empty_jets = " << n_empty_jets + << endl; + } + if (bge_ptr != 0) delete bge_ptr; } #endif } // try - catch (Error fjerr) { + catch (Error &fjerr) { cout << "Caught fastjet error, exiting gracefully" << endl; exit(0); } @@ -860,7 +934,7 @@ int main (int argc, char ** argv) { } // close any file that we've opened if (istr != &cin) delete istr; - } // jet_defs + } // } @@ -883,14 +957,14 @@ void print_jets(const vector & jets_in, bool show_constituents) { jets = sorted_by_E(jets_in); for (unsigned int j = 0; j < jets.size(); j++) { printf("%5u %15.8f %15.8f %15.8f %15.8f\n", - j,jets[j].px(),jets[j].py(),jets[j].pz(),jets[j].E()); + j,jets[j].px(),jets[j].py(),jets[j].pz(),jets[j].E()); if (show_constituents) { - vector const_jets = jets[j].constituents(); - for (unsigned int k = 0; k < const_jets.size(); k++) { - printf(" jet%03u %15.8f %15.8f %15.8f %15.8f\n",j,const_jets[k].px(), - const_jets[k].py(),const_jets[k].pz(),const_jets[k].E()); - } - cout << "\n\n"; + vector const_jets = jets[j].constituents(); + for (unsigned int k = 0; k < const_jets.size(); k++) { + printf(" jet%03u %15.8f %15.8f %15.8f %15.8f\n",j,const_jets[k].px(), + const_jets[k].py(),const_jets[k].pz(),const_jets[k].E()); + } + cout << "\n\n"; } } @@ -898,22 +972,22 @@ void print_jets(const vector & jets_in, bool show_constituents) { jets = sorted_by_pt(jets_in); for (unsigned int j = 0; j < jets.size(); j++) { printf("%5u %15.8f %15.8f %15.8f", - j,jets[j].rap(),jets[j].phi(),jets[j].perp()); + 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()); + jets[j].area_4vector().perp()); cout << "\n"; #endif if (show_constituents) { - vector const_jets = jets[j].constituents(); - for (unsigned int k = 0; k < const_jets.size(); k++) { - printf(" jet%03u %15.8f %15.8f %15.8f %5d\n",j,const_jets[k].rap(), - const_jets[k].phi(),sqrt(const_jets[k].kt2()), const_jets[k].cluster_hist_index()); - } - cout << "\n\n"; + vector const_jets = jets[j].constituents(); + for (unsigned int k = 0; k < const_jets.size(); k++) { + printf(" jet%03u %15.8f %15.8f %15.8f %5d\n",j,const_jets[k].rap(), + const_jets[k].phi(),sqrt(const_jets[k].kt2()), const_jets[k].cluster_hist_index()); + } + cout << "\n\n"; } } } @@ -940,7 +1014,7 @@ void print_jets_and_sub (const vector & jets, double dcut) { // label the columns printf("Printing jets and their subjets with subdcut = %10.5f\n",dcut); printf("%5s %15s %15s %15s %15s\n","jet #", "rapidity", - "phi", "pt", "n constituents"); + "phi", "pt", "n constituents"); // the kind of subjet finding used to test consistency among them SubType sub_type = subtype_internal; @@ -1001,6 +1075,45 @@ void print_jets_and_sub (const vector & jets, double dcut) { } +/// if abs(x) &jets, + const vector &subtracted_jets, + BackgroundEstimatorBase * bge_ptr, + bool do_subtractor){ + printf("Printing jets, background information"); + if (do_subtractor) + printf(" and subtracted jets\n"); + printf("%5s %15s %15s %15s %15s %15s %15s %15s %15s\n","jet #", + "rapidity", "phi", "pt", "pt^2+m^2", + "rho", "rho_m", "sigma", "sigma_m"); + if (do_subtractor) + printf("%5s %15s %15s %15s %15s %15ss\n","jet #", + "rapidity", "phi", "pt", "sqrt(pt^2+m^2)", "area"); + + for (unsigned i = 0; i < jets.size(); i++) { + const PseudoJet & jet = jets[i]; + BackgroundEstimate estimate = bge_ptr->estimate(jet); + // Note that the values of rho_m sometimes comes out as +- a very + // small number and the format can produce either 0.00000000 or + // -0.00000000. The call to "make_safe_zero_truncation" makes sure it is + // printed wo the - sign in each case + printf("%5u %15.8f %15.8f %15.8f %15.8f %15.8f %15.8f %15.8f %15.8f\n", i, + jet.rap(), jet.phi(), jet.perp(), jet.mt(), + estimate.rho(), make_safe_zero_truncation(estimate.rho_m(),1e-8), + estimate.sigma(), estimate.sigma_m()); + if (do_subtractor) { + const PseudoJet & subjet = subtracted_jets[i]; + printf("%5u %15.8f %15.8f %15.8f %15.8f %15.8f\n", i, + subjet.rap(), subjet.phi(), subjet.perp(), subjet.mt(), jet.area()); + } + } +} +#endif// __FJCORE__ //---------------------------------------------------------------------- void signal_failed_comparison(int iev, diff --git a/fastjet/example/python/02-area.py b/fastjet/example/python/02-area.py index 7a4621b..6ad61e7 100755 --- a/fastjet/example/python/02-area.py +++ b/fastjet/example/python/02-area.py @@ -64,8 +64,8 @@ def print_jets(jets): for ijet in range(len(jets)): jet = jets[ijet] - print("{0:5d} {1:10.3f} {2:10.4f} {3:10.4f} {3:10.4f}".format( - ijet, jet.pt(), jet.rap(), jet.phi(), jet.area)) + print("{0:5d} {1:10.3f} {2:10.4f} {3:10.4f} {4:10.4f}".format( + ijet, jet.pt(), jet.rap(), jet.phi(), jet.area())) if __name__ == '__main__': diff --git a/fastjet/example/python/Makefile.in b/fastjet/example/python/Makefile.in index 478101c..7b819ab 100644 --- a/fastjet/example/python/Makefile.in +++ b/fastjet/example/python/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. diff --git a/fastjet/example/root/Makefile.in b/fastjet/example/root/Makefile.in index 7ad74fe..70406f7 100644 --- a/fastjet/example/root/Makefile.in +++ b/fastjet/example/root/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. diff --git a/fastjet/fortran_wrapper/Makefile.alt b/fastjet/fortran_wrapper/Makefile.alt index ddf2f0c..807320f 100644 --- a/fastjet/fortran_wrapper/Makefile.alt +++ b/fastjet/fortran_wrapper/Makefile.alt @@ -11,6 +11,11 @@ CXXFLAGS = -O -g FFLAGS = -O -g F77FLAGS = -O -g +# If FastJet was compiled with a standard that is not the compiler's +# default, on some systems you may need add suitable flags to compile +# with the smae standard +# CXXFLAGS += -std=c++11 + # get the fastjet libraries CXXFLAGS += $(shell $(FASTJET_CONFIG) --cxxflags) LIBS += $(shell $(FASTJET_CONFIG) --libs --plugins ) @@ -19,7 +24,7 @@ LIBS += $(shell $(FASTJET_CONFIG) --libs --plugins ) LIBS += -lstdc++ # for fastjet compiled with MacOS c++ (clang), you may need the following -# (but it even be necessary to link with the C++ compiler directly, cf. below) +# (but it may even be necessary to link with the C++ compiler directly, cf. below) #LIBS += -lc++ # set compilers @@ -30,7 +35,7 @@ fastjet_fortran_example: fastjet_fortran_example.o fastjetfortran.o $(FC) -o fastjet_fortran_example fastjet_fortran_example.o fastjetfortran.o $(LIBS) # on some systems (e.g. MacOX 10.14 with native c++) one needs to link # with the C++ compiler rather than the Fortran one - #$(CXX) -o fastjet_fortran_example fastjet_fortran_example.o fastjetfortran.o $(LIBS) -L/usr/local/lib/gcc/9 -lgfortran + #$(CXX) -o fastjet_fortran_example fastjet_fortran_example.o fastjetfortran.o $(LIBS) -L/usr/local/lib/gcc/10 -lgfortran clean: rm -f *.o diff --git a/fastjet/fortran_wrapper/Makefile.in b/fastjet/fortran_wrapper/Makefile.in index fae230c..0c950b4 100644 --- a/fastjet/fortran_wrapper/Makefile.in +++ b/fastjet/fortran_wrapper/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. diff --git a/fastjet/fortran_wrapper/fastjet_fortran_example.f b/fastjet/fortran_wrapper/fastjet_fortran_example.f index 1040c80..67bb736 100644 --- a/fastjet/fortran_wrapper/fastjet_fortran_example.f +++ b/fastjet/fortran_wrapper/fastjet_fortran_example.f @@ -10,7 +10,7 @@ C C To use, type: ./fastjet_fortran_example < ../example/data/single-event.dat C -C $Id: fastjet_fortran_example.f 4006 2015-10-05 21:39:13Z cacciari $ +C $Id$ C program fastjet_fortran_example implicit none diff --git a/fastjet/fortran_wrapper/fastjetfortran.cc b/fastjet/fortran_wrapper/fastjetfortran.cc index 10f803a..6bd6eac 100644 --- a/fastjet/fortran_wrapper/fastjetfortran.cc +++ b/fastjet/fortran_wrapper/fastjetfortran.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: fastjetfortran.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -33,7 +33,22 @@ #include "fastjet/ClusterSequenceArea.hh" #include "fastjet/Selector.hh" #include "fastjet/SISConePlugin.hh" -//#include + +// Many calls below rely on caching information (input particles, +// ClusterSequence, jets) in fastjet structures so that one can query +// for extra information (e,g, jet constituents) after clustering. +// +// By default, this caching is not thread-safe. +// +// Uncommenting the following line results in defining all the cached +// variables as thread_local, meaning that clustering (with caching) +// and requesting extra information in the same thread is possible. +// +//#define FASTJET_FORTRAN_THREAD_LOCAL_CACHING + +#ifdef FASTJET_FORTRAN_THREAD_LOCAL_CACHING +#include +#endif using namespace std; using namespace fastjet; @@ -43,71 +58,144 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh /// a namespace for the fortran-wrapper which contains commonly-used /// structures and means to transfer fortran <-> C++ namespace fwrapper { +#ifdef FASTJET_FORTRAN_THREAD_LOCAL_CACHING + // use a thread local version of the caching so that this interface + // works in a (reasonably) thread-safe way. + thread_local vector input_particles, jets; + thread_local SharedPtr plugin; + thread_local JetDefinition jet_def; + thread_local SharedPtr cs; +#else // FASTJET_FORTRAN_THREAD_LOCAL_CACHING not defined vector input_particles, jets; SharedPtr plugin; JetDefinition jet_def; SharedPtr cs; - // replace the above with thread local version if you want - // this interface to work in a (reasonably) thread-safe way. - // thread_local vector input_particles, jets; - // thread_local SharedPtr plugin; - // thread_local JetDefinition jet_def; - // thread_local SharedPtr cs; - - /// helper routine to transfer fortran input particles into - void transfer_input_particles(const double * p, const int & npart) { - input_particles.resize(0); - input_particles.reserve(npart); +#endif // FASTJET_FORTRAN_THREAD_LOCAL_CACHING + + /// helper routine to transform the fortran input particles into PseudoJets + void convert_input_particles(const double * p, const int & npart, vector &fj_particles) { + fj_particles.resize(0); + fj_particles.reserve(npart); for (int i=0; i mom(4); // mom[0..3] for (int j=0;j<=3; j++) { mom[j] = *(p++); } PseudoJet psjet(mom); - input_particles.push_back(psjet); + fj_particles.push_back(psjet); } } - /// helper routine to help transfer jets -> f77jets[4*ijet+0..3] - void transfer_jets(double * f77jets, int & njets) { - njets = jets.size(); + /// helper routine to transfer fortran input particles into cached input_particles + void transfer_input_particles(const double * p, const int & npart) { + convert_input_particles(p, npart, input_particles); + } + + /// helper routine to help convert fj_jets -> f77jets[4*ijet+0..3] + void convert_jets(const vector & fj_jets, double * f77jets, int & njets) { + njets = fj_jets.size(); for (int i=0; i f77jets[4*ijet+0..3] + void transfer_jets(double * f77jets, int & njets) { + convert_jets(jets, f77jets, njets); + // njets = jets.size(); + // for (int i=0; i & particles, + const JetDefinition & jet_def, + const double & ghost_maxrap = 0.0, + const int & nrepeat = 0, const double & ghost_area = 0.0) { + // perform the clustering + if ( ghost_maxrap == 0.0 ) { + // cluster without areas + return new ClusterSequence(particles,jet_def); + } else { + // cluster with areas + GhostedAreaSpec area_spec(ghost_maxrap,nrepeat,ghost_area); + AreaDefinition area_def(active_area, area_spec); + return new ClusterSequenceArea(particles,jet_def,area_def); + } + } + /// helper routine packaging the transfers, the clustering /// and the extraction of the jets + /// This fills the f77jets and njets but does not cache anything + void cluster_nocache(const double * p, const int & npart, + const JetDefinition & jet_def, + double * f77jets, int & njets, + const double & ghost_maxrap = 0.0, + const int & nrepeat = 0, const double & ghost_area = 0.0) { + + // transfer p[4*ipart+0..3] -> particles[i] + vector fj_particles; + convert_input_particles(p, npart, fj_particles); + + // cluster + ClusterSequence *cs_local = cluster_base(fj_particles, jet_def, + ghost_maxrap, nrepeat, ghost_area); + + // extract jets + vector fj_jets; + if (jet_def.is_spherical()){ + fj_jets = sorted_by_E(cs_local->inclusive_jets()); + } else { + fj_jets = sorted_by_pt(cs_local->inclusive_jets()); + } + + convert_jets(fj_jets, f77jets, njets); + + // release memory + delete cs_local; + } + + /// helper routine packaging the transfers, the clustering + /// and the extraction of the jets + /// + /// This fills the f77jets and njets and caches the input particles, + /// the ClusterSequence and the jets for future manipulations void transfer_cluster_transfer(const double * p, const int & npart, const JetDefinition & jet_def, double * f77jets, int & njets, const double & ghost_maxrap = 0.0, const int & nrepeat = 0, const double & ghost_area = 0.0) { - // transfer p[4*ipart+0..3] -> input_particles[i] + // transfer p[4*ipart+0..3] -> input_particles[i] (cached) transfer_input_particles(p, npart); - // perform the clustering - if ( ghost_maxrap == 0.0 ) { - // cluster without areas - cs.reset(new ClusterSequence(input_particles,jet_def)); + // cluster + ClusterSequence *cs_local = cluster_base(input_particles, jet_def, + ghost_maxrap, nrepeat, ghost_area); + + // cache + cs.reset(cs_local); + + // extract jets (into cache) + if (jet_def.is_spherical()){ + jets = sorted_by_E(cs_local->inclusive_jets()); } else { - // cluster with areas - GhostedAreaSpec area_spec(ghost_maxrap,nrepeat,ghost_area); - AreaDefinition area_def(active_area, area_spec); - cs.reset(new ClusterSequenceArea(input_particles,jet_def,area_def)); + jets = sorted_by_pt(cs_local->inclusive_jets()); } - // extract jets (pt-ordered) - jets = sorted_by_pt(cs->inclusive_jets()); // transfer jets -> f77jets[4*ijet+0..3] - transfer_jets(f77jets, njets); - + transfer_jets(f77jets, njets); } + } FASTJET_END_NAMESPACE @@ -116,8 +204,15 @@ using namespace fastjet::fwrapper; extern "C" { +//------------------------------------------------------------------------ +// Clustering routines +//------------------------------------------------------------------------ + /// f77 interface to SISCone (via fastjet), as defined in arXiv:0704.0292 /// [see below for the interface to kt, Cam/Aachen & kt] +/// +/// This caches the clustering structures for later access to extra +/// information (constituents, ...) // // Corresponds to the following Fortran subroutine // interface structure: @@ -147,17 +242,34 @@ extern "C" { // void fastjetsiscone_(const double * p, const int & npart, const double & R, const double & f, - double * f77jets, int & njets) { - - // prepare jet def - plugin.reset(new SISConePlugin(R,f)); - jet_def = plugin.get(); - - // do everything - transfer_cluster_transfer(p,npart,jet_def,f77jets,njets); + double * f77jets, int & njets) { + // prepare jet def + plugin.reset(new SISConePlugin(R,f)); + jet_def = plugin.get(); + + // do everything + transfer_cluster_transfer(p,npart,jet_def,f77jets,njets); } +/// same SISCone as above without the caching (invalidating calls to +/// constituents, ... but making this call thread-safe) +/// +/// Note that as of SISCone 3.0.5 SISCone itself is not guaranteed to +/// be thread-safe +void fastjetsisconenocache_(const double * p, const int & npart, + const double & R, const double & f, + double * f77jets, int & njets) { + // prepare jet def + JetDefinition::Plugin *plugin_local = new SISConePlugin(R,f); + JetDefinition jet_def_local = plugin_local; + // do everything + cluster_nocache(p,npart,jet_def_local,f77jets,njets); + + // release memory + delete plugin_local; +} + /// f77 interface to SISCone (via fastjet), as defined in arXiv:0704.0292 /// [see below for the interface to kt, Cam/Aachen & kt] @@ -197,15 +309,33 @@ void fastjetsisconewitharea_(const double * p, const int & npart, const double & R, const double & f, const double & ghost_rapmax, const int & nrepeat, const double & ghost_area, double * f77jets, int & njets) { - - // prepare jet def - plugin.reset(new SISConePlugin(R,f)); - jet_def = plugin.get(); - - // do everything - transfer_cluster_transfer(p,npart,jet_def,f77jets,njets,ghost_rapmax,nrepeat,ghost_area); + // prepare jet def + plugin.reset(new SISConePlugin(R,f)); + jet_def = plugin.get(); + + // do everything + transfer_cluster_transfer(p,npart,jet_def,f77jets,njets,ghost_rapmax,nrepeat,ghost_area); } +/// same SISCone+area as above without the caching (invalidating calls +/// to constituents, ... but making this call thread-safe) +/// +/// Note that as of SISCone 3.0.5 SISCone itself is not guaranteed to +/// be thread-safe +void fastjetsisconewithareanocache_(const double * p, const int & npart, + const double & R, const double & f, + const double & ghost_rapmax, const int & nrepeat, const double & ghost_area, + double * f77jets, int & njets) { + // prepare jet def + JetDefinition::Plugin *plugin_local = new SISConePlugin(R,f); + JetDefinition jet_def_local = plugin_local; + + // do everything + cluster_nocache(p,npart,jet_def_local,f77jets,njets,ghost_rapmax,nrepeat,ghost_area); + + // release memory + delete plugin_local; +} /// f77 interface to the pp generalised-kt (sequential recombination) @@ -248,20 +378,44 @@ void fastjetppgenkt_(const double * p, const int & npart, const double & R, const double & palg, double * f77jets, int & njets) { - // prepare jet def - if (palg == 1.0) { - jet_def = JetDefinition(kt_algorithm, R); - } else if (palg == 0.0) { - jet_def = JetDefinition(cambridge_algorithm, R); - } else if (palg == -1.0) { - jet_def = JetDefinition(antikt_algorithm, R); - } else { - jet_def = JetDefinition(genkt_algorithm, R, palg); - } - - // do everything - transfer_cluster_transfer(p,npart,jet_def,f77jets,njets); + // prepare jet def + if (palg == 1.0) { + jet_def = JetDefinition(kt_algorithm, R); + } else if (palg == 0.0) { + jet_def = JetDefinition(cambridge_algorithm, R); + } else if (palg == -1.0) { + jet_def = JetDefinition(antikt_algorithm, R); + } else { + jet_def = JetDefinition(genkt_algorithm, R, palg); + } + + // do everything + transfer_cluster_transfer(p,npart,jet_def,f77jets,njets); } + +/// same pp generalised-kt as above without the caching (invalidating +/// calls to constituents, ... but making this call thread-safe) +void fastjetppgenktnocache_(const double * p, const int & npart, + const double & R, const double & palg, + double * f77jets, int & njets) { + + // prepare jet def + JetDefinition jet_def_local; + if (palg == 1.0) { + jet_def_local = JetDefinition(kt_algorithm, R); + } else if (palg == 0.0) { + jet_def_local = JetDefinition(cambridge_algorithm, R); + } else if (palg == -1.0) { + jet_def_local = JetDefinition(antikt_algorithm, R); + } else { + jet_def_local = JetDefinition(genkt_algorithm, R, palg); + } + + // do everything + cluster_nocache(p,npart,jet_def_local,f77jets,njets); +} + + /// a routine that provides similar f77 functionality to fastjetppgenkt_, /// but for the e+e- algorithms instead of the pp ones; note this @@ -278,8 +432,20 @@ void fastjeteegenkt_(const double * p, const int & npart, transfer_cluster_transfer(p,npart,jet_def,f77jets,njets); } +/// same ee generalised-kt as above without the caching (invalidating +/// calls to constituents, ... but making this call thread-safe) +void fastjeteegenktnocache_(const double * p, const int & npart, + const double & R, const double & palg, + double * f77jets, int & njets) { + + // prepare jet def + JetDefinition jet_def_local = JetDefinition(ee_genkt_algorithm, R, palg); + + // do everything + cluster_nocache(p,npart,jet_def_local,f77jets,njets); +} - + /// f77 interface to the pp generalised-kt (sequential recombination) /// algorithms, as defined in arXiv.org:0802.1189, which includes /// kt, Cambridge/Aachen and anti-kt as special cases. @@ -342,6 +508,40 @@ void fastjetppgenktwitharea_(const double * p, const int & npart, } +/// same pp generalised-kt+area as above without the caching +/// (invalidating calls to constituents, ... but making this call +/// thread-safe) +void fastjetppgenktwithareanocache_(const double * p, const int & npart, + const double & R, const double & palg, + const double & ghost_rapmax, const int & nrepeat, const double & ghost_area, + double * f77jets, int & njets) { + + // prepare jet def + JetDefinition jet_def_local; + if (palg == 1.0) { + jet_def_local = JetDefinition(kt_algorithm, R); + } else if (palg == 0.0) { + jet_def_local = JetDefinition(cambridge_algorithm, R); + } else if (palg == -1.0) { + jet_def_local = JetDefinition(antikt_algorithm, R); + } else { + jet_def_local = JetDefinition(genkt_algorithm, R, palg); + } + + // do everything + cluster_nocache(p,npart,jet_def_local,f77jets,njets,ghost_rapmax,nrepeat,ghost_area); +} + + +//------------------------------------------------------------------------ +// routines which access the cached particles/CluterSequence/jets +// +// Note that this is not available in the "nocache" versions of the +// above clustering routines These routines may not work properly in a +// threaded environment unless the +// FASTJET_FORTRAN_THREAD_LOCAL_CACHING flag is defined +//------------------------------------------------------------------------ + /// f77 interface to provide access to the constituents of a jet found /// in the jet clustering with one of the above routines. /// diff --git a/fastjet/include/Makefile.in b/fastjet/include/Makefile.in index b136487..630ac5a 100644 --- a/fastjet/include/Makefile.in +++ b/fastjet/include/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. diff --git a/fastjet/include/fastjet/ActiveAreaSpec.hh b/fastjet/include/fastjet/ActiveAreaSpec.hh index 129774d..d37b750 100644 --- a/fastjet/include/fastjet/ActiveAreaSpec.hh +++ b/fastjet/include/fastjet/ActiveAreaSpec.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ActiveAreaSpec.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/AreaDefinition.hh b/fastjet/include/fastjet/AreaDefinition.hh index 12361c1..22c4e33 100644 --- a/fastjet/include/fastjet/AreaDefinition.hh +++ b/fastjet/include/fastjet/AreaDefinition.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: AreaDefinition.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2006-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -143,6 +143,15 @@ public: /// return a reference to the voronoi area spec const VoronoiAreaSpec & voronoi_spec() const {return _voronoi_spec;} + + /// return a copy of this AreaDefinition with a user-defined set of seeds + AreaDefinition with_fixed_seed(const std::vector & iseed) const{ + if (_area_type == voronoi_area) { + return *this; + } else { + return AreaDefinition(_area_type, _ghost_spec.with_fixed_seed(iseed)); + } + } private: diff --git a/fastjet/include/fastjet/CircularRange.hh b/fastjet/include/fastjet/CircularRange.hh index ca8fc66..659d39a 100644 --- a/fastjet/include/fastjet/CircularRange.hh +++ b/fastjet/include/fastjet/CircularRange.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: CircularRange.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -50,28 +50,28 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh class CircularRange : public fastjet::RangeDefinition { public: /// constructor - FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead") - CircularRange() {_set_invalid_rapphi();} + FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead", + CircularRange()) {_set_invalid_rapphi();} /// initialise CircularRange with a jet - FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead") - CircularRange(const fastjet::PseudoJet & jet, double distance) { + FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead", + CircularRange(const fastjet::PseudoJet & jet, double distance)) { _distance = distance; _rapjet = jet.rap(); _phijet = jet.phi(); _total_area = fastjet::pi*_distance*_distance; } /// initialise CircularRange with a (rap,phi) point - FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead") - CircularRange(double rap, double phi, double distance) { + FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead", + CircularRange(double rap, double phi, double distance)) { _distance = distance; _rapjet = rap; _phijet = phi; _total_area = fastjet::pi*_distance*_distance; } /// initialise CircularRange with just the radius parameter - FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead") - CircularRange(double distance) { + FASTJET_DEPRECATED_MSG("CircularRange is deprecated since FastJet 3.0. Use SelectorCircle instead", + CircularRange(double distance)) { _set_invalid_rapphi(); _distance = distance; _total_area = fastjet::pi*_distance*_distance; } diff --git a/fastjet/include/fastjet/ClusterSequence.hh b/fastjet/include/fastjet/ClusterSequence.hh index 9795b30..97cf8f7 100644 --- a/fastjet/include/fastjet/ClusterSequence.hh +++ b/fastjet/include/fastjet/ClusterSequence.hh @@ -2,9 +2,9 @@ #define __FASTJET_CLUSTERSEQUENCE_HH__ //FJSTARTHEADER -// $Id: ClusterSequence.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -47,7 +47,7 @@ #include "fastjet/LimitedWarning.hh" #include "fastjet/FunctionOfPseudoJet.hh" #include "fastjet/ClusterSequenceStructure.hh" - +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write code w&wo thread-safety #include "fastjet/internal/deprecated.hh" FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh @@ -299,8 +299,13 @@ class ClusterSequence { /// when unused bool will_delete_self_when_unused() const {return _deletes_self_when_unused;} +//std::shared_ptr: #ifdef FASTJET_HAVE_THREAD_SAFETY +//std::shared_ptr: /// signals that a jet will no longer use the current CS (internal use only) +//std::shared_ptr: void release_pseudojet(PseudoJet &jet) const; +//std::shared_ptr: #else /// tell the ClusterSequence it's about to be self deleted (internal use only) void signal_imminent_self_deletion() const; +//std::shared_ptr: #endif /// returns the scale associated with a jet as required for this /// clustering algorithm (kt^2 for the kt-algorithm, 1 for the @@ -368,8 +373,8 @@ class ClusterSequence { /// of auto_ptr in C++11 #ifndef SWIG #ifdef FASTJET_HAVE_AUTO_PTR_INTERFACE - FASTJET_DEPRECATED_MSG("Please use ClusterSequence::plugin_associate_extras(Extras * extras_in)) instead") - inline void plugin_associate_extras(std::auto_ptr extras_in){ + FASTJET_DEPRECATED_MSG("Please use ClusterSequence::plugin_associate_extras(Extras * extras_in)) instead", + inline void plugin_associate_extras(std::auto_ptr extras_in)){ _extras.reset(extras_in.release()); } #endif @@ -574,11 +579,14 @@ public: static std::ostream * fastjet_banner_stream() {return _fastjet_banner_ostr;} private: + /// \cond internal_doc - /// contains the actual stream to use for banners +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + static std::atomic _fastjet_banner_ostr; +#else static std::ostream * _fastjet_banner_ostr; - +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY /// \endcond protected: @@ -711,7 +719,11 @@ protected: /// object referring to it disappears. It is mutable so as to ensure /// that signal_imminent_self_deletion() [const] can make relevant /// changes. +#ifdef FASTJET_HAVE_THREAD_SAFETY + mutable std::atomic _deletes_self_when_unused; +#else mutable bool _deletes_self_when_unused; +#endif private: @@ -767,7 +779,7 @@ protected: /// will be set by default to be true for the first run - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; /// manage warnings related to exclusive jets access static LimitedWarning _exclusive_warnings; diff --git a/fastjet/include/fastjet/ClusterSequence1GhostPassiveArea.hh b/fastjet/include/fastjet/ClusterSequence1GhostPassiveArea.hh index b51ab6a..d17941e 100644 --- a/fastjet/include/fastjet/ClusterSequence1GhostPassiveArea.hh +++ b/fastjet/include/fastjet/ClusterSequence1GhostPassiveArea.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequence1GhostPassiveArea.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -69,7 +69,7 @@ public: /// return an estimate for the number of empty jets -- one uses the /// AreaBase one rather than the ActiveArea one (which for which we /// do not have the information). - virtual double n_empty_jets(const Selector & selector) const FASTJET_OVERRIDE { + virtual double n_empty_jets(const Selector & selector) const FASTJET_OVERRIDE{ return ClusterSequenceAreaBase::n_empty_jets(selector); } diff --git a/fastjet/include/fastjet/ClusterSequenceActiveArea.hh b/fastjet/include/fastjet/ClusterSequenceActiveArea.hh index 866bed6..5413695 100644 --- a/fastjet/include/fastjet/ClusterSequenceActiveArea.hh +++ b/fastjet/include/fastjet/ClusterSequenceActiveArea.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceActiveArea.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -73,12 +73,12 @@ public: const GhostedAreaSpec & ghost_spec, const bool & writeout_combinations = false) ; - virtual double area (const PseudoJet & jet) const FASTJET_OVERRIDE { + virtual double area (const PseudoJet & jet) const FASTJET_OVERRIDE{ return _average_area[jet.cluster_hist_index()];}; virtual double area_error (const PseudoJet & jet) const FASTJET_OVERRIDE { return _average_area2[jet.cluster_hist_index()];}; - virtual PseudoJet area_4vector (const PseudoJet & jet) const FASTJET_OVERRIDE { + virtual PseudoJet area_4vector (const PseudoJet & jet) const FASTJET_OVERRIDE{ return _average_area_4vector[jet.cluster_hist_index()];}; /// enum providing a variety of tentative strategies for estimating diff --git a/fastjet/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh b/fastjet/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh index 20be36d..739dd45 100644 --- a/fastjet/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh +++ b/fastjet/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceActiveAreaExplicitGhosts.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/ClusterSequenceArea.hh b/fastjet/include/fastjet/ClusterSequenceArea.hh index 686579f..59b8615 100644 --- a/fastjet/include/fastjet/ClusterSequenceArea.hh +++ b/fastjet/include/fastjet/ClusterSequenceArea.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceArea.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2006-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -79,16 +79,16 @@ public: /// return the area associated with the given jet - virtual double area (const PseudoJet & jet) const FASTJET_OVERRIDE { + virtual double area (const PseudoJet & jet) const FASTJET_OVERRIDE{ return _area_base->area(jet);} /// return the error (uncertainty) associated with the determination /// of the area of this jet - virtual double area_error (const PseudoJet & jet) const FASTJET_OVERRIDE { + virtual double area_error (const PseudoJet & jet) const FASTJET_OVERRIDE{ return _area_base->area_error(jet);} /// return the 4-vector area - virtual PseudoJet area_4vector(const PseudoJet & jet) const FASTJET_OVERRIDE { + virtual PseudoJet area_4vector(const PseudoJet & jet) const FASTJET_OVERRIDE{ return _area_base->area_4vector(jet);} // /// return the total area, up to |y|empty_area(selector);} /// return something similar to the number of pure ghost jets @@ -121,17 +121,17 @@ public: /// The selector needs to have a finite area and be applicable jet by /// jet (see the BackgroundEstimator and Subtractor tools for more /// advanced usage) - virtual double n_empty_jets(const Selector & selector) const FASTJET_OVERRIDE { + virtual double n_empty_jets(const Selector & selector) const FASTJET_OVERRIDE{ return _area_base->n_empty_jets(selector); } /// true if a jet is made exclusively of ghosts - virtual bool is_pure_ghost(const PseudoJet & jet) const FASTJET_OVERRIDE { + virtual bool is_pure_ghost(const PseudoJet & jet) const FASTJET_OVERRIDE{ return _area_base->is_pure_ghost(jet); } /// true if this ClusterSequence has explicit ghosts - virtual bool has_explicit_ghosts() const FASTJET_OVERRIDE { + virtual bool has_explicit_ghosts() const FASTJET_OVERRIDE{ return _area_base->has_explicit_ghosts(); } @@ -149,7 +149,7 @@ public: bool use_area_4vector, double & median, double & sigma, double & mean_area, - bool all_are_incl = false) const FASTJET_OVERRIDE { + bool all_are_incl = false) const FASTJET_OVERRIDE{ _warn_if_range_unsuitable(selector); ClusterSequenceAreaBase::_get_median_rho_and_sigma( all_jets, selector, use_area_4vector, @@ -163,7 +163,7 @@ public: //FASTJET_DEPRECATED_MSG("ClusterSequenceArea::get_median_rho_and_sigma(...) is deprecated since FastJet 3.0. Use the BackgroundEstimator series of tools instead") virtual void get_median_rho_and_sigma(const Selector & selector, bool use_area_4vector, - double & median, double & sigma) const FASTJET_OVERRIDE { + double & median, double & sigma) const FASTJET_OVERRIDE{ ClusterSequenceAreaBase::_get_median_rho_and_sigma(selector,use_area_4vector, median,sigma); } @@ -176,7 +176,7 @@ public: virtual void get_median_rho_and_sigma(const Selector & selector, bool use_area_4vector, double & median, double & sigma, - double & mean_area) const FASTJET_OVERRIDE { + double & mean_area) const FASTJET_OVERRIDE{ ClusterSequenceAreaBase::_get_median_rho_and_sigma(selector,use_area_4vector, median,sigma, mean_area); } @@ -189,7 +189,7 @@ public: virtual void parabolic_pt_per_unit_area(double & a, double & b, const Selector & selector, double exclude_above=-1.0, - bool use_area_4vector=false) const FASTJET_OVERRIDE { + bool use_area_4vector=false) const FASTJET_OVERRIDE{ return _parabolic_pt_per_unit_area(a,b,selector,exclude_above,use_area_4vector); } diff --git a/fastjet/include/fastjet/ClusterSequenceAreaBase.hh b/fastjet/include/fastjet/ClusterSequenceAreaBase.hh index aaca625..5b2aeb6 100644 --- a/fastjet/include/fastjet/ClusterSequenceAreaBase.hh +++ b/fastjet/include/fastjet/ClusterSequenceAreaBase.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceAreaBase.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -144,24 +144,24 @@ public: /// The selector passed as an argument has to have a finite area and /// apply jet-by-jet (see the BackgroundEstimator and Subtractor /// tools for more generic usages) - FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::median_pt_per_unit_area(...) is deprecated since FastJet 3.0. Use the BackgroundEstimator series of tools instead") - double median_pt_per_unit_area(const Selector & selector) const; + FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::median_pt_per_unit_area(...) is deprecated since FastJet 3.0. Use the BackgroundEstimator series of tools instead", + double median_pt_per_unit_area(const Selector & selector) const); /// the median of (pt/area_4vector) for jets contained within the /// selector range, making use also of the info on n_empty_jets /// /// The selector passed as an argument has to have a finite area and /// apply jet-by-jet - FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::median_pt_per_unit_area_4vector(...) is deprecated since FastJet 3.0. Use the BackgroundEstimator series of tools instead") - double median_pt_per_unit_area_4vector(const Selector & selector) const; + FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::median_pt_per_unit_area_4vector(...) is deprecated since FastJet 3.0. Use the BackgroundEstimator series of tools instead", + double median_pt_per_unit_area_4vector(const Selector & selector) const); /// the function that does the work for median_pt_per_unit_area and /// median_pt_per_unit_area_4vector: /// - something_is_area_4vect = false -> use plain area /// - something_is_area_4vect = true -> use 4-vector area - FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::median_pt_per_unit_something(...) is deprecated since FastJet 3.0. Use the BackgroundEstimator series of tools instead") + FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::median_pt_per_unit_something(...) is deprecated since FastJet 3.0. Use the BackgroundEstimator series of tools instead", double median_pt_per_unit_something(const Selector & selector, - bool use_area_4vector) const; + bool use_area_4vector) const); /// using jets withing the selector range (and with 4-vector areas if /// use_area_4vector), calculate the median pt/area, as well as an @@ -252,9 +252,9 @@ public: /// Only inclusive_jets above ptmin are subtracted and returned. /// the ordering is the same as that of sorted_by_pt(cs.inclusive_jets()), /// i.e. not necessarily ordered in pt once subtracted - FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_jets(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead") + FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_jets(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead", std::vector subtracted_jets(const double rho, - const double ptmin=0.0) const; + const double ptmin=0.0) const); /// return a vector of subtracted jets, using area_4vector. /// Only inclusive_jets above ptmin are subtracted and returned. @@ -264,14 +264,14 @@ public: /// The selector passed as an argument has to have a finite area and /// apply jet-by-jet (see the BackgroundEstimator and Subtractor /// tools for more generic usages) - FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_jets(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead") + FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_jets(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead", std::vector subtracted_jets(const Selector & selector, - const double ptmin=0.0) const; + const double ptmin=0.0) const); /// return a subtracted jet, using area_4vector, given rho - FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_jet(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead") + FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_jet(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead", PseudoJet subtracted_jet(const PseudoJet & jet, - const double rho) const; + const double rho) const); /// return a subtracted jet, using area_4vector; note /// that this is potentially inefficient if repeatedly used for many @@ -281,15 +281,15 @@ public: /// The selector passed as an argument has to have a finite area and /// apply jet-by-jet (see the BackgroundEstimator and Subtractor /// tools for more generic usages) - FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_jet(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead") + FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_jet(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead", PseudoJet subtracted_jet(const PseudoJet & jet, - const Selector & selector) const; + const Selector & selector) const); /// return the subtracted pt, given rho - FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_pt(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead") + FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_pt(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead", double subtracted_pt(const PseudoJet & jet, const double rho, - bool use_area_4vector=false) const; + bool use_area_4vector=false) const); /// return the subtracted pt; note that this is /// potentially inefficient if repeatedly used for many different @@ -298,10 +298,10 @@ public: /// The selector passed as an argument has to have a finite area and /// apply jet-by-jet (see the BackgroundEstimator and Subtractor /// tools for more generic usages) - FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_pt(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead") + FASTJET_DEPRECATED_MSG("ClusterSequenceAreaBase::subtracted_pt(...) is deprecated since FastJet 3.0. Use the Subtractor tool (with the BackgroundEstimator series of tools) instead", double subtracted_pt(const PseudoJet & jet, const Selector & selector, - bool use_area_4vector=false) const; + bool use_area_4vector=false) const); protected: /// check the selector is suited for the computations i.e. applies jet by jet and has a finite area diff --git a/fastjet/include/fastjet/ClusterSequencePassiveArea.hh b/fastjet/include/fastjet/ClusterSequencePassiveArea.hh index 8a4a0d4..ac170c6 100644 --- a/fastjet/include/fastjet/ClusterSequencePassiveArea.hh +++ b/fastjet/include/fastjet/ClusterSequencePassiveArea.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequencePassiveArea.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/ClusterSequenceStructure.hh b/fastjet/include/fastjet/ClusterSequenceStructure.hh index 2be6f4b..14c78ab 100644 --- a/fastjet/include/fastjet/ClusterSequenceStructure.hh +++ b/fastjet/include/fastjet/ClusterSequenceStructure.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceStructure.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/ClusterSequenceVoronoiArea.hh b/fastjet/include/fastjet/ClusterSequenceVoronoiArea.hh index 41130cb..8cb1b4e 100644 --- a/fastjet/include/fastjet/ClusterSequenceVoronoiArea.hh +++ b/fastjet/include/fastjet/ClusterSequenceVoronoiArea.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceVoronoiArea.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/ClusterSequenceWithArea.hh b/fastjet/include/fastjet/ClusterSequenceWithArea.hh index 4d7f3c1..b9e2d96 100644 --- a/fastjet/include/fastjet/ClusterSequenceWithArea.hh +++ b/fastjet/include/fastjet/ClusterSequenceWithArea.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceWithArea.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2006-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/CompositeJetStructure.hh b/fastjet/include/fastjet/CompositeJetStructure.hh index 882e5ae..c2ccc83 100644 --- a/fastjet/include/fastjet/CompositeJetStructure.hh +++ b/fastjet/include/fastjet/CompositeJetStructure.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: CompositeJetStructure.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -32,11 +32,11 @@ #ifndef __FASTJET_COMPOSITEJET_STRUCTURE_HH__ #define __FASTJET_COMPOSITEJET_STRUCTURE_HH__ -#include -#include +#include "fastjet/PseudoJet.hh" +#include "fastjet/PseudoJetStructureBase.hh" // to have access to the recombiner we need to include the JetDefinition header -#include +#include "fastjet/JetDefinition.hh" FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh diff --git a/fastjet/include/fastjet/Error.hh b/fastjet/include/fastjet/Error.hh index a8c9583..82926f6 100644 --- a/fastjet/include/fastjet/Error.hh +++ b/fastjet/include/fastjet/Error.hh @@ -1,10 +1,10 @@ -#ifndef __FASTJET_ERROR_HH__ + #ifndef __FASTJET_ERROR_HH__ #define __FASTJET_ERROR_HH__ //FJSTARTHEADER -// $Id: Error.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -35,16 +35,21 @@ #include #include "fastjet/internal/base.hh" #include "fastjet/config.h" +//#include #if (!defined(FASTJET_HAVE_EXECINFO_H)) || defined(__FJCORE__) #include "fastjet/LimitedWarning.hh" #endif +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +#include +#include +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh /// @ingroup error_handling /// \class Error /// base class corresponding to errors that can be thrown by FastJet -class Error { +class Error{ public: /// default constructors Error() {} @@ -79,6 +84,17 @@ public: _default_ostr = ostr; } +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + /// sets the default output stream for all errors (by default + /// cerr; passing a null pointer prevents errors from being output) + /// The second argument is a mutex that would be used to guarantee + /// that only a single thread writes to the stream at a time + static void set_default_stream_and_mutex(std::ostream * ostr, std::mutex * stream_mutex) { + _default_ostr = ostr; + _stream_mutex = stream_mutex; + } +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY + private: #ifndef __FJCORE__ @@ -89,9 +105,19 @@ private: #endif std::string _message; ///< error message + +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + static std::atomic _print_errors; ///< do we print anything? + static std::atomic _print_backtrace; ///< do we print the backtrace? + static std::atomic _default_ostr; ///< the output stream (cerr if not set) + static std::atomic _stream_mutex; ///< the mutex for the output stream (nullptr if not set) +#else static bool _print_errors; ///< do we print anything? static bool _print_backtrace; ///< do we print the backtrace? static std::ostream * _default_ostr; ///< the output stream (cerr if not set) +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY + + #if (!defined(FASTJET_HAVE_EXECINFO_H)) || defined(__FJCORE__) static LimitedWarning _execinfo_undefined; #endif diff --git a/fastjet/include/fastjet/FunctionOfPseudoJet.hh b/fastjet/include/fastjet/FunctionOfPseudoJet.hh index 2e621c4..7f97cd6 100644 --- a/fastjet/include/fastjet/FunctionOfPseudoJet.hh +++ b/fastjet/include/fastjet/FunctionOfPseudoJet.hh @@ -2,9 +2,9 @@ #define __FASTJET_FUNCTION_OF_PSEUDOJET_HH__ //FJSTARTHEADER -// $Id: FunctionOfPseudoJet.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,8 +31,8 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include +#include "fastjet/PseudoJet.hh" +#include "fastjet/Selector.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/include/fastjet/GhostedAreaSpec.hh b/fastjet/include/fastjet/GhostedAreaSpec.hh index e999580..6fd9316 100644 --- a/fastjet/include/fastjet/GhostedAreaSpec.hh +++ b/fastjet/include/fastjet/GhostedAreaSpec.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: GhostedAreaSpec.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -39,6 +39,7 @@ #include "fastjet/Selector.hh" #include "fastjet/LimitedWarning.hh" #include "fastjet/internal/deprecated.hh" +#include "fastjet/SharedPtr.hh" // #define STATIC_GENERATOR 1 @@ -62,26 +63,84 @@ namespace gas { /// /// Class that defines the parameters that go into the measurement /// of active jet areas. +/// +/// Notes about thread-safety. +/// -------------------------- +/// +/// Ghosts are generated randomly, using by default a static random +/// number generator. +/// +/// By default, we will lock the number generator during the period +/// over which we generate the required random numbers. The procedure +/// will keep track of the seeds that have been used to generate a +/// particular set of ghosts and, ultimately, these seeds will be +/// made available from ClusterSequenceArea via +/// +/// ClusterSequenceArea::area_def().ghost_spec().get_last_seed(vector); +/// +/// To use user-specified seeds in a thread-safe way, the end-user +/// should use +/// +/// ClusterSequenceArea csa(particles, jet_def, +/// area_def.with_fixed_seed(user_defined_seed)); +/// +/// or explicitly make a copy of the AreaDefinition before doing +/// the clustering: +/// +/// AreaDefinition local_area_def +/// = area_def.with_fixed_seed(user_defined_seed); +/// ClusterSequenceArea csa(particles, jet_def, area_def,local_area_def); +/// +/// This will use a local random generator to compute the ghosts (in +/// particular, it will not affect the static global generator) +/// +/// Note that each clustering done with the GhostedAreaSpec obtained +/// through area_def.with_seed(user_defined_seed) will use exactly the +/// same set of ghosts. Using +/// area_def.with_fixed_seed(user_defined_seed), with an empty vector +/// passed as argument, will return to using the common static random +/// generator. class GhostedAreaSpec { public: /// default constructor - GhostedAreaSpec(): _ghost_maxrap (gas::def_ghost_maxrap), - _ghost_rap_offset(0.0), - _repeat (gas::def_repeat), - _ghost_area (gas::def_ghost_area), - _grid_scatter (gas::def_grid_scatter), - _pt_scatter (gas::def_pt_scatter), - _mean_ghost_pt(gas::def_mean_ghost_pt), - _fj2_placement(false) {_initialize();} + GhostedAreaSpec(): + _ghost_maxrap (gas::def_ghost_maxrap), + _ghost_rap_offset(0.0), + _repeat (gas::def_repeat), + _ghost_area (gas::def_ghost_area), + _grid_scatter (gas::def_grid_scatter), + _pt_scatter (gas::def_pt_scatter), + _mean_ghost_pt(gas::def_mean_ghost_pt), + _fj2_placement(false), + _user_random_generator(){_initialize();} + /// explicit constructor + /// + /// It takes as parameters the maximal (abs) rapidity for the ghosts + /// and an optional user-specified random number generator. + /// + /// For the latter, ownership is transferred to the GhostedAreaSpec + /// class (i.e. it is stored internally as a shared pointer) + explicit GhostedAreaSpec(double ghost_maxrap_in, + BasicRandom *user_random_generator): + _ghost_maxrap(ghost_maxrap_in), + _ghost_rap_offset(0.0), + _repeat (gas::def_repeat), + _ghost_area (gas::def_ghost_area), + _grid_scatter (gas::def_grid_scatter), + _pt_scatter (gas::def_pt_scatter), + _mean_ghost_pt(gas::def_mean_ghost_pt), + _fj2_placement(false), + _user_random_generator(user_random_generator) {_initialize();} + /// explicit constructor explicit GhostedAreaSpec(double ghost_maxrap_in, - int repeat_in = gas::def_repeat, - double ghost_area_in = gas::def_ghost_area, - double grid_scatter_in = gas::def_grid_scatter, - double pt_scatter_in = gas::def_pt_scatter, - double mean_ghost_pt_in = gas::def_mean_ghost_pt - ): + int repeat_in = gas::def_repeat, + double ghost_area_in = gas::def_ghost_area, + double grid_scatter_in = gas::def_grid_scatter, + double pt_scatter_in = gas::def_pt_scatter, + double mean_ghost_pt_in = gas::def_mean_ghost_pt, + BasicRandom *user_random_generator=NULL): _ghost_maxrap(ghost_maxrap_in), _ghost_rap_offset(0.0), _repeat(repeat_in), @@ -89,7 +148,8 @@ public: _grid_scatter(grid_scatter_in), _pt_scatter(pt_scatter_in), _mean_ghost_pt(mean_ghost_pt_in), - _fj2_placement(false) {_initialize();} + _fj2_placement(false), + _user_random_generator(user_random_generator) {_initialize();} /// explicit constructor explicit GhostedAreaSpec(double ghost_minrap_in, @@ -98,8 +158,8 @@ public: double ghost_area_in = gas::def_ghost_area, double grid_scatter_in = gas::def_grid_scatter, double pt_scatter_in = gas::def_pt_scatter, - double mean_ghost_pt_in = gas::def_mean_ghost_pt - ): + double mean_ghost_pt_in = gas::def_mean_ghost_pt, + BasicRandom *user_random_generator=NULL): _ghost_maxrap (0.5*(ghost_maxrap_in - ghost_minrap_in)), _ghost_rap_offset(0.5*(ghost_maxrap_in + ghost_minrap_in)), _repeat(repeat_in), @@ -107,7 +167,8 @@ public: _grid_scatter(grid_scatter_in), _pt_scatter(pt_scatter_in), _mean_ghost_pt(mean_ghost_pt_in), - _fj2_placement(false) {_initialize();} + _fj2_placement(false), + _user_random_generator(user_random_generator) {_initialize();} /// constructor based on a Selector @@ -116,8 +177,8 @@ public: double ghost_area_in = gas::def_ghost_area, double grid_scatter_in = gas::def_grid_scatter, double pt_scatter_in = gas::def_pt_scatter, - double mean_ghost_pt_in = gas::def_mean_ghost_pt - ); + double mean_ghost_pt_in = gas::def_mean_ghost_pt, + BasicRandom *user_random_generator=NULL); /// does the initialization of actual ghost parameters @@ -173,8 +234,8 @@ public: /// sqrt(area)/(2*maxrap). /// /// FJ2 placement is now deprecated. - FASTJET_DEPRECATED_MSG("This is deprecated since we strongly recomment to use the new ghost placement instead") - void set_fj2_placement(bool val); + FASTJET_DEPRECATED_MSG("This is deprecated since we strongly recommend use of the new ghost placement instead", + void set_fj2_placement(bool val)); /// return nphi (ghosts layed out (-nrap, 0..nphi-1), (-nrap+1,0..nphi-1), /// ... (nrap,0..nphi-1) @@ -184,8 +245,15 @@ public: /// get all relevant information about the status of the /// random number generator, so that it can be reset subsequently /// with set_random_status. + /// + /// inline void get_random_status(std::vector & __iseed) const { - _random_generator.get_status(__iseed);} + if (_user_random_generator){ + _user_random_generator->get_status(__iseed); + } else { + _random_generator.get_status(__iseed); + } + } /// set the status of the random number generator, as obtained /// previously with get_random_status. Note that the random @@ -193,8 +261,38 @@ public: /// instances of the class --- so if you modify the random for this /// instance, you modify it for all instances. inline void set_random_status(const std::vector & __iseed) { - _random_generator.set_status(__iseed);} + if (_user_random_generator){ + _user_random_generator->set_status(__iseed); + } else { + _random_generator.set_status(__iseed); + } + } + + /// allows to return a copy of this GhostedAreaSpec with a local set + /// of seeds + GhostedAreaSpec with_fixed_seed(const std::vector & __iseed) const { + GhostedAreaSpec new_spec = (*this); + new_spec._fixed_seed = __iseed; + return new_spec; + } + + /// returns the current fixed seed + void get_fixed_seed(std::vector & __iseed) const { + __iseed = _fixed_seed; + } + /// allows the user to get the seed that was used at the start of the + /// last generation of ghosts. + /// + /// This should typically be access through the area definition held + /// by the ClusterSequenceArea, because the CSA class takes a copy of the + /// AreaDefinition and it is that copy that stored the + void get_last_seed(std::vector & __iseed) const { + if (_repeat > 1) _warn_fixed_last_seeds_nrepeat_gt_1 + .warn("Using fixed seeds (or accessing last used seeds) not sensible with repeat>1"); + __iseed = _last_used_seed; + } + inline void checkpoint_random() {get_random_status(_random_checkpoint);} inline void restore_checkpoint_random() {set_random_status(_random_checkpoint);} @@ -210,7 +308,10 @@ public: inline double random_at_own_risk() const {return _our_rand();} /// very deprecated public access to the generator itself inline BasicRandom & generator_at_own_risk() const { - return _random_generator;} + return _user_random_generator ? *_user_random_generator : _random_generator;} + /// access to the user-defined random-number generator. Will be empty if not set. + inline SharedPtr > & user_random_generator_at_own_risk(){ + return _user_random_generator;} private: @@ -232,12 +333,44 @@ private: std::vector _random_checkpoint; + + // optional fixed seeds + std::vector _fixed_seed; + + // access to the seeds used the very last time + mutable std::vector _last_used_seed; + + // in order to keep thread-safety, have an independent random + // generator for each thread + // + // 2015-09-24: thread_local is not supported by Apple's version of + // clang! So we'll rely on something different here (see comment at + // the top of the class) + //#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + // static thread_local BasicRandom _random_generator; + //#else static BasicRandom _random_generator; + //#endif //mutable BasicRandom _random_generator; + /// a set of seeds as defined by the end-user + std::vector _user_defined_seeds; + + // allow for a user-defined random generator + SharedPtr > _user_random_generator; + static LimitedWarning _warn_fj2_placement_deprecated; + static LimitedWarning _warn_fixed_last_seeds_nrepeat_gt_1; + + inline double _our_rand() const { + return _user_random_generator ? (*_user_random_generator)() : _random_generator();} - inline double _our_rand() const {return _random_generator();} + inline void _our_rand(unsigned int npoints, double *pointer, + std::vector & used_init_seed) const { + return _user_random_generator + ? (*_user_random_generator)(npoints, pointer, used_init_seed) + : _random_generator(npoints, pointer, used_init_seed); + } }; diff --git a/fastjet/include/fastjet/JetDefinition.hh b/fastjet/include/fastjet/JetDefinition.hh index 7a0299a..2d588f4 100644 --- a/fastjet/include/fastjet/JetDefinition.hh +++ b/fastjet/include/fastjet/JetDefinition.hh @@ -2,9 +2,9 @@ #define __FASTJET_JETDEFINITION_HH__ //FJSTARTHEADER -// $Id: JetDefinition.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -362,12 +362,12 @@ public: /// /// the ordering of arguments here is old and deprecated (except /// as the common constructor for internal use) - FASTJET_DEPRECATED_MSG("This argument ordering is deprecated. Use JetDefinition(alg, R, strategy, scheme[, n_parameters]) instead") + FASTJET_DEPRECATED_MSG("This argument ordering is deprecated. Use JetDefinition(alg, R, strategy, scheme[, n_parameters]) instead", JetDefinition(JetAlgorithm jet_algorithm_in, double R_in, Strategy strategy_in, RecombinationScheme recomb_scheme_in = E_scheme, - int nparameters_in = 1){ + int nparameters_in = 1)){ (*this) = JetDefinition(jet_algorithm_in,R_in,recomb_scheme_in,strategy_in,nparameters_in); } diff --git a/fastjet/include/fastjet/LimitedWarning.hh b/fastjet/include/fastjet/LimitedWarning.hh index e0dce6a..4cbf6bf 100644 --- a/fastjet/include/fastjet/LimitedWarning.hh +++ b/fastjet/include/fastjet/LimitedWarning.hh @@ -2,9 +2,9 @@ #define __FASTJET_LIMITEDWARNING_HH__ //FJSTARTHEADER -// $Id: LimitedWarning.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -37,6 +37,13 @@ #include #include +#include "fastjet/config.h" +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +#include +#include +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY +#include "fastjet/internal/thread_safety_helpers.hh" // provides a counter, thread-safe if needed + FASTJET_BEGIN_NAMESPACE /// @ingroup error_handling @@ -48,11 +55,17 @@ class LimitedWarning { public: /// constructor that provides a default maximum number of warnings - LimitedWarning() : _max_warn(_max_warn_default), _n_warn_so_far(0), _this_warning_summary(0) {} + LimitedWarning() : _max_warn(_max_warn_default),_this_warning_summary(0) {} /// constructor that provides a user-set max number of warnings - LimitedWarning(int max_warn_in) : _max_warn(max_warn_in), _n_warn_so_far(0), _this_warning_summary(0) {} + LimitedWarning(int max_warn_in) : _max_warn(max_warn_in), _this_warning_summary(0) {} +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + /// copy ctor (have to be specified explicitly because of the atomic variable) + LimitedWarning(const LimitedWarning &other) + : _max_warn(other._max_warn), _this_warning_summary{other._this_warning_summary.load()} {} +#endif + /// outputs a warning to standard error (or the user's default /// warning stream if set) void warn(const char * warning) {warn(warning, _default_ostr);} @@ -73,6 +86,18 @@ public: _default_ostr = ostr; } +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + /// sets the default output stream for all warnings (by default + /// cerr; passing a null pointer prevents warnings from being output) + /// The second argument is a mutex that would be used to guarantee + /// that only a single thread writes to the stream at a time + static void set_default_stream_and_mutex(std::ostream * ostr, + std::mutex * warnings_mutex) { + _default_ostr = ostr; + _stream_mutex = warnings_mutex; + } +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY + /// sets the default maximum number of warnings of a given kind /// before warning messages are silenced. static void set_default_max_warn(int max_warn) { @@ -85,20 +110,33 @@ public: /// the number of times so far that a warning has been registered /// with this instance of the class. - int n_warn_so_far() const {return _n_warn_so_far;} + int n_warn_so_far() const; /// returns a summary of all the warnings that came through the /// LimiteWarning class static std::string summary(); private: - int _max_warn, _n_warn_so_far; + const int _max_warn; + + typedef std::pair > Summary; +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + static std::atomic _max_warn_default; + static std::atomic _default_ostr; + static std::atomic _stream_mutex; + static std::mutex _global_warnings_summary_mutex; + std::atomic _this_warning_summary; +#else static int _max_warn_default; static std::ostream * _default_ostr; - typedef std::pair Summary; + Summary* _this_warning_summary; +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY + + // Note that this is updated internally and we use a mutex for the + // thread-safe version. So no other specific treatment is needed at + // this level. static std::list< Summary > _global_warnings_summary; - Summary * _this_warning_summary; - + }; FASTJET_END_NAMESPACE diff --git a/fastjet/include/fastjet/Makefile.in b/fastjet/include/fastjet/Makefile.in index 83561c2..d933d4e 100644 --- a/fastjet/include/fastjet/Makefile.in +++ b/fastjet/include/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. diff --git a/fastjet/include/fastjet/NNBase.hh b/fastjet/include/fastjet/NNBase.hh index 3d0023d..414397b 100644 --- a/fastjet/include/fastjet/NNBase.hh +++ b/fastjet/include/fastjet/NNBase.hh @@ -2,9 +2,9 @@ #define __FASTJET_NNBASE_HH__ //FJSTARTHEADER -// $Id: NNBase.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2016-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2016-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/NNFJN2Plain.hh b/fastjet/include/fastjet/NNFJN2Plain.hh index 89570e3..9fdeea2 100644 --- a/fastjet/include/fastjet/NNFJN2Plain.hh +++ b/fastjet/include/fastjet/NNFJN2Plain.hh @@ -2,9 +2,9 @@ #define __FASTJET_NNFJN2PLAIN_HH__ //FJSTARTHEADER -// $Id: NNFJN2Plain.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,7 +31,7 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include +#include "fastjet/NNBase.hh" FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh diff --git a/fastjet/include/fastjet/NNFJN2Tiled.hh b/fastjet/include/fastjet/NNFJN2Tiled.hh index 30a3f0e..a0cb83f 100644 --- a/fastjet/include/fastjet/NNFJN2Tiled.hh +++ b/fastjet/include/fastjet/NNFJN2Tiled.hh @@ -2,9 +2,9 @@ #define __FASTJET_NNFJN2TILED_HH__ //FJSTARTHEADER -// $Id: NNFJN2Tiled.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2016-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2016-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,8 +31,8 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include +#include "fastjet/NNBase.hh" +#include "fastjet/internal/TilingExtent.hh" FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh diff --git a/fastjet/include/fastjet/NNH.hh b/fastjet/include/fastjet/NNH.hh index f135fa2..18455a1 100644 --- a/fastjet/include/fastjet/NNH.hh +++ b/fastjet/include/fastjet/NNH.hh @@ -2,9 +2,9 @@ #define __FASTJET_NNH_HH__ //FJSTARTHEADER -// $Id: NNH.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,7 +31,7 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include +#include "fastjet/NNBase.hh" FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh diff --git a/fastjet/include/fastjet/PseudoJet.hh b/fastjet/include/fastjet/PseudoJet.hh index 44c03ec..4752be3 100644 --- a/fastjet/include/fastjet/PseudoJet.hh +++ b/fastjet/include/fastjet/PseudoJet.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: PseudoJet.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -37,6 +37,7 @@ #include #include #include +#include "fastjet/config.h" #include "fastjet/internal/numconsts.hh" #include "fastjet/internal/IsBase.hh" #include "fastjet/SharedPtr.hh" @@ -76,6 +77,8 @@ class PseudoJet { // (cf. this is actually OK from a timing point of view and in some // cases better than just having the default constructor for the // internal shared pointer: see PJtiming.cc and the notes therein) + // + // note: no reset of shared pointers needed PseudoJet() : _px(0), _py(0), _pz(0), _E(0) {_finish_init(); _reset_indices();} //PseudoJet() : _px(0), _py(0), _pz(0), _E(0), _phi(pseudojet_invalid_phi), _rap(pseudojet_invalid_rap), _kt2(0) {_reset_indices();} /// construct a pseudojet from explicit components @@ -92,8 +95,18 @@ class PseudoJet { // NB: "dummy" is commented to avoid unused-variable compiler warnings PseudoJet(bool /* dummy */) {} +#ifdef FASTJET_HAVE_THREAD_SAFETY + PseudoJet(const PseudoJet &other){ (*this)=other; } + PseudoJet& operator=(const PseudoJet& other); +#endif + /// default (virtual) destructor - virtual ~PseudoJet(){}; + virtual ~PseudoJet(){} +//std::shared_ptr: #ifdef FASTJET_HAVE_THREAD_SAFETY +//std::shared_ptr: ; +//std::shared_ptr: #else +//std::shared_ptr: {} +//std::shared_ptr: #endif //\} ---- end of constructors and destructors -------------------------- //---------------------------------------------------------------------- @@ -240,6 +253,38 @@ class PseudoJet { PseudoJet & operator+=(const PseudoJet &); PseudoJet & operator-=(const PseudoJet &); +//std::shared_ptr: #ifdef FASTJET_HAVE_THREAD_SAFETY +//std::shared_ptr: /// overload the assignment through the = operator +//std::shared_ptr: /// +//std::shared_ptr: /// this is needed to make sure that release_from_cs is called +//std::shared_ptr: /// before copying the structure shared pointer! +//std::shared_ptr: void operator=(const PseudoJet &other){ +//std::shared_ptr: _release_jet_from_cs(); +//std::shared_ptr: _structure = other._structure; +//std::shared_ptr: _user_info = other._user_info; +//std::shared_ptr: +//std::shared_ptr: _px = other._px; +//std::shared_ptr: _py = other._py; +//std::shared_ptr: _pz = other._pz; +//std::shared_ptr: _E = other._E; +//std::shared_ptr: +//std::shared_ptr: _phi = other._phi; +//std::shared_ptr: _rap = other._rap; +//std::shared_ptr: _kt2 = other._kt2; +//std::shared_ptr: +//std::shared_ptr: _cluster_hist_index = other._cluster_hist_index; +//std::shared_ptr: _user_index = other._user_index; +//std::shared_ptr: } +//std::shared_ptr: +//std::shared_ptr: /// force resetting the structure pointer to an empty structure +//std::shared_ptr: /// +//std::shared_ptr: /// THIS IS STRICTLY MEANT FOR INTERNAL USAGE IN SELF-DELETING +//std::shared_ptr: /// ClusterSequences. IT SHOULD NOT BE USED BY END-USERS. +//std::shared_ptr: void force_reset_structure(){ +//std::shared_ptr: _structure.reset(); +//std::shared_ptr: } +//std::shared_ptr: #endif + /// reset the 4-momentum according to the supplied components and /// put the user and history indices back to their default values inline void reset(double px, double py, double pz, double E); @@ -288,6 +333,7 @@ class PseudoJet { inline void reset_PtYPhiM(double pt_in, double y_in, double phi_in, double m_in=0.0) { reset_momentum_PtYPhiM(pt_in, y_in, phi_in, m_in); _reset_indices(); + //std::shared_ptr: _reset_shared_pointers(); } /// reset the 4-momentum according to the supplied components @@ -551,7 +597,7 @@ class PseudoJet { //------------------------------------------------------------- /// set the associated structure - void set_structure_shared_ptr(const SharedPtr &structure); + void set_structure_shared_ptr(const SharedPtr &structure_in); /// return true if there is some structure associated with this PseudoJet bool has_structure() const; @@ -808,17 +854,48 @@ class PseudoJet { double _kt2; int _cluster_hist_index, _user_index; +#ifdef FASTJET_HAVE_THREAD_SAFETY + enum { + Init_Done=1, + Init_NotDone=0, + Init_InProgress=-1 + }; + + mutable std::atomic _init_status; +#endif + /// calculate phi, rap, kt2 based on the 4-momentum components void _finish_init(); /// set the indices to default values void _reset_indices(); + +//std::shared_ptr: /// reset the shared pointers to empty ones +//std::shared_ptr: void _reset_shared_pointers(); +//std::shared_ptr: +//std::shared_ptr: #ifdef FASTJET_HAVE_THREAD_SAFETY +//std::shared_ptr: /// For jets associated with a ClusterSequence, this will "free" the +//std::shared_ptr: /// jet from the ClusterSequence. This means that, for self-deleting +//std::shared_ptr: /// cluster sequences, it will reset the structure pointer and check +//std::shared_ptr: /// if the CS needs to be deleted. +//std::shared_ptr: /// +//std::shared_ptr: /// This is the replacement mechanism for self-deleting cs (with +//std::shared_ptr: /// set_count not working with std shared_ptr) and... +//std::shared_ptr: /// +//std::shared_ptr: /// IT HAS TO BE CALLED BEFORE ANY CHANGE OF THE JET STRUCTURE +//std::shared_ptr: /// POINTER +//std::shared_ptr: void _release_jet_from_cs(); +//std::shared_ptr: #endif //FASTJET_HAVE_THREAD_SAFETY /// ensure that the internal values for rapidity and phi /// correspond to 4-momentum structure - inline void _ensure_valid_rap_phi() const { +#ifdef FASTJET_HAVE_THREAD_SAFETY + void _ensure_valid_rap_phi() const; +#else + inline void _ensure_valid_rap_phi() const{ if (_phi == pseudojet_invalid_phi) _set_rap_phi(); } - +#endif + /// set cached rapidity and phi values void _set_rap_phi() const; @@ -961,10 +1038,23 @@ template inline PseudoJet::PseudoJet(const L & some_four_vector) { inline void PseudoJet::_reset_indices() { set_cluster_hist_index(-1); set_user_index(-1); + _structure.reset(); _user_info.reset(); } +//std::shared_ptr: inline void PseudoJet::_reset_shared_pointers() { +//std::shared_ptr: #ifdef FASTJET_HAVE_THREAD_SAFETY +//std::shared_ptr: // if the jet currently belongs to a cs, we need to release it before any chenge +//std::shared_ptr: _release_jet_from_cs(); +//std::shared_ptr: #endif // FASTJET_HAVE_THREAD_SAFETY +//std::shared_ptr: _structure.reset(); +//std::shared_ptr: _user_info.reset(); +//std::shared_ptr: // and do not forget to remove it in reset_indices above +//std::shared_ptr: } + + + // taken literally from CLHEP inline double PseudoJet::m() const { @@ -980,6 +1070,7 @@ inline void PseudoJet::reset(double px_in, double py_in, double pz_in, double E_ _E = E_in; _finish_init(); _reset_indices(); + //std::shared_ptr: _reset_shared_pointers(); } inline void PseudoJet::reset_momentum(double px_in, double py_in, double pz_in, double E_in) { diff --git a/fastjet/include/fastjet/PseudoJetStructureBase.hh b/fastjet/include/fastjet/PseudoJetStructureBase.hh index c4f44ab..7419028 100644 --- a/fastjet/include/fastjet/PseudoJetStructureBase.hh +++ b/fastjet/include/fastjet/PseudoJetStructureBase.hh @@ -2,9 +2,9 @@ #define __FASTJET_PSEUDOJET_STRUCTURE_BASE_HH__ //FJSTARTHEADER -// $Id: PseudoJetStructureBase.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/RangeDefinition.hh b/fastjet/include/fastjet/RangeDefinition.hh index 84e4d12..507048a 100644 --- a/fastjet/include/fastjet/RangeDefinition.hh +++ b/fastjet/include/fastjet/RangeDefinition.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: RangeDefinition.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -51,12 +51,12 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh class RangeDefinition { public: /// default constructor - FASTJET_DEPRECATED_MSG("RangeDefinition is deprecated since FastJet 3.0. Use the Selector mechanism instead") - RangeDefinition() { _warn_deprecated(); } + FASTJET_DEPRECATED_MSG("RangeDefinition is deprecated since FastJet 3.0. Use the Selector mechanism instead", + RangeDefinition()) { _warn_deprecated(); } /// constructor for a range definition given by |y| 0.0 ); _rapmax = rapmax; _rapmin = -rapmax; diff --git a/fastjet/include/fastjet/RectangularGrid.hh b/fastjet/include/fastjet/RectangularGrid.hh index 251c317..7a4dd6c 100644 --- a/fastjet/include/fastjet/RectangularGrid.hh +++ b/fastjet/include/fastjet/RectangularGrid.hh @@ -2,9 +2,9 @@ #define __FASTJET_RECTANGULARGRID_HH__ //FJSTARTHEADER -// $Id: RectangularGrid.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -127,17 +127,17 @@ public: /// returns whether a given tile is good // tested in "issue" 2014-08-08-testing-rect-grid - virtual bool tile_is_good(int itile) const FASTJET_OVERRIDE { + virtual bool tile_is_good(int itile) const FASTJET_OVERRIDE{ return _tile_selector.worker() ? _is_good[itile] : true; } /// returns the area of tile itile. - virtual double tile_area(int /* itile */) const FASTJET_OVERRIDE { + virtual double tile_area(int /* itile */) const FASTJET_OVERRIDE{ return mean_tile_area(); } /// returns the mean area of tiles. - virtual double mean_tile_area() const FASTJET_OVERRIDE {return _dphi*_dy;}; + virtual double mean_tile_area() const FASTJET_OVERRIDE { return _dphi*_dy; } /// returns a textual description of the grid virtual std::string description() const FASTJET_OVERRIDE; @@ -152,7 +152,7 @@ public: double dphi() const {return _dphi;} /// returns true if the grid is in a suitably initialised state - virtual bool is_initialised() const FASTJET_OVERRIDE {return _ntotal > 0;} + virtual bool is_initialised() const FASTJET_OVERRIDE { return _ntotal > 0; } private: void _setup_grid(); diff --git a/fastjet/include/fastjet/Selector.hh b/fastjet/include/fastjet/Selector.hh index 946fea5..8026258 100644 --- a/fastjet/include/fastjet/Selector.hh +++ b/fastjet/include/fastjet/Selector.hh @@ -2,9 +2,9 @@ #define __FASTJET_SELECTOR_HH__ //FJSTARTHEADER -// $Id: Selector.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2009-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/SharedPtr.hh b/fastjet/include/fastjet/SharedPtr.hh index 83662ef..aeb919e 100644 --- a/fastjet/include/fastjet/SharedPtr.hh +++ b/fastjet/include/fastjet/SharedPtr.hh @@ -1,10 +1,10 @@ -#ifndef __FASTJET_SHARED_PTR_HH__ + #ifndef __FASTJET_SHARED_PTR_HH__ #define __FASTJET_SHARED_PTR_HH__ //FJSTARTHEADER -// $Id: SharedPtr.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -32,91 +32,311 @@ //FJENDHEADER #include "fastjet/internal/base.hh" +#include "fastjet/config.h" #include // for NULL!!! - -// for testing purposes, the following define makes it possible -// for our SharedPtr simply to be derived from the STL TR1 one. -// #define __FASTJET_USETR1SHAREDPTR - #include "fastjet/internal/deprecated.hh" -#ifdef __FASTJET_USETR1SHAREDPTR -#include -#endif // __FASTJET_USETR1SHAREDPTR +#ifdef FASTJET_HAVE_THREAD_SAFETY +// use C11's shared pointer +//std::shared_ptr #include +#include +#endif // FASTJET_HAVE_THREAD_SAFETY FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh -#ifdef __FASTJET_USETR1SHAREDPTR - -/// @ingroup advanced_usage -/// \class SharedPtr -/// replaces our shared pointer with the TR1 one (for testing purpose) -/// -/// for testing purposes, it can be useful to replace our home-made -/// SharedPtr with the standard library one. Having a class derived -/// from the standard one is way of arranging for this to happen. -/// -/// The other way of working this is a template class with an -/// internal typedef (http://bytes.com/topic/c/answers/60312-typedef-template) -/// since templated typedefs don't work in standard C++ -/// -/// Note that some facilities that are present in the FastJet shared -/// pointer (resetting use-count) are not handled by the TR1 shared -/// pointer; and the FastJet SharedPtr has a different underlying data -/// structure from the TR1 shared pointer, which prevents us from -/// implementing some of TR1 features (notably assignment from shared -/// pointers to a derived class). -template -class SharedPtr : public std::tr1::shared_ptr { -public: - SharedPtr() : std::tr1::shared_ptr() {} - SharedPtr(T * t) : std::tr1::shared_ptr(t) {} - SharedPtr(const SharedPtr & t) : std::tr1::shared_ptr(t) {} - // for some reason operator() doesn't get inherited - #ifdef FASTJET_HAVE_EXPLICIT_FOR_OPERATORS - explicit - #endif - inline operator bool() const {return (this->get()!=NULL);} - /// return the pointer we're pointing to - T* operator ()() const{ - return this->get(); // automatically returns NULL when out-of-scope - } -}; - - -#else // __FASTJET_USETR1SHAREDPTR /** * @ingroup advanced_usage * \class SharedPtr - * an implementation of C++0x shared pointers (or boost's) - * - * this class implements a smart pointer, based on the shared+ptr - * proposal. A description of shared_ptr can be found in Section 2.2.3 - * of the first C++ Technical Report (TR1) - * http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1745.pdf - * or, alternatively, on the Boost C++ library website at - * http://www.boost.org/doc/libs/1_42_0/libs/smart_ptr/shared_ptr.htm - * - * Our implementation is compatible with both of these apart from a - * series of members and functions that have not been implemented: + * + * An implementation of shared pointers that is broadly similar to C++11 + * shared_ptr (https://en.cppreference.com/w/cpp/memory/shared_ptr). + * One key additional feature is + * + * - the ability to force an update of the count with the set_count(...) + * member. + * + * This effectively allows us to incorporate an offset in the count, + * which allows deletions to be triggered even when some pointers remain. + * We use this in particular for automatic deletion of a ClusterSequence + * when no pointers to its structure object remain other than those in + * the PseudoJets that are part of the ClusterSequence object itself. + * + * Key features that are missing relative to C++11 are + * * - conversion from weak and auto pointers * - support for deleters and allocators * - static, constant and dynamic casts * - constructor and assignment sharing ownership with a shared * pointer r but storing a different pointer than r (needed for the * previous item) + * * In the last 2 cases, their implementation would require storing two * pointers for every copies of the shared pointer, while our - * implementation only needs one. We did not implement then since we + * implementation only needs one. We did not implement them since we * want to limit as much as possible memory and time consumption, and * can easily avoid (at least for our needs so far) the casts. - * - * We also add the possibility to force an update of the count. * - * The class has been tested against the existing boost (v1.42) + * The class has been tested against the boost (v1.42) * implementation (for the parts that we have implemented). */ +#ifdef FASTJET_HAVE_THREAD_SAFETY +template +class SharedPtr{ +public: + /// forward declaration of the counting container + class __SharedCountingPtr; + + /// default ctor + SharedPtr() : _ptr(NULL){} + + /// initialise with the main data + /// \param t : the object we want a smart pointer to + template explicit SharedPtr(Y* ptr){ + _ptr = new __SharedCountingPtr(ptr); + } + + /// overload the copy ctor so that it updates count + /// \param share : the object we want to copy + SharedPtr(SharedPtr const & share) : _ptr(share._get_container()){ + // unless we're sharing nothing, increase the counter to reflect + // the fact that we have a newcomer sharing the pointer + if (_ptr!=NULL) (*_ptr)++; + } + + /// default dtor + ~SharedPtr(){ + // make sure the object has been allocated + if (_ptr==NULL) return; + + _decrease_count(); + } + + /// reset the pointer to default value (NULL) + void reset(){ + SharedPtr().swap(*this); + } + + // will not work with the current structure + /// reset from a pointer + template void reset(Y * ptr){ + SharedPtr(ptr).swap(*this); + } + + // not part of the standard + /// do a smart copy + /// \param share : the object we want to copy + template void reset(SharedPtr const & share){ + // if we already are pointing to sth, be sure to decrease its count + if (_ptr!=NULL){ + // in the specific case where we're share is the same as *this, + // reset() has no effect. However if *this is the only instance + // still alive (implying share==*this) bringing the count down + // to 0 and deleting the object will not have the expected + // effect. So we just avoid that situation explicitly + if (_ptr == share._get_container()) return; + + _decrease_count(); + } + + // Watch out: if share is empty, construct an empty shared_ptr + + // copy the container + _ptr = share._get_container(); // Note: automatically set it to NULL if share is empty + + if (_ptr!=NULL) (*_ptr)++; + } + + /// overload the = operator so that it updates count + /// \param share : the object we want to copy + SharedPtr& operator=(SharedPtr const & share){ + reset(share); + return *this; + } + + /// overload the = operator so that it updates count + /// \param share : the object we want to copy + template SharedPtr& operator=(SharedPtr const & share){ + reset(share); + return *this; + } + + /// indirection, get a reference to the stored pointer + /// + /// !!! WATCH OUT + /// It does NOT impose the requirement that the stored pointer must + /// not be NULL!! So you need explicitly to check the validity in + /// your code + inline T& operator*() const{ + return *(_ptr->get()); + } + + /// indirection, get the stored pointer + /// + /// !!! WATCH OUT + /// It fails to check the requirement that the stored pointer must + /// not be NULL!! So you need explicitly to check the validity in + /// your code + inline T* operator->() const{ + if (_ptr==NULL) return NULL; + return _ptr->get(); + } + + /// get the stored pointer + inline T* get() const{ + if (_ptr==NULL) return NULL; + return _ptr->get(); + } + + /// return the pointer we're pointing to + /// + /// WARNING: THIS IS DEPRECATED AND IS VERY LIKELY TO DISAPPEAR IN A + /// FUTURE RELEASE. USE get() INSTEAD + T* operator ()() const{ + if (_ptr==NULL) return NULL; + return _ptr->get(); // automatically returns NULL when out-of-scope + } + + /// check if the instance is unique + inline bool unique() const{ + //GS: do we need some specific spin-lock here? + return (use_count()==1); + } + + /// return the number of counts + inline long use_count() const{ + if (_ptr==NULL) return 0; + return _ptr->use_count(); // automatically returns NULL when out-of-scope + } + + /// conversion to bool + /// This will allow you to use the indirection nicely + inline operator bool() const{ + return (get()!=NULL); + } + + /// exchange the content of the two pointers + inline void swap(SharedPtr & share){ + __SharedCountingPtr* share_container = share._ptr; + share._ptr = _ptr; + _ptr = share_container; + } + + /// force the count to be set to a specified value + /// \param count the value that we need to reset to + void set_count(const long & count){ + if (_ptr==NULL) return; + _ptr->set_count(count); + } + + /** + * \if internal_doc + * \class __SharedCountingPtr + * A reference-counting pointer + * + * This is implemented as a container for that pointer together with + * reference counting. + * The pointer is deleted when the number of counts goes to 0; + * \endif + */ + class __SharedCountingPtr : public std::atomic{ + public: + /// default ctor + __SharedCountingPtr() : std::atomic(0), _ptr(NULL){} + + /// ctor with initialisation + template explicit __SharedCountingPtr(Y* ptr) + : std::atomic(1), _ptr(ptr){} + + /// default dtor + ~__SharedCountingPtr(){ + // force the deletion of the object we keep track of + if (_ptr!=NULL){ delete _ptr;} + } + + /// return a pointer to the object + inline T* get() const {return _ptr;} + + /// return the count + inline long use_count() const {return (long)(*this);} + + /// force the count to be set to a specified value + /// \param count the value that we ned to reset to + inline void set_count(const long & count){ store(count);} + + private: + T *_ptr; ///< the pointer we're counting the references to + }; + +private: + /// return the common container + inline __SharedCountingPtr* _get_container() const{ + return _ptr; + } + + /// decrease the pointer count and support deletion + /// Warning: we don't test that the pointer is allocated + /// This can be dangerous if we have explicitly reset the + /// count. Generally speaking, if the count goes negative + /// after _ptr has been effectively deleted, this is going + /// to lead to a segmentation fault. But, if in the course + /// of the deletion of _ptr, the deletion of its pointer + /// (_ptr::_ptr, i.e. the real data we're storing) makes + /// the counts to become negative, this is going to pass + /// smoothly. + void _decrease_count(){ + //// decrease the count + //(*_ptr)--; + // + //// if no one else is using it, free the allocated memory + //if (_ptr->use_count()==0) + // delete _ptr; // that automatically deletes the object itself + // NB: https://en.cppreference.com/w/cpp/atomic/atomic/operator_arith + // indicates that this uses the atomic fetch_sub(...) function, which + // is what ensures thread safety of the deletion. + if (((*_ptr)--) == 1) + delete _ptr; + } + + // the real info + __SharedCountingPtr *_ptr; +}; + + +/// comparison: equality +template +inline bool operator==(SharedPtr const & t, SharedPtr const & u){ + return t.get() == u.get(); +} + +/// comparison: difference +template +inline bool operator!=(SharedPtr const & t, SharedPtr const & u){ + return t.get() != u.get(); +} + +/// comparison: orgering +template +inline bool operator<(SharedPtr const & t, SharedPtr const & u){ + return t.get() < u.get(); +} + +/// swapping +template +inline void swap(SharedPtr & a, SharedPtr & b){ + return a.swap(b); +} + +/// getting the pointer +template +inline T* get_pointer(SharedPtr const & t){ + return t.get(); +} + + + +#else // FASTJET_HAVE_THREAD_SAFETY + template class SharedPtr{ public: @@ -215,12 +435,15 @@ public: return *this; } - /// return the pointer we're pointing to + // 2015-04-23: this does not belong to most standard implmentations + // (use get() instead), we should get rid of it + // + /// return the pointer we're pointing to /// /// Since FastJet 3.2.0, this is depracated since it is no longer /// part of std::shared_ptr. Use SharedPtr::get() instead - FASTJET_DEPRECATED_MSG("Use SharedPtr::get() instead") - T* operator ()() const{ + FASTJET_DEPRECATED_MSG("Use SharedPtr::get() instead", + T* operator ()() const){ if (_ptr==NULL) return NULL; return _ptr->get(); // automatically returns NULL when out-of-scope } @@ -339,7 +562,7 @@ public: } private: - T *_ptr; ///< the pointer we're counting the references to + T *_ptr; ///< the pointer we're counting the references to long _count; ///< the number of references }; @@ -403,7 +626,7 @@ inline T* get_pointer(SharedPtr const & t){ return t.get(); } -#endif // __FASTJET_USETR1SHAREDPTR +#endif // FASTJET_HAVE_THREAD_SAFETY FASTJET_END_NAMESPACE // defined in fastjet/internal/base.hh diff --git a/fastjet/include/fastjet/WrappedStructure.hh b/fastjet/include/fastjet/WrappedStructure.hh index 3fb88c8..014fabf 100644 --- a/fastjet/include/fastjet/WrappedStructure.hh +++ b/fastjet/include/fastjet/WrappedStructure.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: WrappedStructure.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -75,7 +75,7 @@ public: //\{ //------------------------------------------------------------- /// returns true if there is an associated ClusterSequence - virtual bool has_associated_cluster_sequence() const FASTJET_OVERRIDE { + virtual bool has_associated_cluster_sequence() const FASTJET_OVERRIDE{ return _structure->has_associated_cluster_sequence(); } @@ -87,7 +87,7 @@ public: /// returns true if this PseudoJet has an associated and still /// valid ClusterSequence. - virtual bool has_valid_cluster_sequence() const FASTJET_OVERRIDE { + virtual bool has_valid_cluster_sequence() const FASTJET_OVERRIDE{ return _structure->has_valid_cluster_sequence(); } @@ -155,7 +155,7 @@ public: /// return true if the structure supports constituents. /// /// false by default - virtual bool has_constituents() const FASTJET_OVERRIDE{ + virtual bool has_constituents() const FASTJET_OVERRIDE { return _structure->has_constituents(); } @@ -167,7 +167,7 @@ public: } /// return true if the structure supports exclusive_subjets. - virtual bool has_exclusive_subjets() const FASTJET_OVERRIDE{ + virtual bool has_exclusive_subjets() const FASTJET_OVERRIDE{ return _structure->has_exclusive_subjets(); } @@ -230,14 +230,14 @@ public: /// return true if the structure supports pieces. /// /// false by default - virtual bool has_pieces(const PseudoJet &reference) const FASTJET_OVERRIDE { + virtual bool has_pieces(const PseudoJet &reference) const FASTJET_OVERRIDE{ return _structure->has_pieces(reference); } /// retrieve the pieces building the jet. /// /// By default, throws an Error - virtual std::vector pieces(const PseudoJet &reference) const FASTJET_OVERRIDE { + virtual std::vector pieces(const PseudoJet &reference) const FASTJET_OVERRIDE{ return _structure->pieces(reference); } @@ -248,7 +248,7 @@ public: /// check if it has a defined area /// /// false by default - virtual bool has_area() const FASTJET_OVERRIDE { + virtual bool has_area() const FASTJET_OVERRIDE{ return _structure->has_area(); } diff --git a/fastjet/include/fastjet/config_win.h b/fastjet/include/fastjet/config_win.h index 90d499e..0ad2f9d 100644 --- a/fastjet/include/fastjet/config_win.h +++ b/fastjet/include/fastjet/config_win.h @@ -1,10 +1,10 @@ -#define FASTJET_PACKAGE_STRING "FastJet 3.3.4" -#define FASTJET_PACKAGE_VERSION "3.3.4" -#define FASTJET_VERSION "3.3.4" +#define FASTJET_PACKAGE_STRING "FastJet 3.4.0" +#define FASTJET_PACKAGE_VERSION "3.4.0" +#define FASTJET_VERSION "3.4.0" #define FASTJET_VERSION_MAJOR 3 -#define FASTJET_VERSION_MINOR 3 -#define FASTJET_VERSION_PATCHLEVEL 4 -#define FASTJET_VERSION_NUMBER 30304 +#define FASTJET_VERSION_MINOR 4 +#define FASTJET_VERSION_PATCHLEVEL 0 +#define FASTJET_VERSION_NUMBER 30400 /* The ATLASCone plugin is disabled by default*/ #undef FASTJET_ENABLE_PLUGIN_ATLASCONE diff --git a/fastjet/include/fastjet/internal/BasicRandom.hh b/fastjet/include/fastjet/internal/BasicRandom.hh index d3c9ba8..32eeb13 100644 --- a/fastjet/include/fastjet/internal/BasicRandom.hh +++ b/fastjet/include/fastjet/internal/BasicRandom.hh @@ -1,6 +1,5 @@ // Simple random number generator class taken from nlojet++. -// Some doxygen-style comments added by Gavin Salam, August 2006. -// $Id: BasicRandom.hh 1761 2010-09-16 10:43:18Z soyez $ +// $Id$ // // Copyright (C) 2002 Zoltan Nagy // @@ -17,6 +16,14 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// Changes compared to the original version +// 2006-08: Some doxygen-style comments added by Gavin Salam +// 2017-02: The operator() (size_type, pointer, std::vector &); +// members have been added to implement thread-safe access to the +// generators +// + #ifndef __FASTJET_BASICRANDOM_HH__ #define __FASTJET_BASICRANDOM_HH__ 1 @@ -26,6 +33,12 @@ #include #include "fastjet/internal/base.hh" +#include "fastjet/config.h" +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +#include +#endif + + FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh /// \if internal_doc @@ -88,6 +101,25 @@ public: __res[__i] = __default_random_generator(_M_iseed); } + /// given a pointer __res to the beginning of an array, fill that array + /// with __n random numbers + /// + /// This now acquired an extra argument which allows to retreive the + /// set of seeds used for this generation. + void operator() (size_type __n, pointer __res, std::vector & __iseed) { + // if we have (limited) thread safety, lock things +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + // is the lock here really necessary or would a spinlock do better? + std::lock_guard guard(_multiple_number_generation_mutex); +#endif + // get the seeds + get_status(__iseed); + + // get the numbers + for(size_type __i = 0; __i < __n; __i++) + __res[__i] = __default_random_generator(_M_iseed); + } + // (re)initialize the random number generator void randomize(void *__iseed) { int *__new_seed = (int*) __iseed; @@ -118,6 +150,9 @@ public: private: int _M_iseed[2]; +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + static std::mutex _multiple_number_generation_mutex; +#endif }; @@ -150,6 +185,25 @@ public: __res[__i] = this -> operator()(); } + /// given a pointer __res to the beginning of an array, fill that array + /// with __n random numbers + /// + /// This now acquired an extra argument which allows to retreive the + /// set of seeds used for this generation. + void operator() (size_type __n, pointer __res, std::vector & __iseed) { + // if we have (limited) thread safety, lock things +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + // is the lock here really necessary or would a spinlock do better? + std::lock_guard guard(_multiple_number_generation_mutex); +#endif + // get the seeds + get_status(__iseed); + + // get the numbers + for(size_type __i = 0; __i < __n; __i++) + __res[__i] = this -> operator()(); + } + /// (re)initialize the random number generator from an array of seeds void randomize(void *__iseed) { int *__new_seed = (int*) __iseed; @@ -181,6 +235,9 @@ public: private: int _M_iseed[2]; +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + static std::mutex _multiple_number_generation_mutex; +#endif }; // globally defined random number generator diff --git a/fastjet/include/fastjet/internal/ClosestPair2D.hh b/fastjet/include/fastjet/internal/ClosestPair2D.hh index 3204e01..7e82bc5 100644 --- a/fastjet/include/fastjet/internal/ClosestPair2D.hh +++ b/fastjet/include/fastjet/internal/ClosestPair2D.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClosestPair2D.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/ClosestPair2DBase.hh b/fastjet/include/fastjet/internal/ClosestPair2DBase.hh index af15238..57f0338 100644 --- a/fastjet/include/fastjet/internal/ClosestPair2DBase.hh +++ b/fastjet/include/fastjet/internal/ClosestPair2DBase.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClosestPair2DBase.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/ClusterSequence_N2.icc b/fastjet/include/fastjet/internal/ClusterSequence_N2.icc index 02ef051..e0a3dff 100644 --- a/fastjet/include/fastjet/internal/ClusterSequence_N2.icc +++ b/fastjet/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-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/Dnn2piCylinder.hh b/fastjet/include/fastjet/internal/Dnn2piCylinder.hh index 42223b6..4a3dc83 100644 --- a/fastjet/include/fastjet/internal/Dnn2piCylinder.hh +++ b/fastjet/include/fastjet/internal/Dnn2piCylinder.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Dnn2piCylinder.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/Dnn3piCylinder.hh b/fastjet/include/fastjet/internal/Dnn3piCylinder.hh index 3159bd7..d1376fa 100644 --- a/fastjet/include/fastjet/internal/Dnn3piCylinder.hh +++ b/fastjet/include/fastjet/internal/Dnn3piCylinder.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Dnn3piCylinder.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/Dnn4piCylinder.hh b/fastjet/include/fastjet/internal/Dnn4piCylinder.hh index 182757e..8d7e331 100644 --- a/fastjet/include/fastjet/internal/Dnn4piCylinder.hh +++ b/fastjet/include/fastjet/internal/Dnn4piCylinder.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Dnn4piCylinder.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/DnnPlane.hh b/fastjet/include/fastjet/internal/DnnPlane.hh index 65c9012..580d13a 100644 --- a/fastjet/include/fastjet/internal/DnnPlane.hh +++ b/fastjet/include/fastjet/internal/DnnPlane.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: DnnPlane.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/DynamicNearestNeighbours.hh b/fastjet/include/fastjet/internal/DynamicNearestNeighbours.hh index d894442..d70e213 100644 --- a/fastjet/include/fastjet/internal/DynamicNearestNeighbours.hh +++ b/fastjet/include/fastjet/internal/DynamicNearestNeighbours.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: DynamicNearestNeighbours.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/IsBase.hh b/fastjet/include/fastjet/internal/IsBase.hh index a72c964..0771d76 100644 --- a/fastjet/include/fastjet/internal/IsBase.hh +++ b/fastjet/include/fastjet/internal/IsBase.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: IsBase.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/LazyTiling25.hh b/fastjet/include/fastjet/internal/LazyTiling25.hh index 0cb57fd..685dc92 100644 --- a/fastjet/include/fastjet/internal/LazyTiling25.hh +++ b/fastjet/include/fastjet/internal/LazyTiling25.hh @@ -4,9 +4,9 @@ // #define INSTRUMENT2 1 //FJSTARTHEADER -// $Id: LazyTiling25.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/LazyTiling9.hh b/fastjet/include/fastjet/internal/LazyTiling9.hh index 1f47949..e4c98f9 100644 --- a/fastjet/include/fastjet/internal/LazyTiling9.hh +++ b/fastjet/include/fastjet/internal/LazyTiling9.hh @@ -4,9 +4,9 @@ //#define INSTRUMENT2 1 //FJSTARTHEADER -// $Id: LazyTiling9.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/LazyTiling9Alt.hh b/fastjet/include/fastjet/internal/LazyTiling9Alt.hh index 887b3a7..50ad0c5 100644 --- a/fastjet/include/fastjet/internal/LazyTiling9Alt.hh +++ b/fastjet/include/fastjet/internal/LazyTiling9Alt.hh @@ -2,9 +2,9 @@ #define __FASTJET_LAZYTILING9ALT_HH__ //FJSTARTHEADER -// $Id: LazyTiling9Alt.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/LazyTiling9SeparateGhosts.hh b/fastjet/include/fastjet/internal/LazyTiling9SeparateGhosts.hh index 0b6bf6f..1d32c07 100644 --- a/fastjet/include/fastjet/internal/LazyTiling9SeparateGhosts.hh +++ b/fastjet/include/fastjet/internal/LazyTiling9SeparateGhosts.hh @@ -2,9 +2,9 @@ #define __FASTJET_LAZYTILING9SEPARATEGHOSTS_HH__ //FJSTARTHEADER -// $Id: LazyTiling9SeparateGhosts.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -36,6 +36,8 @@ #include "fastjet/ClusterSequence.hh" #include "fastjet/internal/LazyTiling9Alt.hh" +#include "fastjet/config.h" + FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh class TiledJet3 { diff --git a/fastjet/include/fastjet/internal/LimitedWarning.hh b/fastjet/include/fastjet/internal/LimitedWarning.hh index 8608f46..a62dd9a 100644 --- a/fastjet/include/fastjet/internal/LimitedWarning.hh +++ b/fastjet/include/fastjet/internal/LimitedWarning.hh @@ -2,9 +2,9 @@ #define __FASTJET_INTERNALLIMITEDWARNING_HH__ //FJSTARTHEADER -// $Id: LimitedWarning.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/Makefile.am b/fastjet/include/fastjet/internal/Makefile.am index bc7d7e1..3795b69 100644 --- a/fastjet/include/fastjet/internal/Makefile.am +++ b/fastjet/include/fastjet/internal/Makefile.am @@ -9,7 +9,8 @@ fastjetincludeinternal_HEADERS = base.hh ClosestPair2DBase.hh \ LazyTiling25.hh \ LazyTiling9SeparateGhosts.hh \ TilingExtent.hh \ - deprecated.hh + deprecated.hh \ + thread_safety_helpers.hh # # the following file is used by internal .cc files and diff --git a/fastjet/include/fastjet/internal/Makefile.in b/fastjet/include/fastjet/internal/Makefile.in index 77c3e71..0ed5e6a 100644 --- a/fastjet/include/fastjet/internal/Makefile.in +++ b/fastjet/include/fastjet/internal/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. @@ -349,7 +349,8 @@ fastjetincludeinternal_HEADERS = base.hh ClosestPair2DBase.hh \ LazyTiling25.hh \ LazyTiling9SeparateGhosts.hh \ TilingExtent.hh \ - deprecated.hh + deprecated.hh \ + thread_safety_helpers.hh # diff --git a/fastjet/include/fastjet/internal/MinHeap.hh b/fastjet/include/fastjet/internal/MinHeap.hh index fe70175..4fac9f0 100644 --- a/fastjet/include/fastjet/internal/MinHeap.hh +++ b/fastjet/include/fastjet/internal/MinHeap.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: MinHeap.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/SearchTree.hh b/fastjet/include/fastjet/internal/SearchTree.hh index 756e78c..081bdb0 100644 --- a/fastjet/include/fastjet/internal/SearchTree.hh +++ b/fastjet/include/fastjet/internal/SearchTree.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: SearchTree.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/TilingExtent.hh b/fastjet/include/fastjet/internal/TilingExtent.hh index f8e75ab..b26b3b0 100644 --- a/fastjet/include/fastjet/internal/TilingExtent.hh +++ b/fastjet/include/fastjet/internal/TilingExtent.hh @@ -4,9 +4,9 @@ #include "fastjet/ClusterSequence.hh" //FJSTARTHEADER -// $Id: TilingExtent.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/Triangulation.hh b/fastjet/include/fastjet/internal/Triangulation.hh index c94f872..847b390 100644 --- a/fastjet/include/fastjet/internal/Triangulation.hh +++ b/fastjet/include/fastjet/internal/Triangulation.hh @@ -3,9 +3,9 @@ #define __FASTJET_TRIANGULATION__ //FJSTARTHEADER -// $Id: Triangulation.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/Voronoi.hh b/fastjet/include/fastjet/internal/Voronoi.hh index b867c9b..9c7bdd9 100644 --- a/fastjet/include/fastjet/internal/Voronoi.hh +++ b/fastjet/include/fastjet/internal/Voronoi.hh @@ -2,9 +2,9 @@ #define __FASTJET__VORONOI_H__ //FJSTARTHEADER -// $Id: Voronoi.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/base.hh b/fastjet/include/fastjet/internal/base.hh index ea84437..701e4ea 100644 --- a/fastjet/include/fastjet/internal/base.hh +++ b/fastjet/include/fastjet/internal/base.hh @@ -1,8 +1,8 @@ //FJSTARTHEADER -// $Id: base.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/deprecated.hh b/fastjet/include/fastjet/internal/deprecated.hh index 4b0e354..665923c 100644 --- a/fastjet/include/fastjet/internal/deprecated.hh +++ b/fastjet/include/fastjet/internal/deprecated.hh @@ -1,8 +1,8 @@ //FJSTARTHEADER -// $Id: deprecated.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -39,20 +39,19 @@ // define a deprecation macro based on the capabilities of the compiler // (as determined at configure time). #if defined(FASTJET_HAVE_CXX14_DEPRECATED) && (!defined(__FJCORE__)) -#define FASTJET_DEPRECATED [[deprecated]] -#define FASTJET_DEPRECATED_MSG(message) [[deprecated(message)]] +#define FASTJET_DEPRECATED(func) [[deprecated]] func +#define FASTJET_DEPRECATED_MSG(message,func) [[deprecated(message)]] func #elif defined(FASTJET_HAVE_GNUCXX_DEPRECATED) -#define FASTJET_DEPRECATED __attribute__((__deprecated__)) -#define FASTJET_DEPRECATED_MSG(message) __attribute__((__deprecated__)) +#define FASTJET_DEPRECATED(func) func __attribute__((__deprecated__)) +#define FASTJET_DEPRECATED_MSG(message,func) func __attribute__((__deprecated__)) #else -#define FASTJET_DEPRECATED -#define FASTJET_DEPRECATED_MSG(message) +#define FASTJET_DEPRECATED(func) func +#define FASTJET_DEPRECATED_MSG(message,func) func #endif #else // SIWG -#define FASTJET_DEPRECATED -#define FASTJET_DEPRECATED_MSG(message) +#define FASTJET_DEPRECATED(func) func +#define FASTJET_DEPRECATED_MSG(message,func) func #endif // SWIG - #endif // __FASTJET_FASTJET_DEPRECATED_HH__ diff --git a/fastjet/include/fastjet/internal/numconsts.hh b/fastjet/include/fastjet/internal/numconsts.hh index a9a8de8..a7eb80c 100644 --- a/fastjet/include/fastjet/internal/numconsts.hh +++ b/fastjet/include/fastjet/internal/numconsts.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: numconsts.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/include/fastjet/internal/thread_safety_helpers.hh b/fastjet/include/fastjet/internal/thread_safety_helpers.hh new file mode 100644 index 0000000..bb861aa --- /dev/null +++ b/fastjet/include/fastjet/internal/thread_safety_helpers.hh @@ -0,0 +1,250 @@ +//FJSTARTHEADER +// $Id$ +// +// Copyright (c) 2014-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// +//---------------------------------------------------------------------- +// This file is part of FastJet. +// +// FastJet is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// The algorithms that underlie FastJet have required considerable +// development. They are described in the original FastJet paper, +// hep-ph/0512210 and in the manual, arXiv:1111.6097. If you use +// FastJet as part of work towards a scientific publication, please +// quote the version you use and include a citation to the manual and +// optionally also to hep-ph/0512210. +// +// FastJet is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with FastJet. If not, see . +//---------------------------------------------------------------------- +//FJENDHEADER + +#ifndef __FASTJET_THREAD_SAFETY_HELPERS_HH__ +#define __FASTJET_THREAD_SAFETY_HELPERS_HH__ + +/// The code in this file is supposed to help writing code that will +/// automatically provide thread-safe features when available and come +/// revert back to "old/standard" C++ if thread-safety is not switched +/// on +/// +///\TODO fix doxygen comments (declare things as internal; make sure +/// doxygen doc is not duplicate --- if necessary, keep only doxygen +/// comments in the thread-safe versions) + +#include "fastjet/internal/base.hh" +#include "fastjet/config.h" +#include + +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + +// introduces a few tools in CXX11 that we'll use in some FJ classes +#include + +FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh + +namespace thread_safety_helpers{ + + //---------------------------------------------------------------------- + /// \if internal_doc + /// \class AtomicCounter + /// + /// provides a thread-safe counter which can only step one unit at a time + /// and has overflow protection + /// \endif + template + class AtomicCounter{ + public: + /// default ctor + AtomicCounter() : _count{0}{} + + /// ctor with initialisation + AtomicCounter(const T &count) : _count{count}{} + + /// copy ctor (works around the deleted copy in atomic, see + /// e.g. http://stackoverflow.com/questions/19883092/error-implicitly-deleted-because-the-default-definition-would-be-ill-formed-ve) + AtomicCounter(const AtomicCounter &other) : _count{other._count.load()}{} + + /// for a more friendly usage, overload the type cast to the + /// base template type + operator T() const{ return _count.load();} + + /// get the count + T get() const{ return _count.load();} + + /// set the counter to a given value + void set(const T new_value){ + _count.store(new_value); + } + + /// step the counter and return the count just before it was stepped + /// + /// Q: can we declare this as T && ...? + T step(){ + // another thread could be upadting this at the same time, so extra + // care is needed. + // + // Recall that the compare_exchange_strong will return true if the + // exchange has been done. Otherwise, it means that the count + // changed in the meantime, so we try again. Also, since when it + // "fails" compare_exchange_strong loads the count of *this in + // expected, count does not need to be re-read in the loop! + // + // Note that at the end of this procedure, count will countain the + // number of times this warning occured just before this + // occurence. It can thus be used to see if it needs to be printed + // out + // + // Note also that compared to the apparently simpler fetch_add, + // this method also avoids overflows + T count = _count; + while (_count < std::numeric_limits::max() + && !(_count.compare_exchange_strong(count, count+1))); + return count; + } + + /// override the ++ operator + /// prefix version + inline T operator++(){ + return step()+1; + } + + /// override the ++ operator + /// postfix version + inline T operator++(int){ + return step(); + } + + private: + std::atomic _count; ///< the actual count + }; + + //---------------------------------------------------------------------- + /// \if internal_doc + /// \class FirstTimeTrue + /// provides an object wich will return "true" the first time () is + /// called and false afterwards + /// \endif + class FirstTimeTrue{ + public: + FirstTimeTrue(): _first_time{true}{} + // explicit copy ctor (this class contains atimoc vars) + FirstTimeTrue(const FirstTimeTrue &other) : _first_time{other._first_time.load()}{} + bool operator()(){ + // Thread-safety note: + // the construct + // if (!_first_time) {return;} + // _first_time = false; + // is dangerous because the test can be passed by a second thread + // before the first one has set it to false. Use atomic exchange + // to handle this better + bool expected = true; + // this behaves as follows: if we have the expected value (true), + // set _first_time to the desired (false) and return + // true. Otherwise, do nothing and return false + // + // Note that since we are not using the "expected" value + // afterwards, we can use a relaxed memory ordering if the next + // call returns false + return _first_time.compare_exchange_strong(expected, false, + std::memory_order_seq_cst, + std::memory_order_relaxed); + } + private: + std::atomic _first_time; + }; + +} // namespace thread_safety_helpers + +FASTJET_END_NAMESPACE + +#else // FJ wo thread-safety features + +FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh + +namespace thread_safety_helpers{ + //---------------------------------------------------------------------- + /// \class AtomicCounter + /// + /// (would) provides a thread-safe counter (with CXX11 features) + template + class AtomicCounter{ + public: + /// default ctor + AtomicCounter() : _count(0){} + + /// ctor with initialisation + AtomicCounter(const T &count) : _count(count){} + + /// copy ctor + AtomicCounter(const AtomicCounter &other) : _count(other._count){} + + /// for a more friendly usage, overload the type cast + /// + /// This will (likely) allow a transparent usage w or wo C++11 + /// features enabled + operator T() const{ return _count;} + + /// get the count + T get() const{ return _count;} + + /// set the counter to a given value + void set(const T new_value){ + _count = new_value; + } + + /// step the counter and return the value just before it was stepped + T step(){ + unsigned int count = _count; + if (_count < std::numeric_limits::max()){ _count++; } + return count; + } + + /// override the ++ operator + /// prefix version + inline T operator++(){ + return step()+1; + } + + /// override the ++ operator + /// postfix version + inline T operator++(int){ + return step(); + } + + private: + T _count; ///< the actual value + }; + + //---------------------------------------------------------------------- + /// \class FirstTimeTrue + /// provides an object wich will return "true" the first time () is + /// called and false afterwards + class FirstTimeTrue{ + public: + FirstTimeTrue(): _first_time(true){} + bool operator()(){ + if (!_first_time) {return false;} + _first_time = false; + return true; + } + private: + bool _first_time; + }; +} // namespace thread_safety_helpers + +FASTJET_END_NAMESPACE + + + +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY + +#endif // __FASTJET_THREAD_SAFETY_HELPERS_HH__ diff --git a/fastjet/include/fastjet/version.hh b/fastjet/include/fastjet/version.hh index 8628650..4dc85bb 100644 --- a/fastjet/include/fastjet/version.hh +++ b/fastjet/include/fastjet/version.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: version.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/install-sh b/fastjet/install-sh index 20d8b2e..ec298b5 100755 --- a/fastjet/install-sh +++ b/fastjet/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ while test $# -ne 0; do -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ do fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ do then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ do prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -488,6 +493,13 @@ do then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -502,9 +514,9 @@ do # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff --git a/fastjet/ltmain.sh b/fastjet/ltmain.sh old mode 100644 new mode 100755 index 0cb7f90..21e5e07 --- a/fastjet/ltmain.sh +++ b/fastjet/ltmain.sh @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-14" +VERSION="2.4.6 Debian-2.4.6-15" package_revision=2.4.6 @@ -2141,7 +2141,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-14 + version: $progname $scriptversion Debian-2.4.6-15 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` diff --git a/fastjet/m4/libtool.m4 b/fastjet/m4/libtool.m4 index a6d21ae..c4c0294 100644 --- a/fastjet/m4/libtool.m4 +++ b/fastjet/m4/libtool.m4 @@ -1071,11 +1071,11 @@ _LT_EOF # 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[[91]]*) + 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.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; diff --git a/fastjet/plugins/ATLASCone/ATLASConePlugin.cc b/fastjet/plugins/ATLASCone/ATLASConePlugin.cc index 4567fa2..a94393b 100644 --- a/fastjet/plugins/ATLASCone/ATLASConePlugin.cc +++ b/fastjet/plugins/ATLASCone/ATLASConePlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ATLASConePlugin.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -45,7 +45,7 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh using namespace std; -bool ATLASConePlugin::_first_time = true; +thread_safety_helpers::FirstTimeTrue ATLASConePlugin::_first_time; string ATLASConePlugin::description () const { ostringstream desc; @@ -157,8 +157,7 @@ void ATLASConePlugin::run_clustering(ClusterSequence & clust_seq) const { // print a banner for reference to the 3rd-party code void ATLASConePlugin::_print_banner(ostream *ostr) const{ - if (! _first_time) return; - _first_time=false; + if (! _first_time()) return; // make sure the user has not set the banner stream to NULL if (!ostr) return; diff --git a/fastjet/plugins/ATLASCone/CommonUtils.hh b/fastjet/plugins/ATLASCone/CommonUtils.hh index 360ecc2..5b3a24b 100644 --- a/fastjet/plugins/ATLASCone/CommonUtils.hh +++ b/fastjet/plugins/ATLASCone/CommonUtils.hh @@ -22,7 +22,7 @@ #include #include -#include +#include "fastjet/internal/base.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/plugins/ATLASCone/Jet.cc b/fastjet/plugins/ATLASCone/Jet.cc index 1f0e4f4..c607538 100644 --- a/fastjet/plugins/ATLASCone/Jet.cc +++ b/fastjet/plugins/ATLASCone/Jet.cc @@ -17,7 +17,7 @@ #include "Jet.hh" #include -#include +#include "fastjet/internal/base.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/plugins/ATLASCone/Jet.hh b/fastjet/plugins/ATLASCone/Jet.hh index 0dd2239..1f35ab9 100644 --- a/fastjet/plugins/ATLASCone/Jet.hh +++ b/fastjet/plugins/ATLASCone/Jet.hh @@ -30,7 +30,7 @@ #include #include -#include +#include "fastjet/internal/base.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/plugins/ATLASCone/JetConeFinderTool.cc b/fastjet/plugins/ATLASCone/JetConeFinderTool.cc index 8f63111..c198a20 100644 --- a/fastjet/plugins/ATLASCone/JetConeFinderTool.cc +++ b/fastjet/plugins/ATLASCone/JetConeFinderTool.cc @@ -41,7 +41,7 @@ #include #include -#include +#include "fastjet/internal/base.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/plugins/ATLASCone/JetConeFinderTool.hh b/fastjet/plugins/ATLASCone/JetConeFinderTool.hh index 07785fb..c0833ad 100644 --- a/fastjet/plugins/ATLASCone/JetConeFinderTool.hh +++ b/fastjet/plugins/ATLASCone/JetConeFinderTool.hh @@ -60,7 +60,7 @@ // class JetCollection; #include "Jet.hh" -#include +#include "fastjet/internal/base.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/plugins/ATLASCone/JetDistances.hh b/fastjet/plugins/ATLASCone/JetDistances.hh index 90c3790..99c82ae 100644 --- a/fastjet/plugins/ATLASCone/JetDistances.hh +++ b/fastjet/plugins/ATLASCone/JetDistances.hh @@ -23,7 +23,7 @@ #include -#include +#include "fastjet/internal/base.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/plugins/ATLASCone/JetSplitMergeTool.cc b/fastjet/plugins/ATLASCone/JetSplitMergeTool.cc index 058178b..bd4d310 100644 --- a/fastjet/plugins/ATLASCone/JetSplitMergeTool.cc +++ b/fastjet/plugins/ATLASCone/JetSplitMergeTool.cc @@ -43,7 +43,7 @@ #include "JetDistances.hh" #include "CommonUtils.hh" -#include +#include "fastjet/internal/base.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/plugins/ATLASCone/JetSplitMergeTool.hh b/fastjet/plugins/ATLASCone/JetSplitMergeTool.hh index 6cf2441..617dd26 100644 --- a/fastjet/plugins/ATLASCone/JetSplitMergeTool.hh +++ b/fastjet/plugins/ATLASCone/JetSplitMergeTool.hh @@ -61,7 +61,7 @@ //#include "JetCore/CustomMessage.hh" -#include +#include "fastjet/internal/base.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/plugins/ATLASCone/LorentzVector.hh b/fastjet/plugins/ATLASCone/LorentzVector.hh index 925ad1d..535b393 100644 --- a/fastjet/plugins/ATLASCone/LorentzVector.hh +++ b/fastjet/plugins/ATLASCone/LorentzVector.hh @@ -22,7 +22,7 @@ #define _LORENTZ_VECTOR_HH_ #include -#include +#include "fastjet/internal/base.hh" #ifndef M_PI #define M_PI 3.141592653589793238462643383279502884197 diff --git a/fastjet/plugins/ATLASCone/Makefile.in b/fastjet/plugins/ATLASCone/Makefile.in index 3aded13..80cfea6 100644 --- a/fastjet/plugins/ATLASCone/Makefile.in +++ b/fastjet/plugins/ATLASCone/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. diff --git a/fastjet/plugins/ATLASCone/fastjet/ATLASConePlugin.hh b/fastjet/plugins/ATLASCone/fastjet/ATLASConePlugin.hh index bc6e1a1..91cde1d 100644 --- a/fastjet/plugins/ATLASCone/fastjet/ATLASConePlugin.hh +++ b/fastjet/plugins/ATLASCone/fastjet/ATLASConePlugin.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ATLASConePlugin.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -36,6 +36,7 @@ #define __ATLASCONEPLUGIN_HH__ #include "fastjet/JetDefinition.hh" +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write transparent code w&wo C++11 features // questionable whether this should be in fastjet namespace or not... FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh @@ -91,7 +92,7 @@ private: double _seedPt; ///< the pt seed threshold used in stable-cone search double _f; ///< the overlap thresholod used in the split-merge - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; /// print a banner for reference to the 3rd-party code void _print_banner(std::ostream *ostr) const; diff --git a/fastjet/plugins/ATLASCone/fastjet/Makefile.in b/fastjet/plugins/ATLASCone/fastjet/Makefile.in index c134746..448039c 100644 --- a/fastjet/plugins/ATLASCone/fastjet/Makefile.in +++ b/fastjet/plugins/ATLASCone/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. diff --git a/fastjet/plugins/CDFCones/CDFJetCluPlugin.cc b/fastjet/plugins/CDFCones/CDFJetCluPlugin.cc index a26e5ab..3c876d9 100644 --- a/fastjet/plugins/CDFCones/CDFJetCluPlugin.cc +++ b/fastjet/plugins/CDFCones/CDFJetCluPlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: CDFJetCluPlugin.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -43,7 +43,7 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh using namespace std; using namespace cdf; -bool CDFJetCluPlugin::_first_time = true; +thread_safety_helpers::FirstTimeTrue CDFJetCluPlugin::_first_time; string CDFJetCluPlugin::description () const { ostringstream desc; @@ -168,8 +168,7 @@ void CDFJetCluPlugin::run_clustering(ClusterSequence & clust_seq) const { // print a banner for reference to the 3rd-party code void CDFJetCluPlugin::_print_banner(ostream *ostr) const{ - if (! _first_time) return; - _first_time=false; + if (! _first_time()) return; // make sure the user has not set the banner stream to NULL if (!ostr) return; diff --git a/fastjet/plugins/CDFCones/CDFMidPointPlugin.cc b/fastjet/plugins/CDFCones/CDFMidPointPlugin.cc index 9402884..e02010a 100644 --- a/fastjet/plugins/CDFCones/CDFMidPointPlugin.cc +++ b/fastjet/plugins/CDFCones/CDFMidPointPlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: CDFMidPointPlugin.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -43,7 +43,7 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh using namespace std; using namespace cdf; -bool CDFMidPointPlugin::_first_time = true; +thread_safety_helpers::FirstTimeTrue CDFMidPointPlugin::_first_time; string CDFMidPointPlugin::description () const { ostringstream desc; @@ -156,8 +156,7 @@ void CDFMidPointPlugin::run_clustering(ClusterSequence & clust_seq) const { // print a banner for reference to the 3rd-party code void CDFMidPointPlugin::_print_banner(ostream *ostr) const{ - if (! _first_time) return; - _first_time=false; + if (! _first_time()) return; // make sure the user has not set the banner stream to NULL if (!ostr) return; diff --git a/fastjet/plugins/CDFCones/CDFcode/Makefile.in b/fastjet/plugins/CDFCones/CDFcode/Makefile.in index 898c229..5f66f86 100644 --- a/fastjet/plugins/CDFCones/CDFcode/Makefile.in +++ b/fastjet/plugins/CDFCones/CDFcode/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. diff --git a/fastjet/plugins/CDFCones/Makefile.in b/fastjet/plugins/CDFCones/Makefile.in index 1fe1a09..12d260f 100644 --- a/fastjet/plugins/CDFCones/Makefile.in +++ b/fastjet/plugins/CDFCones/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. diff --git a/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh b/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh index 8b47b9d..2fbaef7 100644 --- a/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh +++ b/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: CDFJetCluPlugin.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -34,6 +34,7 @@ #include "fastjet/JetDefinition.hh" #include "fastjet/PseudoJet.hh" #include +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write transparent code w&wo C++11 features // questionable whether this should be in fastjet namespace or not... @@ -100,7 +101,7 @@ private: /// as ensure that the jet energy is unique void _insert_unique (PseudoJet & jet, std::map & jetmap) const; - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; /// print a banner for reference to the 3rd-party code void _print_banner(std::ostream *ostr) const; diff --git a/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh b/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh index 12821f7..266884b 100644 --- a/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh +++ b/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: CDFMidPointPlugin.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -32,6 +32,7 @@ #define __CDFMIDPOINTPLUGIN_HH__ #include "fastjet/JetDefinition.hh" +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write transparent code w&wo C++11 features // questionable whether this should be in fastjet namespace or not... @@ -171,7 +172,7 @@ private: double _overlap_threshold ; SplitMergeScale _sm_scale ; - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; /// print a banner for reference to the 3rd-party code void _print_banner(std::ostream *ostr) const; diff --git a/fastjet/plugins/CDFCones/fastjet/Makefile.in b/fastjet/plugins/CDFCones/fastjet/Makefile.in index 7132d16..2c9a29c 100644 --- a/fastjet/plugins/CDFCones/fastjet/Makefile.in +++ b/fastjet/plugins/CDFCones/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. diff --git a/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.cc b/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.cc index ff6018f..55cdc8b 100644 --- a/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.cc +++ b/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER // $Id: CMSIterativeConePlugin.cc 1504 2009-04-10 13:39:48Z salam $ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -82,7 +82,7 @@ T deltaR2 (T eta1, T phi1, T eta2, T phi2) { } //------------------------------------------------------ -bool CMSIterativeConePlugin::_first_time = true; +thread_safety_helpers::FirstTimeTrue CMSIterativeConePlugin::_first_time; string CMSIterativeConePlugin::description () const { ostringstream desc; @@ -215,8 +215,7 @@ void CMSIterativeConePlugin::run_clustering(ClusterSequence & clust_seq) const { // print a banner for reference to the 3rd-party code void CMSIterativeConePlugin::_print_banner(ostream *ostr) const{ - if (! _first_time) return; - _first_time=false; + if (! _first_time()) return; // make sure the user has not set the banner stream to NULL if (!ostr) return; diff --git a/fastjet/plugins/CMSIterativeCone/Makefile.in b/fastjet/plugins/CMSIterativeCone/Makefile.in index 173681d..501401e 100644 --- a/fastjet/plugins/CMSIterativeCone/Makefile.in +++ b/fastjet/plugins/CMSIterativeCone/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. diff --git a/fastjet/plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh b/fastjet/plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh index f137fc8..dd7b937 100644 --- a/fastjet/plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh +++ b/fastjet/plugins/CMSIterativeCone/fastjet/CMSIterativeConePlugin.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER // $Id: CMSIterativeConePlugin.hh 1508 2009-04-10 22:46:49Z soyez $ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -32,6 +32,7 @@ #define __CMSITERATIVECONEPLUGIN_HH__ #include "fastjet/JetDefinition.hh" +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write transparent code w&wo C++11 features // questionable whether this should be in fastjet namespace or not... FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh @@ -81,7 +82,7 @@ private: double theConeRadius; ///< cone radius double theSeedThreshold; ///< seed threshold - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; /// print a banner for reference to the 3rd-party code void _print_banner(std::ostream *ostr) const; diff --git a/fastjet/plugins/CMSIterativeCone/fastjet/Makefile.in b/fastjet/plugins/CMSIterativeCone/fastjet/Makefile.in index 46fb3a9..74c73b6 100644 --- a/fastjet/plugins/CMSIterativeCone/fastjet/Makefile.in +++ b/fastjet/plugins/CMSIterativeCone/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. diff --git a/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.cc b/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.cc index 559208a..3178425 100644 --- a/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.cc +++ b/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER // $Id: D0RunIBaseConePlugin.cc 1779 2010-10-25 10:32:59Z soyez $ // -// Copyright (c) 2009-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -151,7 +151,7 @@ void D0RunIBaseConePlugin::run_clustering_worker(ClusterSequence & clust_seq) co // // ///////////////////////////////////////////// -bool D0RunIpre96ConePlugin::_first_time=true; +thread_safety_helpers::FirstTimeTrue D0RunIpre96ConePlugin::_first_time; string D0RunIpre96ConePlugin::description () const { ostringstream desc; @@ -173,8 +173,7 @@ void D0RunIpre96ConePlugin::run_clustering(ClusterSequence & clust_seq) const { // print a banner for reference to the 3rd-party code void D0RunIpre96ConePlugin::_print_banner(ostream *ostr) const{ - if (! _first_time) return; - _first_time=false; + if (! _first_time()) return; // make sure the user has not set the banner stream to NULL if (!ostr) return; @@ -199,7 +198,7 @@ void D0RunIpre96ConePlugin::_print_banner(ostream *ostr) const{ // // ///////////////////////////////////////////// -bool D0RunIConePlugin::_first_time=true; +thread_safety_helpers::FirstTimeTrue D0RunIConePlugin::_first_time; string D0RunIConePlugin::description () const { ostringstream desc; @@ -221,8 +220,7 @@ void D0RunIConePlugin::run_clustering(ClusterSequence & clust_seq) const { // print a banner for reference to the 3rd-party code void D0RunIConePlugin::_print_banner(ostream *ostr) const{ - if (! _first_time) return; - _first_time=false; + if (! _first_time()) return; // make sure the user has not set the banner stream to NULL if (!ostr) return; diff --git a/fastjet/plugins/D0RunICone/Makefile.in b/fastjet/plugins/D0RunICone/Makefile.in index 4bbcec1..0663c36 100644 --- a/fastjet/plugins/D0RunICone/Makefile.in +++ b/fastjet/plugins/D0RunICone/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. diff --git a/fastjet/plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh b/fastjet/plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh index 39e47b2..8efa34b 100644 --- a/fastjet/plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh +++ b/fastjet/plugins/D0RunICone/fastjet/D0RunIBaseConePlugin.hh @@ -4,7 +4,7 @@ //FJSTARTHEADER // $Id: D0RunIBaseConePlugin.hh 1778 2010-10-25 10:02:58Z soyez $ // -// Copyright (c) 2009-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh b/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh index 83c69b4..d2995e4 100644 --- a/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh +++ b/fastjet/plugins/D0RunICone/fastjet/D0RunIConePlugin.hh @@ -4,7 +4,7 @@ //FJSTARTHEADER // $Id: D0RunIConePlugin.hh 1778 2010-10-25 10:02:58Z soyez $ // -// Copyright (c) 2009-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -33,6 +33,7 @@ #include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen) #include "fastjet/D0RunIBaseConePlugin.hh" +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write transparent code w&wo C++11 features // questionable whether this should be in fastjet namespace or not... @@ -87,7 +88,7 @@ public: virtual void run_clustering(ClusterSequence &) const; private: - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; /// print a banner for reference to the 3rd-party code void _print_banner(std::ostream *ostr) const; diff --git a/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh b/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh index c06d075..dd54ce9 100644 --- a/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh +++ b/fastjet/plugins/D0RunICone/fastjet/D0RunIpre96ConePlugin.hh @@ -4,7 +4,7 @@ //FJSTARTHEADER // $Id: D0RunIpre96ConePlugin.hh 1778 2010-10-25 10:02:58Z soyez $ // -// Copyright (c) 2009-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2009-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -33,6 +33,7 @@ #include "fastjet/internal/base.hh" // namespace macros (include explicitly to help Doxygen) #include "fastjet/D0RunIBaseConePlugin.hh" +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write transparent code w&wo C++11 features // questionable whether this should be in fastjet namespace or not... @@ -88,7 +89,7 @@ public: virtual void run_clustering(ClusterSequence &) const; private: - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; /// print a banner for reference to the 3rd-party code void _print_banner(std::ostream *ostr) const; diff --git a/fastjet/plugins/D0RunICone/fastjet/Makefile.in b/fastjet/plugins/D0RunICone/fastjet/Makefile.in index df094e9..c39b258 100644 --- a/fastjet/plugins/D0RunICone/fastjet/Makefile.in +++ b/fastjet/plugins/D0RunICone/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. diff --git a/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.cc b/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.cc index 3e9943e..a8b7f6c 100644 --- a/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.cc +++ b/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: D0RunIIConePlugin.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -55,7 +55,7 @@ const double D0RunIIConePlugin::_DEFAULT_pT_min_second_protojet = 0. ; const int D0RunIIConePlugin::_DEFAULT_merge_max = 10000; const double D0RunIIConePlugin::_DEFAULT_pT_min_nomerge = 0. ; -bool D0RunIIConePlugin::_first_time = true; +thread_safety_helpers::FirstTimeTrue D0RunIIConePlugin::_first_time; string D0RunIIConePlugin::description () const { ostringstream desc; @@ -145,8 +145,7 @@ void D0RunIIConePlugin::run_clustering(ClusterSequence & clust_seq) const { // print a banner for reference to the 3rd-party code void D0RunIIConePlugin::_print_banner(ostream *ostr) const{ - if (! _first_time) return; - _first_time=false; + if (! _first_time()) return; // make sure the user has not set the banner stream to NULL if (!ostr) return; diff --git a/fastjet/plugins/D0RunIICone/Makefile.in b/fastjet/plugins/D0RunIICone/Makefile.in index 1791890..02b760d 100644 --- a/fastjet/plugins/D0RunIICone/Makefile.in +++ b/fastjet/plugins/D0RunIICone/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. diff --git a/fastjet/plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh b/fastjet/plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh index 973e65e..095ee2d 100644 --- a/fastjet/plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh +++ b/fastjet/plugins/D0RunIICone/fastjet/D0RunIIConePlugin.hh @@ -2,9 +2,9 @@ #define __D0RUNIICONEPLUGIN_HH__ //FJSTARTHEADER -// $Id: D0RunIIConePlugin.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -32,6 +32,7 @@ //FJENDHEADER #include "fastjet/JetDefinition.hh" +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write transparent code w&wo C++11 features // questionable whether this should be in fastjet namespace or not... @@ -156,7 +157,7 @@ private: const static int _DEFAULT_merge_max ;// = 10000; const static double _DEFAULT_pT_min_nomerge ;// = 0. ; - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; /// print a banner for reference to the 3rd-party code void _print_banner(std::ostream *ostr) const; diff --git a/fastjet/plugins/D0RunIICone/fastjet/Makefile.in b/fastjet/plugins/D0RunIICone/fastjet/Makefile.in index 6870869..638209b 100644 --- a/fastjet/plugins/D0RunIICone/fastjet/Makefile.in +++ b/fastjet/plugins/D0RunIICone/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. diff --git a/fastjet/plugins/EECambridge/EECambridgePlugin.cc b/fastjet/plugins/EECambridge/EECambridgePlugin.cc index 19d4887..807573a 100644 --- a/fastjet/plugins/EECambridge/EECambridgePlugin.cc +++ b/fastjet/plugins/EECambridge/EECambridgePlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: EECambridgePlugin.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/plugins/EECambridge/Makefile.in b/fastjet/plugins/EECambridge/Makefile.in index 906ee9e..e72d1d0 100644 --- a/fastjet/plugins/EECambridge/Makefile.in +++ b/fastjet/plugins/EECambridge/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. diff --git a/fastjet/plugins/EECambridge/fastjet/EECambridgePlugin.hh b/fastjet/plugins/EECambridge/fastjet/EECambridgePlugin.hh index a814730..bbb3022 100644 --- a/fastjet/plugins/EECambridge/fastjet/EECambridgePlugin.hh +++ b/fastjet/plugins/EECambridge/fastjet/EECambridgePlugin.hh @@ -2,9 +2,9 @@ #define __EECAMBRIDGEPLUGIN_HH__ //FJSTARTHEADER -// $Id: EECambridgePlugin.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/plugins/EECambridge/fastjet/Makefile.in b/fastjet/plugins/EECambridge/fastjet/Makefile.in index b8ba042..ef1b7d0 100644 --- a/fastjet/plugins/EECambridge/fastjet/Makefile.in +++ b/fastjet/plugins/EECambridge/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. diff --git a/fastjet/plugins/GridJet/GridJetPlugin.cc b/fastjet/plugins/GridJet/GridJetPlugin.cc index 5e94ec6..9a52ba5 100644 --- a/fastjet/plugins/GridJet/GridJetPlugin.cc +++ b/fastjet/plugins/GridJet/GridJetPlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER // $Id: GridJetPlugin.cc 2268 2011-06-20 15:12:26Z salam $ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/plugins/GridJet/Makefile.in b/fastjet/plugins/GridJet/Makefile.in index 79972f8..3194d02 100644 --- a/fastjet/plugins/GridJet/Makefile.in +++ b/fastjet/plugins/GridJet/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. diff --git a/fastjet/plugins/GridJet/fastjet/GridJetPlugin.hh b/fastjet/plugins/GridJet/fastjet/GridJetPlugin.hh index f1e3ca0..11de229 100644 --- a/fastjet/plugins/GridJet/fastjet/GridJetPlugin.hh +++ b/fastjet/plugins/GridJet/fastjet/GridJetPlugin.hh @@ -4,7 +4,7 @@ //FJSTARTHEADER // $Id: GridJetPlugin.hh 2267 2011-06-20 15:10:23Z salam $ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/plugins/GridJet/fastjet/Makefile.in b/fastjet/plugins/GridJet/fastjet/Makefile.in index e81fa74..0ca6c12 100644 --- a/fastjet/plugins/GridJet/fastjet/Makefile.in +++ b/fastjet/plugins/GridJet/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. diff --git a/fastjet/plugins/Jade/JadePlugin.cc b/fastjet/plugins/Jade/JadePlugin.cc index e7343b5..f1e997d 100644 --- a/fastjet/plugins/Jade/JadePlugin.cc +++ b/fastjet/plugins/Jade/JadePlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: JadePlugin.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/plugins/Jade/Makefile.in b/fastjet/plugins/Jade/Makefile.in index a571f80..4c7ec5f 100644 --- a/fastjet/plugins/Jade/Makefile.in +++ b/fastjet/plugins/Jade/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. diff --git a/fastjet/plugins/Jade/fastjet/JadePlugin.hh b/fastjet/plugins/Jade/fastjet/JadePlugin.hh index 16f751d..1c68bcb 100644 --- a/fastjet/plugins/Jade/fastjet/JadePlugin.hh +++ b/fastjet/plugins/Jade/fastjet/JadePlugin.hh @@ -2,9 +2,9 @@ #define __JADEPLUGIN_HH__ //FJSTARTHEADER -// $Id: JadePlugin.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/plugins/Jade/fastjet/Makefile.in b/fastjet/plugins/Jade/fastjet/Makefile.in index ceb7a31..5f40cdc 100644 --- a/fastjet/plugins/Jade/fastjet/Makefile.in +++ b/fastjet/plugins/Jade/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. diff --git a/fastjet/plugins/Makefile.in b/fastjet/plugins/Makefile.in index 7ed071a..7264df6 100644 --- a/fastjet/plugins/Makefile.in +++ b/fastjet/plugins/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. diff --git a/fastjet/plugins/NestedDefs/Makefile.in b/fastjet/plugins/NestedDefs/Makefile.in index 295f650..48b7fbc 100644 --- a/fastjet/plugins/NestedDefs/Makefile.in +++ b/fastjet/plugins/NestedDefs/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. diff --git a/fastjet/plugins/NestedDefs/NestedDefsPlugin.cc b/fastjet/plugins/NestedDefs/NestedDefsPlugin.cc index 4b72fae..a63bd6d 100644 --- a/fastjet/plugins/NestedDefs/NestedDefsPlugin.cc +++ b/fastjet/plugins/NestedDefs/NestedDefsPlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: NestedDefsPlugin.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/plugins/NestedDefs/fastjet/Makefile.in b/fastjet/plugins/NestedDefs/fastjet/Makefile.in index b5fd844..4e655ed 100644 --- a/fastjet/plugins/NestedDefs/fastjet/Makefile.in +++ b/fastjet/plugins/NestedDefs/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. diff --git a/fastjet/plugins/NestedDefs/fastjet/NestedDefsPlugin.hh b/fastjet/plugins/NestedDefs/fastjet/NestedDefsPlugin.hh index 979b3dc..aa0e581 100644 --- a/fastjet/plugins/NestedDefs/fastjet/NestedDefsPlugin.hh +++ b/fastjet/plugins/NestedDefs/fastjet/NestedDefsPlugin.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: NestedDefsPlugin.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/plugins/PxCone/Makefile.in b/fastjet/plugins/PxCone/Makefile.in index 157deeb..37a25db 100644 --- a/fastjet/plugins/PxCone/Makefile.in +++ b/fastjet/plugins/PxCone/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. diff --git a/fastjet/plugins/PxCone/PxConePlugin.cc b/fastjet/plugins/PxCone/PxConePlugin.cc index e604dce..08e33ea 100644 --- a/fastjet/plugins/PxCone/PxConePlugin.cc +++ b/fastjet/plugins/PxCone/PxConePlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: PxConePlugin.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -41,7 +41,7 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh using namespace std; -bool PxConePlugin::_first_time = true; +thread_safety_helpers::FirstTimeTrue PxConePlugin::_first_time; string PxConePlugin::description () const { ostringstream desc; @@ -50,7 +50,8 @@ string PxConePlugin::description () const { << "cone_radius = " << cone_radius () << ", " << "min_jet_energy = " << min_jet_energy () << ", " << "overlap_threshold = " << overlap_threshold () << ", " - << "E_scheme_jets = " << E_scheme_jets () + << "E_scheme_jets = " << E_scheme_jets () << ", " + << "mode (1=e+e-, 2=hh) = " << _mode << " (NB: non-standard version of PxCone, containing small bug fixes by Gavin Salam)"; return desc.str(); @@ -62,7 +63,7 @@ void PxConePlugin::run_clustering(ClusterSequence & clust_seq) const { //_print_banner(clust_seq.fastjet_banner_stream()); // only have hh mode - int mode = 2; + //int mode = 2; int ntrak = clust_seq.jets().size(), itkdm = 4; double *ptrak = new double[ntrak*4+1]; @@ -83,7 +84,7 @@ void PxConePlugin::run_clustering(ClusterSequence & clust_seq) const { // run pxcone pxcone( - mode , // 1=>e+e-, 2=>hadron-hadron + _mode , // 1=>e+e-, 2=>hadron-hadron ntrak , // Number of particles itkdm , // First dimension of PTRAK array: ptrak , // Array of particle 4-momenta (Px,Py,Pz,E) @@ -167,8 +168,7 @@ void PxConePlugin::run_clustering(ClusterSequence & clust_seq) const { // print a banner for reference to the 3rd-party code void PxConePlugin::_print_banner(ostream *ostr) const{ - if (! _first_time) return; - _first_time=false; + if (! _first_time()) return; // make sure the user has not set the banner stream to NULL if (!ostr) return; diff --git a/fastjet/plugins/PxCone/fastjet/Makefile.in b/fastjet/plugins/PxCone/fastjet/Makefile.in index bab986e..9871241 100644 --- a/fastjet/plugins/PxCone/fastjet/Makefile.in +++ b/fastjet/plugins/PxCone/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. diff --git a/fastjet/plugins/PxCone/fastjet/PxConePlugin.hh b/fastjet/plugins/PxCone/fastjet/PxConePlugin.hh index 3d6d653..0eeba8f 100644 --- a/fastjet/plugins/PxCone/fastjet/PxConePlugin.hh +++ b/fastjet/plugins/PxCone/fastjet/PxConePlugin.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: PxConePlugin.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -32,6 +32,7 @@ #define __PXCONEPLUGIN_HH__ #include "fastjet/JetDefinition.hh" +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write transparent code w&wo C++11 features // questionable whether this should be in fastjet namespace or not... @@ -89,14 +90,19 @@ public: /// momentum sum for the jets is carried out by direct /// four-vector addition instead of p-scheme recombination. /// - PxConePlugin (double cone_radius_in , - double min_jet_energy_in = 5.0 , + /// - mode: set to 1 for the e+e- version + /// set to 2 for the hadron-hadron version (the default) + /// + PxConePlugin (double cone_radius_in, + double min_jet_energy_in = 5.0, double overlap_threshold_in = 0.5, - bool E_scheme_jets_in = false) : + bool E_scheme_jets_in = false, + int mode = 2) : _cone_radius (cone_radius_in ), _min_jet_energy (min_jet_energy_in ), _overlap_threshold (overlap_threshold_in), - _E_scheme_jets (E_scheme_jets_in ) {} + _E_scheme_jets (E_scheme_jets_in ), + _mode (mode ){} // some functions to return info about parameters ---------------- @@ -118,6 +124,7 @@ public: /// unaffected. bool E_scheme_jets() const {return _E_scheme_jets ;} + int mode() const {return _mode ;} // the things that are required by base class virtual std::string description () const; @@ -133,7 +140,8 @@ private: bool _E_scheme_jets; - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; + int _mode; // 1 = e+e-, 2 = hh (default) /// print a banner for reference to the 3rd-party code void _print_banner(std::ostream *ostr) const; diff --git a/fastjet/plugins/SISCone/Makefile.in b/fastjet/plugins/SISCone/Makefile.in index 6243f9d..ac219e6 100644 --- a/fastjet/plugins/SISCone/Makefile.in +++ b/fastjet/plugins/SISCone/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. diff --git a/fastjet/plugins/SISCone/SISConePlugin.cc b/fastjet/plugins/SISCone/SISConePlugin.cc index 860ab2f..a345460 100644 --- a/fastjet/plugins/SISCone/SISConePlugin.cc +++ b/fastjet/plugins/SISCone/SISConePlugin.cc @@ -289,7 +289,7 @@ void SISConePlugin::run_clustering(ClusterSequence & clust_seq) const { // As of v3.1 of FastJet, extras are automatically owned (as // SharedPtr) by the ClusterSequence and auto_ptr is deprecated. So // we can use a simple pointer here - //clust_seq.plugin_associate_extras(std::auto_ptr(extras)); + //clust_seq.plugin_associate_extras(SharedPtr(extras)); clust_seq.plugin_associate_extras(extras); } diff --git a/fastjet/plugins/SISCone/fastjet/Makefile.in b/fastjet/plugins/SISCone/fastjet/Makefile.in index 8a38d41..20b84a8 100644 --- a/fastjet/plugins/SISCone/fastjet/Makefile.in +++ b/fastjet/plugins/SISCone/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. diff --git a/fastjet/plugins/SISCone/siscone/Makefile.in b/fastjet/plugins/SISCone/siscone/Makefile.in index 7816a9f..ef4e8eb 100644 --- a/fastjet/plugins/SISCone/siscone/Makefile.in +++ b/fastjet/plugins/SISCone/siscone/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. @@ -162,7 +162,7 @@ CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \ INSTALL NEWS README TODO compile config.guess config.sub \ - depcomp install-sh ltmain.sh missing + install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -201,6 +201,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$$' @@ -629,7 +631,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 \ diff --git a/fastjet/plugins/SISCone/siscone/aclocal.m4 b/fastjet/plugins/SISCone/siscone/aclocal.m4 index da4efcd..68d3652 100644 --- a/fastjet/plugins/SISCone/siscone/aclocal.m4 +++ b/fastjet/plugins/SISCone/siscone/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 diff --git a/fastjet/plugins/SISCone/siscone/configure b/fastjet/plugins/SISCone/siscone/configure index 1b16d05..34cc400 100755 --- a/fastjet/plugins/SISCone/siscone/configure +++ b/fastjet/plugins/SISCone/siscone/configure @@ -2526,12 +2526,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` am_aux_dir=`cd "$ac_aux_dir" && pwd` 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 @@ -8276,11 +8271,11 @@ $as_echo "$lt_cv_ld_force_load" >&6; } # 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[91]*) + 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.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; diff --git a/fastjet/plugins/SISCone/siscone/examples/Makefile.in b/fastjet/plugins/SISCone/siscone/examples/Makefile.in index f171ccb..9e68130 100644 --- a/fastjet/plugins/SISCone/siscone/examples/Makefile.in +++ b/fastjet/plugins/SISCone/siscone/examples/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. diff --git a/fastjet/plugins/SISCone/siscone/examples/events/Makefile.in b/fastjet/plugins/SISCone/siscone/examples/events/Makefile.in index b9822fd..5a8ae8d 100644 --- a/fastjet/plugins/SISCone/siscone/examples/events/Makefile.in +++ b/fastjet/plugins/SISCone/siscone/examples/events/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. diff --git a/fastjet/plugins/SISCone/siscone/examples/main.cpp b/fastjet/plugins/SISCone/siscone/examples/main.cpp index b00594d..d700f1f 100644 --- a/fastjet/plugins/SISCone/siscone/examples/main.cpp +++ b/fastjet/plugins/SISCone/siscone/examples/main.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 320 $// -// $Date:: 2011-11-15 09:54:50 +0100 (Tue, 15 Nov 2011) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include diff --git a/fastjet/plugins/SISCone/siscone/examples/options.cpp b/fastjet/plugins/SISCone/siscone/examples/options.cpp index 499cf1b..662f32b 100644 --- a/fastjet/plugins/SISCone/siscone/examples/options.cpp +++ b/fastjet/plugins/SISCone/siscone/examples/options.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 213 $// -// $Date:: 2008-03-17 17:05:59 +0100 (Mon, 17 Mar 2008) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "options.h" diff --git a/fastjet/plugins/SISCone/siscone/examples/options.h b/fastjet/plugins/SISCone/siscone/examples/options.h index 1b76982..5048f84 100644 --- a/fastjet/plugins/SISCone/siscone/examples/options.h +++ b/fastjet/plugins/SISCone/siscone/examples/options.h @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 180 $// -// $Date:: 2007-10-03 19:21:19 +0200 (Wed, 03 Oct 2007) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __OPTIONS_H__ diff --git a/fastjet/plugins/SISCone/siscone/examples/sample.cpp b/fastjet/plugins/SISCone/siscone/examples/sample.cpp index 0dc3e22..c542e61 100644 --- a/fastjet/plugins/SISCone/siscone/examples/sample.cpp +++ b/fastjet/plugins/SISCone/siscone/examples/sample.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 321 $// -// $Date:: 2011-11-15 09:56:39 +0100 (Tue, 15 Nov 2011) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include diff --git a/fastjet/plugins/SISCone/siscone/examples/test.cpp b/fastjet/plugins/SISCone/siscone/examples/test.cpp index 18abae8..a174579 100644 --- a/fastjet/plugins/SISCone/siscone/examples/test.cpp +++ b/fastjet/plugins/SISCone/siscone/examples/test.cpp @@ -25,8 +25,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 324 $// -// $Date:: 2011-11-16 12:10:27 +0100 (Wed, 16 Nov 2011) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include diff --git a/fastjet/plugins/SISCone/siscone/examples/times.cpp b/fastjet/plugins/SISCone/siscone/examples/times.cpp index 6d1f74e..af86f76 100644 --- a/fastjet/plugins/SISCone/siscone/examples/times.cpp +++ b/fastjet/plugins/SISCone/siscone/examples/times.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 320 $// -// $Date:: 2011-11-15 09:54:50 +0100 (Tue, 15 Nov 2011) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include diff --git a/fastjet/plugins/SISCone/siscone/install-sh b/fastjet/plugins/SISCone/siscone/install-sh index 20d8b2e..ec298b5 100755 --- a/fastjet/plugins/SISCone/siscone/install-sh +++ b/fastjet/plugins/SISCone/siscone/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ while test $# -ne 0; do -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ do fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ do then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ do prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -488,6 +493,13 @@ do then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -502,9 +514,9 @@ do # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff --git a/fastjet/plugins/SISCone/siscone/ltmain.sh b/fastjet/plugins/SISCone/siscone/ltmain.sh old mode 100644 new mode 100755 index 0cb7f90..21e5e07 --- a/fastjet/plugins/SISCone/siscone/ltmain.sh +++ b/fastjet/plugins/SISCone/siscone/ltmain.sh @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-14" +VERSION="2.4.6 Debian-2.4.6-15" package_revision=2.4.6 @@ -2141,7 +2141,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-14 + version: $progname $scriptversion Debian-2.4.6-15 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` diff --git a/fastjet/plugins/SISCone/siscone/m4/libtool.m4 b/fastjet/plugins/SISCone/siscone/m4/libtool.m4 index a6d21ae..c4c0294 100644 --- a/fastjet/plugins/SISCone/siscone/m4/libtool.m4 +++ b/fastjet/plugins/SISCone/siscone/m4/libtool.m4 @@ -1071,11 +1071,11 @@ _LT_EOF # 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[[91]]*) + 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.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; diff --git a/fastjet/plugins/SISCone/siscone/siscone/Makefile.in b/fastjet/plugins/SISCone/siscone/siscone/Makefile.in index 86bd46f..30aef3e 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/Makefile.in +++ b/fastjet/plugins/SISCone/siscone/siscone/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. diff --git a/fastjet/plugins/SISCone/siscone/siscone/defines.h b/fastjet/plugins/SISCone/siscone/siscone/defines.h index 3d1e64c..60207c7 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/defines.h +++ b/fastjet/plugins/SISCone/siscone/siscone/defines.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 401 $// -// $Date:: 2016-05-19 16:44:37 +0200 (Thu, 19 May 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// //! \file defines.h diff --git a/fastjet/plugins/SISCone/siscone/siscone/geom_2d.cpp b/fastjet/plugins/SISCone/siscone/siscone/geom_2d.cpp index 36a2e76..cac1cda 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/geom_2d.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/geom_2d.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 171 $// -// $Date:: 2007-06-19 16:26:05 +0200 (Tue, 19 Jun 2007) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "geom_2d.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/geom_2d.h b/fastjet/plugins/SISCone/siscone/siscone/geom_2d.h index 89779d1..b9b573f 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/geom_2d.h +++ b/fastjet/plugins/SISCone/siscone/siscone/geom_2d.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 422 $// -// $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __GEOM_2D_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/hash.cpp b/fastjet/plugins/SISCone/siscone/siscone/hash.cpp index f44cc2e..9ee4689 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/hash.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/hash.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 225 $// -// $Date:: 2008-05-20 16:59:47 +0200 (Tue, 20 May 2008) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include diff --git a/fastjet/plugins/SISCone/siscone/siscone/hash.h b/fastjet/plugins/SISCone/siscone/siscone/hash.h index 7f8c310..94e0b55 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/hash.h +++ b/fastjet/plugins/SISCone/siscone/siscone/hash.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 224 $// -// $Date:: 2008-05-16 19:58:30 +0200 (Fri, 16 May 2008) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __HASH_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/momentum.cpp b/fastjet/plugins/SISCone/siscone/siscone/momentum.cpp index 53272fe..529b52e 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/momentum.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/momentum.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 123 $// -// $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "momentum.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/momentum.h b/fastjet/plugins/SISCone/siscone/siscone/momentum.h index 0705c2b..ce1dba0 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/momentum.h +++ b/fastjet/plugins/SISCone/siscone/siscone/momentum.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 163 $// -// $Date:: 2007-04-26 22:31:02 +0200 (Thu, 26 Apr 2007) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __VECTOR_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/protocones.cpp b/fastjet/plugins/SISCone/siscone/siscone/protocones.cpp index 6929df7..914cb3f 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/protocones.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/protocones.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 322 $// -// $Date:: 2011-11-15 10:12:36 +0100 (Tue, 15 Nov 2011) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// /******************************************************* diff --git a/fastjet/plugins/SISCone/siscone/siscone/protocones.h b/fastjet/plugins/SISCone/siscone/siscone/protocones.h index 2300bc6..5343b4f 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/protocones.h +++ b/fastjet/plugins/SISCone/siscone/siscone/protocones.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 224 $// -// $Date:: 2008-05-16 19:58:30 +0200 (Fri, 16 May 2008) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __PROTOCONES_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/quadtree.cpp b/fastjet/plugins/SISCone/siscone/siscone/quadtree.cpp index 13b9438..6f0ee97 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/quadtree.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/quadtree.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 320 $// -// $Date:: 2011-11-15 09:54:50 +0100 (Tue, 15 Nov 2011) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "quadtree.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/quadtree.h b/fastjet/plugins/SISCone/siscone/siscone/quadtree.h index 37159bc..0743075 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/quadtree.h +++ b/fastjet/plugins/SISCone/siscone/siscone/quadtree.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 123 $// -// $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __QUADTREE_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/reference.cpp b/fastjet/plugins/SISCone/siscone/siscone/reference.cpp index a2ee8ae..13cddf8 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/reference.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/reference.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 311 $// -// $Date:: 2011-10-05 23:27:09 +0200 (Wed, 05 Oct 2011) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "reference.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/reference.h b/fastjet/plugins/SISCone/siscone/siscone/reference.h index 8d4e2d5..2f87a19 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/reference.h +++ b/fastjet/plugins/SISCone/siscone/siscone/reference.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 123 $// -// $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __REFERENCE_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/siscone.cpp b/fastjet/plugins/SISCone/siscone/siscone/siscone.cpp index b04a100..f462cb3 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/siscone.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/siscone.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 403 $// -// $Date:: 2016-05-19 16:52:05 +0200 (Thu, 19 May 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "config.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/siscone.h b/fastjet/plugins/SISCone/siscone/siscone/siscone.h index 6c24425..a35a478 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/siscone.h +++ b/fastjet/plugins/SISCone/siscone/siscone/siscone.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 401 $// -// $Date:: 2016-05-19 16:44:37 +0200 (Thu, 19 May 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SISCONE_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/siscone_error.cpp b/fastjet/plugins/SISCone/siscone/siscone/siscone_error.cpp index 37a444d..fd2ba86 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/siscone_error.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/siscone_error.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 123 $// -// $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "siscone_error.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/siscone_error.h b/fastjet/plugins/SISCone/siscone/siscone/siscone_error.h index f86ca93..3f2d302 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/siscone_error.h +++ b/fastjet/plugins/SISCone/siscone/siscone/siscone_error.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 327 $// -// $Date:: 2011-11-25 15:19:39 +0100 (Fri, 25 Nov 2011) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SISCONE_ERROR_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/Makefile.in b/fastjet/plugins/SISCone/siscone/siscone/spherical/Makefile.in index d7529e7..a3bf2da 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/Makefile.in +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/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. diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/geom_2d.cpp b/fastjet/plugins/SISCone/siscone/siscone/spherical/geom_2d.cpp index fb57462..3b0210b 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/geom_2d.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/geom_2d.cpp @@ -22,8 +22,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 378 $// -// $Date:: 2016-02-24 15:10:38 +0100 (Wed, 24 Feb 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "geom_2d.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/geom_2d.h b/fastjet/plugins/SISCone/siscone/siscone/spherical/geom_2d.h index 0edb464..d55307d 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/geom_2d.h +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/geom_2d.h @@ -23,8 +23,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 422 $// -// $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SPH_GEOM_2D_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/hash.cpp b/fastjet/plugins/SISCone/siscone/siscone/spherical/hash.cpp index 352798e..ff158b7 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/hash.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/hash.cpp @@ -22,8 +22,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 294 $// -// $Date:: 2009-05-01 17:15:04 +0200 (Fri, 01 May 2009) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/hash.h b/fastjet/plugins/SISCone/siscone/siscone/spherical/hash.h index 177fb3e..bc95a45 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/hash.h +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/hash.h @@ -23,8 +23,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 294 $// -// $Date:: 2009-05-01 17:15:04 +0200 (Fri, 01 May 2009) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SPH_HASH_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/momentum.cpp b/fastjet/plugins/SISCone/siscone/siscone/spherical/momentum.cpp index 332ea22..e313025 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/momentum.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/momentum.cpp @@ -22,8 +22,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 255 $// -// $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "momentum.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/momentum.h b/fastjet/plugins/SISCone/siscone/siscone/spherical/momentum.h index 0404341..ea8ad61 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/momentum.h +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/momentum.h @@ -23,8 +23,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 256 $// -// $Date:: 2008-07-14 13:52:16 +0200 (Mon, 14 Jul 2008) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SPH_VECTOR_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/protocones.cpp b/fastjet/plugins/SISCone/siscone/siscone/spherical/protocones.cpp index 0b8c78a..86a7210 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/protocones.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/protocones.cpp @@ -22,8 +22,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 311 $// -// $Date:: 2011-10-05 23:27:09 +0200 (Wed, 05 Oct 2011) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// /******************************************************* diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/protocones.h b/fastjet/plugins/SISCone/siscone/siscone/spherical/protocones.h index 707f8b6..424c9d9 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/protocones.h +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/protocones.h @@ -23,8 +23,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 255 $// -// $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SPH_PROTOCONES_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/siscone.cpp b/fastjet/plugins/SISCone/siscone/siscone/spherical/siscone.cpp index 43f09f4..f277805 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/siscone.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/siscone.cpp @@ -22,8 +22,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 403 $// -// $Date:: 2016-05-19 16:52:05 +0200 (Thu, 19 May 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/siscone.h b/fastjet/plugins/SISCone/siscone/siscone/spherical/siscone.h index f313d72..c6c78bd 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/siscone.h +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/siscone.h @@ -23,8 +23,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 401 $// -// $Date:: 2016-05-19 16:44:37 +0200 (Thu, 19 May 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SPH_SISCONE_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/split_merge.cpp b/fastjet/plugins/SISCone/siscone/siscone/spherical/split_merge.cpp index 7de9758..ec76893 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/split_merge.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/split_merge.cpp @@ -22,8 +22,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 390 $// -// $Date:: 2016-03-03 11:06:52 +0100 (Thu, 03 Mar 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/split_merge.h b/fastjet/plugins/SISCone/siscone/siscone/spherical/split_merge.h index 5be2ac0..a5f9b79 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/split_merge.h +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/split_merge.h @@ -23,8 +23,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 404 $// -// $Date:: 2016-05-22 12:14:42 +0200 (Sun, 22 May 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SPH_SPLIT_MERGE_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/vicinity.cpp b/fastjet/plugins/SISCone/siscone/siscone/spherical/vicinity.cpp index 9f98f81..62e2069 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/vicinity.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/vicinity.cpp @@ -22,8 +22,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 255 $// -// $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "vicinity.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/spherical/vicinity.h b/fastjet/plugins/SISCone/siscone/siscone/spherical/vicinity.h index 7446e7a..a601ed9 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/spherical/vicinity.h +++ b/fastjet/plugins/SISCone/siscone/siscone/spherical/vicinity.h @@ -23,8 +23,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 255 $// -// $Date:: 2008-07-12 17:40:35 +0200 (Sat, 12 Jul 2008) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SPH_VICINITY_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/split_merge.cpp b/fastjet/plugins/SISCone/siscone/siscone/split_merge.cpp index 6bcdd02..86d0987 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/split_merge.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/split_merge.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 390 $// -// $Date:: 2016-03-03 11:06:52 +0100 (Thu, 03 Mar 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "split_merge.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/split_merge.h b/fastjet/plugins/SISCone/siscone/siscone/split_merge.h index ab7e877..989393a 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/split_merge.h +++ b/fastjet/plugins/SISCone/siscone/siscone/split_merge.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 405 $// -// $Date:: 2016-05-23 20:15:02 +0200 (Mon, 23 May 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __SPLIT_MERGE_H__ diff --git a/fastjet/plugins/SISCone/siscone/siscone/vicinity.cpp b/fastjet/plugins/SISCone/siscone/siscone/vicinity.cpp index eb8f970..1f510a6 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/vicinity.cpp +++ b/fastjet/plugins/SISCone/siscone/siscone/vicinity.cpp @@ -20,8 +20,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 388 $// -// $Date:: 2016-03-03 10:42:25 +0100 (Thu, 03 Mar 2016) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #include "vicinity.h" diff --git a/fastjet/plugins/SISCone/siscone/siscone/vicinity.h b/fastjet/plugins/SISCone/siscone/siscone/vicinity.h index 80ef15a..482dba5 100644 --- a/fastjet/plugins/SISCone/siscone/siscone/vicinity.h +++ b/fastjet/plugins/SISCone/siscone/siscone/vicinity.h @@ -21,8 +21,8 @@ // along with this program; if not, write to the Free Software // // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // // // -// $Revision:: 123 $// -// $Date:: 2007-03-01 02:52:16 +0100 (Thu, 01 Mar 2007) $// +// $Revision:: $// +// $Date:: $// /////////////////////////////////////////////////////////////////////////////// #ifndef __VICINITY_H__ diff --git a/fastjet/plugins/TrackJet/Makefile.in b/fastjet/plugins/TrackJet/Makefile.in index 369819b..3bc274d 100644 --- a/fastjet/plugins/TrackJet/Makefile.in +++ b/fastjet/plugins/TrackJet/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. diff --git a/fastjet/plugins/TrackJet/TrackJetPlugin.cc b/fastjet/plugins/TrackJet/TrackJetPlugin.cc index 6e5e127..e3bc45c 100644 --- a/fastjet/plugins/TrackJet/TrackJetPlugin.cc +++ b/fastjet/plugins/TrackJet/TrackJetPlugin.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: TrackJetPlugin.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -88,7 +88,7 @@ class TrackJetParticlePtr{ // implementation of the TrackJet plugin //------------------------------------------------------------------ -bool TrackJetPlugin::_first_time = true; +thread_safety_helpers::FirstTimeTrue TrackJetPlugin::_first_time; string TrackJetPlugin::description () const { ostringstream desc; @@ -187,8 +187,7 @@ void TrackJetPlugin::run_clustering(ClusterSequence & clust_seq) const { // print a banner for reference to the 3rd-party code void TrackJetPlugin::_print_banner(ostream *ostr) const{ - if (! _first_time) return; - _first_time=false; + if (! _first_time()) return; // make sure the user has not set the banner stream to NULL if (!ostr) return; diff --git a/fastjet/plugins/TrackJet/fastjet/Makefile.in b/fastjet/plugins/TrackJet/fastjet/Makefile.in index e66e5e7..71bda6b 100644 --- a/fastjet/plugins/TrackJet/fastjet/Makefile.in +++ b/fastjet/plugins/TrackJet/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. diff --git a/fastjet/plugins/TrackJet/fastjet/TrackJetPlugin.hh b/fastjet/plugins/TrackJet/fastjet/TrackJetPlugin.hh index 1549a4f..51a89d0 100644 --- a/fastjet/plugins/TrackJet/fastjet/TrackJetPlugin.hh +++ b/fastjet/plugins/TrackJet/fastjet/TrackJetPlugin.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: TrackJetPlugin.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2007-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2007-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -32,6 +32,7 @@ #define __TRACKJETPLUGIN_HH__ #include "fastjet/JetDefinition.hh" +#include "fastjet/internal/thread_safety_helpers.hh" // helpers to write transparent code w&wo C++11 features // questionable whether this should be in fastjet namespace or not... FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh @@ -87,7 +88,7 @@ private: JetDefinition::DefaultRecombiner _jet_recombiner; JetDefinition::DefaultRecombiner _track_recombiner; - static bool _first_time; + static thread_safety_helpers::FirstTimeTrue _first_time; /// print a banner for reference to the 3rd-party code void _print_banner(std::ostream *ostr) const; diff --git a/fastjet/pyinterface/Makefile.am b/fastjet/pyinterface/Makefile.am index 160411b..9a9a546 100644 --- a/fastjet/pyinterface/Makefile.am +++ b/fastjet/pyinterface/Makefile.am @@ -68,11 +68,13 @@ python_PYTHON = fastjet.py pyexec_LTLIBRARIES = _fastjet.la _fastjet_la_LIBTOOLFLAGS = --silent _fastjet_la_SOURCES = swig_wrap.cpp -_fastjet_la_CPPFLAGS = $(PYTHON_INCLUDE) $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I../include -I$(top_srcdir)/include -I$(top_srcdir)/tools -DSWIG +_fastjet_la_CPPFLAGS = $(PYTHON_INCLUDE) $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I../include -I$(top_srcdir)/include -I$(top_srcdir)/tools -DSWIG -DSWIG_TYPE_TABLE=fastjet _fastjet_la_LDFLAGS = -module _fastjet_la_LIBADD = ../src/libfastjet.la ../tools/libfastjettools.la $(CGAL_LIBS) # include the interface file for completeness +pyinterfacedir=$(datadir)/fastjet/pyinterface +pyinterface_DATA=$(SWIGINTERFACES) FastJetPythonExtensions.hh # this gets evaluated before install-exec # we use that to silence litool @@ -93,7 +95,7 @@ install-exec-hook: #---------------------------------------------------------------------- -# If we were to let the end-user run waig, then we should have the following: +# If we were to let the end-user run swig, then we should have the following: #BUILT_SOURCES = $(srcdir)/swig_wrap.cpp #SWIG_SOURCES = fastjet.i diff --git a/fastjet/pyinterface/Makefile.in b/fastjet/pyinterface/Makefile.in index 074835d..35c8caf 100644 --- a/fastjet/pyinterface/Makefile.in +++ b/fastjet/pyinterface/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. @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -138,7 +139,8 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)" +am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)" \ + "$(DESTDIR)$(pyinterfacedir)" LTLIBRARIES = $(pyexec_LTLIBRARIES) am__DEPENDENCIES_1 = _fastjet_la_DEPENDENCIES = ../src/libfastjet.la \ @@ -199,6 +201,7 @@ am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) am__pep3147_tweak = \ sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc __pycache__/&.*.pyo|' py_compile = $(top_srcdir)/py-compile +DATA = $(pyinterface_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -442,9 +445,13 @@ python_PYTHON = fastjet.py pyexec_LTLIBRARIES = _fastjet.la _fastjet_la_LIBTOOLFLAGS = --silent _fastjet_la_SOURCES = swig_wrap.cpp -_fastjet_la_CPPFLAGS = $(PYTHON_INCLUDE) $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I../include -I$(top_srcdir)/include -I$(top_srcdir)/tools -DSWIG +_fastjet_la_CPPFLAGS = $(PYTHON_INCLUDE) $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I../include -I$(top_srcdir)/include -I$(top_srcdir)/tools -DSWIG -DSWIG_TYPE_TABLE=fastjet _fastjet_la_LDFLAGS = -module _fastjet_la_LIBADD = ../src/libfastjet.la ../tools/libfastjettools.la $(CGAL_LIBS) + +# include the interface file for completeness +pyinterfacedir = $(datadir)/fastjet/pyinterface +pyinterface_DATA = $(SWIGINTERFACES) FastJetPythonExtensions.hh all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -608,6 +615,27 @@ uninstall-pythonPYTHON: $(am__uninstall_files_from_dir) || st=$$?; \ done || exit $$?; \ exit $$st +install-pyinterfaceDATA: $(pyinterface_DATA) + @$(NORMAL_INSTALL) + @list='$(pyinterface_DATA)'; test -n "$(pyinterfacedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pyinterfacedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pyinterfacedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pyinterfacedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pyinterfacedir)" || exit $$?; \ + done + +uninstall-pyinterfaceDATA: + @$(NORMAL_UNINSTALL) + @list='$(pyinterface_DATA)'; test -n "$(pyinterfacedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pyinterfacedir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -697,14 +725,15 @@ distdir-am: $(DISTFILES) check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"; do \ + for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pyinterfacedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -757,7 +786,7 @@ info: info-am info-am: -install-data-am: install-pythonPYTHON +install-data-am: install-pyinterfaceDATA install-pythonPYTHON install-dvi: install-dvi-am @@ -804,9 +833,11 @@ ps: ps-am ps-am: -uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON +uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pyinterfaceDATA \ + uninstall-pythonPYTHON -.MAKE: all check install install-am install-exec-am install-strip +.MAKE: all check install install-am install-exec install-exec-am \ + install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-generic clean-libtool clean-pyexecLTLIBRARIES \ @@ -818,12 +849,13 @@ uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON install-exec-local install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ install-ps install-ps-am install-pyexecLTLIBRARIES \ - install-pythonPYTHON install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-pyinterfaceDATA install-pythonPYTHON install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am \ - uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON + uninstall-pyexecLTLIBRARIES uninstall-pyinterfaceDATA \ + uninstall-pythonPYTHON .PRECIOUS: Makefile @@ -832,8 +864,6 @@ uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON @BUILD_INCLUDES_SWIG_TRUE@fastjet.py: swig_wrap.cpp @BUILD_INCLUDES_SWIG_TRUE@ @echo "fastjet.py is built at the same time as swig_wrap.cpp" -# include the interface file for completeness - # this gets evaluated before install-exec # we use that to silence litool install-exec-local: @@ -852,7 +882,7 @@ install-exec-hook: @echo "------------------------------------------------------------" #---------------------------------------------------------------------- -# If we were to let the end-user run waig, then we should have the following: +# If we were to let the end-user run swig, then we should have the following: #BUILT_SOURCES = $(srcdir)/swig_wrap.cpp #SWIG_SOURCES = fastjet.i diff --git a/fastjet/pyinterface/fastjet.i b/fastjet/pyinterface/fastjet.i index e96145a..8e91610 100644 --- a/fastjet/pyinterface/fastjet.i +++ b/fastjet/pyinterface/fastjet.i @@ -74,7 +74,7 @@ Example #include "fastjet/internal/BasicRandom.hh" #include "fastjet/SharedPtr.hh" #include "fastjet/LimitedWarning.hh" -#include "fastjet/Error.hh" + //#include "fastjet/Error.hh" #include "fastjet/PseudoJetStructureBase.hh" #include "fastjet/PseudoJet.hh" #include "fastjet/FunctionOfPseudoJet.hh" @@ -102,22 +102,76 @@ Example #include "FastJetPythonExtensions.hh" %} -// code to ensure that FJ C++ exceptions are passed on to Python -// cf https://stackoverflow.com/questions/15006048/dynamically-rethrowing-self-defined-c-exceptions-as-python-exceptions-using-sw + +%template(vectorPJ) std::vector; + +//---------------------------------------------------------------------- +// handle exceptoins by introducing a FastJetError python class +// derived from python's Exception class +// +// Thanks to Patrick Komiske for the fix +//---------------------------------------------------------------------- + +// define as macro for use in contrib files +%define FASTJET_ERRORS_AS_PYTHON_EXCEPTIONS(module) +%{ +// Python class for representing errors from FastJet +static PyObject * FastJetError_; +%} + +// this gets placed in the SWIG_init function +%init %{ + fastjet::Error::set_print_errors(false); + unsigned int mlen = strlen(`module`); + char * msg = (char*) calloc(mlen+15, sizeof(char)); + strcpy(msg, `module`); + strcat(msg, ".FastJetError"); + FastJetError_ = PyErr_NewException(msg, NULL, NULL); + Py_INCREF(FastJetError_); + if (PyModule_AddObject(m, "FastJetError", FastJetError_) < 0) { + Py_DECREF(m); + Py_DECREF(FastJetError_); + //return NULL; + } +%} +%enddef + +// include FastJetError in python module +%pythoncode { + from _fastjet import FastJetError +} + +FASTJET_ERRORS_AS_PYTHON_EXCEPTIONS(fastjet) + +// check for fastjet errors after each action %exception { - try { - $action - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + try { $action } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } -%template(vectorPJ) std::vector; +// // old code +// // +// // code to ensure that FJ C++ exceptions are passed on to Python +// // cf https://stackoverflow.com/questions/15006048/dynamically-rethrowing-self-defined-c-exceptions-as-python-exceptions-using-sw +// %exception { +// try { $action } +// catch (fastjet::Error &_e) { +// SWIG_Python_Raise(SWIG_NewPointerObj( +// (new fastjet::Error(static_cast(_e))), +// SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), +// "fastjet::Error", SWIGTYPE_p_fastjet__Error); +// SWIG_fail; +// } +// } + + +//---------------------------------------------------------------------- +// a list of FastJet includes +//---------------------------------------------------------------------- %include "fastjet/config_auto.h" %include "fastjet/config.h" @@ -154,6 +208,11 @@ Example %include "fastjet/ClusterSequenceArea.hh" %include "FastJetPythonExtensions.hh" +//---------------------------------------------------------------------- +// extra bits and pieces to make a series of specialised things +// directly available in Python +//---------------------------------------------------------------------- + namespace fastjet { // the templated ctors must be specialised for PseudoJet @@ -171,7 +230,7 @@ namespace fastjet { %enddef - +// class descriptions (__str__) FASTJET_SWIG_ADD_STR(JetDefinition) FASTJET_SWIG_ADD_STR(AreaDefinition) FASTJET_SWIG_ADD_STR(Selector) @@ -179,6 +238,7 @@ FASTJET_SWIG_ADD_STR(GhostedAreaSpec) FASTJET_SWIG_ADD_STR(FunctionOfPseudoJet) FASTJET_SWIG_ADD_STR(RectangularGrid) +// templated ctors FASTJET_TEMPLATED_CTOR_FOR_PSEUDOJET(ClusterSequence) FASTJET_TEMPLATED_CTOR_FOR_PSEUDOJET(ClusterSequenceActiveAreaExplicitGhosts) FASTJET_TEMPLATED_CTOR_FOR_PSEUDOJET(ClusterSequenceActiveArea) @@ -294,6 +354,7 @@ namespace fastjet{ } %enddef +// class descriptions (__str__) for the tools FASTJET_SWIG_ADD_STR(Boost) FASTJET_SWIG_ADD_STR(Unboost) FASTJET_SWIG_ADD_STR(Recluster) diff --git a/fastjet/pyinterface/fastjet.py b/fastjet/pyinterface/fastjet.py index 0eeea9e..668a860 100644 --- a/fastjet/pyinterface/fastjet.py +++ b/fastjet/pyinterface/fastjet.py @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 4.0.1 +# Version 4.0.2 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. @@ -283,6 +283,9 @@ def capacity(self): # Register vectorPJ in _fastjet: _fastjet.vectorPJ_swigregister(vectorPJ) + +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 @@ -1628,7 +1631,7 @@ def validated_csab(self): """ return _fastjet.PseudoJet_validated_csab(self) - def set_structure_shared_ptr(self, structure): + def set_structure_shared_ptr(self, structure_in): r""" `set_structure_shared_ptr(const SharedPtr< PseudoJetStructureBase > &structure)` @@ -1636,7 +1639,7 @@ def set_structure_shared_ptr(self, structure): set the associated structure """ - return _fastjet.PseudoJet_set_structure_shared_ptr(self, structure) + return _fastjet.PseudoJet_set_structure_shared_ptr(self, structure_in) def has_structure(self): r""" @@ -4919,6 +4922,15 @@ def set_random_status(self, __iseed): """ return _fastjet.GhostedAreaSpec_set_random_status(self, __iseed) + def with_fixed_seed(self, __iseed): + return _fastjet.GhostedAreaSpec_with_fixed_seed(self, __iseed) + + def get_fixed_seed(self, __iseed): + return _fastjet.GhostedAreaSpec_get_fixed_seed(self, __iseed) + + def get_last_seed(self, __iseed): + return _fastjet.GhostedAreaSpec_get_last_seed(self, __iseed) + def checkpoint_random(self): r""" @@ -4977,6 +4989,9 @@ def generator_at_own_risk(self): """ return _fastjet.GhostedAreaSpec_generator_at_own_risk(self) + def user_random_generator_at_own_risk(self): + return _fastjet.GhostedAreaSpec_user_random_generator_at_own_risk(self) + def __str__(self): return _fastjet.GhostedAreaSpec___str__(self) __swig_destroy__ = _fastjet.delete_GhostedAreaSpec @@ -5110,6 +5125,9 @@ def voronoi_spec(self): """ return _fastjet.AreaDefinition_voronoi_spec(self) + def with_fixed_seed(self, iseed): + return _fastjet.AreaDefinition_with_fixed_seed(self, iseed) + def __str__(self): return _fastjet.AreaDefinition___str__(self) __swig_destroy__ = _fastjet.delete_AreaDefinition @@ -7787,6 +7805,71 @@ def cos_theta_W(self): # 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 + + def __init__(self): + _fastjet.BackgroundEstimate_swiginit(self, _fastjet.new_BackgroundEstimate()) + + def rho(self): + return _fastjet.BackgroundEstimate_rho(self) + + def sigma(self): + return _fastjet.BackgroundEstimate_sigma(self) + + def has_sigma(self): + return _fastjet.BackgroundEstimate_has_sigma(self) + + def rho_m(self): + return _fastjet.BackgroundEstimate_rho_m(self) + + def sigma_m(self): + return _fastjet.BackgroundEstimate_sigma_m(self) + + def has_rho_m(self): + return _fastjet.BackgroundEstimate_has_rho_m(self) + + def mean_area(self): + return _fastjet.BackgroundEstimate_mean_area(self) + + def has_extras(self): + return _fastjet.BackgroundEstimate_has_extras(self) + + def reset(self): + return _fastjet.BackgroundEstimate_reset(self) + + def set_rho(self, rho_in): + return _fastjet.BackgroundEstimate_set_rho(self, rho_in) + + def set_sigma(self, sigma_in): + return _fastjet.BackgroundEstimate_set_sigma(self, sigma_in) + + def set_has_sigma(self, has_sigma_in): + return _fastjet.BackgroundEstimate_set_has_sigma(self, has_sigma_in) + + def set_rho_m(self, rho_m_in): + return _fastjet.BackgroundEstimate_set_rho_m(self, rho_m_in) + + def set_sigma_m(self, sigma_m_in): + return _fastjet.BackgroundEstimate_set_sigma_m(self, sigma_m_in) + + def set_has_rho_m(self, has_rho_m_in): + return _fastjet.BackgroundEstimate_set_has_rho_m(self, has_rho_m_in) + + def set_mean_area(self, mean_area_in): + return _fastjet.BackgroundEstimate_set_mean_area(self, mean_area_in) + + def apply_rescaling_factor(self, rescaling_factor): + return _fastjet.BackgroundEstimate_apply_rescaling_factor(self, rescaling_factor) + + def set_extras(self, extras_in): + return _fastjet.BackgroundEstimate_set_extras(self, extras_in) + __swig_destroy__ = _fastjet.delete_BackgroundEstimate + +# Register BackgroundEstimate in _fastjet: +_fastjet.BackgroundEstimate_swigregister(BackgroundEstimate) + class BackgroundEstimatorBase(object): r""" @@ -7816,6 +7899,15 @@ def set_particles(self, particles): """ return _fastjet.BackgroundEstimatorBase_set_particles(self, particles) + def set_particles_with_seed(self, particles, arg3): + return _fastjet.BackgroundEstimatorBase_set_particles_with_seed(self, particles, arg3) + + def copy(self): + return _fastjet.BackgroundEstimatorBase_copy(self) + + def estimate(self, *args): + return _fastjet.BackgroundEstimatorBase_estimate(self, *args) + def rho(self, *args): r""" @@ -8045,6 +8137,9 @@ def set_particles(self, particles): """ return _fastjet.JetMedianBackgroundEstimator_set_particles(self, particles) + def set_particles_with_seed(self, particles, seed): + return _fastjet.JetMedianBackgroundEstimator_set_particles_with_seed(self, particles, seed) + def set_cluster_sequence(self, csa): r""" @@ -8109,6 +8204,12 @@ def set_compute_rho_m(self, enable): """ return _fastjet.JetMedianBackgroundEstimator_set_compute_rho_m(self, enable) + def copy(self): + return _fastjet.JetMedianBackgroundEstimator_copy(self) + + def estimate(self, *args): + return _fastjet.JetMedianBackgroundEstimator_estimate(self, *args) + def rho(self, *args): r""" @@ -8602,6 +8703,12 @@ def set_compute_rho_m(self, enable): """ return _fastjet.GridMedianBackgroundEstimator_set_compute_rho_m(self, enable) + def copy(self): + return _fastjet.GridMedianBackgroundEstimator_copy(self) + + def estimate(self, *args): + return _fastjet.GridMedianBackgroundEstimator_estimate(self, *args) + def rho(self, *args): r""" @@ -8770,6 +8877,9 @@ def set_defaults(self): """ return _fastjet.Subtractor_set_defaults(self) + def set_background_estimator(self, bge): + return _fastjet.Subtractor_set_background_estimator(self, bge) + def set_use_rho_m(self, use_rho_m_in=True): r""" diff --git a/fastjet/pyinterface/swig_wrap.cpp b/fastjet/pyinterface/swig_wrap.cpp index 3f5d2c8..7889a80 100644 --- a/fastjet/pyinterface/swig_wrap.cpp +++ b/fastjet/pyinterface/swig_wrap.cpp @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 4.0.1 + * Version 4.0.2 * * 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 @@ -808,15 +808,19 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { SWIGINTERN char* SWIG_Python_str_AsChar(PyObject *str) { -#if PY_VERSION_HEX >= 0x03000000 +#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; - PyBytes_AsStringAndSize(str, &cstr, &len); - newstr = (char *) malloc(len+1); - memcpy(newstr, cstr, len+1); + if (PyBytes_AsStringAndSize(str, &cstr, &len) != -1) { + newstr = (char *) malloc(len+1); + if (newstr) + memcpy(newstr, cstr, len+1); + } Py_XDECREF(str); } return newstr; @@ -825,10 +829,10 @@ SWIG_Python_str_AsChar(PyObject *str) #endif } -#if PY_VERSION_HEX >= 0x03000000 -# define SWIG_Python_str_DelForPy3(x) free( (void*) (x) ) +#if PY_VERSION_HEX >= 0x03030000 || PY_VERSION_HEX < 0x03000000 +# define SWIG_Python_str_DelForPy3(x) #else -# define SWIG_Python_str_DelForPy3(x) +# define SWIG_Python_str_DelForPy3(x) free( (void*) (x) ) #endif @@ -1243,6 +1247,19 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi } } +SWIGINTERN int +SWIG_Python_CheckNoKeywords(PyObject *kwargs, const char *name) { + int no_kwargs = 1; + if (kwargs) { + assert(PyDict_Check(kwargs)); + if (PyDict_Size(kwargs) > 0) { + PyErr_Format(PyExc_TypeError, "%s() does not take keyword arguments", name); + no_kwargs = 0; + } + } + return no_kwargs; +} + /* A functor is a function object with one single object argument */ #define SWIG_Python_CallFunctor(functor, obj) PyObject_CallFunctionObjArgs(functor, obj, NULL); @@ -1756,6 +1773,12 @@ SwigPyObject_TypeOnce(void) { #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 */ @@ -1917,6 +1940,12 @@ SwigPyPacked_TypeOnce(void) { #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 */ @@ -2243,8 +2272,10 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) } } #else - PyObject *key = SWIG_This(); - PyObject_SetAttr(inst, key, swig_this); + if (PyObject_SetAttr(inst, SWIG_This(), swig_this) == -1) { + Py_DECREF(inst); + inst = 0; + } #endif } } else { @@ -2256,8 +2287,12 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) inst = ((PyTypeObject *)data->newargs)->tp_new((PyTypeObject *)data->newargs, empty_args, empty_kwargs); Py_DECREF(empty_kwargs); if (inst) { - PyObject_SetAttr(inst, SWIG_This(), swig_this); - Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; + if (PyObject_SetAttr(inst, SWIG_This(), swig_this) == -1) { + Py_DECREF(inst); + inst = 0; + } else { + Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; + } } } Py_DECREF(empty_args); @@ -2274,25 +2309,21 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) return inst; } -SWIGRUNTIME void +SWIGRUNTIME int SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this) { - PyObject *dict; #if !defined(SWIG_PYTHON_SLOW_GETSET_THIS) - PyObject **dictptr = _PyObject_GetDictPtr(inst); - if (dictptr != NULL) { - dict = *dictptr; - if (dict == NULL) { - dict = PyDict_New(); - *dictptr = dict; - } - PyDict_SetItem(dict, SWIG_This(), swig_this); - return; - } + PyObject **dictptr = _PyObject_GetDictPtr(inst); + if (dictptr != NULL) { + PyObject *dict = *dictptr; + if (dict == NULL) { + dict = PyDict_New(); + *dictptr = dict; + } + return PyDict_SetItem(dict, SWIG_This(), swig_this); + } #endif - dict = PyObject_GetAttrString(inst, "__dict__"); - PyDict_SetItem(dict, SWIG_This(), swig_this); - Py_DECREF(dict); + return PyObject_SetAttr(inst, SWIG_This(), swig_this); } @@ -2306,7 +2337,8 @@ SWIG_Python_InitShadowInstance(PyObject *args) { if (sthis) { SwigPyObject_append((PyObject*) sthis, obj[1]); } else { - SWIG_Python_SetSwigThis(obj[0], obj[1]); + if (SWIG_Python_SetSwigThis(obj[0], obj[1]) != 0) + return NULL; } return SWIG_Py_Void(); } @@ -2666,92 +2698,95 @@ SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyO #define SWIGTYPE_p_difference_type swig_types[3] #define SWIGTYPE_p_double swig_types[4] #define SWIGTYPE_p_fastjet__AreaDefinition swig_types[5] -#define SWIGTYPE_p_fastjet__BackgroundEstimatorBase swig_types[6] -#define SWIGTYPE_p_fastjet__BackgroundJetPtDensity swig_types[7] -#define SWIGTYPE_p_fastjet__BackgroundJetPtMDensity swig_types[8] -#define SWIGTYPE_p_fastjet__BackgroundJetScalarPtDensity swig_types[9] -#define SWIGTYPE_p_fastjet__BackgroundRescalingYPolynomial swig_types[10] -#define SWIGTYPE_p_fastjet__BasicRandomT_double_t swig_types[11] -#define SWIGTYPE_p_fastjet__BasicRandomT_int_t swig_types[12] -#define SWIGTYPE_p_fastjet__Boost swig_types[13] -#define SWIGTYPE_p_fastjet__CASubJetTagger swig_types[14] -#define SWIGTYPE_p_fastjet__CASubJetTaggerStructure swig_types[15] -#define SWIGTYPE_p_fastjet__ClusterSequence swig_types[16] -#define SWIGTYPE_p_fastjet__ClusterSequence1GhostPassiveArea swig_types[17] -#define SWIGTYPE_p_fastjet__ClusterSequenceActiveArea swig_types[18] -#define SWIGTYPE_p_fastjet__ClusterSequenceActiveAreaExplicitGhosts swig_types[19] -#define SWIGTYPE_p_fastjet__ClusterSequenceArea swig_types[20] -#define SWIGTYPE_p_fastjet__ClusterSequenceAreaBase swig_types[21] -#define SWIGTYPE_p_fastjet__ClusterSequencePassiveArea swig_types[22] -#define SWIGTYPE_p_fastjet__ClusterSequenceStructure swig_types[23] -#define SWIGTYPE_p_fastjet__ClusterSequenceVoronoiArea swig_types[24] -#define SWIGTYPE_p_fastjet__ClusterSequence__Extras swig_types[25] -#define SWIGTYPE_p_fastjet__CompositeJetStructure swig_types[26] -#define SWIGTYPE_p_fastjet__Error swig_types[27] -#define SWIGTYPE_p_fastjet__Filter swig_types[28] -#define SWIGTYPE_p_fastjet__FilterStructure swig_types[29] -#define SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_double_t swig_types[30] -#define SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t swig_types[31] -#define SWIGTYPE_p_fastjet__GhostedAreaSpec swig_types[32] -#define SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator swig_types[33] -#define SWIGTYPE_p_fastjet__IndexedSortHelper swig_types[34] -#define SWIGTYPE_p_fastjet__InternalError swig_types[35] -#define SWIGTYPE_p_fastjet__JHTopTagger swig_types[36] -#define SWIGTYPE_p_fastjet__JHTopTaggerStructure swig_types[37] -#define SWIGTYPE_p_fastjet__JetAlgorithm swig_types[38] -#define SWIGTYPE_p_fastjet__JetDefinition swig_types[39] -#define SWIGTYPE_p_fastjet__JetDefinition__Plugin swig_types[40] -#define SWIGTYPE_p_fastjet__JetDefinition__Recombiner swig_types[41] -#define SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator swig_types[42] -#define SWIGTYPE_p_fastjet__LimitedWarning swig_types[43] -#define SWIGTYPE_p_fastjet__MassDropTagger swig_types[44] -#define SWIGTYPE_p_fastjet__MassDropTaggerStructure swig_types[45] -#define SWIGTYPE_p_fastjet__Pruner swig_types[46] -#define SWIGTYPE_p_fastjet__PrunerStructure swig_types[47] -#define SWIGTYPE_p_fastjet__PruningPlugin swig_types[48] -#define SWIGTYPE_p_fastjet__PruningRecombiner swig_types[49] -#define SWIGTYPE_p_fastjet__PseudoJet swig_types[50] -#define SWIGTYPE_p_fastjet__PseudoJetStructureBase swig_types[51] -#define SWIGTYPE_p_fastjet__PseudoJet__UserInfoBase swig_types[52] -#define SWIGTYPE_p_fastjet__RangeDefinition swig_types[53] -#define SWIGTYPE_p_fastjet__Recluster swig_types[54] -#define SWIGTYPE_p_fastjet__RecombinerPython swig_types[55] -#define SWIGTYPE_p_fastjet__RectangularGrid swig_types[56] -#define SWIGTYPE_p_fastjet__RestFrameNSubjettinessTagger swig_types[57] -#define SWIGTYPE_p_fastjet__RestFrameNSubjettinessTaggerStructure swig_types[58] -#define SWIGTYPE_p_fastjet__Selector swig_types[59] -#define SWIGTYPE_p_fastjet__SelectorWorker swig_types[60] -#define SWIGTYPE_p_fastjet__SelectorWorkerPython swig_types[61] -#define SWIGTYPE_p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t swig_types[62] -#define SWIGTYPE_p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t swig_types[63] -#define SWIGTYPE_p_fastjet__SharedPtrT_fastjet__SelectorWorker_t swig_types[64] -#define SWIGTYPE_p_fastjet__Subtractor swig_types[65] -#define SWIGTYPE_p_fastjet__TilingBase swig_types[66] -#define SWIGTYPE_p_fastjet__TopTaggerBase swig_types[67] -#define SWIGTYPE_p_fastjet__TopTaggerBaseStructure swig_types[68] -#define SWIGTYPE_p_fastjet__Transformer swig_types[69] -#define SWIGTYPE_p_fastjet__Unboost swig_types[70] -#define SWIGTYPE_p_fastjet__UserInfoPython swig_types[71] -#define SWIGTYPE_p_fastjet__VoronoiAreaSpec swig_types[72] -#define SWIGTYPE_p_fastjet___NoInfo swig_types[73] -#define SWIGTYPE_p_int swig_types[74] -#define SWIGTYPE_p_p_PyObject swig_types[75] -#define SWIGTYPE_p_p_fastjet__PseudoJet swig_types[76] -#define SWIGTYPE_p_size_type swig_types[77] -#define SWIGTYPE_p_std__allocatorT_fastjet__PseudoJet_t swig_types[78] -#define SWIGTYPE_p_std__invalid_argument swig_types[79] -#define SWIGTYPE_p_std__ostream swig_types[80] -#define SWIGTYPE_p_std__valarrayT_double_t swig_types[81] -#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[82] -#define SWIGTYPE_p_std__vectorT_fastjet__ClusterSequence__history_element_std__allocatorT_fastjet__ClusterSequence__history_element_t_t swig_types[83] -#define SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_const_p_std__allocatorT_fastjet__PseudoJet_const_p_t_t swig_types[84] -#define SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_std__allocatorT_fastjet__PseudoJet_t_t swig_types[85] -#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[86] -#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[87] -#define SWIGTYPE_p_swig__SwigPyIterator swig_types[88] -#define SWIGTYPE_p_value_type swig_types[89] -static swig_type_info *swig_types[91]; -static swig_module_info swig_module = {swig_types, 90, 0, 0, 0, 0}; +#define SWIGTYPE_p_fastjet__BackgroundEstimate swig_types[6] +#define SWIGTYPE_p_fastjet__BackgroundEstimate__Extras swig_types[7] +#define SWIGTYPE_p_fastjet__BackgroundEstimatorBase swig_types[8] +#define SWIGTYPE_p_fastjet__BackgroundJetPtDensity swig_types[9] +#define SWIGTYPE_p_fastjet__BackgroundJetPtMDensity swig_types[10] +#define SWIGTYPE_p_fastjet__BackgroundJetScalarPtDensity swig_types[11] +#define SWIGTYPE_p_fastjet__BackgroundRescalingYPolynomial swig_types[12] +#define SWIGTYPE_p_fastjet__BasicRandomT_double_t swig_types[13] +#define SWIGTYPE_p_fastjet__BasicRandomT_int_t swig_types[14] +#define SWIGTYPE_p_fastjet__Boost swig_types[15] +#define SWIGTYPE_p_fastjet__CASubJetTagger swig_types[16] +#define SWIGTYPE_p_fastjet__CASubJetTaggerStructure swig_types[17] +#define SWIGTYPE_p_fastjet__ClusterSequence swig_types[18] +#define SWIGTYPE_p_fastjet__ClusterSequence1GhostPassiveArea swig_types[19] +#define SWIGTYPE_p_fastjet__ClusterSequenceActiveArea swig_types[20] +#define SWIGTYPE_p_fastjet__ClusterSequenceActiveAreaExplicitGhosts swig_types[21] +#define SWIGTYPE_p_fastjet__ClusterSequenceArea swig_types[22] +#define SWIGTYPE_p_fastjet__ClusterSequenceAreaBase swig_types[23] +#define SWIGTYPE_p_fastjet__ClusterSequencePassiveArea swig_types[24] +#define SWIGTYPE_p_fastjet__ClusterSequenceStructure swig_types[25] +#define SWIGTYPE_p_fastjet__ClusterSequenceVoronoiArea swig_types[26] +#define SWIGTYPE_p_fastjet__ClusterSequence__Extras swig_types[27] +#define SWIGTYPE_p_fastjet__CompositeJetStructure swig_types[28] +#define SWIGTYPE_p_fastjet__Error swig_types[29] +#define SWIGTYPE_p_fastjet__Filter swig_types[30] +#define SWIGTYPE_p_fastjet__FilterStructure swig_types[31] +#define SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_double_t swig_types[32] +#define SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t swig_types[33] +#define SWIGTYPE_p_fastjet__GhostedAreaSpec swig_types[34] +#define SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator swig_types[35] +#define SWIGTYPE_p_fastjet__IndexedSortHelper swig_types[36] +#define SWIGTYPE_p_fastjet__InternalError swig_types[37] +#define SWIGTYPE_p_fastjet__JHTopTagger swig_types[38] +#define SWIGTYPE_p_fastjet__JHTopTaggerStructure swig_types[39] +#define SWIGTYPE_p_fastjet__JetAlgorithm swig_types[40] +#define SWIGTYPE_p_fastjet__JetDefinition swig_types[41] +#define SWIGTYPE_p_fastjet__JetDefinition__Plugin swig_types[42] +#define SWIGTYPE_p_fastjet__JetDefinition__Recombiner swig_types[43] +#define SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator swig_types[44] +#define SWIGTYPE_p_fastjet__LimitedWarning swig_types[45] +#define SWIGTYPE_p_fastjet__MassDropTagger swig_types[46] +#define SWIGTYPE_p_fastjet__MassDropTaggerStructure swig_types[47] +#define SWIGTYPE_p_fastjet__Pruner swig_types[48] +#define SWIGTYPE_p_fastjet__PrunerStructure swig_types[49] +#define SWIGTYPE_p_fastjet__PruningPlugin swig_types[50] +#define SWIGTYPE_p_fastjet__PruningRecombiner swig_types[51] +#define SWIGTYPE_p_fastjet__PseudoJet swig_types[52] +#define SWIGTYPE_p_fastjet__PseudoJetStructureBase swig_types[53] +#define SWIGTYPE_p_fastjet__PseudoJet__UserInfoBase swig_types[54] +#define SWIGTYPE_p_fastjet__RangeDefinition swig_types[55] +#define SWIGTYPE_p_fastjet__Recluster swig_types[56] +#define SWIGTYPE_p_fastjet__RecombinerPython swig_types[57] +#define SWIGTYPE_p_fastjet__RectangularGrid swig_types[58] +#define SWIGTYPE_p_fastjet__RestFrameNSubjettinessTagger swig_types[59] +#define SWIGTYPE_p_fastjet__RestFrameNSubjettinessTaggerStructure swig_types[60] +#define SWIGTYPE_p_fastjet__Selector swig_types[61] +#define SWIGTYPE_p_fastjet__SelectorWorker swig_types[62] +#define SWIGTYPE_p_fastjet__SelectorWorkerPython swig_types[63] +#define SWIGTYPE_p_fastjet__SharedPtrT_fastjet__BasicRandomT_double_t_t swig_types[64] +#define SWIGTYPE_p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t swig_types[65] +#define SWIGTYPE_p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t swig_types[66] +#define SWIGTYPE_p_fastjet__SharedPtrT_fastjet__SelectorWorker_t swig_types[67] +#define SWIGTYPE_p_fastjet__Subtractor swig_types[68] +#define SWIGTYPE_p_fastjet__TilingBase swig_types[69] +#define SWIGTYPE_p_fastjet__TopTaggerBase swig_types[70] +#define SWIGTYPE_p_fastjet__TopTaggerBaseStructure swig_types[71] +#define SWIGTYPE_p_fastjet__Transformer swig_types[72] +#define SWIGTYPE_p_fastjet__Unboost swig_types[73] +#define SWIGTYPE_p_fastjet__UserInfoPython swig_types[74] +#define SWIGTYPE_p_fastjet__VoronoiAreaSpec swig_types[75] +#define SWIGTYPE_p_fastjet___NoInfo swig_types[76] +#define SWIGTYPE_p_int swig_types[77] +#define SWIGTYPE_p_p_PyObject swig_types[78] +#define SWIGTYPE_p_p_fastjet__PseudoJet swig_types[79] +#define SWIGTYPE_p_size_type swig_types[80] +#define SWIGTYPE_p_std__allocatorT_fastjet__PseudoJet_t swig_types[81] +#define SWIGTYPE_p_std__invalid_argument swig_types[82] +#define SWIGTYPE_p_std__ostream swig_types[83] +#define SWIGTYPE_p_std__valarrayT_double_t swig_types[84] +#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[85] +#define SWIGTYPE_p_std__vectorT_fastjet__ClusterSequence__history_element_std__allocatorT_fastjet__ClusterSequence__history_element_t_t swig_types[86] +#define SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_const_p_std__allocatorT_fastjet__PseudoJet_const_p_t_t swig_types[87] +#define SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_std__allocatorT_fastjet__PseudoJet_t_t swig_types[88] +#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[89] +#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[90] +#define SWIGTYPE_p_swig__SwigPyIterator swig_types[91] +#define SWIGTYPE_p_value_type swig_types[92] +static swig_type_info *swig_types[94]; +static swig_module_info swig_module = {swig_types, 93, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2774,7 +2809,7 @@ static swig_module_info swig_module = {swig_types, 90, 0, 0, 0, 0}; #endif #define SWIG_name "_fastjet" -#define SWIGVERSION 0x040001 +#define SWIGVERSION 0x040002 #define SWIG_VERSION SWIGVERSION @@ -3372,7 +3407,7 @@ SWIG_AsVal_ptrdiff_t (PyObject * obj, ptrdiff_t *val) #include "fastjet/internal/BasicRandom.hh" #include "fastjet/SharedPtr.hh" #include "fastjet/LimitedWarning.hh" -#include "fastjet/Error.hh" + //#include "fastjet/Error.hh" #include "fastjet/PseudoJetStructureBase.hh" #include "fastjet/PseudoJet.hh" #include "fastjet/FunctionOfPseudoJet.hh" @@ -3527,11 +3562,20 @@ namespace swig { template struct traits_asptr { static int asptr(PyObject *obj, Type **val) { - Type *p = 0; + int res = SWIG_ERROR; swig_type_info *descriptor = type_info(); - int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR; - if (SWIG_IsOK(res)) { - if (val) *val = p; + if (val) { + Type *p = 0; + int newmem = 0; + res = descriptor ? SWIG_ConvertPtrAndOwn(obj, (void **)&p, descriptor, 0, &newmem) : SWIG_ERROR; + if (SWIG_IsOK(res)) { + if (newmem & SWIG_CAST_NEW_MEMORY) { + res |= SWIG_NEWOBJMASK; + } + *val = p; + } + } else { + res = descriptor ? SWIG_ConvertPtr(obj, 0, descriptor, 0) : SWIG_ERROR; } return res; } @@ -4716,7 +4760,7 @@ namespace swig { struct container_owner { // By default, do not add the back-reference (for value types) // Specialization below will check the reference for pointer types. - static bool back_reference(PyObject* child, PyObject* owner) { + static bool back_reference(PyObject* /*child*/, PyObject* /*owner*/) { return false; } }; @@ -4733,8 +4777,7 @@ namespace swig { static bool back_reference(PyObject* child, PyObject* owner) { SwigPyObject* swigThis = SWIG_Python_GetSwigThis(child); if (swigThis && (swigThis->own & SWIG_POINTER_OWN) != SWIG_POINTER_OWN) { - PyObject_SetAttr(child, container_owner_attribute(), owner); - return true; + return PyObject_SetAttr(child, container_owner_attribute(), owner) != -1; } return false; } @@ -4759,6 +4802,10 @@ SWIGINTERN std::vector< fastjet::PseudoJet >::iterator std_vector_Sl_fastjet_Pse SWIGINTERN std::vector< fastjet::PseudoJet >::iterator std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_0(std::vector< fastjet::PseudoJet > *self,std::vector< fastjet::PseudoJet >::iterator pos,std::vector< fastjet::PseudoJet >::value_type const &x){ return self->insert(pos, x); } SWIGINTERN void std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_1(std::vector< fastjet::PseudoJet > *self,std::vector< fastjet::PseudoJet >::iterator pos,std::vector< fastjet::PseudoJet >::size_type n,std::vector< fastjet::PseudoJet >::value_type const &x){ self->insert(pos, n, x); } +// Python class for representing errors from FastJet +static PyObject * FastJetError_; + + SWIGINTERNINLINE PyObject* SWIG_From_int (int value) { @@ -4860,9 +4907,11 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) if (alloc) *alloc = SWIG_NEWOBJ; #endif - PyBytes_AsStringAndSize(obj, &cstr, &len); + if (PyBytes_AsStringAndSize(obj, &cstr, &len) == -1) + return SWIG_TypeError; #else - PyString_AsStringAndSize(obj, &cstr, &len); + if (PyString_AsStringAndSize(obj, &cstr, &len) == -1) + return SWIG_TypeError; #endif if (cptr) { if (alloc) { @@ -5909,17 +5958,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_iterator(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_iterator" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (swig::SwigPyIterator *)std_vector_Sl_fastjet_PseudoJet_Sg__iterator(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (swig::SwigPyIterator *)std_vector_Sl_fastjet_PseudoJet_Sg__iterator(arg1,arg2); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN | 0 ); return resultobj; fail: @@ -5942,17 +5981,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___nonzero__(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ___nonzero__" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > const *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (bool)std_vector_Sl_fastjet_PseudoJet_Sg____nonzero__((std::vector< fastjet::PseudoJet > const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (bool)std_vector_Sl_fastjet_PseudoJet_Sg____nonzero__((std::vector< fastjet::PseudoJet > const *)arg1); resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: @@ -5975,17 +6004,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___bool__(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ___bool__" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > const *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (bool)std_vector_Sl_fastjet_PseudoJet_Sg____bool__((std::vector< fastjet::PseudoJet > const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (bool)std_vector_Sl_fastjet_PseudoJet_Sg____bool__((std::vector< fastjet::PseudoJet > const *)arg1); resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: @@ -6008,17 +6027,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ___len__(PyObject *SWIGUNUSEDPARM(self), PyOb SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ___len__" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > const *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = std_vector_Sl_fastjet_PseudoJet_Sg____len__((std::vector< fastjet::PseudoJet > const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = std_vector_Sl_fastjet_PseudoJet_Sg____len__((std::vector< fastjet::PseudoJet > const *)arg1); resultobj = SWIG_From_size_t(static_cast< size_t >(result)); return resultobj; fail: @@ -6056,22 +6065,12 @@ SWIGINTERN PyObject *_wrap_vectorPJ___getslice__(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorPJ___getslice__" "', argument " "3"" of type '" "std::vector< fastjet::PseudoJet >::difference_type""'"); } arg3 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val3); - { - try { - try { - result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *)std_vector_Sl_fastjet_PseudoJet_Sg____getslice__(arg1,arg2,arg3); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } catch(std::invalid_argument &_e) { - SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *)std_vector_Sl_fastjet_PseudoJet_Sg____getslice__(arg1,arg2,arg3); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_std__allocatorT_fastjet__PseudoJet_t_t, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -6108,22 +6107,12 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setslice____SWIG_0(PyObject *SWIGUNUSEDPAR SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorPJ___setslice__" "', argument " "3"" of type '" "std::vector< fastjet::PseudoJet >::difference_type""'"); } arg3 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val3); - { - try { - try { - std_vector_Sl_fastjet_PseudoJet_Sg____setslice____SWIG_0(arg1,arg2,arg3); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } catch(std::invalid_argument &_e) { - SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + std_vector_Sl_fastjet_PseudoJet_Sg____setslice____SWIG_0(arg1,arg2,arg3); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); } resultobj = SWIG_Py_Void(); return resultobj; @@ -6173,22 +6162,12 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setslice____SWIG_1(PyObject *SWIGUNUSEDPAR } arg4 = ptr; } - { - try { - try { - std_vector_Sl_fastjet_PseudoJet_Sg____setslice____SWIG_1(arg1,arg2,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) { - SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + std_vector_Sl_fastjet_PseudoJet_Sg____setslice____SWIG_1(arg1,arg2,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) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res4)) delete arg4; @@ -6290,22 +6269,12 @@ SWIGINTERN PyObject *_wrap_vectorPJ___delslice__(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorPJ___delslice__" "', argument " "3"" of type '" "std::vector< fastjet::PseudoJet >::difference_type""'"); } arg3 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val3); - { - try { - try { - std_vector_Sl_fastjet_PseudoJet_Sg____delslice__(arg1,arg2,arg3); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } catch(std::invalid_argument &_e) { - SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + std_vector_Sl_fastjet_PseudoJet_Sg____delslice__(arg1,arg2,arg3); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); } resultobj = SWIG_Py_Void(); return resultobj; @@ -6334,22 +6303,12 @@ SWIGINTERN PyObject *_wrap_vectorPJ___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorPJ___delitem__" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet >::difference_type""'"); } arg2 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val2); - { - try { - try { - std_vector_Sl_fastjet_PseudoJet_Sg____delitem____SWIG_0(arg1,arg2); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } catch(std::invalid_argument &_e) { - SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + std_vector_Sl_fastjet_PseudoJet_Sg____delitem____SWIG_0(arg1,arg2); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); } resultobj = SWIG_Py_Void(); return resultobj; @@ -6378,22 +6337,12 @@ SWIGINTERN PyObject *_wrap_vectorPJ___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM } arg2 = (PySliceObject *) swig_obj[1]; } - { - try { - try { - result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *)std_vector_Sl_fastjet_PseudoJet_Sg____getitem____SWIG_0(arg1,arg2); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } catch(std::invalid_argument &_e) { - SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *)std_vector_Sl_fastjet_PseudoJet_Sg____getitem____SWIG_0(arg1,arg2); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_std__allocatorT_fastjet__PseudoJet_t_t, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -6434,22 +6383,12 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM } arg3 = ptr; } - { - try { - try { - std_vector_Sl_fastjet_PseudoJet_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg3); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } catch(std::invalid_argument &_e) { - SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + std_vector_Sl_fastjet_PseudoJet_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg3); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res3)) delete arg3; @@ -6479,22 +6418,12 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM } arg2 = (PySliceObject *) swig_obj[1]; } - { - try { - try { - std_vector_Sl_fastjet_PseudoJet_Sg____setitem____SWIG_1(arg1,arg2); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } catch(std::invalid_argument &_e) { - SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + std_vector_Sl_fastjet_PseudoJet_Sg____setitem____SWIG_1(arg1,arg2); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); } resultobj = SWIG_Py_Void(); return resultobj; @@ -6522,22 +6451,12 @@ SWIGINTERN PyObject *_wrap_vectorPJ___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM } arg2 = (PySliceObject *) swig_obj[1]; } - { - try { - try { - std_vector_Sl_fastjet_PseudoJet_Sg____delitem____SWIG_1(arg1,arg2); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } catch(std::invalid_argument &_e) { - SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + std_vector_Sl_fastjet_PseudoJet_Sg____delitem____SWIG_1(arg1,arg2); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); } resultobj = SWIG_Py_Void(); return resultobj; @@ -6612,20 +6531,10 @@ SWIGINTERN PyObject *_wrap_vectorPJ___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorPJ___getitem__" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet >::difference_type""'"); } arg2 = static_cast< std::vector< fastjet::PseudoJet >::difference_type >(val2); - { - try { - try { - result = (std::vector< fastjet::PseudoJet >::value_type *) &std_vector_Sl_fastjet_PseudoJet_Sg____getitem____SWIG_1((std::vector< fastjet::PseudoJet > const *)arg1,arg2); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + result = (std::vector< fastjet::PseudoJet >::value_type *) &std_vector_Sl_fastjet_PseudoJet_Sg____getitem____SWIG_1((std::vector< fastjet::PseudoJet > const *)arg1,arg2); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJet, 0 | 0 ); (void)swig::container_owner::value_type>::category>::back_reference(resultobj, swig_obj[0]); @@ -6711,20 +6620,10 @@ SWIGINTERN PyObject *_wrap_vectorPJ___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorPJ___setitem__" "', argument " "3"" of type '" "std::vector< fastjet::PseudoJet >::value_type const &""'"); } arg3 = reinterpret_cast< std::vector< fastjet::PseudoJet >::value_type * >(argp3); - { - try { - try { - std_vector_Sl_fastjet_PseudoJet_Sg____setitem____SWIG_2(arg1,arg2,(fastjet::PseudoJet const &)*arg3); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + std_vector_Sl_fastjet_PseudoJet_Sg____setitem____SWIG_2(arg1,arg2,(fastjet::PseudoJet const &)*arg3); + } catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } resultobj = SWIG_Py_Void(); return resultobj; @@ -6815,20 +6714,10 @@ SWIGINTERN PyObject *_wrap_vectorPJ_pop(PyObject *SWIGUNUSEDPARM(self), PyObject SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_pop" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - try { - result = std_vector_Sl_fastjet_PseudoJet_Sg__pop(arg1); - } catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } + try { + result = std_vector_Sl_fastjet_PseudoJet_Sg__pop(arg1); + } 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 ); return resultobj; @@ -6861,17 +6750,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_append(PyObject *SWIGUNUSEDPARM(self), PyObj SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorPJ_append" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet >::value_type const &""'"); } arg2 = reinterpret_cast< std::vector< fastjet::PseudoJet >::value_type * >(argp2); - { - try { - std_vector_Sl_fastjet_PseudoJet_Sg__append(arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + std_vector_Sl_fastjet_PseudoJet_Sg__append(arg1,(fastjet::PseudoJet const &)*arg2); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -6884,17 +6763,7 @@ SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_0(PyObject *SWIGUNUSEDPARM(self), std::vector< fastjet::PseudoJet > *result = 0 ; if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; - { - try { - result = (std::vector< fastjet::PseudoJet > *)new std::vector< fastjet::PseudoJet >(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (std::vector< fastjet::PseudoJet > *)new std::vector< fastjet::PseudoJet >(); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_std__allocatorT_fastjet__PseudoJet_t_t, SWIG_POINTER_NEW | 0 ); return resultobj; fail: @@ -6920,17 +6789,7 @@ SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_1(PyObject *SWIGUNUSEDPARM(self), } arg1 = ptr; } - { - try { - result = (std::vector< fastjet::PseudoJet > *)new std::vector< fastjet::PseudoJet >((std::vector< fastjet::PseudoJet > const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (std::vector< fastjet::PseudoJet > *)new std::vector< fastjet::PseudoJet >((std::vector< fastjet::PseudoJet > const &)*arg1); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_std__allocatorT_fastjet__PseudoJet_t_t, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; return resultobj; @@ -6955,17 +6814,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_empty(PyObject *SWIGUNUSEDPARM(self), PyObje SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_empty" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > const *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (bool)((std::vector< fastjet::PseudoJet > const *)arg1)->empty(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (bool)((std::vector< fastjet::PseudoJet > const *)arg1)->empty(); resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: @@ -6988,17 +6837,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_size(PyObject *SWIGUNUSEDPARM(self), PyObjec SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_size" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > const *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = ((std::vector< fastjet::PseudoJet > const *)arg1)->size(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = ((std::vector< fastjet::PseudoJet > const *)arg1)->size(); resultobj = SWIG_From_size_t(static_cast< size_t >(result)); return resultobj; fail: @@ -7030,17 +6869,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_swap(PyObject *SWIGUNUSEDPARM(self), PyObjec SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorPJ_swap" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet > &""'"); } arg2 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp2); - { - try { - (arg1)->swap(*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + (arg1)->swap(*arg2); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -7063,17 +6892,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_begin(PyObject *SWIGUNUSEDPARM(self), PyObje SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_begin" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (arg1)->begin(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (arg1)->begin(); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< fastjet::PseudoJet >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -7097,17 +6916,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_end(PyObject *SWIGUNUSEDPARM(self), PyObject SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_end" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (arg1)->end(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (arg1)->end(); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< fastjet::PseudoJet >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -7131,17 +6940,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObj SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_rbegin" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (arg1)->rbegin(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (arg1)->rbegin(); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< fastjet::PseudoJet >::reverse_iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -7165,17 +6964,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_rend(PyObject *SWIGUNUSEDPARM(self), PyObjec SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_rend" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (arg1)->rend(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (arg1)->rend(); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< fastjet::PseudoJet >::reverse_iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -7198,17 +6987,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_clear(PyObject *SWIGUNUSEDPARM(self), PyObje SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_clear" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - (arg1)->clear(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + (arg1)->clear(); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -7231,17 +7010,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_get_allocator(PyObject *SWIGUNUSEDPARM(self) SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_get_allocator" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > const *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = ((std::vector< fastjet::PseudoJet > const *)arg1)->get_allocator(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + 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 ); return resultobj; fail: @@ -7262,17 +7031,7 @@ SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_2(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorPJ" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet >::size_type""'"); } arg1 = static_cast< std::vector< fastjet::PseudoJet >::size_type >(val1); - { - try { - result = (std::vector< fastjet::PseudoJet > *)new std::vector< fastjet::PseudoJet >(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (std::vector< fastjet::PseudoJet > *)new std::vector< fastjet::PseudoJet >(arg1); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_std__allocatorT_fastjet__PseudoJet_t_t, SWIG_POINTER_NEW | 0 ); return resultobj; fail: @@ -7294,17 +7053,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_pop_back(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_pop_back" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - (arg1)->pop_back(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + (arg1)->pop_back(); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -7332,17 +7081,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorPJ_resize" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet >::size_type""'"); } arg2 = static_cast< std::vector< fastjet::PseudoJet >::size_type >(val2); - { - try { - (arg1)->resize(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + (arg1)->resize(arg2); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -7377,17 +7116,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""'"); } } - { - try { - result = std_vector_Sl_fastjet_PseudoJet_Sg__erase__SWIG_0(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = std_vector_Sl_fastjet_PseudoJet_Sg__erase__SWIG_0(arg1,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; @@ -7437,17 +7166,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""'"); } } - { - try { - result = std_vector_Sl_fastjet_PseudoJet_Sg__erase__SWIG_1(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = std_vector_Sl_fastjet_PseudoJet_Sg__erase__SWIG_1(arg1,arg2,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; @@ -7529,17 +7248,7 @@ SWIGINTERN PyObject *_wrap_new_vectorPJ__SWIG_3(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vectorPJ" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet >::value_type const &""'"); } arg2 = reinterpret_cast< std::vector< fastjet::PseudoJet >::value_type * >(argp2); - { - try { - result = (std::vector< fastjet::PseudoJet > *)new std::vector< fastjet::PseudoJet >(arg1,(std::vector< fastjet::PseudoJet >::value_type const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (std::vector< fastjet::PseudoJet > *)new std::vector< fastjet::PseudoJet >(arg1,(std::vector< fastjet::PseudoJet >::value_type const &)*arg2); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_fastjet__PseudoJet_std__allocatorT_fastjet__PseudoJet_t_t, SWIG_POINTER_NEW | 0 ); return resultobj; fail: @@ -7626,17 +7335,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_push_back(PyObject *SWIGUNUSEDPARM(self), Py SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorPJ_push_back" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet >::value_type const &""'"); } arg2 = reinterpret_cast< std::vector< fastjet::PseudoJet >::value_type * >(argp2); - { - try { - (arg1)->push_back((std::vector< fastjet::PseudoJet >::value_type const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + (arg1)->push_back((std::vector< fastjet::PseudoJet >::value_type const &)*arg2); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -7659,17 +7358,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_front(PyObject *SWIGUNUSEDPARM(self), PyObje SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_front" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > const *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (std::vector< fastjet::PseudoJet >::value_type *) &((std::vector< fastjet::PseudoJet > const *)arg1)->front(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (std::vector< fastjet::PseudoJet >::value_type *) &((std::vector< fastjet::PseudoJet > const *)arg1)->front(); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJet, 0 | 0 ); (void)swig::container_owner::value_type>::category>::back_reference(resultobj, swig_obj[0]); return resultobj; @@ -7693,17 +7382,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_back(PyObject *SWIGUNUSEDPARM(self), PyObjec SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_back" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > const *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = (std::vector< fastjet::PseudoJet >::value_type *) &((std::vector< fastjet::PseudoJet > const *)arg1)->back(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = (std::vector< fastjet::PseudoJet >::value_type *) &((std::vector< fastjet::PseudoJet > const *)arg1)->back(); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJet, 0 | 0 ); (void)swig::container_owner::value_type>::category>::back_reference(resultobj, swig_obj[0]); return resultobj; @@ -7744,17 +7423,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_assign(PyObject *SWIGUNUSEDPARM(self), PyObj SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorPJ_assign" "', argument " "3"" of type '" "std::vector< fastjet::PseudoJet >::value_type const &""'"); } arg3 = reinterpret_cast< std::vector< fastjet::PseudoJet >::value_type * >(argp3); - { - try { - (arg1)->assign(arg2,(std::vector< fastjet::PseudoJet >::value_type const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + (arg1)->assign(arg2,(std::vector< fastjet::PseudoJet >::value_type const &)*arg3); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -7793,17 +7462,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorPJ_resize" "', argument " "3"" of type '" "std::vector< fastjet::PseudoJet >::value_type const &""'"); } arg3 = reinterpret_cast< std::vector< fastjet::PseudoJet >::value_type * >(argp3); - { - try { - (arg1)->resize(arg2,(std::vector< fastjet::PseudoJet >::value_type const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + (arg1)->resize(arg2,(std::vector< fastjet::PseudoJet >::value_type const &)*arg3); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -7899,17 +7558,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); - { - try { - result = std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_0(arg1,arg2,(fastjet::PseudoJet const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_0(arg1,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; @@ -7963,17 +7612,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); - { - try { - std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_1(arg1,arg2,arg3,(fastjet::PseudoJet const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + std_vector_Sl_fastjet_PseudoJet_Sg__insert__SWIG_1(arg1,arg2,arg3,(fastjet::PseudoJet const &)*arg4); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -8060,17 +7699,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_reserve(PyObject *SWIGUNUSEDPARM(self), PyOb SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorPJ_reserve" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet >::size_type""'"); } arg2 = static_cast< std::vector< fastjet::PseudoJet >::size_type >(val2); - { - try { - (arg1)->reserve(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + (arg1)->reserve(arg2); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -8093,17 +7722,7 @@ SWIGINTERN PyObject *_wrap_vectorPJ_capacity(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorPJ_capacity" "', argument " "1"" of type '" "std::vector< fastjet::PseudoJet > const *""'"); } arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); - { - try { - result = ((std::vector< fastjet::PseudoJet > const *)arg1)->capacity(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); - SWIG_fail; - } - } + result = ((std::vector< fastjet::PseudoJet > const *)arg1)->capacity(); resultobj = SWIG_From_size_t(static_cast< size_t >(result)); return resultobj; fail: @@ -8127,14 +7746,12 @@ SWIGINTERN PyObject *_wrap_delete_vectorPJ(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< std::vector< fastjet::PseudoJet > * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -8269,14 +7886,12 @@ SWIGINTERN PyObject *_wrap___default_random_generator(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< int * >(argp1); { try { - result = (int)fastjet::__default_random_generator(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)fastjet::__default_random_generator(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -8352,14 +7967,12 @@ SWIGINTERN PyObject *_wrap_new_LimitedWarning__SWIG_0(PyObject *SWIGUNUSEDPARM(s if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::LimitedWarning *)new fastjet::LimitedWarning(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::LimitedWarning *)new fastjet::LimitedWarning(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__LimitedWarning, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -8383,14 +7996,12 @@ SWIGINTERN PyObject *_wrap_new_LimitedWarning__SWIG_1(PyObject *SWIGUNUSEDPARM(s arg1 = static_cast< int >(val1); { try { - result = (fastjet::LimitedWarning *)new fastjet::LimitedWarning(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::LimitedWarning *)new fastjet::LimitedWarning(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__LimitedWarning, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -8453,14 +8064,12 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_0(PyObject *SWIGUNUSEDPARM( arg2 = reinterpret_cast< char * >(buf2); { try { - (arg1)->warn((char const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->warn((char const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -8498,14 +8107,12 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_1(PyObject *SWIGUNUSEDPARM( } { try { - (arg1)->warn((std::string const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->warn((std::string const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -8547,14 +8154,12 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_2(PyObject *SWIGUNUSEDPARM( arg3 = reinterpret_cast< std::ostream * >(argp3); { try { - (arg1)->warn((char const *)arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->warn((char const *)arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -8600,14 +8205,12 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_warn__SWIG_3(PyObject *SWIGUNUSEDPARM( arg3 = reinterpret_cast< std::ostream * >(argp3); { try { - (arg1)->warn((std::string const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->warn((std::string const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -8716,14 +8319,12 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_set_default_stream(PyObject *SWIGUNUSE arg1 = reinterpret_cast< std::ostream * >(argp1); { try { - fastjet::LimitedWarning::set_default_stream(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet::LimitedWarning::set_default_stream(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -8748,14 +8349,12 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_set_default_max_warn(PyObject *SWIGUNU arg1 = static_cast< int >(val1); { try { - fastjet::LimitedWarning::set_default_max_warn(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet::LimitedWarning::set_default_max_warn(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -8781,14 +8380,12 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_max_warn(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::LimitedWarning * >(argp1); { try { - result = (int)((fastjet::LimitedWarning const *)arg1)->max_warn(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::LimitedWarning const *)arg1)->max_warn(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -8814,14 +8411,12 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_n_warn_so_far(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::LimitedWarning * >(argp1); { try { - result = (int)((fastjet::LimitedWarning const *)arg1)->n_warn_so_far(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::LimitedWarning const *)arg1)->n_warn_so_far(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -8837,14 +8432,12 @@ SWIGINTERN PyObject *_wrap_LimitedWarning_summary(PyObject *SWIGUNUSEDPARM(self) if (!SWIG_Python_UnpackTuple(args, "LimitedWarning_summary", 0, 0, 0)) SWIG_fail; { try { - result = fastjet::LimitedWarning::summary(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::LimitedWarning::summary(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -8869,14 +8462,12 @@ SWIGINTERN PyObject *_wrap_delete_LimitedWarning(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::LimitedWarning * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -8903,14 +8494,12 @@ SWIGINTERN PyObject *_wrap_new_Error__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::Error *)new fastjet::Error(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Error *)new fastjet::Error(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Error, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -8939,14 +8528,12 @@ SWIGINTERN PyObject *_wrap_new_Error__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ } { try { - result = (fastjet::Error *)new fastjet::Error((std::string const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Error *)new fastjet::Error((std::string const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Error, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -9002,14 +8589,12 @@ SWIGINTERN PyObject *_wrap_delete_Error(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::Error * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -9035,14 +8620,12 @@ SWIGINTERN PyObject *_wrap_Error_message(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::Error * >(argp1); { try { - result = ((fastjet::Error const *)arg1)->message(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Error const *)arg1)->message(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -9068,14 +8651,12 @@ SWIGINTERN PyObject *_wrap_Error_description(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< fastjet::Error * >(argp1); { try { - result = ((fastjet::Error const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Error const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -9100,14 +8681,12 @@ SWIGINTERN PyObject *_wrap_Error_set_print_errors(PyObject *SWIGUNUSEDPARM(self) arg1 = static_cast< bool >(val1); { try { - fastjet::Error::set_print_errors(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet::Error::set_print_errors(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -9132,14 +8711,12 @@ SWIGINTERN PyObject *_wrap_Error_set_print_backtrace(PyObject *SWIGUNUSEDPARM(se arg1 = static_cast< bool >(val1); { try { - fastjet::Error::set_print_backtrace(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet::Error::set_print_backtrace(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -9164,14 +8741,12 @@ SWIGINTERN PyObject *_wrap_Error_set_default_stream(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< std::ostream * >(argp1); { try { - fastjet::Error::set_default_stream(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet::Error::set_default_stream(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -9197,14 +8772,12 @@ SWIGINTERN PyObject *_wrap_Error___str__(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::Error * >(argp1); { try { - result = fastjet_Error___str__((fastjet::Error const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Error___str__((fastjet::Error const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -9246,14 +8819,12 @@ SWIGINTERN PyObject *_wrap_new_InternalError(PyObject *SWIGUNUSEDPARM(self), PyO } { try { - result = (fastjet::InternalError *)new fastjet::InternalError((std::string const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::InternalError *)new fastjet::InternalError((std::string const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__InternalError, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -9280,14 +8851,12 @@ SWIGINTERN PyObject *_wrap_delete_InternalError(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::InternalError * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -9314,14 +8883,12 @@ SWIGINTERN PyObject *_wrap_new_PseudoJetStructureBase(PyObject *SWIGUNUSEDPARM(s if (!SWIG_Python_UnpackTuple(args, "new_PseudoJetStructureBase", 0, 0, 0)) SWIG_fail; { try { - result = (fastjet::PseudoJetStructureBase *)new fastjet::PseudoJetStructureBase(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJetStructureBase *)new fastjet::PseudoJetStructureBase(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJetStructureBase, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -9346,14 +8913,12 @@ SWIGINTERN PyObject *_wrap_delete_PseudoJetStructureBase(PyObject *SWIGUNUSEDPAR arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -9379,14 +8944,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_description(PyObject *SWIGUNUS arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - result = ((fastjet::PseudoJetStructureBase const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJetStructureBase const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -9412,14 +8975,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_associated_cluster_sequenc arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_associated_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_associated_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -9445,14 +9006,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_associated_cluster_sequence(Py arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - result = (fastjet::ClusterSequence *)((fastjet::PseudoJetStructureBase const *)arg1)->associated_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)((fastjet::PseudoJetStructureBase const *)arg1)->associated_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, 0 | 0 ); return resultobj; @@ -9478,14 +9037,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_valid_cluster_sequence(PyO arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_valid_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_valid_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -9511,14 +9068,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_validated_cs(PyObject *SWIGUNU arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - result = (fastjet::ClusterSequence *)((fastjet::PseudoJetStructureBase const *)arg1)->validated_cs(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)((fastjet::PseudoJetStructureBase const *)arg1)->validated_cs(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, 0 | 0 ); return resultobj; @@ -9544,14 +9099,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_validated_csab(PyObject *SWIGU arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - result = (fastjet::ClusterSequenceAreaBase *)((fastjet::PseudoJetStructureBase const *)arg1)->validated_csab(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceAreaBase *)((fastjet::PseudoJetStructureBase const *)arg1)->validated_csab(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0 | 0 ); return resultobj; @@ -9598,14 +9151,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_partner(PyObject *SWIGUNUS arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_partner((fastjet::PseudoJet const &)*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_partner((fastjet::PseudoJet const &)*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -9652,14 +9203,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_child(PyObject *SWIGUNUSED arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_child((fastjet::PseudoJet const &)*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_child((fastjet::PseudoJet const &)*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -9717,14 +9266,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_parents(PyObject *SWIGUNUS arg4 = reinterpret_cast< fastjet::PseudoJet * >(argp4); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_parents((fastjet::PseudoJet const &)*arg2,*arg3,*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_parents((fastjet::PseudoJet const &)*arg2,*arg3,*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -9771,14 +9318,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_object_in_jet(PyObject *SWIGUN arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->object_in_jet((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->object_in_jet((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -9804,14 +9349,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_constituents(PyObject *SWI arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_constituents(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_constituents(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -9847,14 +9390,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_constituents(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::PseudoJetStructureBase const *)arg1)->constituents((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJetStructureBase const *)arg1)->constituents((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -9880,14 +9421,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_exclusive_subjets(PyObject arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_exclusive_subjets(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_exclusive_subjets(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -9933,14 +9472,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subjets(PyObject *SW arg3 = &temp3; { try { - result = ((fastjet::PseudoJetStructureBase const *)arg1)->exclusive_subjets((fastjet::PseudoJet const &)*arg2,(double const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJetStructureBase const *)arg1)->exclusive_subjets((fastjet::PseudoJet const &)*arg2,(double const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -9986,14 +9523,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_n_exclusive_subjets(PyObject * arg3 = &temp3; { try { - result = (int)((fastjet::PseudoJetStructureBase const *)arg1)->n_exclusive_subjets((fastjet::PseudoJet const &)*arg2,(double const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::PseudoJetStructureBase const *)arg1)->n_exclusive_subjets((fastjet::PseudoJet const &)*arg2,(double const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -10037,14 +9572,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subjets_up_to(PyObje arg3 = static_cast< int >(val3); { try { - result = ((fastjet::PseudoJetStructureBase const *)arg1)->exclusive_subjets_up_to((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJetStructureBase const *)arg1)->exclusive_subjets_up_to((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -10088,14 +9621,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subdmerge(PyObject * arg3 = static_cast< int >(val3); { try { - result = (double)((fastjet::PseudoJetStructureBase const *)arg1)->exclusive_subdmerge((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJetStructureBase const *)arg1)->exclusive_subdmerge((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10139,14 +9670,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_exclusive_subdmerge_max(PyObje arg3 = static_cast< int >(val3); { try { - result = (double)((fastjet::PseudoJetStructureBase const *)arg1)->exclusive_subdmerge_max((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJetStructureBase const *)arg1)->exclusive_subdmerge_max((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10182,14 +9711,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_pieces(PyObject *SWIGUNUSE arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_pieces((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_pieces((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -10225,14 +9752,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_pieces(PyObject *SWIGUNUSEDPAR arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::PseudoJetStructureBase const *)arg1)->pieces((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJetStructureBase const *)arg1)->pieces((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -10258,14 +9783,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_has_area(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< fastjet::PseudoJetStructureBase * >(argp1); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->has_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -10301,14 +9824,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area(PyObject *SWIGUNUSEDPARM( arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::PseudoJetStructureBase const *)arg1)->area((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJetStructureBase const *)arg1)->area((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10344,14 +9865,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area_error(PyObject *SWIGUNUSE arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::PseudoJetStructureBase const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJetStructureBase const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10387,14 +9906,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_area_4vector(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::PseudoJetStructureBase const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJetStructureBase const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -10430,14 +9947,12 @@ SWIGINTERN PyObject *_wrap_PseudoJetStructureBase_is_pure_ghost(PyObject *SWIGUN arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJetStructureBase const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -10506,14 +10021,12 @@ SWIGINTERN PyObject *_wrap_new_PseudoJet__SWIG_0(PyObject *SWIGUNUSEDPARM(self), if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::PseudoJet *)new fastjet::PseudoJet(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *)new fastjet::PseudoJet(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -10561,14 +10074,12 @@ SWIGINTERN PyObject *_wrap_new_PseudoJet__SWIG_1(PyObject *SWIGUNUSEDPARM(self), arg4 = static_cast< double >(val4); { try { - result = (fastjet::PseudoJet *)new fastjet::PseudoJet(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *)new fastjet::PseudoJet(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -10592,14 +10103,12 @@ SWIGINTERN PyObject *_wrap_new_PseudoJet__SWIG_2(PyObject *SWIGUNUSEDPARM(self), arg1 = static_cast< bool >(val1); { try { - result = (fastjet::PseudoJet *)new fastjet::PseudoJet(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *)new fastjet::PseudoJet(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -10684,14 +10193,12 @@ SWIGINTERN PyObject *_wrap_delete_PseudoJet(PyObject *SWIGUNUSEDPARM(self), PyOb arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -10717,14 +10224,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_E(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->E(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->E(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10750,14 +10255,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_e(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->e(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->e(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10783,14 +10286,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_px(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->px(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->px(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10816,14 +10317,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_py(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->py(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->py(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10849,14 +10348,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_pz(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->pz(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->pz(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10882,14 +10379,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_phi(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->phi(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->phi(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10915,14 +10410,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_phi_std(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->phi_std(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->phi_std(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10948,14 +10441,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_phi_02pi(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->phi_02pi(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->phi_02pi(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -10981,14 +10472,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_rap(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->rap(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->rap(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11014,14 +10503,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_rapidity(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->rapidity(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->rapidity(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11047,14 +10534,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_pseudorapidity(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->pseudorapidity(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->pseudorapidity(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11080,14 +10565,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_eta(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->eta(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->eta(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11113,14 +10596,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_pt2(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->pt2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->pt2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11146,14 +10627,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_pt(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->pt(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->pt(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11179,14 +10658,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_perp2(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->perp2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->perp2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11212,14 +10689,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_perp(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->perp(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->perp(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11245,14 +10720,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_kt2(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->kt2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->kt2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11278,14 +10751,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_m2(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->m2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->m2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11311,14 +10782,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_m(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11344,14 +10813,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_mperp2(PyObject *SWIGUNUSEDPARM(self), PyOb arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->mperp2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->mperp2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11377,14 +10844,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_mperp(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->mperp(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->mperp(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11410,14 +10875,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_mt2(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->mt2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->mt2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11443,14 +10906,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_mt(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->mt(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->mt(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11476,14 +10937,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_modp2(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->modp2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->modp2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11509,14 +10968,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_modp(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->modp(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->modp(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11542,14 +10999,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_Et(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->Et(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->Et(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11575,14 +11030,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_Et2(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->Et2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->Et2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11608,14 +11061,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_cos_theta(PyObject *SWIGUNUSEDPARM(self), P arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->cos_theta(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->cos_theta(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11641,14 +11092,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_theta(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->theta(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->theta(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11681,14 +11130,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___call__(PyObject *SWIGUNUSEDPARM(self), Py arg2 = static_cast< int >(val2); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->operator ()(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->operator ()(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11724,14 +11171,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_kt_distance(PyObject *SWIGUNUSEDPARM(self), arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->kt_distance((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->kt_distance((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11767,14 +11212,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_plain_distance(PyObject *SWIGUNUSEDPARM(sel arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->plain_distance((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->plain_distance((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11810,14 +11253,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_squared_distance(PyObject *SWIGUNUSEDPARM(s arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->squared_distance((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->squared_distance((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11853,14 +11294,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_delta_R(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->delta_R((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->delta_R((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11896,14 +11335,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_delta_phi_to(PyObject *SWIGUNUSEDPARM(self) arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->delta_phi_to((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->delta_phi_to((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11929,14 +11366,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_beam_distance(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->beam_distance(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->beam_distance(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -11962,14 +11397,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_four_mom(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = ((fastjet::PseudoJet const *)arg1)->four_mom(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJet const *)arg1)->four_mom(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); 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 ); return resultobj; @@ -12005,14 +11438,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_boost(PyObject *SWIGUNUSEDPARM(self), PyObj arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (fastjet::PseudoJet *) &(arg1)->boost((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &(arg1)->boost((fastjet::PseudoJet const &)*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; @@ -12048,14 +11479,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_unboost(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (fastjet::PseudoJet *) &(arg1)->unboost((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &(arg1)->unboost((fastjet::PseudoJet const &)*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; @@ -12088,14 +11517,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___imul__(PyObject *SWIGUNUSEDPARM(self), Py arg2 = static_cast< double >(val2); { try { - result = (fastjet::PseudoJet *) &(arg1)->operator *=(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &(arg1)->operator *=(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, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -12128,14 +11555,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___itruediv__(PyObject *SWIGUNUSEDPARM(self) arg2 = static_cast< double >(val2); { try { - result = (fastjet::PseudoJet *) &(arg1)->operator /=(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &(arg1)->operator /=(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, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -12171,14 +11596,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___iadd__(PyObject *SWIGUNUSEDPARM(self), Py arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (fastjet::PseudoJet *) &(arg1)->operator +=((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &(arg1)->operator +=((fastjet::PseudoJet const &)*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, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -12214,14 +11637,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___isub__(PyObject *SWIGUNUSEDPARM(self), Py arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (fastjet::PseudoJet *) &(arg1)->operator -=((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &(arg1)->operator -=((fastjet::PseudoJet const &)*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, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -12276,14 +11697,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset__SWIG_0(PyObject *SWIGUNUSEDPARM(self arg5 = static_cast< double >(val5); { try { - (arg1)->reset(arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->reset(arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -12317,14 +11736,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset__SWIG_1(PyObject *SWIGUNUSEDPARM(self arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - (arg1)->reset((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->reset((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -12443,14 +11860,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_PtYPhiM__SWIG_0(PyObject *SWIGUNUSEDP arg5 = static_cast< double >(val5); { try { - (arg1)->reset_PtYPhiM(arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->reset_PtYPhiM(arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -12497,14 +11912,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_PtYPhiM__SWIG_1(PyObject *SWIGUNUSEDP arg4 = static_cast< double >(val4); { try { - (arg1)->reset_PtYPhiM(arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->reset_PtYPhiM(arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -12637,14 +12050,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum__SWIG_0(PyObject *SWIGUNUSED arg5 = static_cast< double >(val5); { try { - (arg1)->reset_momentum(arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->reset_momentum(arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -12678,14 +12089,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum__SWIG_1(PyObject *SWIGUNUSED arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - (arg1)->reset_momentum((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->reset_momentum((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -12804,14 +12213,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum_PtYPhiM__SWIG_0(PyObject *SW arg5 = static_cast< double >(val5); { try { - (arg1)->reset_momentum_PtYPhiM(arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->reset_momentum_PtYPhiM(arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -12858,14 +12265,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_reset_momentum_PtYPhiM__SWIG_1(PyObject *SW arg4 = static_cast< double >(val4); { try { - (arg1)->reset_momentum_PtYPhiM(arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->reset_momentum_PtYPhiM(arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -12983,14 +12388,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_set_cached_rap_phi(PyObject *SWIGUNUSEDPARM arg3 = static_cast< double >(val3); { try { - (arg1)->set_cached_rap_phi(arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_cached_rap_phi(arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -13016,14 +12419,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_user_index(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (int)((fastjet::PseudoJet const *)arg1)->user_index(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::PseudoJet const *)arg1)->user_index(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -13055,14 +12456,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_set_user_index(PyObject *SWIGUNUSEDPARM(sel arg2 = static_cast< int >(val2); { try { - (arg1)->set_user_index(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_user_index(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -13094,14 +12493,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_set_user_info(PyObject *SWIGUNUSEDPARM(self arg2 = reinterpret_cast< fastjet::PseudoJet::UserInfoBase * >(argp2); { try { - (arg1)->set_user_info(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_user_info(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -13127,14 +12524,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_user_info(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_user_info(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_user_info(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -13160,14 +12555,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_user_info_ptr(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::PseudoJet::UserInfoBase *)((fastjet::PseudoJet const *)arg1)->user_info_ptr(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet::UserInfoBase *)((fastjet::PseudoJet const *)arg1)->user_info_ptr(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJet__UserInfoBase, 0 | 0 ); return resultobj; @@ -13191,14 +12584,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_user_info_shared_ptr__SWIG_0(PyObject *SWIG arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > *) &((fastjet::PseudoJet const *)arg1)->user_info_shared_ptr(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > *) &((fastjet::PseudoJet const *)arg1)->user_info_shared_ptr(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t, 0 | 0 ); return resultobj; @@ -13222,14 +12613,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_user_info_shared_ptr__SWIG_1(PyObject *SWIG arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > *) &(arg1)->user_info_shared_ptr(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > *) &(arg1)->user_info_shared_ptr(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t, 0 | 0 ); return resultobj; @@ -13291,14 +12680,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_description(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = ((fastjet::PseudoJet const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJet const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -13324,14 +12711,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_associated_cluster_sequence(PyObject *S arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_associated_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_associated_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -13357,14 +12742,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_associated_cs(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_associated_cs(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + 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; @@ -13390,14 +12773,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_valid_cluster_sequence(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_valid_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_valid_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -13423,14 +12804,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_valid_cs(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_valid_cs(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_valid_cs(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -13456,14 +12835,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_associated_cluster_sequence(PyObject *SWIGU arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::ClusterSequence *)((fastjet::PseudoJet const *)arg1)->associated_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)((fastjet::PseudoJet const *)arg1)->associated_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, 0 | 0 ); return resultobj; @@ -13489,14 +12866,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_associated_cs(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::ClusterSequence *)((fastjet::PseudoJet const *)arg1)->associated_cs(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)((fastjet::PseudoJet const *)arg1)->associated_cs(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, 0 | 0 ); return resultobj; @@ -13522,14 +12897,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_validated_cluster_sequence(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::ClusterSequence *)((fastjet::PseudoJet const *)arg1)->validated_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)((fastjet::PseudoJet const *)arg1)->validated_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, 0 | 0 ); return resultobj; @@ -13555,14 +12928,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_validated_cs(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::ClusterSequence *)((fastjet::PseudoJet const *)arg1)->validated_cs(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)((fastjet::PseudoJet const *)arg1)->validated_cs(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, 0 | 0 ); return resultobj; @@ -13588,14 +12959,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_validated_cluster_sequence_area_base(PyObje arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::ClusterSequenceAreaBase *)((fastjet::PseudoJet const *)arg1)->validated_cluster_sequence_area_base(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceAreaBase *)((fastjet::PseudoJet const *)arg1)->validated_cluster_sequence_area_base(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0 | 0 ); return resultobj; @@ -13621,14 +12990,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_validated_csab(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::ClusterSequenceAreaBase *)((fastjet::PseudoJet const *)arg1)->validated_csab(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceAreaBase *)((fastjet::PseudoJet const *)arg1)->validated_csab(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0 | 0 ); return resultobj; @@ -13663,14 +13030,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_set_structure_shared_ptr(PyObject *SWIGUNUS arg2 = reinterpret_cast< fastjet::SharedPtr< fastjet::PseudoJetStructureBase > * >(argp2); { try { - (arg1)->set_structure_shared_ptr((fastjet::SharedPtr< fastjet::PseudoJetStructureBase > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_structure_shared_ptr((fastjet::SharedPtr< fastjet::PseudoJetStructureBase > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -13696,14 +13061,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_structure(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_structure(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_structure(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -13729,14 +13092,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_structure_ptr(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::PseudoJetStructureBase *)((fastjet::PseudoJet const *)arg1)->structure_ptr(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJetStructureBase *)((fastjet::PseudoJet const *)arg1)->structure_ptr(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJetStructureBase, 0 | 0 ); return resultobj; @@ -13762,14 +13123,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_structure_non_const_ptr(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::PseudoJetStructureBase *)(arg1)->structure_non_const_ptr(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJetStructureBase *)(arg1)->structure_non_const_ptr(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJetStructureBase, 0 | 0 ); return resultobj; @@ -13795,14 +13154,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_validated_structure_ptr(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::PseudoJetStructureBase *)((fastjet::PseudoJet const *)arg1)->validated_structure_ptr(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJetStructureBase *)((fastjet::PseudoJet const *)arg1)->validated_structure_ptr(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PseudoJetStructureBase, 0 | 0 ); return resultobj; @@ -13828,14 +13185,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_structure_shared_ptr(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::SharedPtr< fastjet::PseudoJetStructureBase > *) &((fastjet::PseudoJet const *)arg1)->structure_shared_ptr(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::SharedPtr< fastjet::PseudoJetStructureBase > *) &((fastjet::PseudoJet const *)arg1)->structure_shared_ptr(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t, 0 | 0 ); return resultobj; @@ -13871,14 +13226,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_partner(PyObject *SWIGUNUSEDPARM(self), arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_partner(*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_partner(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -13914,14 +13267,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_child(PyObject *SWIGUNUSEDPARM(self), P arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_child(*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_child(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -13968,14 +13319,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_parents(PyObject *SWIGUNUSEDPARM(self), arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_parents(*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_parents(*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -14011,14 +13360,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_contains(PyObject *SWIGUNUSEDPARM(self), Py arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->contains((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->contains((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -14054,14 +13401,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_is_inside(PyObject *SWIGUNUSEDPARM(self), P arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->is_inside((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->is_inside((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -14087,14 +13432,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_constituents(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_constituents(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_constituents(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -14120,14 +13463,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_constituents(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = ((fastjet::PseudoJet const *)arg1)->constituents(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJet const *)arg1)->constituents(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -14153,14 +13494,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_exclusive_subjets(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_exclusive_subjets(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_exclusive_subjets(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -14192,14 +13531,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets__SWIG_0(PyObject *SWIGUNU arg2 = static_cast< double >(val2); { try { - result = ((fastjet::PseudoJet const *)arg1)->exclusive_subjets(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJet const *)arg1)->exclusive_subjets(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -14232,14 +13569,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_n_exclusive_subjets(PyObject *SWIGUNUSEDPAR arg2 = static_cast< double >(val2); { try { - result = (int)((fastjet::PseudoJet const *)arg1)->n_exclusive_subjets(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::PseudoJet const *)arg1)->n_exclusive_subjets(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -14271,14 +13606,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets__SWIG_1(PyObject *SWIGUNU arg2 = static_cast< int >(val2); { try { - result = ((fastjet::PseudoJet const *)arg1)->exclusive_subjets(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJet const *)arg1)->exclusive_subjets(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -14359,14 +13692,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subjets_up_to(PyObject *SWIGUNUSE arg2 = static_cast< int >(val2); { try { - result = ((fastjet::PseudoJet const *)arg1)->exclusive_subjets_up_to(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJet const *)arg1)->exclusive_subjets_up_to(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -14399,14 +13730,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subdmerge(PyObject *SWIGUNUSEDPAR arg2 = static_cast< int >(val2); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->exclusive_subdmerge(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->exclusive_subdmerge(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -14439,14 +13768,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_exclusive_subdmerge_max(PyObject *SWIGUNUSE arg2 = static_cast< int >(val2); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->exclusive_subdmerge_max(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->exclusive_subdmerge_max(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -14472,14 +13799,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_pieces(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_pieces(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_pieces(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -14505,14 +13830,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_pieces(PyObject *SWIGUNUSEDPARM(self), PyOb arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = ((fastjet::PseudoJet const *)arg1)->pieces(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJet const *)arg1)->pieces(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -14538,14 +13861,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_has_area(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->has_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->has_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -14571,14 +13892,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_area(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -14604,14 +13923,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_area_error(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (double)((fastjet::PseudoJet const *)arg1)->area_error(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PseudoJet const *)arg1)->area_error(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -14637,14 +13954,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_area_4vector(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = ((fastjet::PseudoJet const *)arg1)->area_4vector(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PseudoJet const *)arg1)->area_4vector(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -14670,14 +13985,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_is_pure_ghost(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (bool)((fastjet::PseudoJet const *)arg1)->is_pure_ghost(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::PseudoJet const *)arg1)->is_pure_ghost(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -14703,14 +14016,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_cluster_hist_index(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (int)((fastjet::PseudoJet const *)arg1)->cluster_hist_index(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::PseudoJet const *)arg1)->cluster_hist_index(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -14742,14 +14053,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_set_cluster_hist_index(PyObject *SWIGUNUSED arg2 = static_cast< int >(val2); { try { - (arg1)->set_cluster_hist_index(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_cluster_hist_index(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -14775,14 +14084,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_cluster_sequence_history_index(PyObject *SW arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (int)((fastjet::PseudoJet const *)arg1)->cluster_sequence_history_index(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::PseudoJet const *)arg1)->cluster_sequence_history_index(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -14814,14 +14121,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_set_cluster_sequence_history_index(PyObject arg2 = static_cast< int >(val2); { try { - (arg1)->set_cluster_sequence_history_index(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_cluster_sequence_history_index(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -14847,14 +14152,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___str__(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = fastjet_PseudoJet___str__(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_PseudoJet___str__(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -14880,14 +14183,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_set_python_info(PyObject *SWIGUNUSEDPARM(se arg2 = swig_obj[1]; { try { - fastjet_PseudoJet_set_python_info(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet_PseudoJet_set_python_info(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -14913,14 +14214,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet_python_info(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (PyObject *)fastjet_PseudoJet_python_info((fastjet::PseudoJet const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (PyObject *)fastjet_PseudoJet_python_info((fastjet::PseudoJet const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = result; return resultobj; @@ -14956,14 +14255,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___add__(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = fastjet_PseudoJet___add__(arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_PseudoJet___add__(arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15001,14 +14298,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___sub__(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = fastjet_PseudoJet___sub__(arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_PseudoJet___sub__(arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15045,14 +14340,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___eq____SWIG_0(PyObject *SWIGUNUSEDPARM(sel arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)fastjet_PseudoJet___eq____SWIG_0(arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet_PseudoJet___eq____SWIG_0(arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -15089,14 +14382,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___ne____SWIG_0(PyObject *SWIGUNUSEDPARM(sel arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)fastjet_PseudoJet___ne____SWIG_0(arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet_PseudoJet___ne____SWIG_0(arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -15131,14 +14422,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___mul__(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = static_cast< double >(val2); { try { - result = fastjet_PseudoJet___mul__(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_PseudoJet___mul__(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15173,14 +14462,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___rmul__(PyObject *SWIGUNUSEDPARM(self), Py arg2 = static_cast< double >(val2); { try { - result = fastjet_PseudoJet___rmul__(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_PseudoJet___rmul__(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15215,14 +14502,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___div__(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = static_cast< double >(val2); { try { - result = fastjet_PseudoJet___div__(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_PseudoJet___div__(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15256,14 +14541,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___eq____SWIG_1(PyObject *SWIGUNUSEDPARM(sel arg2 = static_cast< double >(val2); { try { - result = (bool)fastjet_PseudoJet___eq____SWIG_1(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet_PseudoJet___eq____SWIG_1(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -15340,14 +14623,12 @@ SWIGINTERN PyObject *_wrap_PseudoJet___ne____SWIG_1(PyObject *SWIGUNUSEDPARM(sel arg2 = static_cast< double >(val2); { try { - result = (bool)fastjet_PseudoJet___ne____SWIG_1(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet_PseudoJet___ne____SWIG_1(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -15442,14 +14723,12 @@ SWIGINTERN PyObject *_wrap___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *arg arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = fastjet::operator +((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::operator +((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15490,14 +14769,12 @@ SWIGINTERN PyObject *_wrap___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *arg arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = fastjet::operator -((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::operator -((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15534,14 +14811,12 @@ SWIGINTERN PyObject *_wrap___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ss arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = fastjet::operator *(arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::operator *(arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15578,14 +14853,12 @@ SWIGINTERN PyObject *_wrap___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ss arg2 = static_cast< double >(val2); { try { - result = fastjet::operator *((fastjet::PseudoJet const &)*arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::operator *((fastjet::PseudoJet const &)*arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15623,14 +14896,12 @@ SWIGINTERN PyObject *_wrap___truediv__(PyObject *SWIGUNUSEDPARM(self), PyObject arg2 = static_cast< double >(val2); { try { - result = fastjet::operator /((fastjet::PseudoJet const &)*arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::operator /((fastjet::PseudoJet const &)*arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -15670,14 +14941,12 @@ SWIGINTERN PyObject *_wrap___eq____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssi arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)fastjet::operator ==((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet::operator ==((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -15717,14 +14986,12 @@ SWIGINTERN PyObject *_wrap___ne____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssi arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)fastjet::operator !=((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet::operator !=((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -15761,14 +15028,12 @@ SWIGINTERN PyObject *_wrap___eq____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssi arg2 = static_cast< double >(val2); { try { - result = (bool)fastjet::operator ==((fastjet::PseudoJet const &)*arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet::operator ==((fastjet::PseudoJet const &)*arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -15805,14 +15070,12 @@ SWIGINTERN PyObject *_wrap___eq____SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssi arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)fastjet::operator ==(arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet::operator ==(arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -15904,14 +15167,12 @@ SWIGINTERN PyObject *_wrap___ne____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssi arg2 = static_cast< double >(val2); { try { - result = (bool)fastjet::operator !=((fastjet::PseudoJet const &)*arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet::operator !=((fastjet::PseudoJet const &)*arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -15948,14 +15209,12 @@ SWIGINTERN PyObject *_wrap___ne____SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssi arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)fastjet::operator !=(arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet::operator !=(arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -16051,14 +15310,12 @@ SWIGINTERN PyObject *_wrap_dot_product(PyObject *SWIGUNUSEDPARM(self), PyObject arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)fastjet::dot_product((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)fastjet::dot_product((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -16097,14 +15354,12 @@ SWIGINTERN PyObject *_wrap_cos_theta(PyObject *SWIGUNUSEDPARM(self), PyObject *a arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)fastjet::cos_theta((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)fastjet::cos_theta((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -16143,14 +15398,12 @@ SWIGINTERN PyObject *_wrap_theta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)fastjet::theta((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)fastjet::theta((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -16189,14 +15442,12 @@ SWIGINTERN PyObject *_wrap_have_same_momentum(PyObject *SWIGUNUSEDPARM(self), Py arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)fastjet::have_same_momentum((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)fastjet::have_same_momentum((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -16244,14 +15495,12 @@ SWIGINTERN PyObject *_wrap_PtYPhiM__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ss arg4 = static_cast< double >(val4); { try { - result = fastjet::PtYPhiM(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::PtYPhiM(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -16291,14 +15540,12 @@ SWIGINTERN PyObject *_wrap_PtYPhiM__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ss arg3 = static_cast< double >(val3); { try { - result = fastjet::PtYPhiM(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::PtYPhiM(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -16397,14 +15644,12 @@ SWIGINTERN PyObject *_wrap_sorted_by_pt(PyObject *SWIGUNUSEDPARM(self), PyObject } { try { - result = fastjet::sorted_by_pt((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::sorted_by_pt((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); if (SWIG_IsNewObj(res1)) delete arg1; @@ -16437,14 +15682,12 @@ SWIGINTERN PyObject *_wrap_sorted_by_rapidity(PyObject *SWIGUNUSEDPARM(self), Py } { try { - result = fastjet::sorted_by_rapidity((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::sorted_by_rapidity((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); if (SWIG_IsNewObj(res1)) delete arg1; @@ -16477,14 +15720,12 @@ SWIGINTERN PyObject *_wrap_sorted_by_E(PyObject *SWIGUNUSEDPARM(self), PyObject } { try { - result = fastjet::sorted_by_E((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::sorted_by_E((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); if (SWIG_IsNewObj(res1)) delete arg1; @@ -16517,14 +15758,12 @@ SWIGINTERN PyObject *_wrap_sorted_by_pz(PyObject *SWIGUNUSEDPARM(self), PyObject } { try { - result = fastjet::sorted_by_pz((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::sorted_by_pz((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); if (SWIG_IsNewObj(res1)) delete arg1; @@ -16564,14 +15803,12 @@ SWIGINTERN PyObject *_wrap_sort_indices(PyObject *SWIGUNUSEDPARM(self), PyObject arg2 = reinterpret_cast< std::vector< double,std::allocator< double > > * >(argp2); { try { - fastjet::sort_indices(*arg1,(std::vector< double,std::allocator< double > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet::sort_indices(*arg1,(std::vector< double,std::allocator< double > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -16597,14 +15834,12 @@ SWIGINTERN PyObject *_wrap_new_IndexedSortHelper(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< std::vector< double,std::allocator< double > > * >(argp1); { try { - result = (fastjet::IndexedSortHelper *)new fastjet::IndexedSortHelper((std::vector< double,std::allocator< double > > const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::IndexedSortHelper *)new fastjet::IndexedSortHelper((std::vector< double,std::allocator< double > > const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__IndexedSortHelper, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -16645,14 +15880,12 @@ SWIGINTERN PyObject *_wrap_IndexedSortHelper___call__(PyObject *SWIGUNUSEDPARM(s arg3 = static_cast< int >(val3); { try { - result = (int)((fastjet::IndexedSortHelper const *)arg1)->operator ()(arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::IndexedSortHelper const *)arg1)->operator ()(arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -16677,14 +15910,12 @@ SWIGINTERN PyObject *_wrap_delete_IndexedSortHelper(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::IndexedSortHelper * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -16724,14 +15955,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize } { try { - result = fastjet::join((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -16760,14 +15989,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = fastjet::join((fastjet::PseudoJet const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((fastjet::PseudoJet const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -16805,14 +16032,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -16861,14 +16086,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -16928,14 +16151,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py_ssize arg4 = reinterpret_cast< fastjet::PseudoJet * >(argp4); { try { - result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,(fastjet::PseudoJet const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,(fastjet::PseudoJet const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -16951,14 +16172,12 @@ SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_0(PyObject *SWIGUNUSEDPARM( if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RangeDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -16982,14 +16201,12 @@ SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_1(PyObject *SWIGUNUSEDPARM( arg1 = static_cast< double >(val1); { try { - result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RangeDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -17014,14 +16231,12 @@ SWIGINTERN PyObject *_wrap_delete_RangeDefinition(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::RangeDefinition * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -17069,14 +16284,12 @@ SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_2(PyObject *SWIGUNUSEDPARM( arg4 = static_cast< double >(val4); { try { - result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RangeDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -17116,14 +16329,12 @@ SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_3(PyObject *SWIGUNUSEDPARM( arg3 = static_cast< double >(val3); { try { - result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RangeDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -17155,14 +16366,12 @@ SWIGINTERN PyObject *_wrap_new_RangeDefinition__SWIG_4(PyObject *SWIGUNUSEDPARM( arg2 = static_cast< double >(val2); { try { - result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RangeDefinition *)new fastjet::RangeDefinition(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RangeDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -17288,14 +16497,12 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_is_localizable(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::RangeDefinition * >(argp1); { try { - result = (bool)((fastjet::RangeDefinition const *)arg1)->is_localizable(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::RangeDefinition const *)arg1)->is_localizable(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -17338,14 +16545,12 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_set_position__SWIG_0(PyObject *SWIGUN arg3 = &temp3; { try { - (arg1)->set_position((double const &)*arg2,(double const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_position((double const &)*arg2,(double const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -17379,14 +16584,12 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_set_position__SWIG_1(PyObject *SWIGUN arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - (arg1)->set_position((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_position((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -17473,14 +16676,12 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_is_in_range__SWIG_0(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::RangeDefinition const *)arg1)->is_in_range((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::RangeDefinition const *)arg1)->is_in_range((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -17520,14 +16721,12 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_is_in_range__SWIG_1(PyObject *SWIGUNU arg3 = static_cast< double >(val3); { try { - result = (bool)((fastjet::RangeDefinition const *)arg1)->is_in_range(arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::RangeDefinition const *)arg1)->is_in_range(arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -17625,14 +16824,12 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_get_rap_limits(PyObject *SWIGUNUSEDPA arg3 = reinterpret_cast< double * >(argp3); { try { - ((fastjet::RangeDefinition const *)arg1)->get_rap_limits(*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::RangeDefinition const *)arg1)->get_rap_limits(*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -17658,14 +16855,12 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_area(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::RangeDefinition * >(argp1); { try { - result = (double)((fastjet::RangeDefinition const *)arg1)->area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::RangeDefinition const *)arg1)->area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -17691,14 +16886,12 @@ SWIGINTERN PyObject *_wrap_RangeDefinition_description(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::RangeDefinition * >(argp1); { try { - result = ((fastjet::RangeDefinition const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::RangeDefinition const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -17734,14 +16927,12 @@ SWIGINTERN PyObject *_wrap_delete_SelectorWorker(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -17777,14 +16968,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker__pass(PyObject *SWIGUNUSEDPARM(self), arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::SelectorWorker const *)arg1)->pass((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::SelectorWorker const *)arg1)->pass((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -17819,14 +17008,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_terminator(PyObject *SWIGUNUSEDPARM(se arg2 = reinterpret_cast< std::vector< fastjet::PseudoJet const *,std::allocator< fastjet::PseudoJet const * > > * >(argp2); { try { - ((fastjet::SelectorWorker const *)arg1)->terminator(*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::SelectorWorker const *)arg1)->terminator(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -17852,14 +17039,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_applies_jet_by_jet(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - result = (bool)((fastjet::SelectorWorker const *)arg1)->applies_jet_by_jet(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::SelectorWorker const *)arg1)->applies_jet_by_jet(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -17885,14 +17070,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_description(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - result = ((fastjet::SelectorWorker const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::SelectorWorker const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -17918,14 +17101,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_takes_reference(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - result = (bool)((fastjet::SelectorWorker const *)arg1)->takes_reference(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::SelectorWorker const *)arg1)->takes_reference(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -17960,14 +17141,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_set_reference(PyObject *SWIGUNUSEDPARM arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - (arg1)->set_reference((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_reference((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -17993,14 +17172,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_copy(PyObject *SWIGUNUSEDPARM(self), P arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - result = (fastjet::SelectorWorker *)(arg1)->copy(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::SelectorWorker *)(arg1)->copy(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__SelectorWorker, 0 | 0 ); return resultobj; @@ -18046,14 +17223,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_get_rapidity_extent(PyObject *SWIGUNUS arg3 = reinterpret_cast< double * >(argp3); { try { - ((fastjet::SelectorWorker const *)arg1)->get_rapidity_extent(*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::SelectorWorker const *)arg1)->get_rapidity_extent(*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -18079,14 +17254,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_is_geometric(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - result = (bool)((fastjet::SelectorWorker const *)arg1)->is_geometric(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::SelectorWorker const *)arg1)->is_geometric(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -18112,14 +17285,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_has_finite_area(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - result = (bool)((fastjet::SelectorWorker const *)arg1)->has_finite_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::SelectorWorker const *)arg1)->has_finite_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -18145,14 +17316,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_has_known_area(PyObject *SWIGUNUSEDPAR arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - result = (bool)((fastjet::SelectorWorker const *)arg1)->has_known_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::SelectorWorker const *)arg1)->has_known_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -18178,14 +17347,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorker_known_area(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - result = (double)((fastjet::SelectorWorker const *)arg1)->known_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::SelectorWorker const *)arg1)->known_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -18208,14 +17375,12 @@ SWIGINTERN PyObject *_wrap_new_Selector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::Selector *)new fastjet::Selector(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Selector *)new fastjet::Selector(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -18239,14 +17404,12 @@ SWIGINTERN PyObject *_wrap_new_Selector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::SelectorWorker * >(argp1); { try { - result = (fastjet::Selector *)new fastjet::Selector(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Selector *)new fastjet::Selector(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -18273,14 +17436,12 @@ SWIGINTERN PyObject *_wrap_new_Selector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::RangeDefinition * >(argp1); { try { - result = (fastjet::Selector *)new fastjet::Selector((fastjet::RangeDefinition const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Selector *)new fastjet::Selector((fastjet::RangeDefinition const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -18344,14 +17505,12 @@ SWIGINTERN PyObject *_wrap_delete_Selector(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -18387,14 +17546,12 @@ SWIGINTERN PyObject *_wrap_Selector__pass(PyObject *SWIGUNUSEDPARM(self), PyObje arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::Selector const *)arg1)->pass((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Selector const *)arg1)->pass((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -18429,14 +17586,12 @@ SWIGINTERN PyObject *_wrap_Selector___call____SWIG_0(PyObject *SWIGUNUSEDPARM(se arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::Selector const *)arg1)->operator ()((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Selector const *)arg1)->operator ()((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -18474,14 +17629,12 @@ SWIGINTERN PyObject *_wrap_Selector_count(PyObject *SWIGUNUSEDPARM(self), PyObje } { try { - result = (unsigned int)((fastjet::Selector const *)arg1)->count((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (unsigned int)((fastjet::Selector const *)arg1)->count((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); if (SWIG_IsNewObj(res2)) delete arg2; @@ -18521,14 +17674,12 @@ SWIGINTERN PyObject *_wrap_Selector_sum(PyObject *SWIGUNUSEDPARM(self), PyObject } { try { - result = ((fastjet::Selector const *)arg1)->sum((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Selector const *)arg1)->sum((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); if (SWIG_IsNewObj(res2)) delete arg2; @@ -18568,14 +17719,12 @@ SWIGINTERN PyObject *_wrap_Selector_scalar_pt_sum(PyObject *SWIGUNUSEDPARM(self) } { try { - result = (double)((fastjet::Selector const *)arg1)->scalar_pt_sum((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::Selector const *)arg1)->scalar_pt_sum((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); if (SWIG_IsNewObj(res2)) delete arg2; @@ -18636,14 +17785,12 @@ SWIGINTERN PyObject *_wrap_Selector_sift(PyObject *SWIGUNUSEDPARM(self), PyObjec arg4 = reinterpret_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > * >(argp4); { try { - ((fastjet::Selector const *)arg1)->sift((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,*arg3,*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::Selector const *)arg1)->sift((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,*arg3,*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -18671,14 +17818,12 @@ SWIGINTERN PyObject *_wrap_Selector_applies_jet_by_jet(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = (bool)((fastjet::Selector const *)arg1)->applies_jet_by_jet(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Selector const *)arg1)->applies_jet_by_jet(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -18715,14 +17860,12 @@ SWIGINTERN PyObject *_wrap_Selector___call____SWIG_1(PyObject *SWIGUNUSEDPARM(se } { try { - result = ((fastjet::Selector const *)arg1)->operator ()((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Selector const *)arg1)->operator ()((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); if (SWIG_IsNewObj(res2)) delete arg2; @@ -18803,14 +17946,12 @@ SWIGINTERN PyObject *_wrap_Selector_nullify_non_selected(PyObject *SWIGUNUSEDPAR arg2 = reinterpret_cast< std::vector< fastjet::PseudoJet const *,std::allocator< fastjet::PseudoJet const * > > * >(argp2); { try { - ((fastjet::Selector const *)arg1)->nullify_non_selected(*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::Selector const *)arg1)->nullify_non_selected(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -18856,14 +17997,12 @@ SWIGINTERN PyObject *_wrap_Selector_get_rapidity_extent(PyObject *SWIGUNUSEDPARM arg3 = reinterpret_cast< double * >(argp3); { try { - ((fastjet::Selector const *)arg1)->get_rapidity_extent(*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::Selector const *)arg1)->get_rapidity_extent(*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -18889,14 +18028,12 @@ SWIGINTERN PyObject *_wrap_Selector_description(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = ((fastjet::Selector const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Selector const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -18922,14 +18059,12 @@ SWIGINTERN PyObject *_wrap_Selector_is_geometric(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = (bool)((fastjet::Selector const *)arg1)->is_geometric(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Selector const *)arg1)->is_geometric(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -18955,14 +18090,12 @@ SWIGINTERN PyObject *_wrap_Selector_has_finite_area(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = (bool)((fastjet::Selector const *)arg1)->has_finite_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Selector const *)arg1)->has_finite_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -18986,14 +18119,12 @@ SWIGINTERN PyObject *_wrap_Selector_area__SWIG_0(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = (double)((fastjet::Selector const *)arg1)->area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::Selector const *)arg1)->area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -19025,14 +18156,12 @@ SWIGINTERN PyObject *_wrap_Selector_area__SWIG_1(PyObject *SWIGUNUSEDPARM(self), arg2 = static_cast< double >(val2); { try { - result = (double)((fastjet::Selector const *)arg1)->area(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::Selector const *)arg1)->area(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -19100,14 +18229,12 @@ SWIGINTERN PyObject *_wrap_Selector_worker(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = (fastjet::SharedPtr< fastjet::SelectorWorker > *) &((fastjet::Selector const *)arg1)->worker(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::SharedPtr< fastjet::SelectorWorker > *) &((fastjet::Selector const *)arg1)->worker(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__SharedPtrT_fastjet__SelectorWorker_t, 0 | 0 ); return resultobj; @@ -19133,14 +18260,12 @@ SWIGINTERN PyObject *_wrap_Selector_validated_worker(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = (fastjet::SelectorWorker *)((fastjet::Selector const *)arg1)->validated_worker(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::SelectorWorker *)((fastjet::Selector const *)arg1)->validated_worker(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__SelectorWorker, 0 | 0 ); return resultobj; @@ -19166,14 +18291,12 @@ SWIGINTERN PyObject *_wrap_Selector_takes_reference(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = (bool)((fastjet::Selector const *)arg1)->takes_reference(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Selector const *)arg1)->takes_reference(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -19209,14 +18332,12 @@ SWIGINTERN PyObject *_wrap_Selector_set_reference(PyObject *SWIGUNUSEDPARM(self) arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (fastjet::Selector *) &(arg1)->set_reference((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Selector *) &(arg1)->set_reference((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Selector, 0 | 0 ); return resultobj; @@ -19252,14 +18373,12 @@ SWIGINTERN PyObject *_wrap_Selector___iand__(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (fastjet::Selector *) &(arg1)->operator &=((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Selector *) &(arg1)->operator &=((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19295,14 +18414,12 @@ SWIGINTERN PyObject *_wrap_Selector___ior__(PyObject *SWIGUNUSEDPARM(self), PyOb arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (fastjet::Selector *) &(arg1)->operator |=((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Selector *) &(arg1)->operator |=((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19326,14 +18443,12 @@ SWIGINTERN PyObject *_wrap_Selector___str____SWIG_0(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = fastjet_Selector___str____SWIG_0((fastjet::Selector const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Selector___str____SWIG_0((fastjet::Selector const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -19357,14 +18472,12 @@ SWIGINTERN PyObject *_wrap_Selector___str____SWIG_1(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = fastjet_Selector___str____SWIG_1(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Selector___str____SWIG_1(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -19436,14 +18549,12 @@ SWIGINTERN PyObject *_wrap_Selector___mul__(PyObject *SWIGUNUSEDPARM(self), PyOb arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = fastjet_Selector___mul__(arg1,(fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Selector___mul__(arg1,(fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19481,14 +18592,12 @@ SWIGINTERN PyObject *_wrap_Selector___and__(PyObject *SWIGUNUSEDPARM(self), PyOb arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = fastjet_Selector___and__(arg1,(fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Selector___and__(arg1,(fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19526,14 +18635,12 @@ SWIGINTERN PyObject *_wrap_Selector___or__(PyObject *SWIGUNUSEDPARM(self), PyObj arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = fastjet_Selector___or__(arg1,(fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Selector___or__(arg1,(fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19561,14 +18668,12 @@ SWIGINTERN PyObject *_wrap_Selector___invert__(PyObject *SWIGUNUSEDPARM(self), P arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = fastjet_Selector___invert__(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Selector___invert__(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19595,14 +18700,12 @@ SWIGINTERN PyObject *_wrap_SelectorIdentity(PyObject *SWIGUNUSEDPARM(self), PyOb if (!SWIG_Python_UnpackTuple(args, "SelectorIdentity", 0, 0, 0)) SWIG_fail; { try { - result = fastjet::SelectorIdentity(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorIdentity(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19640,14 +18743,12 @@ SWIGINTERN PyObject *_wrap___mul____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ss arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = fastjet::operator *((fastjet::Selector const &)*arg1,(fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::operator *((fastjet::Selector const &)*arg1,(fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19730,14 +18831,12 @@ SWIGINTERN PyObject *_wrap_SelectorPtMin(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorPtMin(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorPtMin(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19763,14 +18862,12 @@ SWIGINTERN PyObject *_wrap_SelectorPtMax(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorPtMax(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorPtMax(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19803,14 +18900,12 @@ SWIGINTERN PyObject *_wrap_SelectorPtRange(PyObject *SWIGUNUSEDPARM(self), PyObj arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorPtRange(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorPtRange(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19836,14 +18931,12 @@ SWIGINTERN PyObject *_wrap_SelectorEtMin(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorEtMin(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorEtMin(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19869,14 +18962,12 @@ SWIGINTERN PyObject *_wrap_SelectorEtMax(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorEtMax(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorEtMax(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19909,14 +19000,12 @@ SWIGINTERN PyObject *_wrap_SelectorEtRange(PyObject *SWIGUNUSEDPARM(self), PyObj arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorEtRange(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorEtRange(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19942,14 +19031,12 @@ SWIGINTERN PyObject *_wrap_SelectorEMin(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorEMin(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorEMin(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -19975,14 +19062,12 @@ SWIGINTERN PyObject *_wrap_SelectorEMax(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorEMax(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorEMax(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20015,14 +19100,12 @@ SWIGINTERN PyObject *_wrap_SelectorERange(PyObject *SWIGUNUSEDPARM(self), PyObje arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorERange(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorERange(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20048,14 +19131,12 @@ SWIGINTERN PyObject *_wrap_SelectorMassMin(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorMassMin(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorMassMin(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20081,14 +19162,12 @@ SWIGINTERN PyObject *_wrap_SelectorMassMax(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorMassMax(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorMassMax(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20121,14 +19200,12 @@ SWIGINTERN PyObject *_wrap_SelectorMassRange(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorMassRange(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorMassRange(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20154,14 +19231,12 @@ SWIGINTERN PyObject *_wrap_SelectorRapMin(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorRapMin(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorRapMin(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20187,14 +19262,12 @@ SWIGINTERN PyObject *_wrap_SelectorRapMax(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorRapMax(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorRapMax(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20227,14 +19300,12 @@ SWIGINTERN PyObject *_wrap_SelectorRapRange(PyObject *SWIGUNUSEDPARM(self), PyOb arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorRapRange(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorRapRange(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20260,14 +19331,12 @@ SWIGINTERN PyObject *_wrap_SelectorAbsRapMin(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorAbsRapMin(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorAbsRapMin(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20293,14 +19362,12 @@ SWIGINTERN PyObject *_wrap_SelectorAbsRapMax(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorAbsRapMax(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorAbsRapMax(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20333,14 +19400,12 @@ SWIGINTERN PyObject *_wrap_SelectorAbsRapRange(PyObject *SWIGUNUSEDPARM(self), P arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorAbsRapRange(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorAbsRapRange(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20366,14 +19431,12 @@ SWIGINTERN PyObject *_wrap_SelectorEtaMin(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorEtaMin(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorEtaMin(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20399,14 +19462,12 @@ SWIGINTERN PyObject *_wrap_SelectorEtaMax(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorEtaMax(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorEtaMax(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20439,14 +19500,12 @@ SWIGINTERN PyObject *_wrap_SelectorEtaRange(PyObject *SWIGUNUSEDPARM(self), PyOb arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorEtaRange(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorEtaRange(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20472,14 +19531,12 @@ SWIGINTERN PyObject *_wrap_SelectorAbsEtaMin(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorAbsEtaMin(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorAbsEtaMin(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20505,14 +19562,12 @@ SWIGINTERN PyObject *_wrap_SelectorAbsEtaMax(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorAbsEtaMax(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorAbsEtaMax(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20545,14 +19600,12 @@ SWIGINTERN PyObject *_wrap_SelectorAbsEtaRange(PyObject *SWIGUNUSEDPARM(self), P arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorAbsEtaRange(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorAbsEtaRange(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20585,14 +19638,12 @@ SWIGINTERN PyObject *_wrap_SelectorPhiRange(PyObject *SWIGUNUSEDPARM(self), PyOb arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorPhiRange(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorPhiRange(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20641,14 +19692,12 @@ SWIGINTERN PyObject *_wrap_SelectorRapPhiRange(PyObject *SWIGUNUSEDPARM(self), P arg4 = static_cast< double >(val4); { try { - result = fastjet::SelectorRapPhiRange(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorRapPhiRange(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20674,14 +19723,12 @@ SWIGINTERN PyObject *_wrap_SelectorNHardest(PyObject *SWIGUNUSEDPARM(self), PyOb arg1 = static_cast< unsigned int >(val1); { try { - result = fastjet::SelectorNHardest(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorNHardest(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20707,14 +19754,12 @@ SWIGINTERN PyObject *_wrap_SelectorCircle(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorCircle(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorCircle(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20747,14 +19792,12 @@ SWIGINTERN PyObject *_wrap_SelectorDoughnut(PyObject *SWIGUNUSEDPARM(self), PyOb arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorDoughnut(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorDoughnut(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20780,14 +19823,12 @@ SWIGINTERN PyObject *_wrap_SelectorStrip(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorStrip(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorStrip(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20820,14 +19861,12 @@ SWIGINTERN PyObject *_wrap_SelectorRectangle(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = static_cast< double >(val2); { try { - result = fastjet::SelectorRectangle(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorRectangle(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20853,14 +19892,12 @@ SWIGINTERN PyObject *_wrap_SelectorPtFractionMin(PyObject *SWIGUNUSEDPARM(self), arg1 = static_cast< double >(val1); { try { - result = fastjet::SelectorPtFractionMin(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorPtFractionMin(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20876,14 +19913,12 @@ SWIGINTERN PyObject *_wrap_SelectorIsZero(PyObject *SWIGUNUSEDPARM(self), PyObje if (!SWIG_Python_UnpackTuple(args, "SelectorIsZero", 0, 0, 0)) SWIG_fail; { try { - result = fastjet::SelectorIsZero(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorIsZero(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20899,14 +19934,12 @@ SWIGINTERN PyObject *_wrap_SelectorIsPureGhost(PyObject *SWIGUNUSEDPARM(self), P if (!SWIG_Python_UnpackTuple(args, "SelectorIsPureGhost", 0, 0, 0)) SWIG_fail; { try { - result = fastjet::SelectorIsPureGhost(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorIsPureGhost(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -20922,14 +19955,12 @@ SWIGINTERN PyObject *_wrap_fastjet_version_string(PyObject *SWIGUNUSEDPARM(self) if (!SWIG_Python_UnpackTuple(args, "fastjet_version_string", 0, 0, 0)) SWIG_fail; { try { - result = fastjet::fastjet_version_string(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::fastjet_version_string(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -21005,14 +20036,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_0(PyObject *SWIGUNUSEDPARM(se arg4 = static_cast< fastjet::Strategy >(val4); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21052,14 +20081,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_1(PyObject *SWIGUNUSEDPARM(se arg3 = static_cast< fastjet::RecombinationScheme >(val3); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21091,14 +20118,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_2(PyObject *SWIGUNUSEDPARM(se arg2 = static_cast< double >(val2); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21138,14 +20163,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_3(PyObject *SWIGUNUSEDPARM(se arg3 = static_cast< fastjet::Strategy >(val3); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21177,14 +20200,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_4(PyObject *SWIGUNUSEDPARM(se arg2 = static_cast< fastjet::RecombinationScheme >(val2); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21208,14 +20229,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_5(PyObject *SWIGUNUSEDPARM(se arg1 = static_cast< fastjet::JetAlgorithm >(val1); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21271,14 +20290,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_6(PyObject *SWIGUNUSEDPARM(se arg5 = static_cast< fastjet::Strategy >(val5); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21326,14 +20343,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_7(PyObject *SWIGUNUSEDPARM(se arg4 = static_cast< fastjet::RecombinationScheme >(val4); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21373,14 +20388,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_8(PyObject *SWIGUNUSEDPARM(se arg3 = static_cast< double >(val3); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21428,14 +20441,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_9(PyObject *SWIGUNUSEDPARM(se arg4 = static_cast< fastjet::Strategy >(val4); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,(fastjet::JetDefinition::Recombiner const *)arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,(fastjet::JetDefinition::Recombiner const *)arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21475,14 +20486,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_10(PyObject *SWIGUNUSEDPARM(s arg3 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp3); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,(fastjet::JetDefinition::Recombiner const *)arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,(fastjet::JetDefinition::Recombiner const *)arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21522,14 +20531,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_11(PyObject *SWIGUNUSEDPARM(s arg3 = static_cast< fastjet::Strategy >(val3); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,(fastjet::JetDefinition::Recombiner const *)arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,(fastjet::JetDefinition::Recombiner const *)arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21561,14 +20568,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_12(PyObject *SWIGUNUSEDPARM(s arg2 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp2); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,(fastjet::JetDefinition::Recombiner const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,(fastjet::JetDefinition::Recombiner const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21624,14 +20629,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_13(PyObject *SWIGUNUSEDPARM(s arg5 = static_cast< fastjet::Strategy >(val5); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,(fastjet::JetDefinition::Recombiner const *)arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,(fastjet::JetDefinition::Recombiner const *)arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21679,14 +20682,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_14(PyObject *SWIGUNUSEDPARM(s arg4 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp4); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,(fastjet::JetDefinition::Recombiner const *)arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,(fastjet::JetDefinition::Recombiner const *)arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21702,14 +20703,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_15(PyObject *SWIGUNUSEDPARM(s if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21733,14 +20732,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_16(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::JetDefinition::Plugin * >(argp1); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition((fastjet::JetDefinition::Plugin const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition((fastjet::JetDefinition::Plugin const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21796,14 +20793,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_17(PyObject *SWIGUNUSEDPARM(s arg5 = static_cast< int >(val5); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21859,14 +20854,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_18(PyObject *SWIGUNUSEDPARM(s arg5 = static_cast< int >(val5); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21914,14 +20907,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_19(PyObject *SWIGUNUSEDPARM(s arg4 = static_cast< fastjet::RecombinationScheme >(val4); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -21961,14 +20952,12 @@ SWIGINTERN PyObject *_wrap_new_JetDefinition__SWIG_20(PyObject *SWIGUNUSEDPARM(s arg3 = static_cast< fastjet::Strategy >(val3); { try { - result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *)new fastjet::JetDefinition(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -22523,14 +21512,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_set_recombination_scheme(PyObject *SWIG arg2 = static_cast< fastjet::RecombinationScheme >(val2); { try { - (arg1)->set_recombination_scheme(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_recombination_scheme(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -22561,14 +21548,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_set_recombiner__SWIG_0(PyObject *SWIGUN arg2 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp2); { try { - (arg1)->set_recombiner((fastjet::JetDefinition::Recombiner const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_recombiner((fastjet::JetDefinition::Recombiner const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -22602,14 +21587,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_set_recombiner__SWIG_1(PyObject *SWIGUN arg2 = reinterpret_cast< fastjet::JetDefinition * >(argp2); { try { - (arg1)->set_recombiner((fastjet::JetDefinition const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_recombiner((fastjet::JetDefinition const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -22679,14 +21662,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_delete_recombiner_when_unused(PyObject arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - (arg1)->delete_recombiner_when_unused(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->delete_recombiner_when_unused(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -22712,14 +21693,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_plugin(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (fastjet::JetDefinition::Plugin *)((fastjet::JetDefinition const *)arg1)->plugin(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition::Plugin *)((fastjet::JetDefinition const *)arg1)->plugin(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition__Plugin, 0 | 0 ); return resultobj; @@ -22744,14 +21723,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_delete_plugin_when_unused(PyObject *SWI arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - (arg1)->delete_plugin_when_unused(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->delete_plugin_when_unused(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -22777,14 +21754,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_jet_algorithm(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (fastjet::JetAlgorithm)((fastjet::JetDefinition const *)arg1)->jet_algorithm(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetAlgorithm)((fastjet::JetDefinition const *)arg1)->jet_algorithm(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -22810,14 +21785,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_jet_finder(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (fastjet::JetAlgorithm)((fastjet::JetDefinition const *)arg1)->jet_finder(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetAlgorithm)((fastjet::JetDefinition const *)arg1)->jet_finder(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -22843,14 +21816,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_R(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (double)((fastjet::JetDefinition const *)arg1)->R(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JetDefinition const *)arg1)->R(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -22876,14 +21847,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_extra_param(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (double)((fastjet::JetDefinition const *)arg1)->extra_param(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JetDefinition const *)arg1)->extra_param(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -22909,14 +21878,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_strategy(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (fastjet::Strategy)((fastjet::JetDefinition const *)arg1)->strategy(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Strategy)((fastjet::JetDefinition const *)arg1)->strategy(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -22942,14 +21909,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_recombination_scheme(PyObject *SWIGUNUS arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (fastjet::RecombinationScheme)((fastjet::JetDefinition const *)arg1)->recombination_scheme(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RecombinationScheme)((fastjet::JetDefinition const *)arg1)->recombination_scheme(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -22981,14 +21946,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_set_jet_algorithm(PyObject *SWIGUNUSEDP arg2 = static_cast< fastjet::JetAlgorithm >(val2); { try { - (arg1)->set_jet_algorithm(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_jet_algorithm(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -23020,14 +21983,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_set_jet_finder(PyObject *SWIGUNUSEDPARM arg2 = static_cast< fastjet::JetAlgorithm >(val2); { try { - (arg1)->set_jet_finder(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_jet_finder(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -23059,14 +22020,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_set_extra_param(PyObject *SWIGUNUSEDPAR arg2 = static_cast< double >(val2); { try { - (arg1)->set_extra_param(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_extra_param(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -23092,14 +22051,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_recombiner(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (fastjet::JetDefinition::Recombiner *)((fastjet::JetDefinition const *)arg1)->recombiner(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition::Recombiner *)((fastjet::JetDefinition const *)arg1)->recombiner(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition__Recombiner, 0 | 0 ); return resultobj; @@ -23135,14 +22092,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_has_same_recombiner(PyObject *SWIGUNUSE arg2 = reinterpret_cast< fastjet::JetDefinition * >(argp2); { try { - result = (bool)((fastjet::JetDefinition const *)arg1)->has_same_recombiner((fastjet::JetDefinition const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::JetDefinition const *)arg1)->has_same_recombiner((fastjet::JetDefinition const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -23168,14 +22123,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_is_spherical(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (bool)((fastjet::JetDefinition const *)arg1)->is_spherical(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::JetDefinition const *)arg1)->is_spherical(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -23201,14 +22154,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_description(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = ((fastjet::JetDefinition const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::JetDefinition const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -23234,14 +22185,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_description_no_recombiner(PyObject *SWI arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = ((fastjet::JetDefinition const *)arg1)->description_no_recombiner(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::JetDefinition const *)arg1)->description_no_recombiner(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -23267,14 +22216,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_algorithm_description(PyObject *SWIGUNU arg1 = static_cast< fastjet::JetAlgorithm >(val1); { try { - result = fastjet::JetDefinition::algorithm_description(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition::algorithm_description(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -23300,14 +22247,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_n_parameters_for_algorithm(PyObject *SW arg1 = static_cast< fastjet::JetAlgorithm >(val1); { try { - result = (unsigned int)fastjet::JetDefinition::n_parameters_for_algorithm(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (unsigned int)fastjet::JetDefinition::n_parameters_for_algorithm(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; @@ -23333,14 +22278,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition___str__(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = fastjet_JetDefinition___str__((fastjet::JetDefinition const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_JetDefinition___str__((fastjet::JetDefinition const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -23378,14 +22321,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition___call__(PyObject *SWIGUNUSEDPARM(self) } { try { - result = fastjet_JetDefinition___call__(arg1,(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_JetDefinition___call__(arg1,(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); if (SWIG_IsNewObj(res2)) delete arg2; @@ -23413,14 +22354,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition_set_python_recombiner(PyObject *SWIGUNU arg2 = swig_obj[1]; { try { - fastjet_JetDefinition_set_python_recombiner(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet_JetDefinition_set_python_recombiner(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -23445,14 +22384,12 @@ SWIGINTERN PyObject *_wrap_delete_JetDefinition(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -23503,14 +22440,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py_ssize arg2 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp2); { try { - result = fastjet::join((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition::Recombiner const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition::Recombiner const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -23550,14 +22485,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize arg2 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp2); { try { - result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::JetDefinition::Recombiner const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::JetDefinition::Recombiner const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -23606,14 +22539,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize arg3 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp3); { try { - result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::JetDefinition::Recombiner const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::JetDefinition::Recombiner const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -23673,14 +22604,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_8(PyObject *SWIGUNUSEDPARM(self), Py_ssize arg4 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp4); { try { - result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,(fastjet::JetDefinition::Recombiner const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,(fastjet::JetDefinition::Recombiner const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -23751,14 +22680,12 @@ SWIGINTERN PyObject *_wrap_join__SWIG_9(PyObject *SWIGUNUSEDPARM(self), Py_ssize arg5 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp5); { try { - result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,(fastjet::PseudoJet const &)*arg4,(fastjet::JetDefinition::Recombiner const &)*arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::join((fastjet::PseudoJet const &)*arg1,(fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,(fastjet::PseudoJet const &)*arg4,(fastjet::JetDefinition::Recombiner const &)*arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -23948,14 +22875,12 @@ SWIGINTERN PyObject *_wrap_new_CompositeJetStructure__SWIG_0(PyObject *SWIGUNUSE if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::CompositeJetStructure *)new fastjet::CompositeJetStructure(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::CompositeJetStructure *)new fastjet::CompositeJetStructure(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__CompositeJetStructure, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -23992,14 +22917,12 @@ SWIGINTERN PyObject *_wrap_new_CompositeJetStructure__SWIG_1(PyObject *SWIGUNUSE arg2 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp2); { try { - result = (fastjet::CompositeJetStructure *)new fastjet::CompositeJetStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition::Recombiner const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::CompositeJetStructure *)new fastjet::CompositeJetStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition::Recombiner const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__CompositeJetStructure, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -24030,14 +22953,12 @@ SWIGINTERN PyObject *_wrap_new_CompositeJetStructure__SWIG_2(PyObject *SWIGUNUSE } { try { - result = (fastjet::CompositeJetStructure *)new fastjet::CompositeJetStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::CompositeJetStructure *)new fastjet::CompositeJetStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__CompositeJetStructure, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -24107,14 +23028,12 @@ SWIGINTERN PyObject *_wrap_delete_CompositeJetStructure(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::CompositeJetStructure * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -24140,14 +23059,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_description(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::CompositeJetStructure * >(argp1); { try { - result = ((fastjet::CompositeJetStructure const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::CompositeJetStructure const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -24173,14 +23090,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_has_constituents(PyObject *SWIG arg1 = reinterpret_cast< fastjet::CompositeJetStructure * >(argp1); { try { - result = (bool)((fastjet::CompositeJetStructure const *)arg1)->has_constituents(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::CompositeJetStructure const *)arg1)->has_constituents(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -24216,14 +23131,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_constituents(PyObject *SWIGUNUS arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::CompositeJetStructure const *)arg1)->constituents((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::CompositeJetStructure const *)arg1)->constituents((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -24259,14 +23172,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_has_pieces(PyObject *SWIGUNUSED arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::CompositeJetStructure const *)arg1)->has_pieces((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::CompositeJetStructure const *)arg1)->has_pieces((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -24302,14 +23213,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_pieces(PyObject *SWIGUNUSEDPARM arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::CompositeJetStructure const *)arg1)->pieces((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::CompositeJetStructure const *)arg1)->pieces((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -24335,14 +23244,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_has_area(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::CompositeJetStructure * >(argp1); { try { - result = (bool)((fastjet::CompositeJetStructure const *)arg1)->has_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::CompositeJetStructure const *)arg1)->has_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -24378,14 +23285,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_area(PyObject *SWIGUNUSEDPARM(s arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::CompositeJetStructure const *)arg1)->area((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::CompositeJetStructure const *)arg1)->area((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -24421,14 +23326,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_area_error(PyObject *SWIGUNUSED arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::CompositeJetStructure const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::CompositeJetStructure const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -24464,14 +23367,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_area_4vector(PyObject *SWIGUNUS arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::CompositeJetStructure const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::CompositeJetStructure const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -24507,14 +23408,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_is_pure_ghost(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::CompositeJetStructure const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::CompositeJetStructure const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -24539,14 +23438,12 @@ SWIGINTERN PyObject *_wrap_CompositeJetStructure_discard_area(PyObject *SWIGUNUS arg1 = reinterpret_cast< fastjet::CompositeJetStructure * >(argp1); { try { - (arg1)->discard_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->discard_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -24573,14 +23470,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceStructure__SWIG_0(PyObject *SWIGUN if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::ClusterSequenceStructure *)new fastjet::ClusterSequenceStructure(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceStructure *)new fastjet::ClusterSequenceStructure(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceStructure, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -24604,14 +23499,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceStructure__SWIG_1(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (fastjet::ClusterSequenceStructure *)new fastjet::ClusterSequenceStructure((fastjet::ClusterSequence const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceStructure *)new fastjet::ClusterSequenceStructure((fastjet::ClusterSequence const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceStructure, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -24666,14 +23559,12 @@ SWIGINTERN PyObject *_wrap_delete_ClusterSequenceStructure(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -24699,14 +23590,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_description(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - result = ((fastjet::ClusterSequenceStructure const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceStructure const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -24732,14 +23621,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_associated_cluster_seque arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_associated_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_associated_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -24765,14 +23652,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_associated_cluster_sequence( arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - result = (fastjet::ClusterSequence *)((fastjet::ClusterSequenceStructure const *)arg1)->associated_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)((fastjet::ClusterSequenceStructure const *)arg1)->associated_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, 0 | 0 ); return resultobj; @@ -24798,14 +23683,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_valid_cluster_sequence(P arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_valid_cluster_sequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_valid_cluster_sequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -24831,14 +23714,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_validated_cs(PyObject *SWIGU arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - result = (fastjet::ClusterSequence *)((fastjet::ClusterSequenceStructure const *)arg1)->validated_cs(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)((fastjet::ClusterSequenceStructure const *)arg1)->validated_cs(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, 0 | 0 ); return resultobj; @@ -24864,14 +23745,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_validated_csab(PyObject *SWI arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - result = (fastjet::ClusterSequenceAreaBase *)((fastjet::ClusterSequenceStructure const *)arg1)->validated_csab(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceAreaBase *)((fastjet::ClusterSequenceStructure const *)arg1)->validated_csab(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, 0 | 0 ); return resultobj; @@ -24903,14 +23782,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_set_associated_cs(PyObject * arg2 = reinterpret_cast< fastjet::ClusterSequence * >(argp2); { try { - (arg1)->set_associated_cs((fastjet::ClusterSequence const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_associated_cs((fastjet::ClusterSequence const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -24957,14 +23834,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_partner(PyObject *SWIGUN arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_partner((fastjet::PseudoJet const &)*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_partner((fastjet::PseudoJet const &)*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -25011,14 +23886,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_child(PyObject *SWIGUNUS arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_child((fastjet::PseudoJet const &)*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_child((fastjet::PseudoJet const &)*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -25076,14 +23949,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_parents(PyObject *SWIGUN arg4 = reinterpret_cast< fastjet::PseudoJet * >(argp4); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_parents((fastjet::PseudoJet const &)*arg2,*arg3,*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_parents((fastjet::PseudoJet const &)*arg2,*arg3,*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -25130,14 +24001,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_object_in_jet(PyObject *SWIG arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->object_in_jet((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->object_in_jet((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -25163,14 +24032,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_constituents(PyObject *S arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_constituents(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_constituents(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -25206,14 +24073,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_constituents(PyObject *SWIGU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::ClusterSequenceStructure const *)arg1)->constituents((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceStructure const *)arg1)->constituents((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -25239,14 +24104,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_exclusive_subjets(PyObje arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_exclusive_subjets(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_exclusive_subjets(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -25292,14 +24155,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subjets(PyObject * arg3 = &temp3; { try { - result = ((fastjet::ClusterSequenceStructure const *)arg1)->exclusive_subjets((fastjet::PseudoJet const &)*arg2,(double const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceStructure const *)arg1)->exclusive_subjets((fastjet::PseudoJet const &)*arg2,(double const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -25345,14 +24206,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_n_exclusive_subjets(PyObject arg3 = &temp3; { try { - result = (int)((fastjet::ClusterSequenceStructure const *)arg1)->n_exclusive_subjets((fastjet::PseudoJet const &)*arg2,(double const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::ClusterSequenceStructure const *)arg1)->n_exclusive_subjets((fastjet::PseudoJet const &)*arg2,(double const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -25396,14 +24255,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subjets_up_to(PyOb arg3 = static_cast< int >(val3); { try { - result = ((fastjet::ClusterSequenceStructure const *)arg1)->exclusive_subjets_up_to((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceStructure const *)arg1)->exclusive_subjets_up_to((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -25447,14 +24304,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subdmerge(PyObject arg3 = static_cast< int >(val3); { try { - result = (double)((fastjet::ClusterSequenceStructure const *)arg1)->exclusive_subdmerge((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceStructure const *)arg1)->exclusive_subdmerge((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -25498,14 +24353,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_exclusive_subdmerge_max(PyOb arg3 = static_cast< int >(val3); { try { - result = (double)((fastjet::ClusterSequenceStructure const *)arg1)->exclusive_subdmerge_max((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceStructure const *)arg1)->exclusive_subdmerge_max((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -25541,14 +24394,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_pieces(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_pieces((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_pieces((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -25584,14 +24435,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_pieces(PyObject *SWIGUNUSEDP arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::ClusterSequenceStructure const *)arg1)->pieces((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceStructure const *)arg1)->pieces((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -25617,14 +24466,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_has_area(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::ClusterSequenceStructure * >(argp1); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->has_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -25660,14 +24507,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area(PyObject *SWIGUNUSEDPAR arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceStructure const *)arg1)->area((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceStructure const *)arg1)->area((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -25703,14 +24548,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area_error(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceStructure const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceStructure const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -25746,14 +24589,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_area_4vector(PyObject *SWIGU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::ClusterSequenceStructure const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceStructure const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -25789,14 +24630,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceStructure_is_pure_ghost(PyObject *SWIG arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceStructure const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -25823,14 +24662,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_0(PyObject *SWIGUNUSEDPARM( if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::ClusterSequence *)new fastjet::ClusterSequence(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)new fastjet::ClusterSequence(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -25857,14 +24694,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_3(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (fastjet::ClusterSequence *)new fastjet::ClusterSequence((fastjet::ClusterSequence const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)new fastjet::ClusterSequence((fastjet::ClusterSequence const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -25889,14 +24724,12 @@ SWIGINTERN PyObject *_wrap_delete_ClusterSequence(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -25928,14 +24761,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_inclusive_jets__SWIG_0(PyObject *SWIG arg2 = static_cast< double >(val2); { try { - result = ((fastjet::ClusterSequence const *)arg1)->inclusive_jets(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->inclusive_jets(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -25959,14 +24790,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_inclusive_jets__SWIG_1(PyObject *SWIG arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = ((fastjet::ClusterSequence const *)arg1)->inclusive_jets(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->inclusive_jets(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -26041,14 +24870,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_n_exclusive_jets(PyObject *SWIGUNUSED arg2 = static_cast< double >(val2); { try { - result = (int)((fastjet::ClusterSequence const *)arg1)->n_exclusive_jets(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::ClusterSequence const *)arg1)->n_exclusive_jets(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -26080,14 +24907,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets__SWIG_0(PyObject *SWIG arg2 = static_cast< double >(val2); { try { - result = ((fastjet::ClusterSequence const *)arg1)->exclusive_jets(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->exclusive_jets(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -26119,14 +24944,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets__SWIG_1(PyObject *SWIG arg2 = static_cast< int >(val2); { try { - result = ((fastjet::ClusterSequence const *)arg1)->exclusive_jets(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->exclusive_jets(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -26207,14 +25030,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets_up_to(PyObject *SWIGUN arg2 = static_cast< int >(val2); { try { - result = ((fastjet::ClusterSequence const *)arg1)->exclusive_jets_up_to(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->exclusive_jets_up_to(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -26247,14 +25068,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_dmerge(PyObject *SWIGUNUSED arg2 = static_cast< int >(val2); { try { - result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_dmerge(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_dmerge(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -26287,14 +25106,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_dmerge_max(PyObject *SWIGUN arg2 = static_cast< int >(val2); { try { - result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_dmerge_max(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_dmerge_max(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -26327,14 +25144,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_ymerge(PyObject *SWIGUNUSED arg2 = static_cast< int >(val2); { try { - result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_ymerge(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_ymerge(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -26367,14 +25182,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_ymerge_max(PyObject *SWIGUN arg2 = static_cast< int >(val2); { try { - result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_ymerge_max(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_ymerge_max(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -26407,14 +25220,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_n_exclusive_jets_ycut(PyObject *SWIGU arg2 = static_cast< double >(val2); { try { - result = (int)((fastjet::ClusterSequence const *)arg1)->n_exclusive_jets_ycut(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::ClusterSequence const *)arg1)->n_exclusive_jets_ycut(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -26447,14 +25258,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_jets_ycut(PyObject *SWIGUNU arg2 = static_cast< double >(val2); { try { - result = ((fastjet::ClusterSequence const *)arg1)->exclusive_jets_ycut(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->exclusive_jets_ycut(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -26497,14 +25306,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets__SWIG_0(PyObject *S arg3 = static_cast< double >(val3); { try { - result = ((fastjet::ClusterSequence const *)arg1)->exclusive_subjets((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->exclusive_subjets((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -26548,14 +25355,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_n_exclusive_subjets(PyObject *SWIGUNU arg3 = static_cast< double >(val3); { try { - result = (int)((fastjet::ClusterSequence const *)arg1)->n_exclusive_subjets((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::ClusterSequence const *)arg1)->n_exclusive_subjets((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -26598,14 +25403,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets__SWIG_1(PyObject *S arg3 = static_cast< int >(val3); { try { - result = ((fastjet::ClusterSequence const *)arg1)->exclusive_subjets((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->exclusive_subjets((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -26705,14 +25508,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subjets_up_to(PyObject *SWI arg3 = static_cast< int >(val3); { try { - result = ((fastjet::ClusterSequence const *)arg1)->exclusive_subjets_up_to((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->exclusive_subjets_up_to((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -26756,14 +25557,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subdmerge(PyObject *SWIGUNU arg3 = static_cast< int >(val3); { try { - result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_subdmerge((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_subdmerge((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -26807,14 +25606,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_exclusive_subdmerge_max(PyObject *SWI arg3 = static_cast< int >(val3); { try { - result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_subdmerge_max((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence const *)arg1)->exclusive_subdmerge_max((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -26840,14 +25637,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_Q(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (double)((fastjet::ClusterSequence const *)arg1)->Q(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence const *)arg1)->Q(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -26873,14 +25668,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_Q2(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (double)((fastjet::ClusterSequence const *)arg1)->Q2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence const *)arg1)->Q2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -26927,14 +25720,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_object_in_jet(PyObject *SWIGUNUSEDPAR arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::ClusterSequence const *)arg1)->object_in_jet((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequence const *)arg1)->object_in_jet((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -26992,14 +25783,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_has_parents(PyObject *SWIGUNUSEDPARM( arg4 = reinterpret_cast< fastjet::PseudoJet * >(argp4); { try { - result = (bool)((fastjet::ClusterSequence const *)arg1)->has_parents((fastjet::PseudoJet const &)*arg2,*arg3,*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequence const *)arg1)->has_parents((fastjet::PseudoJet const &)*arg2,*arg3,*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -27045,14 +25834,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_has_child__SWIG_0(PyObject *SWIGUNUSE arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::ClusterSequence const *)arg1)->has_child((fastjet::PseudoJet const &)*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequence const *)arg1)->has_child((fastjet::PseudoJet const &)*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -27098,14 +25885,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_has_child__SWIG_1(PyObject *SWIGUNUSE arg3 = reinterpret_cast< fastjet::PseudoJet ** >(argp3); { try { - result = (bool)((fastjet::ClusterSequence const *)arg1)->has_child((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const *&)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequence const *)arg1)->has_child((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const *&)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -27206,14 +25991,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_has_partner(PyObject *SWIGUNUSEDPARM( arg3 = reinterpret_cast< fastjet::PseudoJet * >(argp3); { try { - result = (bool)((fastjet::ClusterSequence const *)arg1)->has_partner((fastjet::PseudoJet const &)*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequence const *)arg1)->has_partner((fastjet::PseudoJet const &)*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -27249,14 +26032,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_constituents(PyObject *SWIGUNUSEDPARM arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::ClusterSequence const *)arg1)->constituents((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->constituents((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -27303,14 +26084,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_0(PyObject arg3 = reinterpret_cast< std::ostream * >(argp3); { try { - ((fastjet::ClusterSequence const *)arg1)->print_jets_for_root((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequence const *)arg1)->print_jets_for_root((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -27348,14 +26127,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_1(PyObject } { try { - ((fastjet::ClusterSequence const *)arg1)->print_jets_for_root((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequence const *)arg1)->print_jets_for_root((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -27419,14 +26196,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_2(PyObject } { try { - ((fastjet::ClusterSequence const *)arg1)->print_jets_for_root((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(std::string const &)*arg3,(std::string const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequence const *)arg1)->print_jets_for_root((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(std::string const &)*arg3,(std::string const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -27481,14 +26256,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_print_jets_for_root__SWIG_3(PyObject } { try { - ((fastjet::ClusterSequence const *)arg1)->print_jets_for_root((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(std::string const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequence const *)arg1)->print_jets_for_root((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(std::string const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -27627,14 +26400,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_add_constituents(PyObject *SWIGUNUSED arg3 = reinterpret_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > * >(argp3); { try { - ((fastjet::ClusterSequence const *)arg1)->add_constituents((fastjet::PseudoJet const &)*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequence const *)arg1)->add_constituents((fastjet::PseudoJet const &)*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -27660,14 +26431,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_used(PyObject *SWIGUNUSEDPAR arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (fastjet::Strategy)((fastjet::ClusterSequence const *)arg1)->strategy_used(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Strategy)((fastjet::ClusterSequence const *)arg1)->strategy_used(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -27691,14 +26460,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_string__SWIG_0(PyObject *SWI arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = ((fastjet::ClusterSequence const *)arg1)->strategy_string(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->strategy_string(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -27730,14 +26497,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_strategy_string__SWIG_1(PyObject *SWI arg2 = static_cast< fastjet::Strategy >(val2); { try { - result = ((fastjet::ClusterSequence const *)arg1)->strategy_string(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->strategy_string(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -27805,14 +26570,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_jet_def(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (fastjet::JetDefinition *) &((fastjet::ClusterSequence const *)arg1)->jet_def(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetDefinition *) &((fastjet::ClusterSequence const *)arg1)->jet_def(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetDefinition, 0 | 0 ); return resultobj; @@ -27837,14 +26600,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_delete_self_when_unused(PyObject *SWI arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - (arg1)->delete_self_when_unused(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->delete_self_when_unused(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -27870,14 +26631,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_will_delete_self_when_unused(PyObject arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (bool)((fastjet::ClusterSequence const *)arg1)->will_delete_self_when_unused(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequence const *)arg1)->will_delete_self_when_unused(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -27902,14 +26661,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_signal_imminent_self_deletion(PyObjec arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - ((fastjet::ClusterSequence const *)arg1)->signal_imminent_self_deletion(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequence const *)arg1)->signal_imminent_self_deletion(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -27945,14 +26702,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_jet_scale_for_algorithm(PyObject *SWI arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequence const *)arg1)->jet_scale_for_algorithm((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence const *)arg1)->jet_scale_for_algorithm((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -28010,14 +26765,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_ij_recombination__SWIG_ arg5 = reinterpret_cast< int * >(argp5); { try { - (arg1)->plugin_record_ij_recombination(arg2,arg3,arg4,*arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->plugin_record_ij_recombination(arg2,arg3,arg4,*arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -28086,14 +26839,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_ij_recombination__SWIG_ arg6 = reinterpret_cast< int * >(argp6); { try { - (arg1)->plugin_record_ij_recombination(arg2,arg3,arg4,(fastjet::PseudoJet const &)*arg5,*arg6); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->plugin_record_ij_recombination(arg2,arg3,arg4,(fastjet::PseudoJet const &)*arg5,*arg6); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -28219,14 +26970,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_record_iB_recombination(PyObje arg3 = static_cast< double >(val3); { try { - (arg1)->plugin_record_iB_recombination(arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->plugin_record_iB_recombination(arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -28258,14 +27007,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_associate_extras(PyObject *SWI arg2 = reinterpret_cast< fastjet::ClusterSequence::Extras * >(argp2); { try { - (arg1)->plugin_associate_extras(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->plugin_associate_extras(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -28291,14 +27038,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_plugin_activated(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (bool)((fastjet::ClusterSequence const *)arg1)->plugin_activated(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequence const *)arg1)->plugin_activated(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -28324,14 +27069,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_extras(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (fastjet::ClusterSequence::Extras *)((fastjet::ClusterSequence const *)arg1)->extras(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence::Extras *)((fastjet::ClusterSequence const *)arg1)->extras(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence__Extras, 0 | 0 ); return resultobj; @@ -28357,14 +27100,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_jets(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *) &((fastjet::ClusterSequence const *)arg1)->jets(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *) &((fastjet::ClusterSequence const *)arg1)->jets(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(*result)); return resultobj; @@ -28390,14 +27131,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_history(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (std::vector< fastjet::ClusterSequence::history_element,std::allocator< fastjet::ClusterSequence::history_element > > *) &((fastjet::ClusterSequence const *)arg1)->history(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (std::vector< fastjet::ClusterSequence::history_element,std::allocator< fastjet::ClusterSequence::history_element > > *) &((fastjet::ClusterSequence const *)arg1)->history(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_fastjet__ClusterSequence__history_element_std__allocatorT_fastjet__ClusterSequence__history_element_t_t, 0 | 0 ); return resultobj; @@ -28423,14 +27162,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_n_particles(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (unsigned int)((fastjet::ClusterSequence const *)arg1)->n_particles(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (unsigned int)((fastjet::ClusterSequence const *)arg1)->n_particles(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; @@ -28468,14 +27205,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_particle_jet_indices(PyObject *SWIGUN } { try { - result = ((fastjet::ClusterSequence const *)arg1)->particle_jet_indices((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->particle_jet_indices((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); 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 ); if (SWIG_IsNewObj(res2)) delete arg2; @@ -28503,14 +27238,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_unique_history_order(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = ((fastjet::ClusterSequence const *)arg1)->unique_history_order(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->unique_history_order(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); 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 ); return resultobj; @@ -28536,14 +27269,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_unclustered_particles(PyObject *SWIGU arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = ((fastjet::ClusterSequence const *)arg1)->unclustered_particles(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->unclustered_particles(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -28569,14 +27300,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_childless_pseudojets(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = ((fastjet::ClusterSequence const *)arg1)->childless_pseudojets(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequence const *)arg1)->childless_pseudojets(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -28612,14 +27341,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_contains(PyObject *SWIGUNUSEDPARM(sel arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::ClusterSequence const *)arg1)->contains((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequence const *)arg1)->contains((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -28661,14 +27388,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_transfer_from_sequence__SWIG_0(PyObje arg3 = reinterpret_cast< fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > * >(argp3); { try { - (arg1)->transfer_from_sequence((fastjet::ClusterSequence const &)*arg2,(fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->transfer_from_sequence((fastjet::ClusterSequence const &)*arg2,(fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -28702,14 +27427,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_transfer_from_sequence__SWIG_1(PyObje arg2 = reinterpret_cast< fastjet::ClusterSequence * >(argp2); { try { - (arg1)->transfer_from_sequence((fastjet::ClusterSequence const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->transfer_from_sequence((fastjet::ClusterSequence const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -28784,14 +27507,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_structure_shared_ptr(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::ClusterSequence * >(argp1); { try { - result = (fastjet::SharedPtr< fastjet::PseudoJetStructureBase > *) &((fastjet::ClusterSequence const *)arg1)->structure_shared_ptr(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::SharedPtr< fastjet::PseudoJetStructureBase > *) &((fastjet::ClusterSequence const *)arg1)->structure_shared_ptr(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t, 0 | 0 ); return resultobj; @@ -28806,14 +27527,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_print_banner(PyObject *SWIGUNUSEDPARM if (!SWIG_Python_UnpackTuple(args, "ClusterSequence_print_banner", 0, 0, 0)) SWIG_fail; { try { - fastjet::ClusterSequence::print_banner(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet::ClusterSequence::print_banner(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -28838,14 +27557,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_set_fastjet_banner_stream(PyObject *S arg1 = reinterpret_cast< std::ostream * >(argp1); { try { - fastjet::ClusterSequence::set_fastjet_banner_stream(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + fastjet::ClusterSequence::set_fastjet_banner_stream(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -28861,14 +27578,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence_fastjet_banner_stream(PyObject *SWIGU if (!SWIG_Python_UnpackTuple(args, "ClusterSequence_fastjet_banner_stream", 0, 0, 0)) SWIG_fail; { try { - result = (std::ostream *)fastjet::ClusterSequence::fastjet_banner_stream(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (std::ostream *)fastjet::ClusterSequence::fastjet_banner_stream(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__ostream, 0 | 0 ); return resultobj; @@ -28918,14 +27633,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_4(PyObject *SWIGUNUSEDPARM( arg3 = &temp3; { try { - result = (fastjet::ClusterSequence *)new fastjet::ClusterSequence((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(bool const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)new fastjet::ClusterSequence((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(bool const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -28967,14 +27680,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence__SWIG_5(PyObject *SWIGUNUSEDPARM( arg2 = reinterpret_cast< fastjet::JetDefinition * >(argp2); { try { - result = (fastjet::ClusterSequence *)new fastjet::ClusterSequence((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence *)new fastjet::ClusterSequence((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -29084,14 +27795,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_tile_index(PyObject *SWIGUNUSEDPARM(self), arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (int)((fastjet::TilingBase const *)arg1)->tile_index((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::TilingBase const *)arg1)->tile_index((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -29117,14 +27826,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_n_tiles(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::TilingBase * >(argp1); { try { - result = (int)((fastjet::TilingBase const *)arg1)->n_tiles(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::TilingBase const *)arg1)->n_tiles(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -29150,14 +27857,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_n_good_tiles(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::TilingBase * >(argp1); { try { - result = (int)((fastjet::TilingBase const *)arg1)->n_good_tiles(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::TilingBase const *)arg1)->n_good_tiles(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -29190,14 +27895,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_tile_is_good(PyObject *SWIGUNUSEDPARM(self arg2 = static_cast< int >(val2); { try { - result = (bool)((fastjet::TilingBase const *)arg1)->tile_is_good(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::TilingBase const *)arg1)->tile_is_good(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -29223,14 +27926,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_all_tiles_good(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::TilingBase * >(argp1); { try { - result = (bool)((fastjet::TilingBase const *)arg1)->all_tiles_good(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::TilingBase const *)arg1)->all_tiles_good(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -29256,14 +27957,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_all_tiles_equal_area(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< fastjet::TilingBase * >(argp1); { try { - result = (bool)((fastjet::TilingBase const *)arg1)->all_tiles_equal_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::TilingBase const *)arg1)->all_tiles_equal_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -29296,14 +27995,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_tile_area(PyObject *SWIGUNUSEDPARM(self), arg2 = static_cast< int >(val2); { try { - result = (double)((fastjet::TilingBase const *)arg1)->tile_area(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::TilingBase const *)arg1)->tile_area(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -29329,14 +28026,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_mean_tile_area(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::TilingBase * >(argp1); { try { - result = (double)((fastjet::TilingBase const *)arg1)->mean_tile_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::TilingBase const *)arg1)->mean_tile_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -29362,14 +28057,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_description(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::TilingBase * >(argp1); { try { - result = ((fastjet::TilingBase const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::TilingBase const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -29395,14 +28088,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_is_initialised(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::TilingBase * >(argp1); { try { - result = (bool)((fastjet::TilingBase const *)arg1)->is_initialised(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::TilingBase const *)arg1)->is_initialised(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -29428,14 +28119,12 @@ SWIGINTERN PyObject *_wrap_TilingBase_is_initialized(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::TilingBase * >(argp1); { try { - result = (bool)((fastjet::TilingBase const *)arg1)->is_initialized(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::TilingBase const *)arg1)->is_initialized(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -29460,14 +28149,12 @@ SWIGINTERN PyObject *_wrap_delete_TilingBase(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< fastjet::TilingBase * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -29506,14 +28193,12 @@ SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_0(PyObject *SWIGUNUSEDPARM( arg2 = static_cast< double >(val2); { try { - result = (fastjet::RectangularGrid *)new fastjet::RectangularGrid(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RectangularGrid *)new fastjet::RectangularGrid(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RectangularGrid, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -29577,14 +28262,12 @@ SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_1(PyObject *SWIGUNUSEDPARM( } { try { - result = (fastjet::RectangularGrid *)new fastjet::RectangularGrid(arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RectangularGrid *)new fastjet::RectangularGrid(arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RectangularGrid, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -29632,14 +28315,12 @@ SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_2(PyObject *SWIGUNUSEDPARM( arg4 = static_cast< double >(val4); { try { - result = (fastjet::RectangularGrid *)new fastjet::RectangularGrid(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RectangularGrid *)new fastjet::RectangularGrid(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RectangularGrid, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -29655,14 +28336,12 @@ SWIGINTERN PyObject *_wrap_new_RectangularGrid__SWIG_3(PyObject *SWIGUNUSEDPARM( if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::RectangularGrid *)new fastjet::RectangularGrid(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RectangularGrid *)new fastjet::RectangularGrid(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RectangularGrid, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -29787,14 +28466,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_n_tiles(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = (int)((fastjet::RectangularGrid const *)arg1)->n_tiles(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::RectangularGrid const *)arg1)->n_tiles(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -29820,14 +28497,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_n_good_tiles(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = (int)((fastjet::RectangularGrid const *)arg1)->n_good_tiles(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::RectangularGrid const *)arg1)->n_good_tiles(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -29863,14 +28538,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_tile_index(PyObject *SWIGUNUSEDPARM(s arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (int)((fastjet::RectangularGrid const *)arg1)->tile_index((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::RectangularGrid const *)arg1)->tile_index((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -29903,14 +28576,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_tile_is_good(PyObject *SWIGUNUSEDPARM arg2 = static_cast< int >(val2); { try { - result = (bool)((fastjet::RectangularGrid const *)arg1)->tile_is_good(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::RectangularGrid const *)arg1)->tile_is_good(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -29943,14 +28614,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_tile_area(PyObject *SWIGUNUSEDPARM(se arg2 = static_cast< int >(val2); { try { - result = (double)((fastjet::RectangularGrid const *)arg1)->tile_area(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::RectangularGrid const *)arg1)->tile_area(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -29976,14 +28645,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_mean_tile_area(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = (double)((fastjet::RectangularGrid const *)arg1)->mean_tile_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::RectangularGrid const *)arg1)->mean_tile_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -30009,14 +28676,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_description(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = ((fastjet::RectangularGrid const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::RectangularGrid const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -30042,14 +28707,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_rapmin(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = (double)((fastjet::RectangularGrid const *)arg1)->rapmin(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::RectangularGrid const *)arg1)->rapmin(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -30075,14 +28738,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_rapmax(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = (double)((fastjet::RectangularGrid const *)arg1)->rapmax(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::RectangularGrid const *)arg1)->rapmax(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -30108,14 +28769,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_drap(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = (double)((fastjet::RectangularGrid const *)arg1)->drap(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::RectangularGrid const *)arg1)->drap(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -30141,14 +28800,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_dphi(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = (double)((fastjet::RectangularGrid const *)arg1)->dphi(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::RectangularGrid const *)arg1)->dphi(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -30174,14 +28831,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid_is_initialised(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = (bool)((fastjet::RectangularGrid const *)arg1)->is_initialised(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::RectangularGrid const *)arg1)->is_initialised(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -30207,14 +28862,12 @@ SWIGINTERN PyObject *_wrap_RectangularGrid___str__(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = fastjet_RectangularGrid___str__((fastjet::RectangularGrid const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_RectangularGrid___str__((fastjet::RectangularGrid const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -30239,14 +28892,12 @@ SWIGINTERN PyObject *_wrap_delete_RectangularGrid(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -30273,14 +28924,12 @@ SWIGINTERN PyObject *_wrap_new__NoInfo(PyObject *SWIGUNUSEDPARM(self), PyObject if (!SWIG_Python_UnpackTuple(args, "new__NoInfo", 0, 0, 0)) SWIG_fail; { try { - result = (fastjet::_NoInfo *)new fastjet::_NoInfo(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::_NoInfo *)new fastjet::_NoInfo(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet___NoInfo, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30305,14 +28954,12 @@ SWIGINTERN PyObject *_wrap_delete__NoInfo(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = reinterpret_cast< fastjet::_NoInfo * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -30423,14 +29070,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_0(PyObject *SWIGUNUSEDPARM( if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30442,66 +29087,32 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_0(PyObject *SWIGUNUSEDPARM( SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; double arg1 ; - int arg2 ; - double arg3 ; - double arg4 ; - double arg5 ; - double arg6 ; + fastjet::BasicRandom< double > *arg2 = (fastjet::BasicRandom< double > *) 0 ; double val1 ; int ecode1 = 0 ; - int val2 ; - int ecode2 = 0 ; - double val3 ; - int ecode3 = 0 ; - double val4 ; - int ecode4 = 0 ; - double val5 ; - int ecode5 = 0 ; - double val6 ; - int ecode6 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; fastjet::GhostedAreaSpec *result = 0 ; - if ((nobjs < 6) || (nobjs > 6)) SWIG_fail; + if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "double""'"); } arg1 = static_cast< double >(val1); - ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GhostedAreaSpec" "', argument " "2"" of type '" "int""'"); - } - arg2 = static_cast< int >(val2); - ecode3 = SWIG_AsVal_double(swig_obj[2], &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GhostedAreaSpec" "', argument " "3"" of type '" "double""'"); - } - arg3 = static_cast< double >(val3); - ecode4 = SWIG_AsVal_double(swig_obj[3], &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_GhostedAreaSpec" "', argument " "4"" of type '" "double""'"); - } - arg4 = static_cast< double >(val4); - ecode5 = SWIG_AsVal_double(swig_obj[4], &val5); - if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_GhostedAreaSpec" "', argument " "5"" of type '" "double""'"); - } - arg5 = static_cast< double >(val5); - ecode6 = SWIG_AsVal_double(swig_obj[5], &val6); - if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_GhostedAreaSpec" "', argument " "6"" of type '" "double""'"); - } - arg6 = static_cast< double >(val6); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_fastjet__BasicRandomT_double_t, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_GhostedAreaSpec" "', argument " "2"" of type '" "fastjet::BasicRandom< double > *""'"); + } + arg2 = reinterpret_cast< fastjet::BasicRandom< double > * >(argp2); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5,arg6); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30517,6 +29128,8 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_2(PyObject *SWIGUNUSEDPARM( double arg3 ; double arg4 ; double arg5 ; + double arg6 ; + fastjet::BasicRandom< double > *arg7 = (fastjet::BasicRandom< double > *) 0 ; double val1 ; int ecode1 = 0 ; int val2 ; @@ -30527,9 +29140,13 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_2(PyObject *SWIGUNUSEDPARM( int ecode4 = 0 ; double val5 ; int ecode5 = 0 ; + double val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; fastjet::GhostedAreaSpec *result = 0 ; - if ((nobjs < 5) || (nobjs > 5)) SWIG_fail; + if ((nobjs < 7) || (nobjs > 7)) SWIG_fail; ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "double""'"); @@ -30555,16 +29172,24 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_2(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_GhostedAreaSpec" "', argument " "5"" of type '" "double""'"); } arg5 = static_cast< double >(val5); + ecode6 = SWIG_AsVal_double(swig_obj[5], &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_GhostedAreaSpec" "', argument " "6"" of type '" "double""'"); + } + arg6 = static_cast< double >(val6); + res7 = SWIG_ConvertPtr(swig_obj[6], &argp7,SWIGTYPE_p_fastjet__BasicRandomT_double_t, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "new_GhostedAreaSpec" "', argument " "7"" of type '" "fastjet::BasicRandom< double > *""'"); + } + arg7 = reinterpret_cast< fastjet::BasicRandom< double > * >(argp7); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30579,6 +29204,8 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_3(PyObject *SWIGUNUSEDPARM( int arg2 ; double arg3 ; double arg4 ; + double arg5 ; + double arg6 ; double val1 ; int ecode1 = 0 ; int val2 ; @@ -30587,9 +29214,13 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_3(PyObject *SWIGUNUSEDPARM( int ecode3 = 0 ; double val4 ; int ecode4 = 0 ; + double val5 ; + int ecode5 = 0 ; + double val6 ; + int ecode6 = 0 ; fastjet::GhostedAreaSpec *result = 0 ; - if ((nobjs < 4) || (nobjs > 4)) SWIG_fail; + if ((nobjs < 6) || (nobjs > 6)) SWIG_fail; ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "double""'"); @@ -30610,16 +29241,24 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_3(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_GhostedAreaSpec" "', argument " "4"" of type '" "double""'"); } arg4 = static_cast< double >(val4); + ecode5 = SWIG_AsVal_double(swig_obj[4], &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_GhostedAreaSpec" "', argument " "5"" of type '" "double""'"); + } + arg5 = static_cast< double >(val5); + ecode6 = SWIG_AsVal_double(swig_obj[5], &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_GhostedAreaSpec" "', argument " "6"" of type '" "double""'"); + } + arg6 = static_cast< double >(val6); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5,arg6); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30633,15 +29272,21 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_4(PyObject *SWIGUNUSEDPARM( double arg1 ; int arg2 ; double arg3 ; + double arg4 ; + double arg5 ; double val1 ; int ecode1 = 0 ; int val2 ; int ecode2 = 0 ; double val3 ; int ecode3 = 0 ; + double val4 ; + int ecode4 = 0 ; + double val5 ; + int ecode5 = 0 ; fastjet::GhostedAreaSpec *result = 0 ; - if ((nobjs < 3) || (nobjs > 3)) SWIG_fail; + if ((nobjs < 5) || (nobjs > 5)) SWIG_fail; ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "double""'"); @@ -30657,16 +29302,24 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_4(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GhostedAreaSpec" "', argument " "3"" of type '" "double""'"); } arg3 = static_cast< double >(val3); + ecode4 = SWIG_AsVal_double(swig_obj[3], &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_GhostedAreaSpec" "', argument " "4"" of type '" "double""'"); + } + arg4 = static_cast< double >(val4); + ecode5 = SWIG_AsVal_double(swig_obj[4], &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_GhostedAreaSpec" "', argument " "5"" of type '" "double""'"); + } + arg5 = static_cast< double >(val5); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30679,13 +29332,19 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_5(PyObject *SWIGUNUSEDPARM( PyObject *resultobj = 0; double arg1 ; int arg2 ; + double arg3 ; + double arg4 ; double val1 ; int ecode1 = 0 ; int val2 ; int ecode2 = 0 ; + double val3 ; + int ecode3 = 0 ; + double val4 ; + int ecode4 = 0 ; fastjet::GhostedAreaSpec *result = 0 ; - if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; + if ((nobjs < 4) || (nobjs > 4)) SWIG_fail; ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "double""'"); @@ -30696,16 +29355,24 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_5(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GhostedAreaSpec" "', argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); + ecode3 = SWIG_AsVal_double(swig_obj[2], &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GhostedAreaSpec" "', argument " "3"" of type '" "double""'"); + } + arg3 = static_cast< double >(val3); + ecode4 = SWIG_AsVal_double(swig_obj[3], &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_GhostedAreaSpec" "', argument " "4"" of type '" "double""'"); + } + arg4 = static_cast< double >(val4); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30717,26 +29384,40 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_5(PyObject *SWIGUNUSEDPARM( SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; double arg1 ; + int arg2 ; + double arg3 ; double val1 ; int ecode1 = 0 ; + int val2 ; + int ecode2 = 0 ; + double val3 ; + int ecode3 = 0 ; fastjet::GhostedAreaSpec *result = 0 ; - if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + if ((nobjs < 3) || (nobjs > 3)) SWIG_fail; ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "double""'"); } arg1 = static_cast< double >(val1); + ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GhostedAreaSpec" "', argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + ecode3 = SWIG_AsVal_double(swig_obj[2], &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GhostedAreaSpec" "', argument " "3"" of type '" "double""'"); + } + arg3 = static_cast< double >(val3); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30746,6 +29427,157 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_6(PyObject *SWIGUNUSEDPARM( SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_7(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + double arg1 ; + int arg2 ; + double val1 ; + int ecode1 = 0 ; + int val2 ; + int ecode2 = 0 ; + fastjet::GhostedAreaSpec *result = 0 ; + + if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; + ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "double""'"); + } + arg1 = static_cast< double >(val1); + ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GhostedAreaSpec" "', argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + try { + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_8(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + double arg1 ; + double val1 ; + int ecode1 = 0 ; + fastjet::GhostedAreaSpec *result = 0 ; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "double""'"); + } + arg1 = static_cast< double >(val1); + { + try { + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_9(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + double arg1 ; + double arg2 ; + int arg3 ; + double arg4 ; + double arg5 ; + double arg6 ; + double arg7 ; + fastjet::BasicRandom< double > *arg8 = (fastjet::BasicRandom< double > *) 0 ; + double val1 ; + int ecode1 = 0 ; + double val2 ; + int ecode2 = 0 ; + int val3 ; + int ecode3 = 0 ; + double val4 ; + int ecode4 = 0 ; + double val5 ; + int ecode5 = 0 ; + double val6 ; + int ecode6 = 0 ; + double val7 ; + int ecode7 = 0 ; + void *argp8 = 0 ; + int res8 = 0 ; + fastjet::GhostedAreaSpec *result = 0 ; + + if ((nobjs < 8) || (nobjs > 8)) SWIG_fail; + ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "double""'"); + } + arg1 = static_cast< double >(val1); + ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GhostedAreaSpec" "', argument " "2"" of type '" "double""'"); + } + arg2 = static_cast< double >(val2); + ecode3 = SWIG_AsVal_int(swig_obj[2], &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GhostedAreaSpec" "', argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + ecode4 = SWIG_AsVal_double(swig_obj[3], &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_GhostedAreaSpec" "', argument " "4"" of type '" "double""'"); + } + arg4 = static_cast< double >(val4); + ecode5 = SWIG_AsVal_double(swig_obj[4], &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_GhostedAreaSpec" "', argument " "5"" of type '" "double""'"); + } + arg5 = static_cast< double >(val5); + ecode6 = SWIG_AsVal_double(swig_obj[5], &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_GhostedAreaSpec" "', argument " "6"" of type '" "double""'"); + } + arg6 = static_cast< double >(val6); + ecode7 = SWIG_AsVal_double(swig_obj[6], &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_GhostedAreaSpec" "', argument " "7"" of type '" "double""'"); + } + arg7 = static_cast< double >(val7); + res8 = SWIG_ConvertPtr(swig_obj[7], &argp8,SWIGTYPE_p_fastjet__BasicRandomT_double_t, 0 | 0 ); + if (!SWIG_IsOK(res8)) { + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "new_GhostedAreaSpec" "', argument " "8"" of type '" "fastjet::BasicRandom< double > *""'"); + } + arg8 = reinterpret_cast< fastjet::BasicRandom< double > * >(argp8); + { + try { + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_10(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; double arg1 ; double arg2 ; @@ -30808,14 +29640,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_7(PyObject *SWIGUNUSEDPARM( arg7 = static_cast< double >(val7); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5,arg6,arg7); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30824,7 +29654,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_7(PyObject *SWIGUNUSEDPARM( } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_8(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_11(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; double arg1 ; double arg2 ; @@ -30879,14 +29709,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_8(PyObject *SWIGUNUSEDPARM( arg6 = static_cast< double >(val6); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5,arg6); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5,arg6); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30895,7 +29723,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_8(PyObject *SWIGUNUSEDPARM( } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_9(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_12(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; double arg1 ; double arg2 ; @@ -30942,14 +29770,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_9(PyObject *SWIGUNUSEDPARM( arg5 = static_cast< double >(val5); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -30958,7 +29784,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_9(PyObject *SWIGUNUSEDPARM( } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_10(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_13(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; double arg1 ; double arg2 ; @@ -30997,14 +29823,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_10(PyObject *SWIGUNUSEDPARM arg4 = static_cast< double >(val4); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -31013,7 +29837,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_10(PyObject *SWIGUNUSEDPARM } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_11(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_14(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; double arg1 ; double arg2 ; @@ -31044,14 +29868,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_11(PyObject *SWIGUNUSEDPARM arg3 = static_cast< int >(val3); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -31060,7 +29882,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_11(PyObject *SWIGUNUSEDPARM } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_12(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_15(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; double arg1 ; double arg2 ; @@ -31083,14 +29905,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_12(PyObject *SWIGUNUSEDPARM arg2 = static_cast< double >(val2); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -31099,7 +29919,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_12(PyObject *SWIGUNUSEDPARM } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_13(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_16(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; fastjet::Selector *arg1 = 0 ; int arg2 ; @@ -31107,6 +29927,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_13(PyObject *SWIGUNUSEDPARM double arg4 ; double arg5 ; double arg6 ; + fastjet::BasicRandom< double > *arg7 = (fastjet::BasicRandom< double > *) 0 ; void *argp1 = 0 ; int res1 = 0 ; int val2 ; @@ -31119,9 +29940,11 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_13(PyObject *SWIGUNUSEDPARM int ecode5 = 0 ; double val6 ; int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; fastjet::GhostedAreaSpec *result = 0 ; - if ((nobjs < 6) || (nobjs > 6)) SWIG_fail; + if ((nobjs < 7) || (nobjs > 7)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_fastjet__Selector, 0 | 0); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "fastjet::Selector const &""'"); @@ -31155,16 +29978,19 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_13(PyObject *SWIGUNUSEDPARM SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_GhostedAreaSpec" "', argument " "6"" of type '" "double""'"); } arg6 = static_cast< double >(val6); + res7 = SWIG_ConvertPtr(swig_obj[6], &argp7,SWIGTYPE_p_fastjet__BasicRandomT_double_t, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "new_GhostedAreaSpec" "', argument " "7"" of type '" "fastjet::BasicRandom< double > *""'"); + } + arg7 = reinterpret_cast< fastjet::BasicRandom< double > * >(argp7); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2,arg3,arg4,arg5,arg6); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2,arg3,arg4,arg5,arg6,arg7); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -31173,13 +29999,14 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_13(PyObject *SWIGUNUSEDPARM } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_14(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_17(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; fastjet::Selector *arg1 = 0 ; int arg2 ; double arg3 ; double arg4 ; double arg5 ; + double arg6 ; void *argp1 = 0 ; int res1 = 0 ; int val2 ; @@ -31190,9 +30017,11 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_14(PyObject *SWIGUNUSEDPARM int ecode4 = 0 ; double val5 ; int ecode5 = 0 ; + double val6 ; + int ecode6 = 0 ; fastjet::GhostedAreaSpec *result = 0 ; - if ((nobjs < 5) || (nobjs > 5)) SWIG_fail; + if ((nobjs < 6) || (nobjs > 6)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_fastjet__Selector, 0 | 0); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "fastjet::Selector const &""'"); @@ -31221,16 +30050,19 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_14(PyObject *SWIGUNUSEDPARM SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_GhostedAreaSpec" "', argument " "5"" of type '" "double""'"); } arg5 = static_cast< double >(val5); + ecode6 = SWIG_AsVal_double(swig_obj[5], &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_GhostedAreaSpec" "', argument " "6"" of type '" "double""'"); + } + arg6 = static_cast< double >(val6); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2,arg3,arg4,arg5,arg6); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -31239,7 +30071,71 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_14(PyObject *SWIGUNUSEDPARM } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_15(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_18(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + fastjet::Selector *arg1 = 0 ; + int arg2 ; + double arg3 ; + double arg4 ; + double arg5 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + double val3 ; + int ecode3 = 0 ; + double val4 ; + int ecode4 = 0 ; + double val5 ; + int ecode5 = 0 ; + fastjet::GhostedAreaSpec *result = 0 ; + + if ((nobjs < 5) || (nobjs > 5)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_fastjet__Selector, 0 | 0); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "fastjet::Selector const &""'"); + } + if (!argp1) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_GhostedAreaSpec" "', argument " "1"" of type '" "fastjet::Selector const &""'"); + } + arg1 = reinterpret_cast< fastjet::Selector * >(argp1); + ecode2 = SWIG_AsVal_int(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GhostedAreaSpec" "', argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + ecode3 = SWIG_AsVal_double(swig_obj[2], &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GhostedAreaSpec" "', argument " "3"" of type '" "double""'"); + } + arg3 = static_cast< double >(val3); + ecode4 = SWIG_AsVal_double(swig_obj[3], &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_GhostedAreaSpec" "', argument " "4"" of type '" "double""'"); + } + arg4 = static_cast< double >(val4); + ecode5 = SWIG_AsVal_double(swig_obj[4], &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_GhostedAreaSpec" "', argument " "5"" of type '" "double""'"); + } + arg5 = static_cast< double >(val5); + { + try { + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_19(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; fastjet::Selector *arg1 = 0 ; int arg2 ; @@ -31281,14 +30177,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_15(PyObject *SWIGUNUSEDPARM arg4 = static_cast< double >(val4); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -31297,7 +30191,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_15(PyObject *SWIGUNUSEDPARM } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_16(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_20(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; fastjet::Selector *arg1 = 0 ; int arg2 ; @@ -31331,14 +30225,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_16(PyObject *SWIGUNUSEDPARM arg3 = static_cast< double >(val3); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -31347,7 +30239,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_16(PyObject *SWIGUNUSEDPARM } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_17(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_21(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; fastjet::Selector *arg1 = 0 ; int arg2 ; @@ -31373,14 +30265,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_17(PyObject *SWIGUNUSEDPARM arg2 = static_cast< int >(val2); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -31389,7 +30279,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_17(PyObject *SWIGUNUSEDPARM } -SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_18(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_22(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; fastjet::Selector *arg1 = 0 ; void *argp1 = 0 ; @@ -31407,14 +30297,12 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_18(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *)new fastjet::GhostedAreaSpec((fastjet::Selector const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -31425,11 +30313,11 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec__SWIG_18(PyObject *SWIGUNUSEDPARM SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { Py_ssize_t argc; - PyObject *argv[8] = { + PyObject *argv[9] = { 0 }; - if (!(argc = SWIG_Python_UnpackTuple(args, "new_GhostedAreaSpec", 0, 7, argv))) SWIG_fail; + if (!(argc = SWIG_Python_UnpackTuple(args, "new_GhostedAreaSpec", 0, 8, argv))) SWIG_fail; --argc; if (argc == 0) { return _wrap_new_GhostedAreaSpec__SWIG_0(self, argc, argv); @@ -31439,7 +30327,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0); _v = SWIG_CheckState(res); if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_18(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_22(self, argc, argv); } } if (argc == 1) { @@ -31449,7 +30337,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_6(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_8(self, argc, argv); } } if (argc == 2) { @@ -31462,7 +30350,22 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_17(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_21(self, argc, argv); + } + } + } + if (argc == 2) { + int _v; + { + int res = SWIG_AsVal_double(argv[0], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_fastjet__BasicRandomT_double_t, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_new_GhostedAreaSpec__SWIG_1(self, argc, argv); } } } @@ -31478,7 +30381,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_5(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_7(self, argc, argv); } } } @@ -31494,7 +30397,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_12(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_15(self, argc, argv); } } } @@ -31513,7 +30416,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_16(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_20(self, argc, argv); } } } @@ -31535,7 +30438,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_4(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_6(self, argc, argv); } } } @@ -31557,7 +30460,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_11(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_14(self, argc, argv); } } } @@ -31582,7 +30485,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_15(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_19(self, argc, argv); } } } @@ -31610,7 +30513,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_3(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_5(self, argc, argv); } } } @@ -31638,7 +30541,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_10(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_13(self, argc, argv); } } } @@ -31669,7 +30572,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_14(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_18(self, argc, argv); } } } @@ -31703,7 +30606,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_2(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_4(self, argc, argv); } } } @@ -31737,7 +30640,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_9(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_12(self, argc, argv); } } } @@ -31774,7 +30677,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_13(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_17(self, argc, argv); } } } @@ -31814,7 +30717,7 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_1(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_3(self, argc, argv); } } } @@ -31854,7 +30757,95 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_8(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_11(self, argc, argv); + } + } + } + } + } + } + } + if (argc == 7) { + int _v; + int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_NO_NULL | 0); + _v = SWIG_CheckState(res); + if (_v) { + { + int res = SWIG_AsVal_int(argv[1], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[2], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[3], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[4], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[5], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_fastjet__BasicRandomT_double_t, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_new_GhostedAreaSpec__SWIG_16(self, argc, argv); + } + } + } + } + } + } + } + } + if (argc == 7) { + int _v; + { + int res = SWIG_AsVal_double(argv[0], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_int(argv[1], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[2], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[3], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[4], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[5], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_fastjet__BasicRandomT_double_t, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_new_GhostedAreaSpec__SWIG_2(self, argc, argv); + } } } } @@ -31899,7 +30890,58 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - return _wrap_new_GhostedAreaSpec__SWIG_7(self, argc, argv); + return _wrap_new_GhostedAreaSpec__SWIG_10(self, argc, argv); + } + } + } + } + } + } + } + } + if (argc == 8) { + int _v; + { + int res = SWIG_AsVal_double(argv[0], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[1], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_int(argv[2], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[3], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[4], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[5], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + { + int res = SWIG_AsVal_double(argv[6], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_fastjet__BasicRandomT_double_t, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_new_GhostedAreaSpec__SWIG_9(self, argc, argv); + } } } } @@ -31913,18 +30955,22 @@ SWIGINTERN PyObject *_wrap_new_GhostedAreaSpec(PyObject *self, PyObject *args) { SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_GhostedAreaSpec'.\n" " Possible C/C++ prototypes are:\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec()\n" + " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,fastjet::BasicRandom< double > *)\n" + " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,int,double,double,double,double,fastjet::BasicRandom< double > *)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,int,double,double,double,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,int,double,double,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,int,double,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,int,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,int)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double)\n" + " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,double,int,double,double,double,double,fastjet::BasicRandom< double > *)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,double,int,double,double,double,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,double,int,double,double,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,double,int,double,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,double,int,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,double,int)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(double,double)\n" + " fastjet::GhostedAreaSpec::GhostedAreaSpec(fastjet::Selector const &,int,double,double,double,double,fastjet::BasicRandom< double > *)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(fastjet::Selector const &,int,double,double,double,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(fastjet::Selector const &,int,double,double,double)\n" " fastjet::GhostedAreaSpec::GhostedAreaSpec(fastjet::Selector const &,int,double,double)\n" @@ -31951,14 +30997,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec__initialize(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - (arg1)->_initialize(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->_initialize(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -31984,14 +31028,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_rapmax(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_rapmax(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_rapmax(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32017,14 +31059,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_maxrap(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_maxrap(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_maxrap(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32050,14 +31090,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_etamax(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_etamax(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_etamax(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32083,14 +31121,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_maxeta(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_maxeta(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_maxeta(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32116,14 +31152,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_ghost_area(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->ghost_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32149,14 +31183,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_grid_scatter(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->grid_scatter(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->grid_scatter(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32182,14 +31214,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_pt_scatter(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->pt_scatter(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->pt_scatter(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32215,14 +31245,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_mean_ghost_pt(PyObject *SWIGUNUSEDPAR arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->mean_ghost_pt(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->mean_ghost_pt(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32248,14 +31276,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_repeat(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (int)((fastjet::GhostedAreaSpec const *)arg1)->repeat(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::GhostedAreaSpec const *)arg1)->repeat(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -32281,14 +31307,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_fj2_placement(PyObject *SWIGUNUSEDPAR arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (bool)((fastjet::GhostedAreaSpec const *)arg1)->fj2_placement(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::GhostedAreaSpec const *)arg1)->fj2_placement(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -32314,14 +31338,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_kt_scatter(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->kt_scatter(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->kt_scatter(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32347,14 +31369,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_mean_ghost_kt(PyObject *SWIGUNUSEDPAR arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->mean_ghost_kt(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->mean_ghost_kt(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32380,14 +31400,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_actual_ghost_area(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->actual_ghost_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->actual_ghost_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -32413,14 +31431,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_n_ghosts(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (int)((fastjet::GhostedAreaSpec const *)arg1)->n_ghosts(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::GhostedAreaSpec const *)arg1)->n_ghosts(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -32452,14 +31468,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_area(PyObject *SWIGUNUSEDPA arg2 = static_cast< double >(val2); { try { - (arg1)->set_ghost_area(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_ghost_area(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32491,14 +31505,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_rapmax(PyObject *SWIGUNUSED arg2 = static_cast< double >(val2); { try { - (arg1)->set_ghost_rapmax(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_ghost_rapmax(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32530,14 +31542,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_maxrap(PyObject *SWIGUNUSED arg2 = static_cast< double >(val2); { try { - (arg1)->set_ghost_maxrap(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_ghost_maxrap(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32569,14 +31579,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_etamax(PyObject *SWIGUNUSED arg2 = static_cast< double >(val2); { try { - (arg1)->set_ghost_etamax(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_ghost_etamax(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32608,14 +31616,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_ghost_maxeta(PyObject *SWIGUNUSED arg2 = static_cast< double >(val2); { try { - (arg1)->set_ghost_maxeta(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_ghost_maxeta(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32647,14 +31653,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_grid_scatter(PyObject *SWIGUNUSED arg2 = static_cast< double >(val2); { try { - (arg1)->set_grid_scatter(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_grid_scatter(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32686,14 +31690,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_pt_scatter(PyObject *SWIGUNUSEDPA arg2 = static_cast< double >(val2); { try { - (arg1)->set_pt_scatter(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_pt_scatter(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32725,14 +31727,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_mean_ghost_pt(PyObject *SWIGUNUSE arg2 = static_cast< double >(val2); { try { - (arg1)->set_mean_ghost_pt(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_mean_ghost_pt(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32764,14 +31764,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_repeat(PyObject *SWIGUNUSEDPARM(s arg2 = static_cast< int >(val2); { try { - (arg1)->set_repeat(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_repeat(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32803,14 +31801,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_kt_scatter(PyObject *SWIGUNUSEDPA arg2 = static_cast< double >(val2); { try { - (arg1)->set_kt_scatter(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_kt_scatter(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32842,14 +31838,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_mean_ghost_kt(PyObject *SWIGUNUSE arg2 = static_cast< double >(val2); { try { - (arg1)->set_mean_ghost_kt(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_mean_ghost_kt(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32881,14 +31875,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_fj2_placement(PyObject *SWIGUNUSE arg2 = static_cast< bool >(val2); { try { - (arg1)->set_fj2_placement(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_fj2_placement(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -32914,14 +31906,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_nphi(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (int)((fastjet::GhostedAreaSpec const *)arg1)->nphi(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::GhostedAreaSpec const *)arg1)->nphi(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -32947,14 +31937,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_nrap(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (int)((fastjet::GhostedAreaSpec const *)arg1)->nrap(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (int)((fastjet::GhostedAreaSpec const *)arg1)->nrap(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -32989,14 +31977,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_get_random_status(PyObject *SWIGUNUSE arg2 = reinterpret_cast< std::vector< int,std::allocator< int > > * >(argp2); { try { - ((fastjet::GhostedAreaSpec const *)arg1)->get_random_status(*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::GhostedAreaSpec const *)arg1)->get_random_status(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -33031,14 +32017,133 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_set_random_status(PyObject *SWIGUNUSE arg2 = reinterpret_cast< std::vector< int,std::allocator< int > > * >(argp2); { try { - (arg1)->set_random_status((std::vector< int,std::allocator< int > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_random_status((std::vector< int,std::allocator< int > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GhostedAreaSpec_with_fixed_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ; + std::vector< int,std::allocator< int > > *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + fastjet::GhostedAreaSpec result; + + if (!SWIG_Python_UnpackTuple(args, "GhostedAreaSpec_with_fixed_seed", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__GhostedAreaSpec, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GhostedAreaSpec_with_fixed_seed" "', argument " "1"" of type '" "fastjet::GhostedAreaSpec const *""'"); + } + arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GhostedAreaSpec_with_fixed_seed" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GhostedAreaSpec_with_fixed_seed" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + arg2 = reinterpret_cast< std::vector< int,std::allocator< int > > * >(argp2); + { + try { + result = ((fastjet::GhostedAreaSpec const *)arg1)->with_fixed_seed((std::vector< int,std::allocator< int > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj((new fastjet::GhostedAreaSpec(static_cast< const 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) { + PyObject *resultobj = 0; + fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ; + std::vector< int,std::allocator< int > > *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "GhostedAreaSpec_get_fixed_seed", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__GhostedAreaSpec, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GhostedAreaSpec_get_fixed_seed" "', argument " "1"" of type '" "fastjet::GhostedAreaSpec const *""'"); + } + arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GhostedAreaSpec_get_fixed_seed" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GhostedAreaSpec_get_fixed_seed" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > &""'"); + } + arg2 = reinterpret_cast< std::vector< int,std::allocator< int > > * >(argp2); + { + try { + ((fastjet::GhostedAreaSpec const *)arg1)->get_fixed_seed(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GhostedAreaSpec_get_last_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ; + std::vector< int,std::allocator< int > > *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "GhostedAreaSpec_get_last_seed", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__GhostedAreaSpec, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GhostedAreaSpec_get_last_seed" "', argument " "1"" of type '" "fastjet::GhostedAreaSpec const *""'"); + } + arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GhostedAreaSpec_get_last_seed" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GhostedAreaSpec_get_last_seed" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > &""'"); + } + arg2 = reinterpret_cast< std::vector< int,std::allocator< int > > * >(argp2); + { + try { + ((fastjet::GhostedAreaSpec const *)arg1)->get_last_seed(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -33063,14 +32168,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_checkpoint_random(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - (arg1)->checkpoint_random(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->checkpoint_random(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -33095,14 +32198,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_restore_checkpoint_random(PyObject *S arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - (arg1)->restore_checkpoint_random(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->restore_checkpoint_random(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -33128,14 +32229,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_description(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = ((fastjet::GhostedAreaSpec const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::GhostedAreaSpec const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -33170,14 +32269,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_add_ghosts(PyObject *SWIGUNUSEDPARM(s arg2 = reinterpret_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > * >(argp2); { try { - ((fastjet::GhostedAreaSpec const *)arg1)->add_ghosts(*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::GhostedAreaSpec const *)arg1)->add_ghosts(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -33203,14 +32300,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_random_at_own_risk(PyObject *SWIGUNUS arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (double)((fastjet::GhostedAreaSpec const *)arg1)->random_at_own_risk(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GhostedAreaSpec const *)arg1)->random_at_own_risk(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -33236,14 +32331,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_generator_at_own_risk(PyObject *SWIGU arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (fastjet::BasicRandom< double > *) &((fastjet::GhostedAreaSpec const *)arg1)->generator_at_own_risk(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BasicRandom< double > *) &((fastjet::GhostedAreaSpec const *)arg1)->generator_at_own_risk(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BasicRandomT_double_t, 0 | 0 ); return resultobj; @@ -33252,6 +32345,37 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec_generator_at_own_risk(PyObject *SWIGU } +SWIGINTERN PyObject *_wrap_GhostedAreaSpec_user_random_generator_at_own_risk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + fastjet::SharedPtr< fastjet::BasicRandom< double > > *result = 0 ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__GhostedAreaSpec, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GhostedAreaSpec_user_random_generator_at_own_risk" "', argument " "1"" of type '" "fastjet::GhostedAreaSpec *""'"); + } + arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); + { + try { + result = (fastjet::SharedPtr< fastjet::BasicRandom< double > > *) &(arg1)->user_random_generator_at_own_risk(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__SharedPtrT_fastjet__BasicRandomT_double_t_t, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GhostedAreaSpec___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; fastjet::GhostedAreaSpec *arg1 = (fastjet::GhostedAreaSpec *) 0 ; @@ -33269,14 +32393,12 @@ SWIGINTERN PyObject *_wrap_GhostedAreaSpec___str__(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = fastjet_GhostedAreaSpec___str__((fastjet::GhostedAreaSpec const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_GhostedAreaSpec___str__((fastjet::GhostedAreaSpec const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -33301,14 +32423,12 @@ SWIGINTERN PyObject *_wrap_delete_GhostedAreaSpec(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -33335,14 +32455,12 @@ SWIGINTERN PyObject *_wrap_new_VoronoiAreaSpec__SWIG_0(PyObject *SWIGUNUSEDPARM( if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::VoronoiAreaSpec *)new fastjet::VoronoiAreaSpec(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::VoronoiAreaSpec *)new fastjet::VoronoiAreaSpec(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__VoronoiAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -33366,14 +32484,12 @@ SWIGINTERN PyObject *_wrap_new_VoronoiAreaSpec__SWIG_1(PyObject *SWIGUNUSEDPARM( arg1 = static_cast< double >(val1); { try { - result = (fastjet::VoronoiAreaSpec *)new fastjet::VoronoiAreaSpec(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::VoronoiAreaSpec *)new fastjet::VoronoiAreaSpec(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__VoronoiAreaSpec, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -33430,14 +32546,12 @@ SWIGINTERN PyObject *_wrap_VoronoiAreaSpec_effective_Rfact(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< fastjet::VoronoiAreaSpec * >(argp1); { try { - result = (double)((fastjet::VoronoiAreaSpec const *)arg1)->effective_Rfact(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::VoronoiAreaSpec const *)arg1)->effective_Rfact(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -33463,14 +32577,12 @@ SWIGINTERN PyObject *_wrap_VoronoiAreaSpec_description(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::VoronoiAreaSpec * >(argp1); { try { - result = ((fastjet::VoronoiAreaSpec const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::VoronoiAreaSpec const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -33495,14 +32607,12 @@ SWIGINTERN PyObject *_wrap_delete_VoronoiAreaSpec(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::VoronoiAreaSpec * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -33529,14 +32639,12 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_0(PyObject *SWIGUNUSEDPARM(s if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__AreaDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -33571,14 +32679,12 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_1(PyObject *SWIGUNUSEDPARM(s arg2 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp2); { try { - result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition(arg1,(fastjet::GhostedAreaSpec const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition(arg1,(fastjet::GhostedAreaSpec const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__AreaDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -33613,14 +32719,12 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_2(PyObject *SWIGUNUSEDPARM(s arg2 = reinterpret_cast< fastjet::VoronoiAreaSpec * >(argp2); { try { - result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition(arg1,(fastjet::VoronoiAreaSpec const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition(arg1,(fastjet::VoronoiAreaSpec const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__AreaDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -33644,14 +32748,12 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_3(PyObject *SWIGUNUSEDPARM(s arg1 = static_cast< fastjet::AreaType >(val1); { try { - result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__AreaDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -33686,14 +32788,12 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_4(PyObject *SWIGUNUSEDPARM(s arg2 = static_cast< fastjet::AreaType >(val2); { try { - result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition((fastjet::GhostedAreaSpec const &)*arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition((fastjet::GhostedAreaSpec const &)*arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__AreaDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -33720,14 +32820,12 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_5(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp1); { try { - result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition((fastjet::GhostedAreaSpec const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition((fastjet::GhostedAreaSpec const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__AreaDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -33754,14 +32852,12 @@ SWIGINTERN PyObject *_wrap_new_AreaDefinition__SWIG_6(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::VoronoiAreaSpec * >(argp1); { try { - result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition((fastjet::VoronoiAreaSpec const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::AreaDefinition *)new fastjet::AreaDefinition((fastjet::VoronoiAreaSpec const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__AreaDefinition, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -33881,14 +32977,12 @@ SWIGINTERN PyObject *_wrap_AreaDefinition_description(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::AreaDefinition * >(argp1); { try { - result = ((fastjet::AreaDefinition const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::AreaDefinition const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -33914,14 +33008,12 @@ SWIGINTERN PyObject *_wrap_AreaDefinition_area_type(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::AreaDefinition * >(argp1); { try { - result = (fastjet::AreaType)((fastjet::AreaDefinition const *)arg1)->area_type(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::AreaType)((fastjet::AreaDefinition const *)arg1)->area_type(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -33945,14 +33037,12 @@ SWIGINTERN PyObject *_wrap_AreaDefinition_ghost_spec__SWIG_0(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::AreaDefinition * >(argp1); { try { - result = (fastjet::GhostedAreaSpec *) &((fastjet::AreaDefinition const *)arg1)->ghost_spec(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *) &((fastjet::AreaDefinition const *)arg1)->ghost_spec(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, 0 | 0 ); return resultobj; @@ -33976,14 +33066,12 @@ SWIGINTERN PyObject *_wrap_AreaDefinition_ghost_spec__SWIG_1(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::AreaDefinition * >(argp1); { try { - result = (fastjet::GhostedAreaSpec *) &(arg1)->ghost_spec(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GhostedAreaSpec *) &(arg1)->ghost_spec(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GhostedAreaSpec, 0 | 0 ); return resultobj; @@ -34045,14 +33133,12 @@ SWIGINTERN PyObject *_wrap_AreaDefinition_voronoi_spec(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::AreaDefinition * >(argp1); { try { - result = (fastjet::VoronoiAreaSpec *) &((fastjet::AreaDefinition const *)arg1)->voronoi_spec(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::VoronoiAreaSpec *) &((fastjet::AreaDefinition const *)arg1)->voronoi_spec(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__VoronoiAreaSpec, 0 | 0 ); return resultobj; @@ -34061,6 +33147,47 @@ SWIGINTERN PyObject *_wrap_AreaDefinition_voronoi_spec(PyObject *SWIGUNUSEDPARM( } +SWIGINTERN PyObject *_wrap_AreaDefinition_with_fixed_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ; + std::vector< int,std::allocator< int > > *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + fastjet::AreaDefinition result; + + if (!SWIG_Python_UnpackTuple(args, "AreaDefinition_with_fixed_seed", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__AreaDefinition, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AreaDefinition_with_fixed_seed" "', argument " "1"" of type '" "fastjet::AreaDefinition const *""'"); + } + arg1 = reinterpret_cast< fastjet::AreaDefinition * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AreaDefinition_with_fixed_seed" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AreaDefinition_with_fixed_seed" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + arg2 = reinterpret_cast< std::vector< int,std::allocator< int > > * >(argp2); + { + try { + result = ((fastjet::AreaDefinition const *)arg1)->with_fixed_seed((std::vector< int,std::allocator< int > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj((new fastjet::AreaDefinition(static_cast< const 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) { PyObject *resultobj = 0; fastjet::AreaDefinition *arg1 = (fastjet::AreaDefinition *) 0 ; @@ -34078,14 +33205,12 @@ SWIGINTERN PyObject *_wrap_AreaDefinition___str__(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::AreaDefinition * >(argp1); { try { - result = fastjet_AreaDefinition___str__((fastjet::AreaDefinition const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_AreaDefinition___str__((fastjet::AreaDefinition const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -34110,14 +33235,12 @@ SWIGINTERN PyObject *_wrap_delete_AreaDefinition(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::AreaDefinition * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -34144,14 +33267,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceAreaBase(PyObject *SWIGUNUSEDPARM( if (!SWIG_Python_UnpackTuple(args, "new_ClusterSequenceAreaBase", 0, 0, 0)) SWIG_fail; { try { - result = (fastjet::ClusterSequenceAreaBase *)new fastjet::ClusterSequenceAreaBase(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceAreaBase *)new fastjet::ClusterSequenceAreaBase(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceAreaBase, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -34176,14 +33297,12 @@ SWIGINTERN PyObject *_wrap_delete_ClusterSequenceAreaBase(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::ClusterSequenceAreaBase * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -34219,14 +33338,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area(PyObject *SWIGUNUSEDPARM arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->area((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->area((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -34262,14 +33379,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area_error(PyObject *SWIGUNUS arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -34305,14 +33420,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_area_4vector(PyObject *SWIGUN arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -34348,14 +33461,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_is_pure_ghost(PyObject *SWIGU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::ClusterSequenceAreaBase const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceAreaBase const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -34381,14 +33492,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_has_explicit_ghosts(PyObject arg1 = reinterpret_cast< fastjet::ClusterSequenceAreaBase * >(argp1); { try { - result = (bool)((fastjet::ClusterSequenceAreaBase const *)arg1)->has_explicit_ghosts(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceAreaBase const *)arg1)->has_explicit_ghosts(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -34424,14 +33533,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_empty_area(PyObject *SWIGUNUS arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->empty_area((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->empty_area((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -34480,14 +33587,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_empty_area_from_jets(PyObject arg3 = reinterpret_cast< fastjet::Selector * >(argp3); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->empty_area_from_jets((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->empty_area_from_jets((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); if (SWIG_IsNewObj(res2)) delete arg2; @@ -34525,14 +33630,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_n_empty_jets(PyObject *SWIGUN arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->n_empty_jets((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->n_empty_jets((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -34568,14 +33671,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_median_pt_per_unit_area(PyObj arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->median_pt_per_unit_area((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->median_pt_per_unit_area((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -34611,14 +33712,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_median_pt_per_unit_area_4vect arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->median_pt_per_unit_area_4vector((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->median_pt_per_unit_area_4vector((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -34662,14 +33761,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_median_pt_per_unit_something( arg3 = static_cast< bool >(val3); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->median_pt_per_unit_something((fastjet::Selector const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->median_pt_per_unit_something((fastjet::Selector const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -34744,14 +33841,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWI arg6 = reinterpret_cast< double * >(argp6); { try { - ((fastjet::ClusterSequenceAreaBase const *)arg1)->get_median_rho_and_sigma((fastjet::Selector const &)*arg2,arg3,*arg4,*arg5,*arg6); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceAreaBase const *)arg1)->get_median_rho_and_sigma((fastjet::Selector const &)*arg2,arg3,*arg4,*arg5,*arg6); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -34847,14 +33942,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWI arg8 = static_cast< bool >(val8); { try { - ((fastjet::ClusterSequenceAreaBase const *)arg1)->get_median_rho_and_sigma((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3,arg4,*arg5,*arg6,*arg7,arg8); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceAreaBase const *)arg1)->get_median_rho_and_sigma((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3,arg4,*arg5,*arg6,*arg7,arg8); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -34944,14 +34037,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWI arg7 = reinterpret_cast< double * >(argp7); { try { - ((fastjet::ClusterSequenceAreaBase const *)arg1)->get_median_rho_and_sigma((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3,arg4,*arg5,*arg6,*arg7); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceAreaBase const *)arg1)->get_median_rho_and_sigma((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3,arg4,*arg5,*arg6,*arg7); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -35017,14 +34108,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_get_median_rho_and_sigma__SWI arg5 = reinterpret_cast< double * >(argp5); { try { - ((fastjet::ClusterSequenceAreaBase const *)arg1)->get_median_rho_and_sigma((fastjet::Selector const &)*arg2,arg3,*arg4,*arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceAreaBase const *)arg1)->get_median_rho_and_sigma((fastjet::Selector const &)*arg2,arg3,*arg4,*arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -35261,14 +34350,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area__S arg6 = static_cast< bool >(val6); { try { - ((fastjet::ClusterSequenceAreaBase const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4,arg5,arg6); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceAreaBase const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4,arg5,arg6); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -35332,14 +34419,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area__S arg5 = static_cast< double >(val5); { try { - ((fastjet::ClusterSequenceAreaBase const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceAreaBase const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -35395,14 +34480,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_parabolic_pt_per_unit_area__S arg4 = reinterpret_cast< fastjet::Selector * >(argp4); { try { - ((fastjet::ClusterSequenceAreaBase const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceAreaBase const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -35548,14 +34631,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_0(PyObj arg3 = static_cast< double >(val3); { try { - result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jets(arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jets(arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -35587,14 +34668,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_1(PyObj arg2 = static_cast< double >(val2); { try { - result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jets(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jets(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -35637,14 +34716,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_2(PyObj arg3 = static_cast< double >(val3); { try { - result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jets((fastjet::Selector const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jets((fastjet::Selector const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -35679,14 +34756,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jets__SWIG_3(PyObj arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jets((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jets((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -35817,14 +34892,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet__SWIG_0(PyObje arg3 = static_cast< double >(val3); { try { - result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jet((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jet((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -35870,14 +34943,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_jet__SWIG_1(PyObje arg3 = reinterpret_cast< fastjet::Selector * >(argp3); { try { - result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jet((fastjet::PseudoJet const &)*arg2,(fastjet::Selector const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_jet((fastjet::PseudoJet const &)*arg2,(fastjet::Selector const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -35982,14 +35053,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_0(PyObjec arg4 = static_cast< bool >(val4); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_pt((fastjet::PseudoJet const &)*arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_pt((fastjet::PseudoJet const &)*arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -36032,14 +35101,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_1(PyObjec arg3 = static_cast< double >(val3); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_pt((fastjet::PseudoJet const &)*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_pt((fastjet::PseudoJet const &)*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -36093,14 +35160,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_2(PyObjec arg4 = static_cast< bool >(val4); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_pt((fastjet::PseudoJet const &)*arg2,(fastjet::Selector const &)*arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_pt((fastjet::PseudoJet const &)*arg2,(fastjet::Selector const &)*arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -36146,14 +35211,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceAreaBase_subtracted_pt__SWIG_3(PyObjec arg3 = reinterpret_cast< fastjet::Selector * >(argp3); { try { - result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_pt((fastjet::PseudoJet const &)*arg2,(fastjet::Selector const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceAreaBase const *)arg1)->subtracted_pt((fastjet::PseudoJet const &)*arg2,(fastjet::Selector const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -36294,14 +35357,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_n_hard_partic arg1 = reinterpret_cast< fastjet::ClusterSequenceActiveAreaExplicitGhosts * >(argp1); { try { - result = (unsigned int)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->n_hard_particles(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (unsigned int)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->n_hard_particles(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; @@ -36337,14 +35398,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_area(PyObject arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->area((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->area((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -36380,14 +35439,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_area_4vector( arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -36422,14 +35479,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_is_pure_ghost arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -36461,14 +35516,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_is_pure_ghost arg2 = static_cast< int >(val2); { try { - result = (bool)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->is_pure_ghost(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->is_pure_ghost(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -36540,14 +35593,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_has_explicit_ arg1 = reinterpret_cast< fastjet::ClusterSequenceActiveAreaExplicitGhosts * >(argp1); { try { - result = (bool)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->has_explicit_ghosts(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->has_explicit_ghosts(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -36583,14 +35634,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_empty_area(Py arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->empty_area((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->empty_area((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -36616,14 +35665,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_total_area(Py arg1 = reinterpret_cast< fastjet::ClusterSequenceActiveAreaExplicitGhosts * >(argp1); { try { - result = (double)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->total_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->total_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -36649,14 +35696,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_max_ghost_per arg1 = reinterpret_cast< fastjet::ClusterSequenceActiveAreaExplicitGhosts * >(argp1); { try { - result = (double)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->max_ghost_perp2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->max_ghost_perp2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -36682,14 +35727,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveAreaExplicitGhosts_has_dangerous arg1 = reinterpret_cast< fastjet::ClusterSequenceActiveAreaExplicitGhosts * >(argp1); { try { - result = (bool)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->has_dangerous_particles(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceActiveAreaExplicitGhosts const *)arg1)->has_dangerous_particles(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -36750,14 +35793,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_4(P arg4 = &temp4; { try { - result = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *)new fastjet::ClusterSequenceActiveAreaExplicitGhosts((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3,(bool const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *)new fastjet::ClusterSequenceActiveAreaExplicitGhosts((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3,(bool const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -36810,14 +35851,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_5(P arg3 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp3); { try { - result = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *)new fastjet::ClusterSequenceActiveAreaExplicitGhosts((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *)new fastjet::ClusterSequenceActiveAreaExplicitGhosts((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -36890,14 +35929,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_6(P arg5 = &temp5; { try { - result = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *)new fastjet::ClusterSequenceActiveAreaExplicitGhosts((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg3,arg4,(bool const &)*arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *)new fastjet::ClusterSequenceActiveAreaExplicitGhosts((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg3,arg4,(bool const &)*arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -36962,14 +35999,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveAreaExplicitGhosts__SWIG_7(P arg4 = static_cast< double >(val4); { try { - result = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *)new fastjet::ClusterSequenceActiveAreaExplicitGhosts((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceActiveAreaExplicitGhosts *)new fastjet::ClusterSequenceActiveAreaExplicitGhosts((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceActiveAreaExplicitGhosts, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -37106,14 +36141,12 @@ SWIGINTERN PyObject *_wrap_delete_ClusterSequenceActiveAreaExplicitGhosts(PyObje arg1 = reinterpret_cast< fastjet::ClusterSequenceActiveAreaExplicitGhosts * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -37140,14 +36173,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea__SWIG_0(PyObject *SWIGU if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::ClusterSequenceActiveArea *)new fastjet::ClusterSequenceActiveArea(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceActiveArea *)new fastjet::ClusterSequenceActiveArea(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceActiveArea, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -37183,14 +36214,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area(PyObject *SWIGUNUSEDPA arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->area((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->area((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -37226,14 +36255,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area_error(PyObject *SWIGUN arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -37269,14 +36296,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_area_4vector(PyObject *SWIG arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::ClusterSequenceActiveArea const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceActiveArea const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -37316,14 +36341,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area__SWIG_0(Py arg3 = static_cast< double >(val3); { try { - result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->pt_per_unit_area(arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->pt_per_unit_area(arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -37355,14 +36378,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area__SWIG_1(Py arg2 = static_cast< fastjet::ClusterSequenceActiveArea::mean_pt_strategies >(val2); { try { - result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->pt_per_unit_area(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->pt_per_unit_area(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -37386,14 +36407,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_pt_per_unit_area__SWIG_2(Py arg1 = reinterpret_cast< fastjet::ClusterSequenceActiveArea * >(argp1); { try { - result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->pt_per_unit_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->pt_per_unit_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -37493,14 +36512,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_empty_area(PyObject *SWIGUN arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->empty_area((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->empty_area((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -37536,14 +36553,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceActiveArea_n_empty_jets(PyObject *SWIG arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->n_empty_jets((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceActiveArea const *)arg1)->n_empty_jets((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -37604,14 +36619,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea__SWIG_3(PyObject *SWIGU arg4 = &temp4; { try { - result = (fastjet::ClusterSequenceActiveArea *)new fastjet::ClusterSequenceActiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3,(bool const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceActiveArea *)new fastjet::ClusterSequenceActiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3,(bool const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceActiveArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -37664,14 +36677,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceActiveArea__SWIG_4(PyObject *SWIGU arg3 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp3); { try { - result = (fastjet::ClusterSequenceActiveArea *)new fastjet::ClusterSequenceActiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceActiveArea *)new fastjet::ClusterSequenceActiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceActiveArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -37758,14 +36769,12 @@ SWIGINTERN PyObject *_wrap_delete_ClusterSequenceActiveArea(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::ClusterSequenceActiveArea * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -37792,14 +36801,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea__SWIG_0(PyObject if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::ClusterSequence1GhostPassiveArea *)new fastjet::ClusterSequence1GhostPassiveArea(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence1GhostPassiveArea *)new fastjet::ClusterSequence1GhostPassiveArea(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence1GhostPassiveArea, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -37835,14 +36842,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequence1GhostPassiveArea_n_empty_jets(PyObjec arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequence1GhostPassiveArea const *)arg1)->n_empty_jets((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequence1GhostPassiveArea const *)arg1)->n_empty_jets((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -37903,14 +36908,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea__SWIG_3(PyObject arg4 = &temp4; { try { - result = (fastjet::ClusterSequence1GhostPassiveArea *)new fastjet::ClusterSequence1GhostPassiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3,(bool const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence1GhostPassiveArea *)new fastjet::ClusterSequence1GhostPassiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3,(bool const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence1GhostPassiveArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -37963,14 +36966,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequence1GhostPassiveArea__SWIG_4(PyObject arg3 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp3); { try { - result = (fastjet::ClusterSequence1GhostPassiveArea *)new fastjet::ClusterSequence1GhostPassiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequence1GhostPassiveArea *)new fastjet::ClusterSequence1GhostPassiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequence1GhostPassiveArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -38057,14 +37058,12 @@ SWIGINTERN PyObject *_wrap_delete_ClusterSequence1GhostPassiveArea(PyObject *SWI arg1 = reinterpret_cast< fastjet::ClusterSequence1GhostPassiveArea * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -38111,14 +37110,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequencePassiveArea_empty_area(PyObject *SWIGU arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequencePassiveArea const *)arg1)->empty_area((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequencePassiveArea const *)arg1)->empty_area((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -38179,14 +37176,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequencePassiveArea__SWIG_2(PyObject *SWIG arg4 = &temp4; { try { - result = (fastjet::ClusterSequencePassiveArea *)new fastjet::ClusterSequencePassiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3,(bool const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequencePassiveArea *)new fastjet::ClusterSequencePassiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3,(bool const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequencePassiveArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -38239,14 +37234,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequencePassiveArea__SWIG_3(PyObject *SWIG arg3 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp3); { try { - result = (fastjet::ClusterSequencePassiveArea *)new fastjet::ClusterSequencePassiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequencePassiveArea *)new fastjet::ClusterSequencePassiveArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequencePassiveArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -38329,14 +37322,12 @@ SWIGINTERN PyObject *_wrap_delete_ClusterSequencePassiveArea(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::ClusterSequencePassiveArea * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -38372,14 +37363,12 @@ SWIGINTERN PyObject *_wrap_delete_ClusterSequenceVoronoiArea(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::ClusterSequenceVoronoiArea * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -38415,14 +37404,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area(PyObject *SWIGUNUSEDP arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceVoronoiArea const *)arg1)->area((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceVoronoiArea const *)arg1)->area((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -38458,14 +37445,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area_4vector(PyObject *SWI arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::ClusterSequenceVoronoiArea const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceVoronoiArea const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -38501,14 +37486,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceVoronoiArea_area_error(PyObject *SWIGU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceVoronoiArea const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceVoronoiArea const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -38569,14 +37552,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea__SWIG_3(PyObject *SWIG arg4 = &temp4; { try { - result = (fastjet::ClusterSequenceVoronoiArea *)new fastjet::ClusterSequenceVoronoiArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::VoronoiAreaSpec const &)*arg3,(bool const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceVoronoiArea *)new fastjet::ClusterSequenceVoronoiArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::VoronoiAreaSpec const &)*arg3,(bool const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceVoronoiArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -38629,14 +37610,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea__SWIG_4(PyObject *SWIG arg3 = reinterpret_cast< fastjet::VoronoiAreaSpec * >(argp3); { try { - result = (fastjet::ClusterSequenceVoronoiArea *)new fastjet::ClusterSequenceVoronoiArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::VoronoiAreaSpec const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceVoronoiArea *)new fastjet::ClusterSequenceVoronoiArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::VoronoiAreaSpec const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceVoronoiArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -38678,14 +37657,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceVoronoiArea__SWIG_5(PyObject *SWIG arg2 = reinterpret_cast< fastjet::JetDefinition * >(argp2); { try { - result = (fastjet::ClusterSequenceVoronoiArea *)new fastjet::ClusterSequenceVoronoiArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceVoronoiArea *)new fastjet::ClusterSequenceVoronoiArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceVoronoiArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -38793,14 +37770,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_def(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::ClusterSequenceArea * >(argp1); { try { - result = (fastjet::AreaDefinition *) &((fastjet::ClusterSequenceArea const *)arg1)->area_def(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::AreaDefinition *) &((fastjet::ClusterSequenceArea const *)arg1)->area_def(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__AreaDefinition, 0 | 0 ); return resultobj; @@ -38836,14 +37811,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area(PyObject *SWIGUNUSEDPARM(sel arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceArea const *)arg1)->area((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceArea const *)arg1)->area((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -38879,14 +37852,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_error(PyObject *SWIGUNUSEDPA arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceArea const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceArea const *)arg1)->area_error((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -38922,14 +37893,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_area_4vector(PyObject *SWIGUNUSED arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::ClusterSequenceArea const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::ClusterSequenceArea const *)arg1)->area_4vector((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -38965,14 +37934,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_empty_area(PyObject *SWIGUNUSEDPA arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceArea const *)arg1)->empty_area((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceArea const *)arg1)->empty_area((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -39008,14 +37975,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_n_empty_jets(PyObject *SWIGUNUSED arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - result = (double)((fastjet::ClusterSequenceArea const *)arg1)->n_empty_jets((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::ClusterSequenceArea const *)arg1)->n_empty_jets((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -39051,14 +38016,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_is_pure_ghost(PyObject *SWIGUNUSE arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::ClusterSequenceArea const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceArea const *)arg1)->is_pure_ghost((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -39084,14 +38047,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_has_explicit_ghosts(PyObject *SWI arg1 = reinterpret_cast< fastjet::ClusterSequenceArea * >(argp1); { try { - result = (bool)((fastjet::ClusterSequenceArea const *)arg1)->has_explicit_ghosts(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::ClusterSequenceArea const *)arg1)->has_explicit_ghosts(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -39187,14 +38148,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_0( arg8 = static_cast< bool >(val8); { try { - ((fastjet::ClusterSequenceArea const *)arg1)->get_median_rho_and_sigma((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3,arg4,*arg5,*arg6,*arg7,arg8); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceArea const *)arg1)->get_median_rho_and_sigma((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3,arg4,*arg5,*arg6,*arg7,arg8); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -39284,14 +38243,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_1( arg7 = reinterpret_cast< double * >(argp7); { try { - ((fastjet::ClusterSequenceArea const *)arg1)->get_median_rho_and_sigma((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3,arg4,*arg5,*arg6,*arg7); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceArea const *)arg1)->get_median_rho_and_sigma((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(fastjet::Selector const &)*arg3,arg4,*arg5,*arg6,*arg7); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -39357,14 +38314,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_2( arg5 = reinterpret_cast< double * >(argp5); { try { - ((fastjet::ClusterSequenceArea const *)arg1)->get_median_rho_and_sigma((fastjet::Selector const &)*arg2,arg3,*arg4,*arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceArea const *)arg1)->get_median_rho_and_sigma((fastjet::Selector const &)*arg2,arg3,*arg4,*arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -39439,14 +38394,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_get_median_rho_and_sigma__SWIG_3( arg6 = reinterpret_cast< double * >(argp6); { try { - ((fastjet::ClusterSequenceArea const *)arg1)->get_median_rho_and_sigma((fastjet::Selector const &)*arg2,arg3,*arg4,*arg5,*arg6); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceArea const *)arg1)->get_median_rho_and_sigma((fastjet::Selector const &)*arg2,arg3,*arg4,*arg5,*arg6); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -39683,14 +38636,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area__SWIG_ arg6 = static_cast< bool >(val6); { try { - ((fastjet::ClusterSequenceArea const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4,arg5,arg6); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceArea const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4,arg5,arg6); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -39754,14 +38705,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area__SWIG_ arg5 = static_cast< double >(val5); { try { - ((fastjet::ClusterSequenceArea const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceArea const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -39817,14 +38766,12 @@ SWIGINTERN PyObject *_wrap_ClusterSequenceArea_parabolic_pt_per_unit_area__SWIG_ arg4 = reinterpret_cast< fastjet::Selector * >(argp4); { try { - ((fastjet::ClusterSequenceArea const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::ClusterSequenceArea const *)arg1)->parabolic_pt_per_unit_area(*arg2,*arg3,(fastjet::Selector const &)*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -39981,14 +38928,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea__SWIG_3(PyObject *SWIGUNUSEDP arg3 = reinterpret_cast< fastjet::AreaDefinition * >(argp3); { try { - result = (fastjet::ClusterSequenceArea *)new fastjet::ClusterSequenceArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::AreaDefinition const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceArea *)new fastjet::ClusterSequenceArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::AreaDefinition const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -40041,14 +38986,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea__SWIG_4(PyObject *SWIGUNUSEDP arg3 = reinterpret_cast< fastjet::GhostedAreaSpec * >(argp3); { try { - result = (fastjet::ClusterSequenceArea *)new fastjet::ClusterSequenceArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceArea *)new fastjet::ClusterSequenceArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::GhostedAreaSpec const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -40101,14 +39044,12 @@ SWIGINTERN PyObject *_wrap_new_ClusterSequenceArea__SWIG_5(PyObject *SWIGUNUSEDP arg3 = reinterpret_cast< fastjet::VoronoiAreaSpec * >(argp3); { try { - result = (fastjet::ClusterSequenceArea *)new fastjet::ClusterSequenceArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::VoronoiAreaSpec const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::ClusterSequenceArea *)new fastjet::ClusterSequenceArea((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::VoronoiAreaSpec const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__ClusterSequenceArea, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -40202,14 +39143,12 @@ SWIGINTERN PyObject *_wrap_delete_ClusterSequenceArea(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::ClusterSequenceArea * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -40240,14 +39179,12 @@ SWIGINTERN PyObject *_wrap_new_UserInfoPython(PyObject *SWIGUNUSEDPARM(self), Py arg1 = swig_obj[0]; { try { - result = (fastjet::UserInfoPython *)new fastjet::UserInfoPython(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::UserInfoPython *)new fastjet::UserInfoPython(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__UserInfoPython, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -40273,14 +39210,12 @@ SWIGINTERN PyObject *_wrap_UserInfoPython_get_pyobj(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::UserInfoPython * >(argp1); { try { - result = (PyObject *)((fastjet::UserInfoPython const *)arg1)->get_pyobj(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (PyObject *)((fastjet::UserInfoPython const *)arg1)->get_pyobj(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = result; return resultobj; @@ -40305,14 +39240,12 @@ SWIGINTERN PyObject *_wrap_delete_UserInfoPython(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::UserInfoPython * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -40343,14 +39276,12 @@ SWIGINTERN PyObject *_wrap_cpp_string_from_py_str(PyObject *SWIGUNUSEDPARM(self) arg1 = swig_obj[0]; { try { - result = fastjet::cpp_string_from_py_str(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::cpp_string_from_py_str(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -40370,14 +39301,12 @@ SWIGINTERN PyObject *_wrap_cpp_string_from_str_py_obj(PyObject *SWIGUNUSEDPARM(s arg1 = swig_obj[0]; { try { - result = fastjet::cpp_string_from_str_py_obj(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::cpp_string_from_str_py_obj(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -40397,14 +39326,12 @@ SWIGINTERN PyObject *_wrap_cpp_string_from_name_py_obj(PyObject *SWIGUNUSEDPARM( arg1 = swig_obj[0]; { try { - result = fastjet::cpp_string_from_name_py_obj(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::cpp_string_from_name_py_obj(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -40424,14 +39351,12 @@ SWIGINTERN PyObject *_wrap_new_SelectorWorkerPython(PyObject *SWIGUNUSEDPARM(sel arg1 = swig_obj[0]; { try { - result = (fastjet::SelectorWorkerPython *)new fastjet::SelectorWorkerPython(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::SelectorWorkerPython *)new fastjet::SelectorWorkerPython(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__SelectorWorkerPython, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -40456,14 +39381,12 @@ SWIGINTERN PyObject *_wrap_delete_SelectorWorkerPython(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::SelectorWorkerPython * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -40489,14 +39412,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorkerPython_description(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::SelectorWorkerPython * >(argp1); { try { - result = ((fastjet::SelectorWorkerPython const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::SelectorWorkerPython const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -40532,14 +39453,12 @@ SWIGINTERN PyObject *_wrap_SelectorWorkerPython__pass(PyObject *SWIGUNUSEDPARM(s arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (bool)((fastjet::SelectorWorkerPython const *)arg1)->pass((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::SelectorWorkerPython const *)arg1)->pass((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -40570,14 +39489,12 @@ SWIGINTERN PyObject *_wrap_SelectorPython(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = swig_obj[0]; { try { - result = fastjet::SelectorPython(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::SelectorPython(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::Selector(static_cast< const fastjet::Selector& >(result))), SWIGTYPE_p_fastjet__Selector, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -40597,14 +39514,12 @@ SWIGINTERN PyObject *_wrap_new_RecombinerPython(PyObject *SWIGUNUSEDPARM(self), arg1 = swig_obj[0]; { try { - result = (fastjet::RecombinerPython *)new fastjet::RecombinerPython(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RecombinerPython *)new fastjet::RecombinerPython(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RecombinerPython, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -40629,14 +39544,12 @@ SWIGINTERN PyObject *_wrap_delete_RecombinerPython(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::RecombinerPython * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -40662,14 +39575,12 @@ SWIGINTERN PyObject *_wrap_RecombinerPython_description(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::RecombinerPython * >(argp1); { try { - result = ((fastjet::RecombinerPython const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::RecombinerPython const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -40726,14 +39637,12 @@ SWIGINTERN PyObject *_wrap_RecombinerPython_recombine(PyObject *SWIGUNUSEDPARM(s arg4 = reinterpret_cast< fastjet::PseudoJet * >(argp4); { try { - ((fastjet::RecombinerPython const *)arg1)->recombine((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::RecombinerPython const *)arg1)->recombine((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -40768,14 +39677,12 @@ SWIGINTERN PyObject *_wrap_RecombinerPython_preprocess(PyObject *SWIGUNUSEDPARM( arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - ((fastjet::RecombinerPython const *)arg1)->preprocess(*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::RecombinerPython const *)arg1)->preprocess(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -40826,14 +39733,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_0(PyObject *SWIGUNUSEDPARM( arg3 = static_cast< fastjet::Strategy >(val3); { try { - result = fastjet::JetDefinition0Param(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition0Param(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -40865,14 +39770,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_1(PyObject *SWIGUNUSEDPARM( arg2 = static_cast< fastjet::RecombinationScheme >(val2); { try { - result = fastjet::JetDefinition0Param(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition0Param(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -40896,14 +39799,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition0Param__SWIG_2(PyObject *SWIGUNUSEDPARM( arg1 = static_cast< fastjet::JetAlgorithm >(val1); { try { - result = fastjet::JetDefinition0Param(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition0Param(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -41018,14 +39919,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_0(PyObject *SWIGUNUSEDPARM( arg4 = static_cast< fastjet::Strategy >(val4); { try { - result = fastjet::JetDefinition1Param(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition1Param(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -41065,14 +39964,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_1(PyObject *SWIGUNUSEDPARM( arg3 = static_cast< fastjet::RecombinationScheme >(val3); { try { - result = fastjet::JetDefinition1Param(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition1Param(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -41104,14 +40001,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition1Param__SWIG_2(PyObject *SWIGUNUSEDPARM( arg2 = static_cast< double >(val2); { try { - result = fastjet::JetDefinition1Param(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition1Param(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -41252,14 +40147,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_0(PyObject *SWIGUNUSEDPARM( arg5 = static_cast< fastjet::Strategy >(val5); { try { - result = fastjet::JetDefinition2Param(arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition2Param(arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -41307,14 +40200,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_1(PyObject *SWIGUNUSEDPARM( arg4 = static_cast< fastjet::RecombinationScheme >(val4); { try { - result = fastjet::JetDefinition2Param(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition2Param(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -41354,14 +40245,12 @@ SWIGINTERN PyObject *_wrap_JetDefinition2Param__SWIG_2(PyObject *SWIGUNUSEDPARM( arg3 = static_cast< double >(val3); { try { - result = fastjet::JetDefinition2Param(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet::JetDefinition2Param(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::JetDefinition(static_cast< const fastjet::JetDefinition& >(result))), SWIGTYPE_p_fastjet__JetDefinition, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -41489,14 +40378,12 @@ SWIGINTERN PyObject *_wrap_delete_FunctionOfPseudoJetDouble(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::FunctionOfPseudoJet< double > * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -41522,14 +40409,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble_description(PyObject *SWIGU arg1 = reinterpret_cast< fastjet::FunctionOfPseudoJet< double > * >(argp1); { try { - result = ((fastjet::FunctionOfPseudoJet< double > const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::FunctionOfPseudoJet< double > const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -41565,14 +40450,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble_result(PyObject *SWIGUNUSED arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::FunctionOfPseudoJet< double > const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::FunctionOfPseudoJet< double > const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -41607,14 +40490,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___call____SWIG_0(PyObject * arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::FunctionOfPseudoJet< double > const *)arg1)->operator ()((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::FunctionOfPseudoJet< double > const *)arg1)->operator ()((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -41651,14 +40532,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___call____SWIG_1(PyObject * } { try { - result = ((fastjet::FunctionOfPseudoJet< double > const *)arg1)->operator ()((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::FunctionOfPseudoJet< double > const *)arg1)->operator ()((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); 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 ); if (SWIG_IsNewObj(res2)) delete arg2; @@ -41730,14 +40609,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetDouble___str__(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::FunctionOfPseudoJet< double > * >(argp1); { try { - result = fastjet_FunctionOfPseudoJet_Sl_double_Sg____str__((fastjet::FunctionOfPseudoJet< double > const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_FunctionOfPseudoJet_Sl_double_Sg____str__((fastjet::FunctionOfPseudoJet< double > const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -41769,14 +40646,12 @@ SWIGINTERN PyObject *_wrap_delete_FunctionOfPseudoJetPseudoJet(PyObject *SWIGUNU arg1 = reinterpret_cast< fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -41802,14 +40677,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet_description(PyObject *SW arg1 = reinterpret_cast< fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > * >(argp1); { try { - result = ((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -41845,14 +40718,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet_result(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -41887,14 +40758,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___call____SWIG_0(PyObjec arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1)->operator ()((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1)->operator ()((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -41931,14 +40800,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___call____SWIG_1(PyObjec } { try { - result = ((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1)->operator ()((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1)->operator ()((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); if (SWIG_IsNewObj(res2)) delete arg2; @@ -42010,14 +40877,12 @@ SWIGINTERN PyObject *_wrap_FunctionOfPseudoJetPseudoJet___str__(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > * >(argp1); { try { - result = fastjet_FunctionOfPseudoJet_Sl_fastjet_PseudoJet_Sg____str__((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_FunctionOfPseudoJet_Sl_fastjet_PseudoJet_Sg____str__((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -42049,14 +40914,12 @@ SWIGINTERN PyObject *_wrap_delete_Transformer(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::Transformer * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -42092,14 +40955,12 @@ SWIGINTERN PyObject *_wrap_Transformer_result(PyObject *SWIGUNUSEDPARM(self), Py arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::Transformer const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Transformer const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -42125,14 +40986,12 @@ SWIGINTERN PyObject *_wrap_Transformer_description(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::Transformer * >(argp1); { try { - result = ((fastjet::Transformer const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Transformer const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -42168,14 +41027,12 @@ SWIGINTERN PyObject *_wrap_new_Boost(PyObject *SWIGUNUSEDPARM(self), PyObject *a arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::Boost *)new fastjet::Boost((fastjet::PseudoJet const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Boost *)new fastjet::Boost((fastjet::PseudoJet const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Boost, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42211,14 +41068,12 @@ SWIGINTERN PyObject *_wrap_Boost_result(PyObject *SWIGUNUSEDPARM(self), PyObject arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::Boost const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Boost const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -42244,14 +41099,12 @@ SWIGINTERN PyObject *_wrap_Boost___str__(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::Boost * >(argp1); { try { - result = fastjet_Boost___str__((fastjet::Boost const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Boost___str__((fastjet::Boost const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -42276,14 +41129,12 @@ SWIGINTERN PyObject *_wrap_delete_Boost(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::Boost * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -42323,14 +41174,12 @@ SWIGINTERN PyObject *_wrap_new_Unboost(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::Unboost *)new fastjet::Unboost((fastjet::PseudoJet const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Unboost *)new fastjet::Unboost((fastjet::PseudoJet const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Unboost, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42366,14 +41215,12 @@ SWIGINTERN PyObject *_wrap_Unboost_result(PyObject *SWIGUNUSEDPARM(self), PyObje arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::Unboost const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Unboost const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -42399,14 +41246,12 @@ SWIGINTERN PyObject *_wrap_Unboost___str__(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< fastjet::Unboost * >(argp1); { try { - result = fastjet_Unboost___str__((fastjet::Unboost const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Unboost___str__((fastjet::Unboost const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -42431,14 +41276,12 @@ SWIGINTERN PyObject *_wrap_delete_Unboost(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = reinterpret_cast< fastjet::Unboost * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -42465,14 +41308,12 @@ SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_0(PyObject *SWIGUNUSEDPARM(self), if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::Recluster *)new fastjet::Recluster(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Recluster *)new fastjet::Recluster(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Recluster, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42515,14 +41356,12 @@ SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_1(PyObject *SWIGUNUSEDPARM(self), arg3 = static_cast< fastjet::Recluster::Keep >(val3); { try { - result = (fastjet::Recluster *)new fastjet::Recluster((fastjet::JetDefinition const &)*arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Recluster *)new fastjet::Recluster((fastjet::JetDefinition const &)*arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Recluster, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42557,14 +41396,12 @@ SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_2(PyObject *SWIGUNUSEDPARM(self), arg2 = static_cast< bool >(val2); { try { - result = (fastjet::Recluster *)new fastjet::Recluster((fastjet::JetDefinition const &)*arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Recluster *)new fastjet::Recluster((fastjet::JetDefinition const &)*arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Recluster, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42591,14 +41428,12 @@ SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_3(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::JetDefinition * >(argp1); { try { - result = (fastjet::Recluster *)new fastjet::Recluster((fastjet::JetDefinition const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Recluster *)new fastjet::Recluster((fastjet::JetDefinition const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Recluster, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42638,14 +41473,12 @@ SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_4(PyObject *SWIGUNUSEDPARM(self), arg3 = static_cast< fastjet::Recluster::Keep >(val3); { try { - result = (fastjet::Recluster *)new fastjet::Recluster(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Recluster *)new fastjet::Recluster(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Recluster, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42677,14 +41510,12 @@ SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_5(PyObject *SWIGUNUSEDPARM(self), arg2 = static_cast< double >(val2); { try { - result = (fastjet::Recluster *)new fastjet::Recluster(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Recluster *)new fastjet::Recluster(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Recluster, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42716,14 +41547,12 @@ SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_6(PyObject *SWIGUNUSEDPARM(self), arg2 = static_cast< fastjet::Recluster::Keep >(val2); { try { - result = (fastjet::Recluster *)new fastjet::Recluster(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Recluster *)new fastjet::Recluster(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Recluster, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42747,14 +41576,12 @@ SWIGINTERN PyObject *_wrap_new_Recluster__SWIG_7(PyObject *SWIGUNUSEDPARM(self), arg1 = static_cast< fastjet::JetAlgorithm >(val1); { try { - result = (fastjet::Recluster *)new fastjet::Recluster(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Recluster *)new fastjet::Recluster(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Recluster, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -42912,14 +41739,12 @@ SWIGINTERN PyObject *_wrap_delete_Recluster(PyObject *SWIGUNUSEDPARM(self), PyOb arg1 = reinterpret_cast< fastjet::Recluster * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -42951,14 +41776,12 @@ SWIGINTERN PyObject *_wrap_Recluster_set_acquire_recombiner(PyObject *SWIGUNUSED arg2 = static_cast< bool >(val2); { try { - (arg1)->set_acquire_recombiner(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_acquire_recombiner(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -42984,14 +41807,12 @@ SWIGINTERN PyObject *_wrap_Recluster_acquire_recombiner(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::Recluster * >(argp1); { try { - result = (bool)((fastjet::Recluster const *)arg1)->acquire_recombiner(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Recluster const *)arg1)->acquire_recombiner(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -43023,14 +41844,12 @@ SWIGINTERN PyObject *_wrap_Recluster_set_cambridge_optimisation(PyObject *SWIGUN arg2 = static_cast< bool >(val2); { try { - (arg1)->set_cambridge_optimisation(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_cambridge_optimisation(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -43062,14 +41881,12 @@ SWIGINTERN PyObject *_wrap_Recluster_set_cambridge_optimization(PyObject *SWIGUN arg2 = static_cast< bool >(val2); { try { - (arg1)->set_cambridge_optimization(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_cambridge_optimization(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -43095,14 +41912,12 @@ SWIGINTERN PyObject *_wrap_Recluster_cambridge_optimization(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::Recluster * >(argp1); { try { - result = (bool)(arg1)->cambridge_optimization(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)(arg1)->cambridge_optimization(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -43128,14 +41943,12 @@ SWIGINTERN PyObject *_wrap_Recluster_cambridge_optimisation(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::Recluster * >(argp1); { try { - result = (bool)(arg1)->cambridge_optimisation(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)(arg1)->cambridge_optimisation(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -43167,14 +41980,12 @@ SWIGINTERN PyObject *_wrap_Recluster_set_keep(PyObject *SWIGUNUSEDPARM(self), Py arg2 = static_cast< fastjet::Recluster::Keep >(val2); { try { - (arg1)->set_keep(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_keep(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -43200,14 +42011,12 @@ SWIGINTERN PyObject *_wrap_Recluster_keep(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = reinterpret_cast< fastjet::Recluster * >(argp1); { try { - result = (fastjet::Recluster::Keep)((fastjet::Recluster const *)arg1)->keep(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Recluster::Keep)((fastjet::Recluster const *)arg1)->keep(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -43233,14 +42042,12 @@ SWIGINTERN PyObject *_wrap_Recluster_description(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::Recluster * >(argp1); { try { - result = ((fastjet::Recluster const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Recluster const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -43276,14 +42083,12 @@ SWIGINTERN PyObject *_wrap_Recluster_result(PyObject *SWIGUNUSEDPARM(self), PyOb arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::Recluster const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Recluster const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -43330,14 +42135,12 @@ SWIGINTERN PyObject *_wrap_Recluster_get_new_jets_and_def(PyObject *SWIGUNUSEDPA arg3 = reinterpret_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > * >(argp3); { try { - result = (bool)((fastjet::Recluster const *)arg1)->get_new_jets_and_def((fastjet::PseudoJet const &)*arg2,*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Recluster const *)arg1)->get_new_jets_and_def((fastjet::PseudoJet const &)*arg2,*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -43381,14 +42184,12 @@ SWIGINTERN PyObject *_wrap_Recluster_generate_output_jet(PyObject *SWIGUNUSEDPAR arg3 = static_cast< bool >(val3); { try { - result = ((fastjet::Recluster const *)arg1)->generate_output_jet(*arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Recluster const *)arg1)->generate_output_jet(*arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -43414,14 +42215,12 @@ SWIGINTERN PyObject *_wrap_Recluster___str__(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< fastjet::Recluster * >(argp1); { try { - result = fastjet_Recluster___str__((fastjet::Recluster const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Recluster___str__((fastjet::Recluster const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -43448,14 +42247,12 @@ SWIGINTERN PyObject *_wrap_new_Filter__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::Filter *)new fastjet::Filter(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Filter *)new fastjet::Filter(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Filter, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -43511,14 +42308,12 @@ SWIGINTERN PyObject *_wrap_new_Filter__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py arg3 = static_cast< double >(val3); { try { - result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Filter, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -43566,14 +42361,12 @@ SWIGINTERN PyObject *_wrap_new_Filter__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py } { try { - result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Filter, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -43621,14 +42414,12 @@ SWIGINTERN PyObject *_wrap_new_Filter__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py arg3 = static_cast< double >(val3); { try { - result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Filter, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -43668,14 +42459,12 @@ SWIGINTERN PyObject *_wrap_new_Filter__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py } { try { - result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Filter, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -43723,14 +42512,12 @@ SWIGINTERN PyObject *_wrap_new_Filter__SWIG_5(PyObject *SWIGUNUSEDPARM(self), Py arg3 = static_cast< double >(val3); { try { - result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Filter, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -43770,14 +42557,12 @@ SWIGINTERN PyObject *_wrap_new_Filter__SWIG_6(PyObject *SWIGUNUSEDPARM(self), Py } { try { - result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Filter *)new fastjet::Filter(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Filter, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -43924,14 +42709,12 @@ SWIGINTERN PyObject *_wrap_delete_Filter(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::Filter * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -43963,14 +42746,12 @@ SWIGINTERN PyObject *_wrap_Filter_set_subtractor(PyObject *SWIGUNUSEDPARM(self), arg2 = reinterpret_cast< fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > * >(argp2); { try { - (arg1)->set_subtractor((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_subtractor((fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -43996,14 +42777,12 @@ SWIGINTERN PyObject *_wrap_Filter_subtractor(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< fastjet::Filter * >(argp1); { try { - result = (fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *)((fastjet::Filter const *)arg1)->subtractor(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::FunctionOfPseudoJet< fastjet::PseudoJet > *)((fastjet::Filter const *)arg1)->subtractor(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_fastjet__PseudoJet_t, 0 | 0 ); return resultobj; @@ -44039,14 +42818,12 @@ SWIGINTERN PyObject *_wrap_Filter_result(PyObject *SWIGUNUSEDPARM(self), PyObjec arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::Filter const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Filter const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -44072,14 +42849,12 @@ SWIGINTERN PyObject *_wrap_Filter_description(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::Filter * >(argp1); { try { - result = ((fastjet::Filter const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Filter const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -44105,14 +42880,12 @@ SWIGINTERN PyObject *_wrap_Filter___str__(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = reinterpret_cast< fastjet::Filter * >(argp1); { try { - result = fastjet_Filter___str__((fastjet::Filter const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Filter___str__((fastjet::Filter const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -44160,14 +42933,12 @@ SWIGINTERN PyObject *_wrap_new_FilterStructure__SWIG_0(PyObject *SWIGUNUSEDPARM( arg2 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp2); { try { - result = (fastjet::FilterStructure *)new fastjet::FilterStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition::Recombiner const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::FilterStructure *)new fastjet::FilterStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1,(fastjet::JetDefinition::Recombiner const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__FilterStructure, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -44198,14 +42969,12 @@ SWIGINTERN PyObject *_wrap_new_FilterStructure__SWIG_1(PyObject *SWIGUNUSEDPARM( } { try { - result = (fastjet::FilterStructure *)new fastjet::FilterStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::FilterStructure *)new fastjet::FilterStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__FilterStructure, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -44271,14 +43040,12 @@ SWIGINTERN PyObject *_wrap_delete_FilterStructure(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::FilterStructure * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -44304,14 +43071,12 @@ SWIGINTERN PyObject *_wrap_FilterStructure_description(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::FilterStructure * >(argp1); { try { - result = ((fastjet::FilterStructure const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::FilterStructure const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -44337,14 +43102,12 @@ SWIGINTERN PyObject *_wrap_FilterStructure_rejected(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::FilterStructure * >(argp1); { try { - result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *) &((fastjet::FilterStructure const *)arg1)->rejected(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *) &((fastjet::FilterStructure const *)arg1)->rejected(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(*result)); return resultobj; @@ -44395,14 +43158,12 @@ SWIGINTERN PyObject *_wrap_new_Pruner__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py arg3 = static_cast< double >(val3); { try { - result = (fastjet::Pruner *)new fastjet::Pruner(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Pruner *)new fastjet::Pruner(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Pruner, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -44445,14 +43206,12 @@ SWIGINTERN PyObject *_wrap_new_Pruner__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py arg3 = static_cast< double >(val3); { try { - result = (fastjet::Pruner *)new fastjet::Pruner((fastjet::JetDefinition const &)*arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Pruner *)new fastjet::Pruner((fastjet::JetDefinition const &)*arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Pruner, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -44495,14 +43254,12 @@ SWIGINTERN PyObject *_wrap_new_Pruner__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py arg3 = reinterpret_cast< fastjet::FunctionOfPseudoJet< double > * >(argp3); { try { - result = (fastjet::Pruner *)new fastjet::Pruner((fastjet::JetDefinition const &)*arg1,(fastjet::FunctionOfPseudoJet< double > const *)arg2,(fastjet::FunctionOfPseudoJet< double > const *)arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Pruner *)new fastjet::Pruner((fastjet::JetDefinition const &)*arg1,(fastjet::FunctionOfPseudoJet< double > const *)arg2,(fastjet::FunctionOfPseudoJet< double > const *)arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Pruner, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -44617,14 +43374,12 @@ SWIGINTERN PyObject *_wrap_Pruner_result(PyObject *SWIGUNUSEDPARM(self), PyObjec arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::Pruner const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Pruner const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -44650,14 +43405,12 @@ SWIGINTERN PyObject *_wrap_Pruner_description(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::Pruner * >(argp1); { try { - result = ((fastjet::Pruner const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Pruner const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -44683,14 +43436,12 @@ SWIGINTERN PyObject *_wrap_Pruner___str__(PyObject *SWIGUNUSEDPARM(self), PyObje arg1 = reinterpret_cast< fastjet::Pruner * >(argp1); { try { - result = fastjet_Pruner___str__((fastjet::Pruner const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Pruner___str__((fastjet::Pruner const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -44715,14 +43466,12 @@ SWIGINTERN PyObject *_wrap_delete_Pruner(PyObject *SWIGUNUSEDPARM(self), PyObjec arg1 = reinterpret_cast< fastjet::Pruner * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -44762,14 +43511,12 @@ SWIGINTERN PyObject *_wrap_new_PrunerStructure(PyObject *SWIGUNUSEDPARM(self), P arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::PrunerStructure *)new fastjet::PrunerStructure((fastjet::PseudoJet const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PrunerStructure *)new fastjet::PrunerStructure((fastjet::PseudoJet const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PrunerStructure, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -44795,14 +43542,12 @@ SWIGINTERN PyObject *_wrap_PrunerStructure_description(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::PrunerStructure * >(argp1); { try { - result = ((fastjet::PrunerStructure const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PrunerStructure const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -44828,14 +43573,12 @@ SWIGINTERN PyObject *_wrap_PrunerStructure_rejected(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::PrunerStructure * >(argp1); { try { - result = ((fastjet::PrunerStructure const *)arg1)->rejected(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PrunerStructure const *)arg1)->rejected(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -44861,14 +43604,12 @@ SWIGINTERN PyObject *_wrap_PrunerStructure_extra_jets(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::PrunerStructure * >(argp1); { try { - result = ((fastjet::PrunerStructure const *)arg1)->extra_jets(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PrunerStructure const *)arg1)->extra_jets(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -44894,14 +43635,12 @@ SWIGINTERN PyObject *_wrap_PrunerStructure_Rcut(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::PrunerStructure * >(argp1); { try { - result = (double)((fastjet::PrunerStructure const *)arg1)->Rcut(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PrunerStructure const *)arg1)->Rcut(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -44927,14 +43666,12 @@ SWIGINTERN PyObject *_wrap_PrunerStructure_zcut(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::PrunerStructure * >(argp1); { try { - result = (double)((fastjet::PrunerStructure const *)arg1)->zcut(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PrunerStructure const *)arg1)->zcut(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -44959,14 +43696,12 @@ SWIGINTERN PyObject *_wrap_delete_PrunerStructure(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::PrunerStructure * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45018,14 +43753,12 @@ SWIGINTERN PyObject *_wrap_new_PruningRecombiner(PyObject *SWIGUNUSEDPARM(self), arg3 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp3); { try { - result = (fastjet::PruningRecombiner *)new fastjet::PruningRecombiner(arg1,arg2,(fastjet::JetDefinition::Recombiner const *)arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PruningRecombiner *)new fastjet::PruningRecombiner(arg1,arg2,(fastjet::JetDefinition::Recombiner const *)arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PruningRecombiner, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -45082,14 +43815,12 @@ SWIGINTERN PyObject *_wrap_PruningRecombiner_recombine(PyObject *SWIGUNUSEDPARM( arg4 = reinterpret_cast< fastjet::PseudoJet * >(argp4); { try { - ((fastjet::PruningRecombiner const *)arg1)->recombine((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,*arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::PruningRecombiner const *)arg1)->recombine((fastjet::PseudoJet const &)*arg2,(fastjet::PseudoJet const &)*arg3,*arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45115,14 +43846,12 @@ SWIGINTERN PyObject *_wrap_PruningRecombiner_description(PyObject *SWIGUNUSEDPAR arg1 = reinterpret_cast< fastjet::PruningRecombiner * >(argp1); { try { - result = ((fastjet::PruningRecombiner const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PruningRecombiner const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -45148,14 +43877,12 @@ SWIGINTERN PyObject *_wrap_PruningRecombiner_rejected(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::PruningRecombiner * >(argp1); { try { - result = (std::vector< unsigned int,std::allocator< unsigned int > > *) &((fastjet::PruningRecombiner const *)arg1)->rejected(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (std::vector< unsigned int,std::allocator< unsigned int > > *) &((fastjet::PruningRecombiner const *)arg1)->rejected(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0 | 0 ); return resultobj; @@ -45180,14 +43907,12 @@ SWIGINTERN PyObject *_wrap_PruningRecombiner_clear_rejected(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::PruningRecombiner * >(argp1); { try { - (arg1)->clear_rejected(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->clear_rejected(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45212,14 +43937,12 @@ SWIGINTERN PyObject *_wrap_delete_PruningRecombiner(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::PruningRecombiner * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45274,14 +43997,12 @@ SWIGINTERN PyObject *_wrap_new_PruningPlugin(PyObject *SWIGUNUSEDPARM(self), PyO arg3 = static_cast< double >(val3); { try { - result = (fastjet::PruningPlugin *)new fastjet::PruningPlugin((fastjet::JetDefinition const &)*arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PruningPlugin *)new fastjet::PruningPlugin((fastjet::JetDefinition const &)*arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__PruningPlugin, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -45316,14 +44037,12 @@ SWIGINTERN PyObject *_wrap_PruningPlugin_run_clustering(PyObject *SWIGUNUSEDPARM arg2 = reinterpret_cast< fastjet::ClusterSequence * >(argp2); { try { - ((fastjet::PruningPlugin const *)arg1)->run_clustering(*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + ((fastjet::PruningPlugin const *)arg1)->run_clustering(*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45349,14 +44068,12 @@ SWIGINTERN PyObject *_wrap_PruningPlugin_description(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::PruningPlugin * >(argp1); { try { - result = ((fastjet::PruningPlugin const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::PruningPlugin const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -45382,14 +44099,12 @@ SWIGINTERN PyObject *_wrap_PruningPlugin_R(PyObject *SWIGUNUSEDPARM(self), PyObj arg1 = reinterpret_cast< fastjet::PruningPlugin * >(argp1); { try { - result = (double)((fastjet::PruningPlugin const *)arg1)->R(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::PruningPlugin const *)arg1)->R(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -45414,14 +44129,12 @@ SWIGINTERN PyObject *_wrap_delete_PruningPlugin(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::PruningPlugin * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45464,14 +44177,12 @@ SWIGINTERN PyObject *_wrap_new_CASubJetTagger__SWIG_0(PyObject *SWIGUNUSEDPARM(s arg2 = static_cast< double >(val2); { try { - result = (fastjet::CASubJetTagger *)new fastjet::CASubJetTagger(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::CASubJetTagger *)new fastjet::CASubJetTagger(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__CASubJetTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -45495,14 +44206,12 @@ SWIGINTERN PyObject *_wrap_new_CASubJetTagger__SWIG_1(PyObject *SWIGUNUSEDPARM(s arg1 = static_cast< fastjet::CASubJetTagger::ScaleChoice >(val1); { try { - result = (fastjet::CASubJetTagger *)new fastjet::CASubJetTagger(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::CASubJetTagger *)new fastjet::CASubJetTagger(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__CASubJetTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -45518,14 +44227,12 @@ SWIGINTERN PyObject *_wrap_new_CASubJetTagger__SWIG_2(PyObject *SWIGUNUSEDPARM(s if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::CASubJetTagger *)new fastjet::CASubJetTagger(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::CASubJetTagger *)new fastjet::CASubJetTagger(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__CASubJetTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -45605,14 +44312,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTagger_set_dr_min(PyObject *SWIGUNUSEDPARM(se arg2 = static_cast< double >(val2); { try { - (arg1)->set_dr_min(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_dr_min(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45638,14 +44343,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTagger_description(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::CASubJetTagger * >(argp1); { try { - result = ((fastjet::CASubJetTagger const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::CASubJetTagger const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -45676,14 +44379,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTagger_set_absolute_z_cut__SWIG_0(PyObject *S arg2 = static_cast< bool >(val2); { try { - (arg1)->set_absolute_z_cut(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_absolute_z_cut(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45706,14 +44407,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTagger_set_absolute_z_cut__SWIG_1(PyObject *S arg1 = reinterpret_cast< fastjet::CASubJetTagger * >(argp1); { try { - (arg1)->set_absolute_z_cut(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_absolute_z_cut(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45791,14 +44490,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTagger_result(PyObject *SWIGUNUSEDPARM(self), arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::CASubJetTagger const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::CASubJetTagger const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -45824,14 +44521,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTagger___str__(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::CASubJetTagger * >(argp1); { try { - result = fastjet_CASubJetTagger___str__((fastjet::CASubJetTagger const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_CASubJetTagger___str__((fastjet::CASubJetTagger const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -45856,14 +44551,12 @@ SWIGINTERN PyObject *_wrap_delete_CASubJetTagger(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::CASubJetTagger * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -45903,14 +44596,12 @@ SWIGINTERN PyObject *_wrap_new_CASubJetTaggerStructure(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::CASubJetTaggerStructure *)new fastjet::CASubJetTaggerStructure((fastjet::PseudoJet const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::CASubJetTaggerStructure *)new fastjet::CASubJetTaggerStructure((fastjet::PseudoJet const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__CASubJetTaggerStructure, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -45936,14 +44627,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_scale_choice(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::CASubJetTaggerStructure * >(argp1); { try { - result = (fastjet::CASubJetTagger::ScaleChoice)((fastjet::CASubJetTaggerStructure const *)arg1)->scale_choice(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::CASubJetTagger::ScaleChoice)((fastjet::CASubJetTaggerStructure const *)arg1)->scale_choice(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; @@ -45969,14 +44658,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_distance(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::CASubJetTaggerStructure * >(argp1); { try { - result = (double)((fastjet::CASubJetTaggerStructure const *)arg1)->distance(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::CASubJetTaggerStructure const *)arg1)->distance(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -46002,14 +44689,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_z(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::CASubJetTaggerStructure * >(argp1); { try { - result = (double)((fastjet::CASubJetTaggerStructure const *)arg1)->z(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::CASubJetTaggerStructure const *)arg1)->z(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -46035,14 +44720,12 @@ SWIGINTERN PyObject *_wrap_CASubJetTaggerStructure_absolute_z(PyObject *SWIGUNUS arg1 = reinterpret_cast< fastjet::CASubJetTaggerStructure * >(argp1); { try { - result = (bool)((fastjet::CASubJetTaggerStructure const *)arg1)->absolute_z(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::CASubJetTaggerStructure const *)arg1)->absolute_z(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -46067,14 +44750,12 @@ SWIGINTERN PyObject *_wrap_delete_CASubJetTaggerStructure(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::CASubJetTaggerStructure * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -46117,14 +44798,12 @@ SWIGINTERN PyObject *_wrap_new_MassDropTagger__SWIG_0(PyObject *SWIGUNUSEDPARM(s arg2 = static_cast< double >(val2); { try { - result = (fastjet::MassDropTagger *)new fastjet::MassDropTagger(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::MassDropTagger *)new fastjet::MassDropTagger(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__MassDropTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -46148,14 +44827,12 @@ SWIGINTERN PyObject *_wrap_new_MassDropTagger__SWIG_1(PyObject *SWIGUNUSEDPARM(s arg1 = static_cast< double >(val1); { try { - result = (fastjet::MassDropTagger *)new fastjet::MassDropTagger(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::MassDropTagger *)new fastjet::MassDropTagger(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__MassDropTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -46171,14 +44848,12 @@ SWIGINTERN PyObject *_wrap_new_MassDropTagger__SWIG_2(PyObject *SWIGUNUSEDPARM(s if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::MassDropTagger *)new fastjet::MassDropTagger(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::MassDropTagger *)new fastjet::MassDropTagger(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__MassDropTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -46252,14 +44927,12 @@ SWIGINTERN PyObject *_wrap_MassDropTagger_description(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::MassDropTagger * >(argp1); { try { - result = ((fastjet::MassDropTagger const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::MassDropTagger const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -46295,14 +44968,12 @@ SWIGINTERN PyObject *_wrap_MassDropTagger_result(PyObject *SWIGUNUSEDPARM(self), arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::MassDropTagger const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::MassDropTagger const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -46328,14 +44999,12 @@ SWIGINTERN PyObject *_wrap_MassDropTagger___str__(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::MassDropTagger * >(argp1); { try { - result = fastjet_MassDropTagger___str__((fastjet::MassDropTagger const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_MassDropTagger___str__((fastjet::MassDropTagger const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -46360,14 +45029,12 @@ SWIGINTERN PyObject *_wrap_delete_MassDropTagger(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::MassDropTagger * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -46407,14 +45074,12 @@ SWIGINTERN PyObject *_wrap_new_MassDropTaggerStructure(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::PseudoJet * >(argp1); { try { - result = (fastjet::MassDropTaggerStructure *)new fastjet::MassDropTaggerStructure((fastjet::PseudoJet const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::MassDropTaggerStructure *)new fastjet::MassDropTaggerStructure((fastjet::PseudoJet const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__MassDropTaggerStructure, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -46440,14 +45105,12 @@ SWIGINTERN PyObject *_wrap_MassDropTaggerStructure_mu(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::MassDropTaggerStructure * >(argp1); { try { - result = (double)((fastjet::MassDropTaggerStructure const *)arg1)->mu(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::MassDropTaggerStructure const *)arg1)->mu(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -46473,14 +45136,12 @@ SWIGINTERN PyObject *_wrap_MassDropTaggerStructure_y(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< fastjet::MassDropTaggerStructure * >(argp1); { try { - result = (double)((fastjet::MassDropTaggerStructure const *)arg1)->y(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::MassDropTaggerStructure const *)arg1)->y(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -46505,14 +45166,12 @@ SWIGINTERN PyObject *_wrap_delete_MassDropTaggerStructure(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::MassDropTaggerStructure * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -46579,14 +45238,12 @@ SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_0(PyObject *SW arg4 = static_cast< bool >(val4); { try { - result = (fastjet::RestFrameNSubjettinessTagger *)new fastjet::RestFrameNSubjettinessTagger(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RestFrameNSubjettinessTagger *)new fastjet::RestFrameNSubjettinessTagger(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RestFrameNSubjettinessTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -46634,14 +45291,12 @@ SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_1(PyObject *SW arg3 = static_cast< double >(val3); { try { - result = (fastjet::RestFrameNSubjettinessTagger *)new fastjet::RestFrameNSubjettinessTagger(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RestFrameNSubjettinessTagger *)new fastjet::RestFrameNSubjettinessTagger(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RestFrameNSubjettinessTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -46681,14 +45336,12 @@ SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_2(PyObject *SW arg2 = static_cast< double >(val2); { try { - result = (fastjet::RestFrameNSubjettinessTagger *)new fastjet::RestFrameNSubjettinessTagger(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RestFrameNSubjettinessTagger *)new fastjet::RestFrameNSubjettinessTagger(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RestFrameNSubjettinessTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -46720,14 +45373,12 @@ SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTagger__SWIG_3(PyObject *SW } { try { - result = (fastjet::RestFrameNSubjettinessTagger *)new fastjet::RestFrameNSubjettinessTagger(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RestFrameNSubjettinessTagger *)new fastjet::RestFrameNSubjettinessTagger(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RestFrameNSubjettinessTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -46841,14 +45492,12 @@ SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger_description(PyObject *SW arg1 = reinterpret_cast< fastjet::RestFrameNSubjettinessTagger * >(argp1); { try { - result = ((fastjet::RestFrameNSubjettinessTagger const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::RestFrameNSubjettinessTagger const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -46884,14 +45533,12 @@ SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger_result(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::RestFrameNSubjettinessTagger const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::RestFrameNSubjettinessTagger const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -46917,14 +45564,12 @@ SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTagger___str__(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::RestFrameNSubjettinessTagger * >(argp1); { try { - result = fastjet_RestFrameNSubjettinessTagger___str__((fastjet::RestFrameNSubjettinessTagger const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_RestFrameNSubjettinessTagger___str__((fastjet::RestFrameNSubjettinessTagger const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -46949,14 +45594,12 @@ SWIGINTERN PyObject *_wrap_delete_RestFrameNSubjettinessTagger(PyObject *SWIGUNU arg1 = reinterpret_cast< fastjet::RestFrameNSubjettinessTagger * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -46998,14 +45641,12 @@ SWIGINTERN PyObject *_wrap_new_RestFrameNSubjettinessTaggerStructure(PyObject *S } { try { - result = (fastjet::RestFrameNSubjettinessTaggerStructure *)new fastjet::RestFrameNSubjettinessTaggerStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::RestFrameNSubjettinessTaggerStructure *)new fastjet::RestFrameNSubjettinessTaggerStructure((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__RestFrameNSubjettinessTaggerStructure, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res1)) delete arg1; @@ -47033,14 +45674,12 @@ SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTaggerStructure_tau2(PyObject * arg1 = reinterpret_cast< fastjet::RestFrameNSubjettinessTaggerStructure * >(argp1); { try { - result = (double)((fastjet::RestFrameNSubjettinessTaggerStructure const *)arg1)->tau2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::RestFrameNSubjettinessTaggerStructure const *)arg1)->tau2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -47066,14 +45705,12 @@ SWIGINTERN PyObject *_wrap_RestFrameNSubjettinessTaggerStructure_costhetas(PyObj arg1 = reinterpret_cast< fastjet::RestFrameNSubjettinessTaggerStructure * >(argp1); { try { - result = (double)((fastjet::RestFrameNSubjettinessTaggerStructure const *)arg1)->costhetas(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::RestFrameNSubjettinessTaggerStructure const *)arg1)->costhetas(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -47098,14 +45735,12 @@ SWIGINTERN PyObject *_wrap_delete_RestFrameNSubjettinessTaggerStructure(PyObject arg1 = reinterpret_cast< fastjet::RestFrameNSubjettinessTaggerStructure * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -47151,14 +45786,12 @@ SWIGINTERN PyObject *_wrap_TopTaggerBase_set_top_selector(PyObject *SWIGUNUSEDPA arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - (arg1)->set_top_selector((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_top_selector((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -47193,14 +45826,12 @@ SWIGINTERN PyObject *_wrap_TopTaggerBase_set_W_selector(PyObject *SWIGUNUSEDPARM arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - (arg1)->set_W_selector((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_W_selector((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -47226,14 +45857,12 @@ SWIGINTERN PyObject *_wrap_TopTaggerBase_description_of_selectors(PyObject *SWIG arg1 = reinterpret_cast< fastjet::TopTaggerBase * >(argp1); { try { - result = ((fastjet::TopTaggerBase const *)arg1)->description_of_selectors(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::TopTaggerBase const *)arg1)->description_of_selectors(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -47258,14 +45887,12 @@ SWIGINTERN PyObject *_wrap_delete_TopTaggerBase(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::TopTaggerBase * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -47298,14 +45925,12 @@ SWIGINTERN PyObject *_wrap_TopTaggerBaseStructure_W(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< fastjet::TopTaggerBaseStructure * >(argp1); { try { - result = (fastjet::PseudoJet *) &((fastjet::TopTaggerBaseStructure const *)arg1)->W(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &((fastjet::TopTaggerBaseStructure const *)arg1)->W(); + } + 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; @@ -47331,14 +45956,12 @@ SWIGINTERN PyObject *_wrap_TopTaggerBaseStructure_non_W(PyObject *SWIGUNUSEDPARM arg1 = reinterpret_cast< fastjet::TopTaggerBaseStructure * >(argp1); { try { - result = (fastjet::PseudoJet *) &((fastjet::TopTaggerBaseStructure const *)arg1)->non_W(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &((fastjet::TopTaggerBaseStructure const *)arg1)->non_W(); + } + 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; @@ -47363,14 +45986,12 @@ SWIGINTERN PyObject *_wrap_delete_TopTaggerBaseStructure(PyObject *SWIGUNUSEDPAR arg1 = reinterpret_cast< fastjet::TopTaggerBaseStructure * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -47425,14 +46046,12 @@ SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_0(PyObject *SWIGUNUSEDPARM(self arg4 = static_cast< double >(val4); { try { - result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JHTopTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -47472,14 +46091,12 @@ SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_1(PyObject *SWIGUNUSEDPARM(self arg3 = static_cast< double >(val3); { try { - result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JHTopTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -47511,14 +46128,12 @@ SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_2(PyObject *SWIGUNUSEDPARM(self arg2 = static_cast< double >(val2); { try { - result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JHTopTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -47542,14 +46157,12 @@ SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_3(PyObject *SWIGUNUSEDPARM(self arg1 = static_cast< double >(val1); { try { - result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JHTopTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -47565,14 +46178,12 @@ SWIGINTERN PyObject *_wrap_new_JHTopTagger__SWIG_4(PyObject *SWIGUNUSEDPARM(self if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JHTopTagger *)new fastjet::JHTopTagger(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JHTopTagger, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -47698,14 +46309,12 @@ SWIGINTERN PyObject *_wrap_JHTopTagger_description(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::JHTopTagger * >(argp1); { try { - result = ((fastjet::JHTopTagger const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::JHTopTagger const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -47741,14 +46350,12 @@ SWIGINTERN PyObject *_wrap_JHTopTagger_result(PyObject *SWIGUNUSEDPARM(self), Py arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::JHTopTagger const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::JHTopTagger const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -47774,14 +46381,12 @@ SWIGINTERN PyObject *_wrap_JHTopTagger___str__(PyObject *SWIGUNUSEDPARM(self), P arg1 = reinterpret_cast< fastjet::JHTopTagger * >(argp1); { try { - result = fastjet_JHTopTagger___str__((fastjet::JHTopTagger const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_JHTopTagger___str__((fastjet::JHTopTagger const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -47806,14 +46411,12 @@ SWIGINTERN PyObject *_wrap_delete_JHTopTagger(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::JHTopTagger * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -47858,14 +46461,12 @@ SWIGINTERN PyObject *_wrap_new_JHTopTaggerStructure__SWIG_0(PyObject *SWIGUNUSED arg2 = reinterpret_cast< fastjet::JetDefinition::Recombiner * >(argp2); { try { - result = (fastjet::JHTopTaggerStructure *)new fastjet::JHTopTaggerStructure(arg1,(fastjet::JetDefinition::Recombiner const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JHTopTaggerStructure *)new fastjet::JHTopTaggerStructure(arg1,(fastjet::JetDefinition::Recombiner const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JHTopTaggerStructure, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -47891,14 +46492,12 @@ SWIGINTERN PyObject *_wrap_new_JHTopTaggerStructure__SWIG_1(PyObject *SWIGUNUSED } { try { - result = (fastjet::JHTopTaggerStructure *)new fastjet::JHTopTaggerStructure(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JHTopTaggerStructure *)new fastjet::JHTopTaggerStructure(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JHTopTaggerStructure, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -47963,14 +46562,12 @@ SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::JHTopTaggerStructure * >(argp1); { try { - result = (fastjet::PseudoJet *) &((fastjet::JHTopTaggerStructure const *)arg1)->W(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &((fastjet::JHTopTaggerStructure const *)arg1)->W(); + } + 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; @@ -47996,14 +46593,12 @@ SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W1(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::JHTopTaggerStructure * >(argp1); { try { - result = ((fastjet::JHTopTaggerStructure const *)arg1)->W1(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::JHTopTaggerStructure const *)arg1)->W1(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -48029,14 +46624,12 @@ SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_W2(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::JHTopTaggerStructure * >(argp1); { try { - result = ((fastjet::JHTopTaggerStructure const *)arg1)->W2(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::JHTopTaggerStructure const *)arg1)->W2(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -48062,14 +46655,12 @@ SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_non_W(PyObject *SWIGUNUSEDPARM(s arg1 = reinterpret_cast< fastjet::JHTopTaggerStructure * >(argp1); { try { - result = (fastjet::PseudoJet *) &((fastjet::JHTopTaggerStructure const *)arg1)->non_W(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::PseudoJet *) &((fastjet::JHTopTaggerStructure const *)arg1)->non_W(); + } + 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; @@ -48095,14 +46686,12 @@ SWIGINTERN PyObject *_wrap_JHTopTaggerStructure_cos_theta_W(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::JHTopTaggerStructure * >(argp1); { try { - result = (double)((fastjet::JHTopTaggerStructure const *)arg1)->cos_theta_W(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JHTopTaggerStructure const *)arg1)->cos_theta_W(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -48127,14 +46716,12 @@ SWIGINTERN PyObject *_wrap_delete_JHTopTaggerStructure(PyObject *SWIGUNUSEDPARM( arg1 = reinterpret_cast< fastjet::JHTopTaggerStructure * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -48154,6 +46741,679 @@ SWIGINTERN PyObject *JHTopTaggerStructure_swiginit(PyObject *SWIGUNUSEDPARM(self return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN PyObject *_wrap_new_BackgroundEstimate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *result = 0 ; + + if (!SWIG_Python_UnpackTuple(args, "new_BackgroundEstimate", 0, 0, 0)) SWIG_fail; + { + try { + result = (fastjet::BackgroundEstimate *)new fastjet::BackgroundEstimate(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_rho(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + double result; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_rho" "', argument " "1"" of type '" "fastjet::BackgroundEstimate const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + result = (double)((fastjet::BackgroundEstimate const *)arg1)->rho(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_From_double(static_cast< double >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + double result; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_sigma" "', argument " "1"" of type '" "fastjet::BackgroundEstimate const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + result = (double)((fastjet::BackgroundEstimate const *)arg1)->sigma(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_From_double(static_cast< double >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_has_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 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__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_has_sigma" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + result = (bool)(arg1)->has_sigma(); + } + 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_BackgroundEstimate_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + double result; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_rho_m" "', argument " "1"" of type '" "fastjet::BackgroundEstimate const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + result = (double)((fastjet::BackgroundEstimate const *)arg1)->rho_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_From_double(static_cast< double >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_sigma_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + double result; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_sigma_m" "', argument " "1"" of type '" "fastjet::BackgroundEstimate const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + result = (double)((fastjet::BackgroundEstimate const *)arg1)->sigma_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_From_double(static_cast< double >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_has_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 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__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_has_rho_m" "', argument " "1"" of type '" "fastjet::BackgroundEstimate const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + result = (bool)((fastjet::BackgroundEstimate const *)arg1)->has_rho_m(); + } + 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_BackgroundEstimate_mean_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + double result; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_mean_area" "', argument " "1"" of type '" "fastjet::BackgroundEstimate const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + result = (double)((fastjet::BackgroundEstimate const *)arg1)->mean_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_From_double(static_cast< double >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_has_extras(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 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__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_has_extras" "', argument " "1"" of type '" "fastjet::BackgroundEstimate const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + result = (bool)((fastjet::BackgroundEstimate const *)arg1)->has_extras(); + } + 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_BackgroundEstimate_reset(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_reset" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + (arg1)->reset(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_rho(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + double arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + double val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimate_set_rho", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_set_rho" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BackgroundEstimate_set_rho" "', argument " "2"" of type '" "double""'"); + } + arg2 = static_cast< double >(val2); + { + try { + (arg1)->set_rho(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + double arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + double val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimate_set_sigma", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_set_sigma" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BackgroundEstimate_set_sigma" "', argument " "2"" of type '" "double""'"); + } + arg2 = static_cast< double >(val2); + { + try { + (arg1)->set_sigma(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_has_sigma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimate_set_has_sigma", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_set_has_sigma" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BackgroundEstimate_set_has_sigma" "', argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + try { + (arg1)->set_has_sigma(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + double arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + double val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimate_set_rho_m", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_set_rho_m" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BackgroundEstimate_set_rho_m" "', argument " "2"" of type '" "double""'"); + } + arg2 = static_cast< double >(val2); + { + try { + (arg1)->set_rho_m(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_sigma_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + double arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + double val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimate_set_sigma_m", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_set_sigma_m" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BackgroundEstimate_set_sigma_m" "', argument " "2"" of type '" "double""'"); + } + arg2 = static_cast< double >(val2); + { + try { + (arg1)->set_sigma_m(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_has_rho_m(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimate_set_has_rho_m", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_set_has_rho_m" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BackgroundEstimate_set_has_rho_m" "', argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast< bool >(val2); + { + try { + (arg1)->set_has_rho_m(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_mean_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + double arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + double val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimate_set_mean_area", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_set_mean_area" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BackgroundEstimate_set_mean_area" "', argument " "2"" of type '" "double""'"); + } + arg2 = static_cast< double >(val2); + { + try { + (arg1)->set_mean_area(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_apply_rescaling_factor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + double arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + double val2 ; + int ecode2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimate_apply_rescaling_factor", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_apply_rescaling_factor" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BackgroundEstimate_apply_rescaling_factor" "', argument " "2"" of type '" "double""'"); + } + arg2 = static_cast< double >(val2); + { + try { + (arg1)->apply_rescaling_factor(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimate_set_extras(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + fastjet::BackgroundEstimate::Extras *arg2 = (fastjet::BackgroundEstimate::Extras *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimate_set_extras", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimate_set_extras" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_fastjet__BackgroundEstimate__Extras, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BackgroundEstimate_set_extras" "', argument " "2"" of type '" "fastjet::BackgroundEstimate::Extras *""'"); + } + arg2 = reinterpret_cast< fastjet::BackgroundEstimate::Extras * >(argp2); + { + try { + (arg1)->set_extras(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_BackgroundEstimate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimate *arg1 = (fastjet::BackgroundEstimate *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BackgroundEstimate" "', argument " "1"" of type '" "fastjet::BackgroundEstimate *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimate * >(argp1); + { + try { + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *BackgroundEstimate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *BackgroundEstimate_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_delete_BackgroundEstimatorBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ; @@ -48170,14 +47430,12 @@ SWIGINTERN PyObject *_wrap_delete_BackgroundEstimatorBase(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -48214,14 +47472,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_particles(PyObject *SWIGU } { try { - (arg1)->set_particles((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_particles((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -48232,6 +47488,201 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_particles(PyObject *SWIGU } +SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_particles_with_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ; + std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ; + std::vector< int,std::allocator< int > > *arg3 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 = SWIG_OLDOBJ ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject *swig_obj[3] ; + + if (!SWIG_Python_UnpackTuple(args, "BackgroundEstimatorBase_set_particles_with_seed", 3, 3, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimatorBase_set_particles_with_seed" "', argument " "1"" of type '" "fastjet::BackgroundEstimatorBase *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); + { + std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *ptr = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *)0; + res2 = swig::asptr(swig_obj[1], &ptr); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BackgroundEstimatorBase_set_particles_with_seed" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BackgroundEstimatorBase_set_particles_with_seed" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &""'"); + } + arg2 = ptr; + } + res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "BackgroundEstimatorBase_set_particles_with_seed" "', argument " "3"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BackgroundEstimatorBase_set_particles_with_seed" "', argument " "3"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + arg3 = reinterpret_cast< std::vector< int,std::allocator< int > > * >(argp3); + { + try { + (arg1)->set_particles_with_seed((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(std::vector< int,std::allocator< int > > const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res2)) delete arg2; + return resultobj; +fail: + if (SWIG_IsNewObj(res2)) delete arg2; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + fastjet::BackgroundEstimatorBase *result = 0 ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimatorBase_copy" "', argument " "1"" of type '" "fastjet::BackgroundEstimatorBase const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); + { + try { + result = (fastjet::BackgroundEstimatorBase *)((fastjet::BackgroundEstimatorBase const *)arg1)->copy(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + fastjet::BackgroundEstimate result; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimatorBase_estimate" "', argument " "1"" of type '" "fastjet::BackgroundEstimatorBase const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); + { + try { + result = ((fastjet::BackgroundEstimatorBase const *)arg1)->estimate(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const 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) { + PyObject *resultobj = 0; + fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ; + fastjet::PseudoJet *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + fastjet::BackgroundEstimate result; + + if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimatorBase_estimate" "', argument " "1"" of type '" "fastjet::BackgroundEstimatorBase const *""'"); + } + arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_fastjet__PseudoJet, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BackgroundEstimatorBase_estimate" "', argument " "2"" of type '" "fastjet::PseudoJet const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BackgroundEstimatorBase_estimate" "', argument " "2"" of type '" "fastjet::PseudoJet const &""'"); + } + arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); + { + try { + result = ((fastjet::BackgroundEstimatorBase const *)arg1)->estimate((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const fastjet::BackgroundEstimate& >(result))), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_estimate(PyObject *self, PyObject *args) { + Py_ssize_t argc; + PyObject *argv[3] = { + 0 + }; + + if (!(argc = SWIG_Python_UnpackTuple(args, "BackgroundEstimatorBase_estimate", 0, 2, argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_BackgroundEstimatorBase_estimate__SWIG_0(self, argc, argv); + } + } + if (argc == 2) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0); + _v = SWIG_CheckState(res); + if (_v) { + int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_BackgroundEstimatorBase_estimate__SWIG_1(self, argc, argv); + } + } + } + +fail: + SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'BackgroundEstimatorBase_estimate'.\n" + " Possible C/C++ prototypes are:\n" + " fastjet::BackgroundEstimatorBase::estimate() const\n" + " fastjet::BackgroundEstimatorBase::estimate(fastjet::PseudoJet const &) const\n"); + return 0; +} + + SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; fastjet::BackgroundEstimatorBase *arg1 = (fastjet::BackgroundEstimatorBase *) 0 ; @@ -48247,14 +47698,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho__SWIG_0(PyObject *SWIGUNU arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - result = (double)((fastjet::BackgroundEstimatorBase const *)arg1)->rho(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::BackgroundEstimatorBase const *)arg1)->rho(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -48278,14 +47727,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma__SWIG_0(PyObject *SWIGU arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - result = (double)((fastjet::BackgroundEstimatorBase const *)arg1)->sigma(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::BackgroundEstimatorBase const *)arg1)->sigma(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -48320,14 +47767,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho__SWIG_1(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->rho((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->rho((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -48402,14 +47847,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma__SWIG_1(PyObject *SWIGU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->sigma((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->sigma((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -48470,19 +47913,17 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_has_sigma(PyObject *SWIGUNUSE swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimatorBase_has_sigma" "', argument " "1"" of type '" "fastjet::BackgroundEstimatorBase *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackgroundEstimatorBase_has_sigma" "', argument " "1"" of type '" "fastjet::BackgroundEstimatorBase const *""'"); } arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - result = (bool)(arg1)->has_sigma(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::BackgroundEstimatorBase const *)arg1)->has_sigma(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -48506,14 +47947,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho_m__SWIG_0(PyObject *SWIGU arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - result = (double)((fastjet::BackgroundEstimatorBase const *)arg1)->rho_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::BackgroundEstimatorBase const *)arg1)->rho_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -48537,14 +47976,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma_m__SWIG_0(PyObject *SWI arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - result = (double)((fastjet::BackgroundEstimatorBase const *)arg1)->sigma_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::BackgroundEstimatorBase const *)arg1)->sigma_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -48579,14 +48016,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rho_m__SWIG_1(PyObject *SWIGU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->rho_m((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->rho_m((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -48661,14 +48096,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_sigma_m__SWIG_1(PyObject *SWI arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->sigma_m((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->sigma_m((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -48734,14 +48167,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_has_rho_m(PyObject *SWIGUNUSE arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - result = (bool)((fastjet::BackgroundEstimatorBase const *)arg1)->has_rho_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::BackgroundEstimatorBase const *)arg1)->has_rho_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -48773,14 +48204,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_set_rescaling_class(PyObject arg2 = reinterpret_cast< fastjet::FunctionOfPseudoJet< double > * >(argp2); { try { - (arg1)->set_rescaling_class((fastjet::FunctionOfPseudoJet< double > const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_rescaling_class((fastjet::FunctionOfPseudoJet< double > const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -48806,14 +48235,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_rescaling_class(PyObject *SWI arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - result = (fastjet::FunctionOfPseudoJet< double > *)((fastjet::BackgroundEstimatorBase const *)arg1)->rescaling_class(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::FunctionOfPseudoJet< double > *)((fastjet::BackgroundEstimatorBase const *)arg1)->rescaling_class(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_double_t, 0 | 0 ); return resultobj; @@ -48839,14 +48266,12 @@ SWIGINTERN PyObject *_wrap_BackgroundEstimatorBase_description(PyObject *SWIGUNU arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - result = ((fastjet::BackgroundEstimatorBase const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::BackgroundEstimatorBase const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -48909,14 +48334,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_0(PyObject * arg5 = static_cast< double >(val5); { try { - result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundRescalingYPolynomial, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -48964,14 +48387,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_1(PyObject * arg4 = static_cast< double >(val4); { try { - result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundRescalingYPolynomial, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -49011,14 +48432,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_2(PyObject * arg3 = static_cast< double >(val3); { try { - result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1,arg2,arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1,arg2,arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundRescalingYPolynomial, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -49050,14 +48469,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_3(PyObject * arg2 = static_cast< double >(val2); { try { - result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundRescalingYPolynomial, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -49081,14 +48498,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_4(PyObject * arg1 = static_cast< double >(val1); { try { - result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundRescalingYPolynomial, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -49104,14 +48519,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundRescalingYPolynomial__SWIG_5(PyObject * if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundRescalingYPolynomial *)new fastjet::BackgroundRescalingYPolynomial(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundRescalingYPolynomial, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -49282,14 +48695,12 @@ SWIGINTERN PyObject *_wrap_BackgroundRescalingYPolynomial_result(PyObject *SWIGU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::BackgroundRescalingYPolynomial const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::BackgroundRescalingYPolynomial const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -49314,14 +48725,12 @@ SWIGINTERN PyObject *_wrap_delete_BackgroundRescalingYPolynomial(PyObject *SWIGU arg1 = reinterpret_cast< fastjet::BackgroundRescalingYPolynomial * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -49381,14 +48790,12 @@ SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_0(PyObject *SW arg3 = reinterpret_cast< fastjet::AreaDefinition * >(argp3); { try { - result = (fastjet::JetMedianBackgroundEstimator *)new fastjet::JetMedianBackgroundEstimator((fastjet::Selector const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::AreaDefinition const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetMedianBackgroundEstimator *)new fastjet::JetMedianBackgroundEstimator((fastjet::Selector const &)*arg1,(fastjet::JetDefinition const &)*arg2,(fastjet::AreaDefinition const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -49426,14 +48833,12 @@ SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_1(PyObject *SW arg2 = reinterpret_cast< fastjet::ClusterSequenceAreaBase * >(argp2); { try { - result = (fastjet::JetMedianBackgroundEstimator *)new fastjet::JetMedianBackgroundEstimator((fastjet::Selector const &)*arg1,(fastjet::ClusterSequenceAreaBase const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetMedianBackgroundEstimator *)new fastjet::JetMedianBackgroundEstimator((fastjet::Selector const &)*arg1,(fastjet::ClusterSequenceAreaBase const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -49460,14 +48865,12 @@ SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_2(PyObject *SW arg1 = reinterpret_cast< fastjet::Selector * >(argp1); { try { - result = (fastjet::JetMedianBackgroundEstimator *)new fastjet::JetMedianBackgroundEstimator((fastjet::Selector const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetMedianBackgroundEstimator *)new fastjet::JetMedianBackgroundEstimator((fastjet::Selector const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -49483,14 +48886,12 @@ SWIGINTERN PyObject *_wrap_new_JetMedianBackgroundEstimator__SWIG_3(PyObject *SW if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::JetMedianBackgroundEstimator *)new fastjet::JetMedianBackgroundEstimator(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::JetMedianBackgroundEstimator *)new fastjet::JetMedianBackgroundEstimator(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -49574,14 +48975,12 @@ SWIGINTERN PyObject *_wrap_delete_JetMedianBackgroundEstimator(PyObject *SWIGUNU arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -49618,14 +49017,67 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_particles(PyObject * } { try { - (arg1)->set_particles((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_particles((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } + } + resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res2)) delete arg2; + return resultobj; +fail: + if (SWIG_IsNewObj(res2)) delete arg2; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_particles_with_seed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ; + std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *arg2 = 0 ; + std::vector< int,std::allocator< int > > *arg3 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 = SWIG_OLDOBJ ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject *swig_obj[3] ; + + if (!SWIG_Python_UnpackTuple(args, "JetMedianBackgroundEstimator_set_particles_with_seed", 3, 3, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "JetMedianBackgroundEstimator_set_particles_with_seed" "', argument " "1"" of type '" "fastjet::JetMedianBackgroundEstimator *""'"); + } + arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); + { + std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *ptr = (std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > *)0; + res2 = swig::asptr(swig_obj[1], &ptr); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "JetMedianBackgroundEstimator_set_particles_with_seed" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "JetMedianBackgroundEstimator_set_particles_with_seed" "', argument " "2"" of type '" "std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &""'"); + } + arg2 = ptr; + } + res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "JetMedianBackgroundEstimator_set_particles_with_seed" "', argument " "3"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "JetMedianBackgroundEstimator_set_particles_with_seed" "', argument " "3"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + arg3 = reinterpret_cast< std::vector< int,std::allocator< int > > * >(argp3); + { + try { + (arg1)->set_particles_with_seed((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2,(std::vector< int,std::allocator< int > > const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -49662,14 +49114,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_cluster_sequence(PyO arg2 = reinterpret_cast< fastjet::ClusterSequenceAreaBase * >(argp2); { try { - (arg1)->set_cluster_sequence((fastjet::ClusterSequenceAreaBase const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_cluster_sequence((fastjet::ClusterSequenceAreaBase const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -49706,14 +49156,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_jets(PyObject *SWIGU } { try { - (arg1)->set_jets((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_jets((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -49750,14 +49198,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_selector(PyObject *S arg2 = reinterpret_cast< fastjet::Selector * >(argp2); { try { - (arg1)->set_selector((fastjet::Selector const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_selector((fastjet::Selector const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -49789,14 +49235,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_compute_rho_m(PyObje arg2 = static_cast< bool >(val2); { try { - (arg1)->set_compute_rho_m(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_compute_rho_m(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -49805,6 +49249,146 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_compute_rho_m(PyObje } +SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + fastjet::BackgroundEstimatorBase *result = 0 ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "JetMedianBackgroundEstimator_copy" "', argument " "1"" of type '" "fastjet::JetMedianBackgroundEstimator const *""'"); + } + arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); + { + try { + result = (fastjet::BackgroundEstimatorBase *)((fastjet::JetMedianBackgroundEstimator const *)arg1)->copy(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + fastjet::BackgroundEstimate result; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "JetMedianBackgroundEstimator_estimate" "', argument " "1"" of type '" "fastjet::JetMedianBackgroundEstimator const *""'"); + } + arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); + { + try { + result = ((fastjet::JetMedianBackgroundEstimator const *)arg1)->estimate(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const 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) { + PyObject *resultobj = 0; + fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ; + fastjet::PseudoJet *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + fastjet::BackgroundEstimate result; + + if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "JetMedianBackgroundEstimator_estimate" "', argument " "1"" of type '" "fastjet::JetMedianBackgroundEstimator const *""'"); + } + arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_fastjet__PseudoJet, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "JetMedianBackgroundEstimator_estimate" "', argument " "2"" of type '" "fastjet::PseudoJet const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "JetMedianBackgroundEstimator_estimate" "', argument " "2"" of type '" "fastjet::PseudoJet const &""'"); + } + arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); + { + try { + result = ((fastjet::JetMedianBackgroundEstimator const *)arg1)->estimate((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const fastjet::BackgroundEstimate& >(result))), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_estimate(PyObject *self, PyObject *args) { + Py_ssize_t argc; + PyObject *argv[3] = { + 0 + }; + + if (!(argc = SWIG_Python_UnpackTuple(args, "JetMedianBackgroundEstimator_estimate", 0, 2, argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_JetMedianBackgroundEstimator_estimate__SWIG_0(self, argc, argv); + } + } + if (argc == 2) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0); + _v = SWIG_CheckState(res); + if (_v) { + int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_JetMedianBackgroundEstimator_estimate__SWIG_1(self, argc, argv); + } + } + } + +fail: + SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'JetMedianBackgroundEstimator_estimate'.\n" + " Possible C/C++ prototypes are:\n" + " fastjet::JetMedianBackgroundEstimator::estimate() const\n" + " fastjet::JetMedianBackgroundEstimator::estimate(fastjet::PseudoJet const &) const\n"); + return 0; +} + + SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; fastjet::JetMedianBackgroundEstimator *arg1 = (fastjet::JetMedianBackgroundEstimator *) 0 ; @@ -49820,14 +49404,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho__SWIG_0(PyObject *SW arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->rho(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->rho(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -49851,14 +49433,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma__SWIG_0(PyObject * arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->sigma(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->sigma(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -49893,14 +49473,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho__SWIG_1(PyObject *SW arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->rho((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->rho((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -49975,14 +49553,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma__SWIG_1(PyObject * arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->sigma((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->sigma((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -50043,19 +49619,17 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_has_sigma(PyObject *SWIG swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__JetMedianBackgroundEstimator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "JetMedianBackgroundEstimator_has_sigma" "', argument " "1"" of type '" "fastjet::JetMedianBackgroundEstimator *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "JetMedianBackgroundEstimator_has_sigma" "', argument " "1"" of type '" "fastjet::JetMedianBackgroundEstimator const *""'"); } arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (bool)(arg1)->has_sigma(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::JetMedianBackgroundEstimator const *)arg1)->has_sigma(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -50079,14 +49653,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho_m__SWIG_0(PyObject * arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->rho_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->rho_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -50110,14 +49682,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma_m__SWIG_0(PyObject arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->sigma_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->sigma_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -50152,14 +49722,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_rho_m__SWIG_1(PyObject * arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->rho_m((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->rho_m((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -50234,14 +49802,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_sigma_m__SWIG_1(PyObject arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->sigma_m((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->sigma_m((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -50307,14 +49873,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_has_rho_m(PyObject *SWIG arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (bool)((fastjet::JetMedianBackgroundEstimator const *)arg1)->has_rho_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::JetMedianBackgroundEstimator const *)arg1)->has_rho_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -50340,14 +49904,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_mean_area(PyObject *SWIG arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->mean_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->mean_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -50373,14 +49935,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_n_jets_used(PyObject *SW arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (unsigned int)((fastjet::JetMedianBackgroundEstimator const *)arg1)->n_jets_used(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (unsigned int)((fastjet::JetMedianBackgroundEstimator const *)arg1)->n_jets_used(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result)); return resultobj; @@ -50406,14 +49966,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_jets_used(PyObject *SWIG arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = ((fastjet::JetMedianBackgroundEstimator const *)arg1)->jets_used(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::JetMedianBackgroundEstimator const *)arg1)->jets_used(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = swig::from(static_cast< std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > >(result)); return resultobj; @@ -50439,14 +49997,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_empty_area(PyObject *SWI arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->empty_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->empty_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -50472,14 +50028,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_n_empty_jets(PyObject *S arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->n_empty_jets(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::JetMedianBackgroundEstimator const *)arg1)->n_empty_jets(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -50504,14 +50058,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_reset(PyObject *SWIGUNUS arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - (arg1)->reset(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->reset(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -50542,14 +50094,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_use_area_4vector__SW arg2 = static_cast< bool >(val2); { try { - (arg1)->set_use_area_4vector(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_use_area_4vector(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -50572,14 +50122,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_use_area_4vector__SW arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - (arg1)->set_use_area_4vector(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_use_area_4vector(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -50647,14 +50195,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_use_area_4vector(PyObjec arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (bool)((fastjet::JetMedianBackgroundEstimator const *)arg1)->use_area_4vector(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::JetMedianBackgroundEstimator const *)arg1)->use_area_4vector(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -50685,14 +50231,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_provide_fj2_sigma__S arg2 = static_cast< bool >(val2); { try { - (arg1)->set_provide_fj2_sigma(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_provide_fj2_sigma(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -50715,14 +50259,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_provide_fj2_sigma__S arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - (arg1)->set_provide_fj2_sigma(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_provide_fj2_sigma(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -50796,14 +50338,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_jet_density_class(Py arg2 = reinterpret_cast< fastjet::FunctionOfPseudoJet< double > * >(argp2); { try { - (arg1)->set_jet_density_class((fastjet::FunctionOfPseudoJet< double > const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_jet_density_class((fastjet::FunctionOfPseudoJet< double > const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -50829,14 +50369,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_jet_density_class(PyObje arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = (fastjet::FunctionOfPseudoJet< double > *)((fastjet::JetMedianBackgroundEstimator const *)arg1)->jet_density_class(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::FunctionOfPseudoJet< double > *)((fastjet::JetMedianBackgroundEstimator const *)arg1)->jet_density_class(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__FunctionOfPseudoJetT_double_t, 0 | 0 ); return resultobj; @@ -50868,14 +50406,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_set_rescaling_class(PyOb arg2 = reinterpret_cast< fastjet::FunctionOfPseudoJet< double > * >(argp2); { try { - (arg1)->set_rescaling_class((fastjet::FunctionOfPseudoJet< double > const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_rescaling_class((fastjet::FunctionOfPseudoJet< double > const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -50901,14 +50437,12 @@ SWIGINTERN PyObject *_wrap_JetMedianBackgroundEstimator_description(PyObject *SW arg1 = reinterpret_cast< fastjet::JetMedianBackgroundEstimator * >(argp1); { try { - result = ((fastjet::JetMedianBackgroundEstimator const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::JetMedianBackgroundEstimator const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -50955,14 +50489,12 @@ SWIGINTERN PyObject *_wrap_BackgroundJetPtDensity_result(PyObject *SWIGUNUSEDPAR arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::BackgroundJetPtDensity const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::BackgroundJetPtDensity const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -50988,14 +50520,12 @@ SWIGINTERN PyObject *_wrap_BackgroundJetPtDensity_description(PyObject *SWIGUNUS arg1 = reinterpret_cast< fastjet::BackgroundJetPtDensity * >(argp1); { try { - result = ((fastjet::BackgroundJetPtDensity const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::BackgroundJetPtDensity const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -51011,14 +50541,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundJetPtDensity(PyObject *SWIGUNUSEDPARM(s if (!SWIG_Python_UnpackTuple(args, "new_BackgroundJetPtDensity", 0, 0, 0)) SWIG_fail; { try { - result = (fastjet::BackgroundJetPtDensity *)new fastjet::BackgroundJetPtDensity(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundJetPtDensity *)new fastjet::BackgroundJetPtDensity(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundJetPtDensity, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -51043,14 +50571,12 @@ SWIGINTERN PyObject *_wrap_delete_BackgroundJetPtDensity(PyObject *SWIGUNUSEDPAR arg1 = reinterpret_cast< fastjet::BackgroundJetPtDensity * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -51077,14 +50603,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundJetScalarPtDensity__SWIG_0(PyObject *SW if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::BackgroundJetScalarPtDensity *)new fastjet::BackgroundJetScalarPtDensity(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundJetScalarPtDensity *)new fastjet::BackgroundJetScalarPtDensity(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundJetScalarPtDensity, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -51108,14 +50632,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundJetScalarPtDensity__SWIG_1(PyObject *SW arg1 = static_cast< double >(val1); { try { - result = (fastjet::BackgroundJetScalarPtDensity *)new fastjet::BackgroundJetScalarPtDensity(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundJetScalarPtDensity *)new fastjet::BackgroundJetScalarPtDensity(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundJetScalarPtDensity, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -51182,14 +50704,12 @@ SWIGINTERN PyObject *_wrap_BackgroundJetScalarPtDensity_result(PyObject *SWIGUNU arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::BackgroundJetScalarPtDensity const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::BackgroundJetScalarPtDensity const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -51215,14 +50735,12 @@ SWIGINTERN PyObject *_wrap_BackgroundJetScalarPtDensity_description(PyObject *SW arg1 = reinterpret_cast< fastjet::BackgroundJetScalarPtDensity * >(argp1); { try { - result = ((fastjet::BackgroundJetScalarPtDensity const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::BackgroundJetScalarPtDensity const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -51247,14 +50765,12 @@ SWIGINTERN PyObject *_wrap_delete_BackgroundJetScalarPtDensity(PyObject *SWIGUNU arg1 = reinterpret_cast< fastjet::BackgroundJetScalarPtDensity * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -51301,14 +50817,12 @@ SWIGINTERN PyObject *_wrap_BackgroundJetPtMDensity_result(PyObject *SWIGUNUSEDPA arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)((fastjet::BackgroundJetPtMDensity const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::BackgroundJetPtMDensity const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -51334,14 +50848,12 @@ SWIGINTERN PyObject *_wrap_BackgroundJetPtMDensity_description(PyObject *SWIGUNU arg1 = reinterpret_cast< fastjet::BackgroundJetPtMDensity * >(argp1); { try { - result = ((fastjet::BackgroundJetPtMDensity const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::BackgroundJetPtMDensity const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -51357,14 +50869,12 @@ SWIGINTERN PyObject *_wrap_new_BackgroundJetPtMDensity(PyObject *SWIGUNUSEDPARM( if (!SWIG_Python_UnpackTuple(args, "new_BackgroundJetPtMDensity", 0, 0, 0)) SWIG_fail; { try { - result = (fastjet::BackgroundJetPtMDensity *)new fastjet::BackgroundJetPtMDensity(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::BackgroundJetPtMDensity *)new fastjet::BackgroundJetPtMDensity(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundJetPtMDensity, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -51389,14 +50899,12 @@ SWIGINTERN PyObject *_wrap_delete_BackgroundJetPtMDensity(PyObject *SWIGUNUSEDPA arg1 = reinterpret_cast< fastjet::BackgroundJetPtMDensity * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -51439,14 +50947,12 @@ SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_0(PyObject *S arg2 = static_cast< double >(val2); { try { - result = (fastjet::GridMedianBackgroundEstimator *)new fastjet::GridMedianBackgroundEstimator(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GridMedianBackgroundEstimator *)new fastjet::GridMedianBackgroundEstimator(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -51473,14 +50979,12 @@ SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_1(PyObject *S arg1 = reinterpret_cast< fastjet::RectangularGrid * >(argp1); { try { - result = (fastjet::GridMedianBackgroundEstimator *)new fastjet::GridMedianBackgroundEstimator((fastjet::RectangularGrid const &)*arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GridMedianBackgroundEstimator *)new fastjet::GridMedianBackgroundEstimator((fastjet::RectangularGrid const &)*arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -51544,14 +51048,12 @@ SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_2(PyObject *S } { try { - result = (fastjet::GridMedianBackgroundEstimator *)new fastjet::GridMedianBackgroundEstimator(arg1,arg2,arg3,arg4,arg5); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GridMedianBackgroundEstimator *)new fastjet::GridMedianBackgroundEstimator(arg1,arg2,arg3,arg4,arg5); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -51599,14 +51101,12 @@ SWIGINTERN PyObject *_wrap_new_GridMedianBackgroundEstimator__SWIG_3(PyObject *S arg4 = static_cast< double >(val4); { try { - result = (fastjet::GridMedianBackgroundEstimator *)new fastjet::GridMedianBackgroundEstimator(arg1,arg2,arg3,arg4); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::GridMedianBackgroundEstimator *)new fastjet::GridMedianBackgroundEstimator(arg1,arg2,arg3,arg4); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -51747,14 +51247,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_particles(PyObject } { try { - (arg1)->set_particles((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_particles((std::vector< fastjet::PseudoJet,std::allocator< fastjet::PseudoJet > > const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -51788,14 +51286,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_compute_rho_m(PyObj arg2 = static_cast< bool >(val2); { try { - (arg1)->set_compute_rho_m(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_compute_rho_m(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -51804,6 +51300,146 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_compute_rho_m(PyObj } +SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + fastjet::BackgroundEstimatorBase *result = 0 ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridMedianBackgroundEstimator_copy" "', argument " "1"" of type '" "fastjet::GridMedianBackgroundEstimator const *""'"); + } + arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); + { + try { + result = (fastjet::BackgroundEstimatorBase *)((fastjet::GridMedianBackgroundEstimator const *)arg1)->copy(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + fastjet::BackgroundEstimate result; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridMedianBackgroundEstimator_estimate" "', argument " "1"" of type '" "fastjet::GridMedianBackgroundEstimator const *""'"); + } + arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); + { + try { + result = ((fastjet::GridMedianBackgroundEstimator const *)arg1)->estimate(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const 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) { + PyObject *resultobj = 0; + fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ; + fastjet::PseudoJet *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + fastjet::BackgroundEstimate result; + + if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridMedianBackgroundEstimator_estimate" "', argument " "1"" of type '" "fastjet::GridMedianBackgroundEstimator const *""'"); + } + arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_fastjet__PseudoJet, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GridMedianBackgroundEstimator_estimate" "', argument " "2"" of type '" "fastjet::PseudoJet const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GridMedianBackgroundEstimator_estimate" "', argument " "2"" of type '" "fastjet::PseudoJet const &""'"); + } + arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); + { + try { + result = ((fastjet::GridMedianBackgroundEstimator const *)arg1)->estimate((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_NewPointerObj((new fastjet::BackgroundEstimate(static_cast< const fastjet::BackgroundEstimate& >(result))), SWIGTYPE_p_fastjet__BackgroundEstimate, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_estimate(PyObject *self, PyObject *args) { + Py_ssize_t argc; + PyObject *argv[3] = { + 0 + }; + + if (!(argc = SWIG_Python_UnpackTuple(args, "GridMedianBackgroundEstimator_estimate", 0, 2, argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_GridMedianBackgroundEstimator_estimate__SWIG_0(self, argc, argv); + } + } + if (argc == 2) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0); + _v = SWIG_CheckState(res); + if (_v) { + int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_NO_NULL | 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_GridMedianBackgroundEstimator_estimate__SWIG_1(self, argc, argv); + } + } + } + +fail: + SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'GridMedianBackgroundEstimator_estimate'.\n" + " Possible C/C++ prototypes are:\n" + " fastjet::GridMedianBackgroundEstimator::estimate() const\n" + " fastjet::GridMedianBackgroundEstimator::estimate(fastjet::PseudoJet const &) const\n"); + return 0; +} + + SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; fastjet::GridMedianBackgroundEstimator *arg1 = (fastjet::GridMedianBackgroundEstimator *) 0 ; @@ -51819,14 +51455,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho__SWIG_0(PyObject *S arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->rho(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->rho(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -51850,14 +51484,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma__SWIG_0(PyObject arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->sigma(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->sigma(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -51892,14 +51524,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho__SWIG_1(PyObject *S arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->rho((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->rho((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -51974,14 +51604,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma__SWIG_1(PyObject arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->sigma((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->sigma((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -52042,19 +51670,17 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_has_sigma(PyObject *SWI swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__GridMedianBackgroundEstimator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridMedianBackgroundEstimator_has_sigma" "', argument " "1"" of type '" "fastjet::GridMedianBackgroundEstimator *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridMedianBackgroundEstimator_has_sigma" "', argument " "1"" of type '" "fastjet::GridMedianBackgroundEstimator const *""'"); } arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); { try { - result = (bool)(arg1)->has_sigma(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::GridMedianBackgroundEstimator const *)arg1)->has_sigma(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -52078,14 +51704,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho_m__SWIG_0(PyObject arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->rho_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->rho_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -52109,14 +51733,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma_m__SWIG_0(PyObjec arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->sigma_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->sigma_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -52151,14 +51773,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_rho_m__SWIG_1(PyObject arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->rho_m((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->rho_m((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -52233,14 +51853,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_sigma_m__SWIG_1(PyObjec arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = (double)(arg1)->sigma_m((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)(arg1)->sigma_m((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -52306,14 +51924,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_has_rho_m(PyObject *SWI arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); { try { - result = (bool)((fastjet::GridMedianBackgroundEstimator const *)arg1)->has_rho_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::GridMedianBackgroundEstimator const *)arg1)->has_rho_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -52339,14 +51955,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_mean_area(PyObject *SWI arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); { try { - result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->mean_area(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (double)((fastjet::GridMedianBackgroundEstimator const *)arg1)->mean_area(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; @@ -52378,14 +51992,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_set_rescaling_class(PyO arg2 = reinterpret_cast< fastjet::FunctionOfPseudoJet< double > * >(argp2); { try { - (arg1)->set_rescaling_class((fastjet::FunctionOfPseudoJet< double > const *)arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_rescaling_class((fastjet::FunctionOfPseudoJet< double > const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -52411,14 +52023,12 @@ SWIGINTERN PyObject *_wrap_GridMedianBackgroundEstimator_description(PyObject *S arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); { try { - result = ((fastjet::GridMedianBackgroundEstimator const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::GridMedianBackgroundEstimator const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -52443,14 +52053,12 @@ SWIGINTERN PyObject *_wrap_delete_GridMedianBackgroundEstimator(PyObject *SWIGUN arg1 = reinterpret_cast< fastjet::GridMedianBackgroundEstimator * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -52480,19 +52088,17 @@ SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_0(PyObject *SWIGUNUSEDPARM(self) if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Subtractor" "', argument " "1"" of type '" "fastjet::BackgroundEstimatorBase *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Subtractor" "', argument " "1"" of type '" "fastjet::BackgroundEstimatorBase const *""'"); } arg1 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp1); { try { - result = (fastjet::Subtractor *)new fastjet::Subtractor(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Subtractor *)new fastjet::Subtractor((fastjet::BackgroundEstimatorBase const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Subtractor, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -52516,14 +52122,12 @@ SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_1(PyObject *SWIGUNUSEDPARM(self) arg1 = static_cast< double >(val1); { try { - result = (fastjet::Subtractor *)new fastjet::Subtractor(arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Subtractor *)new fastjet::Subtractor(arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Subtractor, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -52555,14 +52159,12 @@ SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_2(PyObject *SWIGUNUSEDPARM(self) arg2 = static_cast< double >(val2); { try { - result = (fastjet::Subtractor *)new fastjet::Subtractor(arg1,arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Subtractor *)new fastjet::Subtractor(arg1,arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Subtractor, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -52578,14 +52180,12 @@ SWIGINTERN PyObject *_wrap_new_Subtractor__SWIG_3(PyObject *SWIGUNUSEDPARM(self) if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; { try { - result = (fastjet::Subtractor *)new fastjet::Subtractor(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (fastjet::Subtractor *)new fastjet::Subtractor(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fastjet__Subtractor, SWIG_POINTER_NEW | 0 ); return resultobj; @@ -52644,7 +52244,7 @@ SWIGINTERN PyObject *_wrap_new_Subtractor(PyObject *self, PyObject *args) { fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Subtractor'.\n" " Possible C/C++ prototypes are:\n" - " fastjet::Subtractor::Subtractor(fastjet::BackgroundEstimatorBase *)\n" + " fastjet::Subtractor::Subtractor(fastjet::BackgroundEstimatorBase const *)\n" " fastjet::Subtractor::Subtractor(double)\n" " fastjet::Subtractor::Subtractor(double,double)\n" " fastjet::Subtractor::Subtractor()\n"); @@ -52668,14 +52268,12 @@ SWIGINTERN PyObject *_wrap_delete_Subtractor(PyObject *SWIGUNUSEDPARM(self), PyO arg1 = reinterpret_cast< fastjet::Subtractor * >(argp1); { try { - delete arg1; - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + delete arg1; + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -52700,14 +52298,49 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_defaults(PyObject *SWIGUNUSEDPARM(self arg1 = reinterpret_cast< fastjet::Subtractor * >(argp1); { try { - (arg1)->set_defaults(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_defaults(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); + SWIG_fail; + } + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_Subtractor_set_background_estimator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + fastjet::Subtractor *arg1 = (fastjet::Subtractor *) 0 ; + fastjet::BackgroundEstimatorBase *arg2 = (fastjet::BackgroundEstimatorBase *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args, "Subtractor_set_background_estimator", 2, 2, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_fastjet__Subtractor, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Subtractor_set_background_estimator" "', argument " "1"" of type '" "fastjet::Subtractor *""'"); + } + arg1 = reinterpret_cast< fastjet::Subtractor * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_fastjet__BackgroundEstimatorBase, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Subtractor_set_background_estimator" "', argument " "2"" of type '" "fastjet::BackgroundEstimatorBase const *""'"); + } + arg2 = reinterpret_cast< fastjet::BackgroundEstimatorBase * >(argp2); + { + try { + (arg1)->set_background_estimator((fastjet::BackgroundEstimatorBase const *)arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -52738,14 +52371,12 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_use_rho_m__SWIG_0(PyObject *SWIGUNUSED arg2 = static_cast< bool >(val2); { try { - (arg1)->set_use_rho_m(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_use_rho_m(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -52768,14 +52399,12 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_use_rho_m__SWIG_1(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::Subtractor * >(argp1); { try { - (arg1)->set_use_rho_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_use_rho_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -52843,14 +52472,12 @@ SWIGINTERN PyObject *_wrap_Subtractor_use_rho_m(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::Subtractor * >(argp1); { try { - result = (bool)((fastjet::Subtractor const *)arg1)->use_rho_m(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Subtractor const *)arg1)->use_rho_m(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -52881,14 +52508,12 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_safe_mass__SWIG_0(PyObject *SWIGUNUSED arg2 = static_cast< bool >(val2); { try { - (arg1)->set_safe_mass(arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_safe_mass(arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -52911,14 +52536,12 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_safe_mass__SWIG_1(PyObject *SWIGUNUSED arg1 = reinterpret_cast< fastjet::Subtractor * >(argp1); { try { - (arg1)->set_safe_mass(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_safe_mass(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -52986,14 +52609,12 @@ SWIGINTERN PyObject *_wrap_Subtractor_safe_mass(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< fastjet::Subtractor * >(argp1); { try { - result = (bool)((fastjet::Subtractor const *)arg1)->safe_mass(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = (bool)((fastjet::Subtractor const *)arg1)->safe_mass(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; @@ -53039,14 +52660,12 @@ SWIGINTERN PyObject *_wrap_Subtractor_set_known_selectors(PyObject *SWIGUNUSEDPA arg3 = reinterpret_cast< fastjet::Selector * >(argp3); { try { - (arg1)->set_known_selectors((fastjet::Selector const &)*arg2,(fastjet::Selector const &)*arg3); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + (arg1)->set_known_selectors((fastjet::Selector const &)*arg2,(fastjet::Selector const &)*arg3); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_Py_Void(); return resultobj; @@ -53082,14 +52701,12 @@ SWIGINTERN PyObject *_wrap_Subtractor_result(PyObject *SWIGUNUSEDPARM(self), PyO arg2 = reinterpret_cast< fastjet::PseudoJet * >(argp2); { try { - result = ((fastjet::Subtractor const *)arg1)->result((fastjet::PseudoJet const &)*arg2); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Subtractor const *)arg1)->result((fastjet::PseudoJet const &)*arg2); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_NewPointerObj((new fastjet::PseudoJet(static_cast< const fastjet::PseudoJet& >(result))), SWIGTYPE_p_fastjet__PseudoJet, SWIG_POINTER_OWN | 0 ); return resultobj; @@ -53115,14 +52732,12 @@ SWIGINTERN PyObject *_wrap_Subtractor_description(PyObject *SWIGUNUSEDPARM(self) arg1 = reinterpret_cast< fastjet::Subtractor * >(argp1); { try { - result = ((fastjet::Subtractor const *)arg1)->description(); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = ((fastjet::Subtractor const *)arg1)->description(); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -53148,14 +52763,12 @@ SWIGINTERN PyObject *_wrap_Subtractor___str__(PyObject *SWIGUNUSEDPARM(self), Py arg1 = reinterpret_cast< fastjet::Subtractor * >(argp1); { try { - result = fastjet_Subtractor___str__((fastjet::Subtractor const *)arg1); - } catch (fastjet::Error &_e) { - SWIG_Python_Raise(SWIG_NewPointerObj( - (new fastjet::Error(static_cast(_e))), - SWIGTYPE_p_fastjet__Error,SWIG_POINTER_OWN), - "fastjet::Error", SWIGTYPE_p_fastjet__Error); + result = fastjet_Subtractor___str__((fastjet::Subtractor const *)arg1); + } + catch (fastjet::Error & e) { + PyErr_SetString(FastJetError_, e.message().c_str()); SWIG_fail; - } + } } resultobj = SWIG_From_std_string(static_cast< std::string >(result)); return resultobj; @@ -56262,6 +55875,9 @@ static PyMethodDef SwigMethods[] = { "you modify it for all instances. \n" "\n" ""}, + { "GhostedAreaSpec_with_fixed_seed", _wrap_GhostedAreaSpec_with_fixed_seed, METH_VARARGS, NULL}, + { "GhostedAreaSpec_get_fixed_seed", _wrap_GhostedAreaSpec_get_fixed_seed, METH_VARARGS, NULL}, + { "GhostedAreaSpec_get_last_seed", _wrap_GhostedAreaSpec_get_last_seed, METH_VARARGS, NULL}, { "GhostedAreaSpec_checkpoint_random", _wrap_GhostedAreaSpec_checkpoint_random, METH_O, "\n" "\n" "`checkpoint_random()` \n" @@ -56302,6 +55918,7 @@ static PyMethodDef SwigMethods[] = { "very deprecated public access to the generator itself \n" "\n" ""}, + { "GhostedAreaSpec_user_random_generator_at_own_risk", _wrap_GhostedAreaSpec_user_random_generator_at_own_risk, METH_O, NULL}, { "GhostedAreaSpec___str__", _wrap_GhostedAreaSpec___str__, METH_O, NULL}, { "delete_GhostedAreaSpec", _wrap_delete_GhostedAreaSpec, METH_O, NULL}, { "GhostedAreaSpec_swigregister", GhostedAreaSpec_swigregister, METH_O, NULL}, @@ -56365,6 +55982,7 @@ static PyMethodDef SwigMethods[] = { "return a reference to the voronoi area spec \n" "\n" ""}, + { "AreaDefinition_with_fixed_seed", _wrap_AreaDefinition_with_fixed_seed, METH_VARARGS, NULL}, { "AreaDefinition___str__", _wrap_AreaDefinition___str__, METH_O, NULL}, { "delete_AreaDefinition", _wrap_delete_AreaDefinition, METH_O, NULL}, { "AreaDefinition_swigregister", AreaDefinition_swigregister, METH_O, NULL}, @@ -57827,6 +57445,28 @@ static PyMethodDef SwigMethods[] = { { "delete_JHTopTaggerStructure", _wrap_delete_JHTopTaggerStructure, METH_O, NULL}, { "JHTopTaggerStructure_swigregister", JHTopTaggerStructure_swigregister, METH_O, NULL}, { "JHTopTaggerStructure_swiginit", JHTopTaggerStructure_swiginit, METH_VARARGS, NULL}, + { "new_BackgroundEstimate", _wrap_new_BackgroundEstimate, METH_NOARGS, NULL}, + { "BackgroundEstimate_rho", _wrap_BackgroundEstimate_rho, METH_O, NULL}, + { "BackgroundEstimate_sigma", _wrap_BackgroundEstimate_sigma, METH_O, NULL}, + { "BackgroundEstimate_has_sigma", _wrap_BackgroundEstimate_has_sigma, METH_O, NULL}, + { "BackgroundEstimate_rho_m", _wrap_BackgroundEstimate_rho_m, METH_O, NULL}, + { "BackgroundEstimate_sigma_m", _wrap_BackgroundEstimate_sigma_m, METH_O, NULL}, + { "BackgroundEstimate_has_rho_m", _wrap_BackgroundEstimate_has_rho_m, METH_O, NULL}, + { "BackgroundEstimate_mean_area", _wrap_BackgroundEstimate_mean_area, METH_O, NULL}, + { "BackgroundEstimate_has_extras", _wrap_BackgroundEstimate_has_extras, METH_O, NULL}, + { "BackgroundEstimate_reset", _wrap_BackgroundEstimate_reset, METH_O, NULL}, + { "BackgroundEstimate_set_rho", _wrap_BackgroundEstimate_set_rho, METH_VARARGS, NULL}, + { "BackgroundEstimate_set_sigma", _wrap_BackgroundEstimate_set_sigma, METH_VARARGS, NULL}, + { "BackgroundEstimate_set_has_sigma", _wrap_BackgroundEstimate_set_has_sigma, METH_VARARGS, NULL}, + { "BackgroundEstimate_set_rho_m", _wrap_BackgroundEstimate_set_rho_m, METH_VARARGS, NULL}, + { "BackgroundEstimate_set_sigma_m", _wrap_BackgroundEstimate_set_sigma_m, METH_VARARGS, NULL}, + { "BackgroundEstimate_set_has_rho_m", _wrap_BackgroundEstimate_set_has_rho_m, METH_VARARGS, NULL}, + { "BackgroundEstimate_set_mean_area", _wrap_BackgroundEstimate_set_mean_area, METH_VARARGS, NULL}, + { "BackgroundEstimate_apply_rescaling_factor", _wrap_BackgroundEstimate_apply_rescaling_factor, METH_VARARGS, NULL}, + { "BackgroundEstimate_set_extras", _wrap_BackgroundEstimate_set_extras, METH_VARARGS, NULL}, + { "delete_BackgroundEstimate", _wrap_delete_BackgroundEstimate, METH_O, NULL}, + { "BackgroundEstimate_swigregister", BackgroundEstimate_swigregister, METH_O, NULL}, + { "BackgroundEstimate_swiginit", BackgroundEstimate_swiginit, METH_VARARGS, NULL}, { "delete_BackgroundEstimatorBase", _wrap_delete_BackgroundEstimatorBase, METH_O, "\n" "\n" "`~BackgroundEstimatorBase()` \n" @@ -57842,6 +57482,9 @@ static PyMethodDef SwigMethods[] = { "particles. \n" "\n" ""}, + { "BackgroundEstimatorBase_set_particles_with_seed", _wrap_BackgroundEstimatorBase_set_particles_with_seed, METH_VARARGS, NULL}, + { "BackgroundEstimatorBase_copy", _wrap_BackgroundEstimatorBase_copy, METH_O, NULL}, + { "BackgroundEstimatorBase_estimate", _wrap_BackgroundEstimatorBase_estimate, METH_VARARGS, NULL}, { "BackgroundEstimatorBase_rho", _wrap_BackgroundEstimatorBase_rho, METH_VARARGS, "\n" "\n" "`rho(const PseudoJet &jet)=0 -> double` \n" @@ -57986,6 +57629,7 @@ static PyMethodDef SwigMethods[] = { "particles. \n" "\n" ""}, + { "JetMedianBackgroundEstimator_set_particles_with_seed", _wrap_JetMedianBackgroundEstimator_set_particles_with_seed, METH_VARARGS, NULL}, { "JetMedianBackgroundEstimator_set_cluster_sequence", _wrap_JetMedianBackgroundEstimator_set_cluster_sequence, METH_VARARGS, "\n" "\n" "`set_cluster_sequence(const ClusterSequenceAreaBase &csa)` \n" @@ -58038,6 +57682,8 @@ static PyMethodDef SwigMethods[] = { "default true) \n" "\n" ""}, + { "JetMedianBackgroundEstimator_copy", _wrap_JetMedianBackgroundEstimator_copy, METH_O, NULL}, + { "JetMedianBackgroundEstimator_estimate", _wrap_JetMedianBackgroundEstimator_estimate, METH_VARARGS, NULL}, { "JetMedianBackgroundEstimator_rho", _wrap_JetMedianBackgroundEstimator_rho, METH_VARARGS, "\n" "\n" "`rho(const PseudoJet &jet) -> double` \n" @@ -58360,6 +58006,8 @@ static PyMethodDef SwigMethods[] = { "default true) \n" "\n" ""}, + { "GridMedianBackgroundEstimator_copy", _wrap_GridMedianBackgroundEstimator_copy, METH_O, NULL}, + { "GridMedianBackgroundEstimator_estimate", _wrap_GridMedianBackgroundEstimator_estimate, METH_VARARGS, NULL}, { "GridMedianBackgroundEstimator_rho", _wrap_GridMedianBackgroundEstimator_rho, METH_VARARGS, "\n" "\n" "`rho(const PseudoJet &jet) -> double` \n" @@ -58477,6 +58125,7 @@ static PyMethodDef SwigMethods[] = { "and is highly likely to change in a future release of FastJet \n" "\n" ""}, + { "Subtractor_set_background_estimator", _wrap_Subtractor_set_background_estimator, METH_VARARGS, NULL}, { "Subtractor_set_use_rho_m", _wrap_Subtractor_set_use_rho_m, METH_VARARGS, "\n" "\n" "`set_use_rho_m(bool use_rho_m_in=true)` \n" @@ -58765,6 +58414,8 @@ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_fastjet__AreaDefinition = {"_p_fastjet__AreaDefinition", "fastjet::AreaDefinition *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_fastjet__BackgroundEstimate = {"_p_fastjet__BackgroundEstimate", "fastjet::BackgroundEstimate *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_fastjet__BackgroundEstimate__Extras = {"_p_fastjet__BackgroundEstimate__Extras", "fastjet::BackgroundEstimate::Extras *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_fastjet__BackgroundEstimatorBase = {"_p_fastjet__BackgroundEstimatorBase", "fastjet::BackgroundEstimatorBase *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_fastjet__BackgroundJetPtDensity = {"_p_fastjet__BackgroundJetPtDensity", "fastjet::BackgroundJetPtDensity *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_fastjet__BackgroundJetPtMDensity = {"_p_fastjet__BackgroundJetPtMDensity", "fastjet::BackgroundJetPtMDensity *", 0, 0, (void*)0, 0}; @@ -58821,6 +58472,7 @@ static swig_type_info _swigt__p_fastjet__RestFrameNSubjettinessTaggerStructure = static swig_type_info _swigt__p_fastjet__Selector = {"_p_fastjet__Selector", "fastjet::Selector *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_fastjet__SelectorWorker = {"_p_fastjet__SelectorWorker", "fastjet::SelectorWorker *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_fastjet__SelectorWorkerPython = {"_p_fastjet__SelectorWorkerPython", "fastjet::SelectorWorkerPython *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_fastjet__SharedPtrT_fastjet__BasicRandomT_double_t_t = {"_p_fastjet__SharedPtrT_fastjet__BasicRandomT_double_t_t", "fastjet::SharedPtr< fastjet::BasicRandom< double > > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t = {"_p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t", "fastjet::SharedPtr< fastjet::PseudoJetStructureBase > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t = {"_p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t", "fastjet::SharedPtr< fastjet::PseudoJet::UserInfoBase > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_fastjet__SharedPtrT_fastjet__SelectorWorker_t = {"_p_fastjet__SharedPtrT_fastjet__SelectorWorker_t", "fastjet::SharedPtr< fastjet::SelectorWorker > *", 0, 0, (void*)0, 0}; @@ -58857,6 +58509,8 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_difference_type, &_swigt__p_double, &_swigt__p_fastjet__AreaDefinition, + &_swigt__p_fastjet__BackgroundEstimate, + &_swigt__p_fastjet__BackgroundEstimate__Extras, &_swigt__p_fastjet__BackgroundEstimatorBase, &_swigt__p_fastjet__BackgroundJetPtDensity, &_swigt__p_fastjet__BackgroundJetPtMDensity, @@ -58913,6 +58567,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_fastjet__Selector, &_swigt__p_fastjet__SelectorWorker, &_swigt__p_fastjet__SelectorWorkerPython, + &_swigt__p_fastjet__SharedPtrT_fastjet__BasicRandomT_double_t_t, &_swigt__p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t, &_swigt__p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t, &_swigt__p_fastjet__SharedPtrT_fastjet__SelectorWorker_t, @@ -58949,6 +58604,8 @@ static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, static swig_cast_info _swigc__p_difference_type[] = { {&_swigt__p_difference_type, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_double[] = { {&_swigt__p_double, 0, 0, 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__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}}; @@ -59005,6 +58662,7 @@ static swig_cast_info _swigc__p_fastjet__RestFrameNSubjettinessTaggerStructure[] 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__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}}; @@ -59041,6 +58699,8 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_difference_type, _swigc__p_double, _swigc__p_fastjet__AreaDefinition, + _swigc__p_fastjet__BackgroundEstimate, + _swigc__p_fastjet__BackgroundEstimate__Extras, _swigc__p_fastjet__BackgroundEstimatorBase, _swigc__p_fastjet__BackgroundJetPtDensity, _swigc__p_fastjet__BackgroundJetPtMDensity, @@ -59097,6 +58757,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_fastjet__Selector, _swigc__p_fastjet__SelectorWorker, _swigc__p_fastjet__SelectorWorkerPython, + _swigc__p_fastjet__SharedPtrT_fastjet__BasicRandomT_double_t_t, _swigc__p_fastjet__SharedPtrT_fastjet__PseudoJetStructureBase_t, _swigc__p_fastjet__SharedPtrT_fastjet__PseudoJet__UserInfoBase_t, _swigc__p_fastjet__SharedPtrT_fastjet__SelectorWorker_t, @@ -59529,6 +59190,12 @@ extern "C" { #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 */ @@ -59858,6 +59525,20 @@ SWIG_init(void) { // thread safe initialization swig::container_owner_attribute(); + + fastjet::Error::set_print_errors(false); + unsigned int mlen = strlen("fastjet"); + char * msg = (char*) calloc(mlen+15, sizeof(char)); + strcpy(msg, "fastjet"); + strcat(msg, ".FastJetError"); + FastJetError_ = PyErr_NewException(msg, NULL, NULL); + Py_INCREF(FastJetError_); + if (PyModule_AddObject(m, "FastJetError", FastJetError_) < 0) { + Py_DECREF(m); + Py_DECREF(FastJetError_); + //return NULL; + } + SWIG_Python_SetConstant(d, "_INCLUDE_FASTJET_CONFIG_AUTO_H",SWIG_From_int(static_cast< int >(1))); SWIG_Python_SetConstant(d, "FASTJET_HAVE_DLFCN_H",SWIG_From_int(static_cast< int >(1))); SWIG_Python_SetConstant(d, "FASTJET_HAVE_EXECINFO_H",SWIG_From_int(static_cast< int >(1))); @@ -59875,16 +59556,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.3.4")); + SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_STRING",SWIG_FromCharPtr("FastJet 3.4.0")); 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.3.4")); + SWIG_Python_SetConstant(d, "FASTJET_PACKAGE_VERSION",SWIG_FromCharPtr("3.4.0")); SWIG_Python_SetConstant(d, "FASTJET_STDC_HEADERS",SWIG_From_int(static_cast< int >(1))); - SWIG_Python_SetConstant(d, "FASTJET_VERSION",SWIG_FromCharPtr("3.3.4")); + SWIG_Python_SetConstant(d, "FASTJET_VERSION",SWIG_FromCharPtr("3.4.0")); 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 >(3))); - SWIG_Python_SetConstant(d, "FASTJET_VERSION_NUMBER",SWIG_From_int(static_cast< int >(30304))); - SWIG_Python_SetConstant(d, "FASTJET_VERSION_PATCHLEVEL",SWIG_From_int(static_cast< int >(4))); + 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))); globals = SWIG_globals(); if (!globals) { PyErr_SetString(PyExc_TypeError, "Failure to create SWIG globals."); diff --git a/fastjet/src/AreaDefinition.cc b/fastjet/src/AreaDefinition.cc index 6e54633..5570aeb 100644 --- a/fastjet/src/AreaDefinition.cc +++ b/fastjet/src/AreaDefinition.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: AreaDefinition.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/BasicRandom.cc b/fastjet/src/BasicRandom.cc index 56f29e7..07df7bf 100644 --- a/fastjet/src/BasicRandom.cc +++ b/fastjet/src/BasicRandom.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: BasicRandom.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,9 +31,11 @@ // nlo includes #include "fastjet/internal/BasicRandom.hh" - FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +std::mutex BasicRandom::_multiple_number_generation_mutex; +#endif // // random number generator diff --git a/fastjet/src/ClosestPair2D.cc b/fastjet/src/ClosestPair2D.cc index b7424a2..78b1843 100644 --- a/fastjet/src/ClosestPair2D.cc +++ b/fastjet/src/ClosestPair2D.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClosestPair2D.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequence.cc b/fastjet/src/ClusterSequence.cc index 6a92ae8..638cf46 100644 --- a/fastjet/src/ClusterSequence.cc +++ b/fastjet/src/ClusterSequence.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequence.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -144,7 +144,11 @@ using namespace std; // by default. This requirement reflects the spirit of // clause 2c of the GNU Public License (v2), under which // FastJet and its plugins are distributed. -std::ostream * ClusterSequence::_fastjet_banner_ostr = &cout; +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +atomic ClusterSequence::_fastjet_banner_ostr{&cout}; +#else +ostream * ClusterSequence::_fastjet_banner_ostr = &cout; +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY // destructor that guarantees proper bookkeeping for the CS Structure @@ -160,6 +164,10 @@ ClusterSequence::~ClusterSequence () { assert(csi != NULL); csi->set_associated_cs(NULL); +//std::shared_ptr: // set_count is not available with CXX11 shared pointers. There +//std::shared_ptr: // we'll use a different mechanism for handling self-deleting +//std::shared_ptr: // ClusterSequences +//std::shared_ptr: #ifndef FASTJET_HAVE_THREAD_SAFETY // if the user had given the CS responsibility to delete itself, // but then deletes the CS themselves, the following lines of // code will ensure that the structure_shared_ptr will have @@ -170,10 +178,41 @@ ClusterSequence::~ClusterSequence () { _structure_shared_ptr.set_count(_structure_shared_ptr.use_count() + _structure_use_count_after_construction); } +//std::shared_ptr: #endif // FASTJET_HAVE_THREAD_SAFETY } } -//----------- +//std::shared_ptr: //----------- +//std::shared_ptr: #ifdef FASTJET_HAVE_THREAD_SAFETY +//std::shared_ptr: // signals that a jet will no longer use the current CS +//std::shared_ptr: void ClusterSequence::release_pseudojet(PseudoJet &jet) const{ +//std::shared_ptr: // this only applies to self-deleting clusteer seqences +//std::shared_ptr: if (!_deletes_self_when_unused) return; +//std::shared_ptr: +//std::shared_ptr: // we "free" the jet from the CS +//std::shared_ptr: //jet.set_structure_shared_ptr(SharedPtr()); +//std::shared_ptr: jet.force_reset_structure(); +//std::shared_ptr: +//std::shared_ptr: // and then we can check if we need to delete the CS +//std::shared_ptr: if (_structure_shared_ptr.use_count() == _structure_use_count_after_construction){ +//std::shared_ptr: //CXX11_SELF_DELETE_DBG: cout << "will self-delete CS (use_count=" << _structure_use_count_after_construction << ")" << endl; +//std::shared_ptr: // we need to set delete_self_when unused to false before +//std::shared_ptr: // triggering the deletion +//std::shared_ptr: // +//std::shared_ptr: // This also serves a 2nd purpose: if several threads delete a PJ +//std::shared_ptr: // At the same time we end up in a situation where +//std::shared_ptr: // "release_pseudojet" frees both their structure pointers and +//std::shared_ptr: // both could delete the CS (giving a double-free +//std::shared_ptr: // corruption). This is prevented by the construct below (where we +//std::shared_ptr: // have made _deletes_self_when_unused atomic) +//std::shared_ptr: bool expected = true; +//std::shared_ptr: if (_deletes_self_when_unused.compare_exchange_strong(expected, false)) +//std::shared_ptr: delete this; +//std::shared_ptr: } +//std::shared_ptr: } +//std::shared_ptr: +//std::shared_ptr: #else // FASTJET_HAVE_THREAD_SAFETY + void ClusterSequence::signal_imminent_self_deletion() const { // normally if the destructor is called when // _deletes_self_when_unused is true, it assumes that it's been @@ -192,6 +231,8 @@ void ClusterSequence::signal_imminent_self_deletion() const { _deletes_self_when_unused = false; } +//std::shared_ptr: #endif // FASTJET_HAVE_THREAD_SAFETY + //DEP //---------------------------------------------------------------------- //DEP void ClusterSequence::_initialise_and_run ( //DEP const double R, @@ -407,7 +448,7 @@ void ClusterSequence::_initialise_and_run_no_decant () { // these needs to be defined outside the class definition. -bool ClusterSequence::_first_time = true; +thread_safety_helpers::FirstTimeTrue ClusterSequence::_first_time; LimitedWarning ClusterSequence::_exclusive_warnings; @@ -422,8 +463,7 @@ string fastjet_version_string() { // prints a banner on the first call void ClusterSequence::print_banner() { - if (!_first_time) {return;} - _first_time = false; + if (!_first_time()) return; // make sure the user has not set the banner stream to NULL ostream * ostr = _fastjet_banner_ostr; @@ -1748,7 +1788,12 @@ void ClusterSequence::delete_self_when_unused() { throw Error("delete_self_when_unused may only be called if at least one object outside the CS (e.g. a jet) is already associated with the CS"); } +//std::shared_ptr: // set_count is not available with CXX11 shared pointers. There +//std::shared_ptr: // we'll use a different mechanism for handling self-deleting +//std::shared_ptr: // ClusterSequences +//std::shared_ptr: #ifndef FASTJET_HAVE_THREAD_SAFETY _structure_shared_ptr.set_count(new_count); +//std::shared_ptr: #endif // FASTJET_HAVE_THREAD_SAFETY _deletes_self_when_unused = true; } diff --git a/fastjet/src/ClusterSequence1GhostPassiveArea.cc b/fastjet/src/ClusterSequence1GhostPassiveArea.cc index 33dc386..892383d 100644 --- a/fastjet/src/ClusterSequence1GhostPassiveArea.cc +++ b/fastjet/src/ClusterSequence1GhostPassiveArea.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequence1GhostPassiveArea.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequenceActiveArea.cc b/fastjet/src/ClusterSequenceActiveArea.cc index 7a3b4e6..1db0a86 100644 --- a/fastjet/src/ClusterSequenceActiveArea.cc +++ b/fastjet/src/ClusterSequenceActiveArea.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceActiveArea.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.cc b/fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.cc index fcebb3d..fd3299e 100644 --- a/fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.cc +++ b/fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceActiveAreaExplicitGhosts.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequenceArea.cc b/fastjet/src/ClusterSequenceArea.cc index c431702..0ab6adc 100644 --- a/fastjet/src/ClusterSequenceArea.cc +++ b/fastjet/src/ClusterSequenceArea.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceArea.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2006-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequenceAreaBase.cc b/fastjet/src/ClusterSequenceAreaBase.cc index 2bb3d9d..b98a09a 100644 --- a/fastjet/src/ClusterSequenceAreaBase.cc +++ b/fastjet/src/ClusterSequenceAreaBase.cc @@ -1,8 +1,8 @@ //FJSTARTHEADER -// $Id: ClusterSequenceAreaBase.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequencePassiveArea.cc b/fastjet/src/ClusterSequencePassiveArea.cc index f20c0c1..03b11fb 100644 --- a/fastjet/src/ClusterSequencePassiveArea.cc +++ b/fastjet/src/ClusterSequencePassiveArea.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequencePassiveArea.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequenceStructure.cc b/fastjet/src/ClusterSequenceStructure.cc index 33f1b4b..2552f35 100644 --- a/fastjet/src/ClusterSequenceStructure.cc +++ b/fastjet/src/ClusterSequenceStructure.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceStructure.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -28,6 +28,7 @@ //---------------------------------------------------------------------- //FJENDHEADER +#include "fastjet/config.h" #include "fastjet/ClusterSequenceStructure.hh" #include "fastjet/Error.hh" #include "fastjet/PseudoJet.hh" @@ -42,6 +43,9 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh using namespace std; ClusterSequenceStructure::~ClusterSequenceStructure(){ + // with CXX11 support, the self-deletion is handled in + // release_pseudojet +//std::shared_ptr: #ifndef FASTJET_HAVE_THREAD_SAFETY if (_associated_cs != NULL && _associated_cs->will_delete_self_when_unused()) { // automatically handle deletion of the cluster sequence; @@ -55,6 +59,7 @@ ClusterSequenceStructure::~ClusterSequenceStructure(){ _associated_cs->signal_imminent_self_deletion(); delete _associated_cs; } +//std::shared_ptr: #endif // FASTJET_HAVE_THREAD_SAFETY } diff --git a/fastjet/src/ClusterSequenceVoronoiArea.cc b/fastjet/src/ClusterSequenceVoronoiArea.cc index d622b58..40596e9 100644 --- a/fastjet/src/ClusterSequenceVoronoiArea.cc +++ b/fastjet/src/ClusterSequenceVoronoiArea.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequenceVoronoiArea.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2006-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2006-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequence_CP2DChan.cc b/fastjet/src/ClusterSequence_CP2DChan.cc index 9af0a8f..a03334d 100644 --- a/fastjet/src/ClusterSequence_CP2DChan.cc +++ b/fastjet/src/ClusterSequence_CP2DChan.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequence_CP2DChan.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequence_Delaunay.cc b/fastjet/src/ClusterSequence_Delaunay.cc index 1e08390..292fed7 100644 --- a/fastjet/src/ClusterSequence_Delaunay.cc +++ b/fastjet/src/ClusterSequence_Delaunay.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequence_Delaunay.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -68,8 +68,8 @@ void ClusterSequence::_delaunay_cluster () { } // initialise our DNN structure with the set of points - SharedPtr DNN; const bool verbose = false; + SharedPtr DNN; #ifndef DROP_CGAL // strategy = NlnN* are not supported if we drop CGAL... bool ignore_nearest_is_mirror = (_Rparam < twopi); if (_strategy == NlnN4pi) { diff --git a/fastjet/src/ClusterSequence_DumbN3.cc b/fastjet/src/ClusterSequence_DumbN3.cc index 62dd9f2..fc2c16b 100644 --- a/fastjet/src/ClusterSequence_DumbN3.cc +++ b/fastjet/src/ClusterSequence_DumbN3.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequence_DumbN3.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequence_N2.cc b/fastjet/src/ClusterSequence_N2.cc index f56696c..39d0b6e 100644 --- a/fastjet/src/ClusterSequence_N2.cc +++ b/fastjet/src/ClusterSequence_N2.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequence_N2.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/ClusterSequence_TiledN2.cc b/fastjet/src/ClusterSequence_TiledN2.cc index c9388cd..fd355bc 100644 --- a/fastjet/src/ClusterSequence_TiledN2.cc +++ b/fastjet/src/ClusterSequence_TiledN2.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: ClusterSequence_TiledN2.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/CompositeJetStructure.cc b/fastjet/src/CompositeJetStructure.cc index 90867fb..143f4aa 100644 --- a/fastjet/src/CompositeJetStructure.cc +++ b/fastjet/src/CompositeJetStructure.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: CompositeJetStructure.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -28,7 +28,7 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include +#include "fastjet/CompositeJetStructure.hh" FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh diff --git a/fastjet/src/Dnn2piCylinder.cc b/fastjet/src/Dnn2piCylinder.cc index 5c4fa9b..de0ce54 100644 --- a/fastjet/src/Dnn2piCylinder.cc +++ b/fastjet/src/Dnn2piCylinder.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Dnn2piCylinder.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/Dnn3piCylinder.cc b/fastjet/src/Dnn3piCylinder.cc index 0d0636e..ba7e670 100644 --- a/fastjet/src/Dnn3piCylinder.cc +++ b/fastjet/src/Dnn3piCylinder.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Dnn3piCylinder.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/Dnn4piCylinder.cc b/fastjet/src/Dnn4piCylinder.cc index 0021c3b..456b196 100644 --- a/fastjet/src/Dnn4piCylinder.cc +++ b/fastjet/src/Dnn4piCylinder.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Dnn4piCylinder.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/DnnPlane.cc b/fastjet/src/DnnPlane.cc index 8f3e2c6..57c635d 100644 --- a/fastjet/src/DnnPlane.cc +++ b/fastjet/src/DnnPlane.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: DnnPlane.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/Error.cc b/fastjet/src/Error.cc index cc0eed1..28de418 100644 --- a/fastjet/src/Error.cc +++ b/fastjet/src/Error.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Error.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -48,9 +48,17 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh using namespace std; +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +atomic Error::_print_errors{true}; +atomic Error::_print_backtrace{false}; +atomic Error::_default_ostr{& cerr}; +atomic Error::_stream_mutex{nullptr}; +#else bool Error::_print_errors = true; bool Error::_print_backtrace = false; ostream * Error::_default_ostr = & cerr; +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY + #if (!defined(FASTJET_HAVE_EXECINFO_H)) || defined(__FJCORE__) LimitedWarning Error::_execinfo_undefined; #endif @@ -112,7 +120,12 @@ string Error::_demangle(const char* symbol) { Error::Error(const std::string & message_in) { _message = message_in; - if (_print_errors && _default_ostr){ + // Thread-safety note: + // get the ostream once and for all (avoids that another thread + // comes and changes that somewhere in the processing after the + // test + ostream* ostr = _default_ostr; + if (_print_errors && ostr){ ostringstream oss; oss << "fastjet::Error: "<< message_in << endl; @@ -140,18 +153,17 @@ Error::Error(const std::string & message_in) { #endif // FASTJET_HAVE_EXECINFO_H #endif // __FJCORE__ - *_default_ostr << oss.str(); - // get something written to file even - // if the program aborts - _default_ostr->flush(); - - // // output error message either to cerr or to the user-set stream - // if (_default_ostr) { *_default_ostr << oss.str(); - // // get something written to file even - // // if the program aborts - // _default_ostr->flush(); } - // else { std::cerr << oss.str(); } - +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + if (_stream_mutex){ + std::lock_guard guard(*_stream_mutex); + *ostr << oss.str(); + ostr->flush(); // get something written to file even if the program aborts + } else +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY + { + *ostr << oss.str(); + ostr->flush(); // get something written to file even if the program aborts + } } } diff --git a/fastjet/src/FunctionOfPseudoJet.cc b/fastjet/src/FunctionOfPseudoJet.cc index f4694b1..b35e465 100644 --- a/fastjet/src/FunctionOfPseudoJet.cc +++ b/fastjet/src/FunctionOfPseudoJet.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: FunctionOfPseudoJet.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -28,7 +28,7 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include +#include "fastjet/FunctionOfPseudoJet.hh" #include #include diff --git a/fastjet/src/GhostedAreaSpec.cc b/fastjet/src/GhostedAreaSpec.cc index aac1735..97ac3da 100644 --- a/fastjet/src/GhostedAreaSpec.cc +++ b/fastjet/src/GhostedAreaSpec.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: GhostedAreaSpec.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -37,8 +37,15 @@ using namespace std; FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh +// in order to keep thread-safety, have an independent random +// generator for each thread +//#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +// thread_local +//#endif BasicRandom GhostedAreaSpec::_random_generator; + LimitedWarning GhostedAreaSpec::_warn_fj2_placement_deprecated; +LimitedWarning GhostedAreaSpec::_warn_fixed_last_seeds_nrepeat_gt_1; /// explicit constructor GhostedAreaSpec::GhostedAreaSpec( @@ -47,8 +54,8 @@ GhostedAreaSpec::GhostedAreaSpec( double ghost_area_in , double grid_scatter_in , double pt_scatter_in , - double mean_ghost_pt_in - ): + double mean_ghost_pt_in , + BasicRandom *user_random_generator): _repeat(repeat_in), _ghost_area(ghost_area_in), _grid_scatter(grid_scatter_in), @@ -56,7 +63,8 @@ GhostedAreaSpec::GhostedAreaSpec( _mean_ghost_pt(mean_ghost_pt_in), _fj2_placement(false), _selector(selector), - _actual_ghost_area(-1.0) + _actual_ghost_area(-1.0), + _user_random_generator(user_random_generator) { // check the selector has the properties needed -- an area and // applicability jet-by-jet (the latter follows automatically from @@ -107,12 +115,14 @@ void GhostedAreaSpec::_initialize() { // checkpoint the status of the random number generator. checkpoint_random(); //_random_generator.info(cerr); + _fixed_seed=vector(); } //---------------------------------------------------------------------- /// adds the ghost 4-momenta to the vector of PseudoJet's void GhostedAreaSpec::add_ghosts(vector & event) const { + // determine the number of ghosts in rapidity double rap_offset; int nrap_upper; if (_fj2_placement) { @@ -123,6 +133,30 @@ void GhostedAreaSpec::add_ghosts(vector & event) const { nrap_upper = _nrap-1; } + // generate all the random numbers + // Note that we have 3 numbers per ghost + unsigned int n_random = (nrap_upper+_nrap+1)*_nphi*3; + double * all_random = new double[n_random]; + if (_fixed_seed.size()){ + if (_repeat > 1) _warn_fixed_last_seeds_nrepeat_gt_1 + .warn("Using fixed seeds (or accessing last used seeds) not sensible with repeat>1"); + // take a copy of the random generator and use that to generate + // things with fixed seeds + BasicRandom local_rand = generator_at_own_risk(); + local_rand.set_status(_fixed_seed); + _last_used_seed = _fixed_seed; + local_rand(n_random, all_random); + // // update the seeds so next time we get the next set + // local_rand.get_status(_fixed_seeds); + } else { + // make sure we use a lock and get the seeds used for this + // generation + _our_rand(n_random, all_random, _last_used_seed); + } + + // a counter for where we are in the random array + unsigned int random_counter=0; + // add momenta for ghosts for (int irap = -_nrap; irap <= nrap_upper; irap++) { for (int iphi = 0; iphi < _nphi; iphi++) { @@ -132,13 +166,17 @@ void GhostedAreaSpec::add_ghosts(vector & event) const { // NB: in FJ2 we'd exchanged the px and py components relative to a // standard definition of phi; to preserve the same areas as fj2 // we now generate a "phi_fj2", and then convert to a standard phi - double phi_fj2 = (iphi+0.5) * _dphi + _dphi*(_our_rand()-0.5)*_grid_scatter; + //double phi_fj2 = (iphi+0.5) * _dphi + _dphi*(_our_rand()-0.5)*_grid_scatter; + double phi_fj2 = (iphi+0.5) * _dphi + _dphi*(all_random[random_counter++]-0.5)*_grid_scatter; double phi; if (_fj2_placement) phi = 0.5*pi - phi_fj2; else phi = phi_fj2; - double rap = (irap+rap_offset) * _drap + _drap*(_our_rand()-0.5)*_grid_scatter + //double rap = (irap+rap_offset) * _drap + _drap*(_our_rand()-0.5)*_grid_scatter + // + _ghost_rap_offset ; + double rap = (irap+rap_offset) * _drap + _drap*(all_random[random_counter++]-0.5)*_grid_scatter + _ghost_rap_offset ; - double pt = _mean_ghost_pt*(1+(_our_rand()-0.5)*_pt_scatter); + //double pt = _mean_ghost_pt*(1+(_our_rand()-0.5)*_pt_scatter); + double pt = _mean_ghost_pt*(1+(all_random[random_counter++]-0.5)*_pt_scatter); double exprap = exp(+rap); double pminus = pt/exprap; @@ -158,6 +196,12 @@ void GhostedAreaSpec::add_ghosts(vector & event) const { event.push_back(mom); } } + + // release memory + delete[] all_random; + + // safety check + assert(random_counter==n_random); } string GhostedAreaSpec::description() const { diff --git a/fastjet/src/JetDefinition.cc b/fastjet/src/JetDefinition.cc index 1158a24..99f4ba1 100644 --- a/fastjet/src/JetDefinition.cc +++ b/fastjet/src/JetDefinition.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: JetDefinition.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -206,7 +206,8 @@ void JetDefinition::set_recombiner(const JetDefinition &other_jet_def){ _default_recombiner = DefaultRecombiner(external_scheme); // and set the _shared_recombiner to the same state // as in the other_jet_def, whatever that was - _shared_recombiner.reset(other_jet_def._shared_recombiner); + _shared_recombiner = other_jet_def._shared_recombiner; + //_shared_recombiner.reset(other_jet_def._shared_recombiner); // NB: it is tempting to go via set_recombiner and then to sort // out the shared part, but this would be dangerous in the diff --git a/fastjet/src/LazyTiling25.cc b/fastjet/src/LazyTiling25.cc index 5540f9f..5849b7d 100644 --- a/fastjet/src/LazyTiling25.cc +++ b/fastjet/src/LazyTiling25.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: LazyTiling25.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/LazyTiling9.cc b/fastjet/src/LazyTiling9.cc index 9b95585..55a96c4 100644 --- a/fastjet/src/LazyTiling9.cc +++ b/fastjet/src/LazyTiling9.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: LazyTiling9.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/LazyTiling9Alt.cc b/fastjet/src/LazyTiling9Alt.cc index d4efba4..f6ec4fa 100644 --- a/fastjet/src/LazyTiling9Alt.cc +++ b/fastjet/src/LazyTiling9Alt.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: LazyTiling9Alt.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/LazyTiling9SeparateGhosts.cc b/fastjet/src/LazyTiling9SeparateGhosts.cc index 0942f6c..a5a1669 100644 --- a/fastjet/src/LazyTiling9SeparateGhosts.cc +++ b/fastjet/src/LazyTiling9SeparateGhosts.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: LazyTiling9SeparateGhosts.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -35,7 +35,11 @@ using namespace std; FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh +//#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +//atomic LazyTiling9SeparateGhosts::ghost_pt2_threshold{1e-100}; +//#else double LazyTiling9SeparateGhosts::ghost_pt2_threshold = 1e-100; +//#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY LazyTiling9SeparateGhosts::LazyTiling9SeparateGhosts(ClusterSequence & cs) : _cs(cs), _jets(cs.jets()) diff --git a/fastjet/src/LimitedWarning.cc b/fastjet/src/LimitedWarning.cc index 4ea01af..2b83e6a 100644 --- a/fastjet/src/LimitedWarning.cc +++ b/fastjet/src/LimitedWarning.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: LimitedWarning.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -36,52 +36,116 @@ using namespace std; FASTJET_BEGIN_NAMESPACE +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +atomic LimitedWarning::_default_ostr{&cerr}; +atomic LimitedWarning::_stream_mutex{nullptr}; +atomic LimitedWarning::_max_warn_default{5}; +std::mutex LimitedWarning::_global_warnings_summary_mutex; +#else ostream * LimitedWarning::_default_ostr = &cerr; -std::list< LimitedWarning::Summary > LimitedWarning::_global_warnings_summary; int LimitedWarning::_max_warn_default = 5; +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY +std::list< LimitedWarning::Summary > LimitedWarning::_global_warnings_summary; // /// output a warning to ostr // void LimitedWarning::warn(const std::string & warning) { // warn(warning, _default_ostr); // } +/// the number of times so far that a warning has been registered +/// with this instance of the class. +int LimitedWarning::n_warn_so_far() const{ + // explicitly cast to the pointer type (useless wo thread-safety + // features but works around an issue with the intel compiler + // (v13.1.3) with thread-safety features + if (((LimitedWarning::Summary *)_this_warning_summary) == 0) return 0; + return (*_this_warning_summary).second; +} + + void LimitedWarning::warn(const char * warning, std::ostream * ostr) { - if (_this_warning_summary == 0) { + // update the summary + if (((LimitedWarning::Summary *)_this_warning_summary) == 0){ +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + // Threadsafety note: + // here we need to lock _this_warning_summary to be sure that we + // can quietly initialising things without taking the risk that + // another thread "regenerates" the Summary entry at the same time + // + // first acquire the mutex! + // See e.g. http://baptiste-wicht.com/posts/2012/03/cp11-concurrency-tutorial-part-2-protect-shared-data.html + // for a quick intro. + std::lock_guard guard(_global_warnings_summary_mutex); + // then make sure we still need to create things (in case another + // thread got us beaten (it's better to use the mutex as little as + // possible, hence the repetition of the text which might + // otherwise look stupid) + if (((LimitedWarning::Summary *)_this_warning_summary) == 0){ + // prepare the information for the summary + _global_warnings_summary.push_back(Summary(warning, 0)); + _this_warning_summary = & (_global_warnings_summary.back()); + } + // the lock will automatically be released here +#else // prepare the information for the summary _global_warnings_summary.push_back(Summary(warning, 0)); _this_warning_summary = & (_global_warnings_summary.back()); +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY } - if (_n_warn_so_far < _max_warn) { + + + // maintain the count, but do not allow overflow + unsigned int count = (*_this_warning_summary).second.step(); + + // print the warning if we have not done it enough already + if ((_max_warn<0) || (count < (unsigned int)_max_warn)) { // prepare the warning within a string stream ostringstream warnstr; warnstr << "WARNING from FastJet: "; warnstr << warning; - _n_warn_so_far++; - if (_n_warn_so_far == _max_warn) warnstr << " (LAST SUCH WARNING)"; + if ((_max_warn>0) && (count+1 == (unsigned int)_max_warn)) + warnstr << " (LAST SUCH WARNING)"; warnstr << std::endl; // arrange for the whole warning to be output in one go (that way // user can easily insert their own printout, e.g. event number // before the warning string). if (ostr) { - (*ostr) << warnstr.str(); - ostr->flush(); // get something written to file even if the program aborts + // if there is a mutex, use it to lock +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + if (_stream_mutex){ + std::lock_guard guard(*_stream_mutex); + (*ostr) << warnstr.str(); + ostr->flush(); // get something written to file even if the program aborts + } else +#endif // FASTJET_HAVE_LIMITED_THREAD_SAFETY + { + (*ostr) << warnstr.str(); + ostr->flush(); // get something written to file even if the program aborts + } } } - // maintain the count, but do not allow overflow - if (_this_warning_summary->second < numeric_limits::max()) { - _this_warning_summary->second++; - } } //---------------------------------------------------------------------- string LimitedWarning::summary() { ostringstream str; +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + { + // is the lock here really necessary. The only potential issue I + // see is if another thread adds a warning when the loop below + // calls it++ on the previous last element. Is there a simpler way + // to handle this? + std::lock_guard guard(_global_warnings_summary_mutex); +#endif for (list::const_iterator it = _global_warnings_summary.begin(); it != _global_warnings_summary.end(); it++) { str << it->second << " times: " << it->first << endl; } +#ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY + } +#endif return str.str(); } diff --git a/fastjet/src/Makefile.in b/fastjet/src/Makefile.in index 3a7d83c..76f5748 100644 --- a/fastjet/src/Makefile.in +++ b/fastjet/src/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. diff --git a/fastjet/src/MinHeap.cc b/fastjet/src/MinHeap.cc index 5276a34..be451d4 100644 --- a/fastjet/src/MinHeap.cc +++ b/fastjet/src/MinHeap.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: MinHeap.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/PseudoJet.cc b/fastjet/src/PseudoJet.cc index 05c6920..a920aa2 100644 --- a/fastjet/src/PseudoJet.cc +++ b/fastjet/src/PseudoJet.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: PseudoJet.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -60,10 +60,61 @@ PseudoJet::PseudoJet(const double px_in, const double py_in, const double pz_in, this->_finish_init(); // some default values for the history and user indices + // note: no reset of shared pointers needed _reset_indices(); - + } +#ifdef FASTJET_HAVE_THREAD_SAFETY +/// copy-assignmemt +/// +/// this has to be explicitly specified since atomic does not support it. +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); + + return *this; +} +#endif // FASTJET_HAVE_THREAD_SAFETY + +//std::shared_ptr: //---------------------------------------------------------------------- +//std::shared_ptr: #ifdef FASTJET_HAVE_THREAD_SAFETY +//std::shared_ptr: PseudoJet::~PseudoJet(){ +//std::shared_ptr: _release_jet_from_cs(); +//std::shared_ptr: } +//std::shared_ptr: +//std::shared_ptr: // this has to be called everytime one tries to alter the jet +//std::shared_ptr: // structural info +//std::shared_ptr: void PseudoJet::_release_jet_from_cs(){ +//std::shared_ptr: // check if the jet has the structure of type CSstruct in which case +//std::shared_ptr: // we have to check if there is a need for self-deletion of the CS +//std::shared_ptr: ClusterSequenceStructure * assoc_css = dynamic_cast(_structure.get()); +//std::shared_ptr: if (assoc_css) { +//std::shared_ptr: const ClusterSequence * assoc_cs = assoc_css->associated_cluster_sequence(); +//std::shared_ptr: if (assoc_cs) assoc_cs->release_pseudojet(*this); +//std::shared_ptr: } +//std::shared_ptr: +//std::shared_ptr: // slightly less efficient version +//std::shared_ptr: // if ((has_structure_of()) && (has_valid_cluster_sequence())){ +//std::shared_ptr: // associated_cs()->release_pseudojet(*this); +//std::shared_ptr: // } +//std::shared_ptr: } +//std::shared_ptr: +//std::shared_ptr: #endif // FASTJET_HAVE_THREAD_SAFETY //---------------------------------------------------------------------- /// do standard end of initialisation @@ -78,7 +129,57 @@ void PseudoJet::_finish_init () { // So we initialise it; penalty is about 0.3ns per PseudoJet out of about // 10ns total initialisation time (on a intel Core i7 2.7GHz) _rap = pseudojet_invalid_rap; + +#ifdef FASTJET_HAVE_THREAD_SAFETY + _init_status = Init_NotDone; +#endif +} + +//---------------------------------------------------------------------- +#ifdef FASTJET_HAVE_THREAD_SAFETY +void PseudoJet::_ensure_valid_rap_phi() const{ + //TODO: for _init_status we can use memory_order_release when + //writing and memory_order_acquire when reading. Check if that has + //an impact on timing + if (_init_status!=Init_Done){ + int expected = Init_NotDone; + // if it's 0 (not done), set thing to "operation in progress" + // (-1) and do the init + // + // Note: + // - this has to be the strong version so we can make a single + // test + // - we need to make sure that the -1 is loaded properly + // (success), hence a std::memory_order_seq_cst model + // - the failure model can be anything since we're not going + // to use the value anyway + if (_init_status.compare_exchange_strong(expected, Init_InProgress, + 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 + } 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)); + } + + } } +#endif //---------------------------------------------------------------------- void PseudoJet::_set_rap_phi() const { @@ -345,6 +446,9 @@ void PseudoJet::set_cached_rap_phi(double rap_in, double phi_in) { _rap = rap_in; _phi = phi_in; if (_phi >= twopi) _phi -= twopi; if (_phi < 0) _phi += twopi; +#ifdef FASTJET_HAVE_THREAD_SAFETY + _init_status = Init_Done; +#endif } //---------------------------------------------------------------------- @@ -466,13 +570,17 @@ const ClusterSequence * PseudoJet::validated_cs() const { //---------------------------------------------------------------------- // set the associated structure void PseudoJet::set_structure_shared_ptr(const SharedPtr &structure_in){ +//std::shared_ptr: #ifdef FASTJET_HAVE_THREAD_SAFETY +//std::shared_ptr: // if the jet currently belongs to a cs, we need to release it before any chenge +//std::shared_ptr: _release_jet_from_cs(); +//std::shared_ptr: #endif //FASTJET_HAVE_THREAD_SAFETY _structure = structure_in; } //---------------------------------------------------------------------- // return true if there is some structure associated with this PseudoJet bool PseudoJet::has_structure() const{ - return bool(_structure); + return (bool) _structure; // cast to bool has to be made explicit } //---------------------------------------------------------------------- diff --git a/fastjet/src/PseudoJetStructureBase.cc b/fastjet/src/PseudoJetStructureBase.cc index ff14780..71f73ef 100644 --- a/fastjet/src/PseudoJetStructureBase.cc +++ b/fastjet/src/PseudoJetStructureBase.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: PseudoJetStructureBase.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/RangeDefinition.cc b/fastjet/src/RangeDefinition.cc index 253d914..db6621e 100644 --- a/fastjet/src/RangeDefinition.cc +++ b/fastjet/src/RangeDefinition.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: RangeDefinition.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/RectangularGrid.cc b/fastjet/src/RectangularGrid.cc index 8c0f2b5..dc8d2c8 100644 --- a/fastjet/src/RectangularGrid.cc +++ b/fastjet/src/RectangularGrid.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: RectangularGrid.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/Selector.cc b/fastjet/src/Selector.cc index c751e79..09c30a2 100644 --- a/fastjet/src/Selector.cc +++ b/fastjet/src/Selector.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Selector.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/TilingExtent.cc b/fastjet/src/TilingExtent.cc index 4d1fcf3..fb824b2 100644 --- a/fastjet/src/TilingExtent.cc +++ b/fastjet/src/TilingExtent.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: TilingExtent.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/Voronoi.cc b/fastjet/src/Voronoi.cc index 5ecf400..45628a5 100644 --- a/fastjet/src/Voronoi.cc +++ b/fastjet/src/Voronoi.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Voronoi.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/src/genconfig.sh b/fastjet/src/genconfig.sh index 8979a72..fcf6f1f 100755 --- a/fastjet/src/genconfig.sh +++ b/fastjet/src/genconfig.sh @@ -19,7 +19,7 @@ echo '#define FASTJET_VERSION "'$packver'"' >> $configfile # follow the strategy used by configure to define all version number macros versionmajor=`echo $packver | sed 's/^\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\).*/\1/'` versionminor=`echo $packver | sed 's/^\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\).*/\2/'` -versionending=`echo $packver | sed 's/^\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)$/\3/'` +versionending=`echo $packver | sed 's/^\([^\.]*\)\.\([^\.]*\)\.\(.*\)$/\3/'` versionpatchlevel=`echo $versionending | sed 's/^\([0-9]*\).*/\1/'` versionprerelease=`echo $versionending | sed 's/^[0-9-]*//'` versionnumber=`printf "%d%.2d%.2d" "$versionmajor" "$versionminor" "$versionpatchlevel"` diff --git a/fastjet/test-driver b/fastjet/test-driver index 89dba1e..9759384 100755 --- a/fastjet/test-driver +++ b/fastjet/test-driver @@ -42,11 +42,13 @@ print_usage () { cat < & sorted_quanti } +void BackgroundEstimatorBase::_lock_if_needed() const{ +#ifdef FASTJET_HAVE_THREAD_SAFETY + bool expected; + // the following waits until the cache_writing status is "false" and sets it to "true" + do { + expected = false; + } while (!_writing_to_cache.compare_exchange_strong(expected, true, + memory_order_seq_cst, + memory_order_relaxed)); +#endif // FASTJET_HAVE_THREAD_SAFETY +} + +void BackgroundEstimatorBase::_unlock_if_needed() const{ +#ifdef FASTJET_HAVE_THREAD_SAFETY + // release the "write-in-progress" lock + _writing_to_cache = false; +#endif +} + + FASTJET_END_NAMESPACE // defined in fastjet/internal/base.hh diff --git a/fastjet/tools/CASubJetTagger.cc b/fastjet/tools/CASubJetTagger.cc index 37dff1d..71dc383 100644 --- a/fastjet/tools/CASubJetTagger.cc +++ b/fastjet/tools/CASubJetTagger.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: CASubJetTagger.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -28,8 +28,8 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include +#include "fastjet/tools/CASubJetTagger.hh" +#include "fastjet/ClusterSequence.hh" #include #include diff --git a/fastjet/tools/Filter.cc b/fastjet/tools/Filter.cc index de81bc7..a4812c3 100644 --- a/fastjet/tools/Filter.cc +++ b/fastjet/tools/Filter.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Filter.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,7 +31,7 @@ #include "fastjet/tools/Filter.hh" #include "fastjet/tools/Recluster.hh" #include "fastjet/tools/Subtractor.hh" -#include +#include "fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh" #include #include #include @@ -65,8 +65,9 @@ string Filter::description() const { ostr << _subjet_def.description(); } ostr<< ", selection " << _selector.description(); - if (_subtractor) { - ostr << ", subtractor: " << _subtractor->description(); + const FunctionOfPseudoJet *local_subtractor = _subtractor; + if (local_subtractor) { + ostr << ", subtractor: " << local_subtractor->description(); } else if (_rho != 0) { ostr << ", subtracting with rho = " << _rho; } @@ -94,8 +95,9 @@ PseudoJet Filter::result(const PseudoJet &jet) const { bool ca_optimised = _set_filtered_elements(jet, subjets); // apply subtraction if needed: - if (_subtractor){ - subjets = (*_subtractor)(subjets); + const FunctionOfPseudoJet *local_subtractor = _subtractor; + if (local_subtractor){ + subjets = (*local_subtractor)(subjets); } else if (_rho!=0){ if (subjets.size()>0){ //const ClusterSequenceAreaBase *csab = subjets[0].validated_csab(); diff --git a/fastjet/tools/GridMedianBackgroundEstimator.cc b/fastjet/tools/GridMedianBackgroundEstimator.cc index 036b7d9..7c0b763 100644 --- a/fastjet/tools/GridMedianBackgroundEstimator.cc +++ b/fastjet/tools/GridMedianBackgroundEstimator.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: GridMedianBackgroundEstimator.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -43,11 +43,13 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh void GridMedianBackgroundEstimator::set_particles(const vector & particles) { vector scalar_pt(n_tiles(), 0.0); -#ifdef FASTJET_GMBGE_USEFJGRID assert(all_tiles_equal_area()); //assert(n_good_tiles() == n_tiles()); // not needed now that we have an implementation -#endif + _cached_estimate.reset(); + _cached_estimate.set_has_sigma(true); + _cached_estimate.set_mean_area(mean_tile_area()); + // check if we need to compute only rho or both rho and rho_m if (_enable_rho_m){ // both rho and rho_m @@ -76,8 +78,9 @@ void GridMedianBackgroundEstimator::set_particles(const vector & part // compute rho_m and sigma_m (see comment below for the // normaliosation of sigma) double p50 = _percentile(scalar_dt, 0.5); - _rho_m = p50 / mean_tile_area(); - _sigma_m = (p50-_percentile(scalar_dt, (1.0-0.6827)/2.0))/sqrt(mean_tile_area()); + _cached_estimate.set_has_rho_m(true); + _cached_estimate.set_rho_m(p50 / mean_tile_area()); + _cached_estimate.set_sigma_m((p50-_percentile(scalar_dt, (1.0-0.6827)/2.0))/sqrt(mean_tile_area())); } else { // only rho //fill(_scalar_pt.begin(), _scalar_pt.end(), 0.0); @@ -122,20 +125,39 @@ void GridMedianBackgroundEstimator::set_particles(const vector & part // watch out: by definition, our sigma is the standard deviation of // the pt density multiplied by the square root of the cell area double p50 = _percentile(scalar_pt, 0.5); - _rho = p50 / mean_tile_area(); - _sigma = (p50-_percentile(scalar_pt, (1.0-0.6827)/2.0))/sqrt(mean_tile_area()); + _cached_estimate.set_rho(p50 / mean_tile_area()); + _cached_estimate.set_sigma((p50-_percentile(scalar_pt, (1.0-0.6827)/2.0))/sqrt(mean_tile_area())); - _has_particles = true; + _cache_available = true; } //---------------------------------------------------------------------- // retrieving fundamental information //---------------------------------------------------------------------- + +// get the full set of background properties +BackgroundEstimate GridMedianBackgroundEstimator::estimate() const{ + verify_particles_set(); + return _cached_estimate; +} + +// get the full set of background properties for a given reference jet +BackgroundEstimate GridMedianBackgroundEstimator::estimate(const PseudoJet &jet) const{ + verify_particles_set(); + if (_rescaling_class == 0) + return _cached_estimate; + + BackgroundEstimate local_estimate = _cached_estimate; + local_estimate.apply_rescaling_factor((*_rescaling_class)(jet)); + return local_estimate; +} + + // get rho, the median background density per unit area double GridMedianBackgroundEstimator::rho() const { verify_particles_set(); - return _rho; + return _cached_estimate.rho(); } @@ -145,7 +167,7 @@ double GridMedianBackgroundEstimator::rho() const { // given area. double GridMedianBackgroundEstimator::sigma() const{ verify_particles_set(); - return _sigma; + return _cached_estimate.sigma(); } //---------------------------------------------------------------------- @@ -177,7 +199,7 @@ double GridMedianBackgroundEstimator::rho_m() const { throw Error("GridMediamBackgroundEstimator: rho_m requested but rho_m calculation has been disabled."); } verify_particles_set(); - return _rho_m; + return _cached_estimate.rho_m(); } @@ -190,7 +212,7 @@ double GridMedianBackgroundEstimator::sigma_m() const{ throw Error("GridMediamBackgroundEstimator: sigma_m requested but rho_m/sigma_m calculation has been disabled."); } verify_particles_set(); - return _sigma_m; + return _cached_estimate.sigma_m(); } //---------------------------------------------------------------------- @@ -215,7 +237,7 @@ double GridMedianBackgroundEstimator::sigma_m(const PseudoJet & jet){ //---------------------------------------------------------------------- // verify that particles have been set and throw an error if not void GridMedianBackgroundEstimator::verify_particles_set() const { - if (!_has_particles) throw Error("GridMedianBackgroundEstimator::rho() or sigma() called without particles having been set"); + if (!_cache_available) throw Error("GridMedianBackgroundEstimator::rho() or sigma() called without particles having been set"); } @@ -224,13 +246,7 @@ void GridMedianBackgroundEstimator::verify_particles_set() const { //---------------------------------------------------------------------- string GridMedianBackgroundEstimator::description() const { ostringstream desc; -#ifdef FASTJET_GMBGE_USEFJGRID desc << "GridMedianBackgroundEstimator, with " << RectangularGrid::description(); -#else - desc << "GridMedianBackgroundEstimator, with grid extension |y| < " << _ymax - << ", and grid cells of size dy x dphi = " << _dy << " x " << _dphi - << " (requested size = " << _requested_grid_spacing << ")"; -#endif return desc.str(); } @@ -254,69 +270,12 @@ void GridMedianBackgroundEstimator::set_rescaling_class(const FunctionOfPseudoJe // you need to call set_particles again if you set the rescaling // class. We thus warn if there are already some available // particles - if (_has_particles) + if (_cache_available) _warning_rescaling.warn("GridMedianBackgroundEstimator::set_rescaling_class(): trying to set the rescaling class when there are already particles that have been set is dangerous: the rescaling will not affect the already existing particles resulting in mis-estimation of rho. You need to call set_particles() again before proceeding with any background estimation."); BackgroundEstimatorBase::set_rescaling_class(rescaling_class_in); } -#ifndef FASTJET_GMBGE_USEFJGRID -//---------------------------------------------------------------------- -// protected material -//---------------------------------------------------------------------- -// configure the grid -void GridMedianBackgroundEstimator::setup_grid() { - - // since we've exchanged the arguments of the grid constructor, - // there's a danger of calls with exchanged ymax,spacing arguments -- - // the following check should catch most such situations. - assert(_ymax>0 && _ymax - _ymin >= _requested_grid_spacing); - - // this grid-definition code is becoming repetitive -- it should - // probably be moved somewhere central... - double ny_double = (_ymax-_ymin) / _requested_grid_spacing; - _ny = int(ny_double+0.5); - _dy = (_ymax-_ymin) / _ny; - - _nphi = int (twopi / _requested_grid_spacing + 0.5); - _dphi = twopi / _nphi; - - // some sanity checking (could throw a fastjet::Error) - assert(_ny >= 1 && _nphi >= 1); - - _ntotal = _nphi * _ny; - //_scalar_pt.resize(_ntotal); - _tile_area = _dy * _dphi; -} - - -//---------------------------------------------------------------------- -// retrieve the grid tile index for a given PseudoJet -int GridMedianBackgroundEstimator::tile_index(const PseudoJet & p) const { - // directly taking int does not work for values between -1 and 0 - // so use floor instead - // double iy_double = (p.rap() - _ymin) / _dy; - // if (iy_double < 0.0) return -1; - // int iy = int(iy_double); - // if (iy >= _ny) return -1; - - // writing it as below gives a huge speed gain (factor two!). Even - // though answers are identical and the routine here is not the - // speed-critical step. It's not at all clear why. - int iy = int(floor( (p.rap() - _ymin) / _dy )); - if (iy < 0 || iy >= _ny) return -1; - - int iphi = int( p.phi()/_dphi ); - assert(iphi >= 0 && iphi <= _nphi); - if (iphi == _nphi) iphi = 0; // just in case of rounding errors - - int index_res = iy*_nphi + iphi; - assert (index_res >= 0 && index_res < _ny*_nphi); - return index_res; -} -#endif // FASTJET_GMBGE_USEFJGRID - - FASTJET_END_NAMESPACE // defined in fastjet/internal/base.hh diff --git a/fastjet/tools/JHTopTagger.cc b/fastjet/tools/JHTopTagger.cc index 90c7811..5711c49 100644 --- a/fastjet/tools/JHTopTagger.cc +++ b/fastjet/tools/JHTopTagger.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: JHTopTagger.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -28,10 +28,10 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include -#include -#include +#include "fastjet/tools/JHTopTagger.hh" +#include "fastjet/Error.hh" +#include "fastjet/JetDefinition.hh" +#include "fastjet/ClusterSequence.hh" #include #include diff --git a/fastjet/tools/JetMedianBackgroundEstimator.cc b/fastjet/tools/JetMedianBackgroundEstimator.cc index e21cf08..4646a7d 100644 --- a/fastjet/tools/JetMedianBackgroundEstimator.cc +++ b/fastjet/tools/JetMedianBackgroundEstimator.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: JetMedianBackgroundEstimator.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -29,15 +29,15 @@ //FJENDHEADER #include "fastjet/tools/JetMedianBackgroundEstimator.hh" -#include -#include +#include "fastjet/ClusterSequenceArea.hh" +#include "fastjet/ClusterSequenceStructure.hh" #include #include -FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh - using namespace std; +FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh + double BackgroundJetScalarPtDensity::result(const PseudoJet & jet) const { // do not include the ghosts in the list of constituents to have a // correct behaviour when _pt_power is <= 0 @@ -115,28 +115,51 @@ JetMedianBackgroundEstimator::JetMedianBackgroundEstimator( const Selector &rho_ // tell the background estimator that it has a new event, composed // of the specified particles. void JetMedianBackgroundEstimator::set_particles(const vector & particles) { + // pass an empty seed vector to the full set_particles method to tell it to use + // default seeds rather than fixed seeds + vector seed; + set_particles_with_seed(particles, seed); +} + + +// tell the background estimator that it has a new event, composed +// of the specified particles and use the supplied seed for the +// generation of ghosts. If the seed is empty, it is ignored. +void JetMedianBackgroundEstimator::set_particles_with_seed(const vector & particles, const vector & seed) { // make sure that we have been provided a genuine jet definition if (_jet_def.jet_algorithm() == undefined_jet_algorithm) throw Error("JetMedianBackgroundEstimator::set_particles can only be called if you set the jet (and area) definition explicitly through the class constructor"); // initialise things decently (including setting uptodate to false!) //reset(); - _uptodate=false; // cluster the particles // // One may argue that it is better to cache the particles and only // do the clustering later but clustering the particles now has 2 // practical advantages: - // - it allows to une only '_included_jets' in all that follows + // - it allows us to use only '_included_jets' in all that follows // - it avoids adding another flag to ensure particles are // clustered only once - ClusterSequenceArea *csa = new ClusterSequenceArea(particles, _jet_def, _area_def); + ClusterSequenceArea *csa; + if (seed.size() == 0) { + csa = new ClusterSequenceArea(particles, _jet_def, _area_def); + } else { + csa = new ClusterSequenceArea(particles, _jet_def, _area_def.with_fixed_seed(seed)); + } +//THREAD-SAFETY-QUESTION: #ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +//THREAD-SAFETY-QUESTION: // before caching thing, lock things down to avoid concurrency issues +//THREAD-SAFETY-QUESTION: std::lock_guard guard(_jets_caching_mutex); +//THREAD-SAFETY-QUESTION: #endif _included_jets = csa->inclusive_jets(); // store the CS for later on _csi = csa->structure_shared_ptr(); csa->delete_self_when_unused(); + + _set_cache_unavailable(); + +//THREAD-SAFETY-QUESTION: // in thread-safe mode, the lock will automatically be released here } //---------------------------------------------------------------------- @@ -158,22 +181,29 @@ void JetMedianBackgroundEstimator::set_particles(const vector & parti // a well-defined area. For this reasons, it is STRONGLY advised to // use an area with explicit ghosts. void JetMedianBackgroundEstimator::set_cluster_sequence(const ClusterSequenceAreaBase & csa) { - _csi = csa.structure_shared_ptr(); - // sanity checks //--------------- - // (i) check the alg is appropriate - _check_jet_alg_good_for_median(); - - // (ii) check that, if there are no explicit ghosts, the selector has a finite area + // (i) check that, if there are no explicit ghosts, the selector has a finite area if ((!csa.has_explicit_ghosts()) && (!_rho_range.has_finite_area())){ throw Error("JetMedianBackgroundEstimator: either an area with explicit ghosts (recommended) or a Selector with finite area is needed (to allow for the computation of the empty area)"); } +//THREAD-SAFETY-QUESTION: #ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +//THREAD-SAFETY-QUESTION: // before caching thing, lock things down to avoid concurrency issues +//THREAD-SAFETY-QUESTION: std::lock_guard guard(_jets_caching_mutex); +//THREAD-SAFETY-QUESTION: #endif + _csi = csa.structure_shared_ptr(); + + // (ii) check the alg is appropriate + _check_jet_alg_good_for_median(); + + // get the initial list of jets _included_jets = csa.inclusive_jets(); - _uptodate = false; + _set_cache_unavailable(); + +//THREAD-SAFETY-QUESTION: // in thread-safe mode, the lock will automatically be released here } @@ -192,53 +222,100 @@ void JetMedianBackgroundEstimator::set_jets(const vector &jets) { if (! (jets[0].has_associated_cluster_sequence()) && (jets[0].has_area())) throw Error("JetMedianBackgroundEstimator::JetMedianBackgroundEstimator: the jets used to estimate the background properties must be associated with a valid ClusterSequenceAreaBase"); - _csi = jets[0].structure_shared_ptr(); - ClusterSequenceStructure * csi = dynamic_cast(_csi.get()); + SharedPtr csi_shared = jets[0].structure_shared_ptr(); + ClusterSequenceStructure * csi = dynamic_cast(csi_shared.get()); const ClusterSequenceAreaBase * csab = csi->validated_csab(); for (unsigned int i=1;ihas_explicit_ghosts()) && (!_rho_range.has_finite_area())){ throw Error("JetMedianBackgroundEstimator: either an area with explicit ghosts (recommended) or a Selector with finite area is needed (to allow for the computation of the empty area)"); } +//THREAD-SAFETY-QUESTION: #ifdef FASTJET_HAVE_LIMITED_THREAD_SAFETY +//THREAD-SAFETY-QUESTION: // before caching thing, lock things down to avoid concurrency issues +//THREAD-SAFETY-QUESTION: std::lock_guard guard(_jets_caching_mutex); +//THREAD-SAFETY-QUESTION: #endif + _csi = csi_shared; + + // (ii) check the alg is appropriate + _check_jet_alg_good_for_median(); // get the initial list of jets _included_jets = jets; // ensure recalculation of quantities that need it - _uptodate = false; + _set_cache_unavailable(); + +//THREAD-SAFETY-QUESTION: // in thread-safe mode, the lock will automatically be released here } - //---------------------------------------------------------------------- // retrieving fundamental information -//---------------------------------------------------------------- +//---------------------------------------------------------------------- + +// get the full set of background properties +// +// For background estimators using a local ranges, this throws an +// error (use estimate(jet) instead) +// In the presence of a rescaling, the rescaling factor is not taken +// into account +BackgroundEstimate JetMedianBackgroundEstimator::estimate() const{ + if (_rho_range.takes_reference()) + throw Error("The background estimation is obtained from a selector that takes a reference jet. estimate(PseudoJet) should be used in that case"); + + if (!_cache_available) _compute_and_cache_no_overwrite(); + return _cached_estimate; +} + +// get the full set of background properties for a given reference jet +// This does not affect the cache +BackgroundEstimate JetMedianBackgroundEstimator::estimate(const PseudoJet &jet) const{ + // first compute an optional rescaling factor + double rescaling_factor = (_rescaling_class != 0) + ? (*_rescaling_class)(jet) : 1.0; + BackgroundEstimate local_estimate; + + // adopt a different strategy for ranges taking a reference and others + if (_rho_range.takes_reference()){ + // we compute the background and rescale it (no caching) + 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 + if (!_cache_available) _compute_and_cache_no_overwrite(); + local_estimate = _cached_estimate; + } + local_estimate.apply_rescaling_factor(rescaling_factor); + return local_estimate; +} + +//------ // get rho, the median background density per unit area double JetMedianBackgroundEstimator::rho() const { if (_rho_range.takes_reference()) throw Error("The background estimation is obtained from a selector that takes a reference jet. rho(PseudoJet) should be used in that case"); - _recompute_if_needed(); - return _rho; + + // we are in a situation where the cache only needs to be computed + // once, but once it has been computed, we can use it freely. + if (!_cache_available) _compute_and_cache_no_overwrite(); + return _cached_estimate.rho(); } // get sigma, the background fluctuations per unit area double JetMedianBackgroundEstimator::sigma() const { if (_rho_range.takes_reference()) - throw Error("The background estimation is obtained from a selector that takes a reference jet. rho(PseudoJet) should be used in that case"); - _recompute_if_needed(); - return _sigma; + throw Error("The background estimation is obtained from a selector that takes a reference jet. sigma(PseudoJet) should be used in that case"); + if (!_cache_available) _compute_and_cache_no_overwrite(); + return _cached_estimate.sigma(); } // get rho, the median background density per unit area, locally at @@ -248,12 +325,21 @@ double JetMedianBackgroundEstimator::sigma() const { // (i.e. is relocatable), then for subsequent operations the // Selector has that jet set as its reference. double JetMedianBackgroundEstimator::rho(const PseudoJet & jet) { - _recompute_if_needed(jet); - double our_rho = _rho; - if (_rescaling_class != 0) { - our_rho *= (*_rescaling_class)(jet); + // first compute an optional rescaling factor + double rescaling_factor = (_rescaling_class != 0) + ? (*_rescaling_class)(jet) : 1.0; + + // adopt a different strategy for ranges taking a reference and others + if (_rho_range.takes_reference()){ + // we compute the background and use it + BackgroundEstimate estimate = _compute_and_cache_if_needed(jet); + return rescaling_factor * estimate.rho(); } - return our_rho; + + // otherwise, we're in a situation where things can be cached once + // and for all and then the cache can be used frely + if (!_cache_available) _compute_and_cache_no_overwrite(); + return rescaling_factor * _cached_estimate.rho(); } // get sigma, the background fluctuations per unit area, @@ -263,25 +349,32 @@ double JetMedianBackgroundEstimator::rho(const PseudoJet & jet) { // (i.e. is relocatable), then for subsequent operations the // Selector has that jet set as its reference. double JetMedianBackgroundEstimator::sigma(const PseudoJet &jet) { - _recompute_if_needed(jet); - double our_sigma = _sigma; - if (_rescaling_class != 0) { - our_sigma *= (*_rescaling_class)(jet); + // first compute an optional rescaling factor + double rescaling_factor = (_rescaling_class != 0) + ? (*_rescaling_class)(jet) : 1.0; + + // see "rho(jet)" for a descrtiption of the strategy + if (_rho_range.takes_reference()){ + BackgroundEstimate estimate = _compute_and_cache_if_needed(jet); + return rescaling_factor * estimate.sigma(); } - return our_sigma; + // otherwise, cache things once and for all + if (!_cache_available) _compute_and_cache_no_overwrite(); + return rescaling_factor * _cached_estimate.sigma(); } - - + + //---------------------------------------------------------------------- // returns rho_m (particle-masses contribution to the 4-vector density) double JetMedianBackgroundEstimator::rho_m() const { if (! has_rho_m()){ throw Error("JetMediamBackgroundEstimator: rho_m requested but rho_m calculation is disabled (either eplicitly or due to the presence of a jet density class)."); } - if (_rho_range.takes_reference()) - throw Error("The background estimation is obtained from a selector that takes a reference jet. rho(PseudoJet) should be used in that case"); - _recompute_if_needed(); - return _rho_m; + if (_rho_range.takes_reference()){ + throw Error("The background estimation is obtained from a selector that takes a reference jet. rho_m(PseudoJet) should be used in that case"); + } + if (!_cache_available) _compute_and_cache_no_overwrite(); + return _cached_estimate.rho_m(); } @@ -294,21 +387,27 @@ double JetMedianBackgroundEstimator::sigma_m() const{ throw Error("JetMediamBackgroundEstimator: sigma_m requested but rho_m/sigma_m calculation is disabled (either explicitly or due to the presence of a jet density class)."); } if (_rho_range.takes_reference()) - throw Error("The background estimation is obtained from a selector that takes a reference jet. rho(PseudoJet) should be used in that case"); - _recompute_if_needed(); - return _sigma_m; + throw Error("The background estimation is obtained from a selector that takes a reference jet. sigma_m(PseudoJet) should be used in that case"); + if (!_cache_available) _compute_and_cache_no_overwrite(); + return _cached_estimate.sigma_m(); } //---------------------------------------------------------------------- // returns rho_m locally at the position of a given jet. As for // rho(jet), it is non-const. double JetMedianBackgroundEstimator::rho_m(const PseudoJet & jet) { - _recompute_if_needed(jet); - double our_rho = _rho_m; - if (_rescaling_class != 0) { - our_rho *= (*_rescaling_class)(jet); - } - return our_rho; + // first compute an optional rescaling factor + double rescaling_factor = (_rescaling_class != 0) + ? (*_rescaling_class)(jet) : 1.0; + + // see "rho(jet)" for a descrtiption of the strategy + if (_rho_range.takes_reference()){ + BackgroundEstimate estimate = _compute_and_cache_if_needed(jet); + return rescaling_factor * estimate.rho_m(); + } + // otherwise, cache things once and for all + if (!_cache_available) _compute_and_cache_no_overwrite(); + return rescaling_factor * _cached_estimate.rho_m(); } @@ -316,14 +415,153 @@ double JetMedianBackgroundEstimator::rho_m(const PseudoJet & jet) { // returns sigma_m locally at the position of a given jet. As for // rho(jet), it is non-const. double JetMedianBackgroundEstimator::sigma_m(const PseudoJet & jet){ - _recompute_if_needed(jet); - double our_sigma = _sigma_m; - if (_rescaling_class != 0) { - our_sigma *= (*_rescaling_class)(jet); + // first compute an optional rescaling factor + double rescaling_factor = (_rescaling_class != 0) + ? (*_rescaling_class)(jet) : 1.0; + + // see "rho(jet)" for a descrtiption of the strategy + if (_rho_range.takes_reference()){ + BackgroundEstimate estimate = _compute_and_cache_if_needed(jet); + return rescaling_factor * estimate.sigma_m(); } - return our_sigma; + // otherwise, cache things once and for all + if (!_cache_available) _compute_and_cache_no_overwrite(); + return rescaling_factor * _cached_estimate.sigma_m(); } + +//---------------------------------------------------------------- +/// Returns the mean area of the jets used to actually compute the +/// background properties in the last call of rho() or sigma() +/// If the configuration has changed in the meantime, throw an error. +double JetMedianBackgroundEstimator::mean_area() const{ + // if the selector takes a reference, we need to use the cache + if (_rho_range.takes_reference()){ + // lock to make sure no other thread interferes w the caching + _lock_if_needed(); + if (!_cache_available){ + _unlock_if_needed(); + throw Error("Calls to JetMedianBackgroundEstimator::mean_area() in cases where the background estimation uses a selector that takes a reference jet need to call a method that fills the cached estimate (rho(jet), sigma(jet), ...)."); + } + double return_value = _cached_estimate.mean_area(); + _unlock_if_needed(); + return return_value; + } + if (!_cache_available) _compute_and_cache_no_overwrite(); + return _cached_estimate.mean_area(); +} + +/// returns the number of jets used to actually compute the +/// background properties in the last call of rho() or sigma() +/// If the configuration has changed in the meantime, throw an error. +unsigned int JetMedianBackgroundEstimator::n_jets_used() const{ + // if the selector takes a reference, we need to use the cache + if (_rho_range.takes_reference()){ + // lock to make sure no other thread interferes w the caching + _lock_if_needed(); + if (!_cache_available){ + _unlock_if_needed(); + throw Error("Calls to JetMedianBackgroundEstimator::n_jets_used() in cases where the background estimation uses a selector that takes a reference jet need to call a method that fills the cached estimate (rho(jet), sigma(jet), ...)."); + } + unsigned int return_value = _cached_estimate.extras().n_jets_used(); + _unlock_if_needed(); + return return_value; + } + if (!_cache_available) _compute_and_cache_no_overwrite(); + return _cached_estimate.extras().n_jets_used(); +} + +/// returns the jets used to actually compute the background +/// properties +std::vector JetMedianBackgroundEstimator::jets_used() const{ + vector tmp_jets; + + // if the selector takes a reference, we need to use the cache + if (_rho_range.takes_reference()){ + // lock to make sure no other thread interferes w the caching + _lock_if_needed(); + if (!_cache_available){ + _unlock_if_needed(); + throw Error("Calls to JetMedianBackgroundEstimator::jets_used() in cases where the background estimation uses a selector that takes a reference jet need to call a method that fills the cached estimate (rho(jet), sigma(jet), ...)."); + } + PseudoJet reference_jet = _cached_estimate.extras().reference_jet(); + _unlock_if_needed(); + Selector local_rho_range = _rho_range; + local_rho_range.set_reference(reference_jet); + tmp_jets = local_rho_range(_included_jets); + } else { + if (!_cache_available) _compute_and_cache_no_overwrite(); + tmp_jets = _rho_range(_included_jets); + } + + std::vector used_jets; + for (unsigned int i=0; i0) used_jets.push_back(tmp_jets[i]); + } + return used_jets; +} + +/// Returns the estimate of the area (within the range defined by +/// the selector) that is not occupied by jets. The value is that +/// for the last call of rho() or sigma() +/// If the configuration has changed in the meantime, throw an error. +/// +/// The answer is defined to be zero if the area calculation +/// involved explicit ghosts; if the area calculation was an active +/// area, then use is made of the active area's internal list of +/// pure ghost jets (taking those that pass the selector); otherwise +/// it is based on the difference between the selector's total area +/// and the area of the jets that pass the selector. +/// +/// The result here is just the cached result of the corresponding +/// call to the ClusterSequenceAreaBase function. +double JetMedianBackgroundEstimator::empty_area() const{ + // if the selector takes a reference, we need to use the cache + if (_rho_range.takes_reference()){ + // lock to make sure no other thread interferes w the caching + _lock_if_needed(); + if (!_cache_available){ + _unlock_if_needed(); + throw Error("Calls to JetMedianBackgroundEstimator::empty_area() in cases where the background estimation uses a selector that takes a reference jet need to call a method that fills the cached estimate (rho(jet), sigma(jet), ...)."); + } + double return_value = _cached_estimate.extras().empty_area(); + _unlock_if_needed(); + return return_value; + } + if (!_cache_available) _compute_and_cache_no_overwrite(); + return _cached_estimate.extras().empty_area(); +} + +/// Returns the number of empty jets used when computing the +/// background properties. The value is that for the last call of +/// rho() or sigma(). +/// If the configuration has changed in the meantime, throw an error. +/// +/// If the area has explicit ghosts the result is zero; for active +/// areas it is the number of internal pure ghost jets that pass the +/// selector; otherwise it is deduced from the empty area, divided by +/// \f$ 0.55 \pi R^2 \f$ (the average pure-ghost-jet area). +/// +/// The result here is just the cached result of the corresponding +/// call to the ClusterSequenceAreaBase function. +double JetMedianBackgroundEstimator::n_empty_jets() const{ + // if the selector takes a reference, we need to use the cache + if (_rho_range.takes_reference()){ + // lock to make sure no other thread interferes w the caching + _lock_if_needed(); + if (!_cache_available){ + _unlock_if_needed(); + throw Error("Calls to JetMedianBackgroundEstimator::n_empty_jets() in cases where the background estimation uses a selector that takes a reference jet need to call a method that fills the cached estimate (rho(jet), sigma(jet), ...)."); + } + double return_value = _cached_estimate.extras().n_empty_jets(); + _unlock_if_needed(); + return return_value; + } + if (!_cache_available) _compute_and_cache_no_overwrite(); + return _cached_estimate.extras().n_empty_jets(); +} + + //---------------------------------------------------------------------- // configuring behaviour //---------------------------------------------------------------------- @@ -338,17 +576,12 @@ void JetMedianBackgroundEstimator::reset(){ _enable_rho_m = true; // reset the computed values - _rho = _sigma = 0.0; - _rho_m = _sigma_m = 0.0; - _n_jets_used = _n_empty_jets = 0; - _empty_area = _mean_area = 0.0; - _included_jets.clear(); _jet_density_class = 0; // null pointer _rescaling_class = 0; // null pointer - _uptodate = false; + _set_cache_unavailable(); } @@ -358,7 +591,7 @@ void JetMedianBackgroundEstimator::reset(){ void JetMedianBackgroundEstimator::set_jet_density_class(const FunctionOfPseudoJet * jet_density_class_in) { _warnings_preliminary.warn("JetMedianBackgroundEstimator::set_jet_density_class: density classes are still preliminary in FastJet 3.1. Their interface may differ in future releases (without guaranteeing backward compatibility). Note that since FastJet 3.1, rho_m and sigma_m are accessible direclty in JetMedianBackgroundEstimator and GridMedianBackgroundEstimator(with no need for a density class)."); _jet_density_class = jet_density_class_in; - _uptodate = false; + _set_cache_unavailable(); } @@ -379,44 +612,44 @@ string JetMedianBackgroundEstimator::description() const { //---------------------------------------------------------------------- // computation of the background properties //---------------------------------------------------------------------- -// for estimation using a relocatable selector (i.e. local range) -// this allows to set its position. Note that this HAS to be called -// before any attempt to compute the background properties -void JetMedianBackgroundEstimator::_recompute_if_needed(const PseudoJet &jet){ - // if the range is relocatable, handles its relocation - if (_rho_range.takes_reference()){ - // check that the reference is not the same as the previous one - // (would avoid an unnecessary recomputation) - if (jet == _current_reference) return; - - // relocate the range and make sure things get recomputed the next - // time one tries to get some information - _rho_range.set_reference(jet); - _uptodate=false; - } - - _recompute_if_needed(); -} - // do the actual job -void JetMedianBackgroundEstimator::_compute() const { +BackgroundEstimate JetMedianBackgroundEstimator::_compute(const PseudoJet &jet) const { + // prepare a local structure to hold temporarily the results + // (by design, this comes with default values of 0 for each property) + BackgroundEstimate local_estimate; + // check if the clustersequence is still valid _check_csa_alive(); + local_estimate.set_has_sigma(has_sigma()); + local_estimate.set_has_rho_m(has_rho_m()); + + // structure to hold the extra info associated w this BGE (the call + // below initialises everything to 0) + Extras * extras = new Extras; + local_estimate.set_extras(extras); + extras->set_reference_jet(jet); + // fill the vector of pt/area (or the quantity from the jet density class) // - in the range vector vector_for_median_pt; vector vector_for_median_dt; double total_area = 0.0; - _n_jets_used = 0; - + // apply the selector to the included jets - vector selected_jets = _rho_range(_included_jets); - + vector selected_jets; + if (_rho_range.takes_reference()){ + Selector local_rho_range = _rho_range; + selected_jets = local_rho_range.set_reference(jet)(_included_jets); + } else { + selected_jets = _rho_range(_included_jets); + } + // compute the pt/area for the selected jets double median_input_pt, median_input_dt=0.0; BackgroundJetPtMDensity m_density; bool do_rho_m = has_rho_m(); + unsigned int njets_used = 0; for (unsigned i = 0; i < selected_jets.size(); i++) { const PseudoJet & current_jet = selected_jets[i]; @@ -434,11 +667,11 @@ void JetMedianBackgroundEstimator::_compute() const { // note that we're using the scalar area as a normalisation inside the // density class! if (do_rho_m) - median_input_dt = m_density(current_jet); + median_input_dt = m_density(current_jet); // perform rescaling if needed if (_rescaling_class != 0) { - double resc = (*_rescaling_class)(current_jet);; + double resc = (*_rescaling_class)(current_jet); median_input_pt /= resc; median_input_dt /= resc; } @@ -446,10 +679,10 @@ void JetMedianBackgroundEstimator::_compute() const { // store the result for future computation of the median vector_for_median_pt.push_back(median_input_pt); if (do_rho_m) - vector_for_median_dt.push_back(median_input_dt); + vector_for_median_dt.push_back(median_input_dt); total_area += this_area; - _n_jets_used++; + njets_used++; } else { _warnings_zero_area.warn("JetMedianBackgroundEstimator::_compute(...): discarded jet with zero area. Zero-area jets may be due to (i) too large a ghost area (ii) a jet being outside the ghost range (iii) the computation not being done using an appropriate algorithm (kt;C/A)."); } @@ -457,47 +690,122 @@ void JetMedianBackgroundEstimator::_compute() const { // there is nothing inside our region, so answer will always be zero if (vector_for_median_pt.size() == 0) { - _rho = 0.0; - _sigma = 0.0; - _rho_m = 0.0; - _sigma_m = 0.0; - _mean_area = 0.0; - return; + // record that the computation has been performed + return local_estimate; } // determine the number of empty jets + // If we have explicit ghosts, this is 0 (i.e. the default) const ClusterSequenceAreaBase * csab = (dynamic_cast(_csi.get()))->validated_csab(); - if (csab->has_explicit_ghosts()) { - _empty_area = 0.0; - _n_empty_jets = 0; - } else { - _empty_area = csab->empty_area(_rho_range); - _n_empty_jets = csab->n_empty_jets(_rho_range); + if (! (csab->has_explicit_ghosts())) { + if (_rho_range.takes_reference()){ + Selector local_rho_range = _rho_range; + local_rho_range.set_reference(jet); + extras->set_empty_area (csab->empty_area(local_rho_range)); + extras->set_n_empty_jets(csab->n_empty_jets(local_rho_range)); + } else { + extras->set_empty_area (csab->empty_area(_rho_range)); + extras->set_n_empty_jets(csab->n_empty_jets(_rho_range)); + } } - double total_njets = _n_jets_used + _n_empty_jets; - total_area += _empty_area; - - double stand_dev; - _median_and_stddev(vector_for_median_pt, _n_empty_jets, _rho, stand_dev, - _provide_fj2_sigma); + extras->set_n_jets_used(njets_used); + double total_njets = extras->n_jets_used() + extras->n_empty_jets(); + total_area += extras->empty_area(); + double rho_tmp, stand_dev; + _median_and_stddev(vector_for_median_pt, extras->n_empty_jets(), + rho_tmp, stand_dev, _provide_fj2_sigma); + local_estimate.set_rho(rho_tmp); + // process and store the results (_rho was already stored above) - _mean_area = total_area / total_njets; - _sigma = stand_dev * sqrt(_mean_area); + local_estimate.set_mean_area(total_area / total_njets); + local_estimate.set_sigma(stand_dev * sqrt(local_estimate.mean_area())); // compute the rho_m part now if (do_rho_m){ - _median_and_stddev(vector_for_median_dt, _n_empty_jets, _rho_m, stand_dev, + _median_and_stddev(vector_for_median_dt, extras->n_empty_jets(), + rho_tmp, stand_dev, _provide_fj2_sigma); - _sigma_m = stand_dev * sqrt(_mean_area); + local_estimate.set_rho_m(rho_tmp); + local_estimate.set_sigma_m(stand_dev * sqrt(local_estimate.mean_area())); } - // record that the computation has been performed - _uptodate = true; + return local_estimate; } +void JetMedianBackgroundEstimator::_cache_no_overwrite(const BackgroundEstimate &estimate) const { + /// this is meant to be called if the selector is not local + assert(!(_rho_range.takes_reference())); + + // we need to write to the cache, so set a lock if needed + _lock_if_needed(); + + // we only need to write if someone else did not do it earlier + // + // Doing this avoids potential "read" problems when two threads try + // to compute the cache at the same time. The first one may return + // and try to read the result when the second actually writes. The + // lines below guarantee that the first thread would have set + // _cache_available to true before releasing the lock and therefore + // the second thread will not attempt to write + if (!_cache_available){ + _cached_estimate = estimate; + _cache_available = true; + } + + // release the lock + _unlock_if_needed(); +} + +void JetMedianBackgroundEstimator::_compute_and_cache_no_overwrite() const { + /// this is meant to be called if the selector is not local + assert(!(_rho_range.takes_reference())); + + // get the result (for a dummy PseudoJet which will anyway not be used) + // and cache it + _cache_no_overwrite(_compute(PseudoJet())); +} + +void JetMedianBackgroundEstimator::_cache(const BackgroundEstimate &estimate) const { + /// this is meant to be called if the selector is local + assert(_rho_range.takes_reference()); + + // we need to write to the cache, so set a lock if needed + _lock_if_needed(); + + // if we overwrite the cache, we need to make sure that other + // parts of the code use r/w accesses that respect the lock that + // we have acquired. + // + // In practice, this will only be used in the case wheere we have + // a local selector, in queries that require access to the cache. + _cached_estimate = estimate; + _cache_available = true; + + // release the lock + _unlock_if_needed(); +} + +BackgroundEstimate JetMedianBackgroundEstimator::_compute_and_cache_if_needed(const PseudoJet &jet) const { + /// this is meant to be called if the selector is local + assert(_rho_range.takes_reference()); + + BackgroundEstimate local_estimate; + + _lock_if_needed(); + if ((_cache_available) && (_cached_estimate.extras().reference_jet() == jet)){ + local_estimate = _cached_estimate; + _unlock_if_needed(); + return local_estimate; + } + _unlock_if_needed(); + + local_estimate = _compute(jet); + _cache(local_estimate); + return local_estimate; +} // check that the underlying structure is still alive; // throw an error otherwise @@ -506,7 +814,7 @@ void JetMedianBackgroundEstimator::_check_csa_alive() const{ if (csa == 0) { throw Error("JetMedianBackgroundEstimator: there is no cluster sequence associated with the JetMedianBackgroundEstimator"); } - if (! dynamic_cast(_csi.get())->has_associated_cluster_sequence()) + if (! csa->has_associated_cluster_sequence()) throw Error("JetMedianBackgroundEstimator: modifications are no longer possible as the underlying ClusterSequence has gone out of scope"); } @@ -532,7 +840,6 @@ void JetMedianBackgroundEstimator::_check_jet_alg_good_for_median() const{ } - FASTJET_END_NAMESPACE diff --git a/fastjet/tools/Makefile.in b/fastjet/tools/Makefile.in index d8b8377..8877fb8 100644 --- a/fastjet/tools/Makefile.in +++ b/fastjet/tools/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. diff --git a/fastjet/tools/MassDropTagger.cc b/fastjet/tools/MassDropTagger.cc index 58e966b..718d995 100644 --- a/fastjet/tools/MassDropTagger.cc +++ b/fastjet/tools/MassDropTagger.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: MassDropTagger.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -28,8 +28,8 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include +#include "fastjet/tools/MassDropTagger.hh" +#include "fastjet/ClusterSequence.hh" #include FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/tools/Pruner.cc b/fastjet/tools/Pruner.cc index 707cd7f..cd4b12b 100644 --- a/fastjet/tools/Pruner.cc +++ b/fastjet/tools/Pruner.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Pruner.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. diff --git a/fastjet/tools/Recluster.cc b/fastjet/tools/Recluster.cc index 1e1996b..ef9f728 100644 --- a/fastjet/tools/Recluster.cc +++ b/fastjet/tools/Recluster.cc @@ -1,4 +1,4 @@ -// $Id: Recluster.cc 3629 2014-08-14 17:21:15Z salam $ +// $Id$ // // Copyright (c) 2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -21,7 +21,7 @@ #include "fastjet/tools/Recluster.hh" #include "fastjet/CompositeJetStructure.hh" -#include +#include "fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh" #include #include diff --git a/fastjet/tools/RestFrameNSubjettinessTagger.cc b/fastjet/tools/RestFrameNSubjettinessTagger.cc index e3b75b9..01f6ab8 100644 --- a/fastjet/tools/RestFrameNSubjettinessTagger.cc +++ b/fastjet/tools/RestFrameNSubjettinessTagger.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: RestFrameNSubjettinessTagger.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -28,9 +28,9 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include -#include +#include "fastjet/tools/RestFrameNSubjettinessTagger.hh" +#include "fastjet/tools/Boost.hh" +#include "fastjet/ClusterSequence.hh" #include using namespace std; diff --git a/fastjet/tools/Subtractor.cc b/fastjet/tools/Subtractor.cc index 7c247fa..b981a02 100644 --- a/fastjet/tools/Subtractor.cc +++ b/fastjet/tools/Subtractor.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Subtractor.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -175,9 +175,11 @@ std::string Subtractor::description() const{ // jet PseudoJet Subtractor::_amount_to_subtract(const PseudoJet &jet) const{ // the "transverse momentum" part + BackgroundEstimate bg_estimate; double rho; if (_bge != 0) { - rho = _bge->rho(jet); + bg_estimate = _bge->estimate(jet); + rho = bg_estimate.rho(); } else if (_rho != _invalid_rho) { rho = _rho; } else { @@ -194,8 +196,9 @@ PseudoJet Subtractor::_amount_to_subtract(const PseudoJet &jet) const{ double rho_m; if (_bge != 0) { - if (!_bge->has_rho_m()) throw Error("Subtractor::_amount_to_subtract(...): requested subtraction with rho_m from a background estimator, but the estimator does not have rho_m support"); - rho_m = _bge->rho_m(jet); + //if (!_bge->has_rho_m()) throw Error("Subtractor::_amount_to_subtract(...): requested subtraction with rho_m from a background estimator, but the estimator does not have rho_m support"); + if (!bg_estimate.has_rho_m()) throw Error("Subtractor::_amount_to_subtract(...): requested subtraction with rho_m from a background estimator, but the estimator does not have rho_m support"); + rho_m = bg_estimate.rho_m(); } else if (_rho_m != _invalid_rho) { rho_m = _rho_m; } else { @@ -203,8 +206,8 @@ PseudoJet Subtractor::_amount_to_subtract(const PseudoJet &jet) const{ } to_subtract += rho_m * PseudoJet(0.0, 0.0, area.pz(), area.E()); } else if (_bge && - _bge->has_rho_m() && - _bge->rho_m(jet) > rho_m_warning_threshold * rho) { + bg_estimate.has_rho_m() && + bg_estimate.rho_m() > rho_m_warning_threshold * rho) { _unused_rho_m_warning.warn("Subtractor::_amount_to_subtract(...): Background estimator indicates non-zero rho_m, but use_rho_m()==false in subtractor; consider calling set_use_rho_m(true) to include the rho_m information"); } diff --git a/fastjet/tools/TopTaggerBase.cc b/fastjet/tools/TopTaggerBase.cc index cbe50bd..1fcea8d 100644 --- a/fastjet/tools/TopTaggerBase.cc +++ b/fastjet/tools/TopTaggerBase.cc @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: TopTaggerBase.cc 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -28,7 +28,7 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include +#include "fastjet/tools/TopTaggerBase.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/tools/fastjet/Makefile.in b/fastjet/tools/fastjet/Makefile.in index 38d99d6..2e215cf 100644 --- a/fastjet/tools/fastjet/Makefile.in +++ b/fastjet/tools/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. diff --git a/fastjet/tools/fastjet/tools/BackgroundEstimatorBase.hh b/fastjet/tools/fastjet/tools/BackgroundEstimatorBase.hh index 47c9710..b33cadf 100644 --- a/fastjet/tools/fastjet/tools/BackgroundEstimatorBase.hh +++ b/fastjet/tools/fastjet/tools/BackgroundEstimatorBase.hh @@ -2,9 +2,9 @@ #define __FASTJET_BACKGROUND_ESTIMATOR_BASE_HH__ //FJSTARTHEADER -// $Id: BackgroundEstimatorBase.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,15 +31,148 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include -#include -#include +#include "fastjet/ClusterSequenceAreaBase.hh" +#include "fastjet/FunctionOfPseudoJet.hh" +#include "fastjet/Selector.hh" +#include "fastjet/Error.hh" #include FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh +/// @ingroup tools_background +/// @name helpers to handle the result of the background estimation +//\{ +/// +/// /// a class that holds the result of the calculation +/// +/// By default it provides access to the main background properties: +/// rho, rho_m, sigma and sigma_m. If background estimators derived +/// from the base class want to store more information, this can be +/// done using the "Extra" information. +class BackgroundEstimate{ +public: + /// ctor wo initialisation + BackgroundEstimate() + : _rho(0.0), _sigma(0.0), _rho_m(0.0), _sigma_m(0.0), + _has_sigma(false), _has_rho_m(false), + _mean_area(0.0){} + + + /// @name for accessing information about the background + ///@{ + + /// background density per unit area + double rho() const {return _rho;} + + /// background fluctuations per unit square-root area + /// must be multipled by sqrt(area) to get fluctuations for a region + /// of a given area. + double sigma() const {return _sigma;} + + /// true if this background estimate has a determination of sigma + bool has_sigma() {return true;} + + /// purely longitudinal (particle-mass-induced) + /// component of the background density per unit area + double rho_m() const {return _rho_m;} + + /// fluctuations in the purely longitudinal (particle-mass-induced) + /// component of the background density per unit square-root area + double sigma_m() const {return _sigma_m;} + + /// true if this background estimate has a determination of rho_m. + /// Support for sigma_m is automatic if one has sigma and rho_m support. + bool has_rho_m() const {return _has_rho_m;} + + /// mean area of the patches used to compute the background properties + double mean_area() const {return _mean_area;} + + /// base class for extra information + class Extras { + public: + // dummy ctor + Extras(){}; + + // dummy virtual dtor + // makes it polymorphic to allow for dynamic_cast + virtual ~Extras(){}; + }; + + /// returns true if the background estimate has extra info + bool has_extras() const{ + return _extras.get(); + } + + /// returns true if the background estimate has extra info + /// compatible with the provided template type + template + bool has_extras() const{ + return _extras.get() && dynamic_cast(_extras.get()); + } + + /// returns a reference to the extra information associated with a + /// given BackgroundEstimator. It assumes that the extra + /// information is reachable with class name + /// BackgroundEstimator::Extras + template + const typename BackgroundEstimator::Extras & extras() const{ + return dynamic_cast(* _extras.get()); + } + + ///@} + + + /// @name for setting information about the background (internal FJ use) + ///@{ + + /// reset to default + void reset(){ + _rho = _sigma = _rho_m = _sigma_m = _mean_area = 0.0; + _has_sigma = _has_rho_m = false; + _extras.reset(); + } + void set_rho(double rho_in) {_rho = rho_in;} + void set_sigma(double sigma_in) {_sigma = sigma_in;} + void set_has_sigma(bool has_sigma_in) {_has_sigma = has_sigma_in;} + void set_rho_m(double rho_m_in) {_rho_m = rho_m_in;} + void set_sigma_m(double sigma_m_in) {_sigma_m = sigma_m_in;} + void set_has_rho_m(bool has_rho_m_in) {_has_rho_m = has_rho_m_in;} + void set_mean_area(double mean_area_in) {_mean_area = mean_area_in;} + + /// apply a rescaling factor (to rho, rho_m, sigma, sigma_m) + void apply_rescaling_factor(double rescaling_factor){ + _rho *= rescaling_factor; + _sigma *= rescaling_factor; + _rho_m *= rescaling_factor; + _sigma_m *= rescaling_factor; + } + + /// sets the extra info based on the provided pointer + /// + /// When calling this method, the BackgroundEstimate class takes + /// ownership of the pointer (and is responsible for deleting it) + void set_extras(Extras *extras_in) { + _extras.reset(extras_in); + } + ///@} + + +protected: + double _rho; ///< background estimated density per unit area + double _sigma; ///< background estimated fluctuations + double _rho_m; ///< "mass" background estimated density per unit area + double _sigma_m; ///< "mass" background estimated fluctuations + bool _has_sigma; ///< true if this estimate has a determination of sigma + bool _has_rho_m; ///< true if this estimate has a determination of rho_m + double _mean_area; ///< mean area of the patches used to compute the bkg properties + + + SharedPtr _extras; + +}; + + /// @ingroup tools_background /// \class BackgroundEstimatorBase /// @@ -52,12 +185,19 @@ public: /// @name constructors and destructors //\{ //---------------------------------------------------------------- - BackgroundEstimatorBase() : _rescaling_class(0) {} - //\} + BackgroundEstimatorBase() : _rescaling_class(0) { + _set_cache_unavailable(); + } + +#ifdef FASTJET_HAVE_THREAD_SAFETY + /// because of the internal atomic variale, we need to explicitly + /// implement a copy ctor + BackgroundEstimatorBase(const BackgroundEstimatorBase &other_bge); +#endif /// a default virtual destructor that does nothing virtual ~BackgroundEstimatorBase() {} - + //\} /// @name setting a new event //\{ @@ -67,18 +207,35 @@ public: /// of the specified particles. virtual void set_particles(const std::vector & particles) = 0; + /// an alternative call that takes a random number generator seed + /// (typically a vector of length 2) to ensure reproducibility of + /// background estimators that rely on random numbers (specifically + /// JetMedianBackgroundEstimator with ghosted areas) + virtual void set_particles_with_seed(const std::vector & particles, const std::vector & /*seed*/) { + set_particles(particles); + } + //\} + /// return a pointer to a copy of this BGE; the user is responsible + /// for eventually deleting the resulting object. + virtual BackgroundEstimatorBase * copy() const = 0; + /// @name retrieving fundamental information //\{ //---------------------------------------------------------------- + /// get the full set of background properties + virtual BackgroundEstimate estimate() const = 0; + + /// get the full set of background properties for a given reference jet + virtual BackgroundEstimate estimate(const PseudoJet &jet) const = 0; /// get rho, the background density per unit area virtual double rho() const = 0; - /// get sigma, the background fluctuations per unit area; must be - /// multipled by sqrt(area) to get fluctuations for a region of a - /// given area. + /// get sigma, the background fluctuations per unit square-root area; + /// must be multipled by sqrt(area) to get fluctuations for a region + /// of a given area. virtual double sigma() const { throw Error("sigma() not supported for this Background Estimator"); } @@ -98,7 +255,7 @@ public: /// returns true if this background estimator has support for /// determination of sigma - virtual bool has_sigma() {return false;} + virtual bool has_sigma() const {return false;} //---------------------------------------------------------------- // now do the same thing for rho_m and sigma_m @@ -111,7 +268,7 @@ public: /// returns sigma_m, a measure of the fluctuations in the purely /// longitudinal, particle-mass-induced component of the background - /// density per unit area; must be multipled by sqrt(area) to get + /// density per unit square-root area; must be multipled by sqrt(area) to get /// fluctuations for a region of a given area. virtual double sigma_m() const { throw Error("sigma_m() not supported for this Background Estimator"); @@ -169,6 +326,7 @@ public: //\} + protected: /// @name helpers for derived classes /// @@ -209,6 +367,41 @@ protected: const FunctionOfPseudoJet * _rescaling_class; static LimitedWarning _warnings_empty_area; + + + // cached actual results of the computation + mutable bool _cache_available; + mutable BackgroundEstimate _cached_estimate; ///< all the info about what is computed + //\} + + /// @name helpers for thread safety + /// + /// Note that these helpers are related to median-based estimation + /// of the background, so there is no guarantee that they will + /// remain in this base class in the long term + //\{ +#ifdef FASTJET_HAVE_THREAD_SAFETY + // true when one is currently writing to cache (i.e. when the spin lock is set) + mutable std::atomic _writing_to_cache; + + void _set_cache_unavailable(){ + _cache_available = false; + _writing_to_cache = false; + } + + // // allows us to lock things down before caching basic (patches) info + // std::mutex _jets_caching_mutex; +#else + void _set_cache_unavailable(){ + _cache_available = false; + } +#endif + + void _lock_if_needed() const; + void _unlock_if_needed() const; + + //\} + }; @@ -251,3 +444,72 @@ FASTJET_END_NAMESPACE #endif // __BACKGROUND_ESTIMATOR_BASE_HH__ +// //-------------------------------------------------- +// // deprecated +// class JetMedianBGE{ +// BackgroundEstimateDefinition(); +// +// ....; +// } +// //-------------------------------------------------- +// +// class BackgroundEstimateDefinition{ +// //const EventBackground get_event_background(particles, ) const; +// +// +// //-------------------------------------------------- +// // DEPRECATED +// void set_particles() { +// +// _worker = ...; +// double rho(const PseudoJet &/*jet*/) const{ _worker.rho();} +// +// //-------------------------------------------------- +// +// EventBackground(Worker?) _cached_event_background; +// }; +// +// class EventBackground{ +// EventBackground(particles, BackgroundEstimateDefinition); +// +// +// class EventBackgroundWorker{ +// +// ... +// }; +// +// +// BackgroundEstimate estimate() const; +// BackgroundEstimate estimate(jet) const; +// +// // do we want this: +// double rho(); +// double rho(jet); +// //? +// +// +// mutable BackgroundEstimate _estimate; +// +// +// SharedPtr _event_background_worker; +// } +// +// class BackgroundEstimate{ +// +// double rho(); +// +// SharedPtr _event_background_worker; +// +// private: +// _rho; +// _sigma; +// _rho_m; +// _sigma_m; +// _has_rho_m; +// _has_sigma; +// +// // info specific to JMBGE: _reference_jet, mean_area, n_jets_used, n_empty_jets, _empty_area +// // all need to go in the estimate in general +// // info specific to GMBGE: RectangularGrid, _mean_area (can go either in the the def, the eventBG or the estimate +// +// }; diff --git a/fastjet/tools/fastjet/tools/Boost.hh b/fastjet/tools/fastjet/tools/Boost.hh index b27745a..5584141 100644 --- a/fastjet/tools/fastjet/tools/Boost.hh +++ b/fastjet/tools/fastjet/tools/Boost.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Boost.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,9 +31,9 @@ #ifndef __FASTJET_TOOL_BOOST_HH__ #define __FASTJET_TOOL_BOOST_HH__ -#include -#include -#include +#include "fastjet/PseudoJet.hh" +#include "fastjet/FunctionOfPseudoJet.hh" +#include "fastjet/PseudoJetStructureBase.hh" FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh diff --git a/fastjet/tools/fastjet/tools/CASubJetTagger.hh b/fastjet/tools/fastjet/tools/CASubJetTagger.hh index 898eb65..e30c620 100644 --- a/fastjet/tools/fastjet/tools/CASubJetTagger.hh +++ b/fastjet/tools/fastjet/tools/CASubJetTagger.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: CASubJetTagger.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,9 +31,9 @@ #ifndef __CASUBJET_TAGGER_HH__ #define __CASUBJET_TAGGER_HH__ -#include -#include -#include +#include "fastjet/PseudoJet.hh" +#include "fastjet/WrappedStructure.hh" +#include "fastjet/tools/Transformer.hh" #include "fastjet/LimitedWarning.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/tools/fastjet/tools/Filter.hh b/fastjet/tools/fastjet/tools/Filter.hh index 31e3f96..bc7d417 100644 --- a/fastjet/tools/fastjet/tools/Filter.hh +++ b/fastjet/tools/fastjet/tools/Filter.hh @@ -2,9 +2,9 @@ #define __FASTJET_TOOLS_FILTER_HH__ //FJSTARTHEADER -// $Id: Filter.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,10 +31,10 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include -#include // to derive the FilterStructure from CompositeJetStructure -#include // to derive Filter from Transformer +#include "fastjet/ClusterSequence.hh" +#include "fastjet/Selector.hh" +#include "fastjet/CompositeJetStructure.hh" // to derive the FilterStructure from CompositeJetStructure +#include "fastjet/tools/Transformer.hh" // to derive Filter from Transformer #include #include diff --git a/fastjet/tools/fastjet/tools/GridMedianBackgroundEstimator.hh b/fastjet/tools/fastjet/tools/GridMedianBackgroundEstimator.hh index 9e39fb5..919e2ae 100644 --- a/fastjet/tools/fastjet/tools/GridMedianBackgroundEstimator.hh +++ b/fastjet/tools/fastjet/tools/GridMedianBackgroundEstimator.hh @@ -2,9 +2,9 @@ #define __GRID_MEDIAN_BACKGROUND_ESTIMATOR_HH__ //FJSTARTHEADER -// $Id: GridMedianBackgroundEstimator.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -33,17 +33,7 @@ #include "fastjet/tools/BackgroundEstimatorBase.hh" - -// if defined then we'll use the RectangularGrid class -// -// (For FastJet 3.2, maybe remove the symbol and simply clean up the -// code below to use exclusively the RectangularGrid) -#define FASTJET_GMBGE_USEFJGRID - -#ifdef FASTJET_GMBGE_USEFJGRID #include "fastjet/RectangularGrid.hh" -#endif - FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh @@ -75,15 +65,12 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh /// rho() [Without rescaling, they are identical] /// class GridMedianBackgroundEstimator : public BackgroundEstimatorBase -#ifdef FASTJET_GMBGE_USEFJGRID , public RectangularGrid -#endif { public: /// @name constructors and destructors //\{ -#ifdef FASTJET_GMBGE_USEFJGRID //---------------------------------------------------------------- /// \param ymax maximal absolute rapidity extent of the grid /// \param requested_grid_spacing size of the grid cell. The @@ -91,13 +78,12 @@ public: /// periodicity in azimuthal angle (size, not area) GridMedianBackgroundEstimator(double ymax, double requested_grid_spacing) : RectangularGrid(ymax, requested_grid_spacing), - _has_particles(false), _enable_rho_m(true) {} + _enable_rho_m(true) {} //---------------------------------------------------------------- /// Constructor based on a user's fully specified RectangularGrid GridMedianBackgroundEstimator(const RectangularGrid & grid) : - RectangularGrid(grid), - _has_particles(false), _enable_rho_m(true) { + RectangularGrid(grid), _enable_rho_m(true) { if (!RectangularGrid::is_initialised()) throw Error("attempt to construct GridMedianBackgroundEstimator with uninitialised RectangularGrid"); } @@ -116,18 +102,7 @@ public: /// the selection GridMedianBackgroundEstimator(double rapmin_in, double rapmax_in, double drap_in, double dphi_in, Selector tile_selector = Selector()) : - RectangularGrid(rapmin_in, rapmax_in, drap_in, dphi_in, tile_selector), - _has_particles(false), _enable_rho_m(true) {} - -#else // alternative in old framework where we didn't have the rectangular grid - GridMedianBackgroundEstimator(double ymax, double requested_grid_spacing) : - _ymin(-ymax), _ymax(ymax), - _requested_grid_spacing(requested_grid_spacing), - _has_particles(false), _enable_rho_m(true) - { - setup_grid(); - } -#endif // FASTJET_GMBGE_USEFJGRID + RectangularGrid(rapmin_in, rapmax_in, drap_in, dphi_in, tile_selector), _enable_rho_m(true) {} //\} @@ -138,64 +113,77 @@ public: /// tell the background estimator that it has a new event, composed /// of the specified particles. - void set_particles(const std::vector & particles); + void set_particles(const std::vector & particles) FASTJET_OVERRIDE; /// determine whether the automatic calculation of rho_m and sigma_m /// is enabled (by default true) - void set_compute_rho_m(bool enable){ _enable_rho_m = enable;} + void set_compute_rho_m(bool enable){ _enable_rho_m = enable; } //\} + /// return a pointer to a copy of this BGE; the user is responsible + /// for eventually deleting the resulting object. + BackgroundEstimatorBase * copy() const FASTJET_OVERRIDE { + return new GridMedianBackgroundEstimator(*this); + }; + + + /// @name retrieving fundamental information //\{ //---------------------------------------------------------------- + /// get the full set of background properties + BackgroundEstimate estimate() const FASTJET_OVERRIDE; + + /// get the full set of background properties for a given reference jet + BackgroundEstimate estimate(const PseudoJet &jet) const FASTJET_OVERRIDE; /// returns rho, the median background density per unit area - double rho() const; + double rho() const FASTJET_OVERRIDE; /// returns sigma, the background fluctuations per unit area; must be /// multipled by sqrt(area) to get fluctuations for a region of a /// given area. - double sigma() const; + double sigma() const FASTJET_OVERRIDE; /// returns rho, the background density per unit area, locally at the /// position of a given jet. Note that this is not const, because a /// user may then wish to query other aspects of the background that /// could depend on the position of the jet last used for a rho(jet) /// determination. - double rho(const PseudoJet & jet); + double rho(const PseudoJet & jet) FASTJET_OVERRIDE; /// returns sigma, the background fluctuations per unit area, locally at /// the position of a given jet. As for rho(jet), it is non-const. - double sigma(const PseudoJet & jet); + double sigma(const PseudoJet & jet) FASTJET_OVERRIDE; /// returns true if this background estimator has support for /// determination of sigma - bool has_sigma() {return true;} + bool has_sigma() const FASTJET_OVERRIDE {return true;} //----------------------------------------------------------------- /// Returns rho_m, the purely longitudinal, particle-mass-induced /// component of the background density per unit area - double rho_m() const; + double rho_m() const FASTJET_OVERRIDE; /// returns sigma_m, a measure of the fluctuations in the purely /// longitudinal, particle-mass-induced component of the background /// density per unit area; must be multipled by sqrt(area) to get /// fluctuations for a region of a given area. - double sigma_m() const; + double sigma_m() const FASTJET_OVERRIDE; /// Returns rho_m locally at the jet position. As for rho(jet), it is non-const. - double rho_m(const PseudoJet & jet); + double rho_m(const PseudoJet & jet) FASTJET_OVERRIDE; /// Returns sigma_m locally at the jet position. As for rho(jet), it is non-const. - double sigma_m(const PseudoJet & jet); + double sigma_m(const PseudoJet & jet) FASTJET_OVERRIDE; /// Returns true if this background estimator has support for /// determination of rho_m. /// /// Note that support for sigma_m is automatic if one has sigma and /// rho_m support. - bool has_rho_m() const {return _enable_rho_m;} + bool has_rho_m() const FASTJET_OVERRIDE {return _enable_rho_m;} /// returns the area of the grid cells (all identical, but @@ -222,7 +210,7 @@ public: /// The same profile will be used for both pt and mt (this is /// probabaly a good approximation since the particle density /// changes is what dominates the rapidity profile) - virtual void set_rescaling_class(const FunctionOfPseudoJet * rescaling_class); + virtual void set_rescaling_class(const FunctionOfPseudoJet * rescaling_class) FASTJET_OVERRIDE; //\} @@ -231,40 +219,21 @@ public: //---------------------------------------------------------------- /// returns a textual description of the background estimator - std::string description() const; + std::string description() const FASTJET_OVERRIDE; //\} private: -#ifndef FASTJET_GMBGE_USEFJGRID - - /// configure the grid - void setup_grid(); - - /// retrieve the grid cell index for a given PseudoJet - int tile_index(const PseudoJet & p) const; - - // information about the grid - double _ymin, _ymax, _dy, _dphi, _requested_grid_spacing, _tile_area; - int _ny, _nphi, _ntotal; - - int n_tiles() const {return _ntotal;} - int n_good_tiles() const {return n_tiles();} - int tile_is_good(int /* itile */) const {return true;} - - double mean_tile_area() const {return _tile_area;} -#endif // FASTJET_GMBGE_USEFJGRID - - /// verify that particles have been set and throw an error if not void verify_particles_set() const; - // information abotu the event + // information about the event //std::vector _scalar_pt; - double _rho, _sigma, _rho_m, _sigma_m; - bool _has_particles; + //double _rho, _sigma, _rho_m, _sigma_m; + BackgroundEstimate _cached_estimate; + //bool _has_particles; bool _enable_rho_m; // various warnings to inform people of potential dangers diff --git a/fastjet/tools/fastjet/tools/JHTopTagger.hh b/fastjet/tools/fastjet/tools/JHTopTagger.hh index f581079..92e7983 100644 --- a/fastjet/tools/fastjet/tools/JHTopTagger.hh +++ b/fastjet/tools/fastjet/tools/JHTopTagger.hh @@ -2,9 +2,9 @@ #define __FASTJET_JH_TOP_TAGGER_HH__ //FJSTARTHEADER -// $Id: JHTopTagger.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -32,9 +32,9 @@ //FJENDHEADER -#include -#include -#include +#include "fastjet/tools/TopTaggerBase.hh" +#include "fastjet/CompositeJetStructure.hh" +#include "fastjet/LimitedWarning.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/tools/fastjet/tools/JetMedianBackgroundEstimator.hh b/fastjet/tools/fastjet/tools/JetMedianBackgroundEstimator.hh index f33e30a..8c56c54 100644 --- a/fastjet/tools/fastjet/tools/JetMedianBackgroundEstimator.hh +++ b/fastjet/tools/fastjet/tools/JetMedianBackgroundEstimator.hh @@ -1,10 +1,11 @@ #ifndef __FASTJET_BACKGROUND_ESTIMATOR_HH__ #define __FASTJET_BACKGROUND_ESTIMATOR_HH__ + //FJSTARTHEADER -// $Id: JetMedianBackgroundEstimator.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,13 +32,18 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include -#include -#include -#include +#include "fastjet/config.h" +#include "fastjet/ClusterSequenceAreaBase.hh" +#include "fastjet/AreaDefinition.hh" +#include "fastjet/FunctionOfPseudoJet.hh" +#include "fastjet/Selector.hh" +#include "fastjet/tools/BackgroundEstimatorBase.hh" #include +#ifdef FASTJET_HAVE_THREAD_SAFETY +#include +#endif + FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh @@ -124,8 +130,8 @@ public: JetMedianBackgroundEstimator(const Selector &rho_range = SelectorIdentity()) : _rho_range(rho_range), _jet_def(JetDefinition()), _enable_rho_m(true){ reset(); } - + /// default dtor ~JetMedianBackgroundEstimator(){} @@ -138,7 +144,12 @@ public: /// tell the background estimator that it has a new event, composed /// of the specified particles. - virtual void set_particles(const std::vector & particles); + virtual void set_particles(const std::vector & particles) FASTJET_OVERRIDE; + + // tell the background estimator that it has a new event, composed + // of the specified particles and use the supplied seed for the + // generation of ghosts. If the seed is empty, it is ignored. + virtual void set_particles_with_seed(const std::vector & particles, const std::vector & seed) FASTJET_OVERRIDE; /// (re)set the cluster sequence (with area support) to be used by /// future calls to rho() etc. @@ -167,25 +178,44 @@ public: /// (re)set the selector to be used for future calls to rho() etc. void set_selector(const Selector & rho_range_selector) { _rho_range = rho_range_selector; - _uptodate = false; + _set_cache_unavailable(); } /// determine whether the automatic calculation of rho_m and sigma_m /// is enabled (by default true) - void set_compute_rho_m(bool enable){ _enable_rho_m = enable;} + void set_compute_rho_m(bool enable){ + _enable_rho_m = enable; + _set_cache_unavailable(); + } //\} + /// return a pointer to a copy of this BGE; the user is responsible + /// for eventually deleting the resulting object. + BackgroundEstimatorBase * copy() const FASTJET_OVERRIDE { + return new JetMedianBackgroundEstimator(*this); + }; + + /// @name retrieving fundamental information //\{ //---------------------------------------------------------------- + /// get the full set of background properties + /// + /// For background estimators using a local ranges, this throws an + /// error (use estimate(jet) instead) + /// In the presence of a rescaling, the rescaling is not included + BackgroundEstimate estimate() const FASTJET_OVERRIDE; + + /// get the full set of background properties for a given reference jet + BackgroundEstimate estimate(const PseudoJet &jet) const FASTJET_OVERRIDE; /// get rho, the median background density per unit area - double rho() const; + double rho() const FASTJET_OVERRIDE; /// get sigma, the background fluctuations per unit area - double sigma() const; + double sigma() const FASTJET_OVERRIDE; /// get rho, the median background density per unit area, locally at /// the position of a given jet. @@ -193,7 +223,7 @@ public: /// If the Selector associated with the range takes a reference jet /// (i.e. is relocatable), then for subsequent operations the /// Selector has that jet set as its reference. - double rho(const PseudoJet & jet); + double rho(const PseudoJet & jet) FASTJET_OVERRIDE; /// get sigma, the background fluctuations per unit area, /// locally at the position of a given jet. @@ -201,30 +231,30 @@ public: /// If the Selector associated with the range takes a reference jet /// (i.e. is relocatable), then for subsequent operations the /// Selector has that jet set as its reference. - double sigma(const PseudoJet &jet); + double sigma(const PseudoJet &jet) FASTJET_OVERRIDE; /// returns true if this background estimator has support for /// determination of sigma - virtual bool has_sigma() {return true;} + virtual bool has_sigma() const FASTJET_OVERRIDE {return true;} //---------------------------------------------------------------- // now do the same thing for rho_m and sigma_m /// returns rho_m, the purely longitudinal, particle-mass-induced /// component of the background density per unit area - virtual double rho_m() const; + virtual double rho_m() const FASTJET_OVERRIDE; /// returns sigma_m, a measure of the fluctuations in the purely /// longitudinal, particle-mass-induced component of the background /// density per unit area; must be multipled by sqrt(area) to get /// fluctuations for a region of a given area. - virtual double sigma_m() const; + virtual double sigma_m() const FASTJET_OVERRIDE; /// Returns rho_m locally at the jet position. As for rho(jet), it is non-const. - virtual double rho_m(const PseudoJet & /*jet*/); + virtual double rho_m(const PseudoJet & /*jet*/) FASTJET_OVERRIDE; /// Returns sigma_m locally at the jet position. As for rho(jet), it is non-const. - virtual double sigma_m(const PseudoJet & /*jet*/); + virtual double sigma_m(const PseudoJet & /*jet*/) FASTJET_OVERRIDE; /// Returns true if this background estimator has support for /// determination of rho_m. @@ -234,7 +264,7 @@ public: /// /// Note that support for sigma_m is automatic is one has sigma and /// rho_m support. - virtual bool has_rho_m() const {return _enable_rho_m && (_jet_density_class == 0);} + virtual bool has_rho_m() const FASTJET_OVERRIDE {return _enable_rho_m && (_jet_density_class == 0);} //\} /// @name retrieving additional useful information @@ -243,35 +273,16 @@ public: /// Returns the mean area of the jets used to actually compute the /// background properties in the last call of rho() or sigma() /// If the configuration has changed in the meantime, throw an error. - double mean_area() const{ - if (!_uptodate) - throw Error("JetMedianBackgroundEstimator::mean_area(): one may not retrieve information about the last call to rho() or sigma() when the configuration has changed in the meantime."); - //_recompute_if_needed(); - return _mean_area; - } + double mean_area() const; /// returns the number of jets used to actually compute the /// background properties in the last call of rho() or sigma() /// If the configuration has changed in the meantime, throw an error. - unsigned int n_jets_used() const{ - if (!_uptodate) - throw Error("JetMedianBackgroundEstimator::n_jets_used(): one may not retrieve information about the last call to rho() or sigma() when the configuration has changed in the meantime."); - //_recompute_if_needed(); - return _n_jets_used; - } + unsigned int n_jets_used() const; /// returns the jets used to actually compute the background /// properties - std::vector jets_used() const{ - if (!_uptodate) throw Error("JetMedianBackgroundEstimator::n_jets_used(): one may not retrieve information about the last call to rho() or sigma() when the configuration has changed in the meantime."); - _check_csa_alive(); - std::vector tmp_jets = _rho_range(_included_jets); - std::vector used_jets; - for (unsigned int i=0; i0) used_jets.push_back(tmp_jets[i]); - } - return used_jets; - } + std::vector jets_used() const; /// Returns the estimate of the area (within the range defined by /// the selector) that is not occupied by jets. The value is that @@ -287,12 +298,7 @@ public: /// /// The result here is just the cached result of the corresponding /// call to the ClusterSequenceAreaBase function. - double empty_area() const{ - if (!_uptodate) - throw Error("JetMedianBackgroundEstimator::empty_area(): one may not retrieve information about the last call to rho() or sigma() when the configuration has changed in the meantime."); - //_recompute_if_needed(); - return _empty_area; - } + double empty_area() const; /// Returns the number of empty jets used when computing the /// background properties. The value is that for the last call of @@ -306,12 +312,7 @@ public: /// /// The result here is just the cached result of the corresponding /// call to the ClusterSequenceAreaBase function. - double n_empty_jets() const{ - if (!_uptodate) - throw Error("JetMedianBackgroundEstimator::n_empty_jets(): one may not retrieve information about the last call to rho() or sigma() when the configuration has changed in the meantime."); - //_recompute_if_needed(); - return _n_empty_jets; - } + double n_empty_jets() const; //} @@ -337,7 +338,7 @@ public: /// \param use_it whether one uses the 4-vector area or not (true by default) void set_use_area_4vector(bool use_it = true){ _use_area_4vector = use_it; - _uptodate = false; + _set_cache_unavailable(); } /// check if the estimator uses the 4-vector area or the scalar area @@ -349,7 +350,7 @@ public: /// call to this function. void set_provide_fj2_sigma(bool provide_fj2_sigma = true) { _provide_fj2_sigma = provide_fj2_sigma; - _uptodate = false; + _set_cache_unavailable(); } /// Set a pointer to a class that calculates the quantity whose @@ -374,9 +375,9 @@ public: /// /// The BackgroundRescalingYPolynomial class can be used to get a /// rescaling that depends just on rapidity. - virtual void set_rescaling_class(const FunctionOfPseudoJet * rescaling_class_in) { + virtual void set_rescaling_class(const FunctionOfPseudoJet * rescaling_class_in) FASTJET_OVERRIDE { BackgroundEstimatorBase::set_rescaling_class(rescaling_class_in); - _uptodate = false; + _set_cache_unavailable(); } //\} @@ -386,32 +387,79 @@ public: //---------------------------------------------------------------- /// returns a textual description of the background estimator - std::string description() const; + std::string description() const FASTJET_OVERRIDE; //\} + /// an internal class to hold results of the calculation + /// that are to be assigned to the "extras" part of a BackgroundEstimate + class Extras : public BackgroundEstimate::Extras { + public: + Extras() + : _reference_jet(PseudoJet()), _n_jets_used(0), + _n_empty_jets(0.0), _empty_area(0.0) {} + + /// returns the current reference jet + PseudoJet reference_jet() const {return _reference_jet;} + + /// returns the number of jets used to estimate the background + unsigned int n_jets_used() const {return _n_jets_used;} + + /// returns the number of empty (pure-ghost) jets + double n_empty_jets() const {return _n_empty_jets;} + + /// returns the empty (pure-ghost/unclustered) area! + double empty_area() const {return _empty_area;} + + void set_reference_jet(const PseudoJet &reference_jet_in){ + _reference_jet = reference_jet_in; + } + void set_n_jets_used(int n_jets_used_in){ _n_jets_used=n_jets_used_in;} + void set_n_empty_jets(double n_empty_jets_in){ _n_empty_jets=n_empty_jets_in;} + void set_empty_area(double empty_area_in){ _empty_area=empty_area_in;} + + + protected: + PseudoJet _reference_jet; ///< current reference jet + unsigned int _n_jets_used; ///< number of jets used to estimate the background + double _n_empty_jets; ///< number of empty (pure-ghost) jets + double _empty_area; ///< the empty (pure-ghost/unclustered) area! + }; + private: - /// do the actual job - void _compute() const; + /// compute the background properties for a given jet (excluding + /// rescaling factors) and return a corresponding BackgroundEstimate + /// + /// this leaves the cache (and the status flags) unchanged + BackgroundEstimate _compute(const PseudoJet &jet) const; + + //------ + // the next calls are meant for the case where the cache can be + // filled once and for all, i.e. cases where the selector does NOT + // take a reference + + /// fill the cache with the given estimate + void _cache_no_overwrite(const BackgroundEstimate &estimate) const; - /// check if the properties need to be recomputed - /// and do so if needed - void _recompute_if_needed() const { - if (!_uptodate) _compute(); - _uptodate = true; - } + /// fill the cache with a computed estimate + void _compute_and_cache_no_overwrite() const; - /// for estimation using a selector that takes a reference jet - /// (i.e. a selector that can be relocated) this function allows one - /// to set its position. - /// - /// Note that this HAS to be called before any attempt to compute - /// the background properties. The call is, however, performed - /// automatically by the functions rho(jet) and sigma(jet). - void _recompute_if_needed(const PseudoJet &jet); + //------ + // the next calls are meant for the case where the selector does + // take a reference and the cache needs to be refilled whenever one + // calls this background estimate with a different reference jet + /// fill the cache with the given estimate + void _cache(const BackgroundEstimate &estimate) const; + + /// update the cache if need be and return the background + /// estimate. This is meant to be called for cases with a local + /// range (selector that takesa reference) + BackgroundEstimate _compute_and_cache_if_needed(const PseudoJet &jet) const; + //----- + /// check that the underlying structure is still alive /// throw an error otherwise void _check_csa_alive() const; @@ -434,20 +482,8 @@ private: //SharedPtr _rescaling_class_sharedptr; bool _enable_rho_m; - // the actual results of the computation - mutable double _rho; ///< background estimated density per unit area - mutable double _sigma; ///< background estimated fluctuations - mutable double _rho_m; ///< "mass" background estimated density per unit area - mutable double _sigma_m; ///< "mass" background estimated fluctuations - mutable double _mean_area; ///< mean area of the jets used to estimate the background - mutable unsigned int _n_jets_used; ///< number of jets used to estimate the background - mutable double _n_empty_jets; ///< number of empty (pure-ghost) jets - mutable double _empty_area; ///< the empty (pure-ghost/unclustered) area! - // internal variables SharedPtr _csi; ///< allows to check if _csa is still valid - PseudoJet _current_reference; ///< current reference jet - mutable bool _uptodate; ///< true when the background computation is up-to-date /// handle warning messages static LimitedWarning _warnings; @@ -522,7 +558,6 @@ public: }; - FASTJET_END_NAMESPACE #endif // __BACKGROUND_ESTIMATOR_HH__ diff --git a/fastjet/tools/fastjet/tools/Makefile.in b/fastjet/tools/fastjet/tools/Makefile.in index 2e9ab7e..e6fdba3 100644 --- a/fastjet/tools/fastjet/tools/Makefile.in +++ b/fastjet/tools/fastjet/tools/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. diff --git a/fastjet/tools/fastjet/tools/MassDropTagger.hh b/fastjet/tools/fastjet/tools/MassDropTagger.hh index 62cba4e..a56a324 100644 --- a/fastjet/tools/fastjet/tools/MassDropTagger.hh +++ b/fastjet/tools/fastjet/tools/MassDropTagger.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: MassDropTagger.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,9 +31,9 @@ #ifndef __FASTJET_MASS_DROP_TAGGER_HH__ #define __FASTJET_MASS_DROP_TAGGER_HH__ -#include -#include -#include +#include "fastjet/tools/Transformer.hh" +#include "fastjet/LimitedWarning.hh" +#include "fastjet/WrappedStructure.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/tools/fastjet/tools/Pruner.hh b/fastjet/tools/fastjet/tools/Pruner.hh index df96f4a..ab826bd 100644 --- a/fastjet/tools/fastjet/tools/Pruner.hh +++ b/fastjet/tools/fastjet/tools/Pruner.hh @@ -2,9 +2,9 @@ #define __FASTJET_TOOLS_PRUNER_HH__ //FJSTARTHEADER -// $Id: Pruner.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -235,8 +235,8 @@ private: /// the softest is rejected. /// /// Note that this in not meant for standalone use [in particular -/// because it could lead to memory issues due to the rejected indices -/// stored internally]. +/// because it could lead to memory (and thread-safety) issues due to +/// the rejected indices stored internally (as a mutable variable)]. /// /// \endif class PruningRecombiner : public JetDefinition::Recombiner{ diff --git a/fastjet/tools/fastjet/tools/Recluster.hh b/fastjet/tools/fastjet/tools/Recluster.hh index 02a927c..85b02e2 100644 --- a/fastjet/tools/fastjet/tools/Recluster.hh +++ b/fastjet/tools/fastjet/tools/Recluster.hh @@ -1,7 +1,7 @@ #ifndef __FASTJET_TOOLS_RECLUSTER_HH__ #define __FASTJET_TOOLS_RECLUSTER_HH__ -// $Id: Recluster.hh 3753 2014-12-17 15:19:55Z salam $ +// $Id$ // // Copyright (c) 2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // @@ -22,8 +22,8 @@ // along with this code. If not, see . //---------------------------------------------------------------------- -#include -#include // to derive Recluster from FOfPJ +#include "fastjet/JetDefinition.hh" +#include "fastjet/FunctionOfPseudoJet.hh" // to derive Recluster from FOfPJ #include #include diff --git a/fastjet/tools/fastjet/tools/RestFrameNSubjettinessTagger.hh b/fastjet/tools/fastjet/tools/RestFrameNSubjettinessTagger.hh index eeb2e0f..ceca21f 100644 --- a/fastjet/tools/fastjet/tools/RestFrameNSubjettinessTagger.hh +++ b/fastjet/tools/fastjet/tools/RestFrameNSubjettinessTagger.hh @@ -2,9 +2,9 @@ #define __FASTJET_RESTFRAMENSUBJETTINESS_TAGGER_HH__ //FJSTARTHEADER -// $Id: RestFrameNSubjettinessTagger.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,10 +31,10 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include -#include -#include +#include "fastjet/PseudoJet.hh" +#include "fastjet/JetDefinition.hh" +#include "fastjet/CompositeJetStructure.hh" +#include "fastjet/tools/Transformer.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/tools/fastjet/tools/Subtractor.hh b/fastjet/tools/fastjet/tools/Subtractor.hh index 92f8bcd..106a0b3 100644 --- a/fastjet/tools/fastjet/tools/Subtractor.hh +++ b/fastjet/tools/fastjet/tools/Subtractor.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Subtractor.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -62,7 +62,7 @@ FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh class Subtractor : public Transformer{ public: /// define a subtractor based on a BackgroundEstimator - Subtractor(BackgroundEstimatorBase * bge) : + Subtractor(const BackgroundEstimatorBase * bge) : _bge(bge), _rho(-1.0) { set_defaults(); } /// define a subtractor that uses a fixed value of rho, the background @@ -91,6 +91,11 @@ public: /// a future release of FastJet void set_defaults(); + void set_background_estimator(const BackgroundEstimatorBase * bge) { + _bge = bge; + _rho = _invalid_rho; + } + /// when 'use_rho_m' is true, include in the subtraction the /// correction from rho_m, the purely longitudinal, /// particle-mass-induced component of the background density per @@ -179,7 +184,7 @@ protected: /// the tool used to estimate the background /// if has to be mutable in case its underlying selector takes a reference jet - mutable BackgroundEstimatorBase * _bge; + const BackgroundEstimatorBase * _bge; /// the fixed value of rho and/or rho_m to use if the user has selected that option double _rho, _rho_m; diff --git a/fastjet/tools/fastjet/tools/TopTaggerBase.hh b/fastjet/tools/fastjet/tools/TopTaggerBase.hh index 3dba4c7..4257b51 100644 --- a/fastjet/tools/fastjet/tools/TopTaggerBase.hh +++ b/fastjet/tools/fastjet/tools/TopTaggerBase.hh @@ -2,9 +2,9 @@ #define __FASTJET_TOP_TAGGER_BASE_HH__ //FJSTARTHEADER -// $Id: TopTaggerBase.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,8 +31,8 @@ //---------------------------------------------------------------------- //FJENDHEADER -#include -#include +#include "fastjet/internal/base.hh" +#include "fastjet/tools/Transformer.hh" FASTJET_BEGIN_NAMESPACE diff --git a/fastjet/tools/fastjet/tools/Transformer.hh b/fastjet/tools/fastjet/tools/Transformer.hh index 17654db..21b0823 100644 --- a/fastjet/tools/fastjet/tools/Transformer.hh +++ b/fastjet/tools/fastjet/tools/Transformer.hh @@ -1,7 +1,7 @@ //FJSTARTHEADER -// $Id: Transformer.hh 4442 2020-05-05 07:50:11Z soyez $ +// $Id$ // -// Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez +// Copyright (c) 2005-2021, Matteo Cacciari, Gavin P. Salam and Gregory Soyez // //---------------------------------------------------------------------- // This file is part of FastJet. @@ -31,9 +31,9 @@ #ifndef __FASTJET_TRANSFORMER_HH__ #define __FASTJET_TRANSFORMER_HH__ -#include -#include -#include +#include "fastjet/PseudoJet.hh" +#include "fastjet/FunctionOfPseudoJet.hh" +#include "fastjet/PseudoJetStructureBase.hh" FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh