Fork me on GitHub

Changeset c466459 in git


Ignore:
Timestamp:
07/04/13 01:35:38 (7 years ago)
Author:
pavel <pavel@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
cf14ea5
Parents:
c41c262
Message:

fix genMakefile and PileUpMergerPythia8

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • doc/genMakefile.tcl

    rc41c262 rc466459  
    107107  puts ""
    108108 
    109   puts {ifneq ($(PYTHIA8),)}
     109  puts {ifeq ($(HAS_PYTHIA8),true)}
    110110  puts -nonewline "${srcPrefix}_OBJ += $suffix"
    111111  puts [join $srcObjFilesPythia8 $suffix]
     
    204204
    205205ifneq ($(PYTHIA8),)
     206HAS_PYTHIA8 = true
    206207CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
    207 DELPHES_LIBS += -L$(PYTHIA8)/lib/archive -lpythia8 -llhapdfdummy
     208DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
     209else
     210ifneq ($(PYTHIA8DATA),)
     211HAS_PYTHIA8 = true
     212CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
     213DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
     214endif
    208215endif
    209216
     
    322329        @mkdir -p $(@D)
    323330        @echo ">> Generating $@"
    324         @rootcint -f $@ -c -Iexternal $<
     331        @rootcint -f $@ -c $(CXXFLAGS) $<
    325332        @echo "#define private public" > $@.arch
    326333        @echo "#define protected public" >> $@.arch
  • modules/PileUpMergerPythia8.cc

    rc41c262 rc466459  
    5757void PileUpMergerPythia8::Init()
    5858{
    59   const char *fileName;
    60 
    6159  fMeanPileUp  = GetDouble("MeanPileUp", 10);
    6260  fZVertexSpread = GetDouble("ZVertexSpread", 0.05)*1.0E3;
     
    10199  Double_t dz, dphi;
    102100  Int_t poisson, event, i;
    103   Long64_t allEntries, entry;
    104101  Candidate *candidate;
    105102  DelphesFactory *factory;
     
    124121    for(i = 0; i < fPythia->event.size(); ++i)
    125122    {
    126       Pythia8::Particle &particle = pythia->event[i];
     123      Pythia8::Particle &particle = fPythia->event[i];
    127124
    128125      if(particle.status() != 1 || !particle.isVisible() || particle.pT() <= fPTMin) continue;
Note: See TracChangeset for help on using the changeset viewer.