Fork me on GitHub

Changeset 5a989eb in git


Ignore:
Timestamp:
Jun 5, 2016, 3:01:22 PM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
c4a72a0
Parents:
3873449 (diff), 67a6d8a (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

Files:
6 added
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r3873449 r5a989eb  
    10011001endif
    10021002
     1003tmp/external/PUPPI/PuppiAlgo.$(ObjSuf): \
     1004        external/PUPPI/PuppiAlgo.$(SrcSuf) \
     1005        external/fastjet/internal/base.hh
     1006tmp/external/PUPPI/PuppiContainer.$(ObjSuf): \
     1007        external/PUPPI/PuppiContainer.$(SrcSuf) \
     1008        external/fastjet/internal/base.hh \
     1009        external/fastjet/Selector.hh
    10031010tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
    10041011        external/PUPPI/puppiCleanContainer.$(SrcSuf) \
     
    13631370        classes/DelphesFormula.h
    13641371FASTJET_OBJ +=  \
     1372        tmp/external/PUPPI/PuppiAlgo.$(ObjSuf) \
     1373        tmp/external/PUPPI/PuppiContainer.$(ObjSuf) \
    13651374        tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
    13661375        tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
Note: See TracChangeset for help on using the changeset viewer.