Changeset c41c262 in git for Makefile

Timestamp:

Jul 4, 2013, 1:04:05 AM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

c466459

Parents:

5ca3d52

Message:

add PileUpMergerPythia8

File:

• Makefile (modified) (7 diffs)

Makefile

@@ -19 +19 @@
 DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
 DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
+
+ifneq ($(PYTHIA8),)
+CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
+DELPHES_LIBS += -L$(PYTHIA8)/lib/archive -lpythia8 -llhapdfdummy
+endif
 
 ###
@@ -201 +206 @@
         modules/Cloner.h \
         modules/Weighter.h \
-        modules/ExampleModule.h
+        modules/ExampleModule.h \
+        modules/PileUpMergerPythia8.h
 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
         external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
@@ -356 +362 @@
         external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
         external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh
+tmp/modules/PileUpMergerPythia8.$(ObjSuf): \
+        modules/PileUpMergerPythia8.$(SrcSuf) \
+        modules/PileUpMergerPythia8.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/StatusPidFilter.$(ObjSuf): \
         modules/StatusPidFilter.$(SrcSuf) \
@@ -889 +905 @@
         tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf)
 
+ifneq ($(PYTHIA8),)
+DELPHES_OBJ +=  \
+        tmp/modules/PileUpMergerPythia8.$(ObjSuf)
+endif
 tmp/display/DelphesDisplay.$(ObjSuf): \
         display/DelphesDisplay.$(SrcSuf) \
@@ -899 +919 @@
         tmp/display/DelphesCaloData.$(ObjSuf)
 
+ifneq ($(PYTHIA8),)
+DISPLAY_OBJ +=  \
+        
+endif
 tmp/external/tcl/tclObj.$(ObjSuf): \
         external/tcl/tclObj.c
@@ -1022 +1046 @@
         @touch $@
 
-modules/ConstituentFilter.h: \
-        classes/DelphesModule.h
-        @touch $@
-
 external/fastjet/JetDefinition.hh: \
         external/fastjet/internal/numconsts.hh \
         external/fastjet/PseudoJet.hh
+        @touch $@
+
+modules/ConstituentFilter.h: \
+        classes/DelphesModule.h
         @touch $@
 
@@ -1158 +1182 @@
 
 modules/UniqueObjectFinder.h: \
+        classes/DelphesModule.h
+        @touch $@
+
+modules/PileUpMergerPythia8.h: \
         classes/DelphesModule.h
         @touch $@