Changeset c41c262 in git
- Timestamp:
- Jul 4, 2013, 1:04:05 AM (11 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- c466459
- Parents:
- 5ca3d52
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r5ca3d52 rc41c262 19 19 DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS) 20 20 DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS) 21 22 ifneq ($(PYTHIA8),) 23 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include 24 DELPHES_LIBS += -L$(PYTHIA8)/lib/archive -lpythia8 -llhapdfdummy 25 endif 21 26 22 27 ### … … 201 206 modules/Cloner.h \ 202 207 modules/Weighter.h \ 203 modules/ExampleModule.h 208 modules/ExampleModule.h \ 209 modules/PileUpMergerPythia8.h 204 210 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \ 205 211 external/ExRootAnalysis/ExRootAnalysisLinkDef.h \ … … 356 362 external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \ 357 363 external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh 364 tmp/modules/PileUpMergerPythia8.$(ObjSuf): \ 365 modules/PileUpMergerPythia8.$(SrcSuf) \ 366 modules/PileUpMergerPythia8.h \ 367 classes/DelphesClasses.h \ 368 classes/DelphesFactory.h \ 369 classes/DelphesFormula.h \ 370 classes/DelphesPileUpReader.h \ 371 external/ExRootAnalysis/ExRootResult.h \ 372 external/ExRootAnalysis/ExRootFilter.h \ 373 external/ExRootAnalysis/ExRootClassifier.h 358 374 tmp/modules/StatusPidFilter.$(ObjSuf): \ 359 375 modules/StatusPidFilter.$(SrcSuf) \ … … 889 905 tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf) 890 906 907 ifneq ($(PYTHIA8),) 908 DELPHES_OBJ += \ 909 tmp/modules/PileUpMergerPythia8.$(ObjSuf) 910 endif 891 911 tmp/display/DelphesDisplay.$(ObjSuf): \ 892 912 display/DelphesDisplay.$(SrcSuf) \ … … 899 919 tmp/display/DelphesCaloData.$(ObjSuf) 900 920 921 ifneq ($(PYTHIA8),) 922 DISPLAY_OBJ += \ 923 924 endif 901 925 tmp/external/tcl/tclObj.$(ObjSuf): \ 902 926 external/tcl/tclObj.c … … 1022 1046 @touch $@ 1023 1047 1024 modules/ConstituentFilter.h: \1025 classes/DelphesModule.h1026 @touch $@1027 1028 1048 external/fastjet/JetDefinition.hh: \ 1029 1049 external/fastjet/internal/numconsts.hh \ 1030 1050 external/fastjet/PseudoJet.hh 1051 @touch $@ 1052 1053 modules/ConstituentFilter.h: \ 1054 classes/DelphesModule.h 1031 1055 @touch $@ 1032 1056 … … 1158 1182 1159 1183 modules/UniqueObjectFinder.h: \ 1184 classes/DelphesModule.h 1185 @touch $@ 1186 1187 modules/PileUpMergerPythia8.h: \ 1160 1188 classes/DelphesModule.h 1161 1189 @touch $@ -
doc/genMakefile.tcl
r5ca3d52 rc41c262 88 88 89 89 set srcObjFiles {} 90 set srcObjFilesPythia8 {} 90 91 91 92 foreach fileName $source { 92 93 regsub {\.cc} $fileName {} srcName 93 94 set srcObjName $prefix$srcName 94 95 lappend srcObjFiles $srcObjName$objSuf 95 96 if {$fileName == "modules/PileUpMergerPythia8.cc"} { 97 lappend srcObjFilesPythia8 $srcObjName$objSuf 98 } else { 99 lappend srcObjFiles $srcObjName$objSuf 100 } 96 101 97 102 dependencies $fileName "$srcObjName$objSuf:$suffix$srcName$srcSuf" … … 101 106 puts [join $srcObjFiles $suffix] 102 107 puts "" 108 109 puts {ifneq ($(PYTHIA8),)} 110 puts -nonewline "${srcPrefix}_OBJ += $suffix" 111 puts [join $srcObjFilesPythia8 $suffix] 112 puts {endif} 103 113 } 104 114 … … 193 203 DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS) 194 204 205 ifneq ($(PYTHIA8),) 206 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include 207 DELPHES_LIBS += -L$(PYTHIA8)/lib/archive -lpythia8 -llhapdfdummy 208 endif 209 195 210 ### 196 211 -
modules/ModulesLinkDef.h
r5ca3d52 rc41c262 37 37 #include "modules/ExampleModule.h" 38 38 39 #ifdef HAS_PYTHIA8 40 #include "modules/PileUpMergerPythia8.h" 41 #endif 42 39 43 #ifdef __CINT__ 40 44 … … 68 72 #pragma link C++ class ExampleModule+; 69 73 74 #ifdef HAS_PYTHIA8 75 #pragma link C++ class PileUpMergerPythia8+; 70 76 #endif 77 78 #endif
Note:
See TracChangeset
for help on using the changeset viewer.