Fork me on GitHub

Ignore:
Timestamp:
Sep 2, 2016, 3:46:14 PM (8 years ago)
Author:
GitHub <noreply@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
fa068d3
Parents:
ec5e04b (diff), 23389ff (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.
git-author:
Pavel Demin <pavel-demin@…> (09/02/16 15:46:14)
git-committer:
GitHub <noreply@…> (09/02/16 15:46:14)
Message:

Merge pull request #32 from delphes/dev_01

Dev 01

File:
1 edited

Legend:

Unmodified
Added
Removed
  • external/fastjet/contribs/Nsubjettiness/MeasureDefinition.cc

    rec5e04b rb9ae4c3  
    55//  Jesse Thaler, Ken Van Tilburg, Christopher K. Vermilion, and TJ Wilkason
    66//
    7 //  $Id: MeasureDefinition.cc 819 2015-06-12 21:23:24Z jthaler $
     7//  $Id: MeasureDefinition.cc 946 2016-06-14 19:11:27Z jthaler $
    88//----------------------------------------------------------------------
    99// This file is part of FastJet contrib.
     
    524524      old_axes[k].set_rap( seedAxes[k].rap() );
    525525      old_axes[k].set_phi( seedAxes[k].phi() );
     526      old_axes[k].set_mom( seedAxes[k].modp()  );
    526527   }
    527528   
Note: See TracChangeset for help on using the changeset viewer.