Changeset 0e7d64a in git for modules

Timestamp:

Aug 16, 2019, 11:24:21 AM (5 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, master

Children:

7c9f3da

Parents:

7692efc (diff), e39abb4 (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:

fixed Makefile conflict

Location:

modules

Files:

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

modules/ModulesLinkDef.h

@@ -41 +41 @@
 #include "modules/DenseTrackFilter.h"
 #include "modules/Calorimeter.h"
+#include "modules/DualReadoutCalorimeter.h"
 #include "modules/OldCalorimeter.h"
 #include "modules/Isolation.h"
@@ -94 +95 @@
 #pragma link C++ class DenseTrackFilter+;
 #pragma link C++ class Calorimeter+;
+#pragma link C++ class DualReadoutCalorimeter+;
 #pragma link C++ class OldCalorimeter+;
 #pragma link C++ class Isolation+;