Changeset 37deb3b in git for Makefile

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

File:

• Makefile (modified) (5 diffs)

Makefile

@@ -301 +301 @@
         modules/ParticlePropagator.h \
         modules/Efficiency.h \
+        modules/IdentificationMap.h \
         modules/EnergySmearing.h \
         modules/MomentumSmearing.h \
@@ -696 +697 @@
         modules/EnergyScale.$(SrcSuf) \
         modules/EnergyScale.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/IdentificationMap.$(ObjSuf): \
+        modules/IdentificationMap.$(SrcSuf) \
+        modules/IdentificationMap.h \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -1164 +1174 @@
         tmp/modules/PdgCodeFilter.$(ObjSuf) \
         tmp/modules/EnergyScale.$(ObjSuf) \
+        tmp/modules/IdentificationMap.$(ObjSuf) \
         tmp/modules/TrackCountingBTagging.$(ObjSuf) \
         tmp/modules/Calorimeter.$(ObjSuf) \
@@ -1487 +1498 @@
         @touch $@
 
+modules/IdentificationMap.h: \
+        classes/DelphesModule.h
+        @touch $@
+
+modules/ExampleModule.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 modules/Isolation.h: \
         classes/DelphesModule.h
@@ -1496 +1515 @@
 
 modules/Merger.h: \
-        classes/DelphesModule.h
-        @touch $@
-
-modules/ExampleModule.h: \
         classes/DelphesModule.h
         @touch $@