Changeset 667a02a in git for Makefile

Timestamp:

Jun 8, 2018, 3:23:13 PM (7 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

e57c062

Parents:

001ee95 (diff), 17d0ab8 (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) (3 diffs)

Makefile

@@ -1295 +1295 @@
 tmp/external/fastjet/contribs/Nsubjettiness/XConePlugin.$(ObjSuf): \
         external/fastjet/contribs/Nsubjettiness/XConePlugin.$(SrcSuf)
+tmp/external/fastjet/contribs/RecursiveTools/BottomUpSoftDrop.$(ObjSuf): \
+        external/fastjet/contribs/RecursiveTools/BottomUpSoftDrop.$(SrcSuf) \
+        external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh \
+        external/fastjet/Selector.hh \
+        external/fastjet/config.h
+tmp/external/fastjet/contribs/RecursiveTools/IteratedSoftDrop.$(ObjSuf): \
+        external/fastjet/contribs/RecursiveTools/IteratedSoftDrop.$(SrcSuf)
 tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf): \
         external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(SrcSuf) \
@@ -1301 +1308 @@
 tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf): \
         external/fastjet/contribs/RecursiveTools/Recluster.$(SrcSuf)
+tmp/external/fastjet/contribs/RecursiveTools/RecursiveSoftDrop.$(ObjSuf): \
+        external/fastjet/contribs/RecursiveTools/RecursiveSoftDrop.$(SrcSuf) \
+        external/fastjet/ClusterSequence.hh
 tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf): \
         external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(SrcSuf) \
@@ -1535 +1545 @@
         tmp/external/fastjet/contribs/Nsubjettiness/TauComponents.$(ObjSuf) \
         tmp/external/fastjet/contribs/Nsubjettiness/XConePlugin.$(ObjSuf) \
+        tmp/external/fastjet/contribs/RecursiveTools/BottomUpSoftDrop.$(ObjSuf) \
+        tmp/external/fastjet/contribs/RecursiveTools/IteratedSoftDrop.$(ObjSuf) \
         tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf) \
         tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf) \
+        tmp/external/fastjet/contribs/RecursiveTools/RecursiveSoftDrop.$(ObjSuf) \
         tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf) \
         tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf) \