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/Triangulation.hh

    rf6b6ee7 r49234af  
    33#define __FASTJET_TRIANGULATION__
    44
    5 //STARTHEADER
    6 // $Id: Triangulation.hh 2595 2011-09-23 09:05:04Z salam $
     5//FJSTARTHEADER
     6// $Id: Triangulation.hh 3433 2014-07-23 08:17:03Z salam $
    77//
    8 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     8// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    99//
    1010//----------------------------------------------------------------------
     
    1717//
    1818//  The algorithms that underlie FastJet have required considerable
    19 //  development and are described in hep-ph/0512210. If you use
     19//  development. They are described in the original FastJet paper,
     20//  hep-ph/0512210 and in the manual, arXiv:1111.6097. If you use
    2021//  FastJet as part of work towards a scientific publication, please
    21 //  include a citation to the FastJet paper.
     22//  quote the version you use and include a citation to the manual and
     23//  optionally also to hep-ph/0512210.
    2224//
    2325//  FastJet is distributed in the hope that it will be useful,
     
    2931//  along with FastJet. If not, see <http://www.gnu.org/licenses/>.
    3032//----------------------------------------------------------------------
    31 //ENDHEADER
     33//FJENDHEADER
    3234
    3335
Note: See TracChangeset for help on using the changeset viewer.