Changeset 37deb3b in git for modules

Timestamp:

Dec 9, 2014, 1:40:26 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

9e991f8

Parents:

49234af (diff), ba7fc1e (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 'Delphes4LHCb' of ​https://github.com/selvaggi/delphes into selvaggi-Delphes4LHCb

Conflicts:

Makefile

Location:

modules

Files:

• IdentificationMap.cc (added)
• IdentificationMap.h (added)
• ModulesLinkDef.h (modified) (3 diffs)

modules/ModulesLinkDef.h

@@ -22 +22 @@
  *  Lists classes to be included in cint dicitonary
  *
- *  $Date$
- *  $Revision$
+ *  $Date: 2014-04-16 17:17:35 +0200 (Wed, 16 Apr 2014) $
+ *  $Revision: 1369 $
  *
  *
@@ -36 +36 @@
 #include "modules/ParticlePropagator.h"
 #include "modules/Efficiency.h"
+#include "modules/IdentificationMap.h"
 #include "modules/EnergySmearing.h"
 #include "modules/MomentumSmearing.h"
@@ -75 +76 @@
 #pragma link C++ class ParticlePropagator+;
 #pragma link C++ class Efficiency+;
+#pragma link C++ class IdentificationMap+;
 #pragma link C++ class EnergySmearing+;
 #pragma link C++ class MomentumSmearing+;