Changeset 4689481 in git for Makefile

Timestamp:

May 25, 2018, 8:28:31 PM (6 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f37555a

Parents:

c3547ed (diff), fbad4c7 (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 'photonId'

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -379 +379 @@
         modules/TaggingParticlesSkimmer.h \
         modules/PileUpJetID.h \
+        modules/PhotonID.h \
         modules/ConstituentFilter.h \
         modules/StatusPidFilter.h \
@@ -825 +826 @@
         classes/DelphesFactory.h \
         classes/DelphesCylindricalFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/PhotonID.$(ObjSuf): \
+        modules/PhotonID.$(SrcSuf) \
+        modules/PhotonID.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
         external/ExRootAnalysis/ExRootResult.h \
         external/ExRootAnalysis/ExRootFilter.h \
@@ -1077 +1087 @@
         tmp/modules/PdgCodeFilter.$(ObjSuf) \
         tmp/modules/PhotonConversions.$(ObjSuf) \
+        tmp/modules/PhotonID.$(ObjSuf) \
         tmp/modules/PileUpJetID.$(ObjSuf) \
         tmp/modules/PileUpMerger.$(ObjSuf) \
@@ -1941 +1952 @@
         @touch $@
 
+modules/PhotonID.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 external/fastjet/tools/Pruner.hh: \
         external/fastjet/ClusterSequence.hh \