Fork me on GitHub

Changeset 0d60c9d in git


Ignore:
Timestamp:
07/04/13 13:19:15 (7 years ago)
Author:
pavel <pavel@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
5150e39
Parents:
af9008e
Message:

add modules/Pythia8LinkDef.h

Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    raf9008e r0d60c9d  
    4141ifneq ($(PYTHIA8),)
    4242HAS_PYTHIA8 = true
    43 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
     43CXXFLAGS += -I$(PYTHIA8)/include
    4444DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
    4545else
    4646ifneq ($(PYTHIA8DATA),)
    4747HAS_PYTHIA8 = true
    48 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
     48CXXFLAGS += -I$(PYTHIA8DATA)/../include
    4949DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
    5050endif
     
    288288EXECUTABLE_OBJ +=  \
    289289        tmp/readers/DelphesPythia8.$(ObjSuf)
     290
     291tmp/modules/Pythia8Dict.$(SrcSuf): \
     292        modules/Pythia8LinkDef.h \
     293        modules/PileUpMergerPythia8.h
     294DELPHES_DICT +=  \
     295        tmp/modules/Pythia8Dict.$(SrcSuf)
     296
     297DELPHES_DICT_OBJ +=  \
     298        tmp/modules/Pythia8Dict.$(ObjSuf)
    290299
    291300endif
     
    321330        modules/Cloner.h \
    322331        modules/Weighter.h \
    323         modules/ExampleModule.h \
    324         modules/PileUpMergerPythia8.h
     332        modules/ExampleModule.h
    325333tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
    326334        external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
     
    335343        external/ExRootAnalysis/ExRootConfReader.h \
    336344        external/ExRootAnalysis/ExRootTask.h
    337 DELPHES_DICT =  \
     345DELPHES_DICT +=  \
    338346        tmp/classes/ClassesDict.$(SrcSuf) \
    339347        tmp/modules/ModulesDict.$(SrcSuf) \
    340348        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
    341349
    342 DELPHES_DICT_OBJ =  \
     350DELPHES_DICT_OBJ +=  \
    343351        tmp/classes/ClassesDict.$(ObjSuf) \
    344352        tmp/modules/ModulesDict.$(ObjSuf) \
     
    349357        display/DelphesDisplay.h \
    350358        display/DelphesCaloData.h
    351 DISPLAY_DICT =  \
     359DISPLAY_DICT +=  \
    352360        tmp/display/DisplayDict.$(SrcSuf)
    353361
    354 DISPLAY_DICT_OBJ =  \
     362DISPLAY_DICT_OBJ +=  \
    355363        tmp/display/DisplayDict.$(ObjSuf)
    356364
     
    10941102tmp/external/tcl/tclCmdMZ.$(ObjSuf): \
    10951103        external/tcl/tclCmdMZ.c
    1096 TCL_OBJ =  \
     1104TCL_OBJ +=  \
    10971105        tmp/external/tcl/tclObj.$(ObjSuf) \
    10981106        tmp/external/tcl/tclUtil.$(ObjSuf) \
     
    14971505        @mkdir -p $(@D)
    14981506        @echo ">> Generating $@"
    1499         @rootcint -f $@ -c $(CXXFLAGS) $<
     1507        @rootcint -f $@ -c -Iexternal $<
    15001508        @echo "#define private public" > $@.arch
    15011509        @echo "#define protected public" >> $@.arch
  • doc/genMakefile.tcl

    raf9008e r0d60c9d  
    7171  }
    7272
    73   puts -nonewline "${dictVar} = $suffix"
     73  puts -nonewline "${dictVar} += $suffix"
    7474  puts [join $dictSrcFiles $suffix]
    7575  puts {}
    7676
    77   puts -nonewline "${dictVar}_OBJ = $suffix"
     77  puts -nonewline "${dictVar}_OBJ += $suffix"
    7878  puts [join $dictObjFiles $suffix]
    7979  puts {}
     
    133133  }
    134134
    135   puts -nonewline "TCL_OBJ = $suffix"
     135  puts -nonewline "TCL_OBJ += $suffix"
    136136  puts [join $srcObjFiles $suffix]
    137137  puts {}
     
    147147
    148148  foreach fileName $executable {
    149     if {$fileName == "examples/DelphesProMC.cpp"} continue
    150 
    151149    regsub {\.cpp} $fileName {} exeObjName
    152150    set exeObjName $prefix$exeObjName
     
    224222ifneq ($(PYTHIA8),)
    225223HAS_PYTHIA8 = true
    226 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
     224CXXFLAGS += -I$(PYTHIA8)/include
    227225DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
    228226else
    229227ifneq ($(PYTHIA8DATA),)
    230228HAS_PYTHIA8 = true
    231 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
     229CXXFLAGS += -I$(PYTHIA8DATA)/../include
    232230DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
    233231endif
     
    267265puts {ifeq ($(HAS_PYTHIA8),true)}
    268266executableDeps {readers/DelphesPythia8.cpp}
     267dictDeps {DELPHES_DICT} {modules/Pythia8LinkDef.h}
    269268puts {endif}
    270269puts {}
    271270
    272 dictDeps {DELPHES_DICT} {classes/*LinkDef.h} {modules/*LinkDef.h} {external/ExRootAnalysis/*LinkDef.h}
    273 
    274 dictDeps {DISPLAY_DICT} {display/*LinkDef.h}
     271dictDeps {DELPHES_DICT} {classes/ClassesLinkDef.h} {modules/ModulesLinkDef.h} {external/ExRootAnalysis/ExRootAnalysisLinkDef.h}
     272
     273dictDeps {DISPLAY_DICT} {display/DisplayLinkDef.h}
    275274
    276275sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc}
     
    366365        @mkdir -p $(@D)
    367366        @echo ">> Generating $@"
    368         @rootcint -f $@ -c $(CXXFLAGS) $<
     367        @rootcint -f $@ -c -Iexternal $<
    369368        @echo "#define private public" > $@.arch
    370369        @echo "#define protected public" >> $@.arch
  • modules/ModulesLinkDef.h

    raf9008e r0d60c9d  
    3737#include "modules/ExampleModule.h"
    3838
    39 #ifdef HAS_PYTHIA8
    40 #include "modules/PileUpMergerPythia8.h"
    41 #endif
    42 
    4339#ifdef __CINT__
    4440
     
    7268#pragma link C++ class ExampleModule+;
    7369
    74 #ifdef HAS_PYTHIA8
    75 #pragma link C++ class PileUpMergerPythia8+;
    7670#endif
    77 
    78 #endif
Note: See TracChangeset for help on using the changeset viewer.