Changeset 1177 in svn for trunk

Timestamp:

Jul 4, 2013, 1:19:15 PM (11 years ago)

Author:

Pavel Demin

Message:

add modules/Pythia8LinkDef.h

Location:

trunk

Files:

• Makefile (modified) (7 diffs)
• doc/genMakefile.tcl (modified) (6 diffs)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/Pythia8LinkDef.h (added)

trunk/Makefile

@@ -41 +41 @@
 ifneq ($(PYTHIA8),)
 HAS_PYTHIA8 = true
-CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
+CXXFLAGS += -I$(PYTHIA8)/include
 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
 else
 ifneq ($(PYTHIA8DATA),)
 HAS_PYTHIA8 = true
-CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
+CXXFLAGS += -I$(PYTHIA8DATA)/../include
 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
 endif
@@ -288 +288 @@
 EXECUTABLE_OBJ +=  \
         tmp/readers/DelphesPythia8.$(ObjSuf)
+
+tmp/modules/Pythia8Dict.$(SrcSuf): \
+        modules/Pythia8LinkDef.h \
+        modules/PileUpMergerPythia8.h
+DELPHES_DICT +=  \
+        tmp/modules/Pythia8Dict.$(SrcSuf)
+
+DELPHES_DICT_OBJ +=  \
+        tmp/modules/Pythia8Dict.$(ObjSuf)
 
 endif
@@ -321 +330 @@
         modules/Cloner.h \
         modules/Weighter.h \
-        modules/ExampleModule.h \
-        modules/PileUpMergerPythia8.h
+        modules/ExampleModule.h
 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
         external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
@@ -335 +343 @@
         external/ExRootAnalysis/ExRootConfReader.h \
         external/ExRootAnalysis/ExRootTask.h
-DELPHES_DICT =  \
+DELPHES_DICT +=  \
         tmp/classes/ClassesDict.$(SrcSuf) \
         tmp/modules/ModulesDict.$(SrcSuf) \
         tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
 
-DELPHES_DICT_OBJ =  \
+DELPHES_DICT_OBJ +=  \
         tmp/classes/ClassesDict.$(ObjSuf) \
         tmp/modules/ModulesDict.$(ObjSuf) \
@@ -349 +357 @@
         display/DelphesDisplay.h \
         display/DelphesCaloData.h
-DISPLAY_DICT =  \
+DISPLAY_DICT +=  \
         tmp/display/DisplayDict.$(SrcSuf)
 
-DISPLAY_DICT_OBJ =  \
+DISPLAY_DICT_OBJ +=  \
         tmp/display/DisplayDict.$(ObjSuf)
 
@@ -1094 +1102 @@
 tmp/external/tcl/tclCmdMZ.$(ObjSuf): \
         external/tcl/tclCmdMZ.c
-TCL_OBJ =  \
+TCL_OBJ +=  \
         tmp/external/tcl/tclObj.$(ObjSuf) \
         tmp/external/tcl/tclUtil.$(ObjSuf) \
@@ -1497 +1505 @@
         @mkdir -p $(@D)
         @echo ">> Generating $@"
-        @rootcint -f $@ -c $(CXXFLAGS) $<
+        @rootcint -f $@ -c -Iexternal $<
         @echo "#define private public" > $@.arch
         @echo "#define protected public" >> $@.arch

trunk/doc/genMakefile.tcl

@@ -71 +71 @@
   }
 
-  puts -nonewline "${dictVar} = $suffix"
+  puts -nonewline "${dictVar} += $suffix"
   puts [join $dictSrcFiles $suffix]
   puts {}
 
-  puts -nonewline "${dictVar}_OBJ = $suffix"
+  puts -nonewline "${dictVar}_OBJ += $suffix"
   puts [join $dictObjFiles $suffix]
   puts {}
@@ -133 +133 @@
   }
 
-  puts -nonewline "TCL_OBJ = $suffix"
+  puts -nonewline "TCL_OBJ += $suffix"
   puts [join $srcObjFiles $suffix]
   puts {}
@@ -147 +147 @@
 
   foreach fileName $executable {
-    if {$fileName == "examples/DelphesProMC.cpp"} continue
-
     regsub {\.cpp} $fileName {} exeObjName
     set exeObjName $prefix$exeObjName
@@ -224 +222 @@
 ifneq ($(PYTHIA8),)
 HAS_PYTHIA8 = true
-CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
+CXXFLAGS += -I$(PYTHIA8)/include
 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
 else
 ifneq ($(PYTHIA8DATA),)
 HAS_PYTHIA8 = true
-CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
+CXXFLAGS += -I$(PYTHIA8DATA)/../include
 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
 endif
@@ -267 +265 @@
 puts {ifeq ($(HAS_PYTHIA8),true)}
 executableDeps {readers/DelphesPythia8.cpp}
+dictDeps {DELPHES_DICT} {modules/Pythia8LinkDef.h}
 puts {endif}
 puts {}
 
-dictDeps {DELPHES_DICT} {classes/*LinkDef.h} {modules/*LinkDef.h} {external/ExRootAnalysis/*LinkDef.h}
-
-dictDeps {DISPLAY_DICT} {display/*LinkDef.h}
+dictDeps {DELPHES_DICT} {classes/ClassesLinkDef.h} {modules/ModulesLinkDef.h} {external/ExRootAnalysis/ExRootAnalysisLinkDef.h}
+
+dictDeps {DISPLAY_DICT} {display/DisplayLinkDef.h}
 
 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)
         @echo ">> Generating $@"
-        @rootcint -f $@ -c $(CXXFLAGS) $<
+        @rootcint -f $@ -c -Iexternal $<
         @echo "#define private public" > $@.arch
         @echo "#define protected public" >> $@.arch

trunk/modules/ModulesLinkDef.h

@@ -37 +37 @@
 #include "modules/ExampleModule.h"
 
-#ifdef HAS_PYTHIA8
-#include "modules/PileUpMergerPythia8.h"
-#endif
-
 #ifdef __CINT__
 
@@ -72 +68 @@
 #pragma link C++ class ExampleModule+;
 
-#ifdef HAS_PYTHIA8
-#pragma link C++ class PileUpMergerPythia8+;
 #endif
-
-#endif