Changeset e024347 in git

Timestamp:

Apr 23, 2015, 5:40:48 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

486c4c3

Parents:

042c7b3 (diff), 4f34105 (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' of github.com:delphes/delphes

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -1080 +1080 @@
 tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf): \
         external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(SrcSuf)
-tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf): \
-        external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(SrcSuf) \
-        external/fastjet/JetDefinition.hh \
-        external/fastjet/ClusterSequenceAreaBase.hh
-tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf): \
-        external/fastjet/contribs/RecursiveTools/Recluster.$(SrcSuf)
-tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf): \
-        external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(SrcSuf) \
-        external/fastjet/JetDefinition.hh \
-        external/fastjet/ClusterSequenceAreaBase.hh
-tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf): \
-        external/fastjet/contribs/RecursiveTools/SoftDrop.$(SrcSuf)
 tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf): \
         external/fastjet/contribs/SoftKiller/SoftKiller.$(SrcSuf)
@@ -1297 +1285 @@
         tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
         tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf) \
-        tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf) \
-        tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf) \
-        tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf) \
-        tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf) \
         tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf) \
         tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf) \