Changeset 0afc0fc in git for Makefile

Timestamp:

Jun 1, 2016, 7:41:02 PM (9 years ago)

Author:

Philip <violatingcp@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

7b45ff5, ee0763a

Parents:

0a836f2

Message:

added the new Puppi

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -955 +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): \
@@ -1309 +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) \
@@ -1742 +1745 @@
 
 modules/RunPUPPI.h: \
-        classes/DelphesModule.h
+        classes/DelphesModule.h \
+        external/PUPPI/PuppiContainer.hh
         @touch $@
 
@@ -1864 +1868 @@
         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 $@