Fork me on GitHub

Changeset f688c89 in git for external/PUPPI/PuppiAlgo.cc


Ignore:
Timestamp:
Jun 21, 2016, 4:37:17 PM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
52315d4
Parents:
04290b1 (diff), 659c7b6 (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 'master' into dev_01

File:
1 edited

Legend:

Unmodified
Added
Removed

  • external/PUPPI/PuppiAlgo.cc

    r04290b1 rf688c89  
    1 //#include "FWCore/ParameterSet/interface/ParameterSet.h"
    2 //#include "FWCore/PythonParameterSet/interface/MakeParameterSets.h"
    31#include "PuppiAlgo.hh"
    4 #include "external/fastjet/internal/base.hh"
    52#include "Math/QuantFuncMathCore.h"
    63#include "Math/SpecFuncMathCore.h"
Note: See TracChangeset for help on using the changeset viewer.