Changeset 1167 in svn for trunk

Timestamp:

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

Author:

Pavel Demin

Message:

add PileUpMergerPythia8

Location:

trunk

Files:

• Makefile (modified) (7 diffs)
• doc/genMakefile.tcl (modified) (3 diffs)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/PileUpMergerPythia8.cc (added)
• modules/PileUpMergerPythia8.h (added)

trunk/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 $@

trunk/doc/genMakefile.tcl

@@ -88 +88 @@
 
   set srcObjFiles {}
+  set srcObjFilesPythia8 {}
 
   foreach fileName $source {
     regsub {\.cc} $fileName {} srcName
     set srcObjName $prefix$srcName
-
-    lappend srcObjFiles $srcObjName$objSuf
+    
+    if {$fileName == "modules/PileUpMergerPythia8.cc"} {
+      lappend srcObjFilesPythia8 $srcObjName$objSuf
+    } else {
+      lappend srcObjFiles $srcObjName$objSuf
+    }
 
     dependencies $fileName "$srcObjName$objSuf:$suffix$srcName$srcSuf"
@@ -101 +106 @@
   puts [join $srcObjFiles $suffix]
   puts ""
+  
+  puts {ifneq ($(PYTHIA8),)}
+  puts -nonewline "${srcPrefix}_OBJ += $suffix"
+  puts [join $srcObjFilesPythia8 $suffix]
+  puts {endif}
 }
 
@@ -193 +203 @@
 DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
 
+ifneq ($(PYTHIA8),)
+CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
+DELPHES_LIBS += -L$(PYTHIA8)/lib/archive -lpythia8 -llhapdfdummy
+endif
+
 ###
 

trunk/modules/ModulesLinkDef.h

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