Changeset 624dc48 in git for modules

Timestamp:

Dec 9, 2014, 4:40:27 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

17826f2, f355a2c

Parents:

2eb25b1 (diff), acf622f (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 github.com:delphes/delphes

Conflicts:

Makefile
modules/ModulesLinkDef.h

Location:

modules

Files:

• AngularSmearing.cc (added)
• AngularSmearing.h (added)
• ModulesLinkDef.h (modified) (2 diffs)

modules/ModulesLinkDef.h

@@ -32 +32 @@
 #include "modules/Delphes.h"
 
+#include "modules/AngularSmearing.h"
 #include "modules/ParticlePropagator.h"
 #include "modules/Efficiency.h"
@@ -70 +71 @@
 #pragma link C++ class Delphes+;
 
+#pragma link C++ class AngularSmearing+;
 #pragma link C++ class ParticlePropagator+;
 #pragma link C++ class Efficiency+;