Fork me on GitHub

Changeset 7b45ff5 in git for Makefile


Ignore:
Timestamp:
Jun 2, 2016, 3:11:01 PM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
0e11b5c, 7d55e69a, a9c67b3a
Parents:
0a836f2 (diff), 0afc0fc (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 pull request #23 from violatingcp/puppi_cms200

added the new Puppi tune on CMS at 200 PU

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r0a836f2 r7b45ff5  
    955955endif
    956956
    957 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
    958         external/PUPPI/puppiCleanContainer.$(SrcSuf) \
     957tmp/external/PUPPI/PuppiAlgo.$(ObjSuf): \
     958        external/PUPPI/PuppiAlgo.$(SrcSuf) \
     959        external/fastjet/internal/base.hh
     960tmp/external/PUPPI/PuppiContainer.$(ObjSuf): \
     961        external/PUPPI/PuppiContainer.$(SrcSuf) \
     962        external/fastjet/internal/base.hh \
    959963        external/fastjet/Selector.hh
    960964tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
     
    13091313        modules/RunPUPPI.$(SrcSuf) \
    13101314        modules/RunPUPPI.h \
    1311         external/PUPPI/puppiCleanContainer.hh \
    1312         external/PUPPI/RecoObj.hh \
    1313         external/PUPPI/puppiParticle.hh \
    1314         external/PUPPI/puppiAlgoBin.hh \
     1315        external/PUPPI/RecoObj2.hh \
     1316        external/PUPPI/AlgoObj.hh \
    13151317        classes/DelphesClasses.h \
    13161318        classes/DelphesFactory.h \
    13171319        classes/DelphesFormula.h
    13181320FASTJET_OBJ +=  \
    1319         tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
     1321        tmp/external/PUPPI/PuppiAlgo.$(ObjSuf) \
     1322        tmp/external/PUPPI/PuppiContainer.$(ObjSuf) \
    13201323        tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
    13211324        tmp/external/fastjet/BasicRandom.$(ObjSuf) \
     
    17421745
    17431746modules/RunPUPPI.h: \
    1744         classes/DelphesModule.h
     1747        classes/DelphesModule.h \
     1748        external/PUPPI/PuppiContainer.hh
    17451749        @touch $@
    17461750
     
    18641868        external/fastjet/AreaDefinition.hh \
    18651869        external/fastjet/ClusterSequenceAreaBase.hh
    1866         @touch $@
    1867 
    1868 external/PUPPI/puppiCleanContainer.hh: \
    1869         external/PUPPI/RecoObj.hh \
    1870         external/PUPPI/puppiParticle.hh \
    1871         external/PUPPI/puppiAlgoBin.hh \
    1872         external/fastjet/internal/base.hh \
    1873         external/fastjet/PseudoJet.hh
    18741870        @touch $@
    18751871
Note: See TracChangeset for help on using the changeset viewer.