Changeset 5a989eb in git

Timestamp:

Jun 5, 2016, 3:01:22 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

c4a72a0

Parents:

3873449 (diff), 67a6d8a (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

Files:

• Makefile (modified) (2 diffs)
• external/PUPPI/AlgoObj.hh (added)
• external/PUPPI/PuppiAlgo.cc (added)
• external/PUPPI/PuppiAlgo.hh (added)
• external/PUPPI/PuppiContainer.cc (added)
• external/PUPPI/PuppiContainer.hh (added)
• external/PUPPI/RecoObj2.hh (added)

Makefile

@@ -1001 +1001 @@
 endif
 
+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/PUPPI/puppiCleanContainer.$(ObjSuf): \
         external/PUPPI/puppiCleanContainer.$(SrcSuf) \
@@ -1363 +1370 @@
         classes/DelphesFormula.h
 FASTJET_OBJ +=  \
+        tmp/external/PUPPI/PuppiAlgo.$(ObjSuf) \
+        tmp/external/PUPPI/PuppiContainer.$(ObjSuf) \
         tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
         tmp/external/fastjet/AreaDefinition.$(ObjSuf) \