Changeset 0d60c9d in git
- Timestamp:
- Jul 4, 2013, 1:19:15 PM (11 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- 5150e39
- Parents:
- af9008e
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
raf9008e r0d60c9d 41 41 ifneq ($(PYTHIA8),) 42 42 HAS_PYTHIA8 = true 43 CXXFLAGS += - DHAS_PYTHIA8 -I$(PYTHIA8)/include43 CXXFLAGS += -I$(PYTHIA8)/include 44 44 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy 45 45 else 46 46 ifneq ($(PYTHIA8DATA),) 47 47 HAS_PYTHIA8 = true 48 CXXFLAGS += - DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include48 CXXFLAGS += -I$(PYTHIA8DATA)/../include 49 49 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy 50 50 endif … … 288 288 EXECUTABLE_OBJ += \ 289 289 tmp/readers/DelphesPythia8.$(ObjSuf) 290 291 tmp/modules/Pythia8Dict.$(SrcSuf): \ 292 modules/Pythia8LinkDef.h \ 293 modules/PileUpMergerPythia8.h 294 DELPHES_DICT += \ 295 tmp/modules/Pythia8Dict.$(SrcSuf) 296 297 DELPHES_DICT_OBJ += \ 298 tmp/modules/Pythia8Dict.$(ObjSuf) 290 299 291 300 endif … … 321 330 modules/Cloner.h \ 322 331 modules/Weighter.h \ 323 modules/ExampleModule.h \ 324 modules/PileUpMergerPythia8.h 332 modules/ExampleModule.h 325 333 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \ 326 334 external/ExRootAnalysis/ExRootAnalysisLinkDef.h \ … … 335 343 external/ExRootAnalysis/ExRootConfReader.h \ 336 344 external/ExRootAnalysis/ExRootTask.h 337 DELPHES_DICT = \345 DELPHES_DICT += \ 338 346 tmp/classes/ClassesDict.$(SrcSuf) \ 339 347 tmp/modules/ModulesDict.$(SrcSuf) \ 340 348 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf) 341 349 342 DELPHES_DICT_OBJ = \350 DELPHES_DICT_OBJ += \ 343 351 tmp/classes/ClassesDict.$(ObjSuf) \ 344 352 tmp/modules/ModulesDict.$(ObjSuf) \ … … 349 357 display/DelphesDisplay.h \ 350 358 display/DelphesCaloData.h 351 DISPLAY_DICT = \359 DISPLAY_DICT += \ 352 360 tmp/display/DisplayDict.$(SrcSuf) 353 361 354 DISPLAY_DICT_OBJ = \362 DISPLAY_DICT_OBJ += \ 355 363 tmp/display/DisplayDict.$(ObjSuf) 356 364 … … 1094 1102 tmp/external/tcl/tclCmdMZ.$(ObjSuf): \ 1095 1103 external/tcl/tclCmdMZ.c 1096 TCL_OBJ = \1104 TCL_OBJ += \ 1097 1105 tmp/external/tcl/tclObj.$(ObjSuf) \ 1098 1106 tmp/external/tcl/tclUtil.$(ObjSuf) \ … … 1497 1505 @mkdir -p $(@D) 1498 1506 @echo ">> Generating $@" 1499 @rootcint -f $@ -c $(CXXFLAGS)$<1507 @rootcint -f $@ -c -Iexternal $< 1500 1508 @echo "#define private public" > $@.arch 1501 1509 @echo "#define protected public" >> $@.arch -
doc/genMakefile.tcl
raf9008e r0d60c9d 71 71 } 72 72 73 puts -nonewline "${dictVar} = $suffix"73 puts -nonewline "${dictVar} += $suffix" 74 74 puts [join $dictSrcFiles $suffix] 75 75 puts {} 76 76 77 puts -nonewline "${dictVar}_OBJ = $suffix"77 puts -nonewline "${dictVar}_OBJ += $suffix" 78 78 puts [join $dictObjFiles $suffix] 79 79 puts {} … … 133 133 } 134 134 135 puts -nonewline "TCL_OBJ = $suffix"135 puts -nonewline "TCL_OBJ += $suffix" 136 136 puts [join $srcObjFiles $suffix] 137 137 puts {} … … 147 147 148 148 foreach fileName $executable { 149 if {$fileName == "examples/DelphesProMC.cpp"} continue150 151 149 regsub {\.cpp} $fileName {} exeObjName 152 150 set exeObjName $prefix$exeObjName … … 224 222 ifneq ($(PYTHIA8),) 225 223 HAS_PYTHIA8 = true 226 CXXFLAGS += - DHAS_PYTHIA8 -I$(PYTHIA8)/include224 CXXFLAGS += -I$(PYTHIA8)/include 227 225 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy 228 226 else 229 227 ifneq ($(PYTHIA8DATA),) 230 228 HAS_PYTHIA8 = true 231 CXXFLAGS += - DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include229 CXXFLAGS += -I$(PYTHIA8DATA)/../include 232 230 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy 233 231 endif … … 267 265 puts {ifeq ($(HAS_PYTHIA8),true)} 268 266 executableDeps {readers/DelphesPythia8.cpp} 267 dictDeps {DELPHES_DICT} {modules/Pythia8LinkDef.h} 269 268 puts {endif} 270 269 puts {} 271 270 272 dictDeps {DELPHES_DICT} {classes/ *LinkDef.h} {modules/*LinkDef.h} {external/ExRootAnalysis/*LinkDef.h}273 274 dictDeps {DISPLAY_DICT} {display/ *LinkDef.h}271 dictDeps {DELPHES_DICT} {classes/ClassesLinkDef.h} {modules/ModulesLinkDef.h} {external/ExRootAnalysis/ExRootAnalysisLinkDef.h} 272 273 dictDeps {DISPLAY_DICT} {display/DisplayLinkDef.h} 275 274 276 275 sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc} … … 366 365 @mkdir -p $(@D) 367 366 @echo ">> Generating $@" 368 @rootcint -f $@ -c $(CXXFLAGS)$<367 @rootcint -f $@ -c -Iexternal $< 369 368 @echo "#define private public" > $@.arch 370 369 @echo "#define protected public" >> $@.arch -
modules/ModulesLinkDef.h
raf9008e r0d60c9d 37 37 #include "modules/ExampleModule.h" 38 38 39 #ifdef HAS_PYTHIA840 #include "modules/PileUpMergerPythia8.h"41 #endif42 43 39 #ifdef __CINT__ 44 40 … … 72 68 #pragma link C++ class ExampleModule+; 73 69 74 #ifdef HAS_PYTHIA875 #pragma link C++ class PileUpMergerPythia8+;76 70 #endif 77 78 #endif
Note:
See TracChangeset
for help on using the changeset viewer.