Changeset 5175bbe in git

Timestamp:

Aug 23, 2016, 11:18:29 AM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

7611cb9

Parents:

480f9ed (diff), 5198eed (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' of ​https://github.com/delphes/delphes

Files:

• CMakeLists.txt (modified) (1 diff)
• cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl (added)
• cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_200PU.tcl (added)
• cards/CMS_PhaseII/trackMomentumResolution_PIX4022.tcl (added)
• cards/CMS_PhaseII/trackMomentumResolution_vs_p_PIX4022.tcl (added)
• external/CMakeLists.txt (modified) (1 diff)
• external/PUPPI/CMakeLists.txt (added)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/RecoPuFilter.cc (added)
• modules/RecoPuFilter.h (added)

CMakeLists.txt

@@ -41 +41 @@
   $<TARGET_OBJECTS:tcl>
   $<TARGET_OBJECTS:Hector>
+  $<TARGET_OBJECTS:PUPPI>
 )
 

external/CMakeLists.txt

@@ -3 +3 @@
 add_subdirectory(Hector)
 add_subdirectory(tcl)
+add_subdirectory(PUPPI)

modules/ModulesLinkDef.h

@@ -58 +58 @@
 #include "modules/StatusPidFilter.h"
 #include "modules/PdgCodeFilter.h"
+#include "modules/RecoPuFilter.h"
 #include "modules/Cloner.h"
 #include "modules/Weighter.h"
@@ -103 +104 @@
 #pragma link C++ class StatusPidFilter+;
 #pragma link C++ class PdgCodeFilter+;
+#pragma link C++ class RecoPuFilter+;
 #pragma link C++ class Cloner+;
 #pragma link C++ class Weighter+;