Changeset 624dc48 in git for Makefile

Timestamp:

Dec 9, 2014, 4:40:27 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

17826f2, f355a2c

Parents:

2eb25b1 (diff), acf622f (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 'master' of github.com:delphes/delphes

Conflicts:

Makefile
modules/ModulesLinkDef.h

File:

• Makefile (modified) (6 diffs)

Makefile

@@ -324 +324 @@
         modules/ModulesLinkDef.h \
         modules/Delphes.h \
+        modules/AngularSmearing.h \
         modules/ParticlePropagator.h \
         modules/Efficiency.h \
@@ -497 +498 @@
         modules/Calorimeter.$(SrcSuf) \
         modules/Calorimeter.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/AngularSmearing.$(ObjSuf): \
+        modules/AngularSmearing.$(SrcSuf) \
+        modules/AngularSmearing.h \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -851 +861 @@
         tmp/modules/Delphes.$(ObjSuf) \
         tmp/modules/Calorimeter.$(ObjSuf) \
+        tmp/modules/AngularSmearing.$(ObjSuf) \
         tmp/modules/LeptonDressing.$(ObjSuf) \
         tmp/modules/UniqueObjectFinder.$(ObjSuf) \
@@ -1535 +1546 @@
         @touch $@
 
+modules/AngularSmearing.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 modules/IdentificationMap.h: \
         classes/DelphesModule.h
@@ -1543 +1558 @@
         @touch $@
 
+modules/Merger.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 modules/Isolation.h: \
         classes/DelphesModule.h
@@ -1548 +1567 @@
 
 modules/EnergyScale.h: \
-        classes/DelphesModule.h
-        @touch $@
-
-modules/Merger.h: \
         classes/DelphesModule.h
         @touch $@