Changeset 2264876 in git for Makefile

Timestamp:

Aug 25, 2016, 4:27:14 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

bc58cf5

Parents:

7993cad (diff), 1408174 (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 'dev_01' of github.com:delphes/delphes into dev_01

File:

• Makefile (modified) (14 diffs)

Makefile

@@ -137 +137 @@
 tmp/examples/Example1.$(ObjSuf): \
         examples/Example1.cpp \
+        classes/DelphesClasses.h \
+        external/ExRootAnalysis/ExRootTreeReader.h \
+        external/ExRootAnalysis/ExRootTreeWriter.h \
+        external/ExRootAnalysis/ExRootTreeBranch.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootUtilities.h
+Validation$(ExeSuf): \
+        tmp/examples/Validation.$(ObjSuf)
+
+tmp/examples/Validation.$(ObjSuf): \
+        examples/Validation.cpp \
         classes/DelphesClasses.h \
         external/ExRootAnalysis/ExRootTreeReader.h \
@@ -150 +161 @@
         root2pileup$(ExeSuf) \
         stdhep2pileup$(ExeSuf) \
-        Example1$(ExeSuf)
+        Example1$(ExeSuf) \
+        Validation$(ExeSuf)
 
 EXECUTABLE_OBJ +=  \
@@ -159 +171 @@
         tmp/converters/root2pileup.$(ObjSuf) \
         tmp/converters/stdhep2pileup.$(ObjSuf) \
-        tmp/examples/Example1.$(ObjSuf)
+        tmp/examples/Example1.$(ObjSuf) \
+        tmp/examples/Validation.$(ObjSuf)
 
 DelphesHepMC$(ExeSuf): \
@@ -183 +196 @@
         classes/DelphesLHEFReader.h \
         external/ExRootAnalysis/ExRootTreeWriter.h \
+        external/ExRootAnalysis/ExRootTreeBranch.h \
+        external/ExRootAnalysis/ExRootProgressBar.h
+DelphesROOT$(ExeSuf): \
+        tmp/readers/DelphesROOT.$(ObjSuf)
+
+tmp/readers/DelphesROOT.$(ObjSuf): \
+        readers/DelphesROOT.cpp \
+        modules/Delphes.h \
+        classes/DelphesStream.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        external/ExRootAnalysis/ExRootTreeWriter.h \
+        external/ExRootAnalysis/ExRootTreeReader.h \
         external/ExRootAnalysis/ExRootTreeBranch.h \
         external/ExRootAnalysis/ExRootProgressBar.h
@@ -200 +226 @@
         DelphesHepMC$(ExeSuf) \
         DelphesLHEF$(ExeSuf) \
+        DelphesROOT$(ExeSuf) \
         DelphesSTDHEP$(ExeSuf)
 
@@ -205 +232 @@
         tmp/readers/DelphesHepMC.$(ObjSuf) \
         tmp/readers/DelphesLHEF.$(ObjSuf) \
+        tmp/readers/DelphesROOT.$(ObjSuf) \
         tmp/readers/DelphesSTDHEP.$(ObjSuf)
 
@@ -344 +372 @@
         modules/PdgCodeFilter.h \
         modules/BeamSpotFilter.h \
+        modules/RecoPuFilter.h \
         modules/Cloner.h \
         modules/Weighter.h \
@@ -351 +380 @@
         modules/VertexSorter.h \
         modules/VertexFinder.h \
+        modules/VertexFinderDA4D.h \
         modules/ExampleModule.h
 tmp/modules/ModulesDict$(PcmSuf): \
@@ -798 +828 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/RecoPuFilter.$(ObjSuf): \
+        modules/RecoPuFilter.$(SrcSuf) \
+        modules/RecoPuFilter.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/SimpleCalorimeter.$(ObjSuf): \
         modules/SimpleCalorimeter.$(SrcSuf) \
@@ -896 +935 @@
         modules/VertexFinder.$(SrcSuf) \
         modules/VertexFinder.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        classes/DelphesPileUpReader.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/VertexFinderDA4D.$(ObjSuf): \
+        modules/VertexFinderDA4D.$(SrcSuf) \
+        modules/VertexFinderDA4D.h \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -998 +1047 @@
         tmp/modules/PileUpJetID.$(ObjSuf) \
         tmp/modules/PileUpMerger.$(ObjSuf) \
+        tmp/modules/RecoPuFilter.$(ObjSuf) \
         tmp/modules/SimpleCalorimeter.$(ObjSuf) \
         tmp/modules/StatusPidFilter.$(ObjSuf) \
@@ -1010 +1060 @@
         tmp/modules/UniqueObjectFinder.$(ObjSuf) \
         tmp/modules/VertexFinder.$(ObjSuf) \
+        tmp/modules/VertexFinderDA4D.$(ObjSuf) \
         tmp/modules/VertexSorter.$(ObjSuf) \
         tmp/modules/Weighter.$(ObjSuf)
@@ -1615 +1666 @@
         tmp/external/tcl/tclVar.$(ObjSuf)
 
+modules/VertexFinderDA4D.h: \
+        classes/DelphesModule.h \
+        classes/DelphesClasses.h
+        @touch $@
+
 modules/TrackSmearing.h: \
         classes/DelphesModule.h
@@ -1959 +2015 @@
 
 modules/BTagging.h: \
+        classes/DelphesModule.h
+        @touch $@
+
+modules/RecoPuFilter.h: \
         classes/DelphesModule.h
         @touch $@