Fork me on GitHub

Changeset 280667b in git


Ignore:
Timestamp:
Dec 15, 2014, 11:34:25 AM (10 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
d836f45
Parents:
0264da8
Message:

make include paths compatible with old and new pythia versions

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r0264da8 r280667b  
    4141HAS_PYTHIA8 = true
    4242CXXFLAGS += -I$(PYTHIA8)/include
     43CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
    4344OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
    4445else
    … …  
    4647HAS_PYTHIA8 = true
    4748CXXFLAGS += -I$(PYTHIA8DATA)/../include
     49CXXFLAGS += -I$(PYTHIA8DATA)/../include/Pythia8
    4850OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
    4951endif

  • doc/genMakefile.tcl

    r0264da8 r280667b  
    231231HAS_PYTHIA8 = true
    232232CXXFLAGS += -I$(PYTHIA8)/include
     233CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
    233234OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
    234235else
    … …  
    236237HAS_PYTHIA8 = true
    237238CXXFLAGS += -I$(PYTHIA8DATA)/../include
     239CXXFLAGS += -I$(PYTHIA8DATA)/../include/Pythia8
    238240OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
    239241endif

  • modules/PileUpMergerPythia8.cc

    r0264da8 r280667b  
    4141#include "ExRootAnalysis/ExRootClassifier.h"
    4242
    43 #include "Pythia8/Pythia.h"
     43#include "Pythia.h"
    4444
    4545#include "TMath.h"

  • readers/DelphesPythia8.cpp

    r0264da8 r280667b  
    2323#include <signal.h>
    2424
    25 #include "Pythia8/Pythia.h"
     25#include "Pythia.h"
    2626
    2727#include "TROOT.h"
Note: See TracChangeset for help on using the changeset viewer.