Changeset a9c67b3a in git for Makefile

Timestamp:

Jun 4, 2016, 8:10:24 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4dd5358

Parents:

3c46e17 (diff), 7b45ff5 (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' into dev_01

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -1001 +1001 @@
 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 +1359 @@
         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) \
@@ -1792 +1795 @@
 
 modules/RunPUPPI.h: \
-        classes/DelphesModule.h
+        classes/DelphesModule.h \
+        external/PUPPI/PuppiContainer.hh
         @touch $@
 
@@ -1924 +1928 @@
         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 $@