Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pythia8.200pre2 #1054

Merged
3 commits merged into from
Sep 25, 2014
Merged

Pythia8.200pre2 #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68cbc3d
Revert "Merge pull request #1046 from cms-sw/revert-1028-topythia8200…
bendavid Sep 24, 2014
b940ff0
update to pythia 8.200pre2 (still from tarball in generator afs area)
bendavid Sep 24, 2014
33f470a
prevent evtgen from trying to link to obsolete pythia8 library
bendavid Sep 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions evtgen.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ export PHOTOSPP_LOCATION=${PHOTOSPP_ROOT}


./configure --prefix=%{i} --hepmcdir=$HEPMC_ROOT --pythiadir=$PYTHIA8_ROOT --tauoladir=$TAUOLAPP_ROOT --photosdir=$PHOTOSPP_ROOT CXXFLAGS="%cms_cxxflags"
#remove obsolete pythia8 library
sed -i 's/PYTHIALIBLIST = -lpythia8 -llhapdfdummy/PYTHIALIBLIST = -lpythia8/g' config.mk

# One more fix-up for OSX (in addition to the patch above)
case %cmsplatf in
osx*)
Expand Down
3 changes: 1 addition & 2 deletions pythia8-toolfile.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ mkdir -p %i/etc/scram.d
cat << \EOF_TOOLFILE >%i/etc/scram.d/pythia8.xml
<tool name="pythia8" version="@TOOL_VERSION@">
<lib name="pythia8"/>
<lib name="pythia8tohepmc"/>
<client>
<environment name="PYTHIA8_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$PYTHIA8_BASE/lib"/>
<environment name="INCLUDE" default="$PYTHIA8_BASE/include"/>
</client>
<runtime name="PYTHIA8DATA" value="$PYTHIA8_BASE/xmldoc"/>
<runtime name="PYTHIA8DATA" value="$PYTHIA8_BASE/share/Pythia8/xmldoc"/>
<use name="hepmc"/>
<use name="lhapdf"/>
</tool>
Expand Down
13 changes: 7 additions & 6 deletions pythia8.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
### RPM external pythia8 185
### RPM external pythia8 200pre2

Requires: hepmc
Requires: hepmc lhapdf

Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz
#Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz
Source: https://cms-project-generators.web.cern.ch/cms-project-generators/%{n}-%{realversion}-src.tgz

%if "%{?cms_cxxflags:set}" != "set"
%define cms_cxxflags -std=c++0x
Expand All @@ -12,9 +13,9 @@ Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-
%setup -q -n %{n}/%{realversion}

export USRCXXFLAGS="%cms_cxxflags"
export HEPMCLOCATION=${HEPMC_ROOT}
export HEPMCVERSION=${HEPMC_VERSION}
./configure --prefix=%i --enable-shared --with-hepmc=${HEPMC_ROOT}
export HEPMCLOCATION=${HEPMC_ROOT}
export HEPMCVERSION=${HEPMC_VERSION}
./configure --prefix=%i --enable-shared --with-hepmc2=${HEPMC_ROOT} --with-lhapdf5=${LHAPDF_ROOT}

%build
make %makeprocesses
Expand Down