Changeset 0e7d64a in git

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

Files:

• Makefile (modified) (4 diffs)
• cards/delphes_card_IDEA.tcl (added)
• modules/DualReadoutCalorimeter.cc (added)
• modules/DualReadoutCalorimeter.h (added)
• modules/ModulesLinkDef.h (modified) (2 diffs)

Makefile

@@ -413 +413 @@
         modules/DenseTrackFilter.h \
         modules/Calorimeter.h \
+        modules/DualReadoutCalorimeter.h \
         modules/OldCalorimeter.h \
         modules/Isolation.h \
@@ -714 +715 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootResult.h
+tmp/modules/DualReadoutCalorimeter.$(ObjSuf): \
+        modules/DualReadoutCalorimeter.$(SrcSuf) \
+        modules/DualReadoutCalorimeter.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/Efficiency.$(ObjSuf): \
         modules/Efficiency.$(SrcSuf) \
@@ -1119 +1129 @@
         tmp/modules/Delphes.$(ObjSuf) \
         tmp/modules/DenseTrackFilter.$(ObjSuf) \
+        tmp/modules/DualReadoutCalorimeter.$(ObjSuf) \
         tmp/modules/Efficiency.$(ObjSuf) \
         tmp/modules/EnergyScale.$(ObjSuf) \
@@ -2260 +2271 @@
         @touch $@
 
+modules/DualReadoutCalorimeter.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 
 

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+;