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.

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

adding VBFNLO and Hjets++ to the externals linked to Herwig7 #4753

Merged
merged 5 commits into from May 21, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 2 additions & 0 deletions cmssw-tool-conf.spec
Expand Up @@ -45,6 +45,7 @@ Requires: hepmc-toolfile
Requires: heppdt-toolfile
Requires: herwig-toolfile
Requires: herwigpp-toolfile
Requires: hjets-toolfile
Requires: ittnotify-toolfile
Requires: jemalloc-toolfile
Requires: jemalloc-debug-toolfile
Expand Down Expand Up @@ -88,6 +89,7 @@ Requires: dcap-toolfile
Requires: frontier_client-toolfile
Requires: xrootd-toolfile
Requires: dd4hep-toolfile
Requires: vbfnlo-toolfile
%if %isnotaarch64
Requires: pyqt-toolfile
%endif
Expand Down
1 change: 1 addition & 0 deletions herwigpp.spec
Expand Up @@ -13,6 +13,7 @@ Requires: gsl
Requires: fastjet
Requires: gosamcontrib gosam
Requires: madgraph5amcatnlo
Requires: vbfnlo
%if %isamd64
Requires: openloops
%endif
Expand Down
26 changes: 26 additions & 0 deletions hjets-toolfile.spec
@@ -0,0 +1,26 @@
### RPM external hjets-toolfile 1.0
Requires: hjets
%prep

%build

%install

mkdir -p %i/etc/scram.d
cat << \EOF_TOOLFILE >%i/etc/scram.d/vbfnlo.xml
<tool name="hjets" version="@TOOL_VERSION@">
<lib name="hjets"/>
<client>
<environment name="HJETS_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$HJETS_BASE/lib/"/>
<environment name="INCLUDE" default="$HJETS_BASE/include"/>
<environment name="BINDIR" default="$HJETS_BASE/bin"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<runtime name="PATH" default="$BINDIR" type="path"/>
<use name="herwigpp"/>
</tool>
EOF_TOOLFILE

## IMPORT scram-tools-post

25 changes: 25 additions & 0 deletions hjets.spec
@@ -0,0 +1,25 @@
### RPM external hjets 1.2
Source: https://hjets.hepforge.org/downloads/HJets-%{realversion}.tar.gz

Requires: herwigpp


BuildRequires: autotools

%prep
%setup -n HJets-%{realversion}

%build
CXX="$(which g++) -fPIC"
CC="$(which gcc) -fPIC"
FC="$(which gfortran) -fPIC"

./configure --prefix=%i --with-herwig=${HERWIGPP_ROOT}

make %makeprocesses

%install
make install

%post

25 changes: 25 additions & 0 deletions vbfnlo-toolfile.spec
@@ -0,0 +1,25 @@
### RPM external vbfnlo-toolfile 1.0
Requires: vbfnlo
%prep

%build

%install

mkdir -p %i/etc/scram.d
cat << \EOF_TOOLFILE >%i/etc/scram.d/vbfnlo.xml
<tool name="vbfnlo" version="@TOOL_VERSION@">
<lib name="vbfnlo"/>
<client>
<environment name="VBFNLO_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$VBFNLO_BASE/lib/"/>
<environment name="INCLUDE" default="$VBFNLO_BASE/include"/>
<environment name="BINDIR" default="$VBFNLO_BASE/bin"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<runtime name="PATH" default="$BINDIR" type="path"/>
</tool>
EOF_TOOLFILE

## IMPORT scram-tools-post

24 changes: 24 additions & 0 deletions vbfnlo.spec
@@ -0,0 +1,24 @@
### RPM external vbfnlo 3.0.0beta5
Source: http://www.itp.kit.edu/~vbfnloweb/archive/vbfnlo-%{realversion}.tgz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Andrej-CMS , why not use https://github.com/vbfnlo/vbfnlo to download it? You can use

git+https://github.com/vbfnlo/%{n}.git?obj=master/v%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz

and then can do

%setup -q -n %{n}-%{realversion}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dear @smuzaffar ,
I get now an error that states that the Manual.pdf file cannot be compiled from TeX file. Do we have in cmsdist some latex package that need to build first?
vbfnlobuild.txt

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smuzaffar
do you have any idea in regards of the question above?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Andrej-CMS , I do not see build errors if I run autoreconf -vi before configure


BuildRequires: autotools

%prep
%setup -q -n VBFNLO-%{realversion}

%build
CXX="$(which g++) -std=c++11"
CC="$(which gcc)"
FC="$(which gfortran)"

Copy link
Contributor

@smuzaffar smuzaffar Mar 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Andrej-CMS , as mentioned in https://github.com/vbfnlo/vbfnlo/blob/master/README.md , you need to run autoreconf -vi before running configure

./configure --prefix=%i \
--enable-processes=vbf,hjjj \
FC=${FC} FCFLAGS=-std=legacy

make %{makeprocesses}

%install
make install

%post