Changes in Makefile [b291b0b:0afc0fc] in git

File:

• Makefile (modified) (15 diffs)

Makefile

@@ -316 +316 @@
         modules/EnergySmearing.h \
         modules/MomentumSmearing.h \
-        modules/TrackSmearing.h \
         modules/ImpactParameterSmearing.h \
         modules/TimeSmearing.h \
@@ -339 +338 @@
         modules/StatusPidFilter.h \
         modules/PdgCodeFilter.h \
-        modules/BeamSpotFilter.h \
         modules/Cloner.h \
         modules/Weighter.h \
@@ -345 +343 @@
         modules/JetFlavorAssociation.h \
         modules/JetFakeParticle.h \
-        modules/VertexSorter.h \
-        modules/VertexFinder.h \
         modules/ExampleModule.h
 ModulesDict$(PcmSuf): \
@@ -550 +546 @@
         classes/DelphesFactory.h \
         classes/DelphesFormula.h
-tmp/modules/BeamSpotFilter.$(ObjSuf): \
-        modules/BeamSpotFilter.$(SrcSuf) \
-        modules/BeamSpotFilter.h \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesFormula.h \
-        external/ExRootAnalysis/ExRootResult.h \
-        external/ExRootAnalysis/ExRootFilter.h \
-        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/Calorimeter.$(ObjSuf): \
         modules/Calorimeter.$(SrcSuf) \
@@ -849 +836 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
-tmp/modules/TrackSmearing.$(ObjSuf): \
-        modules/TrackSmearing.$(SrcSuf) \
-        modules/TrackSmearing.h \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesFormula.h \
-        external/ExRootAnalysis/ExRootResult.h \
-        external/ExRootAnalysis/ExRootFilter.h \
-        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/TreeWriter.$(ObjSuf): \
         modules/TreeWriter.$(SrcSuf) \
@@ -874 +852 @@
         classes/DelphesFactory.h \
         classes/DelphesFormula.h \
-        external/ExRootAnalysis/ExRootResult.h \
-        external/ExRootAnalysis/ExRootFilter.h \
-        external/ExRootAnalysis/ExRootClassifier.h
-tmp/modules/VertexFinder.$(ObjSuf): \
-        modules/VertexFinder.$(SrcSuf) \
-        modules/VertexFinder.h \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesFormula.h \
-        classes/DelphesPileUpReader.h \
-        external/ExRootAnalysis/ExRootResult.h \
-        external/ExRootAnalysis/ExRootFilter.h \
-        external/ExRootAnalysis/ExRootClassifier.h
-tmp/modules/VertexSorter.$(ObjSuf): \
-        modules/VertexSorter.$(SrcSuf) \
-        modules/VertexSorter.h \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesFormula.h \
-        classes/DelphesPileUpReader.h \
         external/ExRootAnalysis/ExRootResult.h \
         external/ExRootAnalysis/ExRootFilter.h \
@@ -957 +915 @@
         tmp/modules/AngularSmearing.$(ObjSuf) \
         tmp/modules/BTagging.$(ObjSuf) \
-        tmp/modules/BeamSpotFilter.$(ObjSuf) \
         tmp/modules/Calorimeter.$(ObjSuf) \
         tmp/modules/Cloner.$(ObjSuf) \
@@ -989 +946 @@
         tmp/modules/TrackCountingTauTagging.$(ObjSuf) \
         tmp/modules/TrackPileUpSubtractor.$(ObjSuf) \
-        tmp/modules/TrackSmearing.$(ObjSuf) \
         tmp/modules/TreeWriter.$(ObjSuf) \
         tmp/modules/UniqueObjectFinder.$(ObjSuf) \
-        tmp/modules/VertexFinder.$(ObjSuf) \
-        tmp/modules/VertexSorter.$(ObjSuf) \
         tmp/modules/Weighter.$(ObjSuf)
 
@@ -1001 +955 @@
 endif
 
-tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
-        external/PUPPI/puppiCleanContainer.$(SrcSuf) \
+tmp/external/PUPPI/PuppiAlgo.$(ObjSuf): \
+        external/PUPPI/PuppiAlgo.$(SrcSuf) \
+        external/fastjet/internal/base.hh
+tmp/external/PUPPI/PuppiContainer.$(ObjSuf): \
+        external/PUPPI/PuppiContainer.$(SrcSuf) \
+        external/fastjet/internal/base.hh \
         external/fastjet/Selector.hh
 tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
@@ -1355 +1313 @@
         modules/RunPUPPI.$(SrcSuf) \
         modules/RunPUPPI.h \
-        external/PUPPI/puppiCleanContainer.hh \
-        external/PUPPI/RecoObj.hh \
-        external/PUPPI/puppiParticle.hh \
-        external/PUPPI/puppiAlgoBin.hh \
+        external/PUPPI/RecoObj2.hh \
+        external/PUPPI/AlgoObj.hh \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
         classes/DelphesFormula.h
 FASTJET_OBJ +=  \
-        tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
+        tmp/external/PUPPI/PuppiAlgo.$(ObjSuf) \
+        tmp/external/PUPPI/PuppiContainer.$(ObjSuf) \
         tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
         tmp/external/fastjet/BasicRandom.$(ObjSuf) \
@@ -1591 +1548 @@
         tmp/external/tcl/tclVar.$(ObjSuf)
 
-modules/TrackSmearing.h: \
-        classes/DelphesModule.h
-        @touch $@
-
 external/fastjet/ClusterSequence.hh: \
         external/fastjet/PseudoJet.hh \
@@ -1792 +1745 @@
 
 modules/RunPUPPI.h: \
-        classes/DelphesModule.h
+        classes/DelphesModule.h \
+        external/PUPPI/PuppiContainer.hh
         @touch $@
 
@@ -1851 +1805 @@
         @touch $@
 
-modules/VertexSorter.h: \
-        classes/DelphesModule.h \
-        classes/DelphesClasses.h
-        @touch $@
-
 modules/Delphes.h: \
         classes/DelphesModule.h
-        @touch $@
-
-modules/VertexFinder.h: \
-        classes/DelphesModule.h \
-        classes/DelphesClasses.h
         @touch $@
 
@@ -1926 +1870 @@
         @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 $@
-
 modules/BTagging.h: \
         classes/DelphesModule.h
@@ -2037 +1973 @@
 
 modules/FastJetFinder.h: \
-        classes/DelphesModule.h
-        @touch $@
-
-modules/BeamSpotFilter.h: \
         classes/DelphesModule.h
         @touch $@