Changeset 973b92a in git for Makefile

Timestamp:

Oct 9, 2015, 2:47:38 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8713dee

Parents:

f118021

Message:

update FastJet library to 3.1.3 and Nsubjettiness library to 2.2.1

File:

• Makefile (modified) (6 diffs)

Makefile

@@ -1105 +1105 @@
         external/fastjet/Voronoi.$(SrcSuf) \
         external/fastjet/internal/Voronoi.hh
-tmp/external/fastjet/contribs/Nsubjettiness/AxesFinder.$(ObjSuf): \
-        external/fastjet/contribs/Nsubjettiness/AxesFinder.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf): \
-        external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(SrcSuf)
+tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf): \
+        external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(SrcSuf)
+tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf): \
+        external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(SrcSuf)
+tmp/external/fastjet/contribs/Nsubjettiness/MeasureDefinition.$(ObjSuf): \
+        external/fastjet/contribs/Nsubjettiness/MeasureDefinition.$(SrcSuf)
 tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf): \
         external/fastjet/contribs/Nsubjettiness/Njettiness.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf): \
-        external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(SrcSuf)
 tmp/external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(ObjSuf): \
         external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(SrcSuf)
 tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf): \
         external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf): \
-        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(SrcSuf)
+tmp/external/fastjet/contribs/Nsubjettiness/TauComponents.$(ObjSuf): \
+        external/fastjet/contribs/Nsubjettiness/TauComponents.$(SrcSuf)
+tmp/external/fastjet/contribs/Nsubjettiness/XConePlugin.$(ObjSuf): \
+        external/fastjet/contribs/Nsubjettiness/XConePlugin.$(SrcSuf)
 tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf): \
         external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(SrcSuf) \
@@ -1264 +1266 @@
         external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
         external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
-        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh \
+        external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh \
         external/fastjet/tools/Filter.hh \
         external/fastjet/tools/Pruner.hh \
@@ -1290 +1292 @@
         external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
         external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
-        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
-        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
+        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh
 tmp/modules/RunPUPPI.$(ObjSuf): \
         modules/RunPUPPI.$(SrcSuf) \
@@ -1343 +1344 @@
         tmp/external/fastjet/TilingExtent.$(ObjSuf) \
         tmp/external/fastjet/Voronoi.$(ObjSuf) \
-        tmp/external/fastjet/contribs/Nsubjettiness/AxesFinder.$(ObjSuf) \
-        tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf) \
+        tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf) \
+        tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf) \
+        tmp/external/fastjet/contribs/Nsubjettiness/MeasureDefinition.$(ObjSuf) \
         tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf) \
-        tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf) \
         tmp/external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(ObjSuf) \
         tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
-        tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf) \
+        tmp/external/fastjet/contribs/Nsubjettiness/TauComponents.$(ObjSuf) \
+        tmp/external/fastjet/contribs/Nsubjettiness/XConePlugin.$(ObjSuf) \
         tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf) \
         tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf) \
@@ -1703 +1705 @@
         @touch $@
 
+external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh: \
+        external/fastjet/PseudoJet.hh \
+        external/fastjet/JetDefinition.hh
+        @touch $@
+
 display/DelphesBranchElement.h: \
         display/DelphesCaloData.h
@@ -1852 +1859 @@
 modules/BTagging.h: \
         classes/DelphesModule.h
-        @touch $@
-
-external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh: \
-        external/fastjet/PseudoJet.hh \
-        external/fastjet/JetDefinition.hh
         @touch $@