Fork me on GitHub

Ignore:
Timestamp:
Jun 22, 2016, 10:42:37 AM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
18a7403
Parents:
e0f8f99 (diff), f688c89 (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 'dev_01' of github.com:delphes/delphes into dev_01

File:
1 edited

Legend:

Unmodified
Added
Removed

  • external/PUPPI/PuppiContainer.cc

    re0f8f99 r52315d4  
    11#include "PuppiContainer.hh"
    2 #include "external/fastjet/internal/base.hh"
    3 #include "external/fastjet/Selector.hh"
    4 //#include "external/fastjet/FunctionOfPseudoJet.hh"
     2#include "fastjet/Selector.hh"
    53#include "Math/ProbFunc.h"
    64#include "TMath.h"
Note: See TracChangeset for help on using the changeset viewer.