Fork me on GitHub

Changeset 4a0d9d5 in git for Makefile


Ignore:
Timestamp:
Jun 6, 2016, 4:47:16 PM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
bd0a1aa
Parents:
4406bf8 (diff), 740d430 (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
  • Makefile

    r4406bf8 r4a0d9d5  
    13621362        modules/RunPUPPI.$(SrcSuf) \
    13631363        modules/RunPUPPI.h \
    1364         external/PUPPI/puppiCleanContainer.hh \
    1365         external/PUPPI/RecoObj.hh \
    1366         external/PUPPI/puppiParticle.hh \
    1367         external/PUPPI/puppiAlgoBin.hh \
     1364        external/PUPPI/RecoObj2.hh \
     1365        external/PUPPI/AlgoObj.hh \
    13681366        classes/DelphesClasses.h \
    13691367        classes/DelphesFactory.h \
     
    18011799
    18021800modules/RunPUPPI.h: \
    1803         classes/DelphesModule.h
     1801        classes/DelphesModule.h \
     1802        external/PUPPI/PuppiContainer.hh
    18041803        @touch $@
    18051804
     
    19331932        external/fastjet/AreaDefinition.hh \
    19341933        external/fastjet/ClusterSequenceAreaBase.hh
    1935         @touch $@
    1936 
    1937 external/PUPPI/puppiCleanContainer.hh: \
    1938         external/PUPPI/RecoObj.hh \
    1939         external/PUPPI/puppiParticle.hh \
    1940         external/PUPPI/puppiAlgoBin.hh \
    1941         external/fastjet/internal/base.hh \
    1942         external/fastjet/PseudoJet.hh
    19431934        @touch $@
    19441935
Note: See TracChangeset for help on using the changeset viewer.