Changeset c466459 in git

Timestamp:

Jul 4, 2013, 1:35:38 AM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

cf14ea5

Parents:

c41c262

Message:

fix genMakefile and PileUpMergerPythia8

Files:

• doc/genMakefile.tcl (modified) (3 diffs)
• modules/PileUpMergerPythia8.cc (modified) (3 diffs)

doc/genMakefile.tcl

@@ -107 +107 @@
   puts ""
   
-  puts {ifneq ($(PYTHIA8),)}
+  puts {ifeq ($(HAS_PYTHIA8),true)}
   puts -nonewline "${srcPrefix}_OBJ += $suffix"
   puts [join $srcObjFilesPythia8 $suffix]
@@ -204 +204 @@
 
 ifneq ($(PYTHIA8),)
+HAS_PYTHIA8 = true
 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
-DELPHES_LIBS += -L$(PYTHIA8)/lib/archive -lpythia8 -llhapdfdummy
+DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
+else
+ifneq ($(PYTHIA8DATA),)
+HAS_PYTHIA8 = true
+CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
+DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
+endif
 endif
 
@@ -322 +329 @@
         @mkdir -p $(@D)
         @echo ">> Generating $@"
-        @rootcint -f $@ -c -Iexternal $<
+        @rootcint -f $@ -c $(CXXFLAGS) $<
         @echo "#define private public" > $@.arch
         @echo "#define protected public" >> $@.arch

modules/PileUpMergerPythia8.cc

@@ -57 +57 @@
 void PileUpMergerPythia8::Init()
 {
-  const char *fileName;
-
   fMeanPileUp  = GetDouble("MeanPileUp", 10);
   fZVertexSpread = GetDouble("ZVertexSpread", 0.05)*1.0E3;
@@ -101 +99 @@
   Double_t dz, dphi;
   Int_t poisson, event, i;
-  Long64_t allEntries, entry;
   Candidate *candidate;
   DelphesFactory *factory;
@@ -124 +121 @@
     for(i = 0; i < fPythia->event.size(); ++i)
     {
-      Pythia8::Particle &particle = pythia->event[i];
+      Pythia8::Particle &particle = fPythia->event[i];
 
       if(particle.status() != 1 || !particle.isVisible() || particle.pT() <= fPTMin) continue;