Changes in Makefile [e8070b6:6f9baba] in git

File:

• Makefile (modified) (13 diffs)

Makefile

@@ -29 +29 @@
 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
 endif
-OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsCommon -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
+OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
 endif
 
@@ -257 +257 @@
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
+        classes/DelphesLHEFReader.h \
         external/ExRootAnalysis/ExRootTreeWriter.h \
         external/ExRootAnalysis/ExRootTreeBranch.h \
@@ -337 +338 @@
         modules/Weighter.h \
         modules/Hector.h \
+        modules/RunPUPPI.h \
         modules/ExampleModule.h
 ModulesDict$(PcmSuf): \
@@ -521 +523 @@
 tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \
         external/Hector/H_VerticalQuadrupole.$(SrcSuf)
+tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
+        external/PUPPI/puppiCleanContainer.$(SrcSuf) \
+        external/fastjet/Selector.hh
 tmp/modules/AngularSmearing.$(ObjSuf): \
         modules/AngularSmearing.$(SrcSuf) \
@@ -730 +735 @@
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
-        classes/DelphesFormula.h \
+        classes/DelphesTF2.h \
         classes/DelphesPileUpReader.h \
         external/ExRootAnalysis/ExRootResult.h \
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/RunPUPPI.$(ObjSuf): \
+        modules/RunPUPPI.$(SrcSuf) \
+        modules/RunPUPPI.h \
+        external/PUPPI/puppiCleanContainer.hh \
+        external/PUPPI/RecoObj.hh \
+        external/PUPPI/puppiParticle.hh \
+        external/PUPPI/puppiAlgoBin.hh \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h
 tmp/modules/SimpleCalorimeter.$(ObjSuf): \
         modules/SimpleCalorimeter.$(SrcSuf) \
@@ -869 +884 @@
         tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \
         tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \
+        tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
         tmp/modules/AngularSmearing.$(ObjSuf) \
         tmp/modules/BTagging.$(ObjSuf) \
@@ -891 +907 @@
         tmp/modules/PileUpJetID.$(ObjSuf) \
         tmp/modules/PileUpMerger.$(ObjSuf) \
+        tmp/modules/RunPUPPI.$(ObjSuf) \
         tmp/modules/SimpleCalorimeter.$(ObjSuf) \
         tmp/modules/StatusPidFilter.$(ObjSuf) \
@@ -1080 +1097 @@
 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)
@@ -1213 +1242 @@
         external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
         external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
-        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
+        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh \
+        external/fastjet/tools/Filter.hh \
+        external/fastjet/tools/Pruner.hh \
+        external/fastjet/contribs/RecursiveTools/SoftDrop.hh
 tmp/modules/FastJetGridMedianEstimator.$(ObjSuf): \
         modules/FastJetGridMedianEstimator.$(SrcSuf) \
@@ -1285 +1317 @@
         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) \
@@ -1541 +1577 @@
         @touch $@
 
-external/fastjet/Selector.hh: \
-        external/fastjet/PseudoJet.hh \
-        external/fastjet/RangeDefinition.hh
-        @touch $@
-
 external/fastjet/internal/Dnn2piCylinder.hh: \
         external/fastjet/internal/DynamicNearestNeighbours.hh \
         external/fastjet/internal/DnnPlane.hh \
         external/fastjet/internal/numconsts.hh
+        @touch $@
+
+external/fastjet/Selector.hh: \
+        external/fastjet/PseudoJet.hh \
+        external/fastjet/RangeDefinition.hh
         @touch $@
 
@@ -1639 +1675 @@
         @touch $@
 
+modules/RunPUPPI.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 modules/Cloner.h: \
         classes/DelphesModule.h
@@ -1757 +1797 @@
         external/fastjet/AreaDefinition.hh \
         external/fastjet/ClusterSequenceAreaBase.hh
+        @touch $@
+
+external/PUPPI/puppiCleanContainer.hh: \
+        external/PUPPI/RecoObj.hh \
+        external/PUPPI/puppiParticle.hh \
+        external/PUPPI/puppiAlgoBin.hh \
+        external/fastjet/internal/base.hh \
+        external/fastjet/PseudoJet.hh
         @touch $@