Fork me on GitHub

Ignore:
Timestamp:
Dec 9, 2014, 1:27:13 PM (10 years ago)
Author:
Michele <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
37deb3b, 9e991f8
Parents:
f6b6ee7 (diff), e7e90df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'TestFastJet310b1'

File:
1 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/internal/ClusterSequence_N2.icc

    rf6b6ee7 r49234af  
    44#include "fastjet/ClusterSequence.hh"
    55
    6 //STARTHEADER
     6//FJSTARTHEADER
    77// $Id: ClusterSequence_N2.cc 1351 2009-01-09 18:03:03Z salam $
    88//
    9 // Copyright (c) 2005-2009, Matteo Cacciari, Gavin Salam and Gregory Soyez
     9// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    1010//
    1111//----------------------------------------------------------------------
    … …  
    1818//
    1919//  The algorithms that underlie FastJet have required considerable
    20 //  development and are described in hep-ph/0512210. If you use
     20//  development. They are described in the original FastJet paper,
     21//  hep-ph/0512210 and in the manual, arXiv:1111.6097. If you use
    2122//  FastJet as part of work towards a scientific publication, please
    22 //  include a citation to the FastJet paper.
     23//  quote the version you use and include a citation to the manual and
     24//  optionally also to hep-ph/0512210.
    2325//
    2426//  FastJet is distributed in the hope that it will be useful,
    … …  
    2830//
    2931//  You should have received a copy of the GNU General Public License
    30 //  along with FastJet; if not, write to the Free Software
    31 //  Foundation, Inc.:
    32 //      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     32//  along with FastJet. If not, see <http://www.gnu.org/licenses/>.
    3333//----------------------------------------------------------------------
    34 //ENDHEADER
     34//FJENDHEADER
    3535
    3636//----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.