Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/ValenciaPlugin.hh
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/ValenciaPlugin.hh (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/ValenciaPlugin.hh (revision 1204)
@@ -0,0 +1,101 @@
+// $Id$
+//
+// Copyright (c) 2014, Marcel Vos and Ignacio Garcia
+//
+//----------------------------------------------------------------------
+// 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_VALENCIAJETALGORITHM_HH__
+#define __FASTJET_CONTRIB_VALENCIAJETALGORITHM_HH__
+
+#include
+#include "fastjet/JetDefinition.hh"
+#include "fastjet/ClusterSequence.hh"
+FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh
+
+namespace contrib{
+
+//----------------------------------------------------------------------
+//
+/// ValenciaPlugin is a plugin for fastjet (v2.4 upwards)
+///
+/// It implements the Valencia algorithm, as defined in
+/// Boronat, Garcia, Vos,
+/// A new jet reconstruction algorithm for lepton colliders
+///
+///
+class ValenciaPlugin : public JetDefinition::Plugin {
+public:
+
+ /// Constructor for the Valencia Plugin class.
+ /// Three floating point arguments are specified to set the parameters
+ /// the radius parameter R has the usual meaning,
+ /// the clustering order beta (beta = 1 yields kt-style clustering,
+ /// beta = 0 purely angular clustering a la C/A and beta = -1
+ /// clusters hard, collinear radiation first, like anti-kt),
+ /// and gamma, that governs the shrinking jet size in the forward region
+ ValenciaPlugin (double R, double beta, double gamma) : _R(R), _beta(beta), _gamma(gamma){}
+
+ /// Constructor for the Valencia Plugin class.
+ /// If two arguments are specified to set the parameters
+ /// the gamma exponent is set equal to beta
+ ValenciaPlugin (double R, double beta) : _R(R), _beta(beta), _gamma(beta){}
+
+ /// copy constructor
+ ValenciaPlugin (const ValenciaPlugin & plugin) {
+ *this = plugin;
+ }
+
+ // the things that are required by base class
+ virtual std::string description () const;
+ virtual void run_clustering(ClusterSequence &) const;
+
+ /// the plugin mechanism's standard way of accessing the jet radius.
+ /// This must be set to return something sensible, even if R
+ /// does not make sense for this algorithm!
+ virtual double R() const {return _R;}
+
+ // the Valencia algorithm has a second parameter beta that governs
+ // the exponent of the energy in the inter-particle and beam distance
+ // criteria, and thus determines the clustering order
+ virtual double beta() const {return _beta;}
+
+ // the Valencia algorithm has a third parameter gamma that governs
+ // the exponent of the sin(theta) in the beam distance
+ // and thus the shrinking of the jet size in the forward region
+ virtual double gamma() const {return _gamma;}
+
+
+
+ /// avoid the warning whenever the user requests "exclusive" jets
+ /// from the cluster sequence
+ virtual bool exclusive_sequence_meaningful() const {return true;}
+
+private:
+ double _R;
+ double _beta;
+ double _gamma;
+};
+
+
+
+
+} // namespace contrib
+
+FASTJET_END_NAMESPACE
+
+#endif // __FASTJET_CONTRIB_VALENCIAJETALGORITHM_HH__
Property changes on: contrib/contribs/ValenciaPlugin/tags/2.0.0/ValenciaPlugin.hh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/example.cc
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/example.cc (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/example.cc (revision 1204)
@@ -0,0 +1,125 @@
+//----------------------------------------------------------------------
+// Example on how to use this contribution
+//
+// run it with
+// ./example < ../data/single-event.dat
+//----------------------------------------------------------------------
+//
+// Copyright (c) 2014-, Marcel Vos and Ignacio Garcia
+//
+//----------------------------------------------------------------------
+// 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
+#include
+
+#include "fastjet/JetDefinition.hh"
+#include "fastjet/PseudoJet.hh"
+#include "fastjet/Selector.hh"
+#include "ValenciaPlugin.hh"
+#include "fastjet/EECambridgePlugin.hh"
+
+
+using namespace std;
+using namespace fastjet;
+
+void read_event(vector &full_event);
+
+//----------------------------------------------------------------------
+int main(){
+ // example for the creation and execution of the fastjet plugin
+ // for the Valencia jet algorithm
+ //
+ // the algorithm is intended for e+e- collisions, but can also be run
+ // on the simulated LHC data that ship with the fjcontrib area
+ // ./example ../data/Pythia-Zp2jets-lhc-pileup-1ev.dat
+ //
+ // read in input particles
+ //----------------------------------------------------------
+ vector full_event;
+ read_event(full_event);
+ full_event = SelectorAbsRapMax(4.0)(full_event);
+
+ // create the jet definition using the plugin mechanism
+ //----------------------------------------------------------
+ fastjet::contrib::ValenciaPlugin * vlc_plugin = new fastjet::contrib::ValenciaPlugin(1.2, 0.8);
+
+ fastjet::JetDefinition jet_def(vlc_plugin);
+ // do the clustering and get the jets
+ // only exclusive clustering is supported
+ //-----------------------------------------------------------
+ ClusterSequence clust_seq(full_event, jet_def);
+
+ vector jets = clust_seq.inclusive_jets(20.);
+
+ cout << "hard jets (pT > 20 GeV) in inclusive clustering " << endl;
+ for (unsigned int i=0; i> px >> py >> pz >> E;
+ PseudoJet particle(px,py,pz,E);
+
+ // push event onto back of full_event vector
+ full_event.push_back(particle);
+ }
+
+}
Property changes on: contrib/contribs/ValenciaPlugin/tags/2.0.0/example.cc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/AUTHORS
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/AUTHORS (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/AUTHORS (revision 1204)
@@ -0,0 +1,7 @@
+The ValenciaJetAlgorithm FastJet contrib was written and is maintained and developed by: Ignacio Garcia Garcia, Marcel Vos, IFIC (UVEG/CSIC) Valencia, Spain
+
+Acknowledging suggestions by Gavin P. Salam (CERN) and J. Thaler (MIT)
+
+A preprint motivating the algorithm and describing its performance is available on: "A new jet algorithm for lepton colliders", arXiv:1404.4294 (submitted to PLB)
+
+Please contact: marcel.vos@ific.uv.es for questions, queries and comments
Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/VERSION
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/VERSION (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/VERSION (revision 1204)
@@ -0,0 +1 @@
+2.0.0
Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/ValenciaPlugin.cc
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/ValenciaPlugin.cc (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/ValenciaPlugin.cc (revision 1204)
@@ -0,0 +1,133 @@
+// $Id$
+//
+// Copyright (c) 2014, Marcel Vos and Ignacio Garcia
+//
+//----------------------------------------------------------------------
+// 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 "ValenciaPlugin.hh"
+#include "fastjet/NNH.hh"
+
+// strings and streams
+#include
+#include
+
+FASTJET_BEGIN_NAMESPACE // defined in fastjet/internal/base.hh
+
+namespace contrib{
+
+//----------------------------------------------------------------------
+/// class that contains the algorithm parameters R and beta
+// needed to run the Valencia algorithm
+class ValenciaInfo {
+
+public:
+ ValenciaInfo(double Ri, double betai, double gammai)
+ { R_ = Ri; beta_ = betai; gamma_ = gammai;}
+
+ double beta() { return beta_; }
+ double gamma() { return gamma_; }
+ double R() { return R_; }
+
+private:
+
+ double R_, beta_, gamma_;
+};
+
+class ValenciaBriefJet {
+public:
+ void init(const PseudoJet & jet, ValenciaInfo * info) {
+ double norm = 1.0/sqrt(jet.modp2());
+ // pseudo-jet information needed to calculate distance
+ nx = jet.px() * norm;
+ ny = jet.py() * norm;
+ nz = jet.pz() * norm;
+ E = jet.E();
+
+ // algorithm parameters needed in distance calculation
+ R = info->R();
+ beta = info->beta();
+
+ // beam distance
+ // E-to-the-2*beta times sin(polar angle)-to-the-2*gamma
+ if (E==0. || jet.perp()==0.) diB=0.;
+ diB = pow(E,2*beta) * pow(jet.perp()/E,2*info->gamma());
+ }
+
+ double distance(const ValenciaBriefJet * jet) const {
+ // inter-particle distance is similar to Durham and e+e- kt
+ // two differences:
+ // R is redefined for greater flexibility
+ // the energy is elevated to 2*beta
+ double dij = 1 - nx*jet->nx
+ - ny*jet->ny
+ - nz*jet->nz;
+
+ if (jet->E < E)
+ dij *= 2 * pow(jet->E,2*beta);
+ else
+ dij *= 2 * pow(E,2*beta);
+
+ dij/=pow(R,2);
+
+ return dij;
+ }
+
+ double beam_distance() const {
+ return diB;
+ }
+
+
+ double E, nx, ny, nz;
+ double diB;
+ double R, beta;
+};
+
+
+std::string ValenciaPlugin::description () const {
+ std::ostringstream desc;
+ desc << "Valencia plugin with R = " << R() << ", beta = " << beta() << " and gamma = " << gamma();
+ return desc.str();
+}
+
+void ValenciaPlugin::run_clustering(fastjet::ClusterSequence & cs) const {
+ int njets = cs.jets().size();
+ ValenciaInfo vinfo(R(),beta(),gamma());
+
+ NNH nnh(cs.jets(),&vinfo);
+
+ while (njets > 0) {
+ int i, j, k;
+ double dij = nnh.dij_min(i, j);
+
+ if (j >= 0) {
+ cs.plugin_record_ij_recombination(i, j, dij, k);
+ nnh.merge_jets(i, j, cs.jets()[k], k);
+ } else {
+
+ cs.plugin_record_iB_recombination(i, dij);
+ nnh.remove_jet(i);
+ }
+
+ njets--;
+ }
+}
+
+
+} // namespace contrib
+
+FASTJET_END_NAMESPACE
Property changes on: contrib/contribs/ValenciaPlugin/tags/2.0.0/ValenciaPlugin.cc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/example.ref
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/example.ref (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/example.ref (revision 1204)
@@ -0,0 +1,29 @@
+#--------------------------------------------------------------------------
+# FastJet release 3.0.6
+# M. Cacciari, G.P. Salam and G. Soyez
+# A software package for jet finding and analysis at colliders
+# http://fastjet.fr
+#
+# Please cite EPJC72(2012)1896 [arXiv:1111.6097] if you use this package
+# for scientific work and optionally PLB641(2006)57 [hep-ph/0512210].
+#
+# FastJet is provided without warranty under the terms of the GNU GPLv2.
+# It uses T. Chan's closest pair algorithm, S. Fortune's Voronoi code
+# and 3rd party plugin jet algorithms. See COPYING file for details.
+#--------------------------------------------------------------------------
+hard jets (pT > 20 GeV) in inclusive clustering
+pt = 982.835, rap = -0.866911
+pt = 909.442, rap = 0.223136
+pt = 73.1231, rap = -1.15058
+
+hard jets in exclusive N=4 clustering
+pt = 15.1466, rap = -2.04554
+pt = 73.1231, rap = -1.15058
+pt = 909.442, rap = 0.223136
+pt = 982.835, rap = -0.866911
+
+hard jets in exclusive clustering up to d = 500
+pt = 73.1231, rap = -1.15058
+pt = 909.442, rap = 0.223136
+pt = 982.835, rap = -0.866911
+
Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/ChangeLog
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/ChangeLog (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/ChangeLog (revision 1204)
@@ -0,0 +1,27 @@
+24-02-2015 Marcel Vos
+
+ *VERSION 2.0.0
+ Releasing first production version
+
+21-02-2015 Marcel Vos
+
+ *VERSION 2.0-devel
+
+ *ValenciaPlugin.cc
+ changed diB filled after in NNH record after discussion with FJ team
+ released 2.0-devel
+
+27-01-2015 Marcel Vos
+
+ *VERSION creating version 2.0-devel
+ ValenciaPlugin.cc
+ The algorithm now accepts three parameters:
+ R, the usual radius parameter
+ beta, the exponent of the energy in dij
+ gamma, the exponent of sin(theta) in diB
+
+13-03-2014 Marcel Vos
+
+ *VERSION first development version 1.0-devel
+ ValenciaPlugin.cc
+ Implements the algorithm described in arXiv:1404.4294
Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/COPYING
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/COPYING (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/COPYING (revision 1204)
@@ -0,0 +1,343 @@
+======================================================================
+======================================================================
+======================================================================
+ 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/ValenciaPlugin/tags/2.0.0/NEWS
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/NEWS (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/NEWS (revision 1204)
@@ -0,0 +1,5 @@
+24 February 2015: version 2.0.0
+21 February 2015: released 2.0-devel
+27 January 2015: creating version 2.0-devel
+13 March 2014: first development version 1.0-devel
+
Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/Makefile
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/Makefile (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/Makefile (revision 1204)
@@ -0,0 +1,77 @@
+# 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=ValenciaPlugin
+SRCS=ValenciaPlugin.cc
+EXAMPLES=example
+INSTALLED_HEADERS=ValenciaPlugin.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: lib$(NAME).a
+
+lib$(NAME).a: $(OBJS)
+ ar cru lib$(NAME).a $(OBJS)
+ ranlib lib$(NAME).a
+
+# 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 $@ $< -L. -l$(NAME) $(LDFLAGS)
+
+# check that everything went fine
+check: examples
+ @for prog in $(EXAMPLES); do\
+ $(check_script) $${prog} ../data/single-event.dat || exit 1; \
+ done
+ @echo "All tests successful"
+
+# cleaning the directory
+clean:
+ rm -f *~ *.o
+
+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
+ $(install_DIR) $(PREFIX)/lib
+ $(install_LIB) lib$(NAME).a $(PREFIX)/lib
+
+depend:
+ makedepend -Y -- -- $(SRCS) $(EXAMPLES_SRCS)
Index: contrib/contribs/ValenciaPlugin/tags/2.0.0/README
===================================================================
--- contrib/contribs/ValenciaPlugin/tags/2.0.0/README (revision 0)
+++ contrib/contribs/ValenciaPlugin/tags/2.0.0/README (revision 1204)
@@ -0,0 +1,2 @@
+The Valencia Jet algorithm provides robust performance at future lepton colliders with non-negligible background, while maintaining an inter-particle distance criterion based on energy and angle that matches closely the experimental practice at lepton colliders.
+