Index: contrib/contribs/KTClusCXX/trunk/AUTHORS =================================================================== --- contrib/contribs/KTClusCXX/trunk/AUTHORS (revision 0) +++ contrib/contribs/KTClusCXX/trunk/AUTHORS (revision 1332) @@ -0,0 +1,3 @@ +The KTCLusCXX FastJet contrib was written and is maintained and developed by: + +Andrii Verbytskyi \ No newline at end of file Index: contrib/contribs/KTClusCXX/trunk/VERSION =================================================================== --- contrib/contribs/KTClusCXX/trunk/VERSION (revision 0) +++ contrib/contribs/KTClusCXX/trunk/VERSION (revision 1332) @@ -0,0 +1 @@ +1.0.0 Index: contrib/contribs/KTClusCXX/trunk/KTClusCXX.hh =================================================================== --- contrib/contribs/KTClusCXX/trunk/KTClusCXX.hh (revision 0) +++ contrib/contribs/KTClusCXX/trunk/KTClusCXX.hh (revision 1332) @@ -0,0 +1,296 @@ +// KTClusCXX Package +// +// Copyright (c) 2021 Andrii Verbytskyi +// +// $Id$ +// +//---------------------------------------------------------------------- +// This file is part of FastJet contrib. +// +// It 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. +// +// It 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 this code. If not, see . +//---------------------------------------------------------------------- + +#ifndef __FASTJET_CONTRIB_KTCLUSCXX_HH__ +#define __FASTJET_CONTRIB_KTCLUSCXX_HH__ +#include +#include +#include +#include +#include +#include "fastjet/PseudoJet.hh" +#include "fastjet/JetDefinition.hh" +#include "fastjet/NNH.hh" + +FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh +// forward declaration to reduce includes +class ClusterSequence; + +namespace contrib { +inline double to_pi(const double& a1) { + double phi = a1; + while (phi>M_PI) phi -= (2*M_PI); + while (phi<-M_PI) phi += (2*M_PI); + return phi; +} + +class KTClusInfo { +public: + KTClusInfo(const double R = 1.0): _R(R) {} + double R() const { + return _R; + } +private: + double _R; +}; + +template +class KTClusBriefJet { +public: + void init(const PseudoJet & jet, KTClusInfo* IN) { + double norm = 1.0/std::sqrt(jet.modp2()); + nx = jet.px() * norm; + ny = jet.py() * norm; + nz = jet.pz() * norm; + E = jet.E(); + pt = jet.pt(); + phi = jet.phi(); + eta = jet.eta(); + rap = jet.rap(); + R = IN->R(); + } + + double distance(const KTClusBriefJet * jet) const { + if (TYPE == 1 && ANGLE == 1) return 2*std::min(E*E, jet->E*jet->E)*(1.0 - (nx*jet->nx + ny*jet->ny + nz*jet->nz)); + if (TYPE == 2 && ANGLE == 1) return 2*std::min(E*E, jet->E*jet->E)*(1.0 - (nx*jet->nx + ny*jet->ny + nz*jet->nz)); + if (TYPE == 3 && ANGLE == 1) return 2*std::min(E*E, jet->E*jet->E)*(1.0 - (nx*jet->nx + ny*jet->ny + nz*jet->nz)); + if (TYPE == 4 && ANGLE == 1) return 2*std::min(E*E, jet->E*jet->E)*(1.0 - (nx*jet->nx + ny*jet->ny + nz*jet->nz)); + + if (TYPE == 1 && ANGLE == 2) return std::min(pt*pt, jet->pt*jet->pt)*(std::pow(to_pi(phi - jet->phi), 2) + std::pow(rap - jet->rap, 2)); + if (TYPE == 2 && ANGLE == 2) return std::min(pt*pt, jet->pt*jet->pt)*(std::pow(to_pi(phi - jet->phi), 2) + std::pow(rap - jet->rap, 2)); + if (TYPE == 3 && ANGLE == 2) return std::min(pt*pt, jet->pt*jet->pt)*(std::pow(to_pi(phi - jet->phi), 2) + std::pow(rap - jet->rap, 2)); + if (TYPE == 4 && ANGLE == 2) return std::min(pt*pt, jet->pt*jet->pt)*(std::pow(to_pi(phi - jet->phi), 2) + std::pow(rap - jet->rap, 2)); + + if (TYPE == 1 && ANGLE == 3) return std::min(pt*pt, jet->pt*jet->pt)*2*(std::cosh(rap - jet->rap) - std::cos(to_pi(phi - jet->phi))); + if (TYPE == 2 && ANGLE == 3) return std::min(pt*pt, jet->pt*jet->pt)*2*(std::cosh(rap - jet->rap) - std::cos(to_pi(phi - jet->phi))); + if (TYPE == 3 && ANGLE == 3) return std::min(pt*pt, jet->pt*jet->pt)*2*(std::cosh(rap - jet->rap) - std::cos(to_pi(phi - jet->phi))); + if (TYPE == 4 && ANGLE == 3) return std::min(pt*pt, jet->pt*jet->pt)*2*(std::cosh(rap - jet->rap) - std::cos(to_pi(phi - jet->phi))); + + throw Error("Unknown distance function"); + } + + double beam_distance() const { + if (TYPE == 1 && ANGLE == 1) return std::numeric_limits::max()/256; + if (TYPE == 2 && ANGLE == 1) return 2*R*R*E*E*(1 + nz); + if (TYPE == 3 && ANGLE == 1) return 2*R*R*E*E*(1 - nz); + if (TYPE == 4 && ANGLE == 1) return 2*R*R*E*E*std::min(1 - nz, 1 + nz); + + if (TYPE == 1 && ANGLE == 2) return std::numeric_limits::max()/256; + if (TYPE == 2 && ANGLE == 2) return R*R*pt*pt; + if (TYPE == 3 && ANGLE == 2) return R*R*pt*pt; + if (TYPE == 4 && ANGLE == 2) return R*R*pt*pt; + + if (TYPE == 1 && ANGLE == 3) return std::numeric_limits::max()/256; + if (TYPE == 2 && ANGLE == 3) return R*R*pt*pt; + if (TYPE == 3 && ANGLE == 3) return R*R*pt*pt; + if (TYPE == 4 && ANGLE == 3) return R*R*pt*pt; + + throw Error("Unknown beam distance function"); + } + +private: + double E, pt, eta, rap, phi, nx, ny, nz, R; +}; + + +template +class KTClusCXX : public JetDefinition::Plugin { +public: + enum Strategy { strategy_NNH = 0}; + + KTClusCXX (const double radius = 1.0, Strategy strategy = strategy_NNH): _R(radius), _strategy(strategy) {} + + KTClusCXX (const KTClusCXX & plugin) { + *this = plugin; + } + + virtual std::string description () const { + std::ostringstream desc; + desc << " KTCLUS algorithm plugin in mode " << TYPE << ANGLE << MONO << RECOM; + switch(_strategy) { + case strategy_NNH: + desc << ", using NNH strategy"; + break; + default: + throw Error("Unrecognized strategy in KTClusCXX"); + } + + return desc.str(); + } + + virtual void run_clustering(ClusterSequence & cs) const { + switch(_strategy) { + case strategy_NNH: + _actual_run_clustering,KTClusInfo> >(cs); + break; + default: + throw Error("Unrecognized strategy in KTClusCXX"); + } + } + + virtual double R() const { + return _R; + } + + virtual bool exclusive_sequence_meaningful() const { + return true; + } + +private: + double _R; + Strategy _strategy; + template void _actual_run_clustering(ClusterSequence & cs) const { + int njets = cs.jets().size(); + KTClusInfo IN(_R); + N nn(cs.jets(),&IN); + while (njets > 0) { + int i, j, k; + double dij = -1; + dij= nn.dij_min(i, j); + if (j >= 0) { + cs.plugin_record_ij_recombination(i, j, dij, k); + nn.merge_jets(i, j, cs.jets()[k], k); + } else { + KTClusBriefJet < TYPE, ANGLE, MONO, 0 > jt; + jt.init(cs.jets()[i],&IN); + double diB = jt.beam_distance(); + cs.plugin_record_iB_recombination(i, diB); + nn.remove_jet(i); + } + njets--; + } + } +}; + +template +JetDefinition KTClusCXXJetDefinition(const double Rad = 1.0) { + RecombinationScheme rs; + if (MODE%10 == 1) rs = E_scheme; + if (MODE%10 == 2) rs = pt_scheme; + if (MODE%10 == 3) rs = pt2_scheme; + JetDefinition JD(new KTClusCXX(Rad)); + JD.set_recombination_scheme(rs); + return JD; +} + +inline JetDefinition KTClusCXXJetDefinition(const int m, const double x = 1.0) { + switch (m) { + case 1111: return KTClusCXXJetDefinition<1111>(x); break; + case 2111: return KTClusCXXJetDefinition<2111>(x); break; + case 3111: return KTClusCXXJetDefinition<3111>(x); break; + case 4111: return KTClusCXXJetDefinition<4111>(x); break; + + case 1211: return KTClusCXXJetDefinition<1211>(x); break; + case 2211: return KTClusCXXJetDefinition<2211>(x); break; + case 3211: return KTClusCXXJetDefinition<3211>(x); break; + case 4211: return KTClusCXXJetDefinition<4211>(x); break; + + case 1311: return KTClusCXXJetDefinition<1311>(x); break; + case 2311: return KTClusCXXJetDefinition<2311>(x); break; + case 3311: return KTClusCXXJetDefinition<3311>(x); break; + case 4311: return KTClusCXXJetDefinition<4311>(x); break; + + case 1121: return KTClusCXXJetDefinition<1121>(x); break; + case 2121: return KTClusCXXJetDefinition<2121>(x); break; + case 3121: return KTClusCXXJetDefinition<3121>(x); break; + case 4121: return KTClusCXXJetDefinition<4121>(x); break; + + case 1221: return KTClusCXXJetDefinition<1221>(x); break; + case 2221: return KTClusCXXJetDefinition<2221>(x); break; + case 3221: return KTClusCXXJetDefinition<3221>(x); break; + case 4221: return KTClusCXXJetDefinition<4221>(x); break; + + case 1321: return KTClusCXXJetDefinition<1321>(x); break; + case 2321: return KTClusCXXJetDefinition<2321>(x); break; + case 3321: return KTClusCXXJetDefinition<3321>(x); break; + case 4321: return KTClusCXXJetDefinition<4321>(x); break; + + case 1112: return KTClusCXXJetDefinition<1112>(x); break; + case 2112: return KTClusCXXJetDefinition<2112>(x); break; + case 3112: return KTClusCXXJetDefinition<3112>(x); break; + case 4112: return KTClusCXXJetDefinition<4112>(x); break; + + case 1212: return KTClusCXXJetDefinition<1212>(x); break; + case 2212: return KTClusCXXJetDefinition<2212>(x); break; + case 3212: return KTClusCXXJetDefinition<3212>(x); break; + case 4212: return KTClusCXXJetDefinition<4212>(x); break; + + case 1312: return KTClusCXXJetDefinition<1312>(x); break; + case 2312: return KTClusCXXJetDefinition<2312>(x); break; + case 3312: return KTClusCXXJetDefinition<3312>(x); break; + case 4312: return KTClusCXXJetDefinition<4312>(x); break; + + case 1122: return KTClusCXXJetDefinition<1122>(x); break; + case 2122: return KTClusCXXJetDefinition<2122>(x); break; + case 3122: return KTClusCXXJetDefinition<3122>(x); break; + case 4122: return KTClusCXXJetDefinition<4122>(x); break; + + case 1222: return KTClusCXXJetDefinition<1222>(x); break; + case 2222: return KTClusCXXJetDefinition<2222>(x); break; + case 3222: return KTClusCXXJetDefinition<3222>(x); break; + case 4222: return KTClusCXXJetDefinition<4222>(x); break; + + case 1322: return KTClusCXXJetDefinition<1322>(x); break; + case 2322: return KTClusCXXJetDefinition<2322>(x); break; + case 3322: return KTClusCXXJetDefinition<3322>(x); break; + case 4322: return KTClusCXXJetDefinition<4322>(x); break; + + case 1113: return KTClusCXXJetDefinition<1113>(x); break; + case 2113: return KTClusCXXJetDefinition<2113>(x); break; + case 3113: return KTClusCXXJetDefinition<3113>(x); break; + case 4113: return KTClusCXXJetDefinition<4113>(x); break; + + case 1213: return KTClusCXXJetDefinition<1213>(x); break; + case 2213: return KTClusCXXJetDefinition<2213>(x); break; + case 3213: return KTClusCXXJetDefinition<3213>(x); break; + case 4213: return KTClusCXXJetDefinition<4213>(x); break; + + case 1313: return KTClusCXXJetDefinition<1313>(x); break; + case 2313: return KTClusCXXJetDefinition<2313>(x); break; + case 3313: return KTClusCXXJetDefinition<3313>(x); break; + case 4313: return KTClusCXXJetDefinition<4313>(x); break; + + case 1123: return KTClusCXXJetDefinition<1123>(x); break; + case 2123: return KTClusCXXJetDefinition<2123>(x); break; + case 3123: return KTClusCXXJetDefinition<3123>(x); break; + case 4123: return KTClusCXXJetDefinition<4123>(x); break; + + case 1223: return KTClusCXXJetDefinition<1223>(x); break; + case 2223: return KTClusCXXJetDefinition<2223>(x); break; + case 3223: return KTClusCXXJetDefinition<3223>(x); break; + case 4223: return KTClusCXXJetDefinition<4223>(x); break; + + case 1323: return KTClusCXXJetDefinition<1323>(x); break; + case 2323: return KTClusCXXJetDefinition<2323>(x); break; + case 3323: return KTClusCXXJetDefinition<3323>(x); break; + case 4323: return KTClusCXXJetDefinition<4323>(x); break; + default: + throw Error("Unrecognized option in KTCLUS"); + } + return JetDefinition(); +} +} // namespace contrib +FASTJET_END_NAMESPACE // defined in fastjet/internal/base.hh + +#endif // __KTCLUSCXX_HH__ + Index: contrib/contribs/KTClusCXX/trunk/example.ref =================================================================== --- contrib/contribs/KTClusCXX/trunk/example.ref (revision 0) +++ contrib/contribs/KTClusCXX/trunk/example.ref (revision 1332) @@ -0,0 +1,58 @@ +Input particles: +0.213284 -0.173290 -2.230787 2.251979 +0.054103 -0.042711 -3.442555 3.478456 +0.374373 -0.051016 -0.050480 0.405938 +0.767837 0.530070 -31.200142 31.218056 +0.363514 0.038266 -4.205636 4.223797 +-0.008025 0.042687 -12.803184 12.804018 +-0.022179 -0.230693 -0.432209 0.509898 +-0.068365 -0.490537 0.240278 0.567903 +-0.354302 0.145503 0.730169 0.963049 +-0.054408 -0.342463 6.596456 6.672051 +0.123458 0.258292 3.113851 3.130096 +-0.061597 -0.024070 -0.107137 0.187968 +-0.001881 0.007350 -0.002595 0.139800 +0.104776 -0.189072 0.204235 0.328508 +0.170895 0.345229 0.746333 0.851399 +0.178118 0.292520 -0.281690 0.443444 +0.088777 -0.151518 0.250435 0.336209 +-0.268216 0.070422 -0.203717 0.344093 +Parameters: 2111 1.000000 0.000100 1.000000 +Pseudojets: +0.767837 0.530070 -31.200142 31.218056 +-0.008025 0.042687 -12.803184 12.804018 +-0.054408 -0.342463 6.596456 6.672051 +0.363514 0.038266 -4.205636 4.223797 +0.054103 -0.042711 -3.442555 3.478456 +0.123458 0.258292 3.113851 3.130096 +0.213284 -0.173290 -2.230787 2.251979 +-0.354302 0.145503 0.730169 0.963049 +0.170895 0.345229 0.746333 0.851399 +-0.068365 -0.490537 0.240278 0.567903 +-0.022179 -0.230693 -0.432209 0.509898 +0.178118 0.292520 -0.281690 0.443444 +0.374373 -0.051016 -0.050480 0.405938 +-0.268216 0.070422 -0.203717 0.344093 +0.088777 -0.151518 0.250435 0.336209 +0.104776 -0.189072 0.204235 0.328508 +-0.061597 -0.024070 -0.107137 0.187968 +-0.001881 0.007350 -0.002595 0.139800 +exclusive_dmerge: +660.198692 +4.149503 +1.191426 +0.946142 +0.792410 +0.235952 +0.224950 +0.204411 +0.131378 +0.106019 +0.101871 +0.096605 +0.038113 +0.011101 +0.009753 +0.004850 +0.004424 +0.001887 Index: contrib/contribs/KTClusCXX/trunk/ChangeLog =================================================================== --- contrib/contribs/KTClusCXX/trunk/ChangeLog (revision 0) +++ contrib/contribs/KTClusCXX/trunk/ChangeLog (revision 1332) @@ -0,0 +1,78 @@ +2014-02-21 Daniele Bertolini + + * example_basic_usage.cc + + - changed order in which functions are presented + + * NEWS + * VERSION + + - Release of version 1.0.0 + + +2014-02-18 Daniele Bertolini + + * EventStorage.hh + * EventStorage.cc + + - new separate header/source files for storage classes (ParticleStorage,EventStorage, and LocalStorage) + - fixed a bug in ParticleStorage about initialization of variables + + * example_basic_usage.cc + * example_advanced_usage.cc + + - example file split into two. One showing usage of basic functions, the other showing more advanced functions + + * readme + + - updated + + * NEWS + * VERSION + + - 1.0-beta5 + + +2014-01-12 Daniele Bertolini + + * JetsWithoutJets.hh + * JetsWithoutJets.cc + + - added storeMass bool flag to choose whether mass of neighbors should be stored or not. + + * readme + + - updated with storeMass flag information + + * NEWS + * VERSION + + - 1.0-beta4 + + +2013-12-10 Daniele Bertolini + + * JetsWithoutJets.hh + * JetsWithoutJets.cc + + - changed namespace to jwj + - changed names of few functions and improved comments + - added new classes EventStorage and ParticleStorage to cache information about single particles + - JWJStorage has been renamed LocalStorage. Now this is managed by EventStorage and can be naturally used by all implemented functions + - implemented suggestions from the FastJet authors about avoiding mutables, and returning const refs for large vectors in MultiplePtCutValues and MultipleRValues classes + + * example.cc + + - updated with the possibility of using a single EventStorage for multiple JetLikeEventShape + + * readme + + - updated with information about new classes and EventStorage use + + * NEWS + * VERSION + + - 1.0-beta3 + +2013-08-26 + Initial creation based on Daniele's private code. Index: contrib/contribs/KTClusCXX/trunk/COPYING =================================================================== --- contrib/contribs/KTClusCXX/trunk/COPYING (revision 0) +++ contrib/contribs/KTClusCXX/trunk/COPYING (revision 1332) @@ -0,0 +1,348 @@ +The KTClusCXX contrib to FastJet is released +under the terms of the GNU General Public License v2 (GPLv2). + +A copy of the GPLv2 is to be found at the end of this file. + +====================================================================== +====================================================================== +====================================================================== + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Index: contrib/contribs/KTClusCXX/trunk/KTClusCXX.cc =================================================================== --- contrib/contribs/KTClusCXX/trunk/KTClusCXX.cc (revision 0) +++ contrib/contribs/KTClusCXX/trunk/KTClusCXX.cc (revision 1332) @@ -0,0 +1,33 @@ +// $Id$ +// +// Copyright (c) -, +// +//---------------------------------------------------------------------- +// This file is part of FastJet contrib. +// +// It 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. +// +// It 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 this code. If not, see . +//---------------------------------------------------------------------- + +#include "KTClusCXX.hh" + +FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh + +namespace contrib{ + + + + +} // namespace contrib + +FASTJET_END_NAMESPACE Index: contrib/contribs/KTClusCXX/trunk/NEWS =================================================================== --- contrib/contribs/KTClusCXX/trunk/NEWS (revision 0) +++ contrib/contribs/KTClusCXX/trunk/NEWS (revision 1332) @@ -0,0 +1 @@ +-- 1.0.0: Initial release. Index: contrib/contribs/KTClusCXX/trunk/Makefile =================================================================== --- contrib/contribs/KTClusCXX/trunk/Makefile (revision 0) +++ contrib/contribs/KTClusCXX/trunk/Makefile (revision 1332) @@ -0,0 +1,72 @@ +# If you are using this Makefile standalone and fastjet-config is not +# in your path, edit this line to specify the full path +FASTJETCONFIG=fastjet-config +PREFIX=`$(FASTJETCONFIG) --prefix` +CXX=g++ +CXXFLAGS= -O3 -Wall -g +install_script = $(SHELL) ../utils/install-sh +check_script = ../utils/check.sh + +# global contrib-wide Makefile include may override some of the above +# variables (leading "-" means don't give an error if you can't find +# the file) +-include ../.Makefile.inc + +#------------------------------------------------------------------------ +# things that are specific to this contrib +NAME=KTClusCXX +SRCS= +EXAMPLES=example +INSTALLED_HEADERS=KTClusCXX.hh +#------------------------------------------------------------------------ + +CXXFLAGS+= $(shell $(FASTJETCONFIG) --cxxflags) +LDFLAGS += -lm $(shell $(FASTJETCONFIG) --libs) + +OBJS = $(SRCS:.cc=.o) +EXAMPLES_SRCS = $(EXAMPLES:=.cc) + +install_HEADER = $(install_script) -c -m 644 +install_LIB = $(install_script) -c -m 644 +install_DIR = $(install_script) -d +install_DATA = $(install_script) -c -m 644 +install_PROGRAM = $(install_script) -c -s +install_SCRIPT = $(install_script) -c + +.PHONY: clean distclean examples check install + +# compilation of the code (default target) +all: KTClusCXX.hh + +# building the examples +examples: $(EXAMPLES) + +# the following construct makes it possible to automatically build +# each of the examples listed in $EXAMPLES +$(EXAMPLES): % : %.o all + $(CXX) -o $@ $< -I. $(LDFLAGS) + +# check that everything went fine +check: examples + @for prog in $(EXAMPLES); do\ + $(check_script) $${prog} ../data/single-epDIS-event.dat || exit 1; \ + done + @echo "All tests successful" + +# cleaning the directory +clean: + rm -f *~ *.o *.a + +distclean: clean + rm -f lib$(NAME).a $(EXAMPLES) + +# install things in PREFIX/... +install: all + $(install_DIR) $(PREFIX)/include/fastjet/contrib + for header in $(INSTALLED_HEADERS); do\ + $(install_HEADER) $$header $(PREFIX)/include/fastjet/contrib/;\ + done + +depend: + makedepend -Y -- -- $(SRCS) $(EXAMPLES_SRCS) +example.o: KTClusCXX.hh Index: contrib/contribs/KTClusCXX/trunk/README =================================================================== --- contrib/contribs/KTClusCXX/trunk/README (revision 0) +++ contrib/contribs/KTClusCXX/trunk/README (revision 1332) @@ -0,0 +1,14 @@ +The KTClusCXX package is based on the physics described in: + +The main reference: +S. Catani, Yu.L. Dokshitzer, M.H. Seymour and B.R. Webber, Nucl.Phys.B406(1993)187. +The ep version: +S. Catani, Yu.L. Dokshitzer and B.R. Webber, Phys.Lett.285B(1992)291. +The inclusive reconstruction method: +S.D. Ellis and D.E. Soper, Phys.Rev.D48(1993)3160. + +And aims to emulate the 'ktclus.f' package by M.~Seymour, 1992-2010. + +--- + +The code 'example.cc' illustrates a basic usage of the package. Index: contrib/contribs/KTClusCXX/trunk/example.cc =================================================================== --- contrib/contribs/KTClusCXX/trunk/example.cc (revision 0) +++ contrib/contribs/KTClusCXX/trunk/example.cc (revision 1332) @@ -0,0 +1,109 @@ +#include +#include +#include +#include +#include +#include "KTClusCXX.hh" + +using namespace fastjet; + +class Input { +public: + Input() {}; + ~Input() {}; + const double PIMASS = 0.139; + std::vector input_particles; + size_t N; + void fill(const size_t N_ = 23) { + srand(1); + N = std::max(size_t{2},std::min(size_t{100},N_)); + for (size_t i = 0; i < N; i++) { + double px = 10 * (drand48() - 0.5); + double py = 10 * (drand48() - 0.5); + double pz = 10 * (drand48() - 0.3); + double e = std::sqrt(px*px + py*py + pz*pz + PIMASS*PIMASS); + auto pj = PseudoJet(px, py, pz, e); + input_particles.push_back(pj); + } + } + void fill(const std::string& inp="") + { + + input_particles.clear(); + size_t i = 0; + double px, py, pz, E; + + if (inp.size()) { + std::ifstream myfile; + myfile.open (inp.c_str()); + while (myfile >> px >> py >> pz >> E) { + input_particles.push_back(PseudoJet(px, py, pz, E)); + i++; + } + myfile.close(); + } else { + + while (std::cin >> px >> py >> pz >> E) { + input_particles.push_back(PseudoJet(px, py, pz, E)); + i++; + } + } + N = i; + } + + void dump(const std:: string& out) { + std::ofstream myfile; + myfile.open (out.c_str()); + for (const auto& p: input_particles) { + myfile << " " << p.px() << " " << p.py() << " " << p.pz() << " " << p.e() << std::endl; + } + myfile.close(); + } + +}; +inline std::ostream& operator<<(std::ostream& os, const PseudoJet &j) { + os << j.px() << " " << j.py() << " " << j.pz() << " " << j.e(); + return os; +} +int main( int argc, char** argv) +{ + ///2111 1.0 0.0001 1.0 + + std::string smode = argc>2?std::string(argv[2]):"2111"; + bool inclusive = (smode.length() > 4 && smode[4] == 'i'); + int mode = std::atoi(smode.substr(0, 4).c_str()); + double Radius = argc>3?std::atof(argv[3]):1.0; + double YCUT = argc>4?std::atof(argv[4]):0.0001; + double ECUT =argc>5?std::atof(argv[5]):1.0; + Input IN; + IN.fill(argc>1?argv[1]:""); + std::vector < PseudoJet > fastjets; + fastjets.reserve(IN.N); + ClusterSequence cs(IN.input_particles, contrib::KTClusCXXJetDefinition(mode, Radius)); + if (inclusive) { + fastjets = cs.inclusive_jets(); + } else { + fastjets = cs.exclusive_jets(ECUT*ECUT*YCUT); + } + std::vector < double > fastjets_dmerge; + std::sort(fastjets.begin(), fastjets.end(), [](const PseudoJet & a, const PseudoJet & b) -> bool { return a.E() > b.E(); }); + for (size_t i = 0; i < IN.N; i++) { + fastjets_dmerge.push_back(cs.exclusive_dmerge_max(i)); + } + + std::cout << std::fixed << std::setw(11) << std::setprecision(6); + std::cout<<"Input particles:"<