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/ClusterSequenceAreaBase.cc

    rf6b6ee7 r49234af  
    11
    2 //STARTHEADER
    3 // $Id$
    4 //
    5 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     2//FJSTARTHEADER
     3// $Id: ClusterSequenceAreaBase.cc 3433 2014-07-23 08:17:03Z salam $
     4//
     5// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    66//
    77//----------------------------------------------------------------------
    … …  
    1414//
    1515//  The algorithms that underlie FastJet have required considerable
    16 //  development and are described in hep-ph/0512210. If you use
     16//  development. They are described in the original FastJet paper,
     17//  hep-ph/0512210 and in the manual, arXiv:1111.6097. If you use
    1718//  FastJet as part of work towards a scientific publication, please
    18 //  include a citation to the FastJet paper.
     19//  quote the version you use and include a citation to the manual and
     20//  optionally also to hep-ph/0512210.
    1921//
    2022//  FastJet is distributed in the hope that it will be useful,
    … …  
    2628//  along with FastJet. If not, see <http://www.gnu.org/licenses/>.
    2729//----------------------------------------------------------------------
    28 //ENDHEADER
     30//FJENDHEADER
    2931
    3032
Note: See TracChangeset for help on using the changeset viewer.