Changeset 91acc76 in git for Makefile

Timestamp:

Aug 23, 2016, 3:28:48 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

19389b8, 7993cad

Parents:

e55f5b0 (diff), 98ce52a (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:

resolved conflict in ModulesLinkDef

File:

• Makefile (modified) (8 diffs)

Makefile

@@ -324 +324 @@
         modules/SimpleCalorimeter.h \
         modules/Calorimeter.h \
+        modules/OldCalorimeter.h \
         modules/Isolation.h \
         modules/EnergyScale.h \
@@ -732 +733 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/OldCalorimeter.$(ObjSuf): \
+        modules/OldCalorimeter.$(SrcSuf) \
+        modules/OldCalorimeter.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/ParticlePropagator.$(ObjSuf): \
         modules/ParticlePropagator.$(SrcSuf) \
@@ -982 +992 @@
         tmp/modules/Merger.$(ObjSuf) \
         tmp/modules/MomentumSmearing.$(ObjSuf) \
+        tmp/modules/OldCalorimeter.$(ObjSuf) \
         tmp/modules/ParticlePropagator.$(ObjSuf) \
         tmp/modules/PdgCodeFilter.$(ObjSuf) \
@@ -1008 +1019 @@
 
 tmp/external/PUPPI/PuppiAlgo.$(ObjSuf): \
-        external/PUPPI/PuppiAlgo.$(SrcSuf) \
-        external/fastjet/internal/base.hh
+        external/PUPPI/PuppiAlgo.$(SrcSuf)
 tmp/external/PUPPI/PuppiContainer.$(ObjSuf): \
         external/PUPPI/PuppiContainer.$(SrcSuf) \
-        external/fastjet/internal/base.hh \
         external/fastjet/Selector.hh
 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
@@ -1370 +1379 @@
         external/PUPPI/RecoObj2.hh \
         external/PUPPI/AlgoObj.hh \
+        external/PUPPI/PuppiContainer.hh \
+        external/fastjet/PseudoJet.hh \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -1761 +1772 @@
         @touch $@
 
+modules/OldCalorimeter.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 external/fastjet/ClusterSequence1GhostPassiveArea.hh: \
         external/fastjet/PseudoJet.hh \
@@ -1805 +1820 @@
 
 modules/RunPUPPI.h: \
-        classes/DelphesModule.h \
-        external/PUPPI/PuppiContainer.hh
+        classes/DelphesModule.h
         @touch $@
 
@@ -1912 +1926 @@
 external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh: \
         external/fastjet/JetDefinition.hh
+        @touch $@
+
+external/PUPPI/PuppiContainer.hh: \
+        external/fastjet/PseudoJet.hh
         @touch $@